<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>app/views/user_notifier/activation.fr.html.erb</filename>
    </added>
    <added>
      <filename>app/views/user_notifier/comment_notice.fr.html.erb</filename>
    </added>
    <added>
      <filename>app/views/user_notifier/follow_up_comment_notice.fr.html.erb</filename>
    </added>
    <added>
      <filename>app/views/user_notifier/follow_up_comment_notice_anonymous.fr.rhtml</filename>
    </added>
    <added>
      <filename>app/views/user_notifier/forgot_username.fr.html.erb</filename>
    </added>
    <added>
      <filename>app/views/user_notifier/friendship_accepted.fr.html.erb</filename>
    </added>
    <added>
      <filename>app/views/user_notifier/friendship_request.fr.html.erb</filename>
    </added>
    <added>
      <filename>app/views/user_notifier/message_notification.fr.html.erb</filename>
    </added>
    <added>
      <filename>app/views/user_notifier/new_forum_post_notice.fr.html.erb</filename>
    </added>
    <added>
      <filename>app/views/user_notifier/post_recommendation.fr.html.erb</filename>
    </added>
    <added>
      <filename>app/views/user_notifier/reset_password.fr.html.erb</filename>
    </added>
    <added>
      <filename>app/views/user_notifier/signup_invitation.fr.html.erb</filename>
    </added>
    <added>
      <filename>app/views/user_notifier/signup_notification.fr.html.erb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -165,20 +165,20 @@ class CommentsController &lt; BaseController
 
       return @comments.first.commentable_name if @comments.first
   
