some reformatting/refactor of en.yml. This might break some translations but I think I've catched the most ones, at least the most important ones

app/helpers/aspects_helper.rb

@@ -53,14 +53,4 @@ module AspectsHelper
       remove_from_aspect_button(aspect.id, person.id)
     end
   end
-
-  def publisher_description(aspect_count)
-    str = "#{t('.share_with')} #{aspect_count} "
-    if aspect_count == 1
-      str += t('_aspect').downcase
-    else
-      str += t('_aspects').downcase
-    end
-    ("<span>#{str}</span>").html_safe
-  end
 end

app/helpers/conversations_helper.rb

@@ -1,9 +1,5 @@
 module ConversationsHelper
   def new_message_text(count)
-    if count > 0
+    t('conversations.helper.new_messages', :count => count)
-      t('new_messages', :count => count)
-    else
-      t('no_new_messages')
-    end
   end
 end

app/helpers/notifications_helper.rb

@@ -34,11 +34,7 @@ module NotificationsHelper
   end
 
   def new_notification_text(count)
-    if count > 0
+      t('notifications.helper.new_notifications', :count => count)
-      t('new_notifications', :count => count)
-    else
-      t('no_new_notifications')
-    end
   end
 
   def new_notification_link(count)

app/helpers/requests_helper.rb

@@ -10,7 +10,7 @@ module RequestsHelper
 
   def new_request_link(request_count)
     if request_count > 0
-        link_to t('new_requests', :count => @request_count), aspects_manage_path
+        link_to t('requests.helper.new_requests', :count => @request_count), aspects_manage_path
     end
   end
 end

app/views/aspects/_aspect_listings.haml

@@ -8,11 +8,7 @@
   .right
     = link_to t('contacts', :count => @contact_count), aspects_manage_path, :title => t('aspects.manage.manage_aspects')
 
-  = aspects.count
+  = t('aspects', :count => aspects.count)
-  - if aspects.count == 1
-    = t('_aspect')
-  - else
-    = t('_aspects')
 
 %ul
   - for aspect in aspects

app/views/shared/_publisher.html.haml

@@ -13,10 +13,7 @@
     = image_tag 'icons/doc_edit.png'
     %span= t('.whats_on_your_mind')
 
-    - if @aspect_ids.length == 1
+    = t('aspects', :count => @aspect_ids.length)
-      = "(#{@aspect_ids.length} #{t('_aspect').downcase})"
-    - else
-      = "(#{@aspect_ids.length} #{t('_aspects').downcase})"
 
   .content_creation
     = form_for(StatusMessage.new, :remote => true, :html => {"data-type" => "json"}) do |status|

config/initializers/will_paginate.rb

@@ -2,5 +2,5 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-WillPaginate::ViewHelpers.pagination_options[:previous_label] = "« #{I18n.t('pagination.previous')}"
+WillPaginate::ViewHelpers.pagination_options[:previous_label] = "« #{I18n.t('previous')}"
-WillPaginate::ViewHelpers.pagination_options[:next_label] = "#{I18n.t('pagination.next')} »"
+WillPaginate::ViewHelpers.pagination_options[:next_label] = "#{I18n.t('next')} »"