-      type = comment_type.underscore
-      case type
-        when 'user'
-          @commentable.login
-        when 'post'
-          @commentable.title
-        when 'clipping'
-          @commentable.description || &quot;Clipping from #{@user.login}&quot;
-        when 'photo'
-          @commentable.description || &quot;Photo from #{@user.login}&quot;
-        else 
-          @commentable.class.to_s.humanize
-      end  
-    end
+    type = comment_type.underscore
+    case type
+      when 'user'
+        @commentable.login
+      when 'post'
+        @commentable.title
+      when 'clipping'
+        @commentable.description || :clipping_from_user.l(@user.login)
+      when 'photo'
+        @commentable.description || :photo_from_user.l(@user.login)
+      else 
+        @commentable.class.to_s.humanize
+    end  
+  end
   
     def render_comments_rss_feed_for(comments, title)
       render_rss_feed_for(comments,</diff>
      <filename>app/controllers/comments_controller.rb</filename>
    </modified>
    <modified>
      <diff>@@ -43,4 +43,4 @@ class InvitationsController &lt; BaseController
     end
   end
   
-end
\ No newline at end of file
+end</diff>
      <filename>app/controllers/invitations_controller.rb</filename>
    </modified>
    <modified>
      <diff>@@ -16,7 +16,7 @@ module BaseHelper
   end
   
   def is_current_user_and_featured?(u)
-     u &amp;&amp; u.eql?(current_user) &amp;&amp; u.featured_writer?
+    u &amp;&amp; u.eql?(current_user) &amp;&amp; u.featured_writer?
   end
   
   def resize_img(classname, width=90, height=135)
@@ -108,10 +108,10 @@ module BaseHelper
     end
   end
 
-	def page_title
-		app_base = AppConfig.community_name
-		tagline = &quot; | #{AppConfig.community_tagline}&quot;
-	
+  def page_title
+    app_base = AppConfig.community_name
+    tagline = &quot; | #{AppConfig.community_tagline}&quot;
+
 		title = app_base
 		case @controller.controller_name
 			when 'base'
@@ -126,37 +126,42 @@ module BaseHelper
           title += (@post.tags.empty? ? '' : &quot; &amp;laquo; &quot;+:keywords.l+&quot;: &quot; + @post.tags[0...4].join(', ') )
           @canonical_url = user_post_url(@post.user, @post)
         end
-			when 'users'
+      when 'users'
         if @user &amp;&amp; !@user.new_record? &amp;&amp; @user.login 
           title = @user.login
-          title += ', expert in ' + @user.offerings.collect{|o| o.skill.name }.join(', ') if @user.vendor? and !@user.offerings.empty?
+          title += ', ' + :expert_in.l + ' ' + @user.offerings.collect{|o| o.skill.name }.join(', ') if @user.vendor? and !@user.offerings.empty?
           title += ' &amp;raquo; ' + app_base + tagline
           @canonical_url = user_url(@user)          
         else
           title = :showing_users.l+' &amp;raquo; ' + app_base + tagline
         end
-			when 'photos'
+      when 'photos'
         if @user and @user.login
-          title = @user.login + '\'s '+:photos.l+' &amp;raquo; ' + app_base + tagline
+          title = :users_photos.l(:user =&gt; @user.login)+' &amp;raquo; ' + app_base + tagline
         end
-			when 'clippings'
+      when 'clippings'
         if @user and @user.login
-          title = @user.login + '\'s '+:clippings.l+' &amp;raquo; ' + app_base + tagline
+          title = :user_clippings.l(:user =&gt; @user.login) + ' &amp;raquo; ' + app_base + tagline
         end
-			when 'tags'
-				case @controller.action_name
-			    when 'show'
-            title = @tags.map(&amp;:name).join(', ') + ' '
-            title += params[:type] ? params[:type].pluralize : :posts_photos_and_bookmarks.l
-            title += ' (Related: ' + @related_tags.join(', ') + ')' if @related_tags
+      when 'tags'
+        case @controller.action_name
+          when 'show'
+            if params[:type]
+#              title = (params[:type].downcase.pluralize + '_tagged').l
+              title = I18n.translate('all_' + params[:type].downcase.pluralize + '_tagged', :tag_name =&gt; @tags.map(&amp;:name).join(', '))
+            else
+              title = :posts_photos_and_bookmarks.l(:name =&gt; @tags.map(&amp;:name).join(', '))
+            end
+#            title += ' ' + @tags.map(&amp;:name).join(', ')
+            title += ' (' + :related_tags.l + ': ' + @related_tags.join(', ') + ')' if @related_tags
             title += ' | ' + app_base    
             @canonical_url = tag_url(URI.escape(@tags_raw, /[\/.?#]/)) if @tags_raw
           else
-          title = 'Showing tags &amp;raquo; ' + app_base + tagline            
-			  end
+            title = 'Showing tags &amp;raquo; ' + app_base + tagline            
+          end
       when 'categories'
         if @category and @category.name
-          title = @category.name + ' '+:posts_photos_and_bookmarks.l+' &amp;raquo; ' + app_base + tagline
+          title = :posts_photos_and_bookmarks.l(:name =&gt; @category.name) + ' &amp;raquo; ' + app_base + tagline
         else
           title = :showing_categories.l+' &amp;raquo; ' + app_base + tagline            
         end
@@ -168,15 +173,16 @@ module BaseHelper
         end
       when 'sessions'
         title = :login.l+' &amp;raquo; ' + app_base + tagline            
-		end
+    end
 
     if @page_title
       title = @page_title + ' &amp;raquo; ' + app_base + tagline
     elsif title == app_base          
-		  title = :showing.l+' ' + @controller.controller_name + ' &amp;raquo; ' + app_base + tagline
-    end	
-		title
-	end
+		  title = :showing.l+' ' + @controller.controller_name.l + ' &amp;raquo; ' + app_base + tagline
+    end
+
+    title
+  end
 
   def add_friend_link(user = nil)
 		html = &quot;&lt;span class='friend_request' id='friend_request_#{user.id}'&gt;&quot;
@@ -184,7 +190,7 @@ module BaseHelper
 				{:update =&gt; &quot;friend_request_#{user.id}&quot;,
 					:loading =&gt; &quot;$$('span#friend_request_#{user.id} span.spinner')[0].show(); $$('span#friend_request_#{user.id} a.add_friend_btn')[0].hide()&quot;, 
 					:complete =&gt; visual_effect(:highlight, &quot;friend_request_#{user.id}&quot;, :duration =&gt; 1),
-          500 =&gt; &quot;alert('&quot;+:sorry_there_was_an_error_requesting_friendship.l+&quot;')&quot;,
+          500 =&gt; &quot;alert('&quot;+:sorry_there_was_an_error_requesting_friendship.l.gsub(/'/, &quot;\\\\'&quot;)+&quot;')&quot;,
 					:url =&gt; hash_for_user_friendships_url(:user_id =&gt; current_user.id, :friend_id =&gt; user.id), 
 					:method =&gt; :post }, {:class =&gt; &quot;add_friend button&quot;}
 		html +=	&quot;&lt;span style='display:none;' class='spinner'&gt;&quot;
@@ -322,19 +328,17 @@ module BaseHelper
     options[:q] ? search_all_sb_posts_path(options) : send(&quot;all_#{prefix}sb_posts_path&quot;, options)
   end
 
-  def distance_of_time_in_words(from_time, to_time = 0, include_seconds = false)
+  def time_ago_in_words(from_time, to_time = Time.now, include_seconds = false)
     from_time = from_time.to_time if from_time.respond_to?(:to_time)
     to_time = to_time.to_time if to_time.respond_to?(:to_time)
     distance_in_minutes = (((to_time - from_time).abs)/60).round
   
     case distance_in_minutes
-      when 0..1           then (distance_in_minutes==0) ? :a_few_seconds_ago.l : :one_minute_ago.l
-      when 2..59          then &quot;#{distance_in_minutes} &quot;+:minutes_ago.l
-      when 60..90         then :one_hour_ago.l
-      when 90..1440       then &quot;#{(distance_in_minutes.to_f / 60.0).round} &quot;+:hours_ago.l
-      when 1440..2160     then :one_day_ago.l # 1 day to 1.5 days
-      when 2160..2880     then &quot;#{(distance_in_minutes.to_f / 1440.0).round} &quot;+:days_ago.l # 1.5 days to 2 days
-      else from_time.strftime(&quot;%b %e, %Y  %l:%M%p&quot;).gsub(/([AP]M)/) { |x| x.downcase }
+      when 0              then :a_few_seconds_ago.l
+      when 1..59          then :minutes_ago.l(:count =&gt; distance_in_minutes)
+      when 60..1440       then :hours_ago.l(:count =&gt; (distance_in_minutes.to_f / 60.0).round)
+      when 1440..2880     then :days_ago.l(:count =&gt; (distance_in_minutes.to_f / 1440.0).round) # 1.5 days to 2 days
+      else I18n.l(from_time, :format =&gt; :time_ago)
     end
   end
 
@@ -350,11 +354,11 @@ module BaseHelper
   
   def profile_completeness(user)
     segments = [
-      {:val =&gt; 2, :action =&gt; link_to('Add a profile photo', edit_user_path(user, :anchor =&gt; 'profile_details')), :test =&gt; !user.avatar.nil? },
-      {:val =&gt; 1, :action =&gt; link_to('Fill in your about me', edit_user_path(user, :anchor =&gt; 'user_description')), :test =&gt; !user.description.blank?},      
-      {:val =&gt; 2, :action =&gt; link_to('Select your city', edit_user_path(user, :anchor =&gt; 'location_chooser')), :test =&gt; !user.metro_area.nil? },            
-      {:val =&gt; 1, :action =&gt; link_to('Tag yourself', edit_user_path(user, :anchor =&gt; &quot;user_tags&quot;)), :test =&gt; user.tags.any?},                  
-      {:val =&gt; 1, :action =&gt; link_to('Invite some friends', new_invitation_path), :test =&gt; user.invitations.any?}
+      {:val =&gt; 2, :action =&gt; link_to(:upload_a_profile_photo.l, edit_user_path(user, :anchor =&gt; 'profile_details')), :test =&gt; !user.avatar.nil? },
+      {:val =&gt; 1, :action =&gt; link_to(:tell_us_about_yourself.l, edit_user_path(user, :anchor =&gt; 'user_description')), :test =&gt; !user.description.blank?},      
+      {:val =&gt; 2, :action =&gt; link_to(:select_your_city.l, edit_user_path(user, :anchor =&gt; 'location_chooser')), :test =&gt; !user.metro_area.nil? },            
+      {:val =&gt; 1, :action =&gt; link_to(:tag_yourself.l, edit_user_path(user, :anchor =&gt; &quot;user_tags&quot;)), :test =&gt; user.tags.any?},                  
+      {:val =&gt; 1, :action =&gt; link_to(:invite_some_friends.l, new_invitation_path), :test =&gt; user.invitations.any?}
     ]
     
     completed_score = segments.select{|s| s[:test].eql?(true)}.sum{|s| s[:val]}</diff>
      <filename>app/helpers/base_helper.rb</filename>
    </modified>
    <modified>
      <diff>@@ -3,7 +3,7 @@ module FriendshipsHelper
   def friendship_control_links(friendship)
     case friendship.friendship_status_id
       when FriendshipStatus[:pending].id
-        &quot;#{(link_to(:accept.l, accept_user_friendship_path(friendship.user, friendship), :method =&gt; :put, :class =&gt; 'button positive') unless friendship.initiator?)} #{link_to( 'Deny', deny_user_friendship_path(friendship.user, friendship), :method =&gt; :put, :class =&gt; 'button negative')}&quot;
+        &quot;#{(link_to(:accept.l, accept_user_friendship_path(friendship.user, friendship), :method =&gt; :put, :class =&gt; 'button positive') unless friendship.initiator?)} #{link_to(:deny.l, deny_user_friendship_path(friendship.user, friendship), :method =&gt; :put, :class =&gt; 'button negative')}&quot;
       when FriendshipStatus[:accepted].id
         &quot;#{link_to(:remove_this_friend.l, deny_user_friendship_path(friendship.user, friendship), :method =&gt; :put, :class =&gt; 'button negative')}&quot;
       when FriendshipStatus[:denied].id</diff>
      <filename>app/helpers/friendships_helper.rb</filename>
    </modified>
    <modified>
      <diff>@@ -4,9 +4,7 @@ module UsersHelper
   end    
   
   def random_greeting(user)
-    greetings = ['Hello', 'Hola', 'Hi ', 'Yo', 'Welcome back,', 'Greetings',
-        'Wassup', 'Aloha', 'Halloo']
-    &quot;#{greetings.sort_by {rand}.first} #{user.login}!&quot;
+    &quot;#{:greetings.l.sort_by {rand}.first} #{user.login}!&quot;
   end
     
-end
\ No newline at end of file
+end</diff>
      <filename>app/helpers/users_helper.rb</filename>
    </modified>
    <modified>
      <diff>@@ -42,9 +42,8 @@ class Photo &lt; ActiveRecord::Base
   attr_accessible :name, :description
 
   def display_name
-    self.name ? self.name : &quot;#{:created_at.l.downcase}: #{I18n.localize(self.created_at.to_date)}&quot;
+    (self.name &amp;&amp; self.name.length&gt;0) ? self.name : &quot;#{:created_at.l.downcase}: #{I18n.l(self.created_at, :format =&gt; :published_date)}&quot;
   end
-  
 
   def description_for_rss
     &quot;&lt;a href='#{self.link_for_rss}' title='#{self.name}'&gt;&lt;img src='#{self.public_filename(:large)}' alt='#{self.name}' /&gt;&lt;br /&gt;#{self.description}&lt;/a&gt;&quot;</diff>
      <filename>app/models/photo.rb</filename>
    </modified>
    <modified>
      <diff>@@ -27,7 +27,7 @@ class User &lt; ActiveRecord::Base
   #validation
   validates_presence_of     :login, :email
   validates_presence_of     :password,                   :if =&gt; :password_required?
-  validates_presence_of     :password_confirmation,      :if =&gt; :password_required?
+#  validates_presence_of     :password_confirmation,      :if =&gt; :password_required?
   validates_length_of       :password, :within =&gt; 6..20, :if =&gt; :password_required?
   validates_confirmation_of :password,                   :if =&gt; :password_required?
   validates_presence_of     :metro_area,                 :if =&gt; Proc.new { |user| user.state }</diff>
      <filename>app/models/user.rb</filename>
    </modified>
    <modified>
      <diff>@@ -9,7 +9,7 @@ class UserNotifier &lt; ActionMailer::Base
   def signup_invitation(email, user, message)
     setup_sender_info
     @recipients  = &quot;#{email}&quot;
-    @subject     = &quot;#{user.login} would like you to join #{AppConfig.community_name}!&quot;
+    @subject     = &quot;#{:would_like_you_to_join.l(:user =&gt; user.login, :site =&gt; AppConfig.community_name)}&quot;
     @sent_on     = Time.now
     @body[:user] = user
     @body[:url]  = signup_by_id_url(user, user.invite_code)
@@ -18,14 +18,14 @@ class UserNotifier &lt; ActionMailer::Base
 
   def friendship_request(friendship)
     setup_email(friendship.friend)
-    @subject     += &quot;#{friendship.user.login} would like to be friends with you!&quot;
+    @subject     += &quot;#{:would_like_to_be_friends_with_you_on.l(:user =&gt; friendship.user.login, :site =&gt; AppConfig.community_name)}&quot;
     @body[:url]  = pending_user_friendships_url(friendship.friend)
     @body[:requester] = friendship.user
   end
   
   def friendship_accepted(friendship)
     setup_email(friendship.user) 
-    @subject     += &quot;Friendship request accepted!&quot;       
+    @subject     += &quot;#{:friendship_request_accepted.l}&quot;
     @body[:requester] = friendship.user
     @body[:friend]    = friendship.friend
     @body[:url]       = user_url(friendship.friend)
@@ -33,7 +33,7 @@ class UserNotifier &lt; ActionMailer::Base
 
   def comment_notice(comment)
     setup_email(comment.recipient)
-    @subject     += &quot;#{comment.username} has something to say to you on #{AppConfig.community_name}!&quot;
+    @subject     += &quot;#{:has_something_to_say_to_you_on.l(:user =&gt; comment.username, :site =&gt; AppConfig.community_name)}&quot;
     @body[:url]  = commentable_url(comment)
     @body[:comment] = comment
     @body[:commenter] = comment.user
@@ -41,7 +41,7 @@ class UserNotifier &lt; ActionMailer::Base
   
   def follow_up_comment_notice(user, comment)
     setup_email(user)
-    @subject     += &quot;#{comment.username} has commented on a #{comment.commentable_type} that you also commented on.&quot;
+    @subject     += &quot;#{:has_commented_on_something_that_you_also_commented_on.l(:user =&gt; comment.username, :item =&gt; comment.commentable_type)}&quot;
     @body[:url]  = commentable_url(comment)
     @body[:comment] = comment
     @body[:commenter] = comment.user
@@ -52,7 +52,7 @@ class UserNotifier &lt; ActionMailer::Base
     setup_sender_info
     @subject     = &quot;[#{AppConfig.community_name}] &quot;
     @sent_on     = Time.now
-    @subject     += &quot;#{comment.username} has commented on a #{comment.commentable_type} that you also commented on.&quot;
+    @subject     += &quot;#{:has_commented_on_something_that_you_also_commented_on.l(:user =&gt; comment.username, :item =&gt; comment.commentable_type)}&quot;
     @body[:url]  = commentable_url(comment)
     @body[:comment] = comment
 
@@ -61,7 +61,7 @@ class UserNotifier &lt; ActionMailer::Base
 
   def new_forum_post_notice(user, post)
      setup_email(user)
-     @subject     += &quot;#{post.user.login} has posted in a thread you are monitoring.&quot;
+     @subject     += &quot;#{:has_posted_in_a_thread_you_are_monitoring.l(:user =&gt; post.user.login)}&quot;
      @body[:url]  = &quot;#{forum_topic_url(:forum_id =&gt; post.topic.forum, :id =&gt; post.topic, :page =&gt; post.topic.last_page)}##{post.dom_id}&quot;
      @body[:post] = post
      @body[:author] = post.user
@@ -69,13 +69,13 @@ class UserNotifier &lt; ActionMailer::Base
 
   def signup_notification(user)
     setup_email(user)
-    @subject    += &quot;Please activate your new #{AppConfig.community_name} account&quot;
+    @subject    += &quot;#{:please_activate_your_new_account.l(:site =&gt; AppConfig.community_name)}&quot;
     @body[:url]  = &quot;#{application_url}users/activate/#{user.activation_code}&quot;
   end
   
   def message_notification(message)
     setup_email(message.recipient)
-    @subject     += &quot;#{message.sender.login} sent you a private message!&quot;
+    @subject     += &quot;#{:sent_you_a_private_message.l(:user =&gt; message.sender.login)}&quot;
     @body[:message] = message
   end
 
@@ -84,7 +84,7 @@ class UserNotifier &lt; ActionMailer::Base
     @recipients  = &quot;#{email}&quot;
     @sent_on     = Time.now
     setup_sender_info
-    @subject     = &quot;Check out this story on #{AppConfig.community_name}&quot;
+    @subject     = &quot;#{:check_out_this_story_on.l(:site =&gt; AppConfig.community_name)}&quot;
     content_type &quot;text/plain&quot;
     @body[:name] = name  
     @body[:title]  = post.title
@@ -97,18 +97,18 @@ class UserNotifier &lt; ActionMailer::Base
   
   def activation(user)
     setup_email(user)
-    @subject    += &quot;Your #{AppConfig.community_name} account has been activated!&quot;
+    @subject    += &quot;#{:your_account_has_been_activated.l(:site =&gt; AppConfig.community_name)}&quot;
     @body[:url]  = home_url
   end
   
   def reset_password(user)
     setup_email(user)
-    @subject    += &quot;#{AppConfig.community_name} User information&quot;
+    @subject    += &quot;#{:user_information.l(:site =&gt; AppConfig.community_name)}&quot;
   end
 
   def forgot_username(user)
     setup_email(user)
-    @subject    += &quot;#{AppConfig.community_name} User information&quot;
+    @subject    += &quot;#{:user_information.l(:site =&gt; AppConfig.community_name)}&quot;
   end
 
   
@@ -122,7 +122,7 @@ class UserNotifier &lt; ActionMailer::Base
   end
   
   def setup_sender_info
-    @from       = &quot;The #{AppConfig.community_name} Team &lt;#{AppConfig.support_email}&gt;&quot; 
+    @from       = &quot;#{:the_team.l(:site =&gt; AppConfig.community_name, :email =&gt; AppConfig.support_email)}&gt;&quot; 
     headers     &quot;Reply-to&quot; =&gt; &quot;#{AppConfig.support_email}&quot;
     @content_type = &quot;text/plain&quot;           
   end</diff>
      <filename>app/models/user_notifier.rb</filename>
    </modified>
    <modified>
      <diff>@@ -50,5 +50,7 @@
           =:updated_their_profile.l
         - when 'logged_in'
           =:logged_into_the_site.l
+        - when 'joined_the_site'
+          =:joined_the_site.l(:site =&gt; AppConfig.community_name)
         - else
           = &quot; #{activity.action.humanize.downcase }&quot;</diff>
      <filename>app/views/activities/_activity.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -18,11 +18,11 @@
 
         - for contest in @contests
           %tr
-            %td=h contest.created_at.strftime(&quot;%m/%d/%y&quot;)
+            %td=h I18n.l(contest.created_at, :format =&gt; :short_published_date)
             %td=h contest.title
             %td=h truncate(contest.post, :length =&gt; 250)
-            %td=h contest.begin_date.strftime(&quot;%m/%d/%y&quot;)
-            %td=h contest.end_date.strftime(&quot;%m/%d/%y&quot;)
+            %td=h I18n.l(contest.begin_date, :format =&gt; :short_published_date)
+            %td=h I18n.l(contest.end_date, :format =&gt; :short_published_date)
             %td
               = link_to :show.l, contest_path(contest)
               %br</diff>
      <filename>app/views/admin/contests.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -22,6 +22,5 @@
 
         %p
           = submit_tag :save.l
-
-          or
+          = :or.l
           = link_to :cancel_and_go_back_to_my_clippings.l, user_clippings_path(@user)</diff>
      <filename>app/views/clippings/edit.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -25,6 +25,5 @@
 
         %p
           = submit_tag :create.l
-
-          or
+          = :or.l
           = link_to :cancel_and_go_back_to_my_clippings.l, user_clippings_path(@user)</diff>
      <filename>app/views/clippings/new.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -1,14 +1,14 @@
 -if comment.user
   .hentry{:id =&gt; &quot;comment_#{comment.id}&quot;}
     .vcard.author
-      %h5= link_to image_tag(comment.user.avatar_photo_url(:thumb), :height =&gt; '50', :width =&gt; '50', :alt =&gt; &quot;#{comment.user.login}&quot;), user_path(comment.user), :rel =&gt; 'bookmark', :class =&gt; 'photo', :title =&gt; &quot;#{comment.user.login}'s profile&quot;
+      %h5= link_to image_tag(comment.user.avatar_photo_url(:thumb), :height =&gt; '50', :width =&gt; '50', :alt =&gt; &quot;#{comment.user.login}&quot;), user_path(comment.user), :rel =&gt; 'bookmark', :class =&gt; 'photo', :title =&gt; :users_profil.l(:user =&gt; comment.user.login)
       %ul
         %li.fn
           = link_to comment.user.login, user_path(comment.user), :class =&gt; 'url'
         %li.update
           %a{&quot;href&quot;=&gt; commentable_url(comment), &quot;rel&quot;=&gt;&quot;bookmark&quot;}
             %abbr.published{&quot;title&quot;=&gt;&quot;#{comment.created_at}&quot;}
-              = comment.created_at.strftime(&quot;%B %d, %Y&quot;)
+              = I18n.l(comment.created_at, :format =&gt; :short_literal_date)
         -if ( comment.can_be_deleted_by(current_user) )
           %li.delete=link_to_remote(&quot;Delete&quot;.l, {:url =&gt; comment_path(comment.commentable_type, comment.commentable_id, comment), :method =&gt; :delete, 500 =&gt; 'alert(\'Sorry, there was a server error\'); return false',  :success =&gt; visual_effect(:fade, &quot;comment_#{comment.id}&quot;), :confirm =&gt; :are_you_sure_you_want_to_permanently_delete_this_comment.l} )
     .entry-content= comment.comment
@@ -25,9 +25,9 @@
         %li.update
           %a{&quot;href&quot;=&gt; commentable_url(comment), &quot;rel&quot;=&gt;&quot;bookmark&quot;}
             %abbr.published{&quot;title&quot;=&gt;&quot;#{comment.created_at}&quot;}
-              = comment.created_at.strftime(&quot;%B %d, %Y&quot;)
+              = I18n.l(comment.created_at, :format =&gt; :short_literal_date)
         -if ( comment.can_be_deleted_by(current_user) )
-          %li.delete=link_to_remote(&quot;Delete&quot;.l, {:url =&gt; comment_path(comment.commentable_type, comment.commentable_id, comment), :method =&gt; :delete, 500 =&gt; 'alert(\'Sorry, there was a server error\'); return false',  :success =&gt; visual_effect(:fade, &quot;comment_#{comment.id}&quot;), :confirm =&gt; &quot;Are you sure you want to permanently delete this comment&quot;} )
+          %li.delete=link_to_remote(:delete.l, {:url =&gt; comment_path(comment.commentable_type, comment.commentable_id, comment), :method =&gt; :delete, 500 =&gt; 'alert(\'Sorry, there was a server error\'); return false',  :success =&gt; visual_effect(:fade, &quot;comment_#{comment.id}&quot;), :confirm =&gt; :are_you_sure_you_want_to_permanently_delete_this_comment.l} )
     .entry-content= comment.comment
 
 - highlighted ||= nil</diff>
      <filename>app/views/comments/_comment.html.haml</filename>
    </modified>
    <modified>
      <filename>app/views/comments/index.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -26,11 +26,11 @@
 				&lt;/p&gt;
 
 				&lt;p&gt;
-					&lt;%= submit_tag :save.l %&gt; or &lt;%= link_to :cancel_and_go_back_to_my_contests.l, contests_path %&gt;
+					&lt;%= submit_tag :save.l %&gt; &lt;%= :or.l %&gt; &lt;%= link_to :cancel_and_go_back_to_my_contests.l, contests_path %&gt;
 				&lt;/p&gt;
 			&lt;% end %&gt;
 		&lt;/div&gt;
 	&lt;/div&gt;
 
 	&lt;br class=&quot;clear&quot; /&gt;
-&lt;/div&gt;
\ No newline at end of file
+&lt;/div&gt;</diff>
      <filename>app/views/contests/edit.html.erb</filename>
    </modified>
    <modified>
      <diff>@@ -26,11 +26,11 @@
 			&lt;/p&gt;
 
 			&lt;p&gt;
-				&lt;%= submit_tag :save.l %&gt; or &lt;%= link_to :cancel_and_go_back_to_all_contests.l, contests_path %&gt;
+				&lt;%= submit_tag :save.l %&gt; &lt;%= :or.l %&gt; &lt;%= link_to :cancel_and_go_back_to_all_contests.l, contests_path %&gt;
 			&lt;/p&gt;
 			&lt;% end %&gt;
 		&lt;/div&gt;
 	&lt;/div&gt;
 
 	&lt;br class=&quot;clear&quot; /&gt;
-&lt;/div&gt;
\ No newline at end of file
+&lt;/div&gt;</diff>
      <filename>app/views/contests/new.html.erb</filename>
    </modified>
    <modified>
      <diff>@@ -4,5 +4,8 @@
   %p= link_to :delete_this_forum.l, forum_path(@forum), :method =&gt; :delete, :class =&gt; &quot;utility&quot;, :confirm =&gt; :are_you_sure.l
   - form_for :forum, :url  =&gt; forum_path(@forum), :html =&gt; { :class =&gt; &quot;MainForm&quot;, :method =&gt; :put } do |f|
     = render :partial =&gt; &quot;form&quot;, :object =&gt; f
-    %p= submit_tag :save_forum.l, :or =&gt; link_to(:cancel.l, forums_path)
+    %p
+      = submit_tag :save_forum.l
+      = :or.l
+      = link_to(:cancel.l, forums_path)
 </diff>
      <filename>app/views/forums/edit.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -67,4 +67,4 @@
         - unless online_users.empty? 
           = :users_online.l + ':'
           = online_users.map { |u| link_to &quot;&lt;strong&gt;#{h u.display_name}&lt;/strong&gt;&quot;, user_path(u) } * &quot;, &quot; 
-          %br
\ No newline at end of file
+          %br</diff>
      <filename>app/views/forums/index.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -2,5 +2,8 @@
   %h3= :new_forum.l
   - form_for :forum, :url =&gt; forums_path, :html =&gt; {:class =&gt; &quot;MainForm&quot;} do |f|
     = render :partial =&gt; &quot;form&quot;, :object =&gt; f
-    %p= submit_tag :create.l, :or =&gt; link_to(:cancel.l, forums_path)
+    %p
+      = submit_tag :create.l
+      = :or.l
+      = link_to(:cancel.l, forums_path)
 </diff>
      <filename>app/views/forums/new.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -35,7 +35,7 @@
   - unless @topics.empty?
     %table.wide.topics{:border=&gt;&quot;0&quot;, :cellspacing=&gt;&quot;0&quot;, :cellpadding=&gt;&quot;0&quot;}
       %tr
-        %th.la{:colspan=&gt;&quot;2&quot;}= :topic.l
+        %th.la{:colspan=&gt;&quot;2&quot;}= :topics.l
         %th{:width=&gt;&quot;1%&quot;}= :posts.l
         %th{:width=&gt;&quot;1%&quot;}= :views.l 
         %th.la= :last_post.l</diff>
      <filename>app/views/forums/show.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -5,10 +5,10 @@
   .yui-g
     .yui-u.first
       %h2= link_to user.login, user_path(user)
-      = &quot;from #{user.location}&lt;br/&gt;&quot; if user.metro_area      
-      = friendship.friendship_status.name ? :accepted.l : :denied.l
-      \: 
-      =:requested.l
-      = time_ago_in_words friendship.created_at
+      = &quot;#{:from.l} #{user.location}&lt;br/&gt;&quot; if user.metro_area      
+      %p= friendship.friendship_status.name.l
+      %p
+        =:requested.l
+        = time_ago_in_words friendship.created_at
 
-    .yui-u= friendship_control_links(friendship) if @is_current_user
\ No newline at end of file
+    .yui-u= friendship_control_links(friendship) if @is_current_user</diff>
      <filename>app/views/friendships/_friendship.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -4,8 +4,7 @@
   .yui-b
     -box :id =&gt; &quot;friends&quot; do
       %h3
-        = @friend_count
-        =:accepted_friendships.l
+        =:accepted_friendships.l(:count =&gt; @friend_count)
         = link_to &quot;(#{@pending_friendships_count} &quot;+:pending.l+&quot;)&quot;, pending_user_friendships_path(@user) if  (@pending_friendships_count &gt; 0)
       .pagination=paginating_links @friendships if @friendships.page_count &gt; 1
       </diff>
      <filename>app/views/friendships/accepted.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -17,7 +17,7 @@
 
         - for homepage_feature in @homepage_features
           %tr
-            %td=h homepage_feature.created_at.strftime(&quot;%m/%d/%y&quot;)
+            %td=h I18n.l(homepage_feature.created_at, :format =&gt; :short_published_date)
             %td
               %a{:href=&gt;&quot;#{h homepage_feature.url}&quot;}=h homepage_feature.title
             %td=h truncate(homepage_feature.description, :length =&gt; 250)
@@ -27,4 +27,4 @@
               %br
               = link_to :edit.l, edit_homepage_feature_path(homepage_feature)
               %br
-              = link_to :destroy.l, homepage_feature_path(homepage_feature), :confirm =&gt; :are_you_sure.l, :method =&gt; :delete
\ No newline at end of file
+              = link_to :destroy.l, homepage_feature_path(homepage_feature), :confirm =&gt; :are_you_sure.l, :method =&gt; :delete</diff>
      <filename>app/views/homepage_features/index.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -6,9 +6,7 @@
   -box :class =&gt; &quot;alt first_alt&quot; do 
     %h3=:spread_the_word.l
     %p
-      =:the_more_people_you_invite_the_better.l
-      = AppConfig.community_name
-      =:becomes.l
+      =:invite_message.l(:site =&gt; AppConfig.community_name)
     %p
       =:people_who_sign_up_using_your_invitation_will_automatically_be_added_as_your_friends_on.l
       = AppConfig.community_name
@@ -31,5 +29,5 @@
 
         %p
           = submit_tag :send_invitations.l
-          or
+          = :or.l
           = link_to :cancel.l, user_path(@user)</diff>
      <filename>app/views/invitations/new.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -17,17 +17,17 @@
                 %td{:width =&gt; '10px'}
                   %fieldset.inline= check_box_tag &quot;delete[]&quot;, message.id
                 %td{:width =&gt; '60px'}
-                  .photo= link_to image_tag( message.sender.avatar_photo_url(:thumb), &quot;height&quot;=&gt;&quot;50px&quot;, &quot;alt&quot;=&gt;&quot;#{message.sender.login}&quot;, &quot;width&quot;=&gt;&quot;50px&quot; ), user_path(message.sender), :title =&gt; &quot;#{message.sender.login}'s &quot; + :profile.l
+                  .photo= link_to image_tag( message.sender.avatar_photo_url(:thumb), &quot;height&quot;=&gt;&quot;50px&quot;, &quot;alt&quot;=&gt;&quot;#{message.sender.login}&quot;, &quot;width&quot;=&gt;&quot;50px&quot; ), user_path(message.sender), :title =&gt; :users_profile.l(:user =&gt; message.sender.login)
 
                 %td
                   = link_to h(message.subject), user_message_path(@user, message)                  
                   %br
-                  from:
+                  = :from.l + &quot;:&quot;
                   = link_to h(message.sender.login), user_path(message.sender)                  
                 %td{:width =&gt; '20px'}
                   %em
-                    = message.read? ? 'read' : 'unread'
-                %td.meta{:width =&gt; '150px'}= h message.created_at.to_s(:long)
+                    = message.read? ? :read.l : :unread.l
+                %td.meta{:width =&gt; '150px'}= h I18n.l(message.created_at, :format =&gt; :time_ago)
         %tfoot
           %tr
             %td{ :colspan =&gt; &quot;5&quot; }</diff>
      <filename>app/views/messages/_inbox.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -15,14 +15,14 @@
                 %td{:width =&gt; '10px'}
                   %fieldset.inline= check_box_tag &quot;delete[]&quot;, message.id
                 %td{:width =&gt; '60px'}
-                  .photo= link_to image_tag( message.recipient.avatar_photo_url(:thumb), &quot;height&quot;=&gt;&quot;50px&quot;, &quot;alt&quot;=&gt;&quot;#{message.recipient.login}&quot;, &quot;width&quot;=&gt;&quot;50px&quot; ), user_path(message.recipient), :title =&gt; &quot;#{message.recipient.login}'s &quot; + :profile.l
+                  .photo= link_to image_tag( message.recipient.avatar_photo_url(:thumb), &quot;height&quot;=&gt;&quot;50px&quot;, &quot;alt&quot;=&gt;&quot;#{message.recipient.login}&quot;, &quot;width&quot;=&gt;&quot;50px&quot; ), user_path(message.recipient), :title =&gt; :users_profile.l(:user =&gt; message.recipient.login)
 
                 %td
                   = link_to h(message.subject), user_message_path(@user, message)                  
                   %br
-                  to:
+                  = :to.l + ':'
                   = link_to h(message.recipient.login), user_path(@user)                  
-                %td.meta{:width =&gt; '150px'}= h message.created_at.to_s(:long)
+                %td.meta{:width =&gt; '150px'}= h I18n.l(message.created_at, :format =&gt; :time_ago)
             
             
           %tfoot</diff>
      <filename>app/views/messages/_sent.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -3,7 +3,7 @@
     %h3= :links.l
     %ul.message_nav
       %li{:class =&gt; &quot;inbox#{@user.unread_messages? ? '_new': ''}&quot;}
-        = link_to &quot;Inbox&quot;, user_messages_path(@user)
+        = link_to :inbox.l, user_messages_path(@user)
         = &quot;(#{@user.unread_message_count})&quot; if @user.unread_messages?
       %li.sent= link_to :sent_messages.l, user_messages_path(@user, :mailbox =&gt; :sent)
       %li.compose= link_to :compose.l, new_user_message_path(@user)</diff>
      <filename>app/views/messages/_sidebar_nav.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -9,7 +9,7 @@
 
       %p
         = :from.l + &quot;:&quot;
-        = @message.sender.eql?(@user) ? link_to(&quot;You&quot;, user_path(@user)) : link_to(h(@message.sender.login), user_path(@message.sender))
+        = @message.sender.eql?(@user) ? link_to(:to_you.l, user_path(@user)) : link_to(h(@message.sender.login), user_path(@message.sender))
 
       %p
         = :to.l + &quot;:&quot;
@@ -18,7 +18,7 @@
       
       %p
         = :date_title.l + &quot;:&quot;
-        = @message.created_at.to_s(:long)
+        = h I18n.l(@message.created_at, :format =&gt; :time_ago)
 
       %pre.message_body= auto_link(h(@message.body))
       
@@ -30,4 +30,4 @@
         %form.MainForm#dummy_reply
           %textarea{:onclick =&gt; &quot;$('reply').toggle(); $('message_body').activate(); $('dummy_reply').hide(); $(this).blur(); return false;&quot;, :style =&gt; &quot;height: 75px;&quot;}
       
-        #reply{:style =&gt; &quot;display:none;&quot;}=render :partial =&gt; 'form', :locals =&gt; {:message =&gt; @reply, :user =&gt; @user}
\ No newline at end of file
+        #reply{:style =&gt; &quot;display:none;&quot;}=render :partial =&gt; 'form', :locals =&gt; {:message =&gt; @reply, :user =&gt; @user}</diff>
      <filename>app/views/messages/show.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -11,7 +11,7 @@
         =:manage_pages.l
       %p=:pages_saved_with_draft_status_wont_appear_on_the_site_until_you_publish_them.l
       %p=link_to :new_page.l, new_admin_page_path
-      
+
       %table{:border =&gt; 0, :width =&gt; '100%'}
         %thead
           %tr
@@ -20,9 +20,9 @@
             %th=:status.l
         %tbody
           - @pages.each do |page|
-            %tr            
+            %tr
               %td
                 = link_to page.title, edit_admin_page_path(page)
                 = link_to(&quot;(#{:preview.l})&quot;, preview_admin_page_path(page), :target =&gt; '_blank') unless page.is_live?
-              %td= page.page_public ? 'Yes' : 'No'
+              %td= page.page_public ? :yes_status.l : :no_status.l
               %td= page.is_live? ? link_to(:published.l, pages_path(page)) : :draft.l</diff>
      <filename>app/views/pages/index.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -1,11 +1,8 @@
 .yui-b
   = render :partial =&gt; 'shared/admin_nav'
-
-.yui-b.sidebar
-  -box do 
-    %h3=:links.l
-    %ul.checks
-      %li=link_to :new_page.l, new_admin_page_path
+  -box :class =&gt; 'alt' do
+    %h3=:tips.l
+    %p=:page_tips.l
 
 #yui-main
   .yui-b
@@ -13,7 +10,8 @@
       %h3 
         =:manage_pages.l
       %p=:pages_saved_with_draft_status_wont_appear_on_the_site_until_you_publish_them.l
-      
+      %p=link_to :new_page.l, new_admin_page_path
+
       %table{:border =&gt; 0, :width =&gt; '100%'}
         %thead
           %tr
@@ -22,9 +20,9 @@
             %th=:status.l
         %tbody
           - @pages.each do |page|
-            %tr            
+            %tr
               %td
                 = link_to page.title, edit_admin_page_path(page)
-                = link_to(&quot;(#{:preview.l})&quot;, page_path(page), :target =&gt; '_blank') unless page.is_live?
+                = link_to(&quot;(#{:preview.l})&quot;, preview_admin_page_path(page), :target =&gt; '_blank') unless page.is_live?
               %td= page.page_public ? :yes.l : :no.l
               %td= page.is_live? ? link_to(:published.l, pages_path(page)) : :draft.l</diff>
      <filename>app/views/pages/index.html.haml~</filename>
    </modified>
    <modified>
      <diff>@@ -13,9 +13,9 @@
       %table{:border =&gt; 0, :width =&gt; '100%'}
         %thead
           %tr
-            %th=:title.l        
-            %th=:photos.l        
-            %th=:created_at.l        
+            %th=:title.l
+            %th=:preview.l
+            %th=:created_at.l
             %th=:actions.l
         %tbody
           - @albums.each do |album|</diff>
      <filename>app/views/photo_manager/index.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -25,7 +25,7 @@
       = text_field_tag 'tag_list', @photo.tag_list, {:autocomplete =&gt; &quot;off&quot;, :size =&gt; 35}
       #tag_list_auto_complete.auto_complete{&quot;class&quot;=&gt;&quot;auto_complete&quot;} 
       = auto_complete_field 'tag_list', {:url =&gt; { :controller =&gt; &quot;tags&quot;, :action =&gt; 'auto_complete_for_tag_name'}, :tokens =&gt; [','] }
-      %label= :name.l + &quot;:&quot;
+      %label= :title.l + &quot;:&quot;
       = f.text_field :name, :size =&gt; 35
       %label= :description.l + &quot;:&quot;
       = f.text_area :description, :size =&gt; &quot;58x5&quot;
@@ -34,8 +34,6 @@
 
       %p
         = submit_tag :update.l
-        or
+        = :or.l
         = link_to :cancel_and_go_back_to_my_photos.l, user_photos_path(@user)
 
-
-</diff>
      <filename>app/views/photos/edit.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -1,9 +1,9 @@
 xml.instruct!
 
 xml.gallery do 
-  xml.album :title=&gt;:photos.l, :lgPath=&gt;&quot;&quot;, :tnPath=&gt;&quot;&quot; do 
+  xml.album :title=&gt;:photos.l(:count =&gt; @photos.size), :lgPath=&gt;&quot;&quot;, :tnPath=&gt;&quot;&quot; do 
     @photos.each do |photo|
       xml.img :src=&gt; photo.public_filename(:large), :tn=&gt; photo.public_filename(:thumb), :link =&gt; user_photo_url(@user, photo)
     end
   end
-end
\ No newline at end of file
+end</diff>
      <filename>app/views/photos/index.xml.builder</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,7 @@
 .yui-b
   -box do 
-    %h3 Tips
+    %h3
+      =:tips.l
     %p 
       =:photo_tip_1.l
     %p 
@@ -16,16 +17,20 @@
       =:new_photo.l
 
     = error_messages_for :photo
-    %a.right{&quot;href&quot;=&gt;&quot;#&quot;, &quot;onclick&quot;=&gt;&quot;$('single_upload').toggle(); $('multiple_upload').toggle(); return false&quot;}
-      =:want_to_upload_multiple_files_at_once.l
+    %p
+      %a{&quot;href&quot;=&gt;&quot;#&quot;, &quot;onclick&quot;=&gt;&quot;$('single_upload').toggle(); $('multiple_upload').toggle(); return false&quot;}
+        = :want_to_upload_multiple_files_at_once.l
 
     - form_for(:photo, :url =&gt; user_photos_path(:user_id =&gt; current_user.id, :album_id =&gt; params[:album_id]), :html =&gt; {:multipart =&gt;true, :class =&gt; &quot;MainForm&quot;} ) do |f|
       = f.file_field :uploaded_data
 
       %label
         %em
-          = (AppConfig.photo['attachment_fu_options']['max_size']) 
-          = &quot; &quot; + :megabyte_upload_limit.l
+          = &quot; &quot; + :megabyte_upload_limit.l(:count =&gt; AppConfig.photo['attachment_fu_options']['max_size'])
+      %label 
+        =:title.l + &quot;:&quot;
+      = f.text_field :name, :size =&gt; 35
+
       %label 
         = :tags.l
         %em=&quot;(#{:optional_keywords_describing_this_photo_separated_by_commas.l})&quot;
@@ -34,10 +39,6 @@
       #tag_list_auto_complete.auto_complete
       = auto_complete_field 'tag_list', {:url =&gt; { :controller =&gt; &quot;tags&quot;, :action =&gt; 'auto_complete_for_tag_name'}, :tokens =&gt; [','] }
 
-      %label 
-        =:name.l + &quot;:&quot;
-      = f.text_field :name, :size =&gt; 35
-
       %label
         =:description.l + &quot;:&quot;
       = f.text_area :description, :size =&gt; &quot;58x5&quot;
@@ -56,8 +57,9 @@
     %h3 
       =:new_photos_multiple_uploader.l
 
-    %a.right{&quot;href&quot;=&gt;&quot;#&quot;, &quot;onclick&quot;=&gt;&quot;$('single_upload').toggle(); $('multiple_upload').toggle(); return false&quot;}
-      =:just_uploading_one_photo.l
+    %p
+      %a{&quot;href&quot;=&gt;&quot;#&quot;, &quot;onclick&quot;=&gt;&quot;$('single_upload').toggle(); $('multiple_upload').toggle(); return false&quot;}
+        =:just_uploading_one_photo.l
     
     %p.centered
       
@@ -73,7 +75,7 @@
           session_key =&gt; cookies[session_key], request_forgery_protection_token =&gt; form_authenticity_token)}');&quot;        |
         };
         
-      %div{:style=&gt;&quot;margin: 0px 10px;&quot;}
+      %div
         %div
           %form.MainForm
             %div{:style=&gt;&quot;display: inline; border: solid 1px #7FAAFF; background: #C5D9FF; padding: 10px 0 0 0;&quot;}
@@ -82,8 +84,7 @@
               %em
                 =:you_can_select_up_to_5_files_at_a_time.l
                 %br
-                = (AppConfig.photo['attachment_fu_options']['max_size'])
-                = :megabyte_upload_limit_per_file.l
+                = :megabyte_upload_limit_per_file.l(:count =&gt; AppConfig.photo['attachment_fu_options']['max_size'])
         #divFileProgressContainer{:style=&gt;&quot;height: 75px;&quot;}
         #thumbnails
       %p
@@ -93,3 +94,4 @@
           = link_to :back_to_my_photos.l, user_photos_path(current_user)
         = :or.l
         = link_to :back_to_photo_manager.l, user_photo_manager_index_path(current_user)
+</diff>
      <filename>app/views/photos/new.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -7,8 +7,8 @@
       %tr
         %th{:colspan =&gt; 2}
           .right
-          =:total_votes.l
-          = poll.votes.size
+            =:total_votes.l
+            = poll.votes.size
           = poll.question
     -poll.choices.each do |choice|
       %tr</diff>
      <filename>app/views/polls/_poll_ui.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -5,16 +5,16 @@
       = link_to image_tag( user.avatar_photo_url(:thumb), &quot;height&quot;=&gt;&quot;50&quot;, &quot;alt&quot;=&gt;&quot;#{user.login}&quot;, &quot;width&quot;=&gt;&quot;50&quot; ), user_path(user), :title =&gt; &quot;#{user.login}'s&quot;+ :profile.l
     %dd.fn
       = link_to user.login, user_path(user), :class =&gt; 'url'
-      = &quot; &lt;small&gt;(&quot; + :featured_writer.l + &quot;)&lt;/small&gt;&quot; if user.featured_writer?        
+      = &quot; &lt;small&gt;(&quot; + :featured_writer.l + &quot;)&lt;/small&gt;&quot; if user.featured_writer?
     %dd
     - if user.description
       = truncate_words( user.description, 12, '...')
     %dd.member
-      =user.created_at.strftime(:member_since.l + &quot;: %m/%d/%y&quot;)
+      =:member_since.l+&quot; #{I18n.l(user.created_at, :format =&gt; :short_published_date)}&quot;
     %dd.post
       - if user.posts.count == 1
-        = link_to :singular_posts.l(:count =&gt; user.posts.count), user_posts_path(user)    
+        = link_to :singular_posts.l(:count =&gt; user.posts.count), user_posts_path(user)
       - else
-        = link_to :plural_posts.l(:count =&gt; user.posts.count), user_posts_path(user)         
+        = link_to :plural_posts.l(:count =&gt; user.posts.count), user_posts_path(user)
     %dd.rss
-      =link_to :rss_feed.l, user_posts_path(user, :format =&gt; :rss)    
+      =link_to :rss_feed.l, user_posts_path(user, :format =&gt; :rss)</diff>
      <filename>app/views/posts/_author_profile.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -11,7 +11,7 @@
       %li.fn=link_to post.user.login, user_path(post.user)
       %li.update
         %a{:href=&gt;&quot;#{user_post_path(post.user, post)}&quot;, :rel=&gt;&quot;bookmark&quot;}
-          %abbr.published{:title=&gt;&quot;#{post.published_at}&quot;}= post.published_at_display(&quot;%B %d, %Y&quot;)
+          %abbr.published{:title=&gt;&quot;#{post.published_at}&quot;}= post.published_at_display(:short_literal_date)
       %li.view
         = :views.l
         = &quot;(#{post.view_count})&quot;
@@ -26,4 +26,4 @@
     = render :partial =&gt; 'polls/excerpt', :locals =&gt; {:poll =&gt; post.poll} if post.poll
     
     %h6=link_to :read_more.l, user_post_path(post.user, post), :rel=&gt; 'bookmark'
-  
\ No newline at end of file
+  </diff>
      <filename>app/views/posts/_post.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -36,7 +36,7 @@
         = f.select(:published_as, [[:published.l, 'live'], [:draft.l, 'draft']])
         %p
           = submit_tag :update.l
-          or
+          = :or.l
           =link_to :cancel.l, user_post_path(current_user, @post)
         %p
           =link_to &quot;#{image_tag 'icons/delete.png', :plugin =&gt; :community_engine} &quot;+:delete_this_post.l, user_post_path(current_user, @post), :method =&gt; :delete, :confirm =&gt; :are_you_sure_you_want_to_delete_this_post.l</diff>
      <filename>app/views/posts/edit.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -30,7 +30,7 @@
           - @posts.each do |post|
             %tr            
               %td
-                %abbr{:title=&gt;&quot;#{post.created_at}&quot;}= post.created_at.strftime(&quot;%Y/%m/%d&quot;)
+                %abbr{:title=&gt;&quot;#{post.created_at}&quot;}= I18n.l(post.created_at, :format =&gt; :published_date)
               %td
                 %abbr{:title=&gt;&quot;#{post.published_at}&quot;}= post.published_at_display
               %td
@@ -39,4 +39,4 @@
               %td= post.category ? post.category.name : :uncategorized.l
               %td= post.tags.any? ? post.tag_list : :no_tags.l
               %td= post.comments.count
-              %td= post.is_live? ? link_to(:published.l, user_post_path(post.user, post)) : :draft.l
\ No newline at end of file
+              %td= post.is_live? ? link_to(:published.l, user_post_path(post.user, post)) : :draft.l</diff>
      <filename>app/views/posts/manage.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -31,5 +31,5 @@
       %h3 
         =:what_is_popular.l
         %ul.subnav
-          %li= :looking_for_most_x.l :link =&gt; link_to(&quot;#{:recent.l}?&quot;, recent_path)
-      = render :partial =&gt; 'posts/post', :collection =&gt; @posts
\ No newline at end of file
+          %li= :looking_for_most_x.l :link =&gt; link_to(&quot;#{:most_recent.l}?&quot;, recent_path)
+      = render :partial =&gt; 'posts/post', :collection =&gt; @posts</diff>
      <filename>app/views/posts/popular.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -22,8 +22,8 @@
       %h3
         =:recent_posts.l
         %ul.subnav
-          %li= :looking_for_most_x.l :link =&gt; link_to(&quot;#{:popular.l}?&quot;, popular_path)
+          %li= :looking_for_most_x.l :link =&gt; link_to(&quot;#{:most_popular.l}?&quot;, popular_path)
 
       = render :partial =&gt; 'posts/post', :collection =&gt; @posts      
       
-      .pagination=paginating_links @posts
\ No newline at end of file
+      .pagination=paginating_links @posts</diff>
      <filename>app/views/posts/recent.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -15,7 +15,7 @@
           %ul
             %li.update
               %a{&quot;href&quot;=&gt;&quot;#{user_post_path(@user, @post)}&quot;, &quot;rel&quot;=&gt;&quot;bookmark&quot;}
-                %abbr.published{&quot;title&quot;=&gt;&quot;#{@post.published_at}&quot;}= @post.published_at_display(&quot;%B %d, %Y&quot;)
+                %abbr.published{&quot;title&quot;=&gt;&quot;#{@post.published_at}&quot;}= @post.published_at_display(:literal_date)
             %li.view= :views.l+&quot; (#{@post.view_count})&quot;
             %li.comments= link_to :comments.l+&quot; (#{@post.comments.size})&quot;, user_post_path(@user, @post)+'#comments'      
             - if current_user and current_user.can_request_friendship_with(@post.user)</diff>
      <filename>app/views/posts/show.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -14,7 +14,7 @@
               :class =&gt; &quot;utility&quot;, :method =&gt; :delete, :confirm =&gt; :are_you_sure_you_want_to_delete_this_post.l) %&gt;  
 
         &lt;%= ajax_spinner_for &quot;editbox&quot;, &quot;spinner_black.gif&quot; %&gt;
-        &lt;%= submit_tag :save_changes.l, :or =&gt; link_to_function(:cancel.l, &quot;EditForm.cancel()&quot;) %&gt;
+        &lt;%= submit_tag :save_changes.l %&gt; &lt;%= :or.l %&gt;  &lt;%= link_to_function(:cancel.l, &quot;EditForm.cancel()&quot;) %&gt;
 
       &lt;/td&gt;
     &lt;/tr&gt;
@@ -27,4 +27,4 @@
   &lt;% end -%&gt;
 &lt;/div&gt;
 &lt;/div&gt;
-&lt;%= tiny_mce if using_tiny_mce? %&gt;
\ No newline at end of file
+&lt;%= tiny_mce if using_tiny_mce? %&gt;</diff>
      <filename>app/views/sb_posts/_edit.html.erb</filename>
    </modified>
    <modified>
      <diff>@@ -9,5 +9,5 @@
 &lt;% form_for :post, :html =&gt; { :method =&gt; :put }, 
      :url  =&gt; sb_post_path(:forum_id =&gt; params[:forum_id], :id =&gt; params[:topic_id], :id =&gt; @post, :page =&gt; params[:page]) do |f| -%&gt;
 &lt;%= f.text_area :body %&gt;
-&lt;%= submit_tag :save.l %&gt; or &lt;%= link_to :cancel.l, forum_topic_path(:forum_id =&gt; params[:forum_id], :id =&gt; params[:topic_id], :page =&gt; params[:page]) %&gt;
-&lt;% end -%&gt;
\ No newline at end of file
+&lt;%= submit_tag :save.l %&gt; &lt;%= :or.l %&gt; &lt;%= link_to :cancel.l, forum_topic_path(:forum_id =&gt; params[:forum_id], :id =&gt; params[:topic_id], :page =&gt; params[:page]) %&gt;
+&lt;% end -%&gt;</diff>
      <filename>app/views/sb_posts/edit.html.erb</filename>
    </modified>
    <modified>
      <diff>@@ -18,7 +18,7 @@
 
   %p.subtitle
     = feed_icon_tag @page_title, all_sb_posts_path(:format =&gt; 'rss')
-    = pluralize(@posts.size, &quot;post&quot;)+' '+:found.l
+    = :post_found.l(:count =&gt; @posts.size)
 
   - if @posts.page_count &gt; 1
     .pagination= paginating_links @posts
@@ -33,17 +33,13 @@
         %td.author.vcard
           .date
             %abbr.updated{ :title =&gt; post.created_at.xmlschema }
-              - if post.created_at &gt; Time.now.utc-24.hours
-                = time_ago_in_words(post.created_at).sub(/about /, '')
-                ago
-              - else
-                = post.created_at.strftime(&quot;%b %e, %Y&quot;)
+              = time_ago_in_words(post.created_at)
 
           = avatar_for @users[post.user_id]
           %span.fn
             = link_to truncate(h(@users[post.user_id].display_name), :length =&gt; 15), user_path(post.user)
           %span.posts
-            = pluralize @users[post.user_id].sb_posts_count, 'post'
+            = pluralize @users[post.user_id].sb_posts_count, :post.l
         %td.body.entry-content
           %p.topic
             = link_to(h(post.forum_name), forum_path(post.forum))</diff>
      <filename>app/views/sb_posts/index.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -10,7 +10,7 @@
 &lt;h1&gt;&lt;%= @page_title %&gt;&lt;/h1&gt;
 &lt;p class=&quot;subtitle&quot;&gt;
   &lt;%= feed_icon_tag @page_title, monitored_all_sb_posts_path(:user_id =&gt; @user, :format =&gt; 'rss') %&gt;
-  &lt;%= pluralize(@posts.size,&quot;post&quot;) %&gt; &lt;%= :found.l %&gt;
+  &lt;%= :post_found.l(:count =&gt; @posts.size) %&gt;
 &lt;/p&gt;
 
 &lt;% if @posts.page_count &gt; 1 -%&gt;</diff>
      <filename>app/views/sb_posts/monitored.html.erb</filename>
    </modified>
    <modified>
      <diff>@@ -5,7 +5,7 @@
     = render :partial =&gt; 'shared/user_menu'
     - if current_user.unread_messages?
       %h2#newmail
-        = link_to pluralize(current_user.unread_message_count, 'unread message'), user_messages_path(current_user)
+        = link_to :unread_messages.l(:count =&gt; current_user.unread_message_count), user_messages_path(current_user)
   - else
     %h2
       =:welcome_message.l(:login_link =&gt; (link_to :log_in.l, login_path), :signup_link =&gt; (link_to :sign_up.l, signup_path))</diff>
      <filename>app/views/shared/_header.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -12,11 +12,11 @@
 
   %hr
   %ul
-    %li= link_to :view_profile.l, user_path(current_user)                    
-    %li=link_to :blog.l, user_posts_path(current_user)
+    %li= link_to :my_profile.l, user_path(current_user)                    
+    %li=link_to :my_blog.l, user_posts_path(current_user)
     %li=link_to :photo_manager.l, user_photo_manager_index_path(current_user)
-    %li=link_to :clippings.l, user_clippings_path(current_user)
-    %li=link_to :friends.l, accepted_user_friendships_path(current_user)        
+    %li=link_to :my_clippings.l, user_clippings_path(current_user)
+    %li=link_to :my_friends.l, accepted_user_friendships_path(current_user)        
   %hr
   =link_to :log_out.l, logout_path
 
@@ -28,4 +28,4 @@
       hideAfter: 1.5,  
       className: 'silver',
       offset: {y:2, x:12}
-      });
\ No newline at end of file
+      });</diff>
      <filename>app/views/shared/_user_menu.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -15,7 +15,7 @@
 #yui-main
   .yui-b
     -box :class =&gt; &quot;user_list&quot; do 
-      %h3= &quot;#{AppConfig.community_name} &quot;+:pros.l
+      %h3= &quot;#{AppConfig.community_name} &amp;raquo; &quot;+:pros.l
 
       .pagination= paginating_links @users if @users.page_count &gt; 1
 </diff>
      <filename>app/views/skills/index.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -2,10 +2,13 @@
   .yui-u
     -box :class =&gt; &quot;alt first_alt&quot; do 
       %h3
-        = params[:type] ? h((params[:type]+'s').l) : :items.l
-        =:tagged.l+&quot;:&quot;
+        - if params[:type]
+          = (params[:type].downcase.pluralize + '_tagged').l
+        - else
+          = :items_tagged.l
         - @tags.each do |tag|
           = link_to h(tag.name), tag_path(tag)
+       
         
     -box do 
       %h3.tags=:related_tags.l
@@ -35,7 +38,7 @@
 
     - if @photos.any?
       %br.clear
-      %h3=:photos.l
+      %h3=:photos.l(:count =&gt; @photos.size)
       - @photos.each do |photo|
         = link_to image_tag(photo.public_filename(:thumb), :title =&gt; &quot;#{photo.description} (&quot;+:uploaded_by.l+&quot; #{photo.user.login})&quot;, :class =&gt; &quot;polaroid&quot;), user_photo_path(photo.user, photo)
       %h6.all= link_to :all_photos_tagged.l(:tag_name =&gt; @tags_raw), show_tag_type_path(:id =&gt; @tags_raw, :type =&gt; 'Photo') unless params[:type]</diff>
      <filename>app/views/tags/show.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -4,4 +4,7 @@
 = error_messages_for :topic
 - form_for :topic,:url  =&gt; forum_topic_path(@forum, @topic), :html =&gt; { :method =&gt; :put, :class =&gt; &quot;MainForm&quot; } do |f|
   = render :partial =&gt; &quot;form&quot;, :object =&gt; f 
-  %p= submit_tag :save_changes.l, :or =&gt; link_to(:cancel.l, forum_topic_path(@forum, @topic))
\ No newline at end of file
+  %p
+    = submit_tag :save_changes.l
+    = :or.l
+    = link_to(:cancel.l, forum_topic_path(@forum, @topic))</diff>
      <filename>app/views/topics/edit.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -14,6 +14,9 @@
   = error_messages_for :topic
   - form_for :topic, :url  =&gt; forum_topics_path(@forum), :html =&gt; {:class =&gt; &quot;MainForm&quot;} do |f|
     = render :partial =&gt; &quot;form&quot;, :object =&gt; f
-    %p= submit_tag :post_topic.l, :or =&gt; link_to(:cancel.l, forum_path(@forum))
+    %p
+      = submit_tag :post_topic.l
+      = :or.l
+      = link_to(:cancel.l, forum_path(@forum))
 
   = javascript_tag &quot;$('topic_title').focus();&quot;</diff>
      <filename>app/views/topics/new.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -18,9 +18,7 @@
       #monitor_topic
         %input#monitor_checkbox{:type=&gt;&quot;checkbox&quot;, :checked=&gt; @monitoring, :onclick=&gt;&quot;monitor_click(this);&quot;}
         %label#monitor_label{&quot;for&quot;=&gt;&quot;monitor_checkbox&quot;}
-          
-          = :watch.l+&quot;#{@monitoring ? :watch_ing.l : ''}&quot;
-          = :topic.l
+          = @monitoring ? :watching_topic.l : :watch_topic.l
         = hidden_field_tag '_method', 'delete' if @monitoring
         = submit_tag :Set, :id =&gt; 'monitor_submit', :style =&gt; &quot;display:none&quot;
         
@@ -49,11 +47,11 @@
 
   %p.subtitle
     = feed_icon_tag @topic.title, forum_topic_path(@forum, @topic, :format =&gt; :rss)
-    = &quot;#{pluralize @topic.sb_posts.count, :post.l}, #{pluralize @topic.voices, :voice.l},&quot;
-    = &quot;Tagged: #{@topic.tags.collect{|t| link_to( h(t.name), tag_url(t), :class =&gt; 'tag') }.join(&quot; &quot;)}&quot; unless @topic.tags.empty?
+    = &quot;#{pluralize @topic.sb_posts.count, :post.l}, #{pluralize @topic.voices, :voice.l}&quot;
+    = &quot;, #{:tags.l} : #{@topic.tags.collect{|t| link_to( h(t.name), tag_url(t), :class =&gt; 'tag') }.join(&quot; &quot;)}&quot; unless @topic.tags.empty?
   
   %ul.flat.talking
-    %li.label= :voices.l+&quot;:&quot;
+    %li.label= :voices.l + &quot;:&quot;
     - @voices.each do |user|
       %li= link_to h(user.display_name), user_path(user)
 </diff>
      <filename>app/views/topics/show.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -3,38 +3,38 @@
     %h3=:dashboard.l
     .yui-g
       .yui-u.first
-        = image_tag 'icons/accept.png', :plugin =&gt; 'community_engine'            
-        =:view_my.l
+        = image_tag 'icons/accept.png', :plugin =&gt; 'community_engine'
+        =:view.l
         %ul
-          %li=link_to :profile.l, user_path(@user)  
-          %li=link_to :blog.l, user_posts_path(@user)
+          %li=link_to :my_profile.l, user_path(@user)  
+          %li=link_to :my_blog.l, user_posts_path(@user)
           %li=link_to :photo_manager.l, user_photo_manager_index_path(@user)
-          %li=link_to :clippings.l, user_clippings_path(@user)
-          %li=link_to :friends.l, accepted_user_friendships_path(@user)
+          %li=link_to :my_clippings.l, user_clippings_path(@user)
+          %li=link_to :my_friends.l, accepted_user_friendships_path(@user)
           %li=link_to :inbox.l, user_messages_path(@user)
       .yui-u
-        = image_tag 'icons/wrench.png', :plugin =&gt; 'community_engine'      
-        =:manage_my.l
+        = image_tag 'icons/wrench.png', :plugin =&gt; 'community_engine'
+        =:manage.l
         %ul
-          %li=link_to :profile.l, edit_user_path(@user)
-          %li=link_to :account_settings.l, edit_account_user_path(@user)
-          %li=link_to :blog_posts.l, manage_user_posts_path(@user)     
+          %li=link_to :my_profile.l, edit_user_path(@user)
+          %li=link_to :my_account.l, edit_account_user_path(@user)
+          %li=link_to :my_blog_posts.l, manage_user_posts_path(@user)
           -if current_user.admin?
             %li=link_to :admin_dashboard.l, admin_dashboard_path
-               
-  
   -box :class =&gt; &quot;alt&quot; do 
     %h3=:stats.l
     %ul
-      %li=:you_last_logged_in_on.l+&quot; #{@user.last_login_at &amp;&amp; @user.last_login_at.strftime(&quot;%m/%d/%y&quot;)}&quot;
-      %li= @user.created_at.strftime(:member_since.l+&quot;: %m/%d/%y&quot;)
+      - if @user.last_login_at
+        %li=:you_last_logged_in_on.l+&quot; #{I18n.l(@user.last_login_at, :format =&gt; :published_date)}&quot;
+      %li=:member_since.l+&quot; #{I18n.l(@user.created_at, :format =&gt; :published_date)}&quot;
       -unless @user.posts.empty?
-        %li=:you_have_written.l+&quot; #{@user.posts.count} &quot;+:blog_posts.l+&quot;.&quot;
+        %li=:you_have_written_blog_posts.l(:count =&gt; @user.posts.count)
       -unless @user.photos.empty?
-        %li=:you_have_uploaded.l+&quot; #{@user.photos.count} &quot;+:photos.l+&quot;.&quot;
+        %li=:you_have_uploaded_photos.l(:count =&gt; @user.photos.count)
       -unless @user.clippings.empty?
-        %li=:you_have_created.l+&quot; #{@user.clippings.count} &quot;+:clippings.l+&quot;.&quot;
+        %li=:you_have_added_clippings.l(:count =&gt; @user.clippings.count)
       -unless @user.comments.empty?
-        %li=:you_have_left.l+&quot; #{@user.posts.count} &quot;+:comments.l+&quot;.&quot;
+        %li=:you_have_left_comments.l(:count =&gt; @user.posts.count)
       -unless @user.accepted_friendships.empty?
-        %li=:you_have.l+&quot; #{pluralize @user.accepted_friendships.count, :friend.l}.&quot;
+        %li=:you_have_friends.l(:count =&gt; @user.accepted_friendships.count)
+</diff>
      <filename>app/views/users/_dashboard_nav.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -36,7 +36,7 @@
       %li.update
         %a{:href=&gt;&quot;#{user_path(@user)}&quot;, :rel=&gt;&quot;bookmark&quot;}
           %abbr.published{:title=&gt;&quot;#{@user.created_at}&quot;}
-            = :member_since.l + @user.created_at.strftime(&quot;: %m/%d/%y&quot;)          
+            =:member_since.l+&quot; #{I18n.l(@user.created_at, :format =&gt; :short_published_date)}&quot;
       %li.view
         =:profile_views.l
         = &quot;(#{@user.view_count})&quot;</diff>
      <filename>app/views/users/_profile_user_info_sidebar.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -28,7 +28,7 @@
       
       %p
         = submit_tag :update.l
-        or
+        = :or.l
         = link_to :cancel_and_go_back_to_my_photos.l, user_photos_path(@user)
 
 
@@ -48,4 +48,4 @@
     function loadExample() {
       new Cropper.ImgWithPreview( 'photo', { previewWrap: 'previewWrap', minWidth: 290, minHeight: 320, ratioDim: { x: 290, y: 320 }, onEndCrop: onEndCrop } );      
     }
-    Event.observe( window, 'load', function() { loadExample(); } );      
\ No newline at end of file
+    Event.observe( window, 'load', function() { loadExample(); } );      </diff>
      <filename>app/views/users/crop_profile_photo.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -16,12 +16,12 @@
       -if @network_activity.empty? &amp;&amp; @recommended_posts.empty?
         %p
           =:this_is_your_dashboard.l
-          %br
-          =:dashboard_friends.l :site =&gt; AppConfig.community_name
-          
         %p
+          =:dashboard_friends.l :site =&gt; AppConfig.community_name
+          %br
           =:to_start_adding_friends.l
           =link_to :browse_all_members.l, users_path
+          \.
         %p
           =link_to :update_profile_and_tag_yourself.l, edit_user_path(current_user)
           =:to_get_recommended_content_on_your_dashboard.l
@@ -39,4 +39,4 @@
           %ul
             -@recommended_posts.each do |post|
               %li
-                = link_to( &quot;#{post.tag_for_first_image_in_body} #{truncate(post.display_title, :length =&gt; 75)} &lt;span class='post_excerpt'&gt;#{ truncate_words(post.post, 35, '...' )} (:by.l #{post.user.login})&lt;/span&gt;&quot;, user_post_path(post.user, post), :title =&gt; &quot;:by.l #{post.user.login}&quot; )
\ No newline at end of file
+                = link_to( &quot;#{post.tag_for_first_image_in_body} #{truncate(post.display_title, :length =&gt; 75)} &lt;span class='post_excerpt'&gt;#{ truncate_words(post.post, 35, '...' )} (:by.l #{post.user.login})&lt;/span&gt;&quot;, user_post_path(post.user, post), :title =&gt; &quot;:by.l #{post.user.login}&quot; )</diff>
      <filename>app/views/users/dashboard.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -13,7 +13,7 @@
       = image_tag( @user.avatar_photo_url(:medium), :class =&gt; &quot;polaroid&quot; )
       %label
         =:choose_a_photo_for_your_profile.l
-      = file_field :avatar, :uploaded_data, :size =&gt; &quot;20&quot;
+      = file_field :avatar, :uploaded_data, :size =&gt; &quot;20&quot;, :value =&gt; &quot;parcourir&quot;
       
       %h3= :location.l
       = render :partial =&gt; 'shared/location_chooser', :locals =&gt; {:selected_country =&gt; @user.country_id, :selected_state =&gt; @user.state_id, :selected_metro_area =&gt; @user.metro_area_id, :states =&gt; @states, :metro_areas =&gt; @metro_areas}</diff>
      <filename>app/views/users/edit.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -6,9 +6,7 @@
   -box :class =&gt; &quot;alt first_alt&quot; do 
     %h3=:spread_the_word.l
     %p
-      =:the_more_people_you_invite_the_better.l
-      = AppConfig.community_name
-      =:becomes.l
+      =:invite_message.l(:site =&gt; AppConfig.community_name)
     %p
       =:people_who_sign_up_using_your_invitation_will_automatically_be_added_as_your_friends.l
 </diff>
      <filename>app/views/users/invite.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -24,19 +24,21 @@
       - form_for :user, :url =&gt; users_path, :html =&gt; {:class =&gt; 'MainForm'} do |f|
         %label{&quot;for&quot;=&gt;&quot;user_login&quot;} 
           =:username.l
+          \:
           %em=:required_your_username_must_not_contain_numerals_spaces_or_special_characters.l
         = f.text_field :login
 
         %label{&quot;for&quot;=&gt;&quot;user_email&quot;}
           =:e_mail_address.l
+          \:
           %em=:required_we_will_send_a_confirmation_e_mail_to_the_address_you_enter.l
         = f.text_field :email
 
         %label{&quot;for&quot;=&gt;&quot;user_birthdate&quot;}
           =:birthday.l
           \:
-          %em=:required_you_must_be_at_least_years_old_to_sign_up.l
-        = date_select :user, :birthday, {:start_year =&gt; 1926, :end_year =&gt; (Time.now.year - 13)}
+          %em=:required_you_must_be_at_least_years_old_to_sign_up.l_with_args(:min_age =&gt; AppConfig.min_age)
+        = date_select :user, :birthday, {:start_year =&gt; (Time.now.year - AppConfig.max_age), :end_year =&gt; (Time.now.year - AppConfig.min_age)}
 
         -if AppConfig.require_captcha_on_signup
           .right{:style =&gt; 'margin-top:2em;'}= recaptcha_tags
@@ -49,4 +51,4 @@
         = f.password_field :password_confirmation
         = hidden_field_tag :inviter_id, params[:inviter_id]
         = hidden_field_tag :inviter_code, params[:inviter_code]
-        %p= submit_tag :sign_up.l
\ No newline at end of file
+        %p= submit_tag :sign_up.l</diff>
      <filename>app/views/users/new.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -26,11 +26,9 @@
     %h3
       =:my_friends.l
       = link_to &quot;(#{@friend_count})&quot;, accepted_user_friendships_path(@user) if @friend_count &gt; 5
-    = link_to &quot;&amp;raquo; #{:invite_a_friend.l :site =&gt; AppConfig.community_name}&quot;, invite_user_path(@user) if @is_current_user
-    %br
-    = link_to &quot;&amp;raquo; #{:view_all_my_friend_requests.l} (#{@pending_friendships_count})&quot;, pending_user_friendships_path(@user) if @is_current_user
-    %br
-    %br
+    %p
+      = link_to &quot;&amp;raquo; #{:invite_a_friend.l :site =&gt; AppConfig.community_name}&quot;, invite_user_path(@user) if @is_current_user
+      %br= link_to &quot;&amp;raquo; #{:view_all_my_friend_requests.l} (#{@pending_friendships_count})&quot;, pending_user_friendships_path(@user) if @is_current_user
     - @accepted_friendships.each do |user|
       =render :partial =&gt; &quot;users/sidebar_user&quot;, :locals =&gt; {:user =&gt; user}
     -if @accepted_friendships.size &gt; 4
@@ -50,7 +48,7 @@
               %strong= :to.l + &quot;: #{link_to comment.recipient.login, commentable_url(comment)}&quot;
             - else
               %br
-              %strong= :on_commentable.l + &quot;: #{link_to comment.commentable_name, commentable_url(comment)} (#{comment.commentable_type})&quot;
+              %strong= :on_commentable.l + &quot;: #{link_to comment.commentable_name, commentable_url(comment)} (#{comment.commentable_type.l})&quot;
           %dd
             %p= &quot;\&quot;#{truncate_words( comment.comment, 10, '...')}\&quot;&quot;
 
@@ -76,7 +74,7 @@
 
     - unless @photos.empty?
       -box :id =&gt; &quot;photos&quot; do
-        %h3=:photos.l
+        %h3=:my_photos.l
         - @photos.each do |photo|
           = link_to image_tag( photo.public_filename(:thumb), :class =&gt; &quot;polaroid&quot;), user_photo_path(@user, photo)
 
@@ -91,7 +89,7 @@
 
     - unless @clippings.empty?
       -box :id =&gt; &quot;clippings&quot; do
-        %h3=:clippings.l
+        %h3=:my_clippings.l
         - @clippings.each do |clipping|
           %a{&quot;href&quot;=&gt;&quot;#{h user_clipping_url(@user, clipping)}&quot;}
             %img.clipping.polaroid{&quot;src&quot;=&gt;&quot;#{h clipping.image_uri(:thumb)}&quot;, :width =&gt; '100', :height =&gt; '100'}</diff>
      <filename>app/views/users/show.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -1,7 +1,7 @@
 .yui-b
   -box :class =&gt; &quot;alt first_alt&quot; do 
     %h3
-      =:get_started_tell_us_about_yourself.l
+      =:get_started.l + ' ' + :tell_us_about_yourself.l
     = render :partial =&gt; 'shared/bio_help'
     %p
       =:remember_you_can_always_change_this_later.l</diff>
      <filename>app/views/users/welcome_about.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,6 @@
 -box do
   %h3
-    =:get_started_invite_some_friends.l
+    =:get_started.l + ' ' + :invite_some_friends.l
     = :invite_some_customers.l if @user.vendor?
   %p
     =:invite_message.l(:site=&gt; AppConfig.community_name)
@@ -19,4 +19,4 @@
     %p
       = submit_tag :send_invitations.l
       %br/
-      = link_to &quot;&amp;raquo; &quot;+ :skip_this_and_go_to_your_profile.l, user_path(@user)
\ No newline at end of file
+      = link_to &quot;&amp;raquo; &quot;+ :skip_this_and_go_to_your_profile.l, user_path(@user)</diff>
      <filename>app/views/users/welcome_invite.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,6 @@
 .yui-b
   -box :class =&gt; &quot;alt first_alt&quot; do 
-    %h3=:get_started_upload_a_profile_photo.l
+    %h3=:get_started.l + ' ' + :upload_a_profile_photo.l
     %p
       =:photo_message.l :site =&gt; AppConfig.community_name
     = link_to &quot;&amp;raquo; &quot; + :skip_this_step.l, welcome_about_user_path(@user)</diff>
      <filename>app/views/users/welcome_photo.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -26,12 +26,16 @@ robots_meta_list_content: 'noindex,follow'
 # when links are included and they point to external sites, the robot should not follow
 robots_meta_show_content: 'index,nofollow'
 
+# min and max age for users to use the site
+min_age: 16
+max_age: 90
+
 photo:
   missing_thumb: '/plugin_assets/community_engine/images/icon_missing_thumb.gif'
   missing_medium: &quot;/plugin_assets/community_engine/images/icon_missing_medium.gif&quot;
   attachment_fu_options:
     resize_to: &quot;465&gt;&quot;
-    min_size: 1    
+    min_size: 1
     #size in megabytes
     max_size: 3
     thumbnails: {thumb: &quot;c100x100!&quot;, medium: &quot;c290x320!&quot;, large: &quot;664&gt;&quot;}
@@ -44,7 +48,7 @@ feature:
   dimensions: [150, 635]
   attachment_fu_options:
     resize_to: &quot;465&gt;&quot;
-    min_size: 1    
+    min_size: 1
     max_size: 1
     thumbnails: {thumb: 'c45x45!', large: 'c635x150!'}    
     storage: 'file_system'</diff>
      <filename>config/application.yml</filename>
    </modified>
    <modified>
      <diff>@@ -6,11 +6,10 @@
 #en: admin_pages: Pages
 #en: accept: Accept
 #en: accepted: accepted
-#en: accepted_friendships: Accepted Friendships
+#en: accepted_friendships: {{count}} Accepted Friendships
 #en: accept_this_request: Accept this request
 #en: account: account
 #en: account_activation_error: Account activation failed. Your account may already be active. Try logging in or e-mail {{email}} for help.
-#en: account_settings: Account settings
 #en: actions: Actions
 #en: activate: Activate
 #en: activation_email_not_sent_message: Activation e-mail could not be sent. Perhaps that user is already active?
@@ -71,7 +70,6 @@
 #en: birthday: Birthday
 #en: birthday_gender: Birthday &amp; Gender
 #en: blog: Blog
-#en: blog_posts: Blog posts
 #en: body_text: Body Text
 #en: body_text_reqiured: Body Text (required)
 #en: bookmarklet: bookmarklet
@@ -92,6 +90,7 @@
 #en: categories: Categories
 #en: category: Category
 #en: category_was_successfully_created: Category was successfully created.
+#en: check_out_this_story_on: Check out this story on {{site}}
 #en: choices: Choices
 #en: choose_a_photo_for_your_profile: &quot;Choose a photo for your profile:&quot;
 #en: choose_a_photo_to_upload: &quot;Choose a photo to upload:&quot;
@@ -107,10 +106,12 @@
 #en: click_the_activation_link_in_the_e_mail_to_log_in: Click the activation link in the e-mail to log in.
 #en: click_to_accept_it: Click to accept it!
 #en: clipping_comments: Clipping Comments
+#en: clipping_from_user: Clipping from {{user}}
 #en: clipping_was_successfully_created: Clipping was successfully created.
 #en: clippings: Clippings
 #en: clippings_are_a_way_to_save_images_you_like_from_around_the_web: Clippings are a way to save images you like from around the Web
 #en: clippings_let_you_to_save_cool_images_from_around_the_web: Clippings let you to save cool images from around the Web.
+#en: clippings_tagged: Clippings tagged
 #en: close_this_message: Close this message
 #en: comma_separated: (comma separated)
 #en: comma_separated_keywords_that_describe_you: Comma-separated keywords that describe you.
@@ -141,11 +142,14 @@
 #en: dashboard: Dashboard
 #en: dashboard_friends: Once you start adding friends, you'll be able to track their activity on {{site}} here
 #en: date:formats:published_date: &quot;%Y/%m/%d&quot;
+#en: date:formats:short_published_date: &quot;%y/%m/%d&quot;
+#en: date:formats:literal_date: &quot;%B %d, %Y&quot;
+#en: date:formats:short_literal_date: &quot;%b %d, %Y&quot;
 #en: date:formats:date_ago: &quot;%B %d&quot;
 #en: date: Date
 #en: date_created: Date Created
 #en: date_published: Date Published
-#en: days_ago: days ago
+#en: days_ago: {{count}} days ago
 #en: deactivate_link: Click here to deactivate your account
 #en: deactivate_tip: Deactivating your account will remove your profile from the site. 
 #en: deactivate_confirmation: Are you sure you want to deactivate your account?
@@ -216,6 +220,7 @@
 #en: event_was_successfully_created: Event was successfully created.
 #en: events: Events
 #en: every_person_has_something_to_say: &quot;Every single person has something to say, something to give, something that will help someone else.  Join in!&quot;
+#en: expert_in: expert in
 #en: explore_site: Explore {{site}}
 #en: failed: failed
 #en: faq: FAQ
@@ -239,13 +244,14 @@
 #en: forgot_your_username: Forgot your username?
 #en: forum: Forum
 #en: forums: Forums
-#en: found: found
+#en: post_found: {{count}} posts found
 #en: frequency: Frequency
 #en: frequent_asked_questions: Frequent Asked Questions
 #en: frequently_asked_questions: Frequently Asked Questions
 #en: friend: friend
 #en: friends: Friends
 #en: friendship_could_not_be_created: Friendship could not be created
+#en: friendship_request_accepted: Friendship request accepted!
 #en: friendship_request_detail: Friendship request detail
 #en: friendship_requested: Requested friendship with {{friend}}.
 #en: from: From
@@ -253,16 +259,18 @@
 #en: gender: Gender
 #en: get_help_from_someone_who_knows: Get help from someone who knows
 #en: get_popular: Get popular.
+#en: get_started: &quot;Get started:&quot;
 #en: get_started_banner: Get started with &lt;a href=&quot;/&quot;&gt;{{site}}&lt;/a&gt; today!
-#en: get_started_invite_some_friends: &quot;Get Started: Invite some friends!&quot;
-#en: get_started_tell_us_about_yourself: &quot;Get Started: Tell us about yourself&quot;
-#en: get_started_upload_a_profile_photo: &quot;Get Started: Upload a profile photo&quot;
 #en: go: Go
 #en: go2: Go
 #en: go_check_your_e_mail: Go check your e-mail!
 #en: go_to_the_forums: go to the forums
 #en: go_to_your_clippings_page_to_get_started: Go to your clippings page to get started.
 #en: go_to_your_profile: Go to your profile
+#en: greetings: ['Hello', 'Hola', 'Hi ', 'Yo', 'Welcome back,', 'Greetings', 'Wassup', 'Aloha', 'Halloo']
+#en: has_commented_on_something_that_you_also_commented_on: {{user}} has commented on a {{item}} that you also commented on.
+#en: has_posted_in_a_thread_you_are_monitoring: {{user}} has posted in a thread you are monitoring.
+#en: has_something_to_say_to_you_on: {{user}} has something to say to you on {{site}}!
 #en: have_an_account: &quot;Have an account? &quot;
 #en: have_something_to_contribute: Have something to contribute?
 #en: help: Help
@@ -271,7 +279,7 @@
 #en: homepage_banner_msg: CommunityEngine is the best way to go from zero to hero in no time
 #en: homepage_banner_signup_prompt: See how it works
 #en: homepage_features: Homepage Features
-#en: hours_ago: hours ago
+#en: hours_ago: {{count}} hours ago
 #en: how_do_i_do_that: How do I do that?
 #en: html: HTML
 #en: image: Image
@@ -285,11 +293,14 @@
 #en: invitation_was_successfully_created: Invitation was successfully created.
 #en: invite_message: The more people you invite the better {{site}} becomes.
 #en: invite_some_customers: Invite some customers!
+#en: invite_some_friends: &quot;Invite some friends!&quot;
 #en: invite_your_friends_to_join: Invite Your Friends To Join!
 #en: invited_friends: invited some friends to join!
 #en: is_great_check_it_out_youll_love_it: is great, check it out you'll love it!
 #en: items: Items
+#en: items_tagged: Items tagged
 #en: joined: joined
+#en: joined_the_site: joined {{site}}
 #en: just_uploading_one_photo: Just uploading one photo?
 #en: keywords: Keywords
 #en: large: Large
@@ -324,13 +335,14 @@
 #en: make_my_profile_public: Make my profile public
 #en: make_this_my_profile_photo: Make this my profile photo
 #en: male: Male
+#en: manage: &quot;Manage:&quot;
 #en: manage_my: &quot;Manage my:&quot;
 #en: manage_pages: Manage Pages
 #en: manage_posts: Manage Posts
 #en: map_it: Map It!
 #en: medium: Medium
-#en: megabyte_upload_limit: megabyte upload limit
-#en: megabyte_upload_limit_per_file: megabyte upload limit per file.
+#en: megabyte_upload_limit: {{count}} megabytes upload limit
+#en: megabyte_upload_limit_per_file: {{count}} megabytes upload limit per file.
 #en: member: Member
 #en: members: Members
 #en: member_since: Member since
@@ -338,10 +350,12 @@
 #en: messages_deleted: Messages deleted
 #en: messages_sent: Messages sent!
 #en: message_sent: Message sent!
+#en: read: read
+#en: unread: unread
 #en: metro_area: Metro Area
 #en: metro_areas: Metro Areas
 #en: metro_area_was_successfully_created: MetroArea was successfully created.
-#en: minutes_ago: minutes ago
+#en: minutes_ago: {{count}} minutes ago
 #en: moderator: Moderator
 #en: moderators: Moderators
 #en: monitored_topics: Monitored Topics
@@ -349,8 +363,15 @@
 #en: more: More
 #en: more_about_you: More about you
 #en: most_active_1_month: Most active (1 month)
+#en: most_recent: most recent
+#en: most_popular: most popular
+#en: my_account: My Account
+#en: my_blog: My Blog
+#en: my_blog_posts: My Blog Posts
+#en: my_clippings: My Clippings
 #en: my_details: My Details
 #en: my_friends: My Friends
+#en: my_photos: My Photos
 #en: my_profile: My Profile
 #en: my_recent_comments: My recent comments
 #en: my_skills: My Skills
@@ -396,9 +417,6 @@
 #en: of: of
 #en: offering_was_successfully_created: Offering was successfully created.
 #en: on_commentable: On
-#en: one_day_ago: one day ago
-#en: one_hour_ago: one hour ago
-#en: one_minute_ago: one minute ago
 #en: optional: optional
 #en: optional_keywords_describing_this_clipping_separated_by_commas: optional keywords describing this clipping, separated by commas
 #en: optional_keywords_describing_this_forum_separated_by_commas: optional keywords describing this forum, separated by commas
@@ -423,18 +441,21 @@
 #en: permanently_delete_this_event: Permanently delete this event?
 #en: permanently_delete_this_post: Permanently delete this post?
 #en: photo_comments: Photo Comments
-#en: photo_from_user: &quot;{{photo_description}} from {{user}}&quot;
+#en: photo_description_from_user: &quot;{{photo_description}} from {{user}}&quot;
+#en: photo_from_user: &quot;Photo from {{user}}&quot;
 #en: photo_message: Your profile photo represents you on {{site}}. You can change it later.
 #en: photo_was_successfully_created: Photo was successfully created.
 #en: photos: Photos
 #en: photos_should_be_x_pixels: Photos should be 300x300 pixels.
+#en: photos_tagged: Photos tagged
 #en: photo_tip_1: Photos show the world your creativity. Pick your best pics, and give them good titles and descriptions.
 #en: photo_tip_2: Use tags to organize your photos. Separate tags with commas.
+#en: please_activate_your_new_account: Please activate your new {{site}} account
 #en: please_log_in: Please log in.
 #en: please_post_something_at_least: Please post something at least...
 #en: plural_posts: &quot;{{count}} posts&quot;
 #en: popular: Popular
-#en: popular_catgory: Popular {{name}}
+#en: popular_category: Popular {{name}}
 #en: popular_posts: Popular Posts
 #en: popular_posts_on: Popular Posts on
 #en: popular_polls: Popular Polls
@@ -451,9 +472,10 @@
 #en: postal_code: &quot;Postal code:&quot;
 #en: posting_tips: &quot;Posting Tips&quot;
 #en: post_topic: Post topic
-#en: posts_photos_and_bookmarks: posts, photos and bookmarks
-#en: pages_saved_with_draft_status_wont_appear_on_the_site_until_you_publish_them: Pages saved with 'draft' status won't appear on the site until you publish them.
+#en: posts_photos_and_bookmarks: {{name}} posts, photos and bookmarks
 #en: posts_saved_with_draft_status_wont_appear_in_your_blog_until_you_publish_them: Posts saved with 'draft' status won't appear in your blog until you publish them.
+#en: posts_tagged: Posts tagged
+#en: pages_saved_with_draft_status_wont_appear_on_the_site_until_you_publish_them: Pages saved with 'draft' status won't appear on the site until you publish them.
 #en: public: Public
 #en: preview: Preview
 #en: previewing_your_post: Previewing your post
@@ -493,7 +515,7 @@
 #en: required: required
 #en: required_we_will_send_a_confirmation_e_mail_to_the_address_you_enter: &quot;(Required: We will send a confirmation e-mail to the address you enter.)&quot;
 #en: required_you_must_be_at_least_years_old_to_sign_up: &quot;(Required: you must be at least 13 years old to sign up.)&quot;
-#en: required_your_username_must_not_contain_numerals_spaces_or_special_characters: &quot;(Required: Your username must not contain numerals, spaces or special characters.)&quot;
+#en: required_your_username_must_not_contain_numerals_spaces_or_special_characters: &quot;(Required: Your username must not contain spaces or special characters.)&quot;
 #en: resend_my_activation_e_mail: Resend my activation e-mail
 #en: resend_your_activation_e_mail: Resend your activation e-mail
 #en: reset_my_password: Reset my password
@@ -524,14 +546,17 @@
 #en: see_all_recent_posts: See all recent posts
 #en: see_you_back_here_in_a_short_while: See you back here in a short while.
 #en: select_images_to_upload: Select Images to Upload
+#en: select_your_city: Select your city
 #en: send: &quot;Send&quot;
 #en: send_me_a_message: &quot;Send me a message&quot;
 #en: send_invitations: Send Invitations!
 #en: send_me_my_username: Send me my username
 #en: sent_messages: Sent messages
 #en: send_this_story_to_friends: Send this message to friends
+#en: sent_you_a_private_message: {{user}} sent you a private message!
 #en: service_could_not_be_deleted: Service could not be deleted.
 #en: share_the_love: Share the love
+#en: sharethis: ShareThis
 #en: show: Show
 #en: show_category: &quot;{{category}}&quot;
 #en: show_this_photo: Show this photo
@@ -571,7 +596,7 @@
 #en: subscribe_events_instructions:  Keep up to date with events using your favorite software (Outlook, Lightning / Thunderbird, Sunbird, iCal, etc.) or online service (Google Calendar, AirSet, iScrybe, etc.).
 #en: tag_does_not_exists: The tag {{tag}} does not exist
 #en: tag_name: Tag name
-#en: tag_yourself: tag yourself
+#en: tag_yourself: Tag yourself
 #en: tags: Tags
 #en: taggings: Taggings
 #en: tag_was_successfully_updated: Tag was successfully updated
@@ -582,6 +607,7 @@
 #en: tags_are_one_word_descriptors_users_assign_to_blog_posts_pictures_and_clippings_on: Tags are one-word descriptors user assign to blog posts, pictures and clippings on
 #en: tagged: tagged
 #en: tags_page: tags page
+#en: tell_us_about_yourself: &quot;Tell us about yourself&quot;
 #en: thanks_for_activating_your_account: Thanks for activating your account!
 #en: thanks_youre_now_logged_in: Thanks! You're now logged in.
 #en: the_comment_was_deleted: The comment was deleted.
@@ -591,6 +617,7 @@
 #en: the_more_people_you_invite_the_better: The more people you invite, the better
 #en: the_service_was_deleted: The service was deleted.
 #en: the_slideshow_is_disabled: The slideshow is disabled.
+#en: the_team: The {{site}} Team &lt;{{email}}&gt;
 #en: the_user_was_activated: The user was activated
 #en: the_user_was_deleted: The user was deleted.
 #en: this_contest_is_closed: This contest is closed
@@ -628,12 +655,14 @@
 #en: un_favorite_this: Un-favorite this
 #en: unactivated_users: Unactivated users
 #en: uncategorized: Uncategorized
+#en: unread_messages: {{count}} unread messages
 #en: update: Update
 #en: update_rsvp: Update RSVP
 #en: update_profile_and_tag_yourself: Update your profile and tag yourself
 #en: update_your_profile: update your profile
 #en: updated_at: Updated at
 #en: updated_their_profile: updated their profile
+#en: upload_a_profile_photo: &quot;Upload a profile photo&quot;
 #en: upload_an_image_for_your_post: Upload an image for your post
 #en: upload_and_continue_to_step_two: Upload, and continue to step two
 #en: uploaded_a_photo: &quot;uploaded a photo:&quot;
@@ -641,13 +670,16 @@
 #en: url: Url
 #en: user_e_mail: &quot;User e-mail:&quot;
 #en: username: Username
+#en: users_profile: {{user}}'s profile
 #en: user: User
+#en: user_information: {{site}} User information
 #en: users: Users
 #en: users_blog: &quot;{{user}}'s Blog&quot;
 #en: user_clippings: Clippings of {{user}}
 #en: user_login: User login
 #en: users_online: Users online
 #en: users_photos: &quot;{{user}}'s Photos&quot;
+#en: users_tagged: &quot;Users tagged&quot;
 #en: user_notifier_change_email_preferences: &quot;\n\n---------------------------------------------------------------------------------\n\nIf you don't want to receive e-mails like this one from {{community_name}}, you can change your e-mail preferences here:\n\n\t {{change_account_here}}&quot;
 #en: user_notifier_thanks: &quot;\n\nThanks,\nThe {{community}} team&quot;
 #en: user_notifier_report_abuse: &quot;\n---------------------------------------\n\n\t{{community_introduction}}\n\nFor support, or to report abuse, please contact {{support}}.&quot;
@@ -672,9 +704,7 @@
 #en: view_all_my_friend_requests: View all my friend requests
 #en: view_all_my_photos: View all my photos
 #en: view_comment: View Comment
-#en: view_my: &quot;View my:&quot;
 #en: view_my_blog: View my blog
-#en: view_profile: View profile
 #en: voice: voice
 #en: voices: Voices
 #en_ vote: Vote
@@ -686,8 +716,6 @@
 #en: want_to_list_your_services_on: Want to list your services on
 #en: want_to_post_in_this_category: Want to post in this category?
 #en: want_to_upload_multiple_files_at_once: Want to upload multiple files at once?
-#en: watch: Watch
-#en: watch_ing: ing
 #en: watch_topic: Watch topic
 #en: watching_topic: Watching topic
 #en: we_just_sent_an_e_mail_to: &quot;We just sent an e-mail to: {{email}}&quot;
@@ -707,6 +735,8 @@
 #en: when_unchecked_your_profile_will_only_be_visible_to_people_who_are_logged_in_to: When unchecked, your profile will only be visible to people who are logged in to
 #en: when_you_see_an_image_you_like_on_the_web: When you see an image you like on the Web, click the bookmarklet to save it to {{site}}
 #en: why_sign_up: Why Sign up?
+#en: would_like_to_be_friends_with_you: {{user}} would like to be friends with you!
+#en: would_like_you_to_join: {{user}} would like you to join {{site}}!
 #en: write_a_blog_post: Write a blog post!
 #en: write_a_message: &quot;Write a message:&quot;
 #en: write_new_post: Write a '{{category}}' post
@@ -718,20 +748,23 @@
 #en: you_cant_delete_that_user: You can't delete that user.
 #en: you_can_select_up_to_5_files_at_a_time: You can select up to 5 files at a time.
 #en: you_could_tag_yourself: You could tag yourself
+#en: you_have_friends: You have {{count}} friends
+#en: you_have_added_clippings: You have added {{count}} clippings
 #en: you_have: You have
 #en: you_have_already_rsvped_for_this_event: You have already RSVPed for this event.
 #en: you_have_already_voted: You have already voted.
 #en: you_have_created: You have created
-#en: you_have_left: You have left
+#en: you_have_left_comments: You have left {{count}} comments
 #en: you_have_no_clippings_use_the_bookmarklet_on_the_right_to_add_some: You have no clippings. Use the bookmarklet on the right to add some.
 #en: you_have_no_network_activity_yet: You have no network activity yet.
 #en: you_have_pending_friendship_requests: You have pending friendship requests.
-#en: you_have_uploaded: You have uploaded
-#en: you_have_written: You have written
+#en: you_have_uploaded_photos: You have uploaded {{count}} photos
+#en: you_have_written_blog_posts: You have written {{count}} blog posts
 #en: you_last_logged_in_on: You last logged in on
 #en: you_may_want_to_use_your_company_logo_or_a_photo_of_one_of_your_products_: &quot;You may want to use your company logo, or a photo of one of your products. &quot;
 #en: you_must_vote_to_see_the_results: You must vote to see the resuts.
-#en: your_about_text_goes_here: Your About text goes here.
+#en: your_about_text_goes_here: Your About Text Goes Here
+#en: your_account_has_been_activated: Your {{site}} account has been activated!
 #en: your_faq_text_goes_here: Your FAQ text goes here.
 #en: your_changes_were_saved: Your changes were saved.
 #en: your_password_has_been_reset_and_emailed_to_you: Your password has been reset and emailed to you.
@@ -744,7 +777,7 @@
 #en: your_username_was_emailed_to_you: Your username was emailed to you.
 #en: youve_been_logged_out_hope_you_come_back_soon: You've been logged out. Hope you come back soon!
 #en: zippostal_code: &quot;ZIP/Postal code:&quot;
-#en: photo_manaer: &quot;Photo manager&quot;
+#en: photo_manager: &quot;Photo manager&quot;
 #en: albums: &quot;Albums&quot;
 # en album_updated: &quot;Album updated&quot;
 #en: album_comments: &quot;Comentarios de &#225;lbum&quot;
@@ -765,4 +798,7 @@
 #en: create_album: &quot;Create album&quot;
 #en: edit_album: &quot;Edit album&quot;
 #en; cancel_and_go_back_to_photo_manager: &quot;Cancel and go back to photo manager&quot;
-#en: back_to_photo_manager: &quot;Back to photo manager&quot;
\ No newline at end of file
+#en: back_to_photo_manager: &quot;Back to photo manager&quot;
+#en: yes_status: yes
+#en: no_status: no
+</diff>
      <filename>lang/base.yml</filename>
    </modified>
    <modified>
      <diff>@@ -7,6 +7,7 @@ de-DE:
   time:
     formats:
       published_date: &quot;%d.%m.%Y&quot;      
+      short_date: &quot;%d.%m.%y&quot;
       time_ago: &quot;%H:%M&quot;
 
   activerecord:
@@ -813,8 +814,8 @@ de-DE:
   posting_tips: &quot;Tip zum Schreiben eines Beitrags&quot;
   #en: post_topic: Post topic
   post_topic: Thema speichern
-  #en: posts_photos_and_bookmarks: posts, photos and bookmarks
-  posts_photos_and_bookmarks: Beitr&#228;ge, Fotos und Bookmarks
+  #en: posts_photos_and_bookmarks: {{name}} posts, photos and bookmarks
+  posts_photos_and_bookmarks: &quot;{{name}} Beitr&#228;ge, Fotos und Bookmarks&quot;
   #en: posts_saved_with_draft_status_wont_appear_in_your_blog_until_you_publish_them: Posts saved with 'draft' status won't appear in your blog until you publish them.
   posts_saved_with_draft_status_wont_appear_in_your_blog_until_you_publish_them: &quot;Eintr&#228;ge, die als Entwurf gespeichert wurden, erscheinen erst in deinem Blog, wenn du sie ver&#246;ffentlichst.&quot;
   #en: preview: Preview
@@ -889,8 +890,8 @@ de-DE:
   required: (erforderlich)
   #en: required_we_will_send_a_confirmation_e_mail_to_the_address_you_enter: &quot;(Required: We will send a confirmation e-mail to the address you enter.)&quot;
   required_we_will_send_a_confirmation_e_mail_to_the_address_you_enter: &quot;(Erforderlich: Wir senden eine Best&#228;tigungsmail an die eingegebene Adresse.)&quot;
-  #en: required_you_must_be_at_least_years_old_to_sign_up: &quot;(Required: you must be at least 13 years old to sign up.)&quot;
-  required_you_must_be_at_least_years_old_to_sign_up: &quot;(Erfoderlich: Du musst mindestens 13 Jahre alt sein, um dich zu registrieren.)&quot;
+  #en: required_you_must_be_at_least_years_old_to_sign_up: &quot;(Required: you must be at least {{min_age}} years old to sign up.)&quot;
+  required_you_must_be_at_least_years_old_to_sign_up: &quot;(Erfoderlich: Du musst mindestens {{min_age}} Jahre alt sein, um dich zu registrieren.)&quot;
   #en: required_your_username_must_not_contain_numerals_spaces_or_special_characters: &quot;(Required: Your username must not contain numerals, spaces or special characters.)&quot;
   required_your_username_must_not_contain_numerals_spaces_or_special_characters: &quot;(Erforderlich: Dein Benutzername sollte keine Zahlen, Leer- oder Sonderzeichen enthalten.)&quot;
   #en: resend_my_activation_e_mail: Resend my activation e-mail</diff>
      <filename>lang/ui/de-DE.yml</filename>
    </modified>
    <modified>
      <diff>@@ -7,12 +7,18 @@ en:
   time:
     formats:
       published_date: &quot;%Y/%m/%d&quot;      
+      short_published_date: &quot;%y/%m/%d&quot;
+      literal_date: &quot;%B %d, %Y&quot;
+      short_literal_date: &quot;%b %d, %Y&quot;
       time_ago: &quot;%l:%M%p&quot;
 
   activerecord:
     attributes:
       photo:
         created_at: &quot;created at: &quot;
+
+  greetings: ['Hello', 'Hola', 'Hi ', 'Yo', 'Welcome back,', 'Greetings', 'Wassup', 'Aloha', 'Halloo']
+
   #en: a_few_seconds_ago:  a few seconds ago
   a_few_seconds_ago:  a few seconds ago
   #en: about: About
@@ -29,16 +35,16 @@ en:
   accept: Accept
   #en: accepted: accepted
   accepted: accepted
-  #en: accepted_friendships: Accepted Friendships
-  accepted_friendships: Accepted Friendships
+  #en: accepted_friendships: {{count}} Accepted Friendships
+  accepted_friendships:
+    one: 1 Accepted Friendship
+    other: &quot;{{count}} Accepted Friendships&quot;
   #en: accept_this_request: Accept this request
   accept_this_request: Accept this request
   #en: account: account
   account: account
   #en: account_activation_error: Account activation failed. Your account may already be active. Try logging in or e-mail {{email}} for help.
   account_activation_error: &quot;Account activation failed. Your account may already be active. Try logging in or e-mail {{email}} for help.&quot;
-  #en: account_settings: Account settings
-  account_settings: Account settings
   #en: actions: Actions
   actions: Actions
   #en: activate: Activate
@@ -145,8 +151,6 @@ en:
   banner_subtitle_required: &quot;Banner subtitle (required):&quot;
   #en: banner_title_required: &quot;Banner title (required):&quot;
   banner_title_required: &quot;Banner title (required):&quot;
-  #en: becomes: becomes.
-  becomes: becomes.
   #en: begin: begin
   begin: begin
   #en: begin_required: begin (required)
@@ -159,8 +163,6 @@ en:
   birthday_gender: &quot;Birthday &amp; Gender&quot;
   #en: blog: Blog
   blog: Blog
-  #en: blog_posts: Blog posts
-  blog_posts: Blog posts
   #en: body_text: Body Text
   body_text: Body Text
   #en: body_text_reqiured: Body Text (required)
@@ -201,6 +203,8 @@ en:
   category: Category
   #en: category_was_successfully_created: Category was successfully created.
   category_was_successfully_created: Category was successfully created.
+  #en: check_out_this_story_on: Check out this story on {{site}}
+  check_out_this_story_on: Check out this story on {{site}}
   #en: choices: Choices
   choices: Choices
   #en: choose_a_photo_for_your_profile: &quot;Choose a photo for your profile:&quot;
@@ -231,6 +235,8 @@ en:
   click_to_accept_it: Click to accept it!
   #en: clipping_comments: Clipping Comments
   clipping_comments: Clipping Comments
+  #en: clipping_from_user: Clipping from {{user}}
+  clipping_from_user: Clipping from {{user}}
   #en: clipping_was_successfully_created: Clipping was successfully created.
   clipping_was_successfully_created: Clipping was successfully created.
   #en: clippings: Clippings
@@ -239,6 +245,8 @@ en:
   clippings_are_a_way_to_save_images_you_like_from_around_the_web: Clippings are a way to save images you like from around the Web
   #en: clippings_let_you_to_save_cool_images_from_around_the_web: Clippings let you to save cool images from around the Web.
   clippings_let_you_to_save_cool_images_from_around_the_web: Clippings let you to save cool images from around the Web.
+  #en: clippings_tagged: Clippings tagged
+  clippings_tagged: &quot;Clippings tagged&quot;
   #en: close_this_message: Close this message
   close_this_message: Close this message
   #en: comma_separated: (comma separated)
@@ -303,8 +311,10 @@ en:
   date_created: Date Created
   #en: date_published: Date Published
   date_published: Date Published
-  #en: days_ago: days ago
-  days_ago: days ago
+  #en: days_ago: {{count}} days ago
+  days_ago: 
+    one: &quot;one day ago&quot;
+    other: &quot;{{count}} days ago&quot;
   #en: deactivate_link: Click here to deactivate your account
   deactivate_link: Click here to deactivate your account
   #en: deactivate_tip: Deactivating your account will remove your profile from the site. 
@@ -445,6 +455,8 @@ en:
   events: Events
   #en: every_person_has_something_to_say: Every single person has something to say, something to give, something that will help someone else.  Join in!
   every_person_has_something_to_say: &quot;Every single person has something to say, something to give, something that will help someone else.  Join in!&quot;
+  #en: expert_in: expert in
+  expert_in: expert in
   #en: explore_site: Explore {{site}}
   explore_site: &quot;Explore {{site}}&quot;
   #en: failed: failed
@@ -491,8 +503,10 @@ en:
   forum: Forum
   #en: forums: Forums
   forums: Forums
-  #en: found: found
-  found: found
+  #en: post_found: {{count}} posts found
+  post_found:
+    one: 1 Post found
+    other: &quot;{{count}} Posts found&quot;
   #en: frequency: Frequency
   frequency: Frequency
   #en: frequent_asked_questions: Frequent Asked Questions
@@ -505,6 +519,8 @@ en:
   friends: Friends
   #en: friendship_could_not_be_created: Friendship could not be created
   friendship_could_not_be_created: Friendship could not be created
+  #en: friendship_request_accepted: Friendship request accepted!
+  friendship_request_accepted: Friendship request accepted!
   #en: friendship_request_detail: Friendship request detail
   friendship_request_detail: Friendship request detail
   #en: friendship_requested: Requested friendship with {{friend}}.
@@ -519,14 +535,16 @@ en:
   get_help_from_someone_who_knows: Get help from someone who knows
   #en: get_popular: Get popular.
   get_popular: Get popular.
+  #en: get_started: &quot;Get started:&quot;
+  get_started: &quot;Get started:&quot;
   #en: get_started_banner: Get started with &lt;a href=&quot;/&quot;&gt;{{site}}&lt;/a&gt; today!
   get_started_banner: &quot;Get started with &lt;a href='/'&gt;{{site}}&lt;/a&gt; today!&quot;
-  #en: get_started_invite_some_friends: &quot;Get Started: Invite some friends!&quot;
-  get_started_invite_some_friends: &quot;Get Started: Invite some friends!&quot;
-  #en: get_started_tell_us_about_yourself: &quot;Get Started: Tell us about yourself&quot;
-  get_started_tell_us_about_yourself: &quot;Get Started: Tell us about yourself&quot;
-  #en: get_started_upload_a_profile_photo: &quot;Get Started: Upload a profile photo&quot;
-  get_started_upload_a_profile_photo: &quot;Get Started: Upload a profile photo&quot;
+  #en: invite_some_friends: &quot;Invite some friends!&quot;
+  invite_some_friends: &quot;Invite some friends!&quot;
+  #en: tell_us_about_yourself: &quot;Tell us about yourself&quot;
+  tell_us_about_yourself: &quot;Tell us about yourself&quot;
+  #en: upload_a_profile_photo: &quot;Upload a profile photo&quot;
+  upload_a_profile_photo: &quot;Upload a profile photo&quot;
   #en: go: Go
   go: Go
   #en: go2: Go
@@ -539,6 +557,12 @@ en:
   go_to_your_clippings_page_to_get_started: Go to your clippings page to get started.
   #en: go_to_your_profile: Go to your profile
   go_to_your_profile: Go to your profile
+  #en: has_commented_on_something_that_you_also_commented_on: {{user}} has commented on a {{item}} that you also commented on.
+  has_commented_on_something_that_you_also_commented_on: &quot;{{user}} has commented on a {{item}} that you also commented on.&quot;
+  #en: has_posted_in_a_thread_you_are_monitoring: {{user}} has posted in a thread you are monitoring.
+  has_posted_in_a_thread_you_are_monitoring: &quot;{{user}} has posted in a thread you are monitoring.&quot;
+  #en: has_something_to_say_to_you_on: {{user}} has something to say to you on {{site}}!
+  has_something_to_say_to_you_on: &quot;{{user}} has something to say to you on {{site}}!&quot;
   #en: have_an_account: &quot;Have an account? &quot;
   have_an_account: &quot;Have an account? &quot;
   #en: have_something_to_contribute: Have something to contribute?
@@ -555,8 +579,10 @@ en:
   homepage_banner_signup_prompt: See how it works
   #en: homepage_features: Homepage Features
   homepage_features: Homepage Features
-  #en: hours_ago: hours ago
-  hours_ago: hours ago
+  #en: hours_ago: {{count}} hours ago
+  hours_ago:
+    one: &quot;one hour ago&quot;
+    other: &quot;{{count}} hours ago&quot;
   #en: how_do_i_do_that: How do I do that?
   how_do_i_do_that: How do I do that?
   #en: html: HTML
@@ -591,8 +617,12 @@ en:
   is_great_check_it_out_youll_love_it: &quot;is great, check it out you'll love it!&quot;
   #en: items: Items
   items: Items
+  #en: items_tagged: Items tagged
+  items_tagged: &quot;Items tagged&quot;
   #en: joined: joined
   joined: joined
+  #en: joined_the_site: joined {{site}}
+  joined_the_site: joined {{site}}
   #en: just_uploading_one_photo: Just uploading one photo?
   just_uploading_one_photo: Just uploading one photo?
   #en: keywords: Keywords
@@ -651,6 +681,10 @@ en:
   look_for_a_message_from: &quot;Look for a message from: {{from}}&quot;
   #en: looking_for_most_x: Looking for {{link}}
   looking_for_most_x: &quot;Looking for {{link}}&quot;
+  #en: most_recent: most recent
+  most_recent: most recent
+  #en: most_popular: most popular
+  most_popular: most popular
   #en: make_moderator: Make moderator
   make_moderator: Make moderator
   #en: make_page_public: Make this page public
@@ -661,6 +695,8 @@ en:
   make_this_my_profile_photo: Make this my profile photo
   #en: male: Male
   male: Male
+  #en: manage: &quot;Manage:&quot;
+  manage: &quot;Manage:&quot;
   #en: manage_my: &quot;Manage my:&quot;
   manage_my: &quot;Manage my:&quot;
   #en: manage_pages: Manage Pages
@@ -671,10 +707,14 @@ en:
   #en: map_it: Map It!
   map_it: Map It!
   medium: Medium
-  #en: megabyte_upload_limit: megabyte upload limit
-  megabyte_upload_limit: megabyte upload limit
-  #en: megabyte_upload_limit_per_file: megabyte upload limit per file.
-  megabyte_upload_limit_per_file: megabyte upload limit per file.
+  #en: megabyte_upload_limit: {{count}} megabytes upload limit
+  megabyte_upload_limit:
+    one: &quot;1 megabyte upload limit&quot;
+    other: &quot;{{count}} megabytes upload limit&quot;
+  #en: megabyte_upload_limit_per_file: {{count}} megabytes upload limit per file.
+  megabyte_upload_limit_per_file:
+    one: &quot;1 megabyte upload limit per file.&quot;
+    other: &quot;{{count}} megabytes upload limit per file.&quot;
   #en: member: Member
   member: Member
   #en: members: Members
@@ -689,14 +729,24 @@ en:
   messages_sent: Messages sent!
   #en: message_sent: Message sent!
   message_sent: Message sent!
+  #en: read: read
+  read: read
+  #en: unread: unread
+  unread: unread
+  #en: unread_messages: {{count}} unread messages
+  unread_messages:
+    one: 1 unread message
+    other: &quot;{{count}} unread messages&quot;
   #en: metro_area: Metro Area
   metro_area: Metro Area
   #en: metro_areas: Metro Areas
   metro_areas: Metro Areas
   #en: metro_area_was_successfully_created: MetroArea was successfully created.
   metro_area_was_successfully_created: MetroArea was successfully created.
-  #en: minutes_ago: minutes ago
-  minutes_ago: minutes ago
+  #en: minutes_ago: {{count}} minutes ago
+  minutes_ago:
+    one: &quot;one minute ago&quot;
+    other: &quot;{{count}} minutes ago&quot;
   #en: moderator: Moderator
   moderator: Moderator
   #en: moderators: Moderators
@@ -711,10 +761,20 @@ en:
   more_about_you: More about you
   #en: most_active_1_month: Most active (1 month)
   most_active_1_month: Most active (1 month)
+  #en: my_account: My Account
+  my_account: My Account
+  #en: my_blog: My Blog
+  my_blog: My Blog
+  #en: my_blog_posts: My Blog Posts
+  my_blog_posts: My Blog Posts
+  #en: my_clippings: My Clippings
+  my_clippings: My Clippings
   #en: my_details: My Details
   my_details: My Details
   #en: my_friends: My Friends
   my_friends: My Friends
+  #en: my_photos: My Photos
+  my_photos: My Photos
   #en: my_profile: My Profile
   my_profile: My Profile
   #en: my_recent_comments: My recent comments
@@ -777,7 +837,7 @@ en:
   next_page: Next page
   #en: no_activation_email: No activation e-mail?
   no_activation_email: No activation e-mail?
-  #en: no_comments_found: Sorry, we couldn't find any comments for that {{type}}
+  #en: no_comments_found_for_that_item: Sorry, we couldn't find any comments for that {{type}}
   no_comments_found: &quot;Sorry, we couldn't find any comments for that {{type}}&quot;
   #en: no_images_uploaded_yet: No images uploaded yet.
   no_images_uploaded_yet: No images uploaded yet.
@@ -791,7 +851,7 @@ en:
   no_tags: No tags
   #en: notify_email_updates: Notify of community news
   notify_email_updates: Notify of community news
-  #en: notify_me_of_follow_ups_via_email: Notify me of follow ups via e-mail  
+  #en: notify_me_of_follow_ups_via_email: Notify me of follow ups via e-mail
   notify_me_of_follow_ups_via_email: Notify me of follow ups via e-mail  
   #en: notify_of_comments: Notify of comments
   notify_of_comments: Notify of comments
@@ -805,12 +865,6 @@ en:
   offering_was_successfully_created: Offering was successfully created.
   #en: on_commentable: On
   on_commentable: 'On'
-  #en: one_day_ago: one day ago
-  one_day_ago: one day ago
-  #en: one_hour_ago: one hour ago
-  one_hour_ago: one hour ago
-  #en: one_minute_ago: one minute ago
-  one_minute_ago: one minute ago
   #en: optional: optional
   optional: optional
   #en: optional_keywords_describing_this_clipping_separated_by_commas: optional keywords describing this clipping, separated by commas
@@ -823,6 +877,10 @@ en:
   optional_keywords_describing_this_post_separated_by_commas: &quot;optional keywords describing this post, separated by commas&quot;
   #en: optional_keywords_describing_this_topic_separated_by_commas: optional keywords describing this topic, separated by commas
   optional_keywords_describing_this_topic_separated_by_commas: optional keywords describing this topic, separated by commas
+  #en: yes_status: yes
+  yes_status: yes
+  #en: no_status: no
+  no_status: no
   #en: or: or
   or: or
   #en: page: page
@@ -859,20 +917,28 @@ en:
   permanently_delete_this_post: Permanently delete this post?
   #en: photo_comments: Photo Comments
   photo_comments: Photo Comments
-  #en: photo_from_user: &quot;{{photo_description}} from {{user}}&quot;
-  photo_from_user: &quot;{{photo_description}} from {{user}}&quot;
+  #en: photo_description_from_user: &quot;{{photo_description}} from {{user}}&quot;
+  photo_description_from_user: &quot;{{photo_description}} from {{user}}&quot;
+  #en: photo_from_user: &quot;Photo from {{user}}&quot;
+  photo_from_user: &quot;Photo from {{user}}&quot;
   #en: photo_message: Your profile photo represents you on {{site}}. You can change it later.
   photo_message: &quot;Your profile photo represents you on {{site}}. You can change it later.&quot;
   #en: photo_was_successfully_created: Photo was successfully created.
   photo_was_successfully_created: Photo was successfully created.
-  #en: photos: Photos
-  photos: Photos
+  #en: photos: {{count}} Photos
+  photos:
+    one: 1 Photo
+    other: &quot;{{count}} Photos&quot;
   #en: photos_should_be_x_pixels: Photos should be 300x300 pixels.
   photos_should_be_x_pixels: Photos should be 300x300 pixels.
+  #en: photos_tagged: Photos tagged
+  photos_tagged: &quot;Photos tagged&quot;
   #en: photo_tip_1: Photos show the world your creativity. Pick your best pics, and give them good titles and descriptions.
   photo_tip_1: &quot;Photos show the world your creativity. Pick your best pics, and give them good titles and descriptions.&quot;
   #en: photo_tip_2: Use tags to organize your photos. Separate tags with commas.
   photo_tip_2: Use tags to organize your photos. Separate tags with commas.
+  #en: please_activate_your_new_account: Please activate your new {{site}} account
+  please_activate_your_new_account: &quot;Please activate your new {{site}} account&quot;
   #en: please_log_in: Please log in.
   please_log_in: Please log in.
   #en: please_post_something_at_least: Please post something at least...
@@ -881,8 +947,8 @@ en:
   plural_posts: &quot;{{count}} posts&quot;
   #en: popular: Popular
   popular: Popular
-  #en: popular_catgory: Popular {{name}}
-  popular_catgory: &quot;Popular {{name}}&quot;
+  #en: popular_category: Popular {{name}}
+  popular_category: &quot;Popular {{name}}&quot;
   #en: popular_posts: Popular Posts
   popular_posts: Popular Posts
   #en: popular_posts_on: Popular Posts on
@@ -915,12 +981,14 @@ en:
   posting_tips: &quot;Posting Tips&quot;
   #en: post_topic: Post topic
   post_topic: Post topic
-  #en: posts_photos_and_bookmarks: posts, photos and bookmarks
-  posts_photos_and_bookmarks: posts, photos and bookmarks
-  #en: pages_saved_with_draft_status_wont_appear_on_the_site_until_you_publish_them: Pages saved with 'draft' status won't appear on the site until you publish them.
-  pages_saved_with_draft_status_wont_appear_on_the_site_until_you_publish_them: Pages saved with 'draft' status won't appear on the site until you publish them.
+  #en: posts_photos_and_bookmarks: {{name}} posts, photos and bookmarks
+  posts_photos_and_bookmarks: &quot;{{name}} posts, photos and bookmarks&quot;
   #en: posts_saved_with_draft_status_wont_appear_in_your_blog_until_you_publish_them: &quot;Posts saved with 'draft' status won't appear in your blog until you publish them.&quot;
   posts_saved_with_draft_status_wont_appear_in_your_blog_until_you_publish_them: &quot;Posts saved with 'draft' status won't appear in your blog until you publish them.&quot;
+  #en: posts_tagged: Posts tagged
+  posts_tagged: &quot;Posts tagged&quot;
+  #en: pages_saved_with_draft_status_wont_appear_on_the_site_until_you_publish_them: Pages saved with 'draft' status won't appear on the site until you publish them.
+  pages_saved_with_draft_status_wont_appear_on_the_site_until_you_publish_them: Pages saved with 'draft' status won't appear on the site until you publish them.
   #en: public: Public
   public: Public
   #en: preview: Preview
@@ -1001,10 +1069,10 @@ en:
   required: required
   #en: required_we_will_send_a_confirmation_e_mail_to_the_address_you_enter: &quot;(Required: We will send a confirmation e-mail to the address you enter.)&quot;
   required_we_will_send_a_confirmation_e_mail_to_the_address_you_enter: &quot;(Required: We will send a confirmation e-mail to the address you enter.)&quot;
-  #en: required_you_must_be_at_least_years_old_to_sign_up: &quot;(Required: you must be at least 13 years old to sign up.)&quot;
-  required_you_must_be_at_least_years_old_to_sign_up: &quot;(Required: you must be at least 13 years old to sign up.)&quot;
-  #en: required_your_username_must_not_contain_numerals_spaces_or_special_characters: &quot;(Required: Your username must not contain numerals, spaces or special characters.)&quot;
-  required_your_username_must_not_contain_numerals_spaces_or_special_characters: &quot;(Required: Your username must not contain numerals, spaces or special characters.)&quot;
+  #en: required_you_must_be_at_least_years_old_to_sign_up: &quot;(Required: you must be at least {{min_age}} years old to sign up.)&quot;
+  required_you_must_be_at_least_years_old_to_sign_up: &quot;(Required: you must be at least {{min_age}} years old to sign up.)&quot;
+  #en: required_your_username_must_not_contain_numerals_spaces_or_special_characters: &quot;(Required: Your username must not contain spaces or special characters.)&quot;
+  required_your_username_must_not_contain_numerals_spaces_or_special_characters: &quot;(Required: Your username must not contain spaces or special characters.)&quot;
   #en: resend_my_activation_e_mail: Resend my activation e-mail
   resend_my_activation_e_mail: Resend my activation e-mail
   #en: resend_your_activation_e_mail: Resend your activation e-mail
@@ -1065,6 +1133,8 @@ en:
   see_you_back_here_in_a_short_while: See you back here in a short while.
   #en: select_images_to_upload: Select Images to Upload
   select_images_to_upload: Select Images to Upload
+  #en: select_your_city: Select your city
+  select_your_city: Select your city
   #en: send: &quot;Send&quot;
   send: &quot;Send&quot;
   #en: send_me_a_message: &quot;Send me a message&quot;
@@ -1073,14 +1143,18 @@ en:
   send_invitations: Send Invitations!
   #en: send_me_my_username: Send me my username
   send_me_my_username: Send me my username
-  #en: sent_messages: Sent messages
-  sent_messages: Sent messages
   #en: send_this_story_to_friends: Send this message to friends
   send_this_story_to_friends: Send this message to friends
+  #en: sent_messages: Sent messages
+  sent_messages: Sent messages
+  #en: sent_you_a_private_message: {{user}} sent you a private message!
+  sent_you_a_private_message: &quot;{{user}} sent you a private message!&quot;
   #en: service_could_not_be_deleted: Service could not be deleted.
   service_could_not_be_deleted: Service could not be deleted.
   #en: share_the_love: Share the love
   share_the_love: Share the love
+  #en: sharethis: ShareThis
+  sharethis: ShareThis
   #en: show: Show
   show: Show
   #en: show_category: {{category}}
@@ -1160,7 +1234,7 @@ en:
   #en: tag_name: Tag name
   tag_name: Tag name
   #en: tag_yourself: tag yourself
-  tag_yourself: tag yourself
+  tag_yourself: Tag yourself
   #en: tags: Tags
   tags: Tags
   #en: taggings: Taggings
@@ -1199,6 +1273,8 @@ en:
   the_service_was_deleted: The service was deleted.
   #en: the_slideshow_is_disabled: The slideshow is disabled.
   the_slideshow_is_disabled: The slideshow is disabled.
+  #en: the_team: The {{site}} Team &lt;{{email}}&gt;
+  the_team: &quot;The {{site}} Team &lt;{{email}}&gt;&quot;
   #en: the_user_was_activated: The user was activated
   the_user_was_activated: The user was activated
   #en: the_user_was_deleted: The user was deleted.
@@ -1299,6 +1375,8 @@ en:
   username: Username
   #en: user: User
   user: User
+  #en: user_information: {{site}} User information
+  user_information: &quot;{{site}} User information&quot;
   #en: users: Users
   users: Users
   #en: users_blog: &quot;{{user}}'s Blog&quot;
@@ -1311,6 +1389,10 @@ en:
   users_online: Users online
   #en: users_photos: &quot;{{user}}'s Photos&quot;
   users_photos: &quot;{{user}}'s Photos&quot;
+  #en: users_profile: {{user}}'s profile
+  users_profile: &quot;{{user}}'s profile&quot;
+  #en: users_tagged: Users tagged
+  users_tagged: &quot;Users tagged&quot;
   #en: user_vendor_offer: &quot;&lt;p&gt;Describe the product or service you offer:&lt;ul&gt;&lt;li&gt; Tell people what you do&lt;/li&gt;&lt;li&gt; Explain why you love your work&lt;/li&gt;&lt;li&gt; How can people contact you? What's your Web site?&lt;/li&gt;&lt;/ul&gt;&lt;/p&gt;&quot;
   user_vendor_offer: &quot;&lt;p&gt;Describe the product or service you offer:&lt;ul&gt;&lt;li&gt; Tell people what you do&lt;/li&gt;&lt;li&gt; Explain why you love your work&lt;/li&gt;&lt;li&gt; How can people contact you? What's your Web site?&lt;/li&gt;&lt;/ul&gt;&lt;/p&gt;&quot;
   #en: user_bio_help: &quot;&lt;p&gt;Your bio is first thing people see on your profile. Some ideas:&lt;ul&gt;&lt;li&gt; Describe your sense of style&lt;/li&gt;&lt;li&gt; Explain what you love about life.&lt;/li&gt;&lt;li&gt; What's the last thing you purchased for a friend?&lt;/li&gt;&lt;/ul&gt;&lt;/p&gt;&quot;
@@ -1327,12 +1409,8 @@ en:
   view_all_my_photos: View all my photos
   #en: view_comment: View Comment
   view_comment: View Comment
-  #en: view_my: &quot;View my:&quot;
-  view_my: &quot;View my:&quot;
   #en: view_my_blog: View my blog
   view_my_blog: View my blog
-  #en: view_profile: View profile
-  view_profile: View profile
   #en: voice: voice
   voice: voice
   #en: voices: Voices
@@ -1355,10 +1433,6 @@ en:
   want_to_post_in_this_category: Want to post in this category?
   #en: want_to_upload_multiple_files_at_once: Want to upload multiple files at once?
   want_to_upload_multiple_files_at_once: Want to upload multiple files at once?
-  #en: watch: Watch
-  watch: Watch
-  #en: watch_ing: ing
-  watch_ing: ing
   #en: watch_topic: Watch topic
   watch_topic: Watch topic
   #en: watching_topic: Watching topic
@@ -1391,13 +1465,16 @@ en:
   when_checked_your_profile_will_be_visible_to_anyone: &quot;When checked, your profile will be visible to anyone.&quot;
   #en: when_unchecked_this_page_will_only_be_visible_to_people_who_are_logged_in_to: When unchecked, this page will only be visible to people who are logged in to
   when_unchecked_this_page_will_only_be_visible_to_people_who_are_logged_in_to: When unchecked, this page will only be visible to people who are logged in to
-
   #en: when_unchecked_your_profile_will_only_be_visible_to_people_who_are_logged_in_to: When unchecked, your profile will only be visible to people who are logged in to
   when_unchecked_your_profile_will_only_be_visible_to_people_who_are_logged_in_to: &quot;When unchecked, your profile will only be visible to people who are logged in to&quot;
   #en: when_you_see_an_image_you_like_on_the_web: When you see an image you like on the Web, click the bookmarklet to save it to {{site}}
   when_you_see_an_image_you_like_on_the_web: &quot;When you see an image you like on the Web, click the bookmarklet to save it to {{site}}&quot;
   #en: why_sign_up: Why Sign up?
   why_sign_up: Why Sign up?
+  #en: would_like_to_be_friends_with_you: {{user}} would like to be friends with you!
+  would_like_to_be_friends_with_you: &quot;{{user}} would like to be friends with you!&quot;
+  #en: would_like_you_to_join: {{user}} would like you to join {{site}}!
+  would_like_you_to_join: &quot;{{user}} would like you to join {{site}}!&quot;
   #en: write_a_blog_post: Write a blog post!
   write_a_blog_post: Write a blog post!
   #en: write_a_message: &quot;Write a message:&quot;
@@ -1420,6 +1497,14 @@ en:
   you_can_select_up_to_5_files_at_a_time: You can select up to 5 files at a time.
   #en: you_could_tag_yourself: You could tag yourself
   you_could_tag_yourself: You could tag yourself
+  #en: you_have_friends: You have {{count}} friends
+  you_have_friends:
+    one: You have 1 friend.
+    other: &quot;You have {{count}} friends.&quot;
+  #en: you_have_added_clippings: You have added {{count}} clippings
+  you_have_added_clippings:
+    one: You have added 1 clipping.
+    other: &quot;You have added {{count}} clippings.&quot;
   #en: you_have: You have
   you_have: You have
   #en: you_have_already_rsvped_for_this_event: You have already RSVPed for this event.
@@ -1428,26 +1513,34 @@ en:
   you_have_already_voted: You have already voted.
   #en: you_have_created: You have created
   you_have_created: You have created
-  #en: you_have_left: You have left
-  you_have_left: You have left
+  #en: you_have_left_comments: You have left {{count}} comments
+  you_have_left_comments:
+    one: You have left 1 comment.
+    other: &quot;You have left {{count}} comments.&quot;
   #en: you_have_no_clippings_use_the_bookmarklet_on_the_right_to_add_some: You have no clippings. Use the bookmarklet on the right to add some.
   you_have_no_clippings_use_the_bookmarklet_on_the_right_to_add_some: You have no clippings. Use the bookmarklet on the right to add some.
   #en: you_have_no_network_activity_yet: You have no network activity yet.
   you_have_no_network_activity_yet: You have no network activity yet.
   #en: you_have_pending_friendship_requests: You have pending friendship requests.
   you_have_pending_friendship_requests: You have pending friendship requests.
-  #en: you_have_uploaded: You have uploaded
-  you_have_uploaded: You have uploaded
-  #en: you_have_written: You have written
-  you_have_written: You have written
+  #en: you_have_uploaded_photos: You have uploaded {{count}} photos
+  you_have_uploaded_photos:
+    one: You have uploaded 1 photo.
+    other: &quot;You have uploaded {{count}} photos.&quot;
+  #en: you_have_written_blog_posts: You have written {{count}} blog posts
+  you_have_written_blog_posts:
+    one: You have written 1 blog post.
+    other: &quot;You have written {{count}} blog posts.&quot;
   #en: you_last_logged_in_on: You last logged in on
   you_last_logged_in_on: You last logged in on
   #en: you_may_want_to_use_your_company_logo_or_a_photo_of_one_of_your_products_: &quot;You may want to use your company logo, or a photo of one of your products. &quot;
   you_may_want_to_use_your_company_logo_or_a_photo_of_one_of_your_products_: &quot;You may want to use your company logo, or a photo of one of your products. &quot;
   #en: you_must_vote_to_see_the_results: You must vote to see the resuts.
   you_must_vote_to_see_the_results: You must vote to see the resuts.
-  #en: your_about_text_goes_here: Your About text goes here.
-  your_about_text_goes_here: Your About text goes here.
+  #en: your_about_text_goes_here: Your About Text Goes Here
+  your_about_text_goes_here: Your About Text Goes Here
+  #en: your_account_has_been_activated: Your {{site}} account has been activated!
+  your_account_has_been_activated: &quot;Your {{site}} account has been activated!&quot;
   #en: your_faq_text_goes_here: Your FAQ text goes here.
   your_faq_text_goes_here: Your FAQ text goes here.
   #en: your_changes_were_saved: Your changes were saved.
@@ -1475,7 +1568,7 @@ en:
 
 
   #This stuff needs to be checked
-  #en: photo_manaer: &quot;Photo manager&quot;
+  #en: photo_manager: &quot;Photo manager&quot;
   photo_manager: &quot;Photo manager&quot;
   #en: albums: &quot;Albums&quot;
   albums: &quot;Albums&quot;
@@ -1518,4 +1611,5 @@ en:
   #en; cancel_and_go_back_to_photo_manager: &quot;Cancel and go back to photo manager&quot;
   cancel_and_go_back_to_photo_manager: &quot;Cancel and go back to photo manager&quot;
   #en: back_to_photo_manager: &quot;Back to photo manager&quot;
-  back_to_photo_manager: &quot;Back to photo manager&quot;
\ No newline at end of file
+  back_to_photo_manager: &quot;Back to photo manager&quot;
+</diff>
      <filename>lang/ui/en-US.yml</filename>
    </modified>
    <modified>
      <diff>@@ -7,6 +7,7 @@ es-AR:
   time:
     formats:
       published_date: &quot;%Y/%m/%d&quot;      
+      short_date: &quot;%y/%m/%d&quot;
       time_ago: &quot;%l:%M%p&quot;
 
   activerecord:
@@ -467,8 +468,8 @@ es-AR:
   required: (requerido)
   #en: required_we_will_send_a_confirmation_e_mail_to_the_address_you_enter: &quot;(Required: We will send a confirmation e-mail to the address you enter.)&quot;
   required_we_will_send_a_confirmation_e_mail_to_the_address_you_enter: &quot;(Requerido: te vamos a mandar un mail de confirmaci\xC3\xB3n a la direcci\xC3\xB3n que ingreses.)&quot;
-  #en: required_you_must_be_at_least__years_old_to_sign_up: &quot;(Required: you must be at least 13 years old to sign up.)&quot;
-  required_you_must_be_at_least__years_old_to_sign_up: &quot;(Requerido: ten\xC3\xA9s que tener al menos 13 a\xC3\xB1o para suscribirte,)&quot;
+  #en: required_you_must_be_at_least__years_old_to_sign_up: &quot;(Required: you must be at least {{min_age}} years old to sign up.)&quot;
+  required_you_must_be_at_least__years_old_to_sign_up: &quot;(Requerido: ten\xC3\xA9s que tener al menos {{min_age}} a\xC3\xB1o para suscribirte,)&quot;
   #en: required_your_username_must_not_contain_numerals_spaces_or_special_characters: &quot;(Required: Your username must not contain numerals, spaces or special characters.)&quot;
   required_your_username_must_not_contain_numerals_spaces_or_special_characters: &quot;(Requerido: tu nombre de usuario no debe contener numerales, espacios o caracteres especiales.)&quot;
   #en: reset_my_password: Reset my password
@@ -739,4 +740,4 @@ es-AR:
   when_checked_your_profile_will_be_visible_to_anyone: &quot;Cuando est&#233; marcado tu perfil ser&#225; visible a todos.&quot;
   when_unchecked_your_profile_will_only_be_visible_to_people_who_are_logged_in_to: &quot;Cuando est&#233; desmarcado tu perfil ser&#225; visible &#250;nicamente a miembros de &quot;
   email_address: &quot;Correo Electr&#243;nico&quot;
-  confirm_password: &quot;Confirmar Contrase&#241;a&quot;
\ No newline at end of file
+  confirm_password: &quot;Confirmar Contrase&#241;a&quot;</diff>
      <filename>lang/ui/es-AR.yml</filename>
    </modified>
    <modified>
      <diff>@@ -7,6 +7,7 @@ es-ES:
   time:
     formats:
       published_date: &quot;%Y/%m/%d&quot;      
+      short_date: &quot;%y/%m/%d&quot;
       time_ago: &quot;%l:%M%p&quot;
 
   activerecord:</diff>
      <filename>lang/ui/es-ES.yml</filename>
    </modified>
    <modified>
      <diff>@@ -286,7 +286,7 @@ es-MX:
   admin_dashboard: Panel de Control del Administrador
   banner_title_required: &quot;T&#237;tulo del An&#250;ncio (required):&quot;
   email_signup_thanks: &quot;&#161;Gracias por registrarte! Deber&#237;as recibir la confirmaci&#243;n de un correo electr&#243;nico dentro de poco en {{email}}&quot;
-  required_you_must_be_at_least_years_old_to_sign_up: &quot;(Requerido: debes tener m&#237;nimo 13 a&#241;os para registarte.)&quot;
+  required_you_must_be_at_least_years_old_to_sign_up: &quot;(Requerido: debes tener m&#237;nimo {{min_age}} a&#241;os para registarte.)&quot;
   create_a_clipping: Crear un Recorte
   activation_email_not_sent_message: El e-mail de activaci&#243;n no pudo ser enviado. &#191;Tal vez el usuario ya ha sido activado?
   post_a_new_topic: Publicar un nuevo Tema
@@ -580,7 +580,7 @@ es-MX:
   get_started_banner: &#161;Iniciate con &lt;a href=&quot;/&quot;&gt;{{site}}&lt;/a&gt; hoy mismo!
   invite_a_friend: Invita un amigo
   new_yesterday: Nuevo Ayer
-  posts_photos_and_bookmarks: publicaciones, fotos y favvoritos
+  posts_photos_and_bookmarks: &quot;{{name}} publicaciones, fotos y favvoritos&quot;
   go_to_the_forums: ir a los foros
   your_post_was_successfully_created: Tu publicaci&#243;n fue creada con &#233;xito.
   this_friendship_is_pending: Esta amistad est&#225; pendiente.</diff>
      <filename>lang/ui/es-MX.yml</filename>
    </modified>
    <modified>
      <diff>@@ -1,314 +1,1544 @@
-fr-FR:
+fr:
   date:
     formats:
-      published_date: &quot;%Y/%m/%d&quot;
-      date_ago: &quot;%B %d&quot;
+      published_date: &quot;%d/%m/%Y&quot;
+      date_ago: &quot;%d %B&quot;
+    order: [ :day, :month, :year ]
+    day_names: [~, Lundi, Mardi, Mercredi, Jeudi, Vendredi, Samedi, Dimanche]
+    abbr_day_names: [~, Lun, Mar, Mer, Jeu, Ven, Sam, Dim]
+    month_names: [~, Janvier, F&#233;vrier, Mars, Avril, Mai, Juin, Juillet, Ao&#251;t, Septembre, Octobre, Novembre, D&#233;cembre]
+    abbr_month_names: [~, Jan, F&#233;v, Mars, Avr, Mai, Juin, Juil, Ao&#251;t, Sept, Oct, Nov, D&#233;c]
 
   time:
     formats:
-      published_date: &quot;%Y/%m/%d&quot;      
-      time_ago: &quot;%l:%M%p&quot;
+      published_date: &quot;%d/%m/%Y&quot;
+      short_published_date: &quot;%d/%m/%y&quot;
+      literal_date: &quot;%d %B %Y&quot;
+      short_literal_date: &quot;%d %b %Y&quot;
+      time_ago: &quot;le %e %b %Y &#224; %H:%M&quot;
+    am: am
+    pm: pm
 
   activerecord:
     attributes:
       photo:
-        created_at: &quot;created at: &quot;
+        created_at: &quot;ajout&#233;e le: &quot;
 
+  greetings: ['Bonjour', 'Salut', 'Bienvenue']
+
+  #en: a_few_seconds_ago: a few seconds ago
+  a_few_seconds_ago: il y a quelques secondes
   #en: about: About
-  about: &quot;\xC3\x80 propos&quot;
+  about: &quot;A propos&quot;
   #en: about_me: About Me
-  about_me: &quot;\xC3\x80 propos de moi&quot;
+  about_me: &quot;Qui suis je ?&quot;
   #en: about_site: About {{site}}
-  about_site: Info sur {{site}}
+  about_site: &quot;A propos de {{site}}&quot;
   #en: about_you: About You
-  about_you: &quot;\xC3\x80 propos de vous&quot;
+  about_you: &quot;Qui suis je ?&quot;
+  #en: accept: Accept
+  accept: Accepter
+  #en: accepted: accepted
+  accepted: accept&#233;
+  #en: accepted_friendships: {{count}} Accepted Friendships
+  accepted_friendships:
+    one: 1 Invitation accept&#233;e
+    other: &quot;{{count}} Invitations accept&#233;es&quot;
+  #en: accept_this_request: Accept this request
+  accept_this_request: Accepter cette invitation
+  #en: account: account
+  account: compte
   #en: account_activation_error: Account activation failed. Your account may already be active. Try logging in or e-mail {{email}} for help.
-  account_activation_error: &quot;Activation non r\xC3\xA9ussie. Votre compte est peut-\xC3\xAAtre d\xC3\xA9j\xC3\xA0 actif. Essayez de vous connecter ou contactez {{email}} pour de l'aide.&quot;
-  #en: account_settings: Account settings
-  account_settings: Configuration du compte
+  account_activation_error: &quot;Echec de l'activation du compte. Votre compte est peut-&#234;tre d&#233;j&#224; actif. Essayez de vous connecter ou contactez {{email}} pour obtenir de l'aide.&quot;
+  #en: actions: Actions
+  actions: Actions
   #en: activate: Activate
   activate: Activer
+  #en: activation_email_not_sent_message: Activation e-mail could not be sent. Perhaps that user is already active?
+  activation_email_not_sent_message: &quot;Le mail d'activation n'a pas pu &#234;tre exp&#233;di&#233;. Cet utilisateur est peut &#234;tre d&#233;j&#224; actif ...&quot;
+  #en: activation_email_resent_message: An activation e-mail was resent to the e-mail address you used to sign up.
+  activation_email_resent_message: &quot;Nous vous avons renvoy&#233; le message d'activation &#224; l'adresse email indiqu&#233;e lors de votre inscription.&quot;
   #en: active: active
   active: actif
   #en: active_users: Active Users
-  active_users: Utilisateurs Actifs
+  active_users: Membres Actifs
   #en: activity_from_your_network: Activity from your network
-  activity_from_your_network: &quot;Activit\xC3\xA9 de votre r\xC3\xA9seau&quot;
+  activity_from_your_network: &quot;Activit&#233; de votre r&#233;seau&quot;
   #en: ad_was_successfully_created: Ad was successfully created.
-  ad_was_successfully_created: &quot;publicit\xC3\xA9 cr\xC3\xA9\xC3\xA9e avec success&quot;
+  ad_was_successfully_created: &quot;La publicit&#233; a &#233;t&#233; cr&#233;&#233;e avec succ&#232;s.&quot;
   #en: ad_was_successfully_updated: Ad was successfully updated.
-  ad_was_successfully_updated: &quot;publicit\xC3\xA9 modifi\xC3\xA9e avec success&quot;
+  ad_was_successfully_updated: &quot;La publicit&#233; a &#233;t&#233; modifi&#233;e avec succ&#232;s.&quot;
   #en: add_a_photo: Add a photo
   add_a_photo: Ajouter une photo
   #en: add_a_poll: Add a poll
   add_a_poll: Ajouter un sondage
-  #en: add_as_friend: Add as friend
-  add_as_friend: Ajouter un ami
   #en: add_comment: Add Comment
   add_comment: Ajouter un commentaire
+  #en: add_from_my_address_book: &quot;Add from my address book&quot;
+  add_from_my_address_book: &quot;Ajouter depuis mon carnet d'adresses&quot;
   #en: add_some_friends_to_get_started: Add some friends to get started!
-  add_some_friends_to_get_started: Ajouter des amis
+  add_some_friends_to_get_started: Pour commencer, ajoutez des amis !
   #en: add_your_comment: Add Your Comment!
-  add_your_comment: Ajouter votre commentaire
+  add_your_comment: Postez votre commentaire !
   #en: added_a_clipping: &quot;added a clipping:&quot;
-  added_a_clipping: a ajouter un clipping
+  added_a_clipping: &quot;a ajout&#233; une photo au p&#234;le-m&#234;le :&quot;
   #en: added_to_a_forum_topic: &quot;added to a forum topic:&quot;
-  added_to_a_forum_topic: &quot;ajout\xC3\xA9 \xC3\xA0 un sujet de forum&quot;
+  added_to_a_forum_topic: &quot;a post&#233; un message :&quot;
+  #en: admin: Admin
+  admin: Administration
+  #en: admin_controls: Admin Controls
+  admin_controls: &quot;Commandes d'administration&quot;
+  #en: admin_dashboard: Admin dashboard
+  admin_dashboard: &quot;Administration du site&quot;
+  #en: admin_pages: Pages
+  admin_pages: Pages
   #en: ads: Ads
-  ads: &quot;Publicit\xC3\xA9s&quot;
+  ads: &quot;Publicit&#233;s&quot;
   #en: advertise: Advertise
-  advertise: &quot;Afficher une publicit\xC3\xA9&quot;
+  advertise: &quot;Afficher une publicit&#233;&quot;
   #en: advertise_on: Advertise on
-  advertise_on: &quot;Afficher une publicit\xC3\xA9 sur&quot;
+  advertise_on: &quot;Afficher une publicit&#233; sur&quot;
   #en: after_signing_up_youll_receive_an_e_mail_confirmation_message: After signing up, you'll receive an e-mail confirmation message.
-  after_signing_up_youll_receive_an_e_mail_confirmation_message: &quot;Apr\xC3\xA8s vous \xC3\xAAtre connect\xC3\xA9, vous recevrez une courriel de confirmation&quot;
+  after_signing_up_youll_receive_an_e_mail_confirmation_message: &quot;Vous recevrez un message de confirmation par mail &#224; la fin de votre inscription.&quot;
   #en: all_clippings_tagged: All clippings tagged {{tag_name}}
-  all_clippings_tagged: &quot;Tous les clippings taggu\xC3\xA9s avec {{tag_name}}&quot;
+  all_clippings_tagged: &quot;Toutes les photos du p&#234;le-m&#234;le tagg&#233;es {{tag_name}}&quot;
   #en: all_comments: All comments
   all_comments: Tous les commentaires
   #en: all_photos_tagged: All photos tagged {{tag_name}}
-  all_photos_tagged: &quot;Tous les photos taggu\xC3\xA9s avec {{tag_name}}&quot;
+  all_photos_tagged: &quot;Toutes les photos tagg&#233;es {{tag_name}}&quot;
   #en: all_posts_tagged: All posts tagged {{tag_name}}
-  all_posts_tagged: &quot;Tous les messages taggu\xC3\xA9s avec {{tag_name}}&quot;
+  all_posts_tagged: &quot;Tous les messages tagg&#233;s {{tag_name}}&quot;
   #en: all_tags: All tags
-  all_tags: Toutes les tags
+  all_tags: Tous les tags
   #en: all_users_tagged: All users tagged {{tag_name}}
-  all_users_tagged: &quot;Tous les utlisateurs taggu\xC3\xA9s avec {{tag_name}}&quot;
+  all_users_tagged: &quot;Tous les membres tagg&#233;s {{tag_name}}&quot;
   #en: already_have_an_account: Already have an account?
-  already_have_an_account: &quot;Vous avez d\xC3\xA9j\xC3\xA0 un compte?&quot;
+  already_have_an_account: &quot;D&#233;j&#224; inscrit ?&quot;
   #en: an_error_occurred: An error occurred
-  an_error_occurred: Une erreur c'est produite
+  an_error_occurred: &quot;Une erreur c'est produite&quot;
   #en: are_you_sure: Are you sure?
-  are_you_sure: &quot;\xC3\x8Ates-vous certains?&quot;
+  are_you_sure: &quot;Etes-vous sur ?&quot;
+  #en: are_you_sure_you_want_to_delete_this_photo: &quot;Are you sure you want to delete this photo?&quot;
+  are_you_sure_you_want_to_delete_this_photo: &quot;Etes vous sur de vouloir supprimer cette photo ?&quot;
+  #en: are_you_sure_you_want_to_delete_this_post: &quot;Are you sure you want to delete this post?&quot;
+  are_you_sure_you_want_to_delete_this_post: &quot;Etes vous sur de vouloir supprimer ce message ?&quot;
+  #en: are_you_sure_you_want_to_permanently_delete_this_comment: &quot;Are you sure you want to permanently delete this comment?&quot;
+  are_you_sure_you_want_to_permanently_delete_this_comment: &quot;Etes vous sur de vouloir supprimer ce commentaire ?&quot;
   #en: are_you_sure_you_want_to_permanently_delete_this_user: Are you sure you want to permanently delete this user?
-  are_you_sure_you_want_to_permanently_delete_this_user: &quot;\xC3\x8Ates-vous certains?&quot;
+  are_you_sure_you_want_to_permanently_delete_this_user: &quot;Etes vous sur de vouloir supprimer cet utilisateur ?&quot;
+  #en: assume_id: Assume ID
+  assume_id: Endosser cet ID
+  #en: assume_user_id: &quot;Assume this user's ID&quot;
+  assume_user_id: &quot;Endosser l'ID de l'utilisateur&quot;
   #en: assign_role: Assign role
-  assign_role: &quot;Assigner un r\xC3\xB4le&quot;
+  assign_role: &quot;Attribuer le r&#244;le&quot;
+  #en: audience: Audience
+  audience: Audience
   #en: author: Author
-  author: Autheur
+  author: Auteur
   #en: back: Back
   back: Retour
   #en: back_to_all_users: Back to all users
-  back_to_all_users: Retour aux utilisateurs
+  back_to_all_users: Retour aux membres
+  #en: back_to_my_photos: Back to my photos
+  back_to_my_photos: Retour &#224; mes photos
+  #en: back_to_all_statistics: Back to all statistics
+  back_to_all_statistics: Retour aux statistiques
+  #en: banner_subtitle_required: &quot;Banner subtitle (required):&quot;
+  banner_subtitle_required: &quot;Sous-titre du bandeau (obligatoire) :&quot;
+  #en: banner_title_required: &quot;Banner title (required):&quot;
+  banner_title_required: &quot;Titre du bandeau (obligatoire) :&quot;
+  #en: begin: begin
+  begin: d&#233;but
+  #en: begin_required: begin (required)
+  begin_required: d&#233;but (obligatoire)
+  #en: bigger_font_size_more_popular_tag: &quot;Bigger font size = more popular tag&quot;
+  bigger_font_size_more_popular_tag: &quot;Caract&#232;res plus grands = Tag plus fr&#233;quent.&quot;
   #en: birthday: Birthday
-  birthday: Date d'anniversaire
-  #en: birthday__gender: Birthday &amp; Gender
-  birthday__gender: Date d'anniversaire &amp; genre
+  birthday: Date de naissance
+  #en: birthday_gender: Birthday &amp; Gender
+  birthday_gender: Date de naissance &amp; Sexe
+  #en: blog: Blog
+  blog: Blog
+  #en: body_text: Body Text
+  body_text: Message
+  #en: body_text_required: Body Text (required)
+  body_text_required: Message (obligatoire)
+  #en: bookmarklet: bookmarklet
+  bookmarklet: lien d'ajout &#224; votre p&#234;le-m&#234;le
   #en: browse_all_members: browse all members
-  browse_all_members: Naviguer parmis les utilisateurs
+  browse_all_members: parcourir la liste des membres
+  #en: browse_content_by_tags: Browse content by tags
+  browse_content_by_tags: Parcourir par tags
   #en: by: by
   by: &quot;par &quot;
   #en: by_looking_at_the: by looking at the
-  by_looking_at_the: en regardant le
+  by_looking_at_the: en regardant la
+  #en: cancel: Cancel
+  cancel: Annuler
+  #en: cancel_and_go_back_to: cancel and go back to
+  cancel_and_go_back_to: annuler et retourner &#224;
+  #en: cancel_and_go_back_to_all_contests: cancel and go back to all contests
+  cancel_and_go_back_to_all_contests: annuler et retourner aux concours
+  #en: cancel_and_go_back_to_all_features: cancel and go back to all features
+  cancel_and_go_back_to_all_features: annuler et retourner aux fonctionnalit&#233;s
+  #en: cancel_and_go_back_to_my_clippings: cancel and go back to my clippings
+  cancel_and_go_back_to_my_clippings: annuler et retourner &#224; mon p&#234;le-m&#234;le
+  #en: cancel_and_go_back_to_my_contests: cancel and go back to my contests
+  cancel_and_go_back_to_my_contests: annuler et retourner &#224; mes concours
+  #en: cancel_and_go_back_to_pages: cancel and go back to pages
+  cancel_and_go_back_to_pages: annuler et retourner aux pages
+  #en: cancel_and_go_back_to_my_photos: cancel and go back to my photos
+  cancel_and_go_back_to_my_photos: annuler et retourner &#224; mes photos
+  #en: cancel_and_go_back_to_my_posts: cancel and go back to my posts
+  cancel_and_go_back_to_my_posts: annuler et retourner &#224; mes messages
+  #en: cancel_and_go_back_to_photo_manager: &quot;Cancel and go back to photo manager&quot;
+  cancel_and_go_back_to_photo_manager: &quot;Annuler et revenir &#224; mes photos&quot;
+  #en: categories: Categories
+  categories: Cat&#233;gories
+  #en: category: Category
+  category: Cat&#233;gorie
+  #en: category_was_successfully_created: Category was successfully created.
+  category_was_successfully_created: La cat&#233;gorie a &#233;t&#233; cr&#233;&#233;e avec succ&#232;s.
+  #en: check_out_this_story_on: Check out this story on {{site}}
+  check_out_this_story_on: &quot;Va voir ce texte sur {{site}}&quot;
+  #en: choices: Choices
+  choices: Choix
   #en: choose_a_photo_for_your_profile: &quot;Choose a photo for your profile:&quot;
-  choose_a_photo_for_your_profile: Choisissez une photo pour votre profile
+  choose_a_photo_for_your_profile: &quot;Choisissez une photo pour votre profil :&quot;
   #en: choose_a_photo_to_upload: &quot;Choose a photo to upload:&quot;
-  choose_a_photo_to_upload: &quot;Choisissez une photo &quot;
+  choose_a_photo_to_upload: &quot;Choisissez une photo &#224; t&#233;l&#233;charger :&quot;
   #en: choose_your_location: Choose your location
-  choose_your_location: Choisissez une location
+  choose_your_location: S&#233;lectionnez votre situation g&#233;ographique 
+  #en: click_here: click here
+  click_here: cliquez ici
+  #en: click_here_to_enter_this_contest: &quot;Click here to enter this contest!&quot;
+  click_here_to_enter_this_contest: &quot;Cliquez ici pour participer &#224; ce concours !&quot;
   #en: click_here_to_retrieve_it: Click here to retrieve it
-  click_here_to_retrieve_it: Cliquer ici pour l'avoir
+  click_here_to_retrieve_it: &quot;Cliquez ici pour l'obtenir&quot;
   #en: click_here_to_sign_up: Click here to sign up
-  click_here_to_sign_up: Cliquer ici pour vous enregistrer
+  click_here_to_sign_up: Cliquez ici pour vous inscrire
+  #en: click_here_to_sign_up_for_an_account_and_enter: Click here to sign up for an account and enter
+  click_here_to_sign_up_for_an_account_and_enter: Cliquez ici pour vous inscrire et vous connecter
   #en: click_here_to_upload_one: Click here to upload one!
-  click_here_to_upload_one: &quot;Cliquer ici pour en t\xC3\xA9l\xC3\xA9charger une&quot;
+  click_here_to_upload_one: &quot;Ajoutez en une !&quot;
+  #en: click_here_to_view_as_a_list: Click here to view as a list
+  click_here_to_view_as_a_list: Cliquez ici pour voir la liste
   #en: click_on_an_image_below_to_clip_it: Click on an image below to clip it.
-  click_on_an_image_below_to_clip_it: Cliquer sur une image pour l'attacher.
+  click_on_an_image_below_to_clip_it: Cliquer sur une des images ci-dessous pour la redimensionner.
   #en: click_the_activation_link_in_the_e_mail_to_log_in: Click the activation link in the e-mail to log in.
-  click_the_activation_link_in_the_e_mail_to_log_in: Clicker le lien d'activation du courriel pour vous connecter
+  click_the_activation_link_in_the_e_mail_to_log_in: &quot;Cliquez sur le lien d'activation dans l'email pour vous connecter.&quot;
+  #en: click_to_accept_it: Click to accept it!
+  click_to_accept_it: Cliquez ici pour accepter !
   #en: clipping_comments: Clipping Comments
-  clipping_comments: Commentaires d'attachments
+  clipping_comments: Commentaires sur le p&#234;le-m&#234;le
+  #en: clipping_from_user: Clipping from {{user}}
+  clipping_from_user: Photo du p&#234;le-m&#234;le de {{user}}
   #en: clipping_was_successfully_created: Clipping was successfully created.
-  clipping_was_successfully_created: &quot;Attachment cr\xC3\xA9\xC3\xA9 avec succes&quot;
+  clipping_was_successfully_created: &quot;la photo a &#233;t&#233; ajout&#233;e &#224; votre p&#234;le-m&#234;le avec succ&#232;s.&quot;
   #en: clippings: Clippings
-  clippings: Attachements
+  clippings: Photos du p&#234;le-m&#234;le
+  #en: clippings_are_a_way_to_save_images_you_like_from_around_the_web: Clippings are a way to save images you like from around the Web
+  clippings_are_a_way_to_save_images_you_like_from_around_the_web: Votre p&#234;le-m&#234;le vous permet de collectionner des photos trouv&#233;es sur internet
+  #en: clippings_let_you_to_save_cool_images_from_around_the_web: Clippings let you to save cool images from around the Web.
+  clippings_let_you_to_save_cool_images_from_around_the_web: Votre p&#234;le-m&#234;le vous permet de collectionner des images sympas trouv&#233;es sur le web.
+  #en: clippings_tagged: Clippings tagged
+  clippings_tagged: &quot;Les photos de p&#234;le-m&#234;le tagg&#233;es&quot;
   #en: close_this_message: Close this message
   close_this_message: Fermer ce message
+  #en: comma_separated: (comma separated)
+  comma_separated: (s&#233;par&#233;s par une virgule)
   #en: comma_separated_keywords_that_describe_you: Comma-separated keywords that describe you.
-  comma_separated_keywords_that_describe_you: &quot;Mots s\xC3\xA9par\xC3\xA9s par des virgule vous d\xC3\xA9crivant&quot;
+  comma_separated_keywords_that_describe_you: Les mots clefs qui vous d&#233;crivent s&#233;par&#233;s par une virgule.
+  #en: comment_character_limit: (2000 character limit)
+  comment_character_limit: (limit&#233; &#224; 2000 caract&#232;res)
   #en: comment_could_not_be_deleted: Comment could not be deleted.
-  comment_could_not_be_deleted: &quot;LE commentaire n'a pu \xC3\xAAtre effac\xC3\xA9&quot;
+  comment_could_not_be_deleted: &quot;Le commentaire n'a pas pu &#234;tre supprim&#233;.&quot;
   #en: comment_save_error: Your comment couldn't be saved.
-  comment_save_error: &quot;Commentaire non sauvegard\xC3\xA9&quot;
+  comment_save_error: &quot;Votre commentaire n'a pas pu &#234;tre enregistr&#233;.&quot;
   #en: comment_was_successfully_created: Comment was successfully created.
-  comment_was_successfully_created: &quot;Commentaire cr\xC3\xA9\xC3\xA9&quot;
+  comment_was_successfully_created: Le commentaire &#224; &#233;t&#233; cr&#233;&#233; avec succ&#232;s.
   #en: comments: Comments
   comments: Commentaires
-  #en: comments_count: &quot;{{count}} {{count}} comments&quot;
-  comments_count: &quot;{{count}} {{count}} commentaires&quot;
+  #en: comments_deleted: Comments deleted
+  comments_deleted: Commentaires supprim&#233;s
+  #en: comments_rss: Comments RSS
+  comments_rss: Flux RSS des commmentaires
   #en: community_tagline: CommunityEngine Rocks!
-  community_tagline: Surfmontreal.com
+  community_tagline: CommunityEngine Rocks !
+  #en: compose: Compose
+  compose: Ecrire
+  #en: compose_message: Compose message
+  compose_message: Ecrire un message
   #en: confirm_password: Confirm Password
-  confirm_password: Confirmer le mot de passe
+  confirm_password: Confirmez votre mot de passe
   #en: contest_was_successfully_created: Contest was successfully created.
-  contest_was_successfully_created: &quot;Concours cr\xC3\xA9\xC3\xA9 avec succ\xC3\xA8s&quot;
+  contest_was_successfully_created: Le concours a &#233;t&#233; cr&#233;&#233; avec succ&#232;s.
   #en: contests: Contests
-  contests: concours
+  contests: Concours
+  #en: contest_entries: Contest Entries
+  contest_entries: Inscriptions au concours
   #en: country: Country
   country: Pays
   #en: create: Create
-  create: &quot;Cr\xC3\xA9er&quot;
-  #en: create_a_clipping_: &quot;Create a clipping &quot;
-  create_a_clipping_: &quot;Cr\xC3\xA9er un attachement&quot;
-  #en: create_a_post: Create a post
-  create_a_post: &quot;Cr\xC3\xA9er un message&quot;
+  create: Cr&#233;er
   #en: create_an_account: Create an account
-  create_an_account: &quot;Cr\xC3\xA9er un compte&quot;
+  create_an_account: Cr&#233;er un compte
+  #en: create_a_clipping: Create a clipping
+  create_a_clipping: Ajouter une photo &#224; mon p&#234;le-m&#234;le
+  #en: create_a_post: Create a post
+  create_a_post: Poster un message
+  #en: create_new_forum: Create new forum
+  create_new_forum: Cr&#233;er un nouveau forum
   #en: create_your_account: Create Your Account
-  create_your_account: &quot;Cr\xC3\xA9er un compte&quot;
+  create_your_account: Cr&#233;er votre compte
+  #en: created_at: Created at
+  created_at: Cr&#233;&#233; le
+  #en: custom_friendly_local: custom, friendly, local
+  custom_friendly_local: &quot;assidu, sympa, proche&quot;
   #en: dashboard: Dashboard
-  dashboard: Tableau de bord
+  dashboard: Espace personnel
   #en: dashboard_friends: Once you start adding friends, you'll be able to track their activity on {{site}} here
-  dashboard_friends: &quot;Lorsque vous ajouter des amis, vous pourrez suivre leurs activit\xC3\xA9s sur {{site}} ici&quot;
+  dashboard_friends: &quot;Vous pourrez suivre sur cette page l'activit&#233;  de vos amis sur {{site}}.&quot;
+  #en: date: Date
+  date_title: Date
   #en: date_created: Date Created
-  date_created: &quot;Date de cr\xC3\xA9ation&quot;
+  date_created: Date de cr&#233;ation
   #en: date_published: Date Published
   date_published: Date de publication
+  #en: days_ago: {{count}} days ago
+  days_ago:
+    one: &quot;il y a 1 jour&quot;
+    other: &quot;il y a {{count}} jours&quot;
+  #en: deactivate_link: Click here to deactivate your account
+  deactivate_link: Cliquer ici pour d&#233;sactiver votre compte
+  #en: deactivate_tip: Deactivating your account will remove your profile from the site. 
+  deactivate_tip: La d&#233;sactivation de votre compte entrainera la suppression de votre profil sur le site.
+  #en: deactivate_confirmation: Are you sure you want to deactivate your account?
+  deactivate_confirmation: &quot;Etes vous certain(e) de vouloir d&#233;sactiver votre compte ?&quot;
+  #en: deactivate_completed: Thanks. Your account has been deactivated and you have been logged out.
+  deactivate_completed: Merci de votre visite. Votre compte a &#233;t&#233; d&#233;sactiv&#233; et vous avez &#233;t&#233; d&#233;connect&#233;.
   #en: delete: Delete
-  delete: &quot;Effac\xC3\xA9&quot;
-  #en: delete_post: Delete post
-  delete_post: Effacer le message
+  delete: Supprimer
+  #en: delete_selected: Delete selected
+  delete_selected: Supprimer la s&#233;lection
   #en: delete_this_event: Delete this event
-  delete_this_event: &quot;Effacer l'\xC3\xA9v\xC3\xA8nement&quot;
+  delete_this_event: Supprimer cet &#233;v&#232;nement
   #en: delete_this_forum: Delete this forum
-  delete_this_forum: Effacer le forum
-  #en: delete_this_post_forever: Delete this post forever?
-  delete_this_post_forever: Effacer ce message?
+  delete_this_forum: Supprimer ce forum
+  #en: delete_this_page: Delete this page
+  delete_this_page: Supprimer cette page
+  #en: delete_this_photo: Delete this photo
+  delete_this_photo: Supprimer cette photo
+  #en: delete_this_post: Delete this post?
+  delete_this_post: Supprimer ce message ?
   #en: delete_this_topic_forever: Delete this topic forever?
-  delete_this_topic_forever: Effacer ce sujet?
+  delete_this_topic_forever: Supprimer d&#233;finitivement cette discussion ?
+  #en: delete_this_user: Delete this user
+  delete_this_user: Supprimer cet utilisateur
+  #en: deny: Deny
+  deny: Refuser
+  #en: denied: denied
+  denied: refus&#233;
+  #en: denied_friendships: Denied Friendships
+  denied_friendships: Invitations rejet&#233;es
+  #en: description: Description
+  description: Description
+  #en: destroy: Destroy
+  destroy: D&#233;truire
   #en: dont_have_an_account: Don't have an account?
-  dont_have_an_account: Vous n'avez pas de compte?
+  dont_have_an_account: &quot;Pas encore inscrit ?&quot;
   #en: dont_wait_its: Don't wait! It's
-  dont_wait_its: N'attendez plus! c'est
+  dont_wait_its: &quot;Vous pouvez nous contacter &#224; tout moment sur&quot;
   #en: draft: draft
   draft: brouillon
+#  #en: drag_and_drop_up_to_three_skills_into_the_gray_area_above: Drag and drop up to three skills into gray area above.
+  drag_and_drop_up_to_three_skills_into_the_gray_area_above: &quot;Faites glisser jusqu'&#224; 3 comp&#233;tences dans la zone gris&#233;e ci-dessus.&quot;
+#  #en: drag_the_bookmarklet: Drag the {{site}}-It! bookmarklet to your bookmarks toolbar.
+  drag_the_bookmarklet: &quot;Faites glisser le lien {{site}}-it! sur votre barre de favoris.&quot;
+  #en: drag_this_to_your_bookmarks_toolbar: Drag this to your bookmarks toolbar
+  drag_this_to_your_bookmarks_toolbar: Faites glisser ceci dans votre barre de favoris
+  #en: e_mail: E-mail
+  e_mail: Email
   #en: e_mail_address: E-mail address
-  e_mail_address: Adresse courriel
-  #en: earlier_posts: &quot;&amp;laquo; Earlier posts&quot;
-  earlier_posts: &quot;&amp;laquo; Message plus r\xC3\xA9cents&quot;
+  e_mail_address: Adresse email
+  #en: e_mail_notification: E-mail Notification
+  e_mail_notification: Alerte par mail
   #en: edit: Edit
-  edit: Modifier
+  edit: Editer
   #en: edit_account: Edit account
-  edit_account: Modifer le compte
-  #en: edit_forum: Edit Forum
-  edit_forum: Modifier le Forum
-  #en: edit_post: Edit Post
-  edit_post: Modifier le message
-  #en: edit_profile: Edit profile
-  edit_profile: Modification du profile
+  edit_account: Editer mon compte
+  #en: edit_contest: Edit Contest
+  edit_contest: Editer le concours
+  #en: edit_event: Edit event
+  edit_event: Editer l'&#233;v&#232;nement
+  #en: edit_forum: Edit forum
+  edit_forum: Editer le forum
+  #en: edit_page: Edit page
+  edit_page: Editer la page
+  #en: edit_post: Edit post
+  edit_post: Editer le message # #en: edit_profile: Edit profile
+  edit_profile: Editer mon profil
   #en: edit_this_event: Edit this event
-  edit_this_event: &quot;Modification de l'\xC3\xA9v\xC3\xA8nnement&quot;
-  #en: edit_topic: Edit Topic
-  edit_topic: Modification du sujet
-  #en: edit_your_account_settings_instead: Edit your account settings instead?
-  edit_your_account_settings_instead: &quot;Modifiez la configuration de votre compte \xC3\xA0 la place?&quot;
+  edit_this_event: &quot;Editer cet &#233;v&#232;nement&quot;
+  #en: edit_this_photo_details: Edit this photo's details
+  edit_this_photo_details: Editer les d&#233;tails de cette photo
+  #en: edit_topic: Edit topic
+  edit_topic: Editer la discussion
+  #en: edit_your_account_settings_instead: &quot;Edit your account settings instead?&quot;
+  edit_your_account_settings_instead: &quot;Modifier la configuration de votre compte ?&quot;
+  #en: edit_your_user_profile: Edit your user profile?
+  edit_your_user_profile: Modifier votre profil ?
   #en: editing_ad: Editing ad
-  editing_ad: &quot;Modification de la publicit\xC3\xA9&quot;
+  editing_ad: Editer la publicit&#233;
   #en: editing_category: Editing category
-  editing_category: &quot;Modification de cat\xC3\xA9gorie&quot;
+  editing_category: Editer la cat&#233;gorie
+  #en: editing_clipping: Editing clipping
+  editing_clipping: Editer la photo du p&#234;le-m&#234;le
+  #en: editing_homepage_feature: Editing homepage feature
+  editing_homepage_feature: &quot;Editer la page d'accueil&quot;
+#  #en: editing_metro_area: Editing Metro Area
+  editing_metro_area: Editer la zone de m&#233;tro
+  #en: editing_photo: Editing photo
+  editing_photo: Editer la photo
   #en: editing_post: Editing post
-  editing_post: Modification
+  editing_post: Editer le message
+#  #en: editing_skill: Editing skill
+  editing_skill: Editer la comp&#233;tence
+  #en: email_addresses: Email Addresses
+  email_addresses: Adresses email
   #en: email_signup_thanks: Thanks for signing up! You should receive an e-mail confirmation shortly at {{email}}
-  email_signup_thanks: &quot;Merci de vous \xC3\xAAtre enregistr\xC3\xA9! Vous devriez recevoir un courriel de confirmation d'ici peu \xC3\xA0 {{email}}&quot;
+  email_signup_thanks: &quot;Merci de votre inscription ! Vous allez recevoir un mail de confirmation dans votre boite {{email}}&quot;
+  #en: email_this_story_to_friends: &quot;E-mail this story to friends&quot;
+  email_this_story_to_friends: &quot;Envoyer ce texte &#224; des amis&quot;
+  #en: email_to_friends: E-mail to friends
+  email_to_friends: Envoyer &#224; des amis
+  #en: end: end
+  end: fin
   #en: end_date: End date
   end_date: Date de fin
+  #en: end_required: end (required)
+  end_required: fin (obligatoire)
+  #en: end_tome: End time
+  end_tome: Heure de fin
+  #en: enter_a_message: Enter a message
+  enter_a_message: Saisissez un message
   #en: enter_e_mail_addresses: Enter e-mail addresses
-  enter_e_mail_addresses: Entrer une adresse courriel
-  #en: enter_your_email_address: &quot;Enter your email address:&quot;
-  enter_your_email_address: Entrer votre adresse courriel
+  enter_e_mail_addresses: Saisissez les emails de vos amis
+  #en: enter_e_mail_addresses_comma_sep: Enter e-mail addresses (comma-separated)
+  enter_e_mail_addresses_comma_sep: Saisissez les adresses email (s&#233;par&#233;es par une virgule)
+  #en: enter_your_email_address: &quot;Enter your email address&quot;
+  enter_your_email_address: &quot;Saisissez votre adresse email&quot;
+  #en: error: Error!
+  error: Erreur !
+#  #en: estimated_total_for_this_month: Estimated total for this month
+  estimated_total_for_this_month: Montant estim&#233; pour ce mois
+#  #en: estimated_writers_costs_this_month: &quot;Estimated writers' costs this month&quot;
+  estimated_writers_costs_this_month: &quot;Co&#251;t estim&#233; des contributeurs pour ce mois&quot;
   #en: event_was_successfully_created: Event was successfully created.
-  event_was_successfully_created: &quot;\xC3\x89v\xC3\xA8nement cr\xC3\xA9\xC3\xA9 avec succ\xC3\xA8s&quot;
+  event_was_successfully_created: &quot;L'&#233;v&#232;nement a &#233;t&#233; cr&#233;&#233; avec succ&#232;s.&quot;
   #en: events: Events
-  events: &quot;\xC3\x89v\xC3\xA8nement&quot;
+  events: Ev&#232;nements
+  #en: every_person_has_something_to_say: Every single person has something to say, something to give, something that will help someone else. Join in!
+  every_person_has_something_to_say: &quot;Tout le monde &#224; des choses &#224; dire, &#224; proposer, des id&#233;es qui peuvent aider les autres. Rejoignez nous !&quot;
+  #en: expert_in: expert in
+  expert_in: expert en
   #en: explore_site: Explore {{site}}
-  explore_site: Explorer {{site}}
-  #en: favorited: favorited
-  favorited: &quot;Facoris\xC3\xA9&quot;
-  #en: featured_posts: Featured Posts
-  featured_posts: Affichage
-  #en: featured_writer: Featured Writer
-  featured_writer: Blogueur
-  #en: features: Features
-  features: &quot;fonctionnalit\xC3\xA9s&quot;
+  explore_site: &quot;Parcourir {{site}}&quot;
+#  #en: failed: failed
+  failed: a &#233;chou&#233;
+  #en: faq: FAQ
+  faq: FAQ
+  #en: faq_section: FAQ section
+  faq_section: Rubrique FAQ
+  #en: favorites: Favorites
+  favorites: Favoris
+  #en: favorite_this: Favorite this
+  favorite_this: Ajouter &#224; mes favoris
+#  #en: featured_posts: Featured posts
+  featured_posts: &quot;Avis d'experts&quot;
+#  #en: featured_writer: Featured writer
+  featured_writer: Expert
+#  #en: featured_writers: Featured writers
+  featured_writers: Experts
+#  #en: features: Features
+  features: Caract&#233;ristiques
+  #en: feel_free_to_embed_images_or_videos: Feel free to embed images or videos.
+  feel_free_to_embed_images_or_videos: Vous pouvez inclure des photos ou des vid&#233;os.
   #en: female: Female
-  female: Femelle
+  female: Femme
+  #en: filename: Filename
+  filename: Nom de fichier
   #en: find_an_expert: Find an Expert
-  find_an_expert: Trouver un expert
+  find_an_expert: Trouver un Expert
+  #en: find_an_expert_in: Find an Expert in
+  find_an_expert_in: Trouver un Expert en
+  #en: find_experts: Find experts
+  find_experts: Trouver des experts
+  #en: find_out_where_to_be_and_when_to_be_there: Find out where to be, and when to be there.
+  find_out_where_to_be_and_when_to_be_there: &quot;D&#233;couvrez o&#249; et quand il faut y &#234;tre.&quot;
+  #en: for_detailed_contest_rules: &quot;For detailed contest rules,&quot;
+  for_detailed_contest_rules: &quot;Pour consulter le r&#232;glement d&#233;taill&#233; du concours,&quot;
+  #en: for_more_information_on_tags_check_out_the: For more information on tags check out the
+  for_more_information_on_tags_check_out_the: &quot;Pour plus d'information sur les tags, consultez le &quot;
   #en: forgot_your_password: Forgot your password?
-  forgot_your_password: &quot;Mot de passe oubli\xC3\xA9?&quot;
+  forgot_your_password: Mot de passe oubli&#233; ?
   #en: forgot_your_username: Forgot your username?
-  forgot_your_username: &quot;Nom d'utilisateur oubli\xC3\xA9?&quot;
+  forgot_your_username: Pseudo oubli&#233; ?
   #en: forum: Forum
   forum: Forum
   #en: forums: Forums
   forums: Forums
+  #en: post_found: {{count}} posts found
+  post_found:
+    one: &quot;1 Message trouv&#233;&quot;
+    other: &quot;{{count}} Messages trouv&#233;s&quot;
   #en: frequency: Frequency
-  frequency: &quot;F\xC3\xA9quence&quot;
+  frequency: Fr&#233;quence
   #en: frequent_asked_questions: Frequent Asked Questions
-  frequent_asked_questions: &quot;Questions pos\xC3\xA9es f\xC3\xA9quemment&quot;
+  frequent_asked_questions: Foire Aux Questions
   #en: frequently_asked_questions: Frequently Asked Questions
-  frequently_asked_questions: &quot;Questions pos\xC3\xA9es f\xC3\xA9quemment&quot;
+  frequently_asked_questions: Foire Aux Questions
+  #en: friend: friend
+  friend: ami
   #en: friends: Friends
   friends: Amis
   #en: friendship_could_not_be_created: Friendship could not be created
-  friendship_could_not_be_created: &quot;Contacte non cr\xC3\xA9\xC3\xA9&quot;
+  friendship_could_not_be_created: &quot;L'invitation a &#233;chou&#233;&quot;
+  #en: friendship_request_accepted: Friendship request accepted!
+  friendship_request_accepted: Invitation accept&#233;e !
   #en: friendship_request_detail: Friendship request detail
-  friendship_request_detail: &quot;D\xC3\xA9tails de la demande de contacte&quot;
+  friendship_request_detail: D&#233;tails de l'invitation
   #en: friendship_requested: Requested friendship with {{friend}}.
-  friendship_requested: &quot;contact avec {{friend}} demand\xC3\xA9&quot;
-  #en: from: from
-  from: de
+  friendship_requested: &quot;Invitation adress&#233;e &#224; {{friend}}.&quot;
+  #en: from: From
+  from: De
+  #en: from2: From
+  from2: Fe
   #en: gender: Gender
   gender: Genre
+#  #en: get_help_from_someone_who_knows: Get help from someone who knows
+  get_help_from_someone_who_knows: &quot;Demander de l'aide &#224; un Expert&quot;
   #en: get_popular: Get popular.
-  get_popular: Faites vous publier
+  get_popular: Faites vous conna&#238;tre !
+  #en: get_started: &quot;Get started:&quot;
+  get_started: &quot;Pour commencer:&quot;
   #en: get_started_banner: Get started with &lt;a href=&quot;/&quot;&gt;{{site}}&lt;/a&gt; today!
-  get_started_banner: &quot;Commencer \xC3\xA0 utiliser &lt;a href=\&quot;/\&quot;&gt;{{site}}&lt;/a&gt; ajourd'hui!&quot;
-  #en: get_started_invite_some_friends: &quot;Get Started: Invite some friends!&quot;
-  get_started_invite_some_friends: Commencer en invitant des amis.
-  #en: get_started_tell_us_about_yourself: &quot;Get Started: Tell us about yourself&quot;
-  get_started_tell_us_about_yourself: &quot;commencer : d\xC3\xA9crivez vous.&quot;
-  #en: get_started_upload_a_profile_photo: &quot;Get Started: Upload a profile photo&quot;
-  get_started_upload_a_profile_photo: &quot;T\xC3\xA9l\xC3\xA9charger votre photo de profile&quot;
+  get_started_banner: &quot;Inscrivez vous sur &lt;a href='/'&gt;{{site}}&lt;/a&gt; d&#232;s aujourd'hui !&quot;
+  #en: invite_some_friends: &quot;Get Started: Invite some friends!&quot;
+  invite_some_friends: &quot;Invitez des amis !&quot;
+  #en: tell_us_about_yourself: &quot;Tell us about yourself&quot;
+  tell_us_about_yourself: &quot;Pr&#233;sentez vous&quot;
+  #en: upload_a_profile_photo: &quot;Upload a profile photo&quot;
+  upload_a_profile_photo: &quot;Ajoutez une photo &#224; votre profil&quot;
+  #en: go: Go
+  go: Continuer
+  #en: go2: Go
+  go2: Continuer
   #en: go_check_your_e_mail: Go check your e-mail!
-  go_check_your_e_mail: Verifiez vos courriels!
+  go_check_your_e_mail: Allez v&#233;rifier vos mails !
+  #en: go_to_the_forums: go to the forums
+  go_to_the_forums: Aller sur les forums
+  #en: go_to_your_clippings_page_to_get_started: Go to your clippings page to get started.
+  go_to_your_clippings_page_to_get_started: Consultez votre p&#234;le-m&#234;le pour commencer.
   #en: go_to_your_profile: Go to your profile
-  go_to_your_profile: &quot;Allez \xC3\xA0 votre profile&quot;
-  #en: have_an_account_: &quot;Have an account? &quot;
-  have_an_account_: Vous avez un compte?
+  go_to_your_profile: Consulter votre profil
+  #en: has_commented_on_something_that_you_also_commented_on: {{user}} has commented on a {{item}} that you also commented on.
+  has_commented_on_something_that_you_also_commented_on: &quot;{{user}} a comment&#233; le m&#234;me &#233;l&#233;ment que vous.&quot;
+  #en: has_posted_in_a_thread_you_are_monitoring: {{user}} has posted in a thread you are monitoring.
+  has_posted_in_a_thread_you_are_monitoring: &quot;{{user}} a post&#233; un message dans une discussion que vous suivez.&quot;
+  #en: has_something_to_say_to_you_on: {{user}} has something to say to you on {{site}}!
+  has_something_to_say_to_you_on: &quot;{{user}} souhaite vous parler sur {{site}} !&quot;
+  #en: have_an_account: &quot;Have an account? &quot;
+  have_an_account: &quot;Vous avez un compte ?&quot;
   #en: have_something_to_contribute: Have something to contribute?
-  have_something_to_contribute: Vous avez une contribution?
+  have_something_to_contribute: Vous avez des choses &#224; proposer ?
   #en: help: Help
   help: Aide
   #en: home: Home
   home: Accueil
+  #en: homepage_banner_download_msg: Download it now and get started
+  homepage_banner_download_msg: T&#233;l&#233;chargez le maintenant et lancez vous
   #en: homepage_banner_msg: CommunityEngine is the best way to go from zero to hero in no time
-  homepage_banner_msg: &quot;Surfmontreal.com vous permet de garder contacts avec les surfeurs de la r\xC3\xA9gion.&quot;
+  homepage_banner_msg: CommunityEngine est le meilleur moyen d'ouvrir rapidement une communaut&#233;
   #en: homepage_banner_signup_prompt: See how it works
-  homepage_banner_signup_prompt: Essayez le
-  #en: homepage_feature_was_successfully_created: Homepage Feature was successfully created.
-  homepage_feature_was_successfully_created: &quot;\xC3\x89l\xC3\xA9ment de la page d'accueil cr\xC3\xA9\xC3\xA9&quot;
+  homepage_banner_signup_prompt: Regardez comment &#231;a marche
+  #en: homepage_features: Homepage Features
+  homepage_features: &quot;Caract&#233;ristiques de la page d'accueil&quot;
+  #en: hours_ago: {{count}} hours ago
+  hours_ago:
+    one: &quot;il y a 1 heure&quot;
+    other: &quot;il y a {{count}} heures&quot;
+  #en: how_do_i_do_that: How do I do that?
+  how_do_i_do_that: &quot;Comment faire ?&quot;
+  #en: html: HTML
+  html: HTML
+  #en: image: Image
+  image: Image
+  #en: image_url: Image URL
+  image_url: &quot;URL de l'image&quot;
+  #en: in_the_forums: In the forums
+  in_the_forums: Dans les forums
+  #en: in_your_favorites: In your favorites
+  in_your_favorites: Dans vos favoris
   #en: inactive: inactive
   inactive: inactif
+  #en: inbox: Inbox
+  inbox: Boite de r&#233;ception
+  #en: insert: Insert
+  insert: Ins&#233;rer
+  #en: invite_a_friend: Invite a friend
+  invite_a_friend: Inviter un ami
   #en: invitation_was_successfully_created: Invitation was successfully created.
-  invitation_was_successfully_created: &quot;Invitation cr\xC3\xA9\xC3\xA9e avec succ\xC3\xA9s&quot;
-  #en: invite_a_friend: Invite a friend to {{site}}
-  invite_a_friend: &quot;Invit\xC3\xA9 un amis \xC3\xA0 {{site}}&quot;
+  invitation_was_successfully_created: &quot;L'invitation a &#233;t&#233; envoy&#233;e avec succ&#232;s.&quot;
   #en: invite_message: The more people you invite the better {{site}} becomes.
-  invite_message: Plus vous invitez de gens, plus {{site}} deviendra utile.
+  invite_message: &quot;Plus vous invitez d'ami(e)s et plus {{site}} devient convivial !&quot;
   #en: invite_some_customers: Invite some customers!
-  invite_some_customers: Iviter des clients!
+  invite_some_customers: Invitez des clients !
   #en: invite_your_friends_to_join: Invite Your Friends To Join!
-  invite_your_friends_to_join: &quot;Inviter des amis \xC3\xA0 se joindre!&quot;
+  invite_your_friends_to_join: Invitez vos amis !
+  #en: invited_friends: invited some friends to join!
+  invited_friends: a invit&#233; des amis !
+  #en: is_great_check_it_out_youll_love_it: is great, check it out you'll love it!
+  is_great_check_it_out_youll_love_it: &quot;est super. Essaye-le, tu vas adorer !&quot;
+  #en: items: Items
+  items: Articles
+  #en: items_tagged: Items tagged
+  items_tagged: &quot;Les &#233;l&#233;ments tagg&#233;s&quot;
   #en: joined: joined
-  joined: joins
-  #en: last_post: Last Post
-  last_post: Dernier affichage
-  #en: later_posts: &quot;Later posts &amp;raquo; &quot;
-  later_posts: Derniers affichages
+  joined: s'est inscrit(e)
+  #en: joined_the_site: joined {{site}}
+  joined_the_site: &quot;a rejoint {{site}}&quot;
+  #en: just_uploading_one_photo: Just uploading one photo?
+  just_uploading_one_photo: &quot;Vous n'avez qu'une photo &#224; t&#233;l&#233;charger ?&quot;
+  #en: keywords: Keywords
+  keywords: Mots clefs
+  #en: large: Large
+  large: Grand
+  #en: last: last
+  last: dernier
+  #en: last_post: Last post
+  last_post: Dernier message
   #en: left_a_comment: &quot;left a comment:&quot;
-  left_a_comment: &quot;a laiss\xC3\xA9 un commentaire&quot;
+  left_a_comment: &quot;a fait un commentaire :&quot;
   #en: links: Links
   links: Liens
+  #en: listing_invitations: Listing invitations
+  listing_invitations: Liste des invitations
   #en: loading_images: Loading images
-  loading_images: &quot;images en cours de t\xC3\xA9l\xC3\xA9chargement&quot;
+  loading_images: Chargement des photos
+  #en: loading_recent_content: Loading recent content...
+  loading_recent_content: Chargement du contenu r&#233;cent ...
+  #en: location: Location
+  location: Situation g&#233;ographique
+  #en: log_in: Log in
+  log_in: Connexion
+  #en: log_in_to_create_a_new_topic: Log in to create a new topic
+  log_in_to_create_a_new_topic: Vous devez &#234;tre connect&#233; pour cr&#233;er une nouvelle discussion
+  #en: log_in_to_leave_a_comment: Log in to leave a comment
+  log_in_to_leave_a_comment: Vous devez &#234;tre connect&#233; pour poster un commmentaire
+  #en: log_in_to_reply_to_this_topic: Log in to reply to this topic
+  log_in_to_reply_to_this_topic: Vous devez &#234;tre connect&#233; pour participer &#224; cette discussion
+  #en: log_in_to_site: Log in to {{site}}
+  log_in_to_site: &quot;Connectez vous sur {{site}}&quot;
+  #en: log_in_to_vote: Log in to vote
+  log_in_to_vote: Vous devez &#234;tre connect&#233; pour voter
+  #en: log_in_to_your: Log in to your
+  log_in_to_your: Connectez vous &#224; votre
+  #en: log_out: Log Out
+  log_out: D&#233;connexion
+  #en: log_out_of_your: Log out of your 
+  log_out_of_your: D&#233;connexion de votre
+  #en: logged_in: &quot;Logged in:&quot;
+  logged_in: &quot;Connect&#233; :&quot;
+#  #en: logged_into_the_site: logged into the site
+  logged_into_the_site: s'est connect&#233;
+  #en: login: Login
+  login: Connexion
+  #en: logins: Logins
+  logins: Connexions
+  #en: locked: Locked
+  locked: V&#233;rrouill&#233;
+  #en: locked2: (locked)
+  locked2: (verrouill&#233;)
+  #en: look_for_a_message_from: Look for a message from: {{from}}
+  look_for_a_message_from: &quot;Cherchez un message de {{from}}&quot;
+  #en: looking_for_most_x: Looking for {{link}}
+  looking_for_most_x: &quot;voir {{link}}&quot;
+  #en: most_recent: most recent
+  most_recent: les plus r&#233;cents
+  #en: most_popular: most popular
+  most_popular: les plus populaires
+  #en: make_moderator: Make moderator
+  make_moderator: Elire mod&#233;rateur
+  #en: make_page_public: Make page public
+  make_page_public: Rendre cette page publique
+  #en: make_my_profile_public: Make my profile public
+  make_my_profile_public: Rendre mon profil public
+  #en: make_this_my_profile_photo: Make this my profile photo
+  make_this_my_profile_photo: Faire de cette photo ma photo de profil
+  #en: male: Male
+  male: Homme
+#  #en: manage: &quot;Manage:&quot;
+  manage: &quot;G&#233;rer :&quot;
+  #en: manage_pages: Manage Pages
+  manage_pages: G&#233;rer les Pages
+  #en: manage_posts: Manage Posts
+  manage_posts: G&#233;rer mes messages
+  #en: medium: Medium
+  medium: Moyen
+  #en: megabyte_upload_limit: {{count}} megabytes upload limit
+  megabyte_upload_limit:
+    one: &quot;Taille limit&#233;e &#224; 1 m&#233;gaoctet.&quot;
+    other: &quot;Taille limit&#233;e &#224; {{count}} m&#233;gaoctets.&quot;
+  #en: megabyte_upload_limit_per_file: {{count}} megabytes upload limit per file.
+  megabyte_upload_limit_per_file:
+    one: &quot;Taille limit&#233;e &#224; 1 Mo par fichier.&quot;
+    other: &quot;Taille limit&#233;e &#224; {{count}} Mo par fichier.&quot;
+  #en: member: Member
+  member: Membre
+  #en: members: Members
+  members: Membres
+  #en: member_since: Member since
+  member_since: Membre depuis le
+  #en: message: Message
+  message: Message
+  #en: messages_deleted: Messages deleted
+  messages_deleted: Messages supprim&#233;s
+  #en: messages_sent: Messages sent!
+  messages_sent: Messages envoy&#233;s !
+  #en: message_sent: Message sent!
+  message_sent: Message envoy&#233; !
+  #en: read: read
+  read: lu
+  #en: unread: unread
+  unread: non lu
+  #en: unread_messages: {{count}} unread messages
+  unread_messages:
+    one: 1 nouveau message
+    other: &quot;{{count}} nouveaux messages&quot;
+#  #en: metro_area: Metro Area
+  metro_area: Zone de m&#233;tro
+#  #en: metro_areas: Metro Areas
+  metro_areas: Zones de m&#233;tro
+#  #en: metro_area_was_successfully_created: MetroArea was successfully created.
+  metro_area_was_successfully_created: La zone de m&#233;tro a &#233;t&#233; cr&#233;&#233;e avec succ&#232;s.
+  #en: minutes_ago: {{count}} minutes ago
+  minutes_ago:
+    one: &quot;il y a 1 minute&quot;
+    other: &quot;il y a {{count}} minutes&quot;
+  #en: moderator: Moderator
+  moderator: Mod&#233;rateur
+  #en: moderators: Moderators
+  moderators: Mod&#233;rateurs
+  #en: monitored_topics: Monitored Topics
+  monitored_topics: Discussions suivies
+  #en: month: Month
+  month: Mois
+  #en: more: More
+  more: Plus
+  #en: more_about_you: More about you
+  more_about_you: Mais encore ...
+  #en: most_active_1_month: Most active (1 month)
+  most_active_1_month: Le plus actif (depuis 1 mois)
+  #en: my_account: My Account
+  my_account: Mon Compte
+  #en: my_blog: My Blog
+  my_blog: Mon Blog
+  #en: my_blog_posts: My Blog Posts
+  my_blog_posts: Mes Articles
+  #en: my_clippings: My Clippings
+  my_clippings: Mon P&#234;le-m&#234;le
+  #en: my_details: My Details
+  my_details: Mes informations
+  #en: my_friends: My Friends
+  my_friends: Mes Amis
+  #en: my_photos: My Photos
+  my_photos: Mes Photos
+  #en: my_profile: My Profile
+  my_profile: Mon Profil
+  #en: my_recent_comments: My recent comments
+  my_recent_comments: Mes commentaires r&#233;cents
+#  #en: my_skills: My Skills
+  my_skills: Mes comp&#233;tences
+  #en: my_tags: My tags
+  my_tags: Mes tags
+  #en: name: Name
+  name: Nom
+#  #en: navigation_menu_text: Navigation menu text
+  navigation_menu_text: Texte du menu de navigation
+#  #en: need_some_help_contact_our: Need some help?  Check out our
+  need_some_help_contact_our: Besoin d'aide ? Consultez notre
+  #en: need_to_contact_us: Need to contact us?
+  need_to_contact_us: &quot;Pour nous contacter :&quot;
+  #en: new_ad: New Ad
+  new_ad: Nouvelle publicit&#233;
+  #en: new_category: New category
+  new_category: Nouvelle cat&#233;gorie
+  #en: new_clipping: New clipping
+  new_clipping: Nouvelle photo du p&#234;le-m&#234;le
+  #en: new_contest: New contest
+  new_contest: Nouveau concours
+  #en: new_event: New Event
+  new_event: Nouvel &#233;v&#232;nement
+  #en: new_forum: New Forum
+  new_forum: Nouveau forum
+  #en: new_homepage_feature: New Homepage Feature
+  new_homepage_feature: Nouvelle information en page d'accueil
+  #en: new_invitation: New Invitation
+  new_invitation: Nouvelle invitation
+  #en: new_invitation_from: New Invitation from
+  new_invitation_from: Nouvelle invitation de 
+#  #en: new_metro_area: New Metro Area
+  new_metro_area: Nouvelle zone de m&#233;tro
+  #en: new_photo: New photo.
+  new_photo: Ajouter une photo
+  #en: new_photos_multiple_uploader: &quot;New Photos &amp;raquo; Multiple Uploader&quot;
+  new_photos_multiple_uploader: &quot;Ajout de nouvelles photos &amp;raquo; T&#233;l&#233;chargement multiple&quot;
+  #en: new_post: New post
+  new_post: Nouveau message
+#  #en: new_post_for_category: New {{category}}
+  new_post_for_category: &quot;Nouveau dans {{category}}&quot;
+  #en: new_post_text: New Post text
+  new_post_text: Contenu du nouveau message
+#  #en: new_skill: New skill
+  new_skill: Nouvelle comp&#233;tence
+  #en: new_today: New today
+  new_today: &quot;Nouveau aujourd'hui&quot;
+  #en: new_topic: New topic
+  new_topic: Nouvelle discussion
+  #en: new_yesterday: New yesterday
+  new_yesterday: Nouveau hier
+  #en: next: next
+  next: suivant
+  #en: next_page: Next page
+  next_page: Page suivante
+  #en: no_activation_email: No activation e-mail?
+  no_activation_email: &quot;Vous n'avez pas re&#231;u le mail d'activation de votre compte ?&quot;
+  #en: no_comments_found: Sorry, we couldn't find any comments for that {{type}}
+  no_comments_found: &quot;D&#233;sol&#233;, il n'y a pas encore de commentaires sur cet &#233;l&#233;ment.&quot;
+  #en: no_images_uploaded_yet: No images uploaded yet.
+  no_images_uploaded_yet: &quot;Pas encore d'images t&#233;l&#233;charg&#233;es.&quot;
+  #en: no_messages: no messages
+  no_messages: pas de messages
+  #en: no_profile_photo: &quot;No profile photo?&quot;
+  no_profile_photo: &quot;Pas encore de photo ?&quot;
+  #en: no_recent_activity: No recent activity
+  no_recent_activity: &quot;Pas d'activit&#233; r&#233;cente&quot;
+  #en: no_tags: No tags
+  no_tags: Pas de tags
+  #en: notify_email_updates: Notify of community news
+  notify_email_updates: Alerte sur les nouveaut&#233;s
+  #en: notify_me_of_follow_ups_via_email: Notify me of follow ups via e-mail  
+  notify_me_of_follow_ups_via_email: Pr&#233;venez moi par mail des nouveaut&#233;s
+  #en: notify_of_comments: Notify of comments
+  notify_of_comments: Alerte sur les commentaires
+  #en: notify_of_friend_requests: Notify of friend requests
+  notify_of_friend_requests: Alerte sur les invitations
+  #en: of: of
+  of: de
+  #en: offering_was_successfully_created: Offering was successfully created.
+  offering_was_successfully_created: La proposition a &#233;t&#233; cr&#233;&#233;e avec succ&#232;s.
+  #en: on_commentable: On
+  on_commentable: &quot;sur&quot;
+  #en: optional: optional
+  optional: facultatif
+  #en: optional_keywords_describing_this_clipping_separated_by_commas: optional keywords describing this clipping, separated by commas
+  optional_keywords_describing_this_clipping_separated_by_commas: &quot;mots clefs d&#233;crivant cette photo de p&#234;me-m&#234;le, s&#233;par&#233;s par une virgule&quot;
+  #en: optional_keywords_describing_this_forum_separated_by_commas: optional keywords describing this forum, separated by commas
+  optional_keywords_describing_this_forum_separated_by_commas: &quot;mots clefs d&#233;crivant ce forum, s&#233;par&#233;s par une virgule&quot;
+  #en: optional_keywords_describing_this_photo_separated_by_commas: optional keywords describing this photo, separated by commas
+  optional_keywords_describing_this_photo_separated_by_commas: &quot;mots clefs d&#233;crivant cette photo, s&#233;par&#233;s par une virgule&quot;
+  #en: optional_keywords_describing_this_post_separated_by_commas: optional keywords describing this post, separated by commas
+  optional_keywords_describing_this_post_separated_by_commas: &quot;mots clefs d&#233;crivant ce message, s&#233;par&#233;s par une virgule&quot;
+  #en: optional_keywords_describing_this_topic_separated_by_commas: optional keywords describing this topic, separated by commas
+  optional_keywords_describing_this_topic_separated_by_commas: &quot;mots clefs d&#233;crivant cette discussion, s&#233;par&#233;s par une virgule&quot;
+  #en: yes_status: yes
+  yes_status: &quot;oui&quot;
+  #en: no_status: no
+  no_status: &quot;non&quot;
+  #en: or: or
+  or: &quot;ou&quot;
+  #en: page: page
+  page: page
+  #en: page_not_found: The page you are trying to view has been moved or no longer exists.
+  page_not_found: La page que vous essayez de consulter &#224; &#233;t&#233; d&#233;plac&#233;e ou supprim&#233;e.
+  #en: page_was_successfully_created: Page was successfully created.
+  page_was_successfully_created: La page a &#233;t&#233; cr&#233;&#233;e avec succ&#232;s.
+  #en: page_was_successfully_deleted: Page was successfully deleted.
+  page_was_successfully_deleted: La page a &#233;t&#233; supprim&#233;e avec succ&#232;s.
+  #en: page_was_successfully_updated: Page was successfully updated.
+  page_was_successfully_updated: La page a &#233;t&#233; mise &#224; jour avec succ&#232;s.
+  #en: pages: &quot;Pages:&quot;
+  pages: &quot;Pages:&quot;
+  #en: page_tips: &quot;Pages are a good place to put static content that you would rather not post to the blog or the forums.&quot;
+  page_tips: &quot;Les pages vous permettent de publier du contenu statique que vous ne souhaitez pas publier dans les blogs ou les forums.&quot;
+  #en: password: Password
+  password: Mot de passe
+  #en: pending: pending
+  pending: en attente
+  #en: pending_friendships: Pending Friendships
+  pending_friendships: Invitations en attente
+  #en: people: People
+  people: Membres
+  #en: people_who_sign_up_using_your_invitation_will_automatically_be_added_as_your_friends: People who sign up using your invitation will automatically be added as your friends
+  people_who_sign_up_using_your_invitation_will_automatically_be_added_as_your_friends: &quot;Les membres qui s'inscrivent gr&#226;ce &#224; votre invitation seront automatiquement ajout&#233;s &#224; vos amis.&quot;
+  #en: people_who_sign_up_using_your_invitation_will_automatically_be_added_as_your_friends_on: People who sign up using your invitation will automatically be added as your friends on
+  people_who_sign_up_using_your_invitation_will_automatically_be_added_as_your_friends_on: &quot;Les membres qui s'inscrivent gr&#226;ce &#224; votre invitation seront automatiquement ajout&#233;s &#224; vos amis sur&quot;
+  #en: permanently_delete_this_clipping: Permanently delete this clipping?
+  permanently_delete_this_clipping: Supprimer d&#233;finitivement cette photo du p&#234;le-m&#234;le ?
+  #en: permanently_delete_this_event: Permanently delete this event?
+  permanently_delete_this_event: Supprimer d&#233;finitivement cet &#233;v&#232;nement ?
+  #en: permanently_delete_this_post: Permanently delete this post?
+  permanently_delete_this_post: Supprimer d&#233;finitivement ce message ?
+  #en: photo_comments: Photo Comments
+  photo_comments: Commentaires sur la photo
+  #en: photo_description_from_user: {{photo_description}} from {{user}}
+  photo_description_from_user: &quot;{{photo_description}} de {{user}}&quot;
+  #en: photo_from_user: Photo from {{user}}
+  photo_from_user: &quot;Photo de {{user}}&quot;
+  #en: photo_message: Your profile photo represents you on {{site}}. You can change it later.
+  photo_message: &quot;Votre photo de profil vous repr&#233;sente sur {{site}}. Vous pourrez la modifier plus tard.&quot;
+  #en: photo_was_successfully_created: Photo was successfully created.
+  photo_was_successfully_created: Votre photo a &#233;t&#233; ajout&#233;e avec succ&#232;s.
+  #en: photos: {{count}} Photos
+  photos:
+    one: 1 Photo
+    other: &quot;{{count}} Photos&quot;
+  #en: photos_should_be_x_pixels: Photos should be 300x300 pixels.
+  photos_should_be_x_pixels: Les photos ne doivent pas exc&#233;der le format 300x300 pixels.
+  #en: photos_tagged: Photos tagged
+  photos_tagged: &quot;Les photos tagg&#233;es&quot;
+  #en: photo_tip_1: Photos show the world your creativity. Pick your best pics, and give them good titles and descriptions.
+  photo_tip_1: &quot;Les photos illustrent votre cr&#233;ativit&#233;. Choisissez vos meilleurs clich&#233;s, et ajoutez leur un titre et une description appropri&#233;s.&quot;
+  #en: photo_tip_2: Use tags to organize your photos. Separate tags with commas.
+  photo_tip_2: Utilisez des tags pour classer vos photos. S&#233;parez les tags par une virgule.
+  #en: please_activate_your_new_account: Please activate your new {{site}} account
+  please_activate_your_new_account: &quot;Merci d'activer votre compte sur {{site}}&quot;
+  #en: please_log_in: Please log in.
+  please_log_in: Merci de vous authentifier.
+  #en: please_post_something_at_least: Please post something at least...
+  please_post_something_at_least: Merci de d&#233;poser au moins un message ...
+  #en: plural_posts: &quot;{{count}} posts&quot;
+  plural_posts:
+    one: &quot;1 message&quot;
+    other: &quot;{{count}} messages&quot;
+  #en: popular: Popular
+  popular: A la Une
+#  #en: popular_category: Popular {{name}}
+  popular_category: &quot;Populaire {{name}}&quot;
+  #en: popular_posts: Popular Posts
+  popular_posts: Les plus consult&#233;s !
+  #en: popular_posts_on: Popular Posts on
+  popular_posts_on: Messages les plus consult&#233;s sur
+  #en: popular_polls: Popular Polls
+  popular_polls: Sondages les plus consult&#233;s
+  #en position: Position
+  position: Position
+  #en: post: Post
+  post: Message
+  #en: posts: Posts
+  posts: Messages
+#  #en: post_a_new_topic: Post a new topic
+  post_a_new_topic: Lancer une nouvelle discussion
+#  #en: post_an_event: Post an event
+  post_an_event: Poster un nouvel &#233;v&#232;nement
+#  #en: post_created_for_category: Your '{{category}}' post was successfully created.
+  post_created_for_category: &quot;Votre message sur &amp;laquo;{{category}}&amp;raquo; a &#233;t&#233; cr&#233;&#233; avec succ&#232;s.&quot;
+#  #en: post_comments: Post Comments
+  post_comments: Ecrire un commentaire
+  #en: postal_code: &quot;Postal code:&quot;
+  postal_code: &quot;Code Postal&quot;
+#  #en: posting_tips: &quot;Posting Tips&quot;
+  posting_tips: &quot;Astuces sur les messages&quot;
+#  #en: post_topic: Post topic
+  post_topic: Proposer une discussion
+  #en: posts_photos_and_bookmarks: {{name}} posts, photos and bookmarks
+  posts_photos_and_bookmarks: &quot;El&#233;ments tagg&#233;s {{name}}&quot;
+  #en: pages_saved_with_draft_status_wont_appear_on_the_site_until_you_publish_them: Pages saved with 'draft' status won't appear on the site until you publish them.
+  pages_saved_with_draft_status_wont_appear_on_the_site_until_you_publish_them: &quot;Les pages sauvegard&#233;es en mode &amp;laquo;brouillon&amp;raquo; n'appara&#238;tront pas sur le site tant que vous ne les aurez pas publi&#233;es.&quot;
+  #en: posts_saved_with_draft_status_wont_appear_in_your_blog_until_you_publish_them: &quot;Posts saved with 'draft' status won't appear in your blog until you publish them.&quot;
+  posts_saved_with_draft_status_wont_appear_in_your_blog_until_you_publish_them: &quot;Les messages sauvegard&#233;s en mode &amp;laquo;brouillon&amp;raquo; n'appara&#238;tront pas dans votre blog tant que vous ne les aurez pas publi&#233;s.&quot;
+  #en: posts_tagged: Posts tagged
+  posts_tagged: &quot;Les messages tagg&#233;s&quot;
+  #en: public: Public
+  public: Public
+  #en: preview: Preview
+  preview: Aper&#231;u
+  #en: previewing_your_post: Previewing your post
+  previewing_your_post: Pr&#233;visualiser votre message
+  #en: previous: previous
+  previous: pr&#233;c&#233;dent
+  #en: print: Print
+  print: Imprimer
+  #en: print_this_story: &quot;Print this story&quot;
+  print_this_story: &quot;Imprimer ce texte&quot;
+  #en: profile: Profile
+  profile: Profil
+  #en: profile_comments: Profile Comments
+  profile_comments: Commentaires sur mon profil
+  #en: profile_photo: Profile Photo
+  profile_photo: Photo du profil
+  #en: profile_photo_change: Change profile photo
+  profile_photo_change: Modifier la photo du profil
+  #en: profile_photo_crop: Crop profile photo
+  profile_photo_crop: Redimensionner la photo du profil
+  #en: profile_privacy: Profile Privacy
+  profile_privacy: Profil priv&#233;/public
+  #en: profile_views: profile views
+  profile_views: Affichages du profil
+#  #en: pros: Pros
+  pros: Experts
+#  #en: pros_skilled_in: Pros skilled in
+  pros_skilled_in: Experts en
+  #en: published: Published
+  published: publi&#233;
+  #en: question: Question
+  question: Question
+  #en: re_type_your_password_to_confirm: &quot;Re-type your password to confirm:&quot;
+  re_type_your_password_to_confirm: &quot;Resaisissez votre mot de passe pour confirmation :&quot;
+  #en: read_more: read more
+  read_more: en savoir plus
+  #en: recent: Recent
+  recent: r&#233;cents
+  #en: recent_activity: Recent activity
+  recent_activity: Activit&#233; r&#233;cente
+#  #en: recent_blog_posts: Recent Blog Posts
+  recent_blog_posts: Derniers articles de mon blog
+  #en: recent_posts: Recent Posts
+  recent_posts: Nouveaux messages
+  #en: recommended_posts: Recommended Posts
+  recommended_posts: Messages conseill&#233;s
+  #en: related_clippings_all_members: Related Clippings (all members)
+  related_clippings_all_members: Photos de p&#234;le-m&#234;le semblables (parmi tous les membres)
+  #en: related_photos_all_members: Related Photos (all members)
+  related_photos_all_members: Photos semblables (parmi tous les membres)
+  #en: related_posts: Related Posts
+  related_posts: Messages semblables
+  #en: related_tags: Related Tags
+  related_tags: Tags associ&#233;s
+  #en: remember_me: Remember me
+  remember_me: Se souvenir de moi
+  #en: remember_you_can_always_change_this_later: Remember, you can always change this later.
+  remember_you_can_always_change_this_later: &quot;Ne vous inqui&#233;tez pas, vous pourrez modifier cela plus tard.&quot;
+  #en: remove_moderator: Remove moderator
+  remove_moderator: Retirer le statut de mod&#233;rateur
+  #en: remove_this_friend: Remove this friend
+  remove_this_friend: Supprimer cet ami
+  #en: reply: Reply
+  reply: R&#233;pondre
+  #en: reply_to_topic: Reply
+  reply_to_topic: R&#233;pondre
+#  #en: request_friendship: Request friendship
+  request_friendship: &quot;Inviter en tant qu'ami&quot;
+#  #en: requested: requested
+  requested: invit&#233;
+#  #en: requested_friendship_with: Requested friendship with
+  requested_friendship_with: Invitation envoy&#233;e &#224;
+#  #en: requesting_friendship: Requesting friendship
+  requesting_friendship: &quot;Invitation re&#231;ue&quot;
+  #en: required: required
+  required: obligatoire
+  #en: required_we_will_send_a_confirmation_e_mail_to_the_address_you_enter: &quot;(Required: We will send a confirmation e-mail to the address you enter.)&quot;
+  required_we_will_send_a_confirmation_e_mail_to_the_address_you_enter: &quot;(Obligatoire : Vous allez recevoir un mail de confirmation &#224; l'adresse indiqu&#233;e.)&quot;
+  #en: required_you_must_be_at_least_years_old_to_sign_up: (Required: you must be at least {{min_age}} years old to sign up.)
+  required_you_must_be_at_least_years_old_to_sign_up: &quot;(Obligatoire : Vous devez avoir au moins {{min_age}} ans pour vous inscrire.)&quot;
+  #en: required_your_username_must_not_contain_numerals_spaces_or_special_characters: (Required: Your username must not contain spaces or special characters.)
+  required_your_username_must_not_contain_numerals_spaces_or_special_characters: &quot;(Obligatoire : Votre pseudo ne doit pas contenir d'espaces ou de caract&#232;res sp&#233;ciaux.)&quot;
+  #en: resend_my_activation_e_mail: Resend my activation e-mail
+  resend_my_activation_e_mail: &quot;Recevoir &#224; nouveau mon mail d'activation&quot;
+  #en: resend_your_activation_e_mail: Resend your activation e-mail
+  resend_your_activation_e_mail: &quot;Renvoyer votre mail d'activation&quot;
+  #en: reset_my_password: Reset my password
+  reset_my_password: R&#233;initialiser mon mot de passe
+  #en: rss: RSS
+  rss: RSS
+  #en: rss_feed: RSS feed
+  rss_feed: Flux RSS
+  #en: run: Run
+  run: Ex&#233;cuter
+  #en: save: Save
+  save: Enregistrer
+  #en: save_and_continue_to_step_three: Save, and continue to step three
+  save_and_continue_to_step_three: &quot;Enregistrer et passer &#224; l'&#233;tape 3&quot;
+  #en: save_changes: Save Changes
+  save_changes: Enregistrer les modifications
+  #en: save_forum: Save Forum
+  save_forum: Enregistrer le forum
+  #en: save_page_as: &quot;Save page as:&quot;
+  save_page_as: &quot;Cette page a le statut :&quot;
+  #en: save_post_as: &quot;Save post as:&quot;
+  save_post_as: &quot;Ce message a le statut :&quot;
+  #en: save_reply: Save reply
+  save_reply: Enregistrer la r&#233;ponse
+  #en: says: says
+  says: dit
+  #en: sb_post_was_deleted: Post '{{title}}' was deleted.
+  sb_post_was_deleted: &quot;Le message &amp;laquo;{{title}}&amp;raquo; a &#233;t&#233; supprim&#233;.&quot;
+  #en: scrapbook: Scrapbook
+  scrapbook: Scrapbook
+  #en: search: Search
+  search: Recherche
+  #en: search_users: Search Users
+  search_users: Chercher les membres
+  #en: searching_for: Searching for
+  searching_for: Chercher
+  #en: see_all: SEE ALL
+  see_all: VOIR TOUT
+  #en: see_all_activity: See all activity
+  see_all_activity: &quot;Voir toute l'activit&#233;&quot;
+  #en: see_all_events: See all events
+  see_all_events: Voir tous les &#233;v&#232;nements
+  #en: see_you_back_here_in_a_short_while: See you back here in a short while.
+  see_you_back_here_in_a_short_while: A tout de suite
+  #en: select_images_to_upload: Select Images to Upload
+  select_images_to_upload: S&#233;lectionnez les images &#224; t&#233;l&#233;charger
+  #en: select_your_city: Select your city
+  select_your_city: S&#233;lectionner ma ville
+  #en: send: &quot;Send&quot;
+  send: &quot;Envoyer&quot;
+  #en: send_me_a_message: &quot;Send me a message&quot;
+  send_me_a_message: &quot;Laisse moi un message&quot;
+  #en: send_invitations: Send Invitations!
+  send_invitations: Envoyer les invitations !
+  #en: send_me_my_username: Send me my username
+  send_me_my_username: Envoyez moi mon pseudo
+  #en: send_this_story_to_friends: Send this message to friends
+  send_this_story_to_friends: Envoyer ce message &#224; des amis
+  #en: sent_messages: Sent messages
+  sent_messages: Messages envoy&#233;s
+  #en: sent_you_a_private_message: {{user}} sent you a private message!
+  sent_you_a_private_message: &quot;Vous avez re&#231;u un message de {{user}} !&quot;
+  #en: service_could_not_be_deleted: Service could not be deleted.
+  service_could_not_be_deleted: &quot;Le service n'a pas pu &#234;tre supprim&#233;.&quot;
+#  #en: share_the_love: Share the love
+  share_the_love: &quot;Share the love&quot;
+  #en: sharethis
+  sharethis: Partager
+  #en: show: Show
+  show: Voir
+  #en: show_category: {{category}}
+  show_category: &quot;{{category}}&quot;
+  #en: show_this_photo: Show this photo
+  show_this_photo: Voir cette photo
+  #en: showing: Showing
+  showing: Pr&#233;sentation
+  #en: showing_ad: Showing Ad
+  showing_ad: Voir la publicit&#233;
+  #en: showing_categories: Showing categories
+  showing_categories: Voir les cat&#233;gories
+#  #en: showing_metro_area_details: Showing Metro Area Details
+  showing_metro_area_details: Voir les d&#233;tails de la zone de m&#233;tro
+  #en: showing_users: Showing users
+  showing_users: Voir les membres
+  #en: sign_up: Sign Up!
+  sign_up: Inscription !
+  #en: sign_up_for_an_account: Sign up for an account.
+  sign_up_for_an_account: Cr&#233;ez votre compte.
+  #en: sign_up_for_a_: Sign up for a
+  sign_up_for_a_: Inscription &#224;
+  #en: sign_up_reason_1: Some reason to sign up
+  sign_up_reason_1: &quot;Une raison de s'inscrire&quot;
+  #en: sign_up_reason_2: Some reason to sign up
+  sign_up_reason_2: &quot;Une autre raison de s'inscrire&quot;
+  #en: singular_posts: &quot;{{count}} post&quot;
+  singular_posts:
+    one: &quot;1 message&quot;
+    other: &quot;{{count}} messages&quot;
+  #en: site_members: &quot;{{site}} members&quot;
+  site_members: &quot;membres de {{site}}&quot;
+#  #en: skill_was_successfully_created: Skill was successfully created.
+  skill_was_successfully_created: La comp&#233;tence a &#233;t&#233; correctement cr&#233;&#233;e.
+#  #en: skills: Skills
+  skills: Comp&#233;tences
+  #en: skip_this_and_go_to_your_profile: Skip this and go to your profile
+  skip_this_and_go_to_your_profile: Passer cette &#233;tape et voir votre profil
+  #en: skip_this_step: Skip this step
+  skip_this_step: Passer cette &#233;tape
+  #en: small_profile: {{user}} doesn't have much here yet. Stay tuned.
+  small_profile: &quot;{{user}} n'a pas encore renseign&#233; beaucoup d'informations. Restez &#224; l'&#233;coute.&quot;
+  #en: sorry_there_was_an_error: &quot;Sorry, there was an error.&quot;
+  sorry_there_was_an_error: &quot;D&#233;sol&#233;, une erreur est survenue.&quot;
+  #en: sorry_there_was_an_error_requesting_friendship: &quot;Sorry, there was an error requesting friendship.&quot;
+  sorry_there_was_an_error_requesting_friendship: &quot;D&#233;sol&#233;, une erreur est survenue pendant l'invitation.&quot;
+  #en: sorry_there_was_an_error_uploading_the_photo: &quot;Sorry, there was an error uploading the photo.&quot;
+  sorry_there_was_an_error_uploading_the_photo: &quot;D&#233;sol&#233;, une erreur est survenue pendant le t&#233;l&#233;chargement de la photo.&quot;
+  #en: sorry_we_dont_have_any_pros_in_this_skill_category_yet: &quot;Sorry, we don't have any pros in this skill category yet.&quot;
+  sorry_we_dont_have_any_pros_in_this_skill_category_yet: &quot;D&#233;sol&#233;, il n'y a pas encore d'experts dans cette cat&#233;gorie.&quot;
+  #en: sorry_we_dont_recognize_that_email_address: &quot;Sorry. We don't recognize that email address.&quot;
+  sorry_we_dont_recognize_that_email_address: &quot;D&#233;sol&#233;, cette adresse mail est inconnue.&quot;
+  #en: spread_the_word: Spread the word
+  spread_the_word: Faites passer le message
+  #en: start_date: Start date
+  start_date: Date de d&#233;but
+  #en: start_time: Start time
+  start_time: Heure de d&#233;but
+  #en: started_a_topic: &quot;started a topic:&quot;
+  started_a_topic: &quot;a lanc&#233; une discussion :&quot;
+  #en: state: State
+  state: Etat
+  #en: statistics: Statistics
+  statistics: Statistiques
+  #en: stats: Stats
+  stats: Stats
+  #en: status: Status
+  status: Statut
+  #en: sticky: Sticky
+  sticky: Epingl&#233;
+  #en: subject: Subject
+  subject: Sujet
+  #en: subscribe_to: Subscribe to
+  subscribe_to: Inscrivez vous &#224;
+  #en: tag_does_not_exists: The tag {{tag}} does not exist
+  tag_does_not_exists: &quot;Le tag &amp;laquo;{{tag}}&amp;raquo; n'existe pas&quot;
+  #en: tag_name: Tag name
+  tag_name: Tag
+  #en: tag_yourself: tag yourself
+  tag_yourself: Choisir mes tags s&#233;par&#233;s par une virgule
+  #en: tags: Tags
+  tags: Tags
+  #en: tags_are_comma_separated_keywords_that_describe_you: Tags are comma-separated keywords that describe you.
+  tags_are_comma_separated_keywords_that_describe_you: &quot;Les tags sont des mots clefs qui vous d&#233;crivent. Si vous souhaitez saisir plusieurs tags, s&#233;parez les par une virgule.&quot;
+  #en: tags_are_keywords_you_use_to_organize_your_clippings_separate_multiple_tags_with_commas: Tags are keywords you use to organize your clippings. Separate multiple tags with commas.
+  tags_are_keywords_you_use_to_organize_your_clippings_separate_multiple_tags_with_commas: &quot;Les tags sont des mots clefs que vous pouvez utiliser pour classer vos photos de p&#234;le-m&#234;le. Vous pouvez saisir plusieurs tags en les s&#233;parant par une virgule.&quot;
+  #en: tags_are_keywords_you_use_to_organize_your_photos: Tags are keywords you use to organize your photos.
+  tags_are_keywords_you_use_to_organize_your_photos: &quot;Les tags sont des mots clefs que vous pouvez utiliser pour classer vos photos. Si vous souhaitez saisir plusieurs tags, s&#233;parez les par une virgule.&quot;
+  #en: tags_are_one_word_descriptors_users_assign_to_blog_posts_pictures_and_clippings_on: Tags are one-word descriptors user assign to blog posts, pictures and clippings on
+  tags_are_one_word_descriptors_users_assign_to_blog_posts_pictures_and_clippings_on: &quot;Les tags sont des mots clefs que vous pouvez associer &#224; vos messages, vos images ou toute autre information. Si vous souhaitez saisir plusieurs tags, s&#233;parez les par une virgule.&quot;
+  #en: tagged: tagged
+  tagged: tagg&#233;s
+  #en: tags_page: tags page
+  tags_page: page de tags
+  #en: thanks_for_activating_your_account: Thanks for activating your account!
+  thanks_for_activating_your_account: &quot;Merci d'avoir activ&#233; votre compte !&quot;
+  #en: thanks_youre_now_logged_in: Thanks! You're now logged in.
+  thanks_youre_now_logged_in: Merci ! Vous &#234;tes connect&#233;.
+  #en: the_comment_was_deleted: The comment was deleted.
+  the_comment_was_deleted: Le commentaire a &#233;t&#233; supprim&#233;.
+  #en: the_community_team: &quot;The {{community}} team&quot;
+  the_community_team: &quot;L'&#233;quipe {{community}}&quot;
+  #en: the_friendship_was_accepted: The friendship was accepted.
+  the_friendship_was_accepted: &quot;L'invitation a &#233;t&#233; accept&#233;e.&quot;
+  #en: the_friendship_was_denied: The friendship was denied.
+  the_friendship_was_denied: &quot;L'invitation a &#233;t&#233; refus&#233;e.&quot;
+  #en: the_service_was_deleted: The service was deleted.
+  the_service_was_deleted: Ce service a &#233;t&#233; supprim&#233;.
+  #en: the_slideshow_is_disabled: The slideshow is disabled.
+  the_slideshow_is_disabled: Les diaporama est d&#233;sactiv&#233;.
+  #en: the_team: The {{site}} Team &lt;{{email}}&gt;
+  the_team: &quot;L'&#233;quipe {{site}} &lt;{{email}}&gt;&quot;
+  #en: the_user_was_activated: The user was activated
+  the_user_was_activated: &quot;L'utilisateur a &#233;t&#233; activ&#233;&quot;
+  #en: the_user_was_deleted: The user was deleted.
+  the_user_was_deleted: &quot;L'utilisateur a &#233;t&#233; supprim&#233;.&quot;
+  #en: this_contest_is_closed: This contest is closed
+  this_contest_is_closed: Le concours est termin&#233;
+  #en: this_forum_is_still_getting_started: &quot;This forum is still getting started ... here are some blog posts to get you thinking ...&quot;
+  this_forum_is_still_getting_started: &quot;Ce forum est encore en phase de lancement ... voici quelques messages pour vous permettre d'y r&#233;fl&#233;chir ...&quot;
+  #en: this_friendship_is_pending: This Friendship is pending.
+  this_friendship_is_pending: Cette invitation est en attente.
+  #en: this_is_your_dashboard: This is your dashboard.
+  this_is_your_dashboard: Ceci est votre espace personnel.
+  #en: this_month_best: &quot;This month's Best&quot;
+  this_month_best: &quot;Le Meilleur du Mois&quot;
+  #en: this_story_is_awesome: &quot;This story is awesome!&quot;
+  this_story_is_awesome: &quot;Ce texte est extraordinaire !&quot;
+  #en: this_topic_is_locked: This topic is locked.
+  this_topic_is_locked: Cette discussion est verrouill&#233;e.
+  #en: this_users_profile_is_not_public_youll_need_to_create_an_account_and_log_in_to_access_it: This user's profile is not public. You'll need to create an account and log in to access it.
+  this_users_profile_is_not_public_youll_need_to_create_an_account_and_log_in_to_access_it: &quot;Le profil de cet utilisateur est priv&#233;. Vous devez &#234;tre inscrit pour le consulter.&quot;
+#  #en: thumb: Thumb
+  thumb: Thumb
+  #en: time_constrained: Time constrained
+  time_constrained: Limite de temps
+  #en: tips: &quot;Tips:&quot;
+  tips: &quot;Astuces&quot;
+  #en: title: Title
+  title: Titre
+  #en: title_required: &quot;Title (required)&quot;
+  title_required: &quot;Titre (obligatoire)&quot;
+  #en: to: To
+  to: Pour
+  #en: to_accept: to accept
+  to_accept: accepter
+  #en: to_get_recommended_content_on_your_dashboard: to start getting recommended content on your dashboard.
+  to_get_recommended_content_on_your_dashboard: pour commencer &#224; recevoir du contenu pertinent sur votre espace personnel.
+#  #en: to_get_started_with_clippings_first: To get started with clippings, first 
+  to_get_started_with_clippings_first: &quot;Pour commencer avec le p&#234;le-m&#234;le, &quot;
+  #en: to_start_adding_friends: To start adding friends, you can
+  to_start_adding_friends: &quot;Pour vous faire de nouveaux amis, vous pouvez&quot;
+  #en: to_you: You
+  to_you: Vous
+  #en: toggle: Toggle
+  toggle: Bascule
+  #en_ top_pros: Top Pros
+  top_pros: Top des Experts
+  #en: top_writers: Top Writers
+  top_writers: Top des Contributeurs
+  #en: topic: Topics
+  topic: Discussion
+  #en: topics: Topics
+  topics: Discussions
+  #en: topic_deleted: Topic '{{topic}}' was deleted.
+  topic_deleted: &quot;La discussion &amp;laquo;{{topic}}&amp;raquo; a &#233;t&#233; supprim&#233;e.&quot;
+  #en: topic_locked: Topic locked
+  topic_locked: Discussion verrouill&#233;e
+  #en: total_users: Total users
+  total_users: Total des membres
+  #en: total_votes: Total votes
+  total_votes: Total des votes
+  #en: type_a_username: Type a username
+  type_a_username: Choisissez un pseudo
+  #en: type_your_password: &quot;Type your password:&quot;
+  type_your_password: &quot;Entrez votre mot de passe :&quot;
+  #en: uh_oh_we_couldnt_log_you_in_with_the_username_and_password_you_entered_try_again: &quot;Uh oh. We couldn't log you in with the username and password you entered. Try again?&quot;
+  uh_oh_we_couldnt_log_you_in_with_the_username_and_password_you_entered_try_again: &quot;Oh oh. Nous n'avons pas pu vous authentifier avec le pseudo et le mot de passe que vous avez saisis. Merci de r&#233;essayer ...&quot;
+  #en: un_favorite_this: Un-favorite this
+  un_favorite_this: Retirer des favoris
+  #en: unactivated_users: Unactivated users
+  unactivated_users: Membres d&#233;sactiv&#233;s
+  #en: uncategorized: Uncategorized
+  uncategorized: Sans cat&#233;gorie
+  #en: update: Update
+  update: Mise &#224; jour
+  #en: update_profile_and_tag_yourself: Update your profile and tag yourself
+  update_profile_and_tag_yourself: Mettez &#224; jour votre profil et vos tags
+  #en: update_your_profile: update your profile
+  update_your_profile: mettez &#224; jour votre profil
+  #en: updated_at: Updated at
+  updated_at: Mis &#224; jour &#224;
+  #en: updated_their_profile: updated their profile
+  updated_their_profile: a mis &#224; jour son profil
+  #en: upload_an_image_for_your_post: Upload an image for your post
+  upload_an_image_for_your_post: Ajoutez une image &#224; votre message
+  #en: upload_and_continue_to_step_two: Upload, and continue to step two
+  upload_and_continue_to_step_two: &quot;T&#233;l&#233;charger et passer &#224; l'&#233;tape 2&quot;
+  #en: uploaded_a_photo: &quot;uploaded a photo:&quot;
+  uploaded_a_photo: &quot;a ajout&#233; une photo :&quot;
+  #en: uploaded_by: uploaded by
+  uploaded_by: t&#233;l&#233;charg&#233; par
+  #en: url: Url
+  url: URL
+  #en: user_e_mail: &quot;User e-mail:&quot;
+  user_e_mail: &quot;Email du membre :&quot;
+  #en: username: Username
+  username: Pseudo
+  #en: user: User
+  user: Membre
+  #en: user_information: {{site}} User information
+  user_information: &quot;Vos informations de connexion sur {{site}}&quot;
+  #en: users: Users
+  users: Membres
+  #en: users_blog: &quot;{{user}}'s Blog&quot;
+  users_blog: &quot;Le Blog de {{user}}&quot;
+  #en: user_clippings: Clippings of {{user}}
+  user_clippings: &quot;Le p&#234;le-m&#234;le de {{user}}&quot;
+  #en: user_login: User login
+  user_login: &quot;Pseudo du membre&quot;
+  #en: users_online: Users online
+  users_online: Membres en ligne
+  #en: users_photos: &quot;{{user}}'s Photos&quot;
+  users_photos: &quot;Les Photos de {{user}}&quot;
+  #en: users_profile: {{user}}'s profile
+  users_profile: &quot;Profil de {{user}}&quot;
+  #en: users_tagged: Users tagged
+  users_tagged: &quot;Les membres tagg&#233;s&quot;
+  #en: user_vendor_offer: &quot;&lt;p&gt;Describe the product or service you offer:&lt;ul&gt;&lt;li&gt; Tell people what you do&lt;/li&gt;&lt;li&gt; Explain why you love your work&lt;/li&gt;&lt;li&gt; How can people contact you? What's your Web site?&lt;/li&gt;&lt;/ul&gt;&lt;/p&gt;&quot;
+  user_vendor_offer: &quot;&lt;p&gt;D&#233;crivez le produit ou le service que vous proposez :&lt;ul&gt;&lt;li&gt;Expliquez aux gens ce que vous faites&lt;/li&gt;&lt;li&gt;Expliquez pourquoi vous aimez ce que vous faites&lt;/li&gt;&lt;li&gt;Comment pouvez vous &#234;tre contact&#233; ? Avez vous un site web ?&lt;/li&gt;&lt;/ul&gt;&lt;/p&gt;&quot;
+  #en: user_bio_help: &quot;&lt;p&gt;Your bio is first thing people see on your profile. Some ideas:&lt;ul&gt;&lt;li&gt; Describe your sense of style&lt;/li&gt;&lt;li&gt; Explain what you love about life.&lt;/li&gt;&lt;li&gt; What's the last thing you purchased for a friend?&lt;/li&gt;&lt;/ul&gt;&lt;/p&gt;&quot;
+  user_bio_help: &quot;&lt;p&gt;Votre biographie est la premi&#232;re chose que les autres d&#233;couvrent sur votre profil. Quelques bonnes id&#233;es :&lt;ul&gt;&lt;li&gt; D&#233;crivez votre style.&lt;/li&gt;&lt;li&gt; Pr&#233;sentez ce que vous aimez dans la vie.&lt;/li&gt;&lt;li&gt; Quelle est la derni&#232;re chose que vous ayez offerte &#224; un ami ?&lt;/li&gt;&lt;/ul&gt;&lt;/p&gt;&quot;
+  #en: view: View
+  view: Consulter
+  #en: views: Views
+  views: Consultations
+  #en: view_all_my_clippings: View all my clippings
+  view_all_my_clippings: Voir mon p&#234;le-m&#234;le
+  #en: view_all_my_friend_requests: View all my friend requests
+  view_all_my_friend_requests: Voir toutes mes invitations
+  #en: view_all_my_photos: View all my photos
+  view_all_my_photos: Voir toutes mes photos
+  #en: view_comment: View Comment
+  view_comment: Voir le commentaire
+  #en: view_my_blog: View my blog
+  view_my_blog: Voir mon blog
+  #en: voice: voice
+  voice: Contributeur
+  #en: voices: Voices
+  voices: Contributeurs
+  #en_ vote: Vote
+  vote: Vote
+  #en: vote_now: Vote now!
+  vote_now: Votez maintenant !
+  #en: votes: votes
+  votes: votes
+  #en: waiting_for: Waiting for
+  waiting_for: En attente de
+  #en: walkthrough_complete: You've completed the {{site}} walk-through. Now you can continue exploring!
+  walkthrough_complete: &quot;Vous avez suivi la visite guid&#233;e de {{site}}. A vous de d&#233;couvrir la suite !&quot;
+  #en: want_to_be_popular: Want to be popular?
+  want_to_be_popular: Vous souhaitez &#234;tre populaire ?
+  #en: want_to_list_your_services_on: Want to list your services on
+  want_to_list_your_services_on: Vous souhaitez proposer vos services sur
+  #en: want_to_post_in_this_category: Want to post in this category?
+  want_to_post_in_this_category: Vous souhaitez poster dans cette cat&#233;gorie ?
+  #en: want_to_upload_multiple_files_at_once: Want to upload multiple files at once?
+  want_to_upload_multiple_files_at_once: &quot;Vous souhaitez t&#233;l&#233;charger plusieurs fichiers d'un coup ?&quot;
+  #en: watch_topic: Watch topic
+  watch_topic: Suivre la discussion
+  #en: watching_topic: Watching topic
+  watching_topic: Discussion suivie
+  #en: we_just_sent_an_e_mail_to: &quot;We just sent an e-mail to: {{email}}&quot;
+  we_just_sent_an_e_mail_to: &quot;Nous venons d'envoyer un mail &#224; : {{email}}&quot;
+  #en: we_need_you: We need you
+  we_need_you: Nous avons besoin de vous
+  #en: welcome_message: Welcome! {{login_link}} or {{signup_link}}
+  welcome_message: &quot;Bienvenue ! {{login_link}} ou {{signup_link}}&quot;
+  #en: what_are_tags: 'What are &quot;Tags&quot;?'
+  what_are_tags: &quot;A quoi servent les &amp;laquo;Tags&amp;raquo; ?&quot;
+#  #en: what_is_popular: &quot;What's Popular&quot;
+  what_is_popular: &quot;A la Une&quot;
+#  #en: whats_fresh: &quot;What's fresh&quot;
+  whats_fresh: &quot;Quoi de neuf ?&quot;
+#  #en: whats_hot: What's Hot
+  whats_hot: &quot;C'est chaud !&quot;
+#  #en: whats_popular: What's Popular
+  whats_popular: &quot;Les messages les plus lus&quot;
+  #en: when_checked_this_page_will_be_visible_to_anyone: &quot;When checked, this page will be visible to anyone.&quot;
+  when_checked_this_page_will_be_visible_to_anyone: &quot;Si vous cochez cette case, cette page sera publique.&quot;
+  #en: when_checked_your_profile_will_be_visible_to_anyone: &quot;When checked, your profile will be visible to anyone.&quot;
+  when_checked_your_profile_will_be_visible_to_anyone: &quot;Si vous cochez cette case, votre profil sera public.&quot;
+  #en: when_unchecked_this_page_will_only_be_visible_to_people_who_are_logged_in_to: When unchecked, this page will only be visible to people who are logged in to
+  when_unchecked_this_page_will_only_be_visible_to_people_who_are_logged_in_to: &quot;Sinon, cette page ne sera visible que par les membres&quot;
+  #en: when_unchecked_your_profile_will_only_be_visible_to_people_who_are_logged_in_to: When unchecked, your profile will only be visible to people who are logged in to
+  when_unchecked_your_profile_will_only_be_visible_to_people_who_are_logged_in_to: &quot;Sinon, votre profil ne sera visible que par les membres&quot;
+  #en: when_you_see_an_image_you_like_on_the_web: When you see an image you like on the Web, click the bookmarklet to save it to {{site}}
+  when_you_see_an_image_you_like_on_the_web: &quot;Lorsque vous trouvez une image sympa sur le web, cliquez sur le lien {{site}}-It! pour la sauvegarder sur {{site}}&quot;
+  #en: why_sign_up: Why Sign up?
+  why_sign_up: &quot;Pourquoi s'inscrire ?&quot;
+  #en: would_like_to_be_friends_with_you_on: {{user}} would like to be friends with you on {{site}}!
+  would_like_to_be_friends_with_you_on: &quot;{{user}} souhaite devenir votre ami sur {{site}} !&quot;
+  #en: would_like_you_to_join: {{user}} would like you to join {{site}}!
+  would_like_you_to_join: &quot;{{user}} vous invite &#224; le rejoindre sur {{site}} !&quot;
+  #en: write_a_blog_post: Write a blog post!
+  write_a_blog_post: Postez un message sur votre blog !
+  #en: write_a_message: &quot;Write a message:&quot;
+  write_a_message: &quot;Ecrire un message :&quot;
+  #en: write_new_post: Write a '{{category}}' post
+  write_new_post: &quot;Ecrire un message sur &amp;laquo;{{category}}&amp;raquo;&quot;
+  #en: wrote_a_post: &quot;wrote a post:&quot;
+  wrote_a_post: &quot;a &#233;crit un message :&quot;
+  #en: yesterday: Yesterday
+  yesterday: Hier
+  #en: you_are_editing_your_account: You are editing your account.
+  you_are_editing_your_account: Vous &#234;tes en train de modifier votre compte utilisateur.
+  #en: you_are_editing_your_profile: &quot;You're editing your profile.&quot;
+  you_are_editing_your_profile: &quot;Vous &#234;tes en train de modifier votre profil.&quot;
+  #en: you_can_browse_all_content_and_users_on: You can browse all content and users on
+  you_can_browse_all_content_and_users_on: Vous pouvez feuilleter tous les contenus et les membres de
+  #en: you_cant_delete_that_user: You can't delete that user.
+  you_cant_delete_that_user: Vous ne pouvez pas supprimer ce membre.
+  #en: you_can_select_up_to_5_files_at_a_time: You can select up to 5 files at a time.
+  you_can_select_up_to_5_files_at_a_time: &quot;Vous pouvez choisir jusqu'&#224; 5 fichiers &#224; la fois.&quot;
+  #en: you_could_tag_yourself: You could tag yourself
+  you_could_tag_yourself: &quot;Exemples de tags :&quot;
+  #en: you_have_friends: You have {{count}} friends
+  you_have_friends:
+    one: Vous avez 1 ami.
+    other: &quot;Vous avez {{count}} amis.&quot;
+  #en: you_have_added_clippings: You have added {{count}} clippings
+  you_have_added_clippings:
+    one: Vous avez ajout&#233; 1 photo &#224; votre p&#234;le-m&#234;le.
+    other: &quot;Vous avez ajout&#233; {{count}} photos &#224; votre p&#234;le-m&#234;le.&quot;
+  #en: you_have_already_voted: You have already voted.
+  you_have_already_voted: Vous avez d&#233;j&#224; vot&#233;.
+  #en: you_have_created: You have created
+  you_have_created: Vous avez cr&#233;&#233;
+  #en: you_have_left_comments: You have left {{count}} comments
+  you_have_left_comments:
+    one: Vous avez laiss&#233; 1 commentaire.
+    other: &quot;Vous avez laiss&#233; {{count}} commentaires.&quot;
+  #en: you_have_no_clippings_use_the_bookmarklet_on_the_right_to_add_some: You have no clippings. Use the bookmarklet on the right to add some.
+  you_have_no_clippings_use_the_bookmarklet_on_the_right_to_add_some: Vous n'avez pas encore de p&#234;le-m&#234;le. Utilisez le lien d'ajout aux favoris sur votre droite pour commencer.
+  #en: you_have_no_network_activity_yet: You have no network activity yet.
+  you_have_no_network_activity_yet: &quot;Vous n'avez pas encore d'activit&#233; sur la communaut&#233;.&quot;
+  #en: you_have_pending_friendship_requests: You have pending friendship requests.
+  you_have_pending_friendship_requests: Vous avez des invitations en attente.
+  #en: you_have_uploaded_photos: You have uploaded {{count}} photos
+  you_have_uploaded_photos:
+    one: Vous avez t&#233;l&#233;charg&#233; 1 photo.
+    other: &quot;Vous avez t&#233;l&#233;charg&#233; {{count}} photos.&quot;
+  #en: you_have_written_blog_posts: You have written {{count}} blog posts
+  you_have_written_blog_posts:
+    one: Vous avez &#233;crit 1 article de blog.
+    other: &quot;Vous avez &#233;crit {{count}} articles de blog.&quot;
+  #en: you_last_logged_in_on: You last logged in on
+  you_last_logged_in_on: Derni&#232;re connexion le
+  #en: you_may_want_to_use_your_company_logo_or_a_photo_of_one_of_your_products_: &quot;You may want to use your company logo, or a photo of one of your products. &quot;
+  you_may_want_to_use_your_company_logo_or_a_photo_of_one_of_your_products_: &quot;Vous souhaitez peut &#234;tre utiliser le logo de votre soci&#233;t&#233;, ou une photo d'un de vos produits. &quot;
+  #en: you_must_vote_to_see_the_results: You must vote to see the resuts.
+  you_must_vote_to_see_the_results: Vous devez voter pour voir les r&#233;sultats.
+  #en: your_about_text_goes_here: Your About Text Goes Here
+  your_about_text_goes_here: &quot;Votre texte &amp;laquo;A propos de&amp;raquo; vient ici&quot;
+  #en: your_account_has_been_activated: Your {{site}} account has been activated!
+  your_account_has_been_activated: &quot;Votre compte {{site}} a &#233;t&#233; activ&#233; !&quot;
+  #en: your_changes_were_saved: Your changes were saved.
+  your_changes_were_saved: Vos modifications ont &#233;t&#233; prises en compte.
+  #en: your_password_has_been_reset_and_emailed_to_you: Your password has been reset and emailed to you.
+  your_password_has_been_reset_and_emailed_to_you: Votre mot de passe a &#233;t&#233; r&#233;initialis&#233;. Vous allez le recevoir par mail.
+  #en: your_post_was_deleted: Your post was deleted.
+  your_post_was_deleted: Votre message a &#233;t&#233; supprim&#233;.
+  #en: your_post_was_successfully_created: Your post was successfully created.
+  your_post_was_successfully_created: Votre message a &#233;t&#233; cr&#233;&#233; avec succ&#232;s.
+  #en: your_profile_photo: &quot;Your profile photo:&quot;
+  your_profile_photo: &quot;Votre photo de profil :&quot;
+  #en: your_username_was_emailed_to_you: Your username was emailed to you.
+  your_username_was_emailed_to_you: Votre pseudo vous a &#233;t&#233; envoy&#233; par mail
+  #en: youve_been_logged_out_hope_you_come_back_soon: You've been logged out. Hope you come back soon!
+  youve_been_logged_out_hope_you_come_back_soon: Vous avez &#233;t&#233; deconnect&#233;. A bient&#244;t !
+  #en: zippostal_code: &quot;ZIP/Postal code:&quot;
+  zippostal_code: &quot;Code Postal&quot;
+  #en: photo_manager: &quot;Photo manager&quot;
+  photo_manager: &quot;Mes photos&quot;
+  #en: albums: &quot;Albums&quot;
+  albums: &quot;Albums&quot;
+  #en: album_updated: &quot;Album updated&quot;
+  album_updated: &quot;Album mis &#224; jour&quot;
+  #en: album_comments: &quot;Album comments&quot;
+  album_comments: &quot;Commentaires sur l'album&quot;
+  #en: album_tip: &quot;Albums let you organize yout photos. Share whole experiencies with other {{community_name}} users&quot;
+  album_tip: &quot;Les albums vous permettent d'organiser vos photos et de partager vos exp&#233;riences avec les membres {{community_name}}&quot;
+  #en: delete_album_and_photos: Delete album and its associated photos?
+  delete_album_and_photos: &quot;Supprimer l'album et les photos qu'il contient ?&quot;
+  #en: album_was_successfully_created: &quot;Album was successfully created&quot;  
+  album_was_successfully_created: &quot;L'album a &#233;t&#233; cr&#233;&#233; avec succ&#232;s&quot;
+  #en: album: &quot;Album&quot;
+  album: &quot;Album&quot;
+  #en: view_more: &quot;View more&quot;
+  view_more: &quot;En voir plus&quot;
+  #en: assign_album: &quot;Assign album&quot;
+  assign_album: &quot;Ajouter &#224; l'album&quot;
+  #en: new_album: &quot;New album&quot;
+  new_album: &quot;Nouvel album&quot;
+  #en: new_page: New Page
+  new_page: Nouvelle page
+  #en: created_an_album: &quot;Created an album&quot;
+  created_an_album: &quot;a cr&#233;&#233; l'album&quot;
+  #en: add_photos: &quot;Add photos&quot;
+  add_photos: &quot;Ajouter des photos&quot;
+  #en: view_my_album: &quot;View my album&quot;
+  view_my_album: &quot;Consulter mon album&quot;
+  #en: photos_of_this_album: &quot;Photos of this album&quot;
+  photos_of_this_album: &quot;Photos de cet album&quot;
+  #en: not_assigned_photos: &quot;Photos not assigned to an album&quot;
+  not_assigned_photos: &quot;Photos non class&#233;es&quot;
+  #en: create_and_add_photos: &quot;Create and add photos to this album&quot;
+  create_and_add_photos: &quot;Cr&#233;er un album et y ajouter des photos&quot;
+  #en: edit_and_add_photos: &quot;Edit and add photos to this album&quot;
+  edit_and_add_photos: &quot;Editer cet album et y ajouter des photos&quot;
+  #en: create_album: &quot;Create album&quot;
+  create_album: &quot;Cr&#233;er un album&quot;
+  #en: edit_album: &quot;Edit album&quot;
+  edit_album: &quot;Editer l'album&quot;
+  #en: back_to_photo_manager: &quot;Back to photo manager&quot;
+  back_to_photo_manager: &quot;Retour &#224; mes photos&quot;
+</diff>
      <filename>lang/ui/fr-FR.yml</filename>
    </modified>
    <modified>
      <diff>@@ -7,6 +7,7 @@ ru-RU:
   time:
     formats:
       published_date: &quot;%Y/%m/%d&quot;      
+      short_date: &quot;%y/%m/%d&quot;
       time_ago: &quot;%l:%M%p&quot;
 
   activerecord:</diff>
      <filename>lang/ui/ru-RU.yml</filename>
    </modified>
    <modified>
      <diff>@@ -7,6 +7,7 @@ sr-CP:
   time:
     formats:
       published_date: &quot;%Y/%m/%d&quot;      
+      short_date: &quot;%y/%m/%d&quot;
       time_ago: &quot;%l:%M%p&quot;
 
   activerecord:</diff>
      <filename>lang/ui/sr-CP.yml</filename>
    </modified>
    <modified>
      <diff>@@ -7,6 +7,7 @@ sv:
   time:
     formats:
       published_date: &quot;%Y-%m-%d&quot;      
+      short_date: &quot;%y-%m-%d&quot;
       time_ago: &quot;%l:%M%p&quot;
 
   activerecord:
@@ -799,8 +800,10 @@ sv:
   permanently_delete_this_post: Ta bort det h&#228;r inl&#228;gget permanent?
   #en: photo_comments: Photo Comments
   photo_comments: Bildkommentarer
-  #en: photo_from_user: &quot;{{photo_description}} from {{user}}&quot;
-  photo_from_user: &quot;{{photo_description}} fr&#229;n {{user}}&quot;
+  #en: photo_from_user: &quot;Photo from {{user}}&quot;
+  photo_from_user: &quot;Bild fr&#229;n {{user}}&quot;
+  #en: photo_description_from_user: &quot;{{photo_description}} from {{user}}&quot;
+  photo_description_from_user: &quot;{{photo_description}} fr&#229;n {{user}}&quot;
   #en: photo_message: Your profile photo represents you on {{site}}. You can change it later.
   photo_message: &quot;Din profilbild representerar dig p&#229; {{site}}. Du kan &#228;ndra den senare.&quot;
   #en: photo_was_successfully_created: Photo was successfully created.
@@ -849,8 +852,8 @@ sv:
   posting_tips: &quot;Tips f&#246;r inl&#228;gg&quot;
   #en: post_topic: Post topic
   post_topic: Spara &#228;mne
-  #en: posts_photos_and_bookmarks: posts, photos and bookmarks
-  posts_photos_and_bookmarks: inl&#228;gg, bilder och bokm&#228;rken
+  #en: posts_photos_and_bookmarks: {{name}} posts, photos and bookmarks
+  posts_photos_and_bookmarks: &quot;{{name}} inl&#228;gg, bilder och bokm&#228;rken&quot;
   #en: posts_saved_with_draft_status_wont_appear_in_your_blog_until_you_publish_them: &quot;Posts saved with 'draft' status won't appear in your blog until you publish them.&quot;
   posts_saved_with_draft_status_wont_appear_in_your_blog_until_you_publish_them: &quot;Inl&#228;gg sparade som 'utkast' kommer inte att synas i din blogg f&#246;rr&#228;n du publicerat dem.&quot;
   #en: preview: Preview
@@ -931,8 +934,8 @@ sv:
   required: obligatorisk
   #en: required_we_will_send_a_confirmation_e_mail_to_the_address_you_enter: &quot;(Required: We will send a confirmation e-mail to the address you enter.)&quot;
   required_we_will_send_a_confirmation_e_mail_to_the_address_you_enter: &quot;(Obligatoriskt: Vi skickar ett bekr&#228;ftelsemejl till adressen du anger.)&quot;
-  #en: required_you_must_be_at_least_years_old_to_sign_up: &quot;(Required: you must be at least 13 years old to sign up.)&quot;
-  required_you_must_be_at_least_years_old_to_sign_up: &quot;(Obligatoriskt: Du m&#229;ste vara minst 13 &#229;r gammal f&#246;r att registrera dig.)&quot;
+  #en: required_you_must_be_at_least_years_old_to_sign_up: &quot;(Required: you must be at least {{min_age}} years old to sign up.)&quot;
+  required_you_must_be_at_least_years_old_to_sign_up: &quot;(Obligatoriskt: Du m&#229;ste vara minst {{min_age}} &#229;r gammal f&#246;r att registrera dig.)&quot;
   #en: required_your_username_must_not_contain_numerals_spaces_or_special_characters: &quot;(Required: Your username must not contain numerals, spaces or special characters.)&quot;
   required_your_username_must_not_contain_numerals_spaces_or_special_characters: &quot;(Obligatoriskt: Ditt anv&#228;ndarnamn f&#229;r inte inneh&#229;lla siffror, blanksteg eller specialtecken.)&quot;
   #en: resend_my_activation_e_mail: Resend my activation e-mail</diff>
      <filename>lang/ui/sv-SE.yml</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>5f21ca410923522a046cdc251d29f7a3076a4f16</id>
    </parent>
    <parent>
      <id>d4f63e3532b1d4275f14dfe7dc0980fb9de47c83</id>
    </parent>
  </parents>
  <author>
    <name>bborn</name>
    <email>bruno.bornsztein@gmail.com</email>
  </author>
  <url>http://github.com/bborn/communityengine/commit/bdbc2c449b90be404e04557baa2eee9c9b04430f</url>
  <id>bdbc2c449b90be404e04557baa2eee9c9b04430f</id>
  <committed-date>2009-10-09T06:25:08-07:00</committed-date>
  <authored-date>2009-10-09T06:25:08-07:00</authored-date>
  <message>Merge branch 'edge' of git://github.com/sdecleire/communityengine into sdecleire/edge

Conflicts:
	app/models/user.rb
	lang/base.yml
	lang/ui/en-US.yml</message>
  <tree>452c8062d8bcc1b05b95af44b3c7819ba8646e32</tree>
  <committer>
    <name>bborn</name>
    <email>bruno.bornsztein@gmail.com</email>
  </committer>
</commit>
