From 6d113da242313691c1fe434a493989e2bb13c08d Mon Sep 17 00:00:00 2001
From: Kiran Soumya <kiran.soumya@gmail.com>
Date: Thu, 17 Mar 2011 00:58:40 +0530
Subject: [PATCH 01/20] Bug Fix:868 for Users unable to download photos

---
 features/download_photos.feature              | 10 ++++++++++
 features/step_definitions/custom_web_steps.rb |  4 ++++
 lib/collect_user_photos.rb                    |  4 ++--
 spec/controllers/users_controller_spec.rb     |  7 +++++++
 4 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 features/download_photos.feature

diff --git a/features/download_photos.feature b/features/download_photos.feature
new file mode 100644
index 000000000..2ab7c0649
--- /dev/null
+++ b/features/download_photos.feature
@@ -0,0 +1,10 @@
+@javascript
+Feature: Download Photos
+
+  Scenario: Download my photos
+  	Given I am signed in
+    And I click on my name in the header
+    And I follow "settings"
+    Then I should be on my account settings page
+    And I follow "download my photos"
+    Then I should get download alert
diff --git a/features/step_definitions/custom_web_steps.rb b/features/step_definitions/custom_web_steps.rb
index f86a1d29f..fe7f5a36a 100644
--- a/features/step_definitions/custom_web_steps.rb
+++ b/features/step_definitions/custom_web_steps.rb
@@ -99,3 +99,7 @@ When /^I wait for "([^\"]*)" to load$/ do |page_name|
     current_location == path_to(page_name)
   end
 end
+
+Then /^I should get download alert$/ do
+  page.evaluate_script("window.alert = function() { return true; }")
+end
diff --git a/lib/collect_user_photos.rb b/lib/collect_user_photos.rb
index cd9d3d6e8..8723e1f5c 100644
--- a/lib/collect_user_photos.rb
+++ b/lib/collect_user_photos.rb
@@ -11,8 +11,8 @@ module PhotoMover
     FileUtils::mkdir_p photos_dir
 
     photos.each do |photo|
-      current_photo_location = "#{Rails.root}/public/uploads/images/#{photo.image_filename}"
-      new_photo_location = "#{photos_dir}/#{photo.image_filename}"
+      current_photo_location = "#{Rails.root}/public/uploads/images/#{photo.remote_photo_name}"
+      new_photo_location = "#{photos_dir}/#{photo.remote_photo_name}"
       FileUtils::cp current_photo_location, new_photo_location
     end
 
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 2986823b3..51d490664 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -21,6 +21,13 @@ describe UsersController do
     end
   end
 
+  describe '#export_photos' do
+    it 'returns a tar file'  do
+      get :export_photos
+      response.header["Content-Type"].should include "application/octet-stream"
+    end
+  end
+
   describe '#public' do
     it 'renders xml' do
       sm = Factory(:status_message, :public => true, :author => @user.person)

From 3d34e3bd357b8e4e3de105dded5f575645989769 Mon Sep 17 00:00:00 2001
From: zhitomirskiyi <ilya@joindiaspora.com>
Date: Wed, 9 Mar 2011 23:24:36 -0800
Subject: [PATCH 02/20] publishing from a person profile page wip

mentioning a person from their profile page, added js & jasmine, still need to add the mention style, and prevent deselecting the last one

a tiny sass add

publishing from the profile works, need js translation

added the translation

made the hover state consistant

need to fix the cucumber spec

specs are green need to add a button

added the buttion to mention people

moved the publisher to the facebox

fixed the cucumbers for the modal window
---
 app/controllers/people_controller.rb          |  3 +
 app/controllers/status_messages_controller.rb | 16 ++++
 app/helpers/application_helper.rb             | 13 +++-
 app/views/aspects/show.html.haml              |  2 +-
 app/views/aspects/show.mobile.haml            |  2 +-
 app/views/people/_aspect_list.haml            |  2 +-
 app/views/people/show.html.haml               |  4 +-
 app/views/shared/_publisher.html.haml         | 14 +++-
 app/views/shared/_publisher.mobile.haml       |  2 +-
 app/views/shared/_stream_element.html.haml    |  2 +-
 app/views/status_messages/new.haml            | 22 ++++++
 config/locales/diaspora/en.yml                |  1 +
 config/locales/javascript/javascript.en.yml   |  2 +
 config/routes.rb                              |  2 +-
 features/posts.feature                        | 64 +++++++++++-----
 features/step_definitions/custom_web_steps.rb | 11 +++
 features/step_definitions/user_steps.rb       | 20 +++++
 public/javascripts/publisher.js               | 21 ++++++
 public/stylesheets/sass/application.sass      |  9 +++
 spec/controllers/people_controller_spec.rb    |  9 +++
 .../status_messages_controller_spec.rb        |  8 ++
 spec/javascripts/publisher-spec.js            | 75 +++++++++++++++++++
 spec/javascripts/rails-spec.js                |  6 +-
 spec/javascripts/view-spec.js                 |  2 +-
 24 files changed, 275 insertions(+), 37 deletions(-)
 create mode 100644 app/views/status_messages/new.haml

diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb
index ccffa26f3..9b72945e5 100644
--- a/app/controllers/people_controller.rb
+++ b/app/controllers/people_controller.rb
@@ -45,6 +45,7 @@ class PeopleController < ApplicationController
   def show
     @person = Person.where(:id => params[:id]).first
     @post_type = :all
+    @aspect = :profile
     @share_with = (params[:share_with] == 'true')
 
     if @person
@@ -57,7 +58,9 @@ class PeopleController < ApplicationController
         @aspects_with_person = []
         if @contact
           @aspects_with_person = @contact.aspects
+          @aspect_ids = @aspects_with_person.map(&:id)
           @contacts_of_contact = @contact.contacts
+
         else
           @contact ||= Contact.new
           @contacts_of_contact = []
diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
index 09b5b81ac..8c0e0e185 100644
--- a/app/controllers/status_messages_controller.rb
+++ b/app/controllers/status_messages_controller.rb
@@ -9,6 +9,22 @@ class StatusMessagesController < ApplicationController
   respond_to :mobile
   respond_to :json, :only => :show
 
+  def new
+    @person = Person.find(params[:person_id])
+    @aspect = :profile
+    @contact = current_user.contact_for(@person)
+    @aspects_with_person = []
+    if @contact
+      @aspects_with_person = @contact.aspects
+      @aspect_ids = @aspects_with_person.map(&:id)
+      @contacts_of_contact = @contact.contacts
+
+      render :layout => nil
+    else
+      redirect_to :back
+    end
+  end
+
   def create
     params[:status_message][:aspect_ids] = params[:aspect_ids]
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 8bd10648b..2fdc0125b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -31,17 +31,22 @@ module ApplicationHelper
     end
   end
 
-  def aspect_badges aspects
+  def aspect_badges aspects, opts = {}
     str = ''
     aspects.each do |aspect|
-      str << aspect_badge(aspect)
+      str << aspect_badge(aspect, opts)
     end
     str.html_safe
   end
 
-  def aspect_badge aspect
+  def aspect_badge aspect, opts = {}
     str = "<span class='aspect_badge single'>"
-    str << link_for_aspect(aspect, 'data-guid' => aspect.id, :class => 'hard_aspect_link').html_safe
+    link = opts.delete(:link)
+    if !link
+      str << link_to(aspect.name, "#", 'data-guid' => aspect.id, :class => 'hard_aspect_link').html_safe
+    else 
+      str << link_for_aspect(aspect, 'data-guid' => aspect.id, :class => 'hard_aspect_link').html_safe
+    end
     str << "</span>"
   end
 
diff --git a/app/views/aspects/show.html.haml b/app/views/aspects/show.html.haml
index 78fb386cb..81149f9bb 100644
--- a/app/views/aspects/show.html.haml
+++ b/app/views/aspects/show.html.haml
@@ -22,7 +22,7 @@
   = render 'aspects/edit_aspect_pane', :contacts => @all_contacts, :aspect => @aspect
 
 .span-15.last
-  = render 'shared/publisher', :aspect => @aspect
+  = render 'shared/publisher', :aspect => @aspect, :aspect_ids => @aspect_ids
 
   #main_stream.stream{:data => {:guids => @aspect.id}}
     = render 'shared/stream', :posts => @posts
diff --git a/app/views/aspects/show.mobile.haml b/app/views/aspects/show.mobile.haml
index 5ac59fe3b..91ddc6dba 100644
--- a/app/views/aspects/show.mobile.haml
+++ b/app/views/aspects/show.mobile.haml
@@ -2,7 +2,7 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-= render 'shared/publisher', :aspect => @aspect
+= render 'shared/publisher', :aspect => @aspect, :aspect_ids => @aspect_ids
 
 = render 'shared/stream', :posts => @posts
 
diff --git a/app/views/people/_aspect_list.haml b/app/views/people/_aspect_list.haml
index a7df0a308..8c65d7361 100644
--- a/app/views/people/_aspect_list.haml
+++ b/app/views/people/_aspect_list.haml
@@ -19,7 +19,7 @@
 
   - else
     .badges{:class => ("hidden" if !contact.persisted?)}
-      = aspect_badges(aspects_with_person)
+      = aspect_badges(aspects_with_person, :link => true)
       %p
       = link_to t('.edit_membership'),
               {:controller => "contacts",
diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml
index ed3ec10b9..9acbd7e6f 100644
--- a/app/views/people/show.html.haml
+++ b/app/views/people/show.html.haml
@@ -45,8 +45,9 @@
 
 
     - else
-      - if user_signed_in? && @contact.person
+      - if user_signed_in? && @contact.person && @contact.pending? == false
         .right
+          = link_to t('.mention'), new_status_message_path(:person_id => @person.id), :class => 'button', :rel => 'facebox'
           = link_to t('.message'), new_conversation_path(:contact_id => @contact.id, :name => @contact.person.name, :contact_id => @contact.id), :class => 'button', :rel => 'facebox'
 
         /- if @post_type == :photos
@@ -70,6 +71,7 @@
               = t('.you_have_no_tags')
               %span.add_tags
                 = link_to t('.add_some'), edit_profile_path
+
   %hr
 
   - if @posts.count > 0
diff --git a/app/views/shared/_publisher.html.haml b/app/views/shared/_publisher.html.haml
index b2c93bb9b..bcb23eaf7 100644
--- a/app/views/shared/_publisher.html.haml
+++ b/app/views/shared/_publisher.html.haml
@@ -13,7 +13,7 @@
     = image_tag 'icons/doc_edit.png'
     %span= t('.whats_on_your_mind')
 
-    = t('aspects', :count => @aspect_ids.length)
+    = t('aspects', :count => aspect_ids.length)
 
   .content_creation
     = form_for(StatusMessage.new, :remote => true, :html => {"data-type" => "json"}) do |status|
@@ -30,12 +30,18 @@
             = status.text_area :fake_text, :rows => 2, :value => h(params[:prefill])
             = status.hidden_field :text, :value => '', :class => 'clear_on_submit'
 
-      - for aspect_id in @aspect_ids
+      - for aspect_id in aspect_ids
         = hidden_field_tag 'aspect_ids[]', aspect_id.to_s
 
       .options_and_submit
         %div.mention_helper
-          %i= t('.mention_helper_text')
+          - if aspect != :profile
+            %i= t('.mention_helper_text')
+          - else
+            .badges
+              %i= 'publishing to: '
+              = aspect_badges(aspects_with_person, :link => false)
+
 
         .right
           #fileInfo
@@ -58,5 +64,5 @@
               = render 'shared/public_explain'
 
     #publisher_photo_upload
-      = render 'photos/new_photo', :aspect_ids => @aspect_ids.join(',')
+      = render 'photos/new_photo', :aspect_ids => aspect_ids.join(',')
 
diff --git a/app/views/shared/_publisher.mobile.haml b/app/views/shared/_publisher.mobile.haml
index 7f850d4ad..0694a5be1 100644
--- a/app/views/shared/_publisher.mobile.haml
+++ b/app/views/shared/_publisher.mobile.haml
@@ -4,7 +4,7 @@
 
 :javascript
   $(document).ready(function(){
-    $("#status_message_message").bind("focus", function(){
+    $("#status_message_text").bind("focus", function(){
       $("#publisher fieldset:first").removeClass('hidden');
     });
   });
diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml
index 1f31ea14d..d65ac48e3 100644
--- a/app/views/shared/_stream_element.html.haml
+++ b/app/views/shared/_stream_element.html.haml
@@ -26,7 +26,7 @@
             = t('the_world')
       - elsif post.author.owner_id == current_user.id
         %span.aspect_badges
-          = aspect_badges(aspects_with_post(all_aspects, post))
+          = aspect_badges(aspects_with_post(all_aspects, post), :link => true)
 
       %span.timeago
         = link_to(how_long_ago(post), status_message_path(post))
diff --git a/app/views/status_messages/new.haml b/app/views/status_messages/new.haml
new file mode 100644
index 000000000..9e9d3c142
--- /dev/null
+++ b/app/views/status_messages/new.haml
@@ -0,0 +1,22 @@
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+
+= javascript_include_tag "publisher.js"
+
+:javascript
+  $(document).ready(function() 
+    {
+      var person = {name: '#{@person.name}', handle: '#{@person.diaspora_handle}' };
+      Publisher.autocompletion.onSelect($("#status_message_fake_text"),person,'#{@person.name}');
+      $("#publisher #status_message_submit.button").click(function(){$.facebox.close();});
+    });
+
+#new_status_message_pane
+  .span-15
+    #facebox_header
+      %h4
+        = t('conversations.index.new_message')
+
+    = render :partial => 'shared/publisher', :locals => { :aspect => @aspect, :aspect_ids => @aspect_ids, :aspects_with_person => @aspects_with_person, :person => @person}
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 97431fe03..25b4404f8 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -346,6 +346,7 @@ en:
       similar_contacts: "similar contacts"
       start_sharing: "start sharing"
       message: "Message"
+      mention: "Mention"
     profile_sidebar:
       remove_contact: "remove contact"
       edit_my_profile: "Edit my profile"
diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml
index 75e04f1c4..dc52cfc2b 100644
--- a/config/locales/javascript/javascript.en.yml
+++ b/config/locales/javascript/javascript.en.yml
@@ -29,4 +29,6 @@ en:
       shared:
         contact_list:
           cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
+      publisher:
+        at_least_one_aspect: "You must publish to at least one aspect"
           
diff --git a/config/routes.rb b/config/routes.rb
index 6ca436187..7efea6eb3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -5,7 +5,7 @@
 Diaspora::Application.routes.draw do
 
 
-  resources :status_messages, :only => [:create, :destroy, :show]
+  resources :status_messages, :only => [:new, :create, :destroy, :show]
   resources :comments,        :only => [:create]
   resources :requests,        :only => [:destroy, :create]
 
diff --git a/features/posts.feature b/features/posts.feature
index 45fc98c56..1714b4ca6 100644
--- a/features/posts.feature
+++ b/features/posts.feature
@@ -4,25 +4,28 @@ Feature: posting
     As a rock star
     I want to tell the world I am eating a yogurt
     
-    Scenario: post to all aspects
-      Given that I am a rock star
+    Background:
+      Given a user with username "bob"
+      And a user with username "alice"
+      When I sign in as "bob@bob.bob"
+      And a user with username "bob" is connected with "alice"
+      And I have an aspect called "PostTo"
+      And I have an aspect called "DidntPostTo"
+      And I have user with username "alice" in an aspect called "PostTo"
+      And I have user with username "alice" in an aspect called "DidntPostTo"
+
       And I have no open aspects saved
-      Given I am signed in
-        And I have an aspect called "Family"
-        And I am on the home page
-        And I expand the publisher
+      And I am on the home page
+
+    Scenario: post to all aspects
+      Given I expand the publisher
       When I fill in "status_message_fake_text" with "I am eating a yogurt"
         And I press "Share"
         And I follow "Home"
       Then I should see "I am eating a yogurt" within ".stream_element"
 
     Scenario: delete a post
-      Given that I am a rock star
-      And I have no open aspects saved
-      And I am signed in
-        And I have an aspect called "Family"
-        And I am on the home page
-        And I expand the publisher
+      Given I expand the publisher
       When I fill in "status_message_fake_text" with "I am eating a yogurt"
         And I press "Share"
         And I follow "Home"
@@ -33,12 +36,6 @@ Feature: posting
         Then I should not see "I am eating a yogurt"
 
     Scenario Outline: post to one aspect
-      Given that I am a rock star
-      And I have no open aspects saved
-      Given I am signed in
-        And I have an aspect called "PostTo"
-        And I have an aspect called "DidntPostTo"
-        And I am on the home page
       When I follow "PostTo"
         And I wait for the ajax to finish
         And I expand the publisher
@@ -52,3 +49,34 @@ Feature: posting
         | aspect      | see     |
         | PostTo      | see     |
         | DidntPostTo | not see |
+    
+    Scenario Outline: posting to all aspects from the profile page
+      Given I am on "alice@alice.alice"'s page
+        And I have turned off jQuery effects
+        And I click "Mention" button
+        And I expand the publisher in the modal window
+        And I append "#publisher #status_message_text" with "I am eating a yogurt" in the modal window
+        And I press "Share" in the modal window
+        And I follow "<aspect>"
+        Then I should <see> "I am eating a yogurt"
+
+        Examples:
+          | aspect      | see     |
+          | PostTo      | see     |
+          | DidntPostTo | see     |
+
+    Scenario Outline: posting to one aspect from the profile page
+      Given I am on "alice@alice.alice"'s page
+        And I have turned off jQuery effects
+        And I click "Mention" button
+        And I expand the publisher in the modal window
+        And I append "#publisher #status_message_text" with "I am eating a yogurt" in the modal window
+        And I follow "DidntPostTo" within "#publisher" in the modal window
+        And I press "Share" in the modal window
+        And I follow "<aspect>"
+        Then I should <see> "I am eating a yogurt"
+
+        Examples:
+          | aspect      | see     |
+          | PostTo      | see     |
+          | DidntPostTo | not see |
diff --git a/features/step_definitions/custom_web_steps.rb b/features/step_definitions/custom_web_steps.rb
index fe7f5a36a..b162fd491 100644
--- a/features/step_definitions/custom_web_steps.rb
+++ b/features/step_definitions/custom_web_steps.rb
@@ -11,6 +11,13 @@ And /^I expand the publisher$/ do
     ')
 end
 
+
+When /^(?:|I )append "([^"]*)" with "([^"]*)"$/ do |field, value|
+  script = "$('#{ field }').val(function(index, value) {
+  return value + ' ' + '#{value}'; });"
+   page.execute_script(script)
+end
+
 And /^I hover over the post$/ do
   page.execute_script('$(".stream_element").first().mouseover()')
 end
@@ -19,6 +26,10 @@ When /^I click to delete the first post$/ do
   page.execute_script('$(".stream_element").first().find(".delete").click()')
 end
 
+And /^I click "([^"]*)" button$/ do |arg1|
+  page.execute_script('$(".button:contains('+arg1+')").click()')
+end
+
 And /^I preemptively confirm the alert$/ do
   page.evaluate_script("window.confirm = function() { return true; }")
 end
diff --git a/features/step_definitions/user_steps.rb b/features/step_definitions/user_steps.rb
index 192dcafeb..353aaeb6d 100644
--- a/features/step_definitions/user_steps.rb
+++ b/features/step_definitions/user_steps.rb
@@ -16,6 +16,13 @@ Given /^a user with email "([^\"]*)"$/ do |email|
   user.aspects.create(:name => "Unicorns")
 end
 
+Given /^a user with username "([^\"]*)"$/ do |username|
+  user = Factory(:user, :email => username + "@" + username + '.' + username, :username => username,
+                 :password => 'password', :password_confirmation => 'password', :getting_started => false)
+  user.aspects.create(:name => "Besties")
+  user.aspects.create(:name => "Unicorns")
+end
+
 Given /^a user named "([^\"]*)" with email "([^\"]*)"$/ do |name, email|
   first, last = name.split
   username = "#{first}_#{last}" if first
@@ -45,6 +52,13 @@ Given /^I have an aspect called "([^\"]*)"$/ do |aspect_name|
   @me.reload
 end
 
+When /^I have user with username "([^"]*)" in an aspect called "([^"]*)"$/ do |username, aspect|
+  user = User.find_by_username(username)
+  contact = @me.reload.contact_for(user.person)
+  contact.aspects << @me.aspects.find_by_name(aspect)
+end
+
+
 Given /^I have one contact request$/ do
   other_user   = Factory(:user)
   other_aspect = other_user.aspects.create!(:name => "meh")
@@ -115,6 +129,12 @@ Given /^a user with email "([^"]*)" is connected with "([^"]*)"$/ do |arg1, arg2
   connect_users(user1, user1.aspects.first, user2, user2.aspects.first)
 end
 
+Given /^a user with username "([^"]*)" is connected with "([^"]*)"$/ do |arg1, arg2|
+  user1 = User.where(:username => arg1).first
+  user2 = User.where(:username => arg2).first
+  connect_users(user1, user1.aspects.first, user2, user2.aspects.first)
+end
+
 Given /^a user with email "([^\"]*)" has posted a status message "([^\"]*)" in all aspects$/ do |arg1, arg2|
   user = User.where(:email => arg1).first
   status_message = user.build_post(:status_message, :text => arg2)
diff --git a/public/javascripts/publisher.js b/public/javascripts/publisher.js
index 3e2eaa495..b322e9f80 100644
--- a/public/javascripts/publisher.js
+++ b/public/javascripts/publisher.js
@@ -306,6 +306,26 @@ var Publisher = {
       '<input id="services_" name="services[]" type="hidden" value="'+service+'">');
     };
   },
+  toggleAspectIds: function(aspectId) {
+    var hidden_field = $('#publisher [name="aspect_ids[]"][value="'+aspectId+'"]')
+    if(hidden_field.length > 0){
+      hidden_field.remove();
+    } else {
+      $("#publisher .content_creation form").append(
+      '<input id="aspect_ids_" name="aspect_ids[]" type="hidden" value="'+aspectId+'">');
+    };
+  },
+  bindAspectToggles: function() {
+    $('#publisher .aspect_badge').bind("click", function(){
+      var unremovedAspects = $(this).parent().children('.aspect_badge').length - $(this).parent().children(".aspect_badge.removed").length;
+      if(!$(this).hasClass('removed') && ( unremovedAspects == 1 )){
+        alert(Diaspora.widgets.i18n.t('publisher.at_least_one_aspect'))
+      }else{
+        Publisher.toggleAspectIds($(this).children('a').attr('data-guid'));
+        $(this).toggleClass("removed");
+      };
+    });
+  },
   initialize: function() {
     Publisher.cachedForm = false;
     Publisher.cachedInput = false;
@@ -314,6 +334,7 @@ var Publisher = {
 
     Publisher.bindServiceIcons();
     Publisher.bindPublicIcon();
+    Publisher.bindAspectToggles();
 
     if ($("#status_message_fake_text").val() == "") {
       Publisher.close();
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 0abadf07b..451de9f87 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -4,6 +4,7 @@
 
 
 $blue: #3F8FBA
+$red: #FF0000 
 $background: rgb(252,252,252)
 
 body
@@ -2217,6 +2218,14 @@ h3,h4
   &:active
     :top 0px
 
+.aspect_badge.removed
+  :background
+    :color #FA2A00 
+  :text
+    :decoration line-through 
+  &:hover
+    :background
+      :color #FA2A00
 .stream
   .avatar
     :float left
diff --git a/spec/controllers/people_controller_spec.rb b/spec/controllers/people_controller_spec.rb
index a0c5f775c..78792edc9 100644
--- a/spec/controllers/people_controller_spec.rb
+++ b/spec/controllers/people_controller_spec.rb
@@ -172,6 +172,15 @@ describe PeopleController do
         get :show, :id => @person.id
         assigns(:posts).should =~ posts_user_can_see
       end
+
+      it 'generates a jasmine fixture' do
+        contact = @user.contact_for(@person)
+        aspect = @user.aspects.create(:name => 'people')
+        contact.aspects << aspect
+        contact.save
+        get :show, :id => @person
+        save_fixture(html_for("body"), "person_show")
+      end
     end
 
     context "when the person is not a contact of the current user" do
diff --git a/spec/controllers/status_messages_controller_spec.rb b/spec/controllers/status_messages_controller_spec.rb
index 46dd5037c..5c9875042 100644
--- a/spec/controllers/status_messages_controller_spec.rb
+++ b/spec/controllers/status_messages_controller_spec.rb
@@ -20,6 +20,14 @@ describe StatusMessagesController do
     @user1.reload
   end
 
+  describe '#new' do
+    it 'succeeds' do
+      get :new,
+        :person_id => @user2.person.id
+      response.should be_success
+    end
+  end
+
   describe '#show' do
     before do
       @message = @user1.build_post :status_message, :text => "ohai", :to => @aspect1.id
diff --git a/spec/javascripts/publisher-spec.js b/spec/javascripts/publisher-spec.js
index c1ce93c9e..0dcbf40da 100644
--- a/spec/javascripts/publisher-spec.js
+++ b/spec/javascripts/publisher-spec.js
@@ -21,6 +21,81 @@ describe("Publisher", function() {
     });
   });
 
+  describe("bindAspectToggles", function() {
+    beforeEach( function(){
+      spec.loadFixture('person_show');
+    });
+
+    it('gets called on initialize', function(){
+      spyOn(Publisher, 'bindAspectToggles'); 
+      Publisher.initialize();
+      expect(Publisher.bindAspectToggles).toHaveBeenCalled();
+    });
+   
+    it('toggles removed only on the clicked icon', function(){
+      expect($("#publisher .aspect_badge").first().hasClass("removed")).toBeFalsy();
+      expect($("#publihser .aspect_badge").last().hasClass("removed")).toBeFalsy();
+
+      Publisher.bindAspectToggles();
+      $("#publisher .aspect_badge").last().click();
+
+      expect($("#publisher .aspect_badge").first().hasClass("removed")).toBeFalsy();
+      expect($("#publisher .aspect_badge").last().hasClass("removed")).toBeTruthy();
+    });
+
+    it('binds to the services icons and toggles the hidden field', function(){
+      spyOn(Publisher, 'toggleAspectIds');
+      Publisher.bindAspectToggles();
+      var aspBadge = $("#publisher .aspect_badge a").last();
+      var aspNum = aspBadge.attr('data-guid');
+      aspBadge.click();
+
+      expect(Publisher.toggleAspectIds).toHaveBeenCalledWith(aspNum);
+    });
+
+    it('does not execute if it is the last non-removed aspect', function(){
+      var aspects = $("#publisher .aspect_badge").length;
+      spyOn(Publisher, 'toggleAspectIds');
+
+      Publisher.bindAspectToggles();
+      spyOn(window, 'alert');// click through the dialog if it happens
+      $("#publisher .aspect_badge a").each(function(){$(this).click()});
+
+      var lastAspectNum = $("#publisher .aspect_badge a").last().attr('data-guid');
+
+      expect($("#publisher .aspect_badge.removed").length).toBe(aspects-1);
+      expect(Publisher.toggleAspectIds.callCount).toBe(1);
+    });
+  });
+  describe('toggleAspectIds', function(){
+    beforeEach( function(){
+      spec.loadFixture('person_show');
+    });
+
+    it('adds a hidden field to the form if there is not one already', function(){
+      expect($('#publisher [name="aspect_ids[]"]').length).toBe(2);
+      Publisher.toggleAspectIds(42);
+      expect($('#publisher [name="aspect_ids[]"]').length).toBe(3);
+      expect($('#publisher [name="aspect_ids[]"]').last().attr('value')).toBe('42');
+    });
+
+    it('removes the hidden field if its already there', function() {
+      Publisher.toggleAspectIds(42);
+      expect($('#publisher [name="aspect_ids[]"]').length).toBe(3);
+
+      Publisher.toggleAspectIds(42);
+      expect($('#publisher [name="aspect_ids[]"]').length).toBe(2);
+    });
+
+    it('does not remove a hidden field with a different value', function() {
+      Publisher.toggleAspectIds(42);
+      expect($('#publisher [name="aspect_ids[]"]').length).toBe(3);
+
+      Publisher.toggleAspectIds(99);
+      expect($('#publisher [name="aspect_ids[]"]').length).toBe(4);
+    });
+  });
+
   describe("bindPublicIcon", function() {
     beforeEach( function(){
       spec.loadFixture('aspects_index_services');
diff --git a/spec/javascripts/rails-spec.js b/spec/javascripts/rails-spec.js
index 6d1911f7a..ae6424a21 100644
--- a/spec/javascripts/rails-spec.js
+++ b/spec/javascripts/rails-spec.js
@@ -3,7 +3,7 @@ describe("rails", function() {
     beforeEach(function() {
       $("#jasmine_content").html(
           '<form accept-charset="UTF-8" id="form" action="/status_messages" data-remote="true"  method="post">' +
-            '<textarea id="status_message_message" name="status_message[message]">Some status message</textarea>' +
+            '<textarea id="status_message_text" name="status_message[text]">Some status message</textarea>' +
             '<input type="submit">' +
             '<input id="standard_hidden" type="hidden" value="keep this value">' +
             '<input id="clearable_hidden" type="hidden" class="clear_on_submit" value="clear this value">' +
@@ -12,12 +12,12 @@ describe("rails", function() {
     });
     it("should retain form values if ajax fails", function() {
       $('#form').trigger('ajax:failure');
-      expect($('#status_message_message').val()).not.toEqual("");
+      expect($('#status_message_text').val()).not.toEqual("");
     });
     it("should clear form on ajax:success", function() {
       $('#form').trigger('ajax:success');
 
-      expect($('#status_message_message').val()).toEqual("");
+      expect($('#status_message_text').val()).toEqual("");
 
     });
     it('should not clear normal hidden fields', function(){
diff --git a/spec/javascripts/view-spec.js b/spec/javascripts/view-spec.js
index 0ba6550fc..013d788a7 100644
--- a/spec/javascripts/view-spec.js
+++ b/spec/javascripts/view-spec.js
@@ -98,7 +98,7 @@ describe("View", function() {
       $("#jasmine_content").html(
         '<div id="publisher">' +
           '<form action="/status_messages" class="new_status_message" id="new_status_message" method="post">' +
-            '<textarea id="status_message_message" name="status_message[message]"></textarea>' +
+            '<textarea id="status_message_text" name="status_message[text]"></textarea>' +
           '</form>' +
         '</div>'
       );

From b7970b23e3042f3a979c9963908741ef9acc0782 Mon Sep 17 00:00:00 2001
From: danielgrippi <daniel@joindiaspora.com>
Date: Wed, 16 Mar 2011 17:27:19 -0700
Subject: [PATCH 03/20] add a people count on tag page

---
 app/controllers/posts_controller.rb |  5 +++--
 app/views/aspects/index.html.haml   |  2 --
 app/views/posts/index.html.haml     | 11 ++++++++++-
 config/locales/diaspora/en.yml      |  2 ++
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 5157b92c8..be51e5f36 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -24,6 +24,7 @@ class PostsController < ApplicationController
 
     profiles = Profile.tagged_with(params[:tag]).where(:searchable => true).select('profiles.id, profiles.person_id')
     @people = Person.where(:id => profiles.map{|p| p.person_id}).limit(15)
+    @people_count = Person.where(:id => profiles.map{|p| p.person_id}).count
 
     @fakes = PostsFake.new(@posts)
     @commenting_disabled = true
@@ -40,11 +41,11 @@ class PostsController < ApplicationController
         I18n.locale = @person.owner.language
         render "posts/#{@post.class.to_s.underscore}", :layout => true
       else
-        flash[:error] = "that post does not exsist!"
+        flash[:error] = "that post does not exist!"
         redirect_to root_url
       end
     else
-      flash[:error] = "that post does not exsist!"
+      flash[:error] = "that post does not exist!"
       redirect_to root_url
     end
   end
diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml
index 222a7a3e0..24697e818 100644
--- a/app/views/aspects/index.html.haml
+++ b/app/views/aspects/index.html.haml
@@ -31,8 +31,6 @@
         %h4
           = new_request_link(@request_count)
 
-    %hr
-
   - if @invites > 0
     .section.invite_friends
       %h4= t('shared.invitations.invite_your_friends')
diff --git a/app/views/posts/index.html.haml b/app/views/posts/index.html.haml
index faaa6f59e..1c3b0a0bc 100644
--- a/app/views/posts/index.html.haml
+++ b/app/views/posts/index.html.haml
@@ -33,7 +33,13 @@
 
 .prepend-2.span-7.last
   %h3
-    = t('.people_tagged_with', :tag => "##{params[:tag]}")
+    = @people_count
+    %span{:style => "font-weight:normal"}
+      - if @people_count == 1
+        = t('.person')
+      - else
+        = t('.people')
+
   .side_stream.stream
     - for person in @people
       .stream_element{:id => person.id}
@@ -43,3 +49,6 @@
             =person_link(person)
           .info
             = person.diaspora_handle
+
+    - if @people_count > 15
+      \...
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 25b4404f8..19607d700 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -404,6 +404,8 @@ en:
       posts_tagged_with: "Posts tagged with #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
       people_tagged_with: "People tagged with %{tag}"
+      people: "people"
+      person: "person"
 
   profiles:
     edit:

From 70091deef4a1f3f652746248f2158b8b1a646f20 Mon Sep 17 00:00:00 2001
From: danielgrippi <daniel@joindiaspora.com>
Date: Wed, 16 Mar 2011 17:46:09 -0700
Subject: [PATCH 04/20] show tags under names in people partials

---
 app/views/aspects/index.html.haml        |  1 -
 app/views/people/_person.html.haml       |  2 +-
 app/views/posts/index.html.haml          |  2 +-
 public/stylesheets/sass/application.sass | 16 ++++++++++++++++
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml
index 24697e818..eeb06b112 100644
--- a/app/views/aspects/index.html.haml
+++ b/app/views/aspects/index.html.haml
@@ -36,7 +36,6 @@
       %h4= t('shared.invitations.invite_your_friends')
       = render "shared/invitations", :invites => @invites
 
-
   #aspect_listings.section
     = render 'aspects/aspect_listings', :aspects => @aspects
 
diff --git a/app/views/people/_person.html.haml b/app/views/people/_person.html.haml
index ce0aa8042..4e8df4e57 100644
--- a/app/views/people/_person.html.haml
+++ b/app/views/people/_person.html.haml
@@ -32,5 +32,5 @@
       =person_link(person)
 
     .info
-      = person.diaspora_handle
+      = person.profile.format_tags(person.profile.tag_string)
 
diff --git a/app/views/posts/index.html.haml b/app/views/posts/index.html.haml
index 1c3b0a0bc..a3129fa9f 100644
--- a/app/views/posts/index.html.haml
+++ b/app/views/posts/index.html.haml
@@ -48,7 +48,7 @@
           %span.from
             =person_link(person)
           .info
-            = person.diaspora_handle
+            = person.profile.format_tags(person.profile.tag_string)
 
     - if @people_count > 15
       \...
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 451de9f87..332ee1b05 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -2787,6 +2787,22 @@ ul.show_comments
   :font
     :weight bold
 
+.info
+  :overflow hidden
+  :white-space nowrap
+  :text-overflow ellipsis
+  
+  .tag
+    :background
+      :color #efefef
+    :color #999
+    :border
+      :bottom 1px dotted #999
+
+    &:hover
+      :border
+        :bottom 1px solid #999
+
 .diaspora_handle
   :font
     :size 12px

From 2e1123275ed927a86228a8e7d25b4b5d9fd73f3d Mon Sep 17 00:00:00 2001
From: danielgrippi <daniel@joindiaspora.com>
Date: Wed, 16 Mar 2011 17:53:25 -0700
Subject: [PATCH 05/20] add styling on tag header

---
 app/views/posts/index.html.haml          |  8 ++------
 public/stylesheets/sass/application.sass | 11 ++++++++++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/views/posts/index.html.haml b/app/views/posts/index.html.haml
index a3129fa9f..535c59bc0 100644
--- a/app/views/posts/index.html.haml
+++ b/app/views/posts/index.html.haml
@@ -14,12 +14,8 @@
   = include_javascripts :home
 
 .span-24.last
-  %h1
-    - if params[:tag]
-      = "##{params[:tag]}"
-
-    - else
-      = t('.whatup', :pod => @pod_url)
+  %h1.tag
+    = "##{params[:tag]}"
 
 .span-15
   #main_stream.stream
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 332ee1b05..8ae7b603b 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -26,7 +26,7 @@ p
   :word-wrap break-word
 
 h1, h2, h3, h4, h5
-  :color #444
+  :color #333
   :position relative
   :font
     :weight bold
@@ -2774,6 +2774,7 @@ ul.show_comments
       :display none
 
 .tag
+  :display inline-block
   &:hover
     :text
       :decoration none
@@ -2787,6 +2788,14 @@ ul.show_comments
   :font
     :weight bold
 
+h1.tag
+  :border
+    :bottom 2px dotted $blue
+  &:hover
+    :border
+      :bottom 2px dotted $blue
+    
+
 .info
   :overflow hidden
   :white-space nowrap

From a30affe8d34113f08089bfda42c5bc786b76c3f7 Mon Sep 17 00:00:00 2001
From: zhitomirskiyi <ilya@joindiaspora.com>
Date: Wed, 16 Mar 2011 18:10:29 -0700
Subject: [PATCH 06/20] moved the fixture to the right place

---
 app/views/status_messages/new.haml                  | 2 +-
 config/locales/diaspora/en.yml                      | 3 +--
 spec/controllers/people_controller_spec.rb          | 9 ---------
 spec/controllers/status_messages_controller_spec.rb | 9 +++++++++
 spec/javascripts/publisher-spec.js                  | 4 ++--
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/views/status_messages/new.haml b/app/views/status_messages/new.haml
index 9e9d3c142..5fc3d362e 100644
--- a/app/views/status_messages/new.haml
+++ b/app/views/status_messages/new.haml
@@ -17,6 +17,6 @@
   .span-15
     #facebox_header
       %h4
-        = t('conversations.index.new_message')
+        = t('mentioning') + @person.name
 
     = render :partial => 'shared/publisher', :locals => { :aspect => @aspect, :aspect_ids => @aspect_ids, :aspects_with_person => @aspects_with_person, :person => @person}
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 19607d700..80cefb7d9 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -539,8 +539,7 @@ en:
 
   status_messages:
     new_status_message:
-      tell_me_something_good: "tell me something good"
-      oh_yeah: "oh yeah!"
+      mentioning: "Mentioning: "
     show:
       destroy: "Delete"
       permalink: "permalink"
diff --git a/spec/controllers/people_controller_spec.rb b/spec/controllers/people_controller_spec.rb
index 78792edc9..a0c5f775c 100644
--- a/spec/controllers/people_controller_spec.rb
+++ b/spec/controllers/people_controller_spec.rb
@@ -172,15 +172,6 @@ describe PeopleController do
         get :show, :id => @person.id
         assigns(:posts).should =~ posts_user_can_see
       end
-
-      it 'generates a jasmine fixture' do
-        contact = @user.contact_for(@person)
-        aspect = @user.aspects.create(:name => 'people')
-        contact.aspects << aspect
-        contact.save
-        get :show, :id => @person
-        save_fixture(html_for("body"), "person_show")
-      end
     end
 
     context "when the person is not a contact of the current user" do
diff --git a/spec/controllers/status_messages_controller_spec.rb b/spec/controllers/status_messages_controller_spec.rb
index 5c9875042..77ca3539c 100644
--- a/spec/controllers/status_messages_controller_spec.rb
+++ b/spec/controllers/status_messages_controller_spec.rb
@@ -26,6 +26,15 @@ describe StatusMessagesController do
         :person_id => @user2.person.id
       response.should be_success
     end
+
+      it 'generates a jasmine fixture' do
+        contact = @user1.contact_for(@user2.person)
+        aspect = @user1.aspects.create(:name => 'people')
+        contact.aspects << aspect
+        contact.save
+        get :new, :person_id => @user2.person.id, :layout => true
+        save_fixture(html_for("body"), "status_message_new")
+      end
   end
 
   describe '#show' do
diff --git a/spec/javascripts/publisher-spec.js b/spec/javascripts/publisher-spec.js
index 0dcbf40da..7197d4aa6 100644
--- a/spec/javascripts/publisher-spec.js
+++ b/spec/javascripts/publisher-spec.js
@@ -23,7 +23,7 @@ describe("Publisher", function() {
 
   describe("bindAspectToggles", function() {
     beforeEach( function(){
-      spec.loadFixture('person_show');
+      spec.loadFixture('status_message_new');
     });
 
     it('gets called on initialize', function(){
@@ -69,7 +69,7 @@ describe("Publisher", function() {
   });
   describe('toggleAspectIds', function(){
     beforeEach( function(){
-      spec.loadFixture('person_show');
+      spec.loadFixture('status_message_new');
     });
 
     it('adds a hidden field to the form if there is not one already', function(){

From 2026b4c3268e6de5ae4b8d8a071ac33d65cb7b35 Mon Sep 17 00:00:00 2001
From: zhitomirskiyi <ilya@joindiaspora.com>
Date: Wed, 16 Mar 2011 19:20:24 -0700
Subject: [PATCH 07/20] fixed the css, added a space

---
 app/views/shared/_publisher.html.haml    | 11 ++++++-----
 app/views/status_messages/new.haml       |  5 +++--
 config/locales/diaspora/en.yml           |  2 +-
 public/stylesheets/sass/application.sass |  9 +++++++++
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/views/shared/_publisher.html.haml b/app/views/shared/_publisher.html.haml
index bcb23eaf7..34f22e38c 100644
--- a/app/views/shared/_publisher.html.haml
+++ b/app/views/shared/_publisher.html.haml
@@ -7,13 +7,14 @@
     $(".question_mark").tipsy({trigger: 'hover', gravity: 'w'});
   });
 
-#publisher
+#publisher.mention_popup
 
   #click_to_share
-    = image_tag 'icons/doc_edit.png'
-    %span= t('.whats_on_your_mind')
+    -unless aspect == :profile
+      = image_tag 'icons/doc_edit.png'
+      %span= t('.whats_on_your_mind')
 
-    = t('aspects', :count => aspect_ids.length)
+      = t('aspects', :count => aspect_ids.length)
 
   .content_creation
     = form_for(StatusMessage.new, :remote => true, :html => {"data-type" => "json"}) do |status|
@@ -50,7 +51,7 @@
 
         .public_toggle
           %span#publisher_service_icons
-            - if aspect == :all
+            - if aspect == :all || :profile
               = status.hidden_field( :public)
               = image_tag "social_media_logos/feed-16x16.png", :title => "RSS", :class => 'public_icon dim'
             - if current_user.services
diff --git a/app/views/status_messages/new.haml b/app/views/status_messages/new.haml
index 5fc3d362e..821bb7afb 100644
--- a/app/views/status_messages/new.haml
+++ b/app/views/status_messages/new.haml
@@ -10,13 +10,14 @@
     {
       var person = {name: '#{@person.name}', handle: '#{@person.diaspora_handle}' };
       Publisher.autocompletion.onSelect($("#status_message_fake_text"),person,'#{@person.name}');
+      $("#publisher #status_message_fake_text").val(function(index, value){ return value + " " });
       $("#publisher #status_message_submit.button").click(function(){$.facebox.close();});
     });
 
 #new_status_message_pane
-  .span-15
+  .span-15.last
     #facebox_header
       %h4
-        = t('mentioning') + @person.name
+        = t('.mentioning') + @person.name
 
     = render :partial => 'shared/publisher', :locals => { :aspect => @aspect, :aspect_ids => @aspect_ids, :aspects_with_person => @aspects_with_person, :person => @person}
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 80cefb7d9..dec5f54fc 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -538,7 +538,7 @@ en:
       cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
 
   status_messages:
-    new_status_message:
+    new:
       mentioning: "Mentioning: "
     show:
       destroy: "Delete"
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 8ae7b603b..758eac5c6 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -848,6 +848,15 @@ label
   :border
     :bottom 2px #777 solid
 
+  &.mention_popup
+
+    :padding 1px 12px
+    :margin
+      :bottom 0
+    :border
+      :bottom none
+
+
   &.closed
     .options_and_submit
       :display none !important

From 7d97d7ea1fcaa347f63c4a1582f1523519ea1673 Mon Sep 17 00:00:00 2001
From: Jordi Mallach <jordi@softcatala.org>
Date: Thu, 17 Mar 2011 13:04:37 +0100
Subject: [PATCH 08/20] Adapt Catalan translation to the reformatting of
 ed8d4db. Hopefully everything is correct, but it wouldn't be surprising if
 something has been overlooked.

---
 config/locales/diaspora/ca.yml | 1082 +++++++++++++++++---------------
 1 file changed, 571 insertions(+), 511 deletions(-)

diff --git a/config/locales/diaspora/ca.yml b/config/locales/diaspora/ca.yml
index 3316606c5..bbab62ca7 100644
--- a/config/locales/diaspora/ca.yml
+++ b/config/locales/diaspora/ca.yml
@@ -28,22 +28,150 @@ ca:
   back: "Enrere"
   the_world: "el món"
   search: "Cerca"
-  new_notifications: "%{count} notificacions noves"
-  no_new_notifications: "cap notificació nova"
-  new_messages: "%{count} missatges nous"
-  no_new_messages: "cap missatge nou"
   _home: "Inici"
-  _more: "Més"
-  _comments: "Comentaris"
-  _comment: "Comentari"
   more: "Més"
   next: "següent"
   previous: "anterior"
+
+
+  #for reference translation, the real activerecord english transations are actually
+  #in en-US, en-GB, and en-AU yml files
+  activerecord:
+    errors:
+      models:
+        user:
+          attributes:
+            person:
+              invalid: "és invàlid."
+            username:
+              taken: "ja és en ús."
+            email:
+              taken: "ja és en ús."
+          person:
+            attributes:
+              diaspora_handle:
+                taken: "ja és en ús."
+          contact:
+            attributes:
+              person_id:
+                taken: "ha de ser únic entre els contactes d'aquest usuari."
+           request:
+             attributes:
+               from_id:
+                 taken: "és un duplicat d'una petició ja existent."
+
+
+  error_messages:
+    helper:
+      invalid_fields: "Camps invàlids"
+      correct_the_following_errors_and_try_again: "Corregiu els errors següents i torneu-ho a provar."
+
+
+  application:
+    helper:
+      unknown_person: "persona desconeguda"
+      video_title:
+        unknown: "Títol del vídeo desconegut"
+      aspect_badge:
+        all_aspects: "Tots els aspectes"
+
+
+  aspects:
+    zero: "cap aspecte"
+    one: "1 aspecte"
+    few: "%{count} aspectes"
+    many: "%{count} aspectes"
+    other: "%{count} aspectes"
+    contacts_visible: "Els contactes en aquest aspecte es podran veure entre ells."
+    contacts_not_visible: "Els contactes en aquest aspecte no es podran veure entre ells."
+    edit:
+      make_aspect_list_visible: "voleu fer visible aquest aspecte?"
+      remove_aspect: "Suprimeix aquest aspecte"
+      confirm_remove_aspect: "Esteu segur de voler suprimir aquest aspecte?"
+      add_existing: "Afegeix un contacte existent"
+      done: "Fet"
+      rename: "canvia el nom"
+      aspect_list_is_visible: "la llista de l'aspecte és visible a tots els membres de l'aspecte"
+      aspect_list_is_not_visible: "la llista de l'aspecte està amagada per a tots els membres de l'aspecte"
+      update: "actualitza"
+    aspect_contacts:
+      done_editing: "finalitza l'edició"
+    aspect_stream:
+      sort_by: "ordena per:"
+      activity: "activitat"
+      post_time: "data de publicació"
+    show:
+      edit_aspect: "edita l'aspecte"
+    no_contacts_message:
+      nobody: "Introduïu la gent que us importa al Diàspora!"
+      nobody_in_aspect: "El vostre aspecte '%{aspect_name}' és buit."
+      add_contact: "Afegeix un contacte"
+      add_contact_to: "Afegeix algú a l'aspecte %{aspect_name}"
+      invite: "Convida algú a unir-se al Diàspora!"
+    no_posts_message:
+      start_talking:  "Ningú no ha dit res encara. Inicieu la conversa!"
+    manage:
+      add_a_new_aspect: "Afegeix un aspecte nou"
+      add_a_new_contact: "Afegeix un contacte nou"
+      requests: "Peticions"
+        no_requests: "No hi ha cap petició nova"
+        manage_aspects: "Gestiona els espectes"
+        drag_to_add: "Arrossegueu i deixeu anar per afegir gent"
+    new_aspect:
+      name: "Nom"
+      create: "Crea'l"
+    create:
+      success: "S'ha creat el vostre aspecte nou %{name}"
+      failure: "Ha fallat la creació de l'aspecte."
+    destroy:
+      success: "S'ha suprimit %{name} amb èxit."
+      failure: "%{name} no és buit i no es pot suprimir."
+    update:
+      success: "S'ha editat l'aspecte %{name} amb èxit."
+      failure: "El nom de l'aspecte %{name} és massa llarg i no es pot desar."
+    move_contact:
+      failure: "no ha funcionat %{inspect}"
+      success: "La persona s'ha mogut a l'aspecte nou"
+      error: "S'ha produït un error en moure el contacte: %{inspect}"
+    add_to_aspect:
+      failure: "No s'ha pogut afegir el contacte a l'aspecte."
+      success: "S'ha afegit el contacte a l'aspecte amb èxit."
+    helper:
+      remove: "suprimeix"
+      aspect_not_empty: "L'aspecte no és buit"
+      are_you_sure: "Esteu segur de voler suprimir aquest aspecte?"
+    seed:
+      family: "Família"
+      work: "Feina"
+    index:
+      handle_explanation: "Aquest és el vostre identificador de Diàspora. Com les adreces de correu, podeu donar això a la gent per a que us contacte."
+      no_contacts: "Cap contacte"
+
+
+  aspect_memberships:
+    destroy:
+      success: "S'ha suprimit a la persona de l'aspecte amb èxit"
+      failure: "No s'ha pogut suprimir a la persona de l'aspecte"
+      no_membership: "No s'ha trobat a la persona seleccionada a l'aspecte"
+
+
+  comments:
+    zero: "cap comentari"
+    one: "1 comentari"
+    few: "%{count} comentaris"
+    many: "%{count} comentaris"
+    other: "%{count} comentaris"
+    new_comment:
+      comment: "Comenta"
+      commenting: "S'està comentant…"
+
+
   contacts:
-    zero:   "cap contacte"
-    one:    "1 contacte"
-    few:    "%{count} contactes"
-    other:  "%{count} contactes"
+    zero: "cap contacte"
+    one: "1 contacte"
+    few: "%{count} contactes"
+    many: "%{count} contactes"
+    other: "%{count} contactes"
     destroy:
       success: "S'ha desconnectat de %{name} amb èxit"
       failure: "No s'ha pogut desconnectar de %{name}"
@@ -53,508 +181,440 @@ ca:
       add_new_aspect: "afegeix a un aspecte nou" 
     create:
       failure: "No s'ha pogut crear el contacte"
-  new_requests:
-    zero:   "no hi ha peticions noves"
-    one:    "petició nova!"
-    few:    "%{count} peticions noves!"
-    other:  "%{count} peticions noves!"
 
-  _contact: "Contacte"
-  _contacts: "Contactes"
 
-  #for reference translation, the real activerecord english transations are actually
-  #in en-US, en-GB, and en-AU yml files
-  activerecord:
-      errors:
-          models:
-              user:
-                  attributes:
-                      person:
-                          invalid: "és invàlid."
-                      username:
-                          taken: "ja és en ús."
-                      email:
-                          taken: "ja és en ús."
-              person:
-                  attributes:
-                      diaspora_handle:
-                          taken: "ja és en ús."
-              contact:
-                  attributes:
-                      person_id:
-                          taken: "ha de ser únic entre els contactes d'aquest usuari."
-              request:
-                  attributes:
-                      from_id:
-                          taken: "és un duplicat d'una petició ja existent."
-
-  application:
-      helper:
-          unknown_person: "persona desconeguda"
-          video_title:
-              unknown: "Títol del vídeo desconegut"
-          aspect_badge:
-              all_aspects: "Tots els aspectes"
-  error_messages:
-      helper:
-          invalid_fields: "Camps invàlids"
-          correct_the_following_errors_and_try_again: "Corregiu els errors següents i torneu-ho a provar."
-  layouts:
-      header:
-        view_profile: "mostra el perfil"
-        edit_profile: "edita el perfil"
-        account_settings: "paràmetres del compte"
-        logout: "surt"
-        blog: "bloc"
-        login: "entra"
-        code: "codi"
-      application:
-        powered_by: "FUNCIONA AMB DIÀSPORA*"
-        whats_new: "què és nou?"
-        have_a_problem: "Teniu un problema? Trobeu aquí una resposta"
-        your_aspects: "els vostres aspectes"
-        logged_in_as: "autenticat com a %{name}"
-        toggle: "commuta el lloc per a mòbils"
-        public_feed: "Canal públic del Diàspora per a %{name}"
-  shared:
-      publisher:
-          mention_helper_text: "per a mencionar algú, premeu «@» i comenceu a escriure el seu nom"
-          posting: "S'està publicant…"
-          share: "Comparteix"
-          post_a_message_to: "Publica un missatge a %{aspect}"
-          make_public: "fes públic"
-          all: "tot"
-          add_photos: "afegeix fotos"
-          all_contacts: "tots els contactes"
-          share_with: "comparteix amb"
-          whats_on_your_mind: "què teniu al cap?"
-      add_contact:
-          enter_a_diaspora_username: "Introduïu un nom d'usuari de Diàspora:"
-          your_diaspora_username_is: "El vostre nom d'usuari de Diàspora és: %{diaspora_handle}"
-          create_request: "Cerca per identificador de Diàspora"
-          diaspora_handle: "diaspora@identificador.cat"
-          know_email: "Coneixeu el seu correu electrònic? L'hauríeu de convidar"
-      invitations:
-          invites: "Invitacions"
-          invite_someone: "Convideu algú"
-          invitations_left: "(en queden %{count})"
-          dont_have_now: "No en teniu cap ara mateix, però aviat arribaran més invitacions!"
-          invites_closed: "Actualment, les invitacions són tancades a aquesta beina de Diàspora"
-          invite_your_friends: "Convideu el vostres amics"
-          from_facebook: "Des del Facebook"
-          by_email: "per correu electrònic"
-      reshare:
-          reshare: "Torna a compartir"
-      public_explain:
-          title: "Esteu a punt de publicar un missatge públic!"
-          outside: "Els missatges públics seran visibles per qualsevol des de fora del Diàspora."
-          logged_in: "s'ha entrat en %{service}"
-          manage: "gestiona els serveis connectats"
-      notification:
-          new: "Nou %{type} de %{from}"
-      contact_list:
-          all_contacts: "Tots els contactes"
-          cannot_remove: "No es pot suprimir a una persona de l'últim aspecte. (Si voleu desconnectar d'aquesta persona, heu de suprimir el contacte.)"
-  aspect_memberships:
-      destroy:
-          success: "S'ha suprimit a la persona de l'aspecte amb èxit"
-          failure: "No s'ha pogut suprimir a la persona de l'aspecte"
-          no_membership: "No s'ha trobat a la persona seleccionada a l'aspecte"
- 
-  aspects:
-      zero: "no Aspectes"
-      one: "1 Aspecte"
-      other: "%{count} Aspectes"
-      contacts_visible: "Els contactes en aquest aspecte es podran veure entre ells."
-      contacts_not_visible: "Els contactes en aquest aspecte no es podran veure entre ells."
-      edit:
-          make_aspect_list_visible: "voleu fer visible aquest aspecte?"
-          remove_aspect: "Suprimeix aquest aspecte"
-          confirm_remove_aspect: "Esteu segur de voler suprimir aquest aspecte?"
-          add_existing: "Afegeix un contacte existent"
-          done: "Fet"
-          rename: "canvia el nom"
-          aspect_list_is_visible: "la llista de l'aspecte és visible a tots els membres de l'aspecte"
-          aspect_list_is_not_visible: "la llista de l'aspecte està amagada per a tots els membres de l'aspecte"
-          update: "actualitza"
-      aspect_contacts:
-          done_editing: "finalitza l'edició"
-      aspect_stream:
-        sort_by: "ordena per:"
-        activity: "activitat"
-        post_time: "data de publicació"
-      show:
-          edit_aspect: "edita l'aspecte"
-      no_contacts_message:
-          nobody: "Introduïu la gent que us importa al Diàspora!"
-          nobody_in_aspect: "El vostre aspecte '%{aspect_name}' és buit."
-          add_contact: "Afegeix un contacte"
-          add_contact_to: "Afegeix algú a l'aspecte %{aspect_name}"
-          invite: "Convida algú a unir-se al Diàspora!"
-      no_posts_message:
-          start_talking:  "Ningú no ha dit res encara. Inicieu la conversa!"
-      manage:
-          add_a_new_aspect: "Afegeix un aspecte nou"
-          add_a_new_contact: "Afegeix un contacte nou"
-          requests: "Peticions"
-          no_requests: "No hi ha cap petició nova"
-          manage_aspects: "Gestiona els espectes"
-          drag_to_add: "Arrossegueu i deixeu anar per afegir gent"
-      new_aspect:
-          name: "Nom"
-          create: "Crea'l"
-
-      create:
-          success: "S'ha creat el vostre aspecte nou %{name}"
-          failure: "Ha fallat la creació de l'aspecte."
-      destroy:
-          success: "S'ha suprimit %{name} amb èxit."
-          failure: "%{name} no és buit i no es pot suprimir."
-      update:
-          success: "S'ha editat l'aspecte %{name} amb èxit."
-          failure: "El nom de l'aspecte %{name} és massa llarg i no es pot desar."
-      move_contact:
-          failure: "no ha funcionat %{inspect}"
-          success: "La persona s'ha mogut a l'aspecte nou"
-          error: "S'ha produït un error en moure el contacte: %{inspect}"
-      add_to_aspect:
-          failure: "No s'ha pogut afegir el contacte a l'aspecte."
-          success: "S'ha afegit el contacte a l'aspecte amb èxit."
-      helper:
-          remove: "suprimeix"
-          aspect_not_empty: "L'aspecte no és buit"
-          are_you_sure: "Esteu segur de voler suprimir aquest aspecte?"
-      seed:
-          family: "Família"
-          work: "Feina"
-      index:
-          handle_explanation: "Aquest és el vostre identificador de Diàspora. Com les adreces de correu, podeu donar això a la gent per a que us contacte."
-          no_contacts: "Cap contacte"
-  notifications:
-      request_accepted: "ha acceptat la vostra petició per a compartir."
-      new_request: "s'ha oferit a compartir amb vosaltres"
-      comment_on_post: "ha comentat la vostra"
-      also_commented: "also commented on your contact's"
-      mentioned: "us ha mencionat a la seva"
-      post: "publicació"
-      deleted: "suprimida"
-      also_commented_deleted: "ha comentat una publicació suprimida"
-      index:
-        notifications: "Notificacions"
-        mark_all_as_read: "Marca-les totes com a llegides"
-  users:
-      edit:
-          export_data: "Exporta les dades"
-          close_account: "Tanca el compte"
-          change_language: "Canvia la llengua"
-          change_password: "Canvia la contrasenya"
-          new_password: "Contrasenya nova"
-          current_password: "Contrasenya actual"
-          download_xml: "baixa el meu XML"
-          download_photos: "baixa les meues fotos"
-          your_handle: "El vostre identificador de diàspora"
-          your_email: "El vostre correu electrònic"
-          edit_account: "Edita el compte"
-          receive_email_notifications: "Voleu rebre notificacions per correu quan…"
-          also_commented: "… algú també comenti la publicació del vostre contacte?"
-          comment_on_post: "… algú comenti la vostra publicació?"
-          mentioned: "… us mencionin a una publicació?"
-          request_received: "… rebeu una petició per a compartir nova?"
-          request_acceptence: "… la vostra petició per a compartir siga acceptada?"
-          private_message: "… rebeu un missatge privat?"
-          change: "Canvia"
-      destroy: "S'ha tancat el compte amb èxit."
-      getting_started:
-          welcome: "Benvingut/da al Diàspora!"
-          signup_steps: "Acabeu el registre completant aquests tres pasos:"
-          edit_profile: "Editeu el vostre perfil"
-          connect_on_diaspora: "Connecta al Diàspora"
-          connect_services: "Connecta els vostres altres serveis"
-          finished: "Finalitzat!"
-          skip: "omet la configuració inicial"
-          save_and_continue: "Desa i continua"
-          step_3:
-              finish: "Finalitza"
-              people_already_on_diaspora: "Gent que ja és al Diàspora"
-          step_2:
-              find_your_friends_on_diaspora: "Voleu cercar els vostres amics del Facebook al Diàspora?"
-              skip: "Omet"
-      update:
-          password_changed: "S'ha canviat la contrasenya"
-          password_not_changed: "Ha fallat el canvi de contrasenya"
-          language_changed: "S'ha canviat la llengua"
-          language_not_changed: "Ha fallat el canvi de llengua"
-          email_notifications_changed: "S'han canviat les notificacions per correu"
-      public:
-          does_not_exist: "L'usuari %{username} no existeix!"
-  comments:
-      new_comment:
-          comment: "Comenta"
-          commenting: "S'està comentant…"
-  photos:
-      show:
-          delete_photo: "Suprimeix la foto"
-          make_profile_photo: "fes-la la foto del perfil"
-          update_photo: "Actualitza la foto"
-          view: "mostra"
-          edit: "edita"
-          edit_delete_photo: "Edita la descripció de la foto / suprimeix la foto"
-          permalink: "enllaç permanent"
-          collection_permalink: "enllaç permanent a la colecció"
-          original_post: "Publicació original"
-      edit:
-          editing: "S'està editant"
-      photo:
-          view_all: "mostra totes les fotos de %{name}"
-      new:
-          new_photo: "Foto nova"
-          back_to_list: "Torna a la llista"
-          post_it: "publica-ho!"
-      create:
-          runtime_error: "Ha fallat la pujada de la foto. Heu comprovat que porteu el cinturó de seguretat?"
-          integrity_error: "Ha fallat la pujada de la foto. Esteu segur que això era una imatge?"
-          type_error: "Ha fallat la pujada de la foto. Esteu segur d'haver afegit una imatge?"
-      update:
-          notice: "S'ha actualitzat la foto amb èxit."
-          error:  "No s'ha pogut editar la foto."
-      destroy:
-          notice: "S'ha suprimit la foto."
-      new_photo:
-          invalid_ext: "{file} té una extensió invàlida. Només es permeten les extensions {extensions}."
-          size_error: "{file} és massa gran. La mida màxima dels fitxers és {sizeLimit}."
-          empty: "{file} és buit. Seleccioneu els fitxers de nou, sense incloure aquest."
-      new_profile_photo:
-          upload: "Pugeu una foto de perfil nova!"
-          or_select_one: "o seleccioneu una de les ja existents"
-  registrations:
-      new:
-          sign_up: "Registreu-vos"
-          sign_up_for_diaspora: "Registreu-vos al Diàspora"
-          enter_email: "Introduïu una adreça de correu electrònic"
-          enter_username: "Trieu un nom d'usuari (només amb lletres, números i subratllats)"
-          enter_password: "Introduïu una contrasenya"
-          enter_password_again: "Introduïu la mateixa contrasenya de nou"
-      create:
-          success: "Us heu unit al Diàspora!"
-      edit:
-          edit: "Edita %{name}"
-          leave_blank: "(deixeu-ho en blanc si no ho voleu canviar)"
-          password_to_confirm: "(és necessària la vostra contrasenya actual per a confirmar els canvis)"
-          unhappy: "No esteu content?"
-          update: "Actualitza"
-          cancel_my_account: "Canceŀla el meu compte"
-      closed: "Els registres són tancats en aquesta beina del Diàspora."
-  invitations:
-      create:
-          sent: "S'ha enviat invitacions a: "
-          rejected: "Les adreces següents han tingut problemes: "
-          no_more: "No teniu més invitacions."
-          already_sent: "Ja heu convidat aquesta persona."
-          already_contacts: "Ja esteu connectat a aquesta persona" 
-      new:
-          invite_someone_to_join: "Convideu algú a unir-se al Diàspora!"
-          if_they_accept_info: "si accepten, seran afegits a l'aspecte al qual l'heu convidat."
-          comma_seperated_plz: "Podeu introduir múltiples adreces de correu separades per comes."
-          to: "A"
-          personal_message: "Missatge personal"
-          send_an_invitation: "Envia una invitació"
-          send_invitation: "Envia una invitació"
-          aspect: "Aspecte"
-          already_invited: "Ja convidat"
-          resend: "Torna-la a enviar"
-      check_token:
-          not_found: "No s'ha trobat el testimoni de la invitació"
-      edit:
-          sign_up: "registreu-vos"
-  status_messages:
-      new_status_message:
-          tell_me_something_good: "dis-me alguna cosa bonica"
-          oh_yeah: "oh sí!"
-      show:
-          destroy: "Suprimeix"
-          permalink: "enllaç permanent"
-      helper:
-          no_message_to_display: "No hi ha missatges a mostrar."
-      destroy:
-          failure: "No s'ha pogut suprimir la publicació"
-  profiles:
-      edit:
-          info_available_to: "Aquesta informació serà disponible per a tots aquells amb qui connectes al Diàspora."
-          your_profile: "El vostre perfil"
-          your_name: "El vostre nom"
-          first_name: "Nom"
-          last_name: "Cognom"
-          your_gender: "El vostre gènere"
-          your_birthday: "El vostre aniversari"
-          your_bio: "La vostra biografia"
-          your_photo: "La vostra foto"
-          update_profile: "Actualitza el perfil"
-          allow_search: "Permet que la gent em cerque dins del Diàspora"
-          edit_profile: "Edita el perfil"
-      update:
-          updated: "S'ha actualitzat el perfil"
-          failed: "No s'ha pogut actualitzar el perfil"
-  people:
-      person:
-          pending_request: "petició pendent"
-          already_connected: "Ja connectat"
-          thats_you: "ets tu!"
-          add_contact: "afegeix un contacte"
-      index:
-          results_for: "resultats de la cerca per a"
-          no_results: "Ep! Heu de cercar alguna cosa."
-          couldnt_find_them_send_invite: "No l'heu trobat? Envieu-li una invitació!"
-          no_one_found: "… i no s'ha trobat ningú."
-      webfinger:
-          fail: "No s'ha trobat a %{handle}."
-      show:
-          no_posts: "no hi ha publicacions a mostrar!"
-          incoming_request: "%{name} vol compartir amb tu"
-          return_to_aspects: "Torneu a la pàgina d'aspectes"
-          to_accept_or_ignore: "per a acceptar-ho o descartar-ho."
-          does_not_exist: "Aquesta persona no existeix!"
-          not_connected: "No esteu compartint amb %{name}"
-          recent_posts: "Publicacions recents"
-          recent_public_posts: "Publicacions públiques recents"
-          similar_contacts: "contactes similars"
-          start_sharing: "comença a compartir"
-          message: "Missatge"
-      profile_sidebar:
-          remove_contact: "suprimeix el contacte"
-          edit_my_profile: "Edita el meu perfil"
-          bio: "biografia"
-          gender: "gènere"
-          born: "aniversari"
-          in_aspects: "als aspectes"
-          cannot_remove: "No es pot suprimir a %{name} de l'últim aspecte. (Si voleu desconnectar d'aquesta persona, heu de suprimir el contacte.)"
-          remove_from: "Voleu suprimir a %{name} de l'aspecte %{aspect}?"
-      helper:
-           results_for: " resultats per a %{params}"
-           people_on_pod_are_aware_of: " persones a la beina són conscients de"
-      aspect_list:
-           edit_membership: "edita la pertinença de l'aspecte"
-  posts:
-      index:
-          whatup: "Què està passant a %{pod}"
-          posts_tagged_with: "Publicacions etiquetades amb #%{tag}"
-  requests:
-      manage_aspect_contacts:
-          manage_within: "Gestiona els contactes inclosos"
-          existing: "Existing contacts"
-      destroy:
-          success: "Ara sou amics."
-          error: "Seleccioneu un aspecte!"
-          ignore: "S'ha omès la petició de contacte."
-      create:
-          sending: "S'està enviant"
-          sent: "Heu demanat compartir amb %{name}. Hauria de veure la petició la pròxima vegada que entri al Diàspora."
-      new_request_to_person:
-          sent: "enviat!"
-  services:
-      index:
-        logged_in_as: "s'ha autenticat com a"
-        disconnect: "desconnecta"
-        really_disconnect: "desconnecta del %{service}?"
-        connect_to_twitter: "Connect al Twitter"
-        connect_to_facebook: "Connecta al Facebook"
-        edit_services: "Edita els serveis"
-      create:
-          success: "S'ha autenticat amb èxit."
-      destroy:
-          success: "S'ha suprimit l'autenticació amb èxit."
-      failure:
-          error: "s'ha produït un error en connectar a aquell servei"
-      inviter:
-          join_me_on_diaspora: "Uneix-te a mi al DIÀSPORA*"
-          click_link_to_accept_invitation: "Feu clic en aquest enllaç per a acceptar la invitació"
-      finder:
-          invite_your_friends_from: "Convideu els vostres amics del %{service}"
-          friends:
-            zero:   "cap amic"
-            one:    "1 amic"
-            few:    "%{count} amics"
-            other:  "%{count} amics"
-          not_connected: "no connectat"
-      remote_friend:
-          resend: "torna a enviar"
-          invite: "convida"
-  notifier:
-      hello: "Hola %{name}!"
-      love: "Amb amor,"
-      thanks: "Gràcies,"
-      diaspora: "el robot del correu del Diàspora"
-      single_admin:
-          subject: "Un missatge sobre el vostre compte de Diàspora:"
-          admin: "L'administrador de Diàspora"
-      new_request:
-          subject: "Nova petició de contacte de %{from} al Diàspora"
-          just_sent_you: "us acaba d'enviar una petició de contacte al Diàspora*"
-          try_it_out: "Seria interessant que li pegareu una ullada."
-          sign_in: "Identifiqueu-vos aquí"
-      request_accepted:
-          subject: "%{name} ha acceptat la vostra petició de contacte al Diàspora*"
-          accepted: "ha acceptat la vostra petició de contacte!"
-          sign_in: "Identifiqueu-vos aquí"
-      comment_on_post:
-          subject: "%{name} ha comentat la vostra publicació."
-          commented: "ha comentat la vostra publicació:"
-          sign_in: "Identifiqueu-vos per a mostrar-ho."
-      also_commented:
-          subject: "%{name} també ha comentat la publicació de %{post_author}."
-          commented: "també ha comentat la publicació de %{post_author}:"
-          sign_in: "Identifiqueu-vos per a mostrar-ho."
-      mentioned:
-          subject: "%{name} t'ha mencionat al Diàspora*"
-          mentioned: "t'ha mencionat en una publicació:"
-          sign_in: "Identifiqueu-vos per a mostrar-ho."
-      private_message:
-          subject: "%{name} us ha enviat un missatge privat al Diàspora*"
-          private_message: "us ha enviat un missatge privat:"
-          message_subject: "Assumpte: %{subject}"
-          sign_in: "Identifiqueu-vos per a mostrar-ho."
-  home:
-      show:
-          share_what_you_want: "Compartiu el que vulgueu, amb qui vulgueu."
-          tagline_first_half: "Compartiu el que vulgueu,"
-          tagline_second_half: "amb qui vulgueu."
-          already_account: "ja teniu un compte?"
-          login_here: "Identifiqueu-vos aquí"
-          choice: "Elecció"
-          choice_explanation: "El Diàspora us permet ordenar les vostres connexions en grups anomenats aspectes. Únics al Diàspora, els aspectes asseguren que les vostres fotos, històries i acudits només són compartits amb les persones que vosaltres voleu."
-          ownership: "Pertinença"
-          ownership_explanation: "Les vostres imatges us pertanyen, i no hauríeu de renunciar a això només per poder compartir-les. Conserveu la propietat de tot el que compartiu al Diàspora, i això us dona control total sobre la seva distribució."
-          simplicity: "Simplicitat"
-          simplicity_explanation: "El Diàspora fa que compartir siga net i fàcil – i això també s'aplica a la privacitat. Inherentment privat, el Diàspora no fa que us hagueu de perdre entre pàgines de paràmetres i opcions només per mantenir el vostre perfil segur."
-          learn_about_host: "Aprengueu com hostatjar el vostre servidor de Diàspora propi."
-  stream_helper:
-      show_comments: "mostra tots els comentaris"
-      hide_comments: "amaga els comentaris"
-  webfinger:
-      fetch_failed: "no s'ha pogut obtenir el perfil webfinger per a %{profile_url}"
-      hcard_fetch_failed: "s'ha produït un problema en obtenir l'hcard per a %{account}"
-      xrd_fetch_failed: "s'ha produït un error en obtenir l'xrd del compte %{account}"
-      not_enabled: "sembla que el webfinger no és habilitat al servidor de %{account}"
-      no_person_constructed: "No s'ha pogut construir ningú a partir d'aquesta hcard."
-  pagination:
-      next: "Següent"
-      previous: "Anterior"
-  date:
-      formats:
-          fullmonth_day: "%B %d"
-          birthday: "%B %d"
-          birthday_with_year: "%B %d %Y"
   conversations:
-      index:
-          message_inbox: "Bústia d'entrada"
-          new_message: "Missatge nou"
-          no_conversation_selected: "no hi ha cap conversa seleccionada"
-          create_a_new_message: "crea un missatge nou"
-          no_messages: "no hi ha missatges"
+    index:
+      message_inbox: "Bústia d'entrada"
+        new_message: "Missatge nou"
+        no_conversation_selected: "no hi ha cap conversa seleccionada"
+        create_a_new_message: "crea un missatge nou"
+        no_messages: "no hi ha missatges"
       show:
-          reply: "respon"
-          delete: "suprimeix i bloca la conversa"
+        reply: "respon"
+        delete: "suprimeix i bloca la conversa"
       new:
-          to: "a"
-          subject: "assumpte"
-          send: "Envia"
-          no_results: "No s'ha trobat cap resultat"
+        to: "a"
+        subject: "assumpte"
+        send: "Envia"
+        no_results: "No s'ha trobat cap resultat"
+      helper:
+        new_messages:
+          zero: "cap missatge nou"
+          one: "1 missatge nou"
+          few: "%{count} missatges nous"
+          many: "%{count} missatges nous"
+          other: "%{count} missatges nous"
+
+
+  date:
+    formats:
+      fullmonth_day: "%B %d"
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+
+
+  home:
+    show:
+      share_what_you_want: "Compartiu el que vulgueu, amb qui vulgueu."
+      tagline_first_half: "Compartiu el que vulgueu,"
+      tagline_second_half: "amb qui vulgueu."
+      already_account: "ja teniu un compte?"
+      login_here: "Identifiqueu-vos aquí"
+      choice: "Elecció"
+      choice_explanation: "El Diàspora us permet ordenar les vostres connexions en grups anomenats aspectes. Únics al Diàspora, els aspectes asseguren que les vostres fotos, històries i acudits només són compartits amb les persones que vosaltres voleu."
+      ownership: "Pertinença"
+      ownership_explanation: "Les vostres imatges us pertanyen, i no hauríeu de renunciar a això només per poder compartir-les. Conserveu la propietat de tot el que compartiu al Diàspora, i això us dona control total sobre la seva distribució."
+      simplicity: "Simplicitat"
+      simplicity_explanation: "El Diàspora fa que compartir siga net i fàcil – i això també s'aplica a la privacitat. Inherentment privat, el Diàspora no fa que us hagueu de perdre entre pàgines de paràmetres i opcions només per mantenir el vostre perfil segur."
+      learn_about_host: "Aprengueu com hostatjar el vostre servidor de Diàspora propi."
+
+
+  invitations:
+    create:
+      sent: "S'ha enviat invitacions a: "
+      rejected: "Les adreces següents han tingut problemes: "
+      no_more: "No teniu més invitacions."
+      already_sent: "Ja heu convidat aquesta persona."
+      already_contacts: "Ja esteu connectat a aquesta persona" 
+    new:
+      invite_someone_to_join: "Convideu algú a unir-se al Diàspora!"
+      if_they_accept_info: "si accepten, seran afegits a l'aspecte al qual l'heu convidat."
+      comma_seperated_plz: "Podeu introduir múltiples adreces de correu separades per comes."
+      to: "A"
+      personal_message: "Missatge personal"
+      send_an_invitation: "Envia una invitació"
+      send_invitation: "Envia una invitació"
+      aspect: "Aspecte"
+      already_invited: "Ja convidat"
+      resend: "Torna-la a enviar"
+    check_token:
+      not_found: "No s'ha trobat el testimoni de la invitació"
+    edit:
+      sign_up: "registreu-vos"
+
+
+  layouts:
+    header:
+      view_profile: "mostra el perfil"
+      edit_profile: "edita el perfil"
+      account_settings: "paràmetres del compte"
+      logout: "surt"
+      blog: "bloc"
+      login: "entra"
+      code: "codi"
+    application:
+      powered_by: "FUNCIONA AMB DIÀSPORA*"
+      whats_new: "què és nou?"
+      have_a_problem: "Teniu un problema? Trobeu aquí una resposta"
+      your_aspects: "els vostres aspectes"
+      logged_in_as: "autenticat com a %{name}"
+      toggle: "commuta el lloc per a mòbils"
+      public_feed: "Canal públic del Diàspora per a %{name}"
+
+
+  notifications:
+    request_accepted: "ha acceptat la vostra petició per a compartir."
+    new_request: "s'ha oferit a compartir amb vosaltres"
+    comment_on_post: "ha comentat la vostra"
+    also_commented: "also commented on your contact's"
+    mentioned: "us ha mencionat a la seva"
+    post: "publicació"
+    deleted: "suprimida"
+    also_commented_deleted: "ha comentat una publicació suprimida"
+    index:
+      notifications: "Notificacions"
+      mark_all_as_read: "Marca-les totes com a llegides"
+    helper:
+      new_notifications:
+        zero: "cap notificació nova"
+        one: "1 notificació nova"
+        few: "%{count} notificacions noves"
+        many: "%{count} notificacions noves"
+        other: "%{count} notificacions noves"
+
+
+  notifier:
+    hello: "Hola %{name}!"
+    love: "Amb amor,"
+    thanks: "Gràcies,"
+    diaspora: "el robot del correu del Diàspora"
+    single_admin:
+      subject: "Un missatge sobre el vostre compte de Diàspora:"
+      admin: "L'administrador de Diàspora"
+    new_request:
+      subject: "Nova petició de contacte de %{from} al Diàspora"
+      just_sent_you: "us acaba d'enviar una petició de contacte al Diàspora*"
+      try_it_out: "Seria interessant que li pegareu una ullada."
+      sign_in: "Identifiqueu-vos aquí"
+    request_accepted:
+      subject: "%{name} ha acceptat la vostra petició de contacte al Diàspora*"
+      accepted: "ha acceptat la vostra petició de contacte!"
+      sign_in: "Identifiqueu-vos aquí"
+    comment_on_post:
+      subject: "%{name} ha comentat la vostra publicació."
+      commented: "ha comentat la vostra publicació:"
+      sign_in: "Identifiqueu-vos per a mostrar-ho."
+    also_commented:
+      subject: "%{name} també ha comentat la publicació de %{post_author}."
+      commented: "també ha comentat la publicació de %{post_author}:"
+      sign_in: "Identifiqueu-vos per a mostrar-ho."
+    mentioned:
+      subject: "%{name} t'ha mencionat al Diàspora*"
+      mentioned: "t'ha mencionat en una publicació:"
+      sign_in: "Identifiqueu-vos per a mostrar-ho."
+    private_message:
+      subject: "%{name} us ha enviat un missatge privat al Diàspora*"
+      private_message: "us ha enviat un missatge privat:"
+      message_subject: "Assumpte: %{subject}"
+      sign_in: "Identifiqueu-vos per a mostrar-ho."
+
+
+  people:
+    person:
+      pending_request: "petició pendent"
+      already_connected: "Ja connectat"
+      thats_you: "ets tu!"
+      add_contact: "afegeix un contacte"
+    index:
+      results_for: "resultats de la cerca per a"
+      no_results: "Ep! Heu de cercar alguna cosa."
+      couldnt_find_them_send_invite: "No l'heu trobat? Envieu-li una invitació!"
+      no_one_found: "… i no s'ha trobat ningú."
+    webfinger:
+      fail: "No s'ha trobat a %{handle}."
+    show:
+      no_posts: "no hi ha publicacions a mostrar!"
+      incoming_request: "%{name} vol compartir amb tu"
+      return_to_aspects: "Torneu a la pàgina d'aspectes"
+      to_accept_or_ignore: "per a acceptar-ho o descartar-ho."
+      does_not_exist: "Aquesta persona no existeix!"
+      not_connected: "No esteu compartint amb %{name}"
+      recent_posts: "Publicacions recents"
+      recent_public_posts: "Publicacions públiques recents"
+      similar_contacts: "contactes similars"
+      start_sharing: "comença a compartir"
+      message: "Missatge"
+    profile_sidebar:
+      remove_contact: "suprimeix el contacte"
+      edit_my_profile: "Edita el meu perfil"
+      bio: "biografia"
+      gender: "gènere"
+      born: "aniversari"
+      in_aspects: "als aspectes"
+      cannot_remove: "No es pot suprimir a %{name} de l'últim aspecte. (Si voleu desconnectar d'aquesta persona, heu de suprimir el contacte.)"
+      remove_from: "Voleu suprimir a %{name} de l'aspecte %{aspect}?"
+    helper:
+      results_for: " resultats per a %{params}"
+      people_on_pod_are_aware_of: " persones a la beina són conscients de"
+    aspect_list:
+      edit_membership: "edita la pertinença de l'aspecte"
+
+
+  photos:
+    show:
+      delete_photo: "Suprimeix la foto"
+      make_profile_photo: "fes-la la foto del perfil"
+      update_photo: "Actualitza la foto"
+      view: "mostra"
+      edit: "edita"
+      edit_delete_photo: "Edita la descripció de la foto / suprimeix la foto"
+      permalink: "enllaç permanent"
+      collection_permalink: "enllaç permanent a la colecció"
+      original_post: "Publicació original"
+    edit:
+      editing: "S'està editant"
+    photo:
+      view_all: "mostra totes les fotos de %{name}"
+    new:
+      new_photo: "Foto nova"
+      back_to_list: "Torna a la llista"
+      post_it: "publica-ho!"
+    create:
+      runtime_error: "Ha fallat la pujada de la foto. Heu comprovat que porteu el cinturó de seguretat?"
+      integrity_error: "Ha fallat la pujada de la foto. Esteu segur que això era una imatge?"
+      type_error: "Ha fallat la pujada de la foto. Esteu segur d'haver afegit una imatge?"
+    update:
+      notice: "S'ha actualitzat la foto amb èxit."
+      error:  "No s'ha pogut editar la foto."
+    destroy:
+      notice: "S'ha suprimit la foto."
+    new_photo:
+      invalid_ext: "{file} té una extensió invàlida. Només es permeten les extensions {extensions}."
+      size_error: "{file} és massa gran. La mida màxima dels fitxers és {sizeLimit}."
+      empty: "{file} és buit. Seleccioneu els fitxers de nou, sense incloure aquest."
+    new_profile_photo:
+      upload: "Pugeu una foto de perfil nova!"
+      or_select_one: "o seleccioneu una de les ja existents"
+
+
+  posts:
+    index:
+      whatup: "Què està passant a %{pod}"
+      posts_tagged_with: "Publicacions etiquetades amb #%{tag}"
+
+
+  profiles:
+    edit:
+      info_available_to: "Aquesta informació serà disponible per a tots aquells amb qui connectes al Diàspora."
+      your_profile: "El vostre perfil"
+      your_name: "El vostre nom"
+      first_name: "Nom"
+      last_name: "Cognom"
+      your_gender: "El vostre gènere"
+      your_birthday: "El vostre aniversari"
+      your_bio: "La vostra biografia"
+      your_photo: "La vostra foto"
+      update_profile: "Actualitza el perfil"
+      allow_search: "Permet que la gent em cerque dins del Diàspora"
+      edit_profile: "Edita el perfil"
+    update:
+      updated: "S'ha actualitzat el perfil"
+      failed: "No s'ha pogut actualitzar el perfil"
+
+
+  registrations:
+    new:
+      sign_up: "Registreu-vos"
+      sign_up_for_diaspora: "Registreu-vos al Diàspora"
+      enter_email: "Introduïu una adreça de correu electrònic"
+      enter_username: "Trieu un nom d'usuari (només amb lletres, números i subratllats)"
+      enter_password: "Introduïu una contrasenya"
+      enter_password_again: "Introduïu la mateixa contrasenya de nou"
+    create:
+      success: "Us heu unit al Diàspora!"
+    edit:
+      edit: "Edita %{name}"
+      leave_blank: "(deixeu-ho en blanc si no ho voleu canviar)"
+      password_to_confirm: "(és necessària la vostra contrasenya actual per a confirmar els canvis)"
+      unhappy: "No esteu content?"
+      update: "Actualitza"
+      cancel_my_account: "Canceŀla el meu compte"
+    closed: "Els registres són tancats en aquesta beina del Diàspora."
+
+
+  requests:
+    manage_aspect_contacts:
+      manage_within: "Gestiona els contactes inclosos"
+      existing: "Existing contacts"
+    destroy:
+      success: "Ara sou amics."
+      error: "Seleccioneu un aspecte!"
+      ignore: "S'ha omès la petició de contacte."
+    create:
+      sending: "S'està enviant"
+      sent: "Heu demanat compartir amb %{name}. Hauria de veure la petició la pròxima vegada que entri al Diàspora."
+    new_request_to_person:
+      sent: "enviat!"
+    helper:
+      new_requests:
+        zero: "no hi ha peticions noves"
+        one: "petició nova!"
+        few: "%{count} peticions noves!"
+        many: "%{count} peticions noves!"
+        other: "%{count} peticions noves!"
+
+
+  services:
+    index:
+      logged_in_as: "s'ha autenticat com a"
+      disconnect: "desconnecta"
+      really_disconnect: "desconnecta del %{service}?"
+      connect_to_twitter: "Connect al Twitter"
+      connect_to_facebook: "Connecta al Facebook"
+      edit_services: "Edita els serveis"
+    create:
+      success: "S'ha autenticat amb èxit."
+    destroy:
+      success: "S'ha suprimit l'autenticació amb èxit."
+    failure:
+      error: "s'ha produït un error en connectar a aquell servei"
+    inviter:
+      join_me_on_diaspora: "Uneix-te a mi al DIÀSPORA*"
+      click_link_to_accept_invitation: "Feu clic en aquest enllaç per a acceptar la invitació"
+    finder:
+      invite_your_friends_from: "Convideu els vostres amics del %{service}"
+      friends:
+        zero: "cap amic"
+        one: "1 amic"
+        few: "%{count} amics"
+        many: "%{count} amics"
+        other: "%{count} amics"
+      not_connected: "no connectat"
+      remote_friend:
+        resend: "torna a enviar"
+        invite: "convida"
+
+
+  shared:
+    publisher:
+      mention_helper_text: "per a mencionar algú, premeu «@» i comenceu a escriure el seu nom"
+      posting: "S'està publicant…"
+      share: "Comparteix"
+      post_a_message_to: "Publica un missatge a %{aspect}"
+      make_public: "fes públic"
+      all: "tot"
+      add_photos: "afegeix fotos"
+      all_contacts: "tots els contactes"
+      share_with: "comparteix amb"
+      whats_on_your_mind: "què teniu al cap?"
+    add_contact:
+      enter_a_diaspora_username: "Introduïu un nom d'usuari de Diàspora:"
+      your_diaspora_username_is: "El vostre nom d'usuari de Diàspora és: %{diaspora_handle}"
+      create_request: "Cerca per identificador de Diàspora"
+      diaspora_handle: "diaspora@identificador.cat"
+      know_email: "Coneixeu el seu correu electrònic? L'hauríeu de convidar"
+    invitations:
+      invites: "Invitacions"
+      invite_someone: "Convideu algú"
+      invitations_left: "(en queden %{count})"
+      dont_have_now: "No en teniu cap ara mateix, però aviat arribaran més invitacions!"
+      invites_closed: "Actualment, les invitacions són tancades a aquesta beina de Diàspora"
+      invite_your_friends: "Convideu el vostres amics"
+      from_facebook: "Des del Facebook"
+      by_email: "per correu electrònic"
+    reshare:
+      reshare: "Torna a compartir"
+    public_explain:
+      title: "Esteu a punt de publicar un missatge públic!"
+      outside: "Els missatges públics seran visibles per qualsevol des de fora del Diàspora."
+      logged_in: "s'ha entrat en %{service}"
+      manage: "gestiona els serveis connectats"
+    notification:
+      new: "Nou %{type} de %{from}"
+    contact_list:
+      all_contacts: "Tots els contactes"
+      cannot_remove: "No es pot suprimir a una persona de l'últim aspecte. (Si voleu desconnectar d'aquesta persona, heu de suprimir el contacte.)"
+
+
+  status_messages:
+    new_status_message:
+      tell_me_something_good: "dis-me alguna cosa bonica"
+      oh_yeah: "oh sí!"
+    show:
+      destroy: "Suprimeix"
+      permalink: "enllaç permanent"
+    helper:
+      no_message_to_display: "No hi ha missatges a mostrar."
+    destroy:
+      failure: "No s'ha pogut suprimir la publicació"
+
+
+  stream_helper:
+    show_comments: "mostra tots els comentaris"
+    hide_comments: "amaga els comentaris"
+
+
+  users:
+    edit:
+      export_data: "Exporta les dades"
+      close_account: "Tanca el compte"
+      change_language: "Canvia la llengua"
+      change_password: "Canvia la contrasenya"
+      new_password: "Contrasenya nova"
+      current_password: "Contrasenya actual"
+      download_xml: "baixa el meu XML"
+      download_photos: "baixa les meues fotos"
+      your_handle: "El vostre identificador de diàspora"
+      your_email: "El vostre correu electrònic"
+      edit_account: "Edita el compte"
+      receive_email_notifications: "Voleu rebre notificacions per correu quan…"
+      also_commented: "… algú també comenti la publicació del vostre contacte?"
+      comment_on_post: "… algú comenti la vostra publicació?"
+      mentioned: "… us mencionin a una publicació?"
+      request_received: "… rebeu una petició per a compartir nova?"
+      request_acceptence: "… la vostra petició per a compartir siga acceptada?"
+      private_message: "… rebeu un missatge privat?"
+      change: "Canvia"
+    destroy: "S'ha tancat el compte amb èxit."
+    getting_started:
+      welcome: "Benvingut/da al Diàspora!"
+      signup_steps: "Acabeu el registre completant aquests tres pasos:"
+      edit_profile: "Editeu el vostre perfil"
+      connect_on_diaspora: "Connecta al Diàspora"
+      connect_services: "Connecta els vostres altres serveis"
+      finished: "Finalitzat!"
+      skip: "omet la configuració inicial"
+      save_and_continue: "Desa i continua"
+      step_3:
+        finish: "Finalitza"
+        people_already_on_diaspora: "Gent que ja és al Diàspora"
+      step_2:
+        find_your_friends_on_diaspora: "Voleu cercar els vostres amics del Facebook al Diàspora?"
+        skip: "Omet"
+    update:
+      password_changed: "S'ha canviat la contrasenya"
+      password_not_changed: "Ha fallat el canvi de contrasenya"
+      language_changed: "S'ha canviat la llengua"
+      language_not_changed: "Ha fallat el canvi de llengua"
+      email_notifications_changed: "S'han canviat les notificacions per correu"
+    public:
+      does_not_exist: "L'usuari %{username} no existeix!"
+
+
+  webfinger:
+    fetch_failed: "no s'ha pogut obtenir el perfil webfinger per a %{profile_url}"
+    hcard_fetch_failed: "s'ha produït un problema en obtenir l'hcard per a %{account}"
+    xrd_fetch_failed: "s'ha produït un error en obtenir l'xrd del compte %{account}"
+    not_enabled: "sembla que el webfinger no és habilitat al servidor de %{account}"
+    no_person_constructed: "No s'ha pogut construir ningú a partir d'aquesta hcard."

From dd293d8bffcfd01b0cd4795c0dea7e475a6d69c0 Mon Sep 17 00:00:00 2001
From: Jordi Mallach <jordi@softcatala.org>
Date: Thu, 17 Mar 2011 13:44:13 +0100
Subject: [PATCH 09/20] Updated Catalan translations to 6a33ae7.

---
 config/locales/diaspora/ca.yml              | 20 ++++++++++++++++----
 config/locales/javascript/javascript.ca.yml |  2 ++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/config/locales/diaspora/ca.yml b/config/locales/diaspora/ca.yml
index bbab62ca7..30856c263 100644
--- a/config/locales/diaspora/ca.yml
+++ b/config/locales/diaspora/ca.yml
@@ -32,6 +32,7 @@ ca:
   more: "Més"
   next: "següent"
   previous: "anterior"
+  _comments: "Comentaris"
 
 
   #for reference translation, the real activerecord english transations are actually
@@ -285,6 +286,8 @@ ca:
     index:
       notifications: "Notificacions"
       mark_all_as_read: "Marca-les totes com a llegides"
+      and_others: "i %{number} més"
+      and: "and"
     helper:
       new_notifications:
         zero: "cap notificació nova"
@@ -345,16 +348,20 @@ ca:
       fail: "No s'ha trobat a %{handle}."
     show:
       no_posts: "no hi ha publicacions a mostrar!"
+      you_have_no_tags: "no teniu cap etiqueta!"
+      add_some: "afegiu alguna"
+      edit: "edita"
       incoming_request: "%{name} vol compartir amb tu"
       return_to_aspects: "Torneu a la pàgina d'aspectes"
       to_accept_or_ignore: "per a acceptar-ho o descartar-ho."
       does_not_exist: "Aquesta persona no existeix!"
-      not_connected: "No esteu compartint amb %{name}"
+      not_connected: "No esteu compartint amb aquesta persona"
       recent_posts: "Publicacions recents"
       recent_public_posts: "Publicacions públiques recents"
       similar_contacts: "contactes similars"
       start_sharing: "comença a compartir"
       message: "Missatge"
+      mention: "Menció"
     profile_sidebar:
       remove_contact: "suprimeix el contacte"
       edit_my_profile: "Edita el meu perfil"
@@ -412,6 +419,10 @@ ca:
     index:
       whatup: "Què està passant a %{pod}"
       posts_tagged_with: "Publicacions etiquetades amb #%{tag}"
+      nobody_talking: "Ningú està parlant de %{tag} encara."
+      people_tagged_with: "Gent etiquetada amb %{tag}"
+      people: "gent"
+      person: "persona"
 
 
   profiles:
@@ -423,6 +434,8 @@ ca:
       last_name: "Cognom"
       your_gender: "El vostre gènere"
       your_birthday: "El vostre aniversari"
+      your_tags: "Vosaltres: en 5 #etiquetes"
+      your_tags_placeholder: "P. ex. #música #llibres #esport #amics #cervesa"
       your_bio: "La vostra biografia"
       your_photo: "La vostra foto"
       update_profile: "Actualitza el perfil"
@@ -548,9 +561,8 @@ ca:
 
 
   status_messages:
-    new_status_message:
-      tell_me_something_good: "dis-me alguna cosa bonica"
-      oh_yeah: "oh sí!"
+    new:
+      mentioning: "Mencionant: "
     show:
       destroy: "Suprimeix"
       permalink: "enllaç permanent"
diff --git a/config/locales/javascript/javascript.ca.yml b/config/locales/javascript/javascript.ca.yml
index 459b106f1..77d45b169 100644
--- a/config/locales/javascript/javascript.ca.yml
+++ b/config/locales/javascript/javascript.ca.yml
@@ -32,4 +32,6 @@ ca:
       shared:
         contact_list:
           cannot_remove: "No es pot suprimir a una persona de l'últim aspecte. (Si voleu desconnectar d'aquesta persona, heu de suprimir el contacte.)"
+      publisher:
+        at_least_one_aspect: "Heu de publicar almenys un aspecte."
           

From 2fd6cab1f1e3ce68c1b72ed1b645c4c6a5cf8fc5 Mon Sep 17 00:00:00 2001
From: Jordi Mallach <jordi@softcatala.org>
Date: Thu, 17 Mar 2011 13:45:02 +0100
Subject: [PATCH 10/20] Fix typo.

---
 config/locales/devise/devise.en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/devise/devise.en.yml b/config/locales/devise/devise.en.yml
index 958e23d3d..349d83a20 100644
--- a/config/locales/devise/devise.en.yml
+++ b/config/locales/devise/devise.en.yml
@@ -34,7 +34,7 @@ en:
         change_password: "Change my password"
       new:
         forgot_password: "Forgot your password?"
-        no_account: 'No account with this email exsists.  If you are waiting for an invite, we are rolling them out as soon as possible'
+        no_account: 'No account with this email exists.  If you are waiting for an invite, we are rolling them out as soon as possible'
         send_password_instructions: "Send me reset password instructions"
     confirmations:
       send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'

From 561c377bc58cb377b8d036bfb7d36346a97ef6b0 Mon Sep 17 00:00:00 2001
From: Jordi Mallach <jordi@softcatala.org>
Date: Thu, 17 Mar 2011 14:16:25 +0100
Subject: [PATCH 11/20] Two of the keys are verb, not noun. Adapt accordingly.

---
 config/locales/diaspora/ca.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/locales/diaspora/ca.yml b/config/locales/diaspora/ca.yml
index 30856c263..4216545fa 100644
--- a/config/locales/diaspora/ca.yml
+++ b/config/locales/diaspora/ca.yml
@@ -349,7 +349,7 @@ ca:
     show:
       no_posts: "no hi ha publicacions a mostrar!"
       you_have_no_tags: "no teniu cap etiqueta!"
-      add_some: "afegiu alguna"
+      add_some: "afegiu-ne alguna"
       edit: "edita"
       incoming_request: "%{name} vol compartir amb tu"
       return_to_aspects: "Torneu a la pàgina d'aspectes"
@@ -360,8 +360,8 @@ ca:
       recent_public_posts: "Publicacions públiques recents"
       similar_contacts: "contactes similars"
       start_sharing: "comença a compartir"
-      message: "Missatge"
-      mention: "Menció"
+      message: "Envia-li un missatge"
+      mention: "Menciona'l"
     profile_sidebar:
       remove_contact: "suprimeix el contacte"
       edit_my_profile: "Edita el meu perfil"

From 8cf96f4b3d9d2d587e5f912e80a3f1b7411cc4ff Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Thu, 17 Mar 2011 14:31:14 +0100
Subject: [PATCH 12/20] fixed syntax errors in ca.yml

---
 config/locales/diaspora/ca.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/locales/diaspora/ca.yml b/config/locales/diaspora/ca.yml
index 4216545fa..246691db3 100644
--- a/config/locales/diaspora/ca.yml
+++ b/config/locales/diaspora/ca.yml
@@ -56,10 +56,10 @@ ca:
             attributes:
               person_id:
                 taken: "ha de ser únic entre els contactes d'aquest usuari."
-           request:
-             attributes:
-               from_id:
-                 taken: "és un duplicat d'una petició ja existent."
+            request:
+              attributes:
+                from_id:
+                  taken: "és un duplicat d'una petició ja existent."
 
 
   error_messages:
@@ -114,7 +114,7 @@ ca:
     manage:
       add_a_new_aspect: "Afegeix un aspecte nou"
       add_a_new_contact: "Afegeix un contacte nou"
-      requests: "Peticions"
+      requests:
         no_requests: "No hi ha cap petició nova"
         manage_aspects: "Gestiona els espectes"
         drag_to_add: "Arrossegueu i deixeu anar per afegir gent"
@@ -186,7 +186,7 @@ ca:
 
   conversations:
     index:
-      message_inbox: "Bústia d'entrada"
+      message_inbox:
         new_message: "Missatge nou"
         no_conversation_selected: "no hi ha cap conversa seleccionada"
         create_a_new_message: "crea un missatge nou"

From 34450621ae005c2a59f8e94ed93fcdd66946c1c6 Mon Sep 17 00:00:00 2001
From: Jordi Mallach <jordi@softcatala.org>
Date: Thu, 17 Mar 2011 14:34:53 +0100
Subject: [PATCH 13/20] Adding "1" to notification message.

---
 config/locales/diaspora/ca.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/diaspora/ca.yml b/config/locales/diaspora/ca.yml
index 246691db3..3b6e0ab94 100644
--- a/config/locales/diaspora/ca.yml
+++ b/config/locales/diaspora/ca.yml
@@ -482,7 +482,7 @@ ca:
     helper:
       new_requests:
         zero: "no hi ha peticions noves"
-        one: "petició nova!"
+        one: "1 petició nova!"
         few: "%{count} peticions noves!"
         many: "%{count} peticions noves!"
         other: "%{count} peticions noves!"

From dda14e1629e5a20b4b59302f5a076c9bf828c7e7 Mon Sep 17 00:00:00 2001
From: Jordi Mallach <jordi@softcatala.org>
Date: Thu, 17 Mar 2011 14:44:10 +0100
Subject: [PATCH 14/20] Correct indentation and re-add requests & message_inbox
 tags.

---
 config/locales/diaspora/ca.yml | 48 +++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/config/locales/diaspora/ca.yml b/config/locales/diaspora/ca.yml
index 3b6e0ab94..af1503277 100644
--- a/config/locales/diaspora/ca.yml
+++ b/config/locales/diaspora/ca.yml
@@ -114,10 +114,10 @@ ca:
     manage:
       add_a_new_aspect: "Afegeix un aspecte nou"
       add_a_new_contact: "Afegeix un contacte nou"
-      requests:
-        no_requests: "No hi ha cap petició nova"
-        manage_aspects: "Gestiona els espectes"
-        drag_to_add: "Arrossegueu i deixeu anar per afegir gent"
+      requests: "Peticions"
+      no_requests: "No hi ha cap petició nova"
+      manage_aspects: "Gestiona els espectes"
+      drag_to_add: "Arrossegueu i deixeu anar per afegir gent"
     new_aspect:
       name: "Nom"
       create: "Crea'l"
@@ -186,26 +186,26 @@ ca:
 
   conversations:
     index:
-      message_inbox:
-        new_message: "Missatge nou"
-        no_conversation_selected: "no hi ha cap conversa seleccionada"
-        create_a_new_message: "crea un missatge nou"
-        no_messages: "no hi ha missatges"
-      show:
-        reply: "respon"
-        delete: "suprimeix i bloca la conversa"
-      new:
-        to: "a"
-        subject: "assumpte"
-        send: "Envia"
-        no_results: "No s'ha trobat cap resultat"
-      helper:
-        new_messages:
-          zero: "cap missatge nou"
-          one: "1 missatge nou"
-          few: "%{count} missatges nous"
-          many: "%{count} missatges nous"
-          other: "%{count} missatges nous"
+      message_inbox: "Bústia d'entrada"
+      new_message: "Missatge nou"
+      no_conversation_selected: "no hi ha cap conversa seleccionada"
+      create_a_new_message: "crea un missatge nou"
+      no_messages: "no hi ha missatges"
+    show:
+      reply: "respon"
+      delete: "suprimeix i bloca la conversa"
+    new:
+      to: "a"
+      subject: "assumpte"
+      send: "Envia"
+      no_results: "No s'ha trobat cap resultat"
+    helper:
+      new_messages:
+        zero: "cap missatge nou"
+        one: "1 missatge nou"
+        few: "%{count} missatges nous"
+        many: "%{count} missatges nous"
+        other: "%{count} missatges nous"
 
 
   date:

From a2f1381dde05ceb7339dbfad123bee3822d8d036 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Thu, 17 Mar 2011 15:11:24 +0100
Subject: [PATCH 15/20] moar translations

---
 app/controllers/posts_controller.rb   |  4 ++--
 app/views/posts/index.html.haml       |  7 +------
 app/views/shared/_publisher.html.haml |  2 +-
 app/views/status_messages/new.haml    |  2 +-
 config/locales/diaspora/en.yml        | 11 ++++++++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index be51e5f36..25edeccc2 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -41,11 +41,11 @@ class PostsController < ApplicationController
         I18n.locale = @person.owner.language
         render "posts/#{@post.class.to_s.underscore}", :layout => true
       else
-        flash[:error] = "that post does not exist!"
+        flash[:error] = I18n.t('posts.doesnt_exist')
         redirect_to root_url
       end
     else
-      flash[:error] = "that post does not exist!"
+      flash[:error] = I18n.t('posts.doesnt_exist')
       redirect_to root_url
     end
   end
diff --git a/app/views/posts/index.html.haml b/app/views/posts/index.html.haml
index 535c59bc0..a2ac65a90 100644
--- a/app/views/posts/index.html.haml
+++ b/app/views/posts/index.html.haml
@@ -29,12 +29,7 @@
 
 .prepend-2.span-7.last
   %h3
-    = @people_count
-    %span{:style => "font-weight:normal"}
-      - if @people_count == 1
-        = t('.person')
-      - else
-        = t('.people')
+    = t('people', :count => @people_count)
 
   .side_stream.stream
     - for person in @people
diff --git a/app/views/shared/_publisher.html.haml b/app/views/shared/_publisher.html.haml
index 34f22e38c..2e073bae9 100644
--- a/app/views/shared/_publisher.html.haml
+++ b/app/views/shared/_publisher.html.haml
@@ -40,7 +40,7 @@
             %i= t('.mention_helper_text')
           - else
             .badges
-              %i= 'publishing to: '
+              %i= t('.publishing_to')
               = aspect_badges(aspects_with_person, :link => false)
 
 
diff --git a/app/views/status_messages/new.haml b/app/views/status_messages/new.haml
index 821bb7afb..4ecc87e22 100644
--- a/app/views/status_messages/new.haml
+++ b/app/views/status_messages/new.haml
@@ -18,6 +18,6 @@
   .span-15.last
     #facebox_header
       %h4
-        = t('.mentioning') + @person.name
+        = t('.mentioning', :person => @person.name)
 
     = render :partial => 'shared/publisher', :locals => { :aspect => @aspect, :aspect_ids => @aspect_ids, :aspects_with_person => @aspects_with_person, :person => @person}
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index dec5f54fc..cc1e7c216 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -319,6 +319,11 @@ en:
         sign_in: "Sign in to view it."
 
   people:
+    zero: "no people"
+    one: "1 person"
+    few: "%{count} people"
+    many: "%{count} people"
+    other: "%{count} people"
     person:
       pending_request: "pending request"
       already_connected: "Already connected"
@@ -399,13 +404,12 @@ en:
       or_select_one: "or select one from your already existing"
 
   posts:
+    doesnt_exist: "that post does not exist!"
     index:
       whatup: "What's happening on %{pod}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
       people_tagged_with: "People tagged with %{tag}"
-      people: "people"
-      person: "person"
 
   profiles:
     edit:
@@ -509,6 +513,7 @@ en:
       all_contacts: "all contacts"
       share_with: "share with"
       whats_on_your_mind: "what's on your mind?"
+      publishing_to: "publishing to: "
     add_contact:
       enter_a_diaspora_username: "Enter a Diaspora username:"
       your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
@@ -539,7 +544,7 @@ en:
 
   status_messages:
     new:
-      mentioning: "Mentioning: "
+      mentioning: "Mentioning: %{person}"
     show:
       destroy: "Delete"
       permalink: "permalink"

From 759b5707484ed9865ae4c10d5e0139200842e595 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Thu, 17 Mar 2011 15:23:34 +0100
Subject: [PATCH 16/20] updated locales

---
 config/locales/diaspora/ar.yml                |  29 +-
 config/locales/diaspora/cs.yml                |  29 +-
 config/locales/diaspora/cy.yml                |  29 +-
 config/locales/diaspora/da.yml                |  29 +-
 config/locales/diaspora/de.yml                |  29 +-
 config/locales/diaspora/el.yml                |  29 +-
 config/locales/diaspora/en_shaw.yml           |  29 +-
 config/locales/diaspora/eo.yml                |  29 +-
 config/locales/diaspora/es-CL.yml             |  35 +-
 config/locales/diaspora/es.yml                |  29 +-
 config/locales/diaspora/eu.yml                |  29 +-
 config/locales/diaspora/fi.yml                |  29 +-
 config/locales/diaspora/fr.yml                |  29 +-
 config/locales/diaspora/ga.yml                |  29 +-
 config/locales/diaspora/gl.yml                |  31 +-
 config/locales/diaspora/he.yml                |  29 +-
 config/locales/diaspora/hu.yml                |  29 +-
 config/locales/diaspora/id.yml                |  29 +-
 config/locales/diaspora/is.yml                |  29 +-
 config/locales/diaspora/it.yml                |  29 +-
 config/locales/diaspora/lt.yml                |  29 +-
 config/locales/diaspora/mk.yml                |  29 +-
 config/locales/diaspora/ml.yml                |  29 +-
 config/locales/diaspora/nb.yml                |  29 +-
 config/locales/diaspora/nl.yml                |  35 +-
 config/locales/diaspora/pa.yml                |  29 +-
 config/locales/diaspora/pl.yml                |  29 +-
 config/locales/diaspora/pt-BR.yml             |  53 +--
 config/locales/diaspora/pt-PT.yml             | 333 +++++++++---------
 config/locales/diaspora/ro.yml                |  29 +-
 config/locales/diaspora/ru.yml                |  29 +-
 config/locales/diaspora/sk.yml                |  29 +-
 config/locales/diaspora/sl.yml                |  29 +-
 config/locales/diaspora/sv.yml                |  29 +-
 config/locales/diaspora/tr.yml                |  29 +-
 config/locales/diaspora/zh-TW.yml             |  29 +-
 config/locales/diaspora/zh.yml                |  29 +-
 config/locales/javascript/javascript.cs.yml   |   2 +
 config/locales/javascript/javascript.da.yml   |   2 +
 config/locales/javascript/javascript.de.yml   |   2 +
 config/locales/javascript/javascript.el.yml   |   2 +
 .../locales/javascript/javascript.en_shaw.yml |   2 +
 config/locales/javascript/javascript.es.yml   |   2 +
 config/locales/javascript/javascript.eu.yml   |   2 +
 config/locales/javascript/javascript.fi.yml   |   2 +
 config/locales/javascript/javascript.fr.yml   |   2 +
 config/locales/javascript/javascript.gl.yml   |   2 +
 config/locales/javascript/javascript.he.yml   |   2 +
 config/locales/javascript/javascript.hu.yml   |   2 +
 config/locales/javascript/javascript.id.yml   |   2 +
 config/locales/javascript/javascript.is.yml   |   2 +
 config/locales/javascript/javascript.it.yml   |   2 +
 config/locales/javascript/javascript.nl.yml   |   2 +
 config/locales/javascript/javascript.pl.yml   |   2 +
 .../locales/javascript/javascript.pt-BR.yml   |   2 +
 .../locales/javascript/javascript.pt-PT.yml   |   2 +
 config/locales/javascript/javascript.ro.yml   |   2 +
 config/locales/javascript/javascript.ru.yml   |   2 +
 config/locales/javascript/javascript.sk.yml   |   2 +
 config/locales/javascript/javascript.sl.yml   |   2 +
 config/locales/javascript/javascript.sv.yml   |   2 +
 config/locales/javascript/javascript.tr.yml   |   2 +
 .../locales/javascript/javascript.zh-TW.yml   |   2 +
 config/locales/javascript/javascript.zh.yml   |   2 +
 64 files changed, 1002 insertions(+), 467 deletions(-)

diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 44c6d7d60..97e4e5a70 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -222,13 +222,12 @@ ar:
       whats_new: "what's new?"
       your_aspects: "your aspects"
     header: 
-      account_settings: "account settings"
       blog: "blog"
       code: "code"
-      edit_profile: "edit profile"
       login: "login"
       logout: "logout"
-      view_profile: "view profile"
+      profile: "profile"
+      settings: "settings"
   more: "More"
   next: "next"
   notifications: 
@@ -293,6 +292,7 @@ ar:
   people: 
     aspect_list: 
       edit_membership: "edit aspect membership"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " results for %{params}"
@@ -301,6 +301,9 @@ ar:
       no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "buscar resultados para"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "add contact"
       already_connected: "Already connected"
@@ -316,8 +319,11 @@ ar:
       remove_contact: "remove contact"
       remove_from: "Remove %{name} from %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "¡Esa persona no existe!"
+      edit: "edit"
       incoming_request: "You have an incoming request from this person."
+      mention: "Mention"
       message: "Message"
       no_posts: "¡No hay mensajes que mostrar!"
       not_connected: "You are not connected with this person"
@@ -327,8 +333,10 @@ ar:
       similar_contacts: "similar contacts"
       start_sharing: "start sharing"
       to_accept_or_ignore: "to accept or ignore it."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Sorry, we couldn't find %{handle}."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Photo upload failed.  Are you sure that was an image?"
@@ -365,7 +373,10 @@ ar:
       error: "فشل تحرير الصورة."
       notice: "تم تحديث الصورة بنجاح"
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       whatup: "What's happening on %{pod}"
   previous: "previous"
@@ -375,7 +386,6 @@ ar:
       allow_search: "Allow for people to search for you within Diaspora"
       edit_profile: "Edit profile"
       first_name: "First name"
-      info_available_to: "This info will be available to whomever you connect with on Diaspora."
       last_name: "Last name"
       update_profile: "Update Profile"
       your_bio: "Your bio"
@@ -383,7 +393,10 @@ ar:
       your_gender: "Your gender"
       your_name: "Your name"
       your_photo: "Your photo"
-      your_profile: "Your profile"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
@@ -490,6 +503,7 @@ ar:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
+      publishing_to: "publishing to: "
       share: "مشاركة"
       share_with: "Share with %{aspect}"
       whats_on_your_mind: "what's on your mind?"
@@ -500,9 +514,8 @@ ar:
       failure: "Failed to delete post"
     helper: 
       no_message_to_display: "لا يوجد رسالة لعرضها"
-    new_status_message: 
-      oh_yeah: "!يا سلااام"
-      tell_me_something_good: "قل لي شيئا جيداً"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "إزالة"
       permalink: "permalink"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 7e246b4d9..577577045 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -222,13 +222,12 @@ cs:
       whats_new: "co je nového?"
       your_aspects: "vaše aspekty"
     header: 
-      account_settings: "nastavení účtu"
       blog: "blog"
       code: "kód"
-      edit_profile: "upravit profil"
       login: "přihlášení"
       logout: "odhlásit"
-      view_profile: "zobrazit profil"
+      profile: "profile"
+      settings: "settings"
   more: "Více"
   next: "další"
   notifications: 
@@ -293,6 +292,7 @@ cs:
   people: 
     aspect_list: 
       edit_membership: "upravit člena aspektu"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " lidé na podu jsou si vědomi"
       results_for: " výsledky pro %{params}"
@@ -301,6 +301,9 @@ cs:
       no_one_found: "... a nikdo nebyl nalezen."
       no_results: "Hej! Musíte něco hledat."
       results_for: "výsledky hledání pro"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "přidat kontakt"
       already_connected: "Již připojen"
@@ -316,8 +319,11 @@ cs:
       remove_contact: "odstranit kontakt"
       remove_from: "Odstranit %{name} z %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "Osoba neexistuje!"
+      edit: "edit"
       incoming_request: "%{name} s vámi chce sdílet"
+      mention: "Mention"
       message: "Zpráva"
       no_posts: "žádné zprávy k zobrazení!"
       not_connected: "Nesdílíte s touto osobou"
@@ -327,8 +333,10 @@ cs:
       similar_contacts: "podobné kontakty"
       start_sharing: "začít sdílet"
       to_accept_or_ignore: "přijmout nebo ignorovat."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Omlouváme se, ale %{handle} nebyl nalezen."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Nahrání fotky selhalo. Jste si jist, že to byl obrázek?"
@@ -365,7 +373,10 @@ cs:
       error: "Nepodařilo se upravit fotku."
       notice: "Fotka úspěšně aktualizována."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Příspěvky označené #%{tag}"
       whatup: "Co se děje na %{pod}"
   previous: "předchozí"
@@ -375,7 +386,6 @@ cs:
       allow_search: "Umožnit, aby vás lidé mohli najít na Diaspoře"
       edit_profile: "Upravit profil"
       first_name: "Jméno"
-      info_available_to: "Tyto informace budou dostupné komukoliv, ke komu jste připojeni na Diaspoře."
       last_name: "Příjmení"
       update_profile: "Aktualizovat profil"
       your_bio: "Váš životopis"
@@ -383,7 +393,10 @@ cs:
       your_gender: "Vaše pohlaví"
       your_name: "Vaše jméno"
       your_photo: "Vaše fotografie"
-      your_profile: "Váš profil"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Nepodařilo se aktualizovat profil"
       updated: "Profil aktualizován"
@@ -490,6 +503,7 @@ cs:
       mention_helper_text: "pokud chcete někoho zmínit, stiskněte tlačítko '@' a začněte psát jeho jméno"
       post_a_message_to: "Poslat zprávu do %{aspect}"
       posting: "Odesílání..."
+      publishing_to: "publishing to: "
       share: "Sdělit"
       share_with: "sdílet s"
       whats_on_your_mind: "co máte na mysli?"
@@ -500,9 +514,8 @@ cs:
       failure: "Nepodařilo se smazat příspěvek"
     helper: 
       no_message_to_display: "Není k zobrazení žádná zpráva."
-    new_status_message: 
-      oh_yeah: "ó ano!"
-      tell_me_something_good: "pověz mi něco dobrého"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Smazat"
       permalink: "trvalý odkaz"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 7428cb94d..6ddce9bfb 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -222,13 +222,12 @@ cy:
       whats_new: "what's new?"
       your_aspects: "your aspects"
     header: 
-      account_settings: "account settings"
       blog: "blog"
       code: "code"
-      edit_profile: "edit profile"
       login: "login"
       logout: "logout"
-      view_profile: "view profile"
+      profile: "profile"
+      settings: "settings"
   more: "More"
   next: "next"
   notifications: 
@@ -293,6 +292,7 @@ cy:
   people: 
     aspect_list: 
       edit_membership: "edit aspect membership"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " results for %{params}"
@@ -301,6 +301,9 @@ cy:
       no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "search results for"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "add contact"
       already_connected: "Already connected"
@@ -316,8 +319,11 @@ cy:
       remove_contact: "remove contact"
       remove_from: "Remove %{name} from %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "Person does not exist!"
+      edit: "edit"
       incoming_request: "You have an incoming request from this person."
+      mention: "Mention"
       message: "Message"
       no_posts: "no posts to display!"
       not_connected: "You are not connected with this person"
@@ -327,8 +333,10 @@ cy:
       similar_contacts: "similar contacts"
       start_sharing: "start sharing"
       to_accept_or_ignore: "to accept or ignore it."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Sorry, we couldn't find %{handle}."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Photo upload failed.  Are you sure that was an image?"
@@ -365,7 +373,10 @@ cy:
       error: "Failed to edit photo."
       notice: "Photo successfully updated."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       whatup: "What's happening on %{pod}"
   previous: "previous"
@@ -375,7 +386,6 @@ cy:
       allow_search: "Allow for people to search for you within Diaspora"
       edit_profile: "Edit profile"
       first_name: "First name"
-      info_available_to: "This info will be available to whomever you connect with on Diaspora."
       last_name: "Last name"
       update_profile: "Update Profile"
       your_bio: "Your bio"
@@ -383,7 +393,10 @@ cy:
       your_gender: "Your gender"
       your_name: "Your name"
       your_photo: "Your photo"
-      your_profile: "Your profile"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
@@ -490,6 +503,7 @@ cy:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
+      publishing_to: "publishing to: "
       share: "Share"
       share_with: "Share with %{aspect}"
       whats_on_your_mind: "what's on your mind?"
@@ -500,9 +514,8 @@ cy:
       failure: "Failed to delete post"
     helper: 
       no_message_to_display: "No message to display."
-    new_status_message: 
-      oh_yeah: "oh yeah!"
-      tell_me_something_good: "tell me something good"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Destroy"
       permalink: "permalink"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 504b656c6..0c653ca26 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -222,13 +222,12 @@ da:
       whats_new: "Hvad er nyt?"
       your_aspects: "dine aspekter"
     header: 
-      account_settings: "Kontoindstillinger"
       blog: "blog"
       code: "kode"
-      edit_profile: "Redigér profil"
       login: "Log ind"
       logout: "Log ud"
-      view_profile: "Vis profil"
+      profile: "profile"
+      settings: "settings"
   more: "Mere"
   next: "Næste"
   notifications: 
@@ -293,6 +292,7 @@ da:
   people: 
     aspect_list: 
       edit_membership: "redigér aspektsmedlemsskab"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: "brugere på serveren er bevidste om"
       results_for: " resultat for %{params}"
@@ -301,6 +301,9 @@ da:
       no_one_found: "... Og ingen blev fundet."
       no_results: "Hey! Du er nødt til at søge efter noget."
       results_for: "søgeresultater for"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "tilføj kontaktperson"
       already_connected: "Allerede forbundet"
@@ -316,8 +319,11 @@ da:
       remove_contact: "fjern kontaktperson"
       remove_from: "Fjern %{name} fra %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "Personen findes ikke!"
+      edit: "edit"
       incoming_request: "%{name} vil gerne dele med dig."
+      mention: "Mention"
       message: "Besked"
       no_posts: "ingen indlæg at vise!"
       not_connected: "Du er ikke forbundet til denne person."
@@ -327,8 +333,10 @@ da:
       similar_contacts: "lignende kontakter"
       start_sharing: "begynd at dele"
       to_accept_or_ignore: "at godkende eller ignorere det."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Undskyld, vi kunne ikke finde %{handle}."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Billed-upload fejlede. Er du sikker på det var et billede?"
@@ -365,7 +373,10 @@ da:
       error: "Kunne ikke redigere billede."
       notice: "Billedet blev opdateret."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Post tagget med #%{tag}"
       whatup: "Hvad sker der på %{pod}"
   previous: "Forrige"
@@ -375,7 +386,6 @@ da:
       allow_search: "Tillad folk at søge på dig indeni Diaspora"
       edit_profile: "Rediger profil"
       first_name: "Fornavn"
-      info_available_to: "Denne information vil være tilgenelig for alle du forbinder til på Diaspora."
       last_name: "Efternavn"
       update_profile: "Opdater profil"
       your_bio: "Din bio"
@@ -383,7 +393,10 @@ da:
       your_gender: "Dit køn"
       your_name: "Dit navn"
       your_photo: "Dit foto"
-      your_profile: "Din profil"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Kunne ikke opdatere profil"
       updated: "Profil opdateret"
@@ -490,6 +503,7 @@ da:
       mention_helper_text: "for at nævne nogen i en post, tryk '@' og begynd at skrive deres navn"
       post_a_message_to: "Send en besked til %{aspect}"
       posting: "Sender..."
+      publishing_to: "publishing to: "
       share: "Del"
       share_with: "Del med"
       whats_on_your_mind: "Hvad har du på hjertet?"
@@ -500,9 +514,8 @@ da:
       failure: "Kunne ikke slette post."
     helper: 
       no_message_to_display: "Ingen beskeder at vise."
-    new_status_message: 
-      oh_yeah: "Fedt mand!"
-      tell_me_something_good: "fortæl mig noget godt"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Slet"
       permalink: "permanentlink"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 3134e793e..d1dbebd3a 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -222,13 +222,12 @@ de:
       whats_new: "Was gibt’s Neues?"
       your_aspects: "Deine Aspekte"
     header: 
-      account_settings: "Kontoeinstellungen"
       blog: "Blog"
       code: "Code"
-      edit_profile: "Profil bearbeiten"
       login: "Anmelden"
       logout: "Abmelden"
-      view_profile: "Profil ansehen"
+      profile: "profile"
+      settings: "settings"
   more: "Mehr"
   next: "Nächste"
   notifications: 
@@ -293,6 +292,7 @@ de:
   people: 
     aspect_list: 
       edit_membership: "bearbeite die Aspekt-Zugehörigkeit"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: "Leute auf dem Pod wissen von"
       results_for: "Ergebnisse für %{params}"
@@ -301,6 +301,9 @@ de:
       no_one_found: "… und niemand wurde gefunden."
       no_results: "Hey! Du musst nach etwas suchen."
       results_for: "Suchergebnisse für"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "Kontakt hinzufügen"
       already_connected: "Bereits verbunden"
@@ -316,8 +319,11 @@ de:
       remove_contact: "Kontakt entfernen"
       remove_from: "%{name} aus %{aspect} entfernen?"
     show: 
+      add_some: "add some"
       does_not_exist: "Person existiert nicht!"
+      edit: "edit"
       incoming_request: "Du hast eine eingehende Anfrage von dieser Person."
+      mention: "Mention"
       message: "Nachricht"
       no_posts: "Keine Beiträge zum Anzeigen!"
       not_connected: "Du teilst nicht mit dieser Person"
@@ -327,8 +333,10 @@ de:
       similar_contacts: "ähnliche Kontakte"
       start_sharing: "Fang an zu teilen!"
       to_accept_or_ignore: "um zu akzeptieren oder zu ignorieren."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Entschuldigung, wir konnten %{handle} nicht finden."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Hochladen des Fotos fehlgeschlagen. Bist du sicher, dass es eine Bilddatei war?"
@@ -365,7 +373,10 @@ de:
       error: "Bearbeiten des Fotos fehlgeschlagen."
       notice: "Foto erfolgreich aktualisiert."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts, die mit #%{tag} getaggt sind"
       whatup: "Was auf %{pod} passiert"
   previous: "Vorherige"
@@ -375,7 +386,6 @@ de:
       allow_search: "Erlaube anderen nach dir zu suchen"
       edit_profile: "Profil bearbeiten"
       first_name: "Vorname"
-      info_available_to: "Diese Informationen sind für alle mit denen Du Kontakt auf Diaspora* hast sichtbar."
       last_name: "Nachname"
       update_profile: "Profil aktualisieren"
       your_bio: "Deine Biographie"
@@ -383,7 +393,10 @@ de:
       your_gender: "Dein Geschlecht"
       your_name: "Dein Name"
       your_photo: "Dein Profilbild"
-      your_profile: "Dein Profil"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Fehler beim aktualisieren deines Profils"
       updated: "Profil aktualisiert"
@@ -490,6 +503,7 @@ de:
       mention_helper_text: "um jemanden zu erwähnen, drücke '@' und beginne den Namen zu schreiben"
       post_a_message_to: "Sende eine Nachricht an %{aspect}"
       posting: "Senden …"
+      publishing_to: "publishing to: "
       share: "Teilen"
       share_with: "Teile mit"
       whats_on_your_mind: "Woran denkst du gerade?"
@@ -500,9 +514,8 @@ de:
       failure: "Post löschen fehlgeschlagen"
     helper: 
       no_message_to_display: "Keine Nachricht zum Anzeigen."
-    new_status_message: 
-      oh_yeah: "Ja!"
-      tell_me_something_good: "Was gibt’s Neues?"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Entfernen"
       permalink: "Permalink"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index a7e069f84..29d0218cf 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -222,13 +222,12 @@ el:
       whats_new: "Τι νέα?"
       your_aspects: "οι πτυχές σας"
     header: 
-      account_settings: "ρυθμίσεις λογαριασμού"
       blog: "blog"
       code: "κώδικας"
-      edit_profile: "επεξεργασία προφίλ"
       login: "Είσοδος"
       logout: "αποσύνδεση"
-      view_profile: "προβολή προφίλ"
+      profile: "profile"
+      settings: "settings"
   more: "Περισσότερα"
   next: "επόμενο"
   notifications: 
@@ -293,6 +292,7 @@ el:
   people: 
     aspect_list: 
       edit_membership: "επεξεργασία ιδιοτήτων πτυχής"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: "άνθρωποι στο pod γνωρίζουν ότι"
       results_for: "αποτελέσματα για %{params}"
@@ -301,6 +301,9 @@ el:
       no_one_found: "...κανένας δεν βρέθηκε. "
       no_results: "Επ! Χρειάζεται να ψάξετε για κάτι."
       results_for: "αποτελέσματα αναζήτησης για"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "προσθήκη επαφής"
       already_connected: "Είναι ήδη συνδεδεμένο"
@@ -316,8 +319,11 @@ el:
       remove_contact: "αφαίρεση επαφής"
       remove_from: "Αφαίρεση του χρήστη %{name} από τη πτυχή %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "Ο/Η χρήστης δεν υπάρχει!"
+      edit: "edit"
       incoming_request: "Ο/Η %{name} θέλει να μοιραστεί μαζί σας"
+      mention: "Mention"
       message: "Μήνυμα"
       no_posts: "κανένα μήνυμα προς εμφάνιση!"
       not_connected: "Δεν είστε συνδεδεμένος με τον χρήστη %{name}"
@@ -327,8 +333,10 @@ el:
       similar_contacts: "παρόμοιες επαφές"
       start_sharing: "ξεκινήσετε την κοινή χρήση"
       to_accept_or_ignore: "να το αποδεχθεί ή να το αγνοήσει."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Λυπούμαστε, δεν ήταν δυνατή η εύρεση του %{handle}."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Η μεταφόρτωση της φωτογραφίας απέτυχε. Είστε σίγουρος/η ότι ήταν φωτογραφία;"
@@ -365,7 +373,10 @@ el:
       error: "Αποτυχία επεξεργασίας φωτογραφίας."
       notice: "Η φωτογραφία ενημερώθηκε επιτυχώς."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Δημοσιεύσεις με την ετικέτα #%{tag}"
       whatup: "Τι συμβαίνει στο %{pod}"
   previous: "προηγούμενο"
@@ -375,7 +386,6 @@ el:
       allow_search: "Επιτρέψτε σε άλλους ανθρώπους να σας αναζητούν στο Diaspora"
       edit_profile: "Επεξεργασία προφίλ"
       first_name: "Όνομα"
-      info_available_to: "Η πληροφορία θα είναι διαθέσιμη σε όποιον σε όποιον συνδεθείτε στο Diaspora."
       last_name: "Επώνυμο"
       update_profile: "Ενημέρωση Προφίλ"
       your_bio: "To βιογραφικό σας"
@@ -383,7 +393,10 @@ el:
       your_gender: "Tο φύλο σας"
       your_name: "Το όνομά σας"
       your_photo: "Η φωτογραφία σας"
-      your_profile: "Το προφίλ σας"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Αποτυχία ενημέρωσης προφίλ"
       updated: "Το προφίλ ενημερώθηκε"
@@ -490,6 +503,7 @@ el:
       mention_helper_text: "για ν' αναφέρεις κάποιον, πάτα '@' και άρχισε να πληκτρολογείς το όνομα του"
       post_a_message_to: "Αναρτήστε ένα μήνυμα στην πτυχή %{aspect}"
       posting: "Ανάρτηση..."
+      publishing_to: "publishing to: "
       share: "Μοιράσου"
       share_with: "Μοιράσου με"
       whats_on_your_mind: "Τι σκέφτεστε;"
@@ -500,9 +514,8 @@ el:
       failure: "Αποτυχία διαγραφής δημοσίευσης"
     helper: 
       no_message_to_display: "Κανένα μήνυμα"
-    new_status_message: 
-      oh_yeah: "ναι!"
-      tell_me_something_good: "πες μου κάτι καλό"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Διαγραφή"
       permalink: "permalink"
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 0ac565a79..32a5de31c 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -222,13 +222,12 @@ en_shaw:
       whats_new: "𐑢𐑪𐑑𐑕 𐑯𐑿?"
       your_aspects: "𐑿𐑼 𐑨𐑕𐑒𐑐𐑧𐑒𐑑𐑕"
     header: 
-      account_settings: "𐑩𐑒𐑬𐑯𐑑 𐑕𐑧𐑑𐑦𐑙𐑟"
       blog: "𐑚𐑤𐑪𐑜"
       code: "𐑒𐑴𐑛"
-      edit_profile: "𐑧𐑛𐑦𐑑 𐑐𐑮𐑴𐑓𐑲𐑤"
       login: "𐑤𐑪𐑜𐑦𐑯"
       logout: "𐑤𐑪𐑜𐑬𐑑"
-      view_profile: "𐑝𐑿 𐑐𐑮𐑴𐑓𐑲𐑤"
+      profile: "profile"
+      settings: "settings"
   more: "𐑥𐑹"
   next: "𐑯𐑧𐑒𐑕𐑑"
   notifications: 
@@ -293,6 +292,7 @@ en_shaw:
   people: 
     aspect_list: 
       edit_membership: "𐑧𐑛𐑦𐑑 𐑨𐑕𐑐𐑧𐑒𐑑 𐑥𐑧𐑥𐑚𐑼𐑖𐑦𐑐"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " 𐑐𐑰𐑐𐑤 𐑪𐑯 𐑐𐑪𐑛 𐑸 𐑩𐑢𐑺 𐑝"
       results_for: " 𐑮𐑦𐑟𐑫𐑤𐑑 𐑓𐑹 %{params}"
@@ -301,6 +301,9 @@ en_shaw:
       no_one_found: "...𐑯 𐑯𐑴 𐑢𐑳𐑯 𐑢𐑪𐑟 𐑓𐑬𐑯𐑛."
       no_results: "𐑣𐑱! 𐑿 𐑯𐑰𐑛 𐑑 𐑕𐑻𐑗 𐑓𐑹 𐑕𐑳𐑥𐑔𐑦𐑙."
       results_for: "𐑕𐑻𐑗 𐑮𐑦𐑟𐑫𐑤𐑑𐑕 𐑓𐑹"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "𐑨𐑛 𐑒𐑪𐑯𐑑𐑨𐑒𐑑"
       already_connected: "𐑷𐑤𐑮𐑧𐑛𐑦 𐑒𐑩𐑯𐑧𐑒𐑑𐑩𐑛"
@@ -316,8 +319,11 @@ en_shaw:
       remove_contact: "𐑮𐑦𐑥𐑵𐑝 𐑒𐑪𐑯𐑑𐑨𐑒𐑑"
       remove_from: "𐑮𐑦𐑥𐑵𐑝 %{name} 𐑓𐑮𐑪𐑥 %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "𐑐𐑻𐑕𐑩𐑯 𐑛𐑳𐑟 𐑯𐑪𐑑 𐑧𐑜𐑟𐑦𐑕𐑑!"
+      edit: "edit"
       incoming_request: "%{name} 𐑢𐑳𐑯𐑑𐑕 𐑑 𐑖𐑺 𐑢𐑦𐑞 𐑿"
+      mention: "Mention"
       message: "𐑥𐑧𐑕𐑩𐑡"
       no_posts: "𐑯𐑴 𐑐𐑴𐑕𐑑𐑕 𐑑 𐑛𐑦𐑕𐑐𐑤𐑱!"
       not_connected: "𐑿 𐑸 𐑯𐑪𐑑 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 %{name}"
@@ -327,8 +333,10 @@ en_shaw:
       similar_contacts: "𐑕𐑦𐑥𐑦𐑤𐑼 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
       start_sharing: "𐑕𐑑𐑸𐑑 𐑖𐑺𐑦𐑙"
       to_accept_or_ignore: "𐑑 𐑩𐑒𐑕𐑧𐑐𐑑 𐑹 𐑦𐑜𐑯𐑹 𐑦𐑑."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "𐑕𐑪𐑮𐑦, 𐑢𐑰 𐑒𐑫𐑛𐑯𐑑 𐑓𐑲𐑯𐑛 %{handle}."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "𐑓𐑴𐑑𐑴 𐑳𐑐𐑤𐑴𐑛 𐑓𐑱𐑤𐑛.  𐑸 𐑿 𐑖𐑻 𐑞𐑨𐑑 𐑢𐑪𐑟 𐑩𐑯 𐑦𐑥𐑩𐑡?"
@@ -365,7 +373,10 @@ en_shaw:
       error: "𐑓𐑱𐑤𐑛 𐑑 𐑧𐑛𐑦𐑑 𐑓𐑴𐑑𐑴."
       notice: "𐑓𐑴𐑑𐑴 𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑳𐑐𐑛𐑱𐑑𐑩𐑛."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       whatup: "What's happening on %{pod}"
   previous: "𐑐𐑮𐑰𐑝𐑾𐑕"
@@ -375,7 +386,6 @@ en_shaw:
       allow_search: "𐑩𐑤𐑬 𐑓𐑹 𐑐𐑰𐑐𐑩𐑤 𐑑 𐑕𐑻𐑗 𐑓𐑹 𐑿 𐑢𐑦𐑞𐑦𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩"
       edit_profile: "𐑧𐑛𐑦𐑑 𐑐𐑮𐑴𐑓𐑲𐑤"
       first_name: "𐑓𐑻𐑕𐑑 𐑯𐑱𐑥"
-      info_available_to: "𐑞𐑦𐑕 𐑦𐑯𐑓𐑴 𐑢𐑦𐑤 𐑚𐑰 𐑩𐑝𐑱𐑤𐑩𐑚𐑩𐑤 𐑑 𐑣𐑵𐑥𐑧𐑝𐑼 𐑿 𐑒𐑩𐑯𐑧𐑒𐑑 𐑢𐑦𐑞 𐑪𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩."
       last_name: "𐑤𐑨𐑕𐑑 𐑯𐑱𐑥"
       update_profile: "𐑳𐑐𐑛𐑱𐑑 𐑐𐑮𐑴𐑓𐑲𐑤"
       your_bio: "𐑿𐑼 𐑚𐑲𐑴"
@@ -383,7 +393,10 @@ en_shaw:
       your_gender: "𐑿𐑼 𐑡𐑧𐑯𐑛𐑼"
       your_name: "𐑿𐑼 𐑯𐑱𐑥"
       your_photo: "𐑿𐑼 𐑓𐑴𐑑𐑴"
-      your_profile: "𐑿𐑼 𐑐𐑮𐑴𐑓𐑲𐑤"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "𐑓𐑱𐑤𐑛 𐑑 𐑳𐑐𐑛𐑱𐑑 𐑐𐑮𐑴𐑓𐑲𐑤"
       updated: "𐑐𐑮𐑴𐑓𐑲𐑤 𐑳𐑐𐑛𐑱𐑑𐑩𐑛"
@@ -490,6 +503,7 @@ en_shaw:
       mention_helper_text: "𐑑 𐑥𐑧𐑯𐑖𐑩𐑯 𐑕𐑳𐑥𐑢𐑩𐑯, 𐑐𐑮𐑧𐑕 '@' 𐑯 𐑕𐑑𐑸𐑑 𐑑𐑲𐑐𐑦𐑙 𐑞𐑺 𐑯𐑱𐑥"
       post_a_message_to: "𐑐𐑴𐑕𐑑 𐑩 𐑥𐑧𐑕𐑩𐑡 𐑑 %{aspect}"
       posting: "𐑐𐑴𐑕𐑑𐑦𐑙..."
+      publishing_to: "publishing to: "
       share: "𐑖𐑺"
       share_with: "𐑖𐑺 𐑢𐑦𐑞 %{aspect}"
       whats_on_your_mind: "𐑢𐑪𐑑𐑕 𐑪𐑯 𐑿𐑼 𐑥𐑲𐑯𐑛?"
@@ -500,9 +514,8 @@ en_shaw:
       failure: "𐑓𐑱𐑤𐑛 𐑑 𐑛𐑦𐑤𐑰𐑑 𐑐𐑴𐑕𐑑"
     helper: 
       no_message_to_display: "𐑯𐑴 𐑥𐑧𐑕𐑩𐑡 𐑑 𐑛𐑦𐑕𐑐𐑤𐑱."
-    new_status_message: 
-      oh_yeah: "𐑴 𐑘𐑨!"
-      tell_me_something_good: "𐑑𐑧𐑤 𐑥𐑰 𐑕𐑳𐑥𐑔𐑦𐑙 𐑜𐑫𐑛"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "𐑛𐑦𐑤𐑰𐑑"
       permalink: "𐑐𐑻𐑥𐑩𐑤𐑦𐑙𐑒"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 75fef4b2e..059cdecb8 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -222,13 +222,12 @@ eo:
       whats_new: "what's new?"
       your_aspects: "your aspects"
     header: 
-      account_settings: "account settings"
       blog: "blog"
       code: "code"
-      edit_profile: "edit profile"
       login: "login"
       logout: "logout"
-      view_profile: "view profile"
+      profile: "profile"
+      settings: "settings"
   more: "More"
   next: "next"
   notifications: 
@@ -293,6 +292,7 @@ eo:
   people: 
     aspect_list: 
       edit_membership: "edit aspect membership"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " results for %{params}"
@@ -301,6 +301,9 @@ eo:
       no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "search results for"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "add contact"
       already_connected: "Already connected"
@@ -316,8 +319,11 @@ eo:
       remove_contact: "remove contact"
       remove_from: "Remove %{name} from %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "Person does not exist!"
+      edit: "edit"
       incoming_request: "You have an incoming request from this person."
+      mention: "Mention"
       message: "Message"
       no_posts: "no posts to display!"
       not_connected: "You are not connected with this person"
@@ -327,8 +333,10 @@ eo:
       similar_contacts: "similar contacts"
       start_sharing: "start sharing"
       to_accept_or_ignore: "to accept or ignore it."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Sorry, we couldn't find %{handle}."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Photo upload failed.  Are you sure that was an image?"
@@ -365,7 +373,10 @@ eo:
       error: "Failed to edit photo."
       notice: "Photo successfully updated."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       whatup: "What's happening on %{pod}"
   previous: "previous"
@@ -375,7 +386,6 @@ eo:
       allow_search: "Allow for people to search for you within Diaspora"
       edit_profile: "Edit profile"
       first_name: "First name"
-      info_available_to: "This info will be available to whomever you connect with on Diaspora."
       last_name: "Last name"
       update_profile: "Update Profile"
       your_bio: "Your bio"
@@ -383,7 +393,10 @@ eo:
       your_gender: "Your gender"
       your_name: "Your name"
       your_photo: "Your photo"
-      your_profile: "Your profile"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
@@ -490,6 +503,7 @@ eo:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
+      publishing_to: "publishing to: "
       share: "Share"
       share_with: "Share with %{aspect}"
       whats_on_your_mind: "what's on your mind?"
@@ -500,9 +514,8 @@ eo:
       failure: "Failed to delete post"
     helper: 
       no_message_to_display: "No message to display."
-    new_status_message: 
-      oh_yeah: "oh yeah!"
-      tell_me_something_good: "tell me something good"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Destroy"
       permalink: "permalink"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 0f14e0523..0888d4f7c 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -222,13 +222,12 @@ es-CL:
       whats_new: "¿Qué hay de nuevo?"
       your_aspects: "Tus Aspectos"
     header: 
-      account_settings: "configuración de cuenta"
       blog: "blog"
       code: "codigo"
-      edit_profile: "editar perfil"
       login: "entrar"
       logout: "salir"
-      view_profile: "ver perfil"
+      profile: "profile"
+      settings: "settings"
   more: "Más"
   next: "Siguiente"
   notifications: 
@@ -244,8 +243,8 @@ es-CL:
         other: "%{count} nuevas notificaciones"
         zero: "sin nuevas notificaciones"
     index: 
-      and: "and"
-      and_others: "and %{number} others"
+      and: "y"
+      and_others: "y otros %{number}"
       mark_all_as_read: "Marcar todo como leido"
       notifications: "Notificaciones"
     mentioned: "te mencionó en su"
@@ -293,6 +292,7 @@ es-CL:
   people: 
     aspect_list: 
       edit_membership: "Editar el Aspecto donde está el contacto"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: "la gente en el servidor son conscientes de"
       results_for: "resultados para %{params}"
@@ -301,6 +301,9 @@ es-CL:
       no_one_found: "...y nadie fue encontrado."
       no_results: "¡Oye! Tienes que buscar algo."
       results_for: "resultados de búsqueda para"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "agregar contacto"
       already_connected: "Ya conectado"
@@ -316,19 +319,24 @@ es-CL:
       remove_contact: "eliminar contacto"
       remove_from: "¿Eliminar a %{name} de %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "¡La persona no existe!"
+      edit: "edit"
       incoming_request: "Tienes una solicitud pendiente de %{name}"
+      mention: "Mention"
       message: "Mensaje"
       no_posts: "¡no hay posteos para mostrar!"
-      not_connected: "No estás conectado con %{name}"
+      not_connected: "No estás conectado con esa persona"
       recent_posts: "Posteos Recientes"
       recent_public_posts: "Posteos Públicos Recientes"
       return_to_aspects: "Volver a tu página de aspectos"
       similar_contacts: "Contactos similares"
       start_sharing: "Empezar a compartir"
       to_accept_or_ignore: "aceptar o ignorar."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Lo siento, no pudimos encontrar %{handle}."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Error al subir la foto.  ¿Estás seguro que eso era una imagen?"
@@ -365,7 +373,10 @@ es-CL:
       error: "Error al editar foto."
       notice: "Foto actualizada correctamente."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts etiquetado en #%{tag}"
       whatup: "Que esta pasando en %{pod}"
   previous: "Anterior"
@@ -375,7 +386,6 @@ es-CL:
       allow_search: "Permitir que la gente te busque dentro de Diaspora"
       edit_profile: "Editar perfil"
       first_name: "Nombre"
-      info_available_to: "Esta información estará disponible para cualquier contacto en Diaspora."
       last_name: "Apellido"
       update_profile: "Actualizar perfil"
       your_bio: "Tu biografía"
@@ -383,7 +393,10 @@ es-CL:
       your_gender: "Tu genero"
       your_name: "Tu nombre"
       your_photo: "Tu foto"
-      your_profile: "Tu perfil"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Error al actualizar perfil"
       updated: "Perfil actualizado"
@@ -490,6 +503,7 @@ es-CL:
       mention_helper_text: "para mencionar a alguien, usa '@' antes de su nombre"
       post_a_message_to: "Postear un mensaje a %{aspect}"
       posting: "Posteando..."
+      publishing_to: "publishing to: "
       share: "Compartir"
       share_with: "Compartir con "
       whats_on_your_mind: "¿Que pasa por tu cabeza?"
@@ -500,9 +514,8 @@ es-CL:
       failure: "Error al eliminar el post"
     helper: 
       no_message_to_display: "No hay mensaje que mostrar."
-    new_status_message: 
-      oh_yeah: "¡Oh sí!"
-      tell_me_something_good: "dime algo bueno"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Eliminar"
       permalink: "permalink"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 73d5cb906..664ab0194 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -222,13 +222,12 @@ es:
       whats_new: "¿Qué hay de nuevo?"
       your_aspects: "Tus Aspectos"
     header: 
-      account_settings: "Configurar cuenta"
       blog: "Blog"
       code: "Código"
-      edit_profile: "Editar Perfil"
       login: "Conectarse"
       logout: "Desconectarse"
-      view_profile: "Ver Perfil"
+      profile: "profile"
+      settings: "settings"
   more: "Más"
   next: "Siguiente"
   notifications: 
@@ -293,6 +292,7 @@ es:
   people: 
     aspect_list: 
       edit_membership: "editar el Aspecto donde está el contacto"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: "La gente que está en POD son conscientes de"
       results_for: "Resultados para %{params}"
@@ -301,6 +301,9 @@ es:
       no_one_found: "...y nadie fue encontrado."
       no_results: "¡Eh! ¡Tienes que buscar algo!"
       results_for: "Resultados para"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "Añadir contacto"
       already_connected: "Ya está conectado"
@@ -316,8 +319,11 @@ es:
       remove_contact: "eliminar contacto"
       remove_from: "¿Eliminar a %{name} de %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "¡El usuario no existe!"
+      edit: "edit"
       incoming_request: "%{name} quisiera compartir contigo"
+      mention: "Mention"
       message: "Mensaje"
       no_posts: "¡No hay publicaciones que mostrar!"
       not_connected: "No estás conectado con esta persona."
@@ -327,8 +333,10 @@ es:
       similar_contacts: "Contactos similares"
       start_sharing: "Empezar a compartir"
       to_accept_or_ignore: "Aceptar o ignorar"
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Perdona, no pudimos encontrar %{handle}"
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Subida de foto fallida. ¿Estás seguro de que era una imagen?"
@@ -365,7 +373,10 @@ es:
       error: "Falló la edición de la foto."
       notice: "Foto actualizada correctamente."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "La Publicación se ha etiquetado en #%{tag}"
       whatup: "Que esta pasando en %{pod}"
   previous: "Anterior"
@@ -375,7 +386,6 @@ es:
       allow_search: "Permitir que la gente te busque dentro de Diaspora*"
       edit_profile: "Editar perfil"
       first_name: "Nombre"
-      info_available_to: "Esta información se mostrará a quien quiera conectar contigo en Diaspora*."
       last_name: "Apellidos"
       update_profile: "Actualizar Perfil"
       your_bio: "Tu Biografía"
@@ -383,7 +393,10 @@ es:
       your_gender: "Tu Género / Sexo"
       your_name: "Tu Nombre"
       your_photo: "Tu Foto"
-      your_profile: "Tu Perfil"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "No se pudo actualizar el Perfil"
       updated: "Perfil actualizado"
@@ -490,6 +503,7 @@ es:
       mention_helper_text: "para nombrar a alguien, usa \"@\" justo antes"
       post_a_message_to: "Enviar un mensaje a %{aspect}"
       posting: "Publicando..."
+      publishing_to: "publishing to: "
       share: "Compartir"
       share_with: "compartir con"
       whats_on_your_mind: "¿Qué tal? ¡Qué pasa!"
@@ -500,9 +514,8 @@ es:
       failure: "Fallo elminando la publicación"
     helper: 
       no_message_to_display: "No hay mensajes que mostrar."
-    new_status_message: 
-      oh_yeah: "¡Eih síí!"
-      tell_me_something_good: "¿Qué hay de nuevo?"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Eliminar"
       permalink: "Enlace permanente"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index ca628dcc7..b5acaf773 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -222,13 +222,12 @@ eu:
       whats_new: "zer berri?"
       your_aspects: "zure alderdiak"
     header: 
-      account_settings: "kontuaren lehentasunak"
       blog: "bloga"
       code: "kodea"
-      edit_profile: "profila aldatu"
       login: "sartu"
       logout: "irten"
-      view_profile: "profila ikusi"
+      profile: "profile"
+      settings: "settings"
   more: "Gehiago"
   next: "hurrengoa"
   notifications: 
@@ -293,6 +292,7 @@ eu:
   people: 
     aspect_list: 
       edit_membership: "aldatu alderdiaren bazkidetza"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: "zerbitzariko jendeak honen kontziente dira:"
       results_for: " %{params}(r)entzat emaitzak"
@@ -301,6 +301,9 @@ eu:
       no_one_found: "... ez da inor aurkitu."
       no_results: "Aizu! Zerbait bilatu behar duzu."
       results_for: "bilaketa emaitzak hontarako:"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "adiskidea gehitu"
       already_connected: "Dagoeneko harremanetan"
@@ -316,8 +319,11 @@ eu:
       remove_contact: "adiskidea ezabatu"
       remove_from: "%{name} ezabatu %{aspect} alderditik?"
     show: 
+      add_some: "add some"
       does_not_exist: "Pertsona hau ez dago!"
+      edit: "edit"
       incoming_request: "%{name}(e)k zure adiskidea izan nahi du"
+      mention: "Mention"
       message: "Mezu pribatua bidali"
       no_posts: "erakusteko sarrerarik ez dago!"
       not_connected: "Ez zaude partekatzen %{name}(r)ekin"
@@ -327,8 +333,10 @@ eu:
       similar_contacts: "antzeko adiskideak"
       start_sharing: "harremanetan hasi"
       to_accept_or_ignore: "onartu edo utzi."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "%{handle} ezin izan dugu aurkitu."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Argazki igoerak huts egin du. Ziur al zaude irudi bat zela?"
@@ -365,7 +373,10 @@ eu:
       error: "Huts argazkia aldatzean."
       notice: "Argazkia arrakastaz eguneratua."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "#%{tag}(r)ekin etiketatutako mezuak"
       whatup: "Zer berri %{pod}(e)n"
   previous: "aurrekoa"
@@ -375,7 +386,6 @@ eu:
       allow_search: "Jendea baimendu zu Diasporan bilatzera"
       edit_profile: "Profila aldatu"
       first_name: "Izena"
-      info_available_to: "Informazio hau eskuragarri egongo da zure Diasporako harreman guztientzat"
       last_name: "Abizena"
       update_profile: "Profila Eguneratu"
       your_bio: "Zuri buruz"
@@ -383,7 +393,10 @@ eu:
       your_gender: "Zure sexua"
       your_name: "Zure izena"
       your_photo: "Zure argazkia"
-      your_profile: "Zure profila"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Huts profila eguneratzean"
       updated: "Profila eguneratu duzu."
@@ -490,6 +503,7 @@ eu:
       mention_helper_text: "norbait aipatzeko, idatzi '@' eta hasi adiskidearen izena idazten"
       post_a_message_to: "%{aspect}(e)n mezu bat partekatu"
       posting: "Partekatzen..."
+      publishing_to: "publishing to: "
       share: "Partekatu"
       share_with: "honekin partekatu:"
       whats_on_your_mind: "zer berri?"
@@ -500,9 +514,8 @@ eu:
       failure: "Akatsa mezua ezabatzean"
     helper: 
       no_message_to_display: "Erakusteko mezurik ez."
-    new_status_message: 
-      oh_yeah: "hori da eta!"
-      tell_me_something_good: "zerbait polita esaidazu"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Suntsitu"
       permalink: "permalink"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 8a158bcb3..554b37344 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -222,13 +222,12 @@ fi:
       whats_new: "Uutta"
       your_aspects: "näkymäsi"
     header: 
-      account_settings: "käyttäjätilin asetukset"
       blog: "blogi"
       code: "lähdekoodi"
-      edit_profile: "muokkaa profiilia"
       login: "kirjaudu sisään"
       logout: "kirjaudu ulos"
-      view_profile: "profiili"
+      profile: "profile"
+      settings: "settings"
   more: "Lisää"
   next: "seuraava"
   notifications: 
@@ -293,6 +292,7 @@ fi:
   people: 
     aspect_list: 
       edit_membership: "muokkaa näkymän jäsenyyttä."
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " ihmiset podissa tietävät, että"
       results_for: " tulokset kyselylle %{params}"
@@ -301,6 +301,9 @@ fi:
       no_one_found: "...ketään ei löytynyt."
       no_results: "Hei! Sinun tulisi etsiä jotakin."
       results_for: "hakutulokset kohteelle"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "lisää kontakti"
       already_connected: "Yhteys jo olemassa"
@@ -316,8 +319,11 @@ fi:
       remove_contact: "poista kontakti"
       remove_from: "Poista %{name} näkymästä %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "Henkilöä ei ole olemassa!"
+      edit: "edit"
       incoming_request: "Tämä henkilö on lähettänyt sinulle pyynnön."
+      mention: "Mention"
       message: "Viesti"
       no_posts: "Ei näytettäviä viestejä!"
       not_connected: "Et ole yhteydessä henkilöön %{name}"
@@ -327,8 +333,10 @@ fi:
       similar_contacts: "Yhteiset kontaktit"
       start_sharing: "aloita jakamaan"
       to_accept_or_ignore: "hyväksyäksesi, tai hylätäksesi sen."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Valitettavasti tunnusta %{handle} ei löytynyt."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Kuvan lataus epäonnistui. Oletko varma, että se oli kuva?"
@@ -365,7 +373,10 @@ fi:
       error: "Kuvan muokkaus epäonnistui."
       notice: "Kuva päivitettiin onnistuneesti."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       whatup: "What's happening on %{pod}"
   previous: "edellinen"
@@ -375,7 +386,6 @@ fi:
       allow_search: "Salli ihmisten etsiä sinua Diasporassa"
       edit_profile: "Muokkaa profiilia"
       first_name: "Etunimi"
-      info_available_to: "Tämä tieto tulee näkyviin niille kenen kanssa olet yhteydessä Diasporassa"
       last_name: "Sukunimi"
       update_profile: "Päivitä profiili"
       your_bio: "Biografia"
@@ -383,7 +393,10 @@ fi:
       your_gender: "Sukupuolesi"
       your_name: "Nimesi"
       your_photo: "Profiili kuva"
-      your_profile: "Profiilisi"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Profiilin päivitys epäonnistui"
       updated: "Profiili päivitetty"
@@ -490,6 +503,7 @@ fi:
       mention_helper_text: "mainitaksesi jonkun, valitse '@' ja kirjoita nimen alku"
       post_a_message_to: "Lähetä viesti näkymään %{aspect}"
       posting: "Lähetetään..."
+      publishing_to: "publishing to: "
       share: "Jaa"
       share_with: "Jaa"
       whats_on_your_mind: "Mitä mielessä?"
@@ -500,9 +514,8 @@ fi:
       failure: "Viestin poisto epäonnistui"
     helper: 
       no_message_to_display: "Ei näytettäviä viestejä."
-    new_status_message: 
-      oh_yeah: "Hienoa!"
-      tell_me_something_good: "kerro jotain mukavaa"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Poista"
       permalink: "pysyvä linkki"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 67e4b6230..156b8e636 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -222,13 +222,12 @@ fr:
       whats_new: "Quoi de neuf ?"
       your_aspects: "vos aspects"
     header: 
-      account_settings: "options du compte"
       blog: "blog"
       code: "code"
-      edit_profile: "modifier le profil"
       login: "connexion"
       logout: "se déconnecter"
-      view_profile: "voir le profil"
+      profile: "profile"
+      settings: "settings"
   more: "Plus"
   next: "suivant"
   notifications: 
@@ -293,6 +292,7 @@ fr:
   people: 
     aspect_list: 
       edit_membership: "modifier l'appartenance à vos aspects"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: "les personnes sur le pod sont au courant de"
       results_for: "résultats pour %{params}"
@@ -301,6 +301,9 @@ fr:
       no_one_found: "… et personne n'a été trouvé."
       no_results: "Hé ! Vous devez rechercher quelque chose."
       results_for: "résultats de la recherche pour"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "ajouter un contact"
       already_connected: "Déjà connecté"
@@ -316,8 +319,11 @@ fr:
       remove_contact: "supprimer le contact"
       remove_from: "Supprimer %{name} de %{aspect} ?"
     show: 
+      add_some: "add some"
       does_not_exist: "Cette personne n'existe pas !"
+      edit: "edit"
       incoming_request: "%{name} désire partager avec vous"
+      mention: "Mention"
       message: "Message"
       no_posts: "aucun message à afficher !"
       not_connected: "Vous n'êtes pas connecté(e) avec cette personne"
@@ -327,8 +333,10 @@ fr:
       similar_contacts: "Contacts similaires"
       start_sharing: "commencer à partager"
       to_accept_or_ignore: "pour l'accepter ou l'ignorer."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Impossible de trouver %{handle}."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Impossible d'envoyer la photo. S'agit-il réellement d'une image ?"
@@ -365,7 +373,10 @@ fr:
       error: "La modification de la photo a échoué."
       notice: "La photo a été mise à jour."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Publications marquées avec #%{tag}"
       whatup: "Quoi de neuf sur %{pod}"
   previous: "précédent"
@@ -375,7 +386,6 @@ fr:
       allow_search: "Permettre à tous de vous rechercher dans Diaspora"
       edit_profile: "Modifier le profil"
       first_name: "Prénom"
-      info_available_to: "Cette information sera visible de tous ceux avec qui vous avez une connexion sur Diaspora."
       last_name: "Nom de famille"
       update_profile: "Mettre à jour le profil"
       your_bio: "Votre biographie"
@@ -383,7 +393,10 @@ fr:
       your_gender: "Votre sexe"
       your_name: "Votre nom"
       your_photo: "Votre photo"
-      your_profile: "Votre profil"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Impossible de mettre à jour le profil"
       updated: "Profil mis à jour"
@@ -490,6 +503,7 @@ fr:
       mention_helper_text: "pour mentionner quelqu'un, insérez un « @ » et commencez à écrire son nom"
       post_a_message_to: "Publier un message dans %{aspect}"
       posting: "Publication…"
+      publishing_to: "publishing to: "
       share: "Partager"
       share_with: "Partager avec"
       whats_on_your_mind: "exprimez-vous"
@@ -500,9 +514,8 @@ fr:
       failure: "Impossible de supprimer le message"
     helper: 
       no_message_to_display: "Aucun message à afficher."
-    new_status_message: 
-      oh_yeah: "oh ouais !"
-      tell_me_something_good: "dites-moi quelque chose de bien"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Supprimer"
       permalink: "permalien"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index 67157d7d0..c65d92a8e 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -222,13 +222,12 @@ ga:
       whats_new: "cad atá nua?"
       your_aspects: "your aspects"
     header: 
-      account_settings: "socraithe cúntas"
       blog: "blag"
       code: "cod"
-      edit_profile: "athraigh próifíl"
       login: "logáil isteach"
       logout: "logáil amach"
-      view_profile: "brathnaigh air próifíl"
+      profile: "profile"
+      settings: "settings"
   more: "More"
   next: "ar aghaidh"
   notifications: 
@@ -293,6 +292,7 @@ ga:
   people: 
     aspect_list: 
       edit_membership: "athraigh ballraíocht gné"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " tá a fhios ag daoine ar an phod faoi"
       results_for: " torthaí do %{params}"
@@ -301,6 +301,9 @@ ga:
       no_one_found: "...agus níor fuarthas aon duine"
       no_results: "Hé! Tá ort cuardaigh le rud éigin!"
       results_for: "cuardaigh torthaí do"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "cuir teagmháil leis"
       already_connected: "Cheanna féin nasctha"
@@ -316,8 +319,11 @@ ga:
       remove_contact: "fhaíl ré le teagmháil"
       remove_from: "Fháil ré le %{name} ó %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "Person does not exist!"
+      edit: "edit"
       incoming_request: "Tá iarratas nua agat ón duine seo."
+      mention: "Mention"
       message: "Message"
       no_posts: "níl aon póstanna chun taispeáint!"
       not_connected: "Níl tú ag roinnt le %{name}"
@@ -327,8 +333,10 @@ ga:
       similar_contacts: "teagmháillí cosúil"
       start_sharing: "start sharing"
       to_accept_or_ignore: "chun glacadh leis nó neamhaird a dhéanamh de"
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Brón orn, níor raibhamar abálta %{handle} a fháil."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Níor d'éirigh le uaslódáil an pictiúr. An bhfuil tú cinnte go raibh sé pictiúr?"
@@ -365,7 +373,10 @@ ga:
       error: "Níor d'éirigh le aithrú an pictiúr."
       notice: "Pictiure Uaslódaithe."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       whatup: "What's happening on %{pod}"
   previous: "roimhhe"
@@ -375,7 +386,6 @@ ga:
       allow_search: "Allow for people to search for you within Diaspora"
       edit_profile: "Edit profile"
       first_name: "First name"
-      info_available_to: "This info will be available to whomever you connect with on Diaspora."
       last_name: "Last name"
       update_profile: "Update Profile"
       your_bio: "Your bio"
@@ -383,7 +393,10 @@ ga:
       your_gender: "Your gender"
       your_name: "Your name"
       your_photo: "Your photo"
-      your_profile: "Your profile"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
@@ -490,6 +503,7 @@ ga:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Chuir teachtaireach chuig %{aspect}"
       posting: "Póstáil..."
+      publishing_to: "publishing to: "
       share: "Roinn"
       share_with: "Roinn le %{aspect}"
       whats_on_your_mind: "what's on your mind?"
@@ -500,9 +514,8 @@ ga:
       failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Níl aon teachtaireacht chun taispeáint."
-    new_status_message: 
-      oh_yeah: "ó sea!"
-      tell_me_something_good: "rá liom rud maith"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Scrios"
       permalink: "nasc-buan"
diff --git a/config/locales/diaspora/gl.yml b/config/locales/diaspora/gl.yml
index 347b15d82..82bf8eb48 100644
--- a/config/locales/diaspora/gl.yml
+++ b/config/locales/diaspora/gl.yml
@@ -222,13 +222,12 @@ gl:
       whats_new: "que hai de novo?"
       your_aspects: "os teus aspectos"
     header: 
-      account_settings: "Configuración da conta"
       blog: "Bitácora"
       code: "código"
-      edit_profile: "Modificar o perfil"
       login: "Identificarse"
       logout: "Saír"
-      view_profile: "Ver o perfil"
+      profile: "profile"
+      settings: "settings"
   more: "Máis"
   next: "seguinte"
   notifications: 
@@ -293,6 +292,7 @@ gl:
   people: 
     aspect_list: 
       edit_membership: "Editar membresía de aspecto"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: "xente nesta vaíña están ao tanto de"
       results_for: "resultados para %{params}"
@@ -301,6 +301,9 @@ gl:
       no_one_found: "...non se atopou ningún"
       no_results: "Ei! Precisas buscar algo."
       results_for: "resultados da procura para"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "engadir contacto"
       already_connected: "Xa conectado"
@@ -316,19 +319,24 @@ gl:
       remove_contact: "borrar contacto"
       remove_from: "Eliminar %{name} de %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "Esa persoa non existe!"
+      edit: "edit"
       incoming_request: "%{name} quere compartir contigo"
+      mention: "Mention"
       message: "Mensaxe"
       no_posts: "Non hai mensaxes que amosar!"
-      not_connected: "Non estás conectado a %{name}"
+      not_connected: "Non estás compartindo con %{name}"
       recent_posts: "Publicacións recentes"
       recent_public_posts: "Publicacións Públicas Recentes"
       return_to_aspects: "Voltar á paxina dos teus aspectos"
       similar_contacts: "contactos semellantes"
       start_sharing: "comezar a compartir"
       to_accept_or_ignore: "aceptalo ou ignoralo"
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Sentímolo, non poidemos atopar %{handle}."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Fallou a carga da foto.  Seguro que o ficheiro era unha imaxe?"
@@ -365,7 +373,10 @@ gl:
       error: "Erro ao editar a foto."
       notice: "Foto actualizada correctamente."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Publicacións etiquetadas como #%{tag}"
       whatup: "Que está acontecendo en %{pod}"
   previous: "anterior"
@@ -375,7 +386,6 @@ gl:
       allow_search: "Permitir á xente buscarte en Diaspora"
       edit_profile: "Editar perfil"
       first_name: "Nome"
-      info_available_to: "Esta información estará dispoñible para calquera que se conecte contigo en Diaspora"
       last_name: "Apelidos"
       update_profile: "Actualizar Perfil"
       your_bio: "Biografía"
@@ -383,7 +393,10 @@ gl:
       your_gender: "O teu xénero"
       your_name: "O teu nome"
       your_photo: "A túa foto"
-      your_profile: "O teu perfil"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Fallouse ao actualizar perfil"
       updated: "Perfil actualizado"
@@ -490,6 +503,7 @@ gl:
       mention_helper_text: "para citar a alguén, pon \"@\" e teclea o seu nome"
       post_a_message_to: "Deixar un mensaxe en %{aspect}"
       posting: "Publicando..."
+      publishing_to: "publishing to: "
       share: "Compartir"
       share_with: "Compartir con %{aspect}"
       whats_on_your_mind: "Que tes en mente?"
@@ -500,9 +514,8 @@ gl:
       failure: "Fallo ao borrar publicación"
     helper: 
       no_message_to_display: "Non hai mensaxes para amosar"
-    new_status_message: 
-      oh_yeah: "e logo!"
-      tell_me_something_good: "cóntame algo bo"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Borrar"
       permalink: "permalink"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 088565ba1..e4c7b6beb 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -222,13 +222,12 @@ he:
       whats_new: "מה חדש?"
       your_aspects: "ההיבטים שלך"
     header: 
-      account_settings: "הגדרות החשבון"
       blog: "בלוג"
       code: "קוד"
-      edit_profile: "עריכת הפרופיל"
       login: "כניסה"
       logout: "יציאה"
-      view_profile: "צפייה בפרופיל"
+      profile: "profile"
+      settings: "settings"
   more: "המשך"
   next: "הבאה"
   notifications: 
@@ -293,6 +292,7 @@ he:
   people: 
     aspect_list: 
       edit_membership: "עריכת חברות בהיבט"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " האנשים בפוד מודעים לגבי"
       results_for: " תוצאות עבור %{params}"
@@ -301,6 +301,9 @@ he:
       no_one_found: "...ולא נמצא אף אחד."
       no_results: "הי! לא חיפשת שום דבר."
       results_for: "תוצאות חיפוש עבור"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "הוספת איש קשר"
       already_connected: "כבר קושרתם"
@@ -316,8 +319,11 @@ he:
       remove_contact: "הסרת איש קשר"
       remove_from: "האם להסיר את %{name} מההיבט %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "אדם זה אינו קיים!"
+      edit: "edit"
       incoming_request: "ברצונו/ה של %{name} לשתף אתך"
+      mention: "Mention"
       message: "הודעה"
       no_posts: "אין רשומות להצגה!"
       not_connected: "אין לך שיתוף עם %{name}"
@@ -327,8 +333,10 @@ he:
       similar_contacts: "אנשי קשר דומים"
       start_sharing: "התחלת השיתוף"
       to_accept_or_ignore: "כדי לקבל או לדחות אותה."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "לא ניתן למצוא את %{handle}, עמך הסליחה."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "העלאת התמונה נכשלה.  האם זו אכן הייתה תמונה?"
@@ -365,7 +373,10 @@ he:
       error: "אירע כשל בעריכת התמונה."
       notice: "התמונה עודכנה בהצלחה."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       whatup: "What's happening on %{pod}"
   previous: "הקודמת"
@@ -375,7 +386,6 @@ he:
       allow_search: "מתן אישור לאנשים לחפש אחריך ברשת דיאספורה"
       edit_profile: "עריכת הפרופיל"
       first_name: "שם פרטי"
-      info_available_to: "מידע זה יוצג לכל מי שייצור אתך קשר דרך דיאספורה."
       last_name: "שם משפחה"
       update_profile: "עדכון הפרופיל"
       your_bio: "הביוגרפיה שלך"
@@ -383,7 +393,10 @@ he:
       your_gender: "המגדר שלך"
       your_name: "שמך"
       your_photo: "התמונה שלך"
-      your_profile: "הפרופיל שלך"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "אירע כשל בעדכון הפרופיל"
       updated: "הפרופיל עודכן"
@@ -490,6 +503,7 @@ he:
       mention_helper_text: "כדי להזכיר שם של מישהו, יש ללחוץ על '@' ולהתחיל לכתוב את שמו"
       post_a_message_to: "פרסום הודעה אל %{aspect}"
       posting: "פרסום..."
+      publishing_to: "publishing to: "
       share: "שיתוף"
       share_with: "שיתוף עם"
       whats_on_your_mind: "מה עובר לך בראש?"
@@ -500,9 +514,8 @@ he:
       failure: "אירע כשל במחיקת הרשומה"
     helper: 
       no_message_to_display: "אין הודעה להצגה."
-    new_status_message: 
-      oh_yeah: "אחלה!"
-      tell_me_something_good: "בא לי לשמוע סיפור נחמד"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "מחיקה"
       permalink: "קישור קבוע"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 84bde9b30..1cb62729a 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -222,13 +222,12 @@ hu:
       whats_new: "Újdonságok"
       your_aspects: "csoportjaid"
     header: 
-      account_settings: "Fiók beállítások"
       blog: "blog"
       code: "kód"
-      edit_profile: "profil szerkesztése"
       login: "belépés"
       logout: "kilépés"
-      view_profile: "profil megtekintése"
+      profile: "profile"
+      settings: "settings"
   more: "Bővebben"
   next: "következő"
   notifications: 
@@ -293,6 +292,7 @@ hu:
   people: 
     aspect_list: 
       edit_membership: "csoport tagság szerkesztése"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: "az emberek tisztában vannak"
       results_for: "eredmények %{params}"
@@ -301,6 +301,9 @@ hu:
       no_one_found: "...és nem találni senkit."
       no_results: "Hé! Valamit keresned kell."
       results_for: "találatok keresése"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "Kapcsolat hozzáadása"
       already_connected: "Már csatlakozott"
@@ -316,8 +319,11 @@ hu:
       remove_contact: "kapcsolat törlése"
       remove_from: "Törlöd %{name}-t a %{aspect} csoportból?"
     show: 
+      add_some: "add some"
       does_not_exist: "Személy nem létezik!"
+      edit: "edit"
       incoming_request: "%{name} megosztást kezdeményezett veled."
+      mention: "Mention"
       message: "Message"
       no_posts: "nincs bejegyzés!"
       not_connected: "Nem ismerősöd"
@@ -327,8 +333,10 @@ hu:
       similar_contacts: "hasonló kapcsolatok"
       start_sharing: "Megosztás indítása"
       to_accept_or_ignore: "hogy elfogadd vagy elutasítsd."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Sajnáljuk, de nem találjuk őt: %{handle}."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Kép feltöltése nem sikerült. Biztos vagy benne, hogy ez egy kép?"
@@ -365,7 +373,10 @@ hu:
       error: "Nem sikerült szerkeszteni a képet."
       notice: "Kép szerkesztése sikerült."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       whatup: "What's happening on %{pod}"
   previous: "előző"
@@ -375,7 +386,6 @@ hu:
       allow_search: "Megtalálható legyek a Diaspora keresőben"
       edit_profile: "Profil szerkesztése"
       first_name: "Keresztnév"
-      info_available_to: "Ez az információ elérhető lesz a Diaspora ismerőseid számára."
       last_name: "Vezetéknév"
       update_profile: "Profil frissítése"
       your_bio: "Rólam"
@@ -383,7 +393,10 @@ hu:
       your_gender: "Nem"
       your_name: "Nevem"
       your_photo: "Fényképem"
-      your_profile: "Profilom"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Profil frissítése sikertelen"
       updated: "Profil frissítve"
@@ -490,6 +503,7 @@ hu:
       mention_helper_text: "valaki megemlítéséhez írj '@' jelet, és kezd el írni a nevet"
       post_a_message_to: "Bejegyzés küldése ennek a csoportnak: %{aspect}"
       posting: "Küldés..."
+      publishing_to: "publishing to: "
       share: "Megosztás"
       share_with: "Megosztás vele: %{aspect}"
       whats_on_your_mind: "Mi jár a fejedben?"
@@ -500,9 +514,8 @@ hu:
       failure: "Bejegyzés törlése sikertelen"
     helper: 
       no_message_to_display: "Nincs üzenet."
-    new_status_message: 
-      oh_yeah: "Ez az!"
-      tell_me_something_good: "Mondj valamit!"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Töröl"
       permalink: "permalink"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index b93ab0722..a7b7de538 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -222,13 +222,12 @@ id:
       whats_new: "what's new?"
       your_aspects: "your aspects"
     header: 
-      account_settings: "account settings"
       blog: "blog"
       code: "code"
-      edit_profile: "edit profile"
       login: "login"
       logout: "logout"
-      view_profile: "view profile"
+      profile: "profile"
+      settings: "settings"
   more: "More"
   next: "next"
   notifications: 
@@ -293,6 +292,7 @@ id:
   people: 
     aspect_list: 
       edit_membership: "edit aspect membership"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " results for %{params}"
@@ -301,6 +301,9 @@ id:
       no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "search results for"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "add contact"
       already_connected: "Already connected"
@@ -316,8 +319,11 @@ id:
       remove_contact: "remove contact"
       remove_from: "Remove %{name} from %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "Person does not exist!"
+      edit: "edit"
       incoming_request: "You have an incoming request from this person."
+      mention: "Mention"
       message: "Message"
       no_posts: "no posts to display!"
       not_connected: "You are not connected with this person"
@@ -327,8 +333,10 @@ id:
       similar_contacts: "similar contacts"
       start_sharing: "start sharing"
       to_accept_or_ignore: "to accept or ignore it."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Sorry, we couldn't find %{handle}."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Photo upload failed.  Are you sure that was an image?"
@@ -365,7 +373,10 @@ id:
       error: "Gagal mengubah foto."
       notice: "Foto berhasil diperbarui."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       whatup: "What's happening on %{pod}"
   previous: "previous"
@@ -375,7 +386,6 @@ id:
       allow_search: "Allow for people to search for you within Diaspora"
       edit_profile: "Edit profile"
       first_name: "First name"
-      info_available_to: "This info will be available to whomever you connect with on Diaspora."
       last_name: "Last name"
       update_profile: "Update Profile"
       your_bio: "Your bio"
@@ -383,7 +393,10 @@ id:
       your_gender: "Your gender"
       your_name: "Your name"
       your_photo: "Your photo"
-      your_profile: "Your profile"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
@@ -490,6 +503,7 @@ id:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
+      publishing_to: "publishing to: "
       share: "Bagikan"
       share_with: "Share with %{aspect}"
       whats_on_your_mind: "what's on your mind?"
@@ -500,9 +514,8 @@ id:
       failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Tidak ada pesan yang dapat ditampilkan."
-    new_status_message: 
-      oh_yeah: "oh yeah!"
-      tell_me_something_good: "katakan padaku sesuatu yang baik"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Hapus"
       permalink: "permalink"
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index bd18e61cf..cd7b534a2 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -222,13 +222,12 @@ is:
       whats_new: "hvað er að frétta?"
       your_aspects: "þínar ásýndir"
     header: 
-      account_settings: "stillingar"
       blog: "blogg"
       code: "code"
-      edit_profile: "edit profile"
       login: "Innskráning"
       logout: "Útskrá"
-      view_profile: "skoða síðuna mína"
+      profile: "profile"
+      settings: "settings"
   more: "Meira"
   next: "næsta"
   notifications: 
@@ -293,6 +292,7 @@ is:
   people: 
     aspect_list: 
       edit_membership: "breyta aðild að ásýnd"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " niðurstöður fyrir %{params}"
@@ -301,6 +301,9 @@ is:
       no_one_found: "...og enginn fannst."
       no_results: "Hey! Þú þarft að leita að einhverju."
       results_for: "leitarniðurstöður fyrir"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "bæta tengilið við"
       already_connected: "Þegar tengdur"
@@ -316,8 +319,11 @@ is:
       remove_contact: "fjarlægja tengilið"
       remove_from: "Fjarlægja %{name} úr %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "Manneskjan er ekki til!"
+      edit: "edit"
       incoming_request: "%{name} vill samnýta með þér"
+      mention: "Mention"
       message: "Message"
       no_posts: "no posts to display!"
       not_connected: "Þú samnýtir ekki með %{name}"
@@ -327,8 +333,10 @@ is:
       similar_contacts: "svipaðir tengiliðir"
       start_sharing: "Byrja að samnýta"
       to_accept_or_ignore: "að samþykkja eða hunsa það."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Því miður, %{handle} fannst ekki."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Innhlöðunn myndar mistókst. Ertu viss um að þetta hafi verið mynd?"
@@ -365,7 +373,10 @@ is:
       error: "Ekki tókst að breyta mynd."
       notice: "Velheppnuð uppfærsla á mynd. "
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       whatup: "What's happening on %{pod}"
   previous: "fyrra"
@@ -375,7 +386,6 @@ is:
       allow_search: "Leyfa fólki að leita að þér á Díaspora"
       edit_profile: "Breyta síðunni minni"
       first_name: "Fornafn"
-      info_available_to: "Þetta verður sýnilegt hverjum þeim sem þú tengist við í gegnum Díaspora."
       last_name: "Kenninafn/Eftirnafn"
       update_profile: "Uppfæra síðuna mína"
       your_bio: "Ferilskrá þín"
@@ -383,7 +393,10 @@ is:
       your_gender: "Kyn þitt"
       your_name: "Nafn þitt"
       your_photo: "Mynd þín"
-      your_profile: "Síðan mín"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Ekki tókst að uppfæra síðuna mína"
       updated: "Síðan mín uppfærð"
@@ -490,6 +503,7 @@ is:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Skrifa skilaboð til %{aspect}"
       posting: "Senda..."
+      publishing_to: "publishing to: "
       share: "Deila"
       share_with: "deila með"
       whats_on_your_mind: "hvað er þér efst í huga?"
@@ -500,9 +514,8 @@ is:
       failure: "Ekki tókst að eyða færslu"
     helper: 
       no_message_to_display: "Engin skilaboð að sýna!"
-    new_status_message: 
-      oh_yeah: "nú jæja!"
-      tell_me_something_good: "segðu mér eitthvað skemmtiegt"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Eyða"
       permalink: "varanleg slóð"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index ae823e7b7..3fd1839a4 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -222,13 +222,12 @@ it:
       whats_new: "novità"
       your_aspects: "I tuoi aspetti"
     header: 
-      account_settings: "impostazioni account"
       blog: "blog"
       code: "codice"
-      edit_profile: "modifica profilo"
       login: "accedi"
       logout: "esci"
-      view_profile: "visualizza profilo"
+      profile: "profile"
+      settings: "settings"
   more: "Altro"
   next: "successivo"
   notifications: 
@@ -293,6 +292,7 @@ it:
   people: 
     aspect_list: 
       edit_membership: "modifica appartenenza all'aspetto"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " le persone sul pod sanno che"
       results_for: " risultati per %{params}"
@@ -301,6 +301,9 @@ it:
       no_one_found: "...e nessuno è stato trovato."
       no_results: "Ehi! Devi inserire qualcosa da cercare."
       results_for: "risultati della ricerca per"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "aggiungi contatto"
       already_connected: "Già connesso"
@@ -316,8 +319,11 @@ it:
       remove_contact: "rimuovi contatto"
       remove_from: "Rimuovere %{name} da %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "La persona non esiste!"
+      edit: "edit"
       incoming_request: "%{name} vuole condividere con te"
+      mention: "Mention"
       message: "Message"
       no_posts: "nessun post da mostrare!"
       not_connected: "Non sei in contatto con %{name}"
@@ -327,8 +333,10 @@ it:
       similar_contacts: "contatti simili"
       start_sharing: "inizia a condividere"
       to_accept_or_ignore: "per accettarla o ignorarla."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Spiacenti, non possiamo trovare %{handle}."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Il caricamento della foto non è riuscito. Sei sicuro che fosse un'immagine?"
@@ -365,7 +373,10 @@ it:
       error: "Modifica della foto fallita."
       notice: "Foto aggiornata con successo."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       whatup: "What's happening on %{pod}"
   previous: "precedente"
@@ -375,7 +386,6 @@ it:
       allow_search: "Permetti ad altri di trovarti su Diaspora"
       edit_profile: "Edita il profilo"
       first_name: "Nome"
-      info_available_to: "Queste informazioni saranno disponibili a chiunque sarà connesso con te su Diaspora."
       last_name: "Cognome"
       update_profile: "Aggiorna Profilo"
       your_bio: "La tua biografia"
@@ -383,7 +393,10 @@ it:
       your_gender: "Sesso"
       your_name: "Il tuo nome"
       your_photo: "La tua foto"
-      your_profile: "Il tuo profilo"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Aggiornamento del profilo non riuscito"
       updated: "Profilo aggiornato"
@@ -490,6 +503,7 @@ it:
       mention_helper_text: "per menzionare qualcuno, inserisci '@' e digita il suo nome"
       post_a_message_to: "Invia un messaggio a %{aspect}"
       posting: "Invio in corso..."
+      publishing_to: "publishing to: "
       share: "Condividi"
       share_with: "Condividi con"
       whats_on_your_mind: "cosa stai pensando?"
@@ -500,9 +514,8 @@ it:
       failure: "Eliminazione post non riuscita"
     helper: 
       no_message_to_display: "Nessun messaggio da visualizzare."
-    new_status_message: 
-      oh_yeah: "oh si!"
-      tell_me_something_good: "dimmi qualcosa di buono"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Elimina"
       permalink: "permalink"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 460c5c444..19860d1a6 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -222,13 +222,12 @@ lt:
       whats_new: "what's new?"
       your_aspects: "your aspects"
     header: 
-      account_settings: "paskyros nustatymai"
       blog: "blog'as"
       code: "code"
-      edit_profile: "keisti profilį"
       login: "prisijungti"
       logout: "atsijungti"
-      view_profile: "peržiūrėti profilį"
+      profile: "profile"
+      settings: "settings"
   more: "More"
   next: "next"
   notifications: 
@@ -293,6 +292,7 @@ lt:
   people: 
     aspect_list: 
       edit_membership: "edit aspect membership"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " žmonės serveryje žino"
       results_for: " \"%{params}\" rezultatai"
@@ -301,6 +301,9 @@ lt:
       no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "ieškoti rezultatų pagal"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "pridėti kontaktą"
       already_connected: "Jau prisijungtas"
@@ -316,8 +319,11 @@ lt:
       remove_contact: "pašalinti kontaktą"
       remove_from: "Ar pašalinti kontaktą \"%{name}\" iš aspekto \"%{aspect}\"?"
     show: 
+      add_some: "add some"
       does_not_exist: "Asmuo neegzistuoja!"
+      edit: "edit"
       incoming_request: "Jūs gavote pakvietimą iš šio asmens."
+      mention: "Mention"
       message: "Message"
       no_posts: "nėra jokių pokalbių"
       not_connected: "You are not connected with this person"
@@ -327,8 +333,10 @@ lt:
       similar_contacts: "similar contacts"
       start_sharing: "start sharing"
       to_accept_or_ignore: "priimti arba ignoruoti."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Sorry, we couldn't find %{handle}."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Photo upload failed.  Are you sure that was an image?"
@@ -365,7 +373,10 @@ lt:
       error: "Nuotraukos atnaujinti nepavyko."
       notice: "Nuotrauka atnaujinta sėkmingai."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       whatup: "What's happening on %{pod}"
   previous: "previous"
@@ -375,7 +386,6 @@ lt:
       allow_search: "Allow for people to search for you within Diaspora"
       edit_profile: "Edit profile"
       first_name: "First name"
-      info_available_to: "This info will be available to whomever you connect with on Diaspora."
       last_name: "Last name"
       update_profile: "Update Profile"
       your_bio: "Your bio"
@@ -383,7 +393,10 @@ lt:
       your_gender: "Your gender"
       your_name: "Your name"
       your_photo: "Your photo"
-      your_profile: "Your profile"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
@@ -490,6 +503,7 @@ lt:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Parašyti žinutę į aspektą \"%{aspect}\""
       posting: "Rašoma..."
+      publishing_to: "publishing to: "
       share: "Skelbti"
       share_with: "Skelbti aspekte \"%{aspect}\""
       whats_on_your_mind: "what's on your mind?"
@@ -500,9 +514,8 @@ lt:
       failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Žinučių nėra."
-    new_status_message: 
-      oh_yeah: "o taip!"
-      tell_me_something_good: "papasakok man ką nors gero"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Sunaikinti"
       permalink: "permalink"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index b4807ece3..88232e14d 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -222,13 +222,12 @@ mk:
       whats_new: "what's new?"
       your_aspects: "your aspects"
     header: 
-      account_settings: "подесувања на корисничка сметка"
       blog: "блог"
       code: "code"
-      edit_profile: "уреди профил"
       login: "најави се"
       logout: "одјави се"
-      view_profile: "погледни профил"
+      profile: "profile"
+      settings: "settings"
   more: "More"
   next: "next"
   notifications: 
@@ -293,6 +292,7 @@ mk:
   people: 
     aspect_list: 
       edit_membership: "edit aspect membership"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " достапните луѓе се запознаени со"
       results_for: " резултати за %{params}"
@@ -301,6 +301,9 @@ mk:
       no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "резултати од пребарување за"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "додај контакт"
       already_connected: "Веќе поврзани"
@@ -316,8 +319,11 @@ mk:
       remove_contact: "одстрани контакт"
       remove_from: "Одстрани %{name} од %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "Личноста не постои!"
+      edit: "edit"
       incoming_request: "You have an incoming request from this person."
+      mention: "Mention"
       message: "Message"
       no_posts: "нема пораки за прикажување!"
       not_connected: "You are not connected with this person"
@@ -327,8 +333,10 @@ mk:
       similar_contacts: "similar contacts"
       start_sharing: "start sharing"
       to_accept_or_ignore: "to accept or ignore it."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Sorry, we couldn't find %{handle}."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Photo upload failed.  Are you sure that was an image?"
@@ -365,7 +373,10 @@ mk:
       error: "Неуспешно уредување на слика."
       notice: "Ажурирањето на сликата е успешно."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       whatup: "What's happening on %{pod}"
   previous: "previous"
@@ -375,7 +386,6 @@ mk:
       allow_search: "Allow for people to search for you within Diaspora"
       edit_profile: "Edit profile"
       first_name: "First name"
-      info_available_to: "This info will be available to whomever you connect with on Diaspora."
       last_name: "Last name"
       update_profile: "Update Profile"
       your_bio: "Your bio"
@@ -383,7 +393,10 @@ mk:
       your_gender: "Your gender"
       your_name: "Your name"
       your_photo: "Your photo"
-      your_profile: "Your profile"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
@@ -490,6 +503,7 @@ mk:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Додај порака во %{aspect}"
       posting: "Објавување..."
+      publishing_to: "publishing to: "
       share: "Сподели"
       share_with: "Сподели со %{aspect}"
       whats_on_your_mind: "what's on your mind?"
@@ -500,9 +514,8 @@ mk:
       failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Нема пораки за прикажување."
-    new_status_message: 
-      oh_yeah: "о да!"
-      tell_me_something_good: "кажи ми нешто добро"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Уништи"
       permalink: "permalink"
diff --git a/config/locales/diaspora/ml.yml b/config/locales/diaspora/ml.yml
index ed4a3c2df..89043033a 100644
--- a/config/locales/diaspora/ml.yml
+++ b/config/locales/diaspora/ml.yml
@@ -222,13 +222,12 @@ ml:
       whats_new: "പുതിയത്?"
       your_aspects: "നിങ്ങളുടെ പരിചയങ്ങള്‍"
     header: 
-      account_settings: "അക്കൌണ്ട് ക്രമീകരണങ്ങള്‍"
       blog: "ബ്ലോഗ്"
       code: "കോഡ്"
-      edit_profile: "പ്രൊഫൈല്‍ തിരുത്തുക"
       login: "അകത്ത് കടക്കുക"
       logout: "പുറത്ത് കടക്കു"
-      view_profile: "പ്രൊഫൈ‌ല്‍_കാണുക"
+      profile: "profile"
+      settings: "settings"
   more: "കൂടുതല്‍"
   next: "അടുത്തത്"
   notifications: 
@@ -293,6 +292,7 @@ ml:
   people: 
     aspect_list: 
       edit_membership: "edit aspect membership"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " results for %{params}"
@@ -301,6 +301,9 @@ ml:
       no_one_found: "...and no one was found."
       no_results: "താങ്കള്‍ എന്തിനെങ്കിലും വേണ്ടി തിരയേണ്ടതുണ്ട്."
       results_for: "റിസള്‍ട്ടുകള്‍ക്കായി തെരയുക"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "സമ്പര്‍ക്കം ചേര്‍ക്കുക"
       already_connected: "Already connected"
@@ -316,8 +319,11 @@ ml:
       remove_contact: "സമ്പര്‍ക്കം മാറ്റുക"
       remove_from: "Remove %{name} from %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "വ്യക്തി നിലവിലില്ല!"
+      edit: "edit"
       incoming_request: "%{name} wants to share with you"
+      mention: "Mention"
       message: "Message"
       no_posts: "no posts to display!"
       not_connected: "താങ്കള്‍ %{name} യുമായി പങ്കുവെയ്ക്കുന്നില്ല"
@@ -327,8 +333,10 @@ ml:
       similar_contacts: "സാമ്യമുള്ള സമ്പര്‍ക്കങ്ങള്‍"
       start_sharing: "പങ്കുവച്ച് തുടങ്ങുക"
       to_accept_or_ignore: "to accept or ignore it."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "ക്ഷമിക്കണം, ഞങ്ങള്‍ക്ക് %{handle} കണ്ടെത്താനായില്ല.."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Photo upload failed.  Are you sure that was an image?"
@@ -365,7 +373,10 @@ ml:
       error: "ചിത്രം തിരുത്താന്‍ പറ്റുന്നില്ല.."
       notice: "ചിത്രം വിജയകരമായി പുതുക്കി."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       whatup: "What's happening on %{pod}"
   previous: "മുന്‍‌പത്തെ"
@@ -375,7 +386,6 @@ ml:
       allow_search: "Allow for people to search for you within Diaspora"
       edit_profile: "Edit profile"
       first_name: "First name"
-      info_available_to: "This info will be available to whomever you connect with on Diaspora."
       last_name: "Last name"
       update_profile: "Update Profile"
       your_bio: "Your bio"
@@ -383,7 +393,10 @@ ml:
       your_gender: "Your gender"
       your_name: "Your name"
       your_photo: "Your photo"
-      your_profile: "Your profile"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
@@ -490,6 +503,7 @@ ml:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "%{aspect}ല്‍ ഒരു സന്ദേശം പ്രസിദ്ധീകരിക്കുക"
       posting: "പ്രസിദ്ധീകരിക്കുന്നു..."
+      publishing_to: "publishing to: "
       share: "പങ്കുവെയ്ക്കുക"
       share_with: "പങ്കുവെയ്ക്കുക"
       whats_on_your_mind: "എന്താണ് നിങ്ങളുടെ മനസ്സില്‍?"
@@ -500,9 +514,8 @@ ml:
       failure: "Failed to delete post"
     helper: 
       no_message_to_display: "സന്ദേശമൊന്നും കാണിക്കാനില്ല."
-    new_status_message: 
-      oh_yeah: "oh yeah!"
-      tell_me_something_good: "എന്നോട് നല്ലതെന്തെങ്കിലും പറയുക"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "നീക്കം ചെയ്യുക"
       permalink: "സ്ഥിരം കണ്ണി"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 05960675a..e57321da9 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -222,13 +222,12 @@ nb:
       whats_new: "what's new?"
       your_aspects: "dine aspekt"
     header: 
-      account_settings: "kontoinstillinger"
       blog: "blogg"
       code: "code"
-      edit_profile: "rediger profil"
       login: "logg inn"
       logout: "logg ut"
-      view_profile: "vis profil"
+      profile: "profile"
+      settings: "settings"
   more: "Mer"
   next: "neste"
   notifications: 
@@ -293,6 +292,7 @@ nb:
   people: 
     aspect_list: 
       edit_membership: "edit aspect membership"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " resultater for %{params}"
@@ -301,6 +301,9 @@ nb:
       no_one_found: "...og ingen ble funnet."
       no_results: "Hey! You need to search for something."
       results_for: "søkeresultater for"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "legg til kontakt"
       already_connected: "Already connected"
@@ -316,8 +319,11 @@ nb:
       remove_contact: "fjern kontakt"
       remove_from: "Fjern %{name} fra %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "Personen eksisterer ikke!"
+      edit: "edit"
       incoming_request: "You have an incoming request from this person."
+      mention: "Mention"
       message: "Melding"
       no_posts: "ingen innlegg å vise!"
       not_connected: "You are not connected with this person"
@@ -327,8 +333,10 @@ nb:
       similar_contacts: "lignende kontakter"
       start_sharing: "start sharing"
       to_accept_or_ignore: "to accept or ignore it."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Beklager, vi kunne ikke finne %{handle}."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Bildeopplastning mislyktes. Er du sikker på det var et bilde?"
@@ -365,7 +373,10 @@ nb:
       error: "Greide ikke å endre bildet."
       notice: "Bildet er oppdatert."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Innlegg tagget med #%{tag}"
       whatup: "Hva skjer på %{pod}"
   previous: "forrige"
@@ -375,7 +386,6 @@ nb:
       allow_search: "Tillat folk å søke på deg i Diaspora"
       edit_profile: "Endre profil"
       first_name: "Fornavn"
-      info_available_to: "This info will be available to whomever you connect with on Diaspora."
       last_name: "Etternavn"
       update_profile: "Oppdater Profil"
       your_bio: "Om meg"
@@ -383,7 +393,10 @@ nb:
       your_gender: "Ditt kjønn"
       your_name: "Ditt navn"
       your_photo: "Ditt profilbilde"
-      your_profile: "Din profil"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Kunne ikke oppdatere profil"
       updated: "Profil oppdatert"
@@ -490,6 +503,7 @@ nb:
       mention_helper_text: "for å nevne noen, skriv '@' og begynn å skriv navnet deres"
       post_a_message_to: "Post et innlegg til %{aspect}"
       posting: "Poster..."
+      publishing_to: "publishing to: "
       share: "Del"
       share_with: "Share with %{aspect}"
       whats_on_your_mind: "Hva tenker du på?"
@@ -500,9 +514,8 @@ nb:
       failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Ingen melding å vise."
-    new_status_message: 
-      oh_yeah: "Ja da!"
-      tell_me_something_good: "Fortell noe tøft"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Utslett"
       permalink: "permalink"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index ef7df2d27..e1492e4e8 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -222,13 +222,12 @@ nl:
       whats_new: "wat is nieuw op Diaspora?"
       your_aspects: "jouw aspecten"
     header: 
-      account_settings: "account instellingen"
       blog: "blog"
       code: "code"
-      edit_profile: "bewerk profiel"
       login: "inloggen"
       logout: "log uit"
-      view_profile: "bekijk profiel"
+      profile: "profile"
+      settings: "settings"
   more: "Meer"
   next: "volgende"
   notifications: 
@@ -244,8 +243,8 @@ nl:
         other: "%{count} nieuwe notificaties"
         zero: "geen nieuwe notificaties"
     index: 
-      and: "and"
-      and_others: "and %{number} others"
+      and: "en"
+      and_others: "en %{number} anderen"
       mark_all_as_read: "Markeer alles gelezen"
       notifications: "Notificaties"
     mentioned: "heeft je genoemd in zijn/haar"
@@ -293,6 +292,7 @@ nl:
   people: 
     aspect_list: 
       edit_membership: "bewerk aspect lidmaatschap"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: "mensen op de pod zich bewust van zijn"
       results_for: "resultaten voor %{params}"
@@ -301,6 +301,9 @@ nl:
       no_one_found: "...en je hebt niemand gevonden."
       no_results: "Heey! Je moet wel ergens naar zoeken."
       results_for: "zoekresultaten voor"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "voeg contact toe"
       already_connected: "Al verbonden"
@@ -316,19 +319,24 @@ nl:
       remove_contact: "verwijder contact"
       remove_from: "Verwijder %{name} uit %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "Die persoon bestaat niet!"
+      edit: "edit"
       incoming_request: "% {name} wil met je delen"
+      mention: "Mention"
       message: "Bericht"
       no_posts: "geen berichten om weer te geven!"
-      not_connected: "Je deelt niet met %{name}"
+      not_connected: "Je deelt niet met deze persoon"
       recent_posts: "Recente Berichten"
       recent_public_posts: "Recente Openbare Berichten"
       return_to_aspects: "Ga terug naar je aspecten pagina"
       similar_contacts: "vergelijkbare contacten"
       start_sharing: "start met delen"
       to_accept_or_ignore: "om te accepteren of te negeren."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Sorry, we konden %{handle} niet vinden."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Foto uploaden mislukt. Weet je zeker dat het een afbeelding was?"
@@ -365,7 +373,10 @@ nl:
       error: "Foto veranderen niet gelukt."
       notice: "Foto succesvol veranderd."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts getagged met #%{tag}"
       whatup: "Nu op %{pod}"
   previous: "vorige"
@@ -375,7 +386,6 @@ nl:
       allow_search: "Sta mensen toe je op te zoeken binnen Diaspora"
       edit_profile: "Bewerk profiel"
       first_name: "Voornaam"
-      info_available_to: "Deze info zal beschikbaar zijn voor iedereen waarmee je contact legt op Diaspora."
       last_name: "Achternaam"
       update_profile: "Profiel bijwerken"
       your_bio: "Jouw bio"
@@ -383,7 +393,10 @@ nl:
       your_gender: "Je geslacht"
       your_name: "Je naam"
       your_photo: "Je profielfoto"
-      your_profile: "Jouw profiel"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Profiel bijwerken mislukt"
       updated: "Profiel bijgewerkt"
@@ -490,6 +503,7 @@ nl:
       mention_helper_text: "om iemand te noemen, typ '@' gevolgd door zijn of haar naam"
       post_a_message_to: "Plaats een bericht aan %{aspect}"
       posting: "Plaatsen..."
+      publishing_to: "publishing to: "
       share: "Delen"
       share_with: "deel met"
       whats_on_your_mind: "waar denk je aan?"
@@ -500,9 +514,8 @@ nl:
       failure: "Verwijderen van post mislukt"
     helper: 
       no_message_to_display: "Geen bericht om te weergeven."
-    new_status_message: 
-      oh_yeah: "oh ja!"
-      tell_me_something_good: "vertel me iets leuks"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Verwijderen"
       permalink: "permalink"
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index 1ebd1e925..8051dd75b 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -222,13 +222,12 @@ pa:
       whats_new: "ਨਵਾਂ ਕੀ ਹੈ?"
       your_aspects: "your aspects"
     header: 
-      account_settings: "ਅਕਾਊਂਟ ਸੈਟਿੰਗ"
       blog: "ਬਲੌਗ"
       code: "ਕੋਡ"
-      edit_profile: "ਪਰੋਫਾਇਲ ਸੋਧ"
       login: "ਲਾਗਇਨ"
       logout: "ਲਾਗਆਉਟ"
-      view_profile: "ਪਰੋਫਾਇਲ ਵੇਖੋ"
+      profile: "profile"
+      settings: "settings"
   more: "ਹੋਰ"
   next: "ਅੱਗੇ"
   notifications: 
@@ -293,6 +292,7 @@ pa:
   people: 
     aspect_list: 
       edit_membership: "edit aspect membership"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: "%{params} ਲਈ ਨਤੀਜੇ"
@@ -301,6 +301,9 @@ pa:
       no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "search results for"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "ਸੰਪਰਕ ਸ਼ਾਮਲ"
       already_connected: "ਪਹਿਲਾਂ ਹੀ ਕੁਨੈਕਟ ਹੈ"
@@ -316,8 +319,11 @@ pa:
       remove_contact: "remove contact"
       remove_from: "Remove %{name} from %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "Person does not exist!"
+      edit: "edit"
       incoming_request: "%{name} wants to share with you"
+      mention: "Mention"
       message: "Message"
       no_posts: "no posts to display!"
       not_connected: "You are not sharing with %{name}"
@@ -327,8 +333,10 @@ pa:
       similar_contacts: "ਰਲਦੇ ਸੰਪਰਕ"
       start_sharing: "start sharing"
       to_accept_or_ignore: "to accept or ignore it."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Sorry, we couldn't find %{handle}."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Photo upload failed.  Are you sure that was an image?"
@@ -365,7 +373,10 @@ pa:
       error: "Failed to edit photo."
       notice: "Photo successfully updated."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       whatup: "What's happening on %{pod}"
   previous: "ਪਿੱਛੇ"
@@ -375,7 +386,6 @@ pa:
       allow_search: "Allow for people to search for you within Diaspora"
       edit_profile: "Edit profile"
       first_name: "First name"
-      info_available_to: "This info will be available to whomever you connect with on Diaspora."
       last_name: "Last name"
       update_profile: "Update Profile"
       your_bio: "Your bio"
@@ -383,7 +393,10 @@ pa:
       your_gender: "Your gender"
       your_name: "Your name"
       your_photo: "Your photo"
-      your_profile: "Your profile"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
@@ -490,6 +503,7 @@ pa:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Post a message to %{aspect}"
       posting: "ਪੋਸਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+      publishing_to: "publishing to: "
       share: "Share"
       share_with: "share with"
       whats_on_your_mind: "ਤੁਹਾਡੇ ਦਿਮਾਗ 'ਚ ਕੀ ਹੈ?"
@@ -500,9 +514,8 @@ pa:
       failure: "Failed to delete post"
     helper: 
       no_message_to_display: "ਵੇਖਾਉਣ ਲਈ ਕੋਈ ਸੁਨੇਹਾ ਨਹੀਂ ਹੈ।"
-    new_status_message: 
-      oh_yeah: "ਓਹ ਹਾਂ!"
-      tell_me_something_good: "tell me something good"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Delete"
       permalink: "permalink"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index a5e60a72b..92a84a721 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -222,13 +222,12 @@ pl:
       whats_new: "what's new?"
       your_aspects: "your aspects"
     header: 
-      account_settings: "ustawienia konta"
       blog: "blog"
       code: "kod"
-      edit_profile: "edycja profilu"
       login: "logowanie"
       logout: "wyloguj"
-      view_profile: "podgląd profilu"
+      profile: "profile"
+      settings: "settings"
   more: "More"
   next: "next"
   notifications: 
@@ -293,6 +292,7 @@ pl:
   people: 
     aspect_list: 
       edit_membership: "edit aspect membership"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " osoby na podzie wiedzą, że"
       results_for: " wyniki dla %{params}"
@@ -301,6 +301,9 @@ pl:
       no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "wyniki wyszukiwania dla"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "dodaj kontakt"
       already_connected: "Już podłączono"
@@ -316,8 +319,11 @@ pl:
       remove_contact: "usuwanie kontaktu"
       remove_from: "Usunąć %{name} z aspektu %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "Osoba nie istnieje!"
+      edit: "edit"
       incoming_request: "Masz nowe zaproszenie od tej osoby."
+      mention: "Mention"
       message: "Message"
       no_posts: "brak wpisów!"
       not_connected: "You are not connected with this person"
@@ -327,8 +333,10 @@ pl:
       similar_contacts: "similar contacts"
       start_sharing: "współdziel"
       to_accept_or_ignore: "by je przyjąć lub zignorować."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Wybacz, nie można było znaleźć %{handle}."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Nie udało się przesłać zdjęcia. Czy @{m,f:jesteś pew}{m:ien|f:na|n:to na pewno}{m,f: że to} był obraz?"
@@ -365,7 +373,10 @@ pl:
       error: "Błąd podczas edycji zdjęcia."
       notice: "Pomyślnie zaktualizowano zdjęcie."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       whatup: "What's happening on %{pod}"
   previous: "previous"
@@ -375,7 +386,6 @@ pl:
       allow_search: "Allow for people to search for you within Diaspora"
       edit_profile: "Edit profile"
       first_name: "First name"
-      info_available_to: "This info will be available to whomever you connect with on Diaspora."
       last_name: "Last name"
       update_profile: "Update Profile"
       your_bio: "Your bio"
@@ -383,7 +393,10 @@ pl:
       your_gender: "Your gender"
       your_name: "Your name"
       your_photo: "Your photo"
-      your_profile: "Your profile"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
@@ -490,6 +503,7 @@ pl:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Wyślij wiadomość do %{aspect}"
       posting: "Wysyłanie…"
+      publishing_to: "publishing to: "
       share: "Podziel się"
       share_with: "Podziel się z aspektem %{aspect}"
       whats_on_your_mind: "co Ci chodzi po głowie?"
@@ -500,9 +514,8 @@ pl:
       failure: "Błąd podczas usuwania wpisu"
     helper: 
       no_message_to_display: "Brak wiadomości."
-    new_status_message: 
-      oh_yeah: "o tak!"
-      tell_me_something_good: "co dobrego?"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Usuń"
       permalink: "permalink"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 225e7f1ac..1004e75d5 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -138,9 +138,9 @@ pt-BR:
     one: "1 contato"
     other: "%{count} contatos"
     share_with_pane: 
-      accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
+      accepts: "Uma vez que %{name} aceite, começarão a ver os posts de cada um no Diaspora"
       add_new_aspect: "add to new aspect"
-      share_with: "Start sharing with %{name}"
+      share_with: "Começar a partilhar com %{name}"
     zero: "sem contatos"
   conversations: 
     helper: 
@@ -222,13 +222,12 @@ pt-BR:
       whats_new: "O que há de novo?"
       your_aspects: "Seus aspectos"
     header: 
-      account_settings: "Editar conta"
       blog: "Blog"
       code: "Código"
-      edit_profile: "Editar perfil"
       login: "Entrar"
       logout: "Sair"
-      view_profile: "ver perfil"
+      profile: "profile"
+      settings: "settings"
   more: "Mais"
   next: "Próximo"
   notifications: 
@@ -246,12 +245,12 @@ pt-BR:
     index: 
       and: "and"
       and_others: "and %{number} others"
-      mark_all_as_read: "Marcar todas como lido"
+      mark_all_as_read: "Marcar Tudo como Lido"
       notifications: "Notificações"
     mentioned: "has mentioned you in their"
-    new_request: "Deseja compartilhar com você."
+    new_request: "deseja partilhar com você."
     post: "post"
-    request_accepted: "Aceitou sua solicitação de compartilhamento."
+    request_accepted: "Aceitou a sua solicitação de partilha."
   notifier: 
     also_commented: 
       commented: "também comentou sobre a postagem de %{post_author}:"
@@ -292,15 +291,19 @@ pt-BR:
   password_confirmation: "Confirmação de senha"
   people: 
     aspect_list: 
-      edit_membership: "Editar participação no aspecto"
+      edit_membership: "editar participação no aspecto"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " as pessoas deste \"pod\" sabem que"
       results_for: " results for %{params}"
     index: 
-      couldnt_find_them_send_invite: "Não conseguiu encontrá-los? Convide-os!"
-      no_one_found: "...ninguém foi encontrado."
+      couldnt_find_them_send_invite: "Não conseguiu encontrá-los? Envie um convite!"
+      no_one_found: "...e ninguém foi encontrado."
       no_results: "Ei! Você precisa buscar algo."
       results_for: "Resultado da busca por"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "adicionar contato"
       already_connected: "É seu contato"
@@ -316,8 +319,11 @@ pt-BR:
       remove_contact: "remover contato"
       remove_from: "Remover %{name} de %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "Pessoa inexistente!"
+      edit: "edit"
       incoming_request: "Você possui uma solicitação dessa pessoa."
+      mention: "Mention"
       message: "Message"
       no_posts: "Nada para mostrar por aqui."
       not_connected: "Você não está conectado com %{name}."
@@ -327,8 +333,10 @@ pt-BR:
       similar_contacts: "Contatos similares"
       start_sharing: "Comece a compartilhar"
       to_accept_or_ignore: "Aceitar ou ignorar."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Desculpe, não conseguimos encontrar %{handle}."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "O envio da foto falhou. Tem certeza que era uma imagem?"
@@ -365,7 +373,10 @@ pt-BR:
       error: "Falha ao editar foto."
       notice: "Foto enviada com sucesso."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       whatup: "What's happening on %{pod}"
   previous: "Anterior"
@@ -374,18 +385,20 @@ pt-BR:
     edit: 
       allow_search: "Allow for people to search for you within Diaspora"
       edit_profile: "Edit profile"
-      first_name: "First name"
-      info_available_to: "This info will be available to whomever you connect with on Diaspora."
+      first_name: "Prenome"
       last_name: "Last name"
       update_profile: "Update Profile"
-      your_bio: "Your bio"
+      your_bio: "Sua biografia"
       your_birthday: "Your birthday"
       your_gender: "Your gender"
       your_name: "Your name"
       your_photo: "Your photo"
-      your_profile: "Your profile"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
-      failed: "Failed to update profile"
+      failed: "Erro ao atualizar o perfil"
       updated: "Profile updated"
   registrations: 
     closed: "Cadastro temporariamente desabilitado."
@@ -440,7 +453,7 @@ pt-BR:
         one: "1 amigo"
         other: "%{count} amigos"
         zero: "nenhum amigo"
-      invite_your_friends_from: "Convide amigos de %{service}"
+      invite_your_friends_from: "Convide seus amigos de %{service}"
       not_connected: "desconectado"
     index: 
       connect_to_facebook: "Conectar com o Facebook"
@@ -490,6 +503,7 @@ pt-BR:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Enviar uma mensagem para %{aspect}"
       posting: "Postando..."
+      publishing_to: "publishing to: "
       share: "Compartilhar"
       share_with: "Compartilhar com %{aspect}"
       whats_on_your_mind: "O quê você está pensando?"
@@ -500,9 +514,8 @@ pt-BR:
       failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Sem mensagens para mostrar."
-    new_status_message: 
-      oh_yeah: "É isso aí!"
-      tell_me_something_good: "Diga-me algo de bom"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Excluir"
       permalink: "Link permanente"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index d205c15dc..d10c9e20f 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -15,73 +15,73 @@ pt-PT:
         contact: 
           attributes: 
             person_id: 
-              taken: "must be unique among this user's contacts."
+              taken: "tem de ser único entre os contactos deste utilizador."
         person: 
           attributes: 
             diaspora_handle: 
-              taken: "is already taken."
+              taken: "já existe."
         request: 
           attributes: 
             from_id: 
-              taken: "is a duplicate of a pre-existing request."
+              taken: "é duplicado de pedido pré-existente."
         user: 
           attributes: 
             email: 
-              taken: "is already taken."
+              taken: "já existe."
             person: 
-              invalid: "is invalid."
+              invalid: "é inválido."
             username: 
-              taken: "is already taken."
+              taken: "já existe."
   ago: "%{time} atrás"
   application: 
     helper: 
       aspect_badge: 
-        all_aspects: "All aspects"
+        all_aspects: "Todos os aspectos"
       unknown_person: "utilizador(a) desconhecido(a)"
       video_title: 
-        unknown: "Unknown Video Title"
-  are_you_sure: "Are you sure?"
+        unknown: "Video sem título	"
+  are_you_sure: "Tem a certeza?"
   aspect_memberships: 
     destroy: 
-      failure: "Failed to remove person from aspect"
-      no_membership: "Could not find the selected person in that aspect"
-      success: "Successfully removed person from aspect"
+      failure: "Erro ao remover a pessoa do aspecto"
+      no_membership: "A pessoa seleccionada não foi encontrada neste aspecto"
+      success: "Pessoa removida com sucesso do aspecto."
   aspects: 
     add_to_aspect: 
       failure: "Falha ao adicionar amigo ao grupo."
       success: "Amigo adicionado com sucesso ao grupo."
     aspect_contacts: 
-      done_editing: "done editing"
+      done_editing: "finalizar edição"
     aspect_stream: 
-      activity: "activity"
-      post_time: "post time"
-      sort_by: "sort by:"
-    contacts_not_visible: "Contacts in this aspect will not be able to see each other."
-    contacts_visible: "Contacts in this aspect will be able to see each other."
+      activity: "actividade"
+      post_time: "hora do post"
+      sort_by: "ordenar por:"
+    contacts_not_visible: "Contactos neste aspecto não se verão uns aos outros."
+    contacts_visible: "Contactos neste aspecto ver-se-ão uns aos outros."
     create: 
       failure: "A criação do grupo falhou."
       success: "O teu novo grupo %{name} foi  criado"
     destroy: 
-      failure: "%{name} is not empty and could not be removed."
+      failure: "%{name} não se encontra vazio e não pôde ser removido."
       success: "%{name} foi removido(a) com sucesso."
     edit: 
-      add_existing: "Add an existing contact"
+      add_existing: "Adicionar um contacto existente"
       aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
       aspect_list_is_visible: "aspect list is visible to others in aspect"
-      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      confirm_remove_aspect: "Tem a certeza que deseja remover este aspecto?"
       done: "Done"
-      make_aspect_list_visible: "make aspect list visible?"
-      remove_aspect: "Delete this aspect"
-      rename: "rename"
+      make_aspect_list_visible: "tornar visível a lista de aspectos?"
+      remove_aspect: "Remover este aspecto"
+      rename: "renomear"
       update: "update"
-    few: "%{count} aspects"
+    few: "%{count} aspectos"
     helper: 
-      are_you_sure: "Are you sure you want to delete this aspect?"
+      are_you_sure: "Tem a certeza que deseja eliminar este aspecto?"
       aspect_not_empty: "Mini-Perfil não está vazio"
       remove: "remover"
     index: 
       handle_explanation: "Esta é a tua chave do Diaspora. Tal como um email, podes dar esta chave às pessoas para que te possam contactar."
-      no_contacts: "No contacts"
+      no_contacts: "Nenhum contacto"
     manage: 
       add_a_new_aspect: "Adicionar um novo grupo"
       add_a_new_contact: "Adicionar um novo contacto"
@@ -89,7 +89,7 @@ pt-PT:
       manage_aspects: "Gerir Grupos"
       no_requests: "Não existem novos pedidos"
       requests: "Pedidos"
-    many: "%{count} aspects"
+    many: "%{count} aspectos"
     move_contact: 
       error: "Erro ao mover contacto: %{inspect}"
       failure: "não funcionou %{inspect}"
@@ -105,8 +105,8 @@ pt-PT:
       nobody_in_aspect: "O teu grupo '%{aspect_name}' está vazio."
     no_posts_message: 
       start_talking: "Ainda ninguém disse nada. Dá início à conversa!"
-    one: "1 aspect"
-    other: "%{count} aspects"
+    one: "1 aspecto"
+    other: "%{count} aspectos"
     seed: 
       family: "Família"
       work: "Trabalho"
@@ -115,7 +115,7 @@ pt-PT:
     update: 
       failure: "Your aspect, %{name}, had too long name to be saved."
       success: "O teu grupo, %{name}, foi editado com sucesso."
-    zero: "no aspects"
+    zero: "nenhum aspecto"
   back: "Voltar"
   cancel: "Cancelar"
   comments: 
@@ -125,31 +125,31 @@ pt-PT:
       comment: "Comentar"
       commenting: "A comentar..."
     one: "1 comment"
-    other: "%{count} comments"
-    zero: "no comments"
+    other: "%{count} comentários"
+    zero: "nenhum comentário"
   contacts: 
     create: 
-      failure: "Failed to create contact"
+      failure: "Erro ao criar contacto"
     destroy: 
-      failure: "Failed to disconnect from %{name}"
-      success: "Successfully disconnected from %{name}"
-    few: "%{count} contacts"
-    many: "%{count} contacts"
-    one: "1 contact"
-    other: "%{count} contacts"
+      failure: "Erro ao desligar de %{name}"
+      success: "Sucesso ao desligar de %{name}"
+    few: "%{count} contactos"
+    many: "%{count} contactos"
+    one: "1 contacto"
+    other: "%{count} contactos"
     share_with_pane: 
-      accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
-      add_new_aspect: "add to new aspect"
-      share_with: "Start sharing with %{name}"
-    zero: "no contacts"
+      accepts: "Uma vez que %{name} aceite, começarão a ver os posts de cada um no Diaspora"
+      add_new_aspect: "adicionar a novo aspecto"
+      share_with: "Começar a partilhar com %{name}"
+    zero: "nenhum contacto"
   conversations: 
     helper: 
       new_messages: 
-        few: "%{count} new messages"
-        many: "%{count} new messages"
-        one: "1 new messages"
-        other: "%{count} new messages"
-        zero: "no new messages"
+        few: "%{count} novas mensagens"
+        many: "%{count} novas mensagens"
+        one: "1 nova mensagem"
+        other: "%{count} novas mensagens"
+        zero: "nenhuma nova mensagem"
     index: 
       create_a_new_message: "create a new message"
       message_inbox: "Message Inbox"
@@ -157,10 +157,10 @@ pt-PT:
       no_conversation_selected: "no conversation selected"
       no_messages: "no messages"
     new: 
-      no_results: "No Results Found"
-      send: "Send"
-      subject: "subject"
-      to: "to"
+      no_results: "Nenhum Resultado Encontrado"
+      send: "Enviar"
+      subject: "assunto"
+      to: "para"
     show: 
       delete: "delete and block conversation"
       reply: "reply"
@@ -188,79 +188,78 @@ pt-PT:
       share_what_you_want: "Partilha o que quiseres, com quem quiseres."
       simplicity: "Simplicidade"
       simplicity_explanation: "O Diaspora torna a partilha clara e fácil – e o mesmo se aplica à privacidade. Privado por definição, o Diaspora não tem inúmeras páginas de definições e opções de forma a manteres o teu perfil seguro e privado."
-      tagline_first_half: "Share what you want,"
-      tagline_second_half: "with whom you want."
+      tagline_first_half: "Partilhe o que desejar,"
+      tagline_second_half: "com quem desejar."
   invitations: 
     check_token: 
       not_found: "Token de convite não encontrado"
     create: 
-      already_contacts: "You are already connected with this person"
-      already_sent: "You already invited this person."
+      already_contacts: "Você já está ligado a esta pessoa"
+      already_sent: "Você já convidou esta pessoa."
       no_more: "Não tens mais convites."
       rejected: "Os seguintes endereços de email tiveram problemas: "
       sent: "Os teu convites foram enviados a:"
     edit: 
       sign_up: "registar"
     new: 
-      already_invited: "Already invited"
-      aspect: "Aspect"
+      already_invited: "Já convidado"
+      aspect: "Aspecto"
       comma_seperated_plz: "Podes inserir vários endereços de email separados por vírgulas."
-      if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
+      if_they_accept_info: "se aceitarem, serão adicionados ao aspecto com que os convidou."
       invite_someone_to_join: "Convida alguém para se juntar ao Diaspora!"
       personal_message: "Personal message"
-      resend: "Resend"
+      resend: "Reenviar"
       send_an_invitation: "Envia um convite"
       send_invitation: "Enviar convite"
       to: "Para"
   layouts: 
     application: 
-      have_a_problem: "Have a problem? Find an answer here"
-      logged_in_as: "logged in as %{name}"
+      have_a_problem: "Problema? Encontre uma resposta aqui"
+      logged_in_as: "entrou como %{name}"
       powered_by: "POWERED BY DIASPORA*"
-      public_feed: "Public Diaspora Feed for %{name}"
+      public_feed: "Feed Diaspora público para %{name}"
       toggle: "toggle mobile site"
-      whats_new: "what's new?"
-      your_aspects: "your aspects"
+      whats_new: "O que há de novo?"
+      your_aspects: "seus aspectos"
     header: 
-      account_settings: "definições da conta"
       blog: "blog"
-      code: "code"
-      edit_profile: "editar perfil"
+      code: "código"
       login: "entrar"
       logout: "sair"
-      view_profile: "ver perfil"
-  more: "More"
-  next: "next"
+      profile: "profile"
+      settings: "settings"
+  more: "Mais"
+  next: "próximo"
   notifications: 
     also_commented: "also commented on"
-    also_commented_deleted: "commented on a deleted post"
-    comment_on_post: "commented on your"
-    deleted: "deleted"
+    also_commented_deleted: "comentou num post removido"
+    comment_on_post: "comentou no seu"
+    deleted: "excluído"
     helper: 
       new_notifications: 
-        few: "%{count} new notifications"
-        many: "%{count} new notifications"
-        one: "1 new notifications"
-        other: "%{count} new notifications"
-        zero: "no new notifications"
+        few: "%{count} novas notificações"
+        many: "%{count} novas notificações"
+        one: "1 nova notificação"
+        other: "%{count} novas notificações"
+        zero: "nenhuma nova notificação"
     index: 
-      and: "and"
-      and_others: "and %{number} others"
-      mark_all_as_read: "Mark All as Read"
-      notifications: "Notifications"
+      and: "e"
+      and_others: "e %{number} outros"
+      mark_all_as_read: "Marcar Tudo como Lido"
+      notifications: "Notificações"
     mentioned: "has mentioned you in their"
-    new_request: "offered to share with you."
+    new_request: "deseja partilhar consigo."
     post: "post"
-    request_accepted: "accepted your share request."
+    request_accepted: "Aceitou a sua solicitação de partilha."
   notifier: 
     also_commented: 
-      commented: "has also commented on %{post_author}'s post:"
-      sign_in: "Sign in to view it."
+      commented: "também comentou no post de %{post_author}:"
+      sign_in: "Faça login para ver."
       subject: "%{name} has also commented."
     comment_on_post: 
       commented: "has commented on your post!"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has commented on your post."
+      sign_in: "Faça login para ver."
+      subject: "%{name} comentou no seu post."
     diaspora: "o robot de email do diaspora"
     hello: "Olá %{name}!"
     love: "com carinho,"
@@ -283,24 +282,28 @@ pt-PT:
       sign_in: "Sign in here"
       subject: "%{name} aceitou o teu pedido de contacto no Diaspora*"
     single_admin: 
-      admin: "Your Diaspora administrator"
+      admin: " O seu administrador do Diaspora"
       subject: "A message from your Diaspora administrator:"
-    thanks: "Thanks,"
+    thanks: "Obrigado,"
   ok: "OK"
   or: "ou"
   password: "Palavra-chave"
   password_confirmation: "Confirmação de palavra-chave"
   people: 
     aspect_list: 
-      edit_membership: "edit aspect membership"
+      edit_membership: "editar participação no aspecto"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " as pessoas no pod estão cientes de que"
       results_for: " resultados para %{params}"
     index: 
-      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
-      no_one_found: "...and no one was found."
+      couldnt_find_them_send_invite: "Não conseguiu encontrá-los? Envie um convite!"
+      no_one_found: "...e ninguém foi encontrado."
       no_results: "Hey! You need to search for something."
       results_for: "resultados de pesquisa para"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "adicionar contacto"
       already_connected: "Já está ligado"
@@ -316,24 +319,29 @@ pt-PT:
       remove_contact: "remover contacto"
       remove_from: "Remover %{name} de %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "Essa pessoa não existe!"
+      edit: "edit"
       incoming_request: "Tens um pedido desta pessoa"
+      mention: "Mention"
       message: "Message"
       no_posts: "Não existem entradas para mostrar!"
       not_connected: "You are not connected with this person"
       recent_posts: "Recent Posts"
       recent_public_posts: "Recent Public Posts"
       return_to_aspects: "Voltar à página dos grupos"
-      similar_contacts: "similar contacts"
-      start_sharing: "start sharing"
+      similar_contacts: "contactos similares"
+      start_sharing: "começar a partilhar"
       to_accept_or_ignore: "para o aceitares ou ignorares"
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Sorry, we couldn't find %{handle}."
+    zero: "no people"
   photos: 
     create: 
-      integrity_error: "Photo upload failed.  Are you sure that was an image?"
-      runtime_error: "Photo upload failed.  Are you sure that your seatbelt is fastened?"
-      type_error: "Photo upload failed.  Are you sure an image was added?"
+      integrity_error: "O envio de foto falhou.  Tem a certeza que isso era uma imagem?"
+      runtime_error: "Envio de foto falhou. Tem a certeza que o seu cinto de segurança está apertado?"
+      type_error: "Envio de foto falhou. Tem a certeza que uma imagem foi adicionada?"
     destroy: 
       notice: "Fotografia apagada."
     edit: 
@@ -348,7 +356,7 @@ pt-PT:
       size_error: "{file} é muito grande, o tamanho máximo é {sizeLimit}."
     new_profile_photo: 
       or_select_one: "or select one from your already existing"
-      upload: "Upload a new profile photo!"
+      upload: "Envie uma foto nova do seu perfil!"
     photo: 
       view_all: "ver todas as fotografias de %{name}"
     show: 
@@ -365,28 +373,33 @@ pt-PT:
       error: "Falha ao editar a fotografia"
       notice: "Fotografia adicionada com sucesso."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       whatup: "What's happening on %{pod}"
-  previous: "previous"
+  previous: "anterior"
   profile: "Perfil"
   profiles: 
     edit: 
-      allow_search: "Allow for people to search for you within Diaspora"
-      edit_profile: "Edit profile"
-      first_name: "First name"
-      info_available_to: "This info will be available to whomever you connect with on Diaspora."
-      last_name: "Last name"
-      update_profile: "Update Profile"
-      your_bio: "Your bio"
-      your_birthday: "Your birthday"
-      your_gender: "Your gender"
-      your_name: "Your name"
-      your_photo: "Your photo"
-      your_profile: "Your profile"
+      allow_search: "Permitir que outros o busquem no Diaspora"
+      edit_profile: "Editar perfil"
+      first_name: "Prenome"
+      last_name: "Sobrenome"
+      update_profile: "Actualizar Perfil"
+      your_bio: "Sua biografia"
+      your_birthday: "O seu aniversário"
+      your_gender: "O seu sexo"
+      your_name: "O seu prenome"
+      your_photo: "A sua foto"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
-      failed: "Failed to update profile"
-      updated: "Profile updated"
+      failed: "Erro ao actualizar o perfil"
+      updated: "Perfil actualizado"
   registrations: 
     closed: "Os registos estão encerrados neste pod do Diaspora."
     create: 
@@ -399,27 +412,27 @@ pt-PT:
       unhappy: "Descontente?"
       update: "Actualizar"
     new: 
-      enter_email: "Enter an e-mail"
-      enter_password: "Enter a password"
-      enter_password_again: "Enter the same password as before"
-      enter_username: "Pick a username (only letters, numbers, and underscores)"
+      enter_email: "Insira um  endereço de e-mail"
+      enter_password: "Insira uma senha"
+      enter_password_again: "Insira a mesma senha que anteriormente"
+      enter_username: "Escolha um nome de utilizador (apenas letras, números e underscores)"
       sign_up: "Registar"
       sign_up_for_diaspora: "Regista-te no Diaspora"
   requests: 
     create: 
       sending: "A enviar..."
-      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      sent: "Você solicitou partilhar com %{name}, que será notificado assim que entrar no Diaspora."
     destroy: 
       error: "Por favor, escolhe um grupo!"
       ignore: "Ignorar pedido de contacto."
       success: "São agora amigos."
     helper: 
       new_requests: 
-        few: "%{count} new requests!"
-        many: "%{count} new requests!"
-        one: "new request!"
-        other: "%{count} new requests!"
-        zero: "no new requests"
+        few: "%{count} novos pedidos!"
+        many: "% {count} novos pedidos!"
+        one: "novo pedido!"
+        other: "%{count} novos pedidos!"
+        zero: "nenhum novo pedido"
     manage_aspect_contacts: 
       existing: "Contactos existentes"
       manage_within: "Gerir contactos dentro"
@@ -435,23 +448,23 @@ pt-PT:
       error: "there was an error connecting that service"
     finder: 
       friends: 
-        few: "%{count} friends"
-        many: "%{count} friends"
-        one: "1 friend"
-        other: "%{count} friends"
-        zero: "no friends"
-      invite_your_friends_from: "Invite your friends from %{service}"
-      not_connected: "not connected"
+        few: "%{count} amigos"
+        many: "%{count} amigos"
+        one: "1 amigo"
+        other: "%{count} amigos"
+        zero: "nenhum amigo"
+      invite_your_friends_from: "Convide os seus amigos de %{service}"
+      not_connected: "desligado"
     index: 
       connect_to_facebook: "Ligar ao Facebook"
       connect_to_twitter: "Ligar ao Twitter"
       disconnect: "Desligar"
-      edit_services: "Edit services"
+      edit_services: "Editar serviços"
       logged_in_as: "registado como"
       really_disconnect: "desligar do %{service}?"
     inviter: 
-      click_link_to_accept_invitation: "Click this link to accept your invitation"
-      join_me_on_diaspora: "Join me on DIASPORA*"
+      click_link_to_accept_invitation: "Clique neste link para aceitar o convite"
+      join_me_on_diaspora: "Junte-se a mim no DIASPORA*"
     remote_friend: 
       invite: "invite"
       resend: "resend"
@@ -461,19 +474,19 @@ pt-PT:
       create_request: "Encontrar através do nome de utilizador no Diaspora"
       diaspora_handle: "Nome de Utilizador"
       enter_a_diaspora_username: "Insere um nome de utilizador do Diaspora"
-      know_email: "Know their email address? You should invite them"
+      know_email: "Sabe os seus endereços de email? Deveria convidá-los"
       your_diaspora_username_is: "O teu nome de utilizador do Diaspora é: %{diaspora_handle}"
     contact_list: 
-      all_contacts: "All contacts"
+      all_contacts: "Todos os contactos"
       cannot_remove: "Impossível remover esta pessoa do último Grupo. (Se quiseres desligar-te desta pessoa terás que remover o contacto.)"
     invitations: 
-      by_email: "by Email"
+      by_email: "por Email"
       dont_have_now: "Não tens nenhum agora, mas terás mais convites brevemente!"
-      from_facebook: "From Facebook"
+      from_facebook: "Do Facebook"
       invitations_left: "(faltam %{count})"
       invite_someone: "Convida alguém"
-      invite_your_friends: "Invite your friends"
-      invites: "Invites"
+      invite_your_friends: "Convidar amigos"
+      invites: "Convites"
       invites_closed: "Invites are currently closed on this Diaspora seed"
     notification: 
       new: "Novo %{type} de %{from}"
@@ -490,9 +503,10 @@ pt-PT:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Publicar uma mensagem em %{aspect}"
       posting: "A publicar..."
+      publishing_to: "publishing to: "
       share: "Partilhar"
       share_with: "Partilhar com %{aspect}"
-      whats_on_your_mind: "what's on your mind?"
+      whats_on_your_mind: "No que está a pensar?"
     reshare: 
       reshare: "Partilhar Novamente"
   status_messages: 
@@ -500,37 +514,36 @@ pt-PT:
       failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Nenhuma mensagem para mostrar."
-    new_status_message: 
-      oh_yeah: "Boa!"
-      tell_me_something_good: "Diz-me algo bom"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Destruir"
       permalink: "permalink"
   stream_helper: 
-    hide_comments: "hide comments"
+    hide_comments: "ocultar comentários"
     show_comments: "show comments"
   the_world: "o mundo"
   username: "Nome de Utilizador"
   users: 
     destroy: "Conta encerrada com sucesso"
     edit: 
-      also_commented: "...someone also comments on your contact's post?"
-      change: "Change"
+      also_commented: "...alguém também comenta no post do seu contacto?"
+      change: "Mudar"
       change_language: "Modificar Idioma"
       change_password: "Modificar Palavra-chave"
       close_account: "Encerrar Conta"
-      comment_on_post: "...someone comments on your post?"
-      current_password: "Current password"
+      comment_on_post: "...alguém comenta nos seus post?"
+      current_password: "Senha actual"
       download_photos: "descarregar as minhas fotos"
       download_xml: "descarregar o meu xml"
-      edit_account: "Edit account"
+      edit_account: "Editar conta"
       export_data: "Exportar Dados"
-      mentioned: "...you are mentioned in a post?"
+      mentioned: "...você é mencionado num post?"
       new_password: "Nova Palavra-chave"
-      private_message: "...you receive a private message?"
+      private_message: "...você recebe uma mensagem privada?"
       receive_email_notifications: "Receive email notificaions?"
-      request_acceptence: "...your share request is accepted?"
-      request_received: "...you receive a new share request?"
+      request_acceptence: "...o seu pedido de partilha é aceite?"
+      request_received: "...você recebe um novo pedido de partilha?"
       your_email: "O teu email"
       your_handle: "O teu nome de utilizador no Diaspora"
     getting_started: 
@@ -557,8 +570,8 @@ pt-PT:
       password_changed: "Palavra-chave Modificada"
       password_not_changed: "Falha ao Modificar Palavra-chave"
   webfinger: 
-    fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
+    fetch_failed: "erro a obter perfil webfinger profile para %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
-    no_person_constructed: "No person could be constructed from this hcard."
-    not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
-    xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
+    no_person_constructed: "Nenhuma pessoa pôde ser construída através deste hcard."
+    not_enabled: "webfinger parece não estar activado para o anfitrião de %{account}'s"
+    xrd_fetch_failed: "erro ao obter o xrd da conta %{account}"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 0c3846f67..3d8aaab84 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -222,13 +222,12 @@ ro:
       whats_new: "what's new?"
       your_aspects: "aspectele tale"
     header: 
-      account_settings: "Setări cont"
       blog: "blog"
       code: "codul"
-      edit_profile: "Editare profil"
       login: "login"
       logout: "Ieşire"
-      view_profile: "Profilul meu"
+      profile: "profile"
+      settings: "settings"
   more: "Mai mult"
   next: "următorul"
   notifications: 
@@ -293,6 +292,7 @@ ro:
   people: 
     aspect_list: 
       edit_membership: "edit aspect membership"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " results for %{params}"
@@ -301,6 +301,9 @@ ro:
       no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "caută rezultate pentru"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "adaugă contact"
       already_connected: "Already connected"
@@ -316,8 +319,11 @@ ro:
       remove_contact: "Elimină contactul"
       remove_from: "Elimini pe %{name} din %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "Persoana nu există!"
+      edit: "edit"
       incoming_request: "You have an incoming request from this person."
+      mention: "Mention"
       message: "Message"
       no_posts: "nici un post disponibil!"
       not_connected: "You are not connected with this person"
@@ -327,8 +333,10 @@ ro:
       similar_contacts: "similar contacts"
       start_sharing: "start sharing"
       to_accept_or_ignore: "to accept or ignore it."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Sorry, we couldn't find %{handle}."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Încărcarea fotografiei a eşuat. Eşti sigur că a fost o imagine?"
@@ -365,7 +373,10 @@ ro:
       error: "Nu s-a reuşit editarea fotografiii."
       notice: "Fotografia a fost actualizată cu succes."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       whatup: "What's happening on %{pod}"
   previous: "anterioare"
@@ -375,7 +386,6 @@ ro:
       allow_search: "Allow for people to search for you within Diaspora"
       edit_profile: "Edit profile"
       first_name: "First name"
-      info_available_to: "This info will be available to whomever you connect with on Diaspora."
       last_name: "Last name"
       update_profile: "Update Profile"
       your_bio: "Your bio"
@@ -383,7 +393,10 @@ ro:
       your_gender: "Your gender"
       your_name: "Your name"
       your_photo: "Your photo"
-      your_profile: "Your profile"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
@@ -490,6 +503,7 @@ ro:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
+      publishing_to: "publishing to: "
       share: "Distribuie"
       share_with: "Share with %{aspect}"
       whats_on_your_mind: "what's on your mind?"
@@ -500,9 +514,8 @@ ro:
       failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Nici un mesaj nou."
-    new_status_message: 
-      oh_yeah: "o, da!"
-      tell_me_something_good: "spune-mi ceva bun"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Şterge"
       permalink: "permalink"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 09685c306..ae2a61e76 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -222,13 +222,12 @@ ru:
       whats_new: "Что нового?"
       your_aspects: "Ваши аспекты"
     header: 
-      account_settings: "настройки аккаунта"
       blog: "блог"
       code: "код"
-      edit_profile: "редактировать профиль"
       login: "логин"
       logout: "выйти"
-      view_profile: "просмотр профиля"
+      profile: "profile"
+      settings: "settings"
   more: "Подробнее"
   next: "далее"
   notifications: 
@@ -293,6 +292,7 @@ ru:
   people: 
     aspect_list: 
       edit_membership: "редактировать участников аспекта"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: "люди на сервере знают о"
       results_for: "результаты для %{params}"
@@ -301,6 +301,9 @@ ru:
       no_one_found: "...и не удалось кого либо найти."
       no_results: "Эй! Вам надо что то найти."
       results_for: "результат поиска для"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "добавить контакт"
       already_connected: "Уже подключен"
@@ -316,8 +319,11 @@ ru:
       remove_contact: "удалить контакт"
       remove_from: "Удалить %{name} из %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "Персоны не существует !"
+      edit: "edit"
       incoming_request: "%{name} хочет поделиться с вами"
+      mention: "Mention"
       message: "Message"
       no_posts: "новых сообщений нет!"
       not_connected: "Вы не поделились с %{name}"
@@ -327,8 +333,10 @@ ru:
       similar_contacts: "аналогичные контакты"
       start_sharing: "поделиться"
       to_accept_or_ignore: "принять или игнорировать."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "К сожалению, мы не смогли найти %{handle}."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Сбой при загрузке фото. Вы уверены, что это изображение?"
@@ -365,7 +373,10 @@ ru:
       error: "Не удалось изменить фотографию."
       notice: "Фотография загружена."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       whatup: "What's happening on %{pod}"
   previous: "предыдущая"
@@ -375,7 +386,6 @@ ru:
       allow_search: "Allow for people to search for you within Diaspora"
       edit_profile: "Edit profile"
       first_name: "First name"
-      info_available_to: "This info will be available to whomever you connect with on Diaspora."
       last_name: "Last name"
       update_profile: "Update Profile"
       your_bio: "Your bio"
@@ -383,7 +393,10 @@ ru:
       your_gender: "Your gender"
       your_name: "Your name"
       your_photo: "Your photo"
-      your_profile: "Your profile"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
@@ -490,6 +503,7 @@ ru:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Опубликовать сообщение для %{aspect}"
       posting: "Отправка ..."
+      publishing_to: "publishing to: "
       share: "Поделиться"
       share_with: "поделиться с"
       whats_on_your_mind: "о чём вы думаете?"
@@ -500,9 +514,8 @@ ru:
       failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Новых сообщений нет."
-    new_status_message: 
-      oh_yeah: "о да!"
-      tell_me_something_good: "расскажи мне что-нибудь хорошее"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Уничтожить"
       permalink: "постоянная ссылка"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index cae0047ca..dac7e717e 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -222,13 +222,12 @@ sk:
       whats_new: "Čo je nové?"
       your_aspects: "Vaše aspekty"
     header: 
-      account_settings: "nastavenia účtu"
       blog: "blog"
       code: "kód"
-      edit_profile: "upraviť profil"
       login: "prihlásenie"
       logout: "odhlásiť sa"
-      view_profile: "pozrieť profil"
+      profile: "profile"
+      settings: "settings"
   more: "Viac"
   next: "ďalej"
   notifications: 
@@ -293,6 +292,7 @@ sk:
   people: 
     aspect_list: 
       edit_membership: "upraviť členstvo v Aspekte."
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: "Ľudia na pode sú si vedomí"
       results_for: "Výsledky hľadania %{params}"
@@ -301,6 +301,9 @@ sk:
       no_one_found: "...a nenašlo sa."
       no_results: "Hej! Môžete sa po tom poobzerať."
       results_for: "Výsledky vyhľadávania pre"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "Pridať kontakt"
       already_connected: "Už pripojené"
@@ -316,8 +319,11 @@ sk:
       remove_contact: "odstrániť kontakt"
       remove_from: "Odstrániť užívateľa %{name} z aspektu %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "Osoba neexistuje!"
+      edit: "edit"
       incoming_request: "Od tejto osoby máte prichádzajúcu žiadosť."
+      mention: "Mention"
       message: "Správa"
       no_posts: "Žiadne príspevky na zobrazenie!"
       not_connected: "You are not connected with this person"
@@ -327,8 +333,10 @@ sk:
       similar_contacts: "podobné kontakty"
       start_sharing: "začať zdieľať"
       to_accept_or_ignore: "akceptovať, alebo ignorovať."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Prepáčte, nie je možné nájsť %{handle}."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Chyba pri nahrávani fotky.  Ste si istý, že je to obrázkový formát?"
@@ -365,7 +373,10 @@ sk:
       error: "Úprava fotky zlyhala."
       notice: "Fotka bola úspešne aktualizovaná."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       whatup: "Čo sa deje na  %{pod}"
   previous: "Predchádzajúce"
@@ -375,7 +386,6 @@ sk:
       allow_search: "Allow for people to search for you within Diaspora"
       edit_profile: "Upraviť profil"
       first_name: "Meno"
-      info_available_to: "This info will be available to whomever you connect with on Diaspora."
       last_name: "Priezvisko"
       update_profile: "Aktualizovať profil"
       your_bio: "Niečo o mne"
@@ -383,7 +393,10 @@ sk:
       your_gender: "Pohlavie"
       your_name: "Meno"
       your_photo: "Tvoja fotka"
-      your_profile: "Profil"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Aktualizovanie profilu zlyhalo"
       updated: "Profil aktualizovaný"
@@ -490,6 +503,7 @@ sk:
       mention_helper_text: "spomenúť niekoho, stlač '@' a začni písať jeho meno"
       post_a_message_to: "Poslať správu na aspekt %{aspect}"
       posting: "Posielam..."
+      publishing_to: "publishing to: "
       share: "Zdieľať"
       share_with: "Zdieľať s aspektom %{aspect}"
       whats_on_your_mind: "Čo máte na mysli?"
@@ -500,9 +514,8 @@ sk:
       failure: "Odstránenie príspevku zlyhalo"
     helper: 
       no_message_to_display: "Žiadne správy k zobrazeniu."
-    new_status_message: 
-      oh_yeah: "Skvelé!"
-      tell_me_something_good: "Dajte o niečom vedieť"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Zmazať"
       permalink: "permalink"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 1780c4029..89e513843 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -222,13 +222,12 @@ sl:
       whats_new: "kaj je novega?"
       your_aspects: "your aspects"
     header: 
-      account_settings: "nastavitve računa"
       blog: "blog"
       code: "koda"
-      edit_profile: "uredi profil"
       login: "prijava"
       logout: "odjavi me"
-      view_profile: "ogled profila"
+      profile: "profile"
+      settings: "settings"
   more: "More"
   next: "naslednja"
   notifications: 
@@ -293,6 +292,7 @@ sl:
   people: 
     aspect_list: 
       edit_membership: "uredi člane skupin"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " ljudje v 'podu' so seznanjeni o"
       results_for: "zadetkov za %{params}"
@@ -301,6 +301,9 @@ sl:
       no_one_found: "...nikogar ni bilo mogoče najti."
       no_results: "Ja, halo! Za iskanje je potrebno vpisati pogoj."
       results_for: "rezultati iskanja za"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "dodaj stik"
       already_connected: "Ste že povezani"
@@ -316,8 +319,11 @@ sl:
       remove_contact: "odstrani stik"
       remove_from: "Ali odstranim %{name} iz skupine %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "Oseba ne obstaja!"
+      edit: "edit"
       incoming_request: "Od te osebe ste prejeli novo prošnjo."
+      mention: "Mention"
       message: "Message"
       no_posts: "ni prispevkov na ogled!"
       not_connected: "Niste povezani s/z %{name}"
@@ -327,8 +333,10 @@ sl:
       similar_contacts: "podobni stiki"
       start_sharing: "začni deliti"
       to_accept_or_ignore: "sprejmite ali zavrnite."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Žal ni bilo mogoče najti %{handle}."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Nalaganje slike ni uspelo. Ste prepričani, da je bila izbrana slika?"
@@ -365,7 +373,10 @@ sl:
       error: "Urejanje slike ni uspelo."
       notice: "Slika uspešno posodobljena."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       whatup: "What's happening on %{pod}"
   previous: "prejšnja"
@@ -375,7 +386,6 @@ sl:
       allow_search: "Allow for people to search for you within Diaspora"
       edit_profile: "Edit profile"
       first_name: "First name"
-      info_available_to: "This info will be available to whomever you connect with on Diaspora."
       last_name: "Last name"
       update_profile: "Update Profile"
       your_bio: "Your bio"
@@ -383,7 +393,10 @@ sl:
       your_gender: "Your gender"
       your_name: "Your name"
       your_photo: "Your photo"
-      your_profile: "Your profile"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
@@ -490,6 +503,7 @@ sl:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Objavi sporočilo v %{aspect}"
       posting: "Objavljam..."
+      publishing_to: "publishing to: "
       share: "Deli"
       share_with: "deli s/z"
       whats_on_your_mind: "what's on your mind?"
@@ -500,9 +514,8 @@ sl:
       failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Ni sporočil."
-    new_status_message: 
-      oh_yeah: "to ja!"
-      tell_me_something_good: "povej mi kaj dobrega"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Izbriši"
       permalink: "trajna povezava"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 27d1dce44..0065f448a 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -222,13 +222,12 @@ sv:
       whats_new: "några nyheter?"
       your_aspects: "your aspects"
     header: 
-      account_settings: "kontoinställningar"
       blog: "blogg"
       code: "källkod"
-      edit_profile: "ändra profil"
       login: "logga in"
       logout: "logga ut"
-      view_profile: "visa profil"
+      profile: "profile"
+      settings: "settings"
   more: "More"
   next: "nästa"
   notifications: 
@@ -293,6 +292,7 @@ sv:
   people: 
     aspect_list: 
       edit_membership: "flytta mellan sidor"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " personer på denna plats är medvetna om att"
       results_for: " resultat för %{params}"
@@ -301,6 +301,9 @@ sv:
       no_one_found: "...och ingen hittades."
       no_results: "Du måste söka efter något."
       results_for: "Sökresultat för"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "lägg till kontakt"
       already_connected: "Redan ansluten"
@@ -316,8 +319,11 @@ sv:
       remove_contact: "ta bort kontakt"
       remove_from: "Ta bort %{name} från %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "Den här personen finns inte!"
+      edit: "edit"
       incoming_request: "%{name} vill dela med dig"
+      mention: "Mention"
       message: "Message"
       no_posts: "inga meddelanden att visa!"
       not_connected: "Du är inte ansluten till %{name}"
@@ -327,8 +333,10 @@ sv:
       similar_contacts: "liknande kontakter"
       start_sharing: "start sharing"
       to_accept_or_ignore: "for att acceptera eller ignorera."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Förlåt, vi kunde inte hitta %{handle}."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Fotouppladdning misslyckades. Är du säker på att det var en bild?"
@@ -365,7 +373,10 @@ sv:
       error: "Misslyckades med att ändra fotot."
       notice: "Fotot är nu uppdaterat."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       whatup: "What's happening on %{pod}"
   previous: "föregående"
@@ -375,7 +386,6 @@ sv:
       allow_search: "Allow for people to search for you within Diaspora"
       edit_profile: "Edit profile"
       first_name: "First name"
-      info_available_to: "This info will be available to whomever you connect with on Diaspora."
       last_name: "Last name"
       update_profile: "Update Profile"
       your_bio: "Your bio"
@@ -383,7 +393,10 @@ sv:
       your_gender: "Your gender"
       your_name: "Your name"
       your_photo: "Your photo"
-      your_profile: "Your profile"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
@@ -490,6 +503,7 @@ sv:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Skicka ett meddelande till %{aspect}"
       posting: "Skickar..."
+      publishing_to: "publishing to: "
       share: "Dela"
       share_with: "dela med"
       whats_on_your_mind: "what's on your mind?"
@@ -500,9 +514,8 @@ sv:
       failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Inget meddelande att visa."
-    new_status_message: 
-      oh_yeah: "oh yeah!"
-      tell_me_something_good: "berätta något intressant"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Ta bort"
       permalink: "permalänk"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 21923199f..33aedb06c 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -222,13 +222,12 @@ tr:
       whats_new: "what's new?"
       your_aspects: "your aspects"
     header: 
-      account_settings: "hesap seçenekleri"
       blog: "blog"
       code: "code"
-      edit_profile: "Profili düzenle"
       login: "login"
       logout: "Çıkış"
-      view_profile: "Profili görüntüle"
+      profile: "profile"
+      settings: "settings"
   more: "More"
   next: "next"
   notifications: 
@@ -293,6 +292,7 @@ tr:
   people: 
     aspect_list: 
       edit_membership: "edit aspect membership"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " results for %{params}"
@@ -301,6 +301,9 @@ tr:
       no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "search results for"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "kişi ekle"
       already_connected: "Zaten bağlı"
@@ -316,8 +319,11 @@ tr:
       remove_contact: "remove contact"
       remove_from: "Remove %{name} from %{aspect}?"
     show: 
+      add_some: "add some"
       does_not_exist: "Person does not exist!"
+      edit: "edit"
       incoming_request: "You have an incoming request from this person."
+      mention: "Mention"
       message: "Message"
       no_posts: "no posts to display!"
       not_connected: "You are not connected with this person"
@@ -327,8 +333,10 @@ tr:
       similar_contacts: "similar contacts"
       start_sharing: "start sharing"
       to_accept_or_ignore: "kabul et veya yoksay."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Sorry, we couldn't find %{handle}."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "Photo upload failed.  Are you sure that was an image?"
@@ -365,7 +373,10 @@ tr:
       error: "Fotoyu düzeltme basarısız oldu."
       notice: "Resim başarıyla eklendi."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       whatup: "What's happening on %{pod}"
   previous: "previous"
@@ -375,7 +386,6 @@ tr:
       allow_search: "Allow for people to search for you within Diaspora"
       edit_profile: "Edit profile"
       first_name: "First name"
-      info_available_to: "This info will be available to whomever you connect with on Diaspora."
       last_name: "Last name"
       update_profile: "Update Profile"
       your_bio: "Your bio"
@@ -383,7 +393,10 @@ tr:
       your_gender: "Your gender"
       your_name: "Your name"
       your_photo: "Your photo"
-      your_profile: "Your profile"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
@@ -490,6 +503,7 @@ tr:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "mesaj gönder %{aspect}"
       posting: "Posting..."
+      publishing_to: "publishing to: "
       share: "Paylaş"
       share_with: "Share with %{aspect}"
       whats_on_your_mind: "what's on your mind?"
@@ -500,9 +514,8 @@ tr:
       failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Gosterilcek bir mesaj yok."
-    new_status_message: 
-      oh_yeah: "tabi ya!"
-      tell_me_something_good: "bana iyi bir şey söyle"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Yok et"
       permalink: "permalink"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 3dc1a8b20..d74036162 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -222,13 +222,12 @@ zh-TW:
       whats_new: "有什麼新消息?"
       your_aspects: "你的面向"
     header: 
-      account_settings: "帳號設定"
       blog: "部落格"
       code: "源碼"
-      edit_profile: "編輯個人檔案"
       login: "登入"
       logout: "登出"
-      view_profile: "檢視個人檔案"
+      profile: "profile"
+      settings: "settings"
   more: "更多"
   next: "後面"
   notifications: 
@@ -293,6 +292,7 @@ zh-TW:
   people: 
     aspect_list: 
       edit_membership: "編輯所屬面向"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: "Pod 上已知的人"
       results_for: "%{params} 的搜尋結果"
@@ -301,6 +301,9 @@ zh-TW:
       no_one_found: "...找不到任何東西."
       no_results: "嘿! 搜尋要有目標."
       results_for: "搜尋結果:"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "加入聯繫"
       already_connected: "已建立連結"
@@ -316,8 +319,11 @@ zh-TW:
       remove_contact: "刪除聯繫"
       remove_from: "要從 %{aspect} 刪除 %{name} 嗎?"
     show: 
+      add_some: "add some"
       does_not_exist: "聯絡人不存在!"
+      edit: "edit"
       incoming_request: "%{name} 希望能和你分享"
+      mention: "Mention"
       message: "訊息"
       no_posts: "沒有貼文可顯示!"
       not_connected: "你不跟這個人分享"
@@ -327,8 +333,10 @@ zh-TW:
       similar_contacts: "相似的聯繫"
       start_sharing: "開始分享"
       to_accept_or_ignore: "接受或不管它."
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "抱歉, 找不到 %{handle}."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "相片上傳失敗. 你確定它是圖片嗎?"
@@ -365,7 +373,10 @@ zh-TW:
       error: "相片編輯失敗."
       notice: "相片更新成功."
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "標記為#%{tag}的貼文"
       whatup: "%{pod}的新鮮事"
   previous: "前面"
@@ -375,7 +386,6 @@ zh-TW:
       allow_search: "讓別人在 Diaspora 可以搜尋到你"
       edit_profile: "編輯個人檔案"
       first_name: "First name"
-      info_available_to: "和你在 Diaspora 建立聯繫的每個人都能看到這些資訊."
       last_name: "Last name"
       update_profile: "更新個人檔案"
       your_bio: "你的自我介紹"
@@ -383,7 +393,10 @@ zh-TW:
       your_gender: "你的性別"
       your_name: "你的名字"
       your_photo: "你的相片"
-      your_profile: "你的個人檔案"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "個人檔案更新失敗"
       updated: "個人檔案已更新"
@@ -490,6 +503,7 @@ zh-TW:
       mention_helper_text: "想提到某人的話, 先敲 '@' 再接著打他們的名字"
       post_a_message_to: "在 %{aspect} 發表訊息"
       posting: "發表中..."
+      publishing_to: "publishing to: "
       share: "分享"
       share_with: "與他/她分享:"
       whats_on_your_mind: "在想什麼?"
@@ -500,9 +514,8 @@ zh-TW:
       failure: "刪除貼文失敗"
     helper: 
       no_message_to_display: "沒有訊息可顯示."
-    new_status_message: 
-      oh_yeah: "oh yeah!"
-      tell_me_something_good: "報好康的給我"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "刪除"
       permalink: "靜態連結"
diff --git a/config/locales/diaspora/zh.yml b/config/locales/diaspora/zh.yml
index 339f48fe0..dcf930617 100644
--- a/config/locales/diaspora/zh.yml
+++ b/config/locales/diaspora/zh.yml
@@ -222,13 +222,12 @@ zh:
       whats_new: "what's new?"
       your_aspects: "your aspects"
     header: 
-      account_settings: "帐户设置"
       blog: "博客"
       code: "代码"
-      edit_profile: "编辑个人资料"
       login: "登录"
       logout: "退出"
-      view_profile: "查看个人资料"
+      profile: "profile"
+      settings: "settings"
   more: "More"
   next: "下一步"
   notifications: 
@@ -293,6 +292,7 @@ zh:
   people: 
     aspect_list: 
       edit_membership: "edit aspect membership"
+    few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " results for %{params}"
@@ -301,6 +301,9 @@ zh:
       no_one_found: "...但是找不到任何人。"
       no_results: "你好！你得用搜索功能去查找。"
       results_for: "搜索结果"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
     person: 
       add_contact: "增加联系人"
       already_connected: "已关联"
@@ -316,8 +319,11 @@ zh:
       remove_contact: "删除联系人"
       remove_from: "真的要把%{name}从%{aspect}中删除吗？"
     show: 
+      add_some: "add some"
       does_not_exist: "此人不存在！"
+      edit: "edit"
       incoming_request: "您有一条这个人发的邀请。"
+      mention: "Mention"
       message: "Message"
       no_posts: "无贴见人！"
       not_connected: "还还没有和%{name}共享"
@@ -327,8 +333,10 @@ zh:
       similar_contacts: "相似联系人"
       start_sharing: "start sharing"
       to_accept_or_ignore: "接受或者忽略。"
+      you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Sorry, we couldn't find %{handle}."
+    zero: "no people"
   photos: 
     create: 
       integrity_error: "图片上传失败，你肯定你上传的是图片吗？"
@@ -365,7 +373,10 @@ zh:
       error: "照片编辑失败。"
       notice: "头像更新成功。"
   posts: 
+    doesnt_exist: "that post does not exist!"
     index: 
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       whatup: "What's happening on %{pod}"
   previous: "后退"
@@ -375,7 +386,6 @@ zh:
       allow_search: "Allow for people to search for you within Diaspora"
       edit_profile: "Edit profile"
       first_name: "First name"
-      info_available_to: "This info will be available to whomever you connect with on Diaspora."
       last_name: "Last name"
       update_profile: "Update Profile"
       your_bio: "Your bio"
@@ -383,7 +393,10 @@ zh:
       your_gender: "Your gender"
       your_name: "Your name"
       your_photo: "Your photo"
-      your_profile: "Your profile"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "You: in 5 #tags"
+      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
@@ -490,6 +503,7 @@ zh:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "发送信息给%{aspect}这个分组的所有人"
       posting: "发布中"
+      publishing_to: "publishing to: "
       share: "分享"
       share_with: "和%{aspect}这个分组中的人分享"
       whats_on_your_mind: "what's on your mind?"
@@ -500,9 +514,8 @@ zh:
       failure: "Failed to delete post"
     helper: 
       no_message_to_display: "没有消息。"
-    new_status_message: 
-      oh_yeah: "oh yeah!"
-      tell_me_something_good: "给我透露点好消息吧"
+    new: 
+      mentioning: "Mentioning: %{person}"
     show: 
       destroy: "删除"
       permalink: "永久链接"
diff --git a/config/locales/javascript/javascript.cs.yml b/config/locales/javascript/javascript.cs.yml
index 8e6e44b2b..38e3a7dbb 100644
--- a/config/locales/javascript/javascript.cs.yml
+++ b/config/locales/javascript/javascript.cs.yml
@@ -6,6 +6,8 @@
 cs: 
   javascripts: 
     confirm_dialog: "Jste si jisti?"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Hledat {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.da.yml b/config/locales/javascript/javascript.da.yml
index 809b47e4a..1a3b49075 100644
--- a/config/locales/javascript/javascript.da.yml
+++ b/config/locales/javascript/javascript.da.yml
@@ -6,6 +6,8 @@
 da: 
   javascripts: 
     confirm_dialog: "Are you sure?"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Search for {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml
index e0813801b..4e39cfe68 100644
--- a/config/locales/javascript/javascript.de.yml
+++ b/config/locales/javascript/javascript.de.yml
@@ -6,6 +6,8 @@
 de: 
   javascripts: 
     confirm_dialog: "Bist du dir sicher?"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Nach {{name}} suchen"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.el.yml b/config/locales/javascript/javascript.el.yml
index 115105e04..84da0b2ed 100644
--- a/config/locales/javascript/javascript.el.yml
+++ b/config/locales/javascript/javascript.el.yml
@@ -6,6 +6,8 @@
 el: 
   javascripts: 
     confirm_dialog: "Είστε σίγουρος/η;"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Αναζήτηση για {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.en_shaw.yml b/config/locales/javascript/javascript.en_shaw.yml
index b7a541053..6dc0a9b1e 100644
--- a/config/locales/javascript/javascript.en_shaw.yml
+++ b/config/locales/javascript/javascript.en_shaw.yml
@@ -6,6 +6,8 @@
 en_shaw: 
   javascripts: 
     confirm_dialog: "𐑸 𐑿 𐑖𐑻?"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "𐑕𐑻𐑗 𐑓𐑹 {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml
index 6f9b99b35..7f8489e1d 100644
--- a/config/locales/javascript/javascript.es.yml
+++ b/config/locales/javascript/javascript.es.yml
@@ -6,6 +6,8 @@
 es: 
   javascripts: 
     confirm_dialog: "¿Estás seguro?"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Buscar a {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.eu.yml b/config/locales/javascript/javascript.eu.yml
index 8f1077c33..5c452f18c 100644
--- a/config/locales/javascript/javascript.eu.yml
+++ b/config/locales/javascript/javascript.eu.yml
@@ -6,6 +6,8 @@
 eu: 
   javascripts: 
     confirm_dialog: "Ziur al zaude?"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Bilatu {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.fi.yml b/config/locales/javascript/javascript.fi.yml
index 72c6955c3..9cb143768 100644
--- a/config/locales/javascript/javascript.fi.yml
+++ b/config/locales/javascript/javascript.fi.yml
@@ -6,6 +6,8 @@
 fi: 
   javascripts: 
     confirm_dialog: "Oletko varma?"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Etsi nimellä {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.fr.yml b/config/locales/javascript/javascript.fr.yml
index 8a61853de..0e0e236cf 100644
--- a/config/locales/javascript/javascript.fr.yml
+++ b/config/locales/javascript/javascript.fr.yml
@@ -6,6 +6,8 @@
 fr: 
   javascripts: 
     confirm_dialog: "Êtes-vous sûr ?"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Chercher {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.gl.yml b/config/locales/javascript/javascript.gl.yml
index fc7191168..c7c0a8a0e 100644
--- a/config/locales/javascript/javascript.gl.yml
+++ b/config/locales/javascript/javascript.gl.yml
@@ -6,6 +6,8 @@
 gl: 
   javascripts: 
     confirm_dialog: "Seguro?"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Buscar a {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.he.yml b/config/locales/javascript/javascript.he.yml
index 6ac6d3646..0b969232a 100644
--- a/config/locales/javascript/javascript.he.yml
+++ b/config/locales/javascript/javascript.he.yml
@@ -6,6 +6,8 @@
 he: 
   javascripts: 
     confirm_dialog: "בבטחה?"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "חיפוש אחר {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.hu.yml b/config/locales/javascript/javascript.hu.yml
index a79f0331a..c0447e585 100644
--- a/config/locales/javascript/javascript.hu.yml
+++ b/config/locales/javascript/javascript.hu.yml
@@ -6,6 +6,8 @@
 hu: 
   javascripts: 
     confirm_dialog: "Biztos vagy benne?"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "{{name}} keresése."
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.id.yml b/config/locales/javascript/javascript.id.yml
index df6716b88..a85a3befa 100644
--- a/config/locales/javascript/javascript.id.yml
+++ b/config/locales/javascript/javascript.id.yml
@@ -6,6 +6,8 @@
 id: 
   javascripts: 
     confirm_dialog: "Are you sure?"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Search for {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.is.yml b/config/locales/javascript/javascript.is.yml
index e493acb25..78044ee7c 100644
--- a/config/locales/javascript/javascript.is.yml
+++ b/config/locales/javascript/javascript.is.yml
@@ -6,6 +6,8 @@
 is: 
   javascripts: 
     confirm_dialog: "Ertu viss?"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Search for {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.it.yml b/config/locales/javascript/javascript.it.yml
index 7cd134b57..2ce16a564 100644
--- a/config/locales/javascript/javascript.it.yml
+++ b/config/locales/javascript/javascript.it.yml
@@ -6,6 +6,8 @@
 it: 
   javascripts: 
     confirm_dialog: "Sei sicuro?"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Ricerca per {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.nl.yml b/config/locales/javascript/javascript.nl.yml
index d872b47a1..6e396f482 100644
--- a/config/locales/javascript/javascript.nl.yml
+++ b/config/locales/javascript/javascript.nl.yml
@@ -6,6 +6,8 @@
 nl: 
   javascripts: 
     confirm_dialog: "Weet je het zeker?"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Zoek naar {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.pl.yml b/config/locales/javascript/javascript.pl.yml
index 5124a78ea..3707e31a0 100644
--- a/config/locales/javascript/javascript.pl.yml
+++ b/config/locales/javascript/javascript.pl.yml
@@ -6,6 +6,8 @@
 pl: 
   javascripts: 
     confirm_dialog: "Czy @{m,f:jesteś|n:na}{ pew}{m:ien|f:na|n:no}?"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Szukaj: {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.pt-BR.yml b/config/locales/javascript/javascript.pt-BR.yml
index ff5f48949..b0286c822 100644
--- a/config/locales/javascript/javascript.pt-BR.yml
+++ b/config/locales/javascript/javascript.pt-BR.yml
@@ -6,6 +6,8 @@
 pt-BR: 
   javascripts: 
     confirm_dialog: "Tem certeza?"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Search for {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.pt-PT.yml b/config/locales/javascript/javascript.pt-PT.yml
index 149bd4e44..53fc7d064 100644
--- a/config/locales/javascript/javascript.pt-PT.yml
+++ b/config/locales/javascript/javascript.pt-PT.yml
@@ -6,6 +6,8 @@
 pt-PT: 
   javascripts: 
     confirm_dialog: "Are you sure?"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Search for {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.ro.yml b/config/locales/javascript/javascript.ro.yml
index b0356430a..71507a52a 100644
--- a/config/locales/javascript/javascript.ro.yml
+++ b/config/locales/javascript/javascript.ro.yml
@@ -6,6 +6,8 @@
 ro: 
   javascripts: 
     confirm_dialog: "Eşti sigur?"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Search for {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.ru.yml b/config/locales/javascript/javascript.ru.yml
index 1aaab3057..1e6e5ea85 100644
--- a/config/locales/javascript/javascript.ru.yml
+++ b/config/locales/javascript/javascript.ru.yml
@@ -6,6 +6,8 @@
 ru: 
   javascripts: 
     confirm_dialog: "Вы уверенны? "
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Искать для {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.sk.yml b/config/locales/javascript/javascript.sk.yml
index b0669e9f4..a55234d63 100644
--- a/config/locales/javascript/javascript.sk.yml
+++ b/config/locales/javascript/javascript.sk.yml
@@ -6,6 +6,8 @@
 sk: 
   javascripts: 
     confirm_dialog: "Ste si istý?"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Hľadať {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.sl.yml b/config/locales/javascript/javascript.sl.yml
index 54978d2b2..345bdfada 100644
--- a/config/locales/javascript/javascript.sl.yml
+++ b/config/locales/javascript/javascript.sl.yml
@@ -6,6 +6,8 @@
 sl: 
   javascripts: 
     confirm_dialog: "Are you sure?"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Search for {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.sv.yml b/config/locales/javascript/javascript.sv.yml
index e1d36e803..4bc0c3ed0 100644
--- a/config/locales/javascript/javascript.sv.yml
+++ b/config/locales/javascript/javascript.sv.yml
@@ -6,6 +6,8 @@
 sv: 
   javascripts: 
     confirm_dialog: "Are you sure?"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Search for {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.tr.yml b/config/locales/javascript/javascript.tr.yml
index 46fc63814..cfbaffbc1 100644
--- a/config/locales/javascript/javascript.tr.yml
+++ b/config/locales/javascript/javascript.tr.yml
@@ -6,6 +6,8 @@
 tr: 
   javascripts: 
     confirm_dialog: "Emin misiniz?"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "{{name}}'i ara"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.zh-TW.yml b/config/locales/javascript/javascript.zh-TW.yml
index deecd39a1..71e9016ee 100644
--- a/config/locales/javascript/javascript.zh-TW.yml
+++ b/config/locales/javascript/javascript.zh-TW.yml
@@ -6,6 +6,8 @@
 zh-TW: 
   javascripts: 
     confirm_dialog: "你確定嗎?"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "搜尋 {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.zh.yml b/config/locales/javascript/javascript.zh.yml
index 5aaa61aa4..7c75b4a05 100644
--- a/config/locales/javascript/javascript.zh.yml
+++ b/config/locales/javascript/javascript.zh.yml
@@ -6,6 +6,8 @@
 zh: 
   javascripts: 
     confirm_dialog: "Are you sure?"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Search for {{name}}"
     shared: 
       contact_list: 

From d6ebc04402f46e76a2f36708d9ff2bab5c11f56c Mon Sep 17 00:00:00 2001
From: Jordi Mallach <jordi@softcatala.org>
Date: Thu, 17 Mar 2011 15:42:14 +0100
Subject: [PATCH 17/20] Fix some leftovers thanks to MrZYX's diff-yml-keys.py.

---
 config/locales/diaspora/ca.yml | 41 ++++++++++++++++------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/config/locales/diaspora/ca.yml b/config/locales/diaspora/ca.yml
index af1503277..454fd0309 100644
--- a/config/locales/diaspora/ca.yml
+++ b/config/locales/diaspora/ca.yml
@@ -35,8 +35,6 @@ ca:
   _comments: "Comentaris"
 
 
-  #for reference translation, the real activerecord english transations are actually
-  #in en-US, en-GB, and en-AU yml files
   activerecord:
     errors:
       models:
@@ -48,18 +46,18 @@ ca:
               taken: "ja és en ús."
             email:
               taken: "ja és en ús."
-          person:
-            attributes:
-              diaspora_handle:
-                taken: "ja és en ús."
-          contact:
-            attributes:
-              person_id:
-                taken: "ha de ser únic entre els contactes d'aquest usuari."
-            request:
-              attributes:
-                from_id:
-                  taken: "és un duplicat d'una petició ja existent."
+        person:
+          attributes:
+            diaspora_handle:
+              taken: "ja és en ús."
+        contact:
+          attributes:
+            person_id:
+              taken: "ha de ser únic entre els contactes d'aquest usuari."
+        request:
+          attributes:
+            from_id:
+              taken: "és un duplicat d'una petició ja existent."
 
 
   error_messages:
@@ -257,9 +255,8 @@ ca:
 
   layouts:
     header:
-      view_profile: "mostra el perfil"
-      edit_profile: "edita el perfil"
-      account_settings: "paràmetres del compte"
+      profile: "perfil"
+      settings: "paràmetres"
       logout: "surt"
       blog: "bloc"
       login: "entra"
@@ -427,8 +424,8 @@ ca:
 
   profiles:
     edit:
-      info_available_to: "Aquesta informació serà disponible per a tots aquells amb qui connectes al Diàspora."
-      your_profile: "El vostre perfil"
+      your_public_profile: "El vostre perfil públic"
+      your_private_profile: "El vostre perfil privat"
       your_name: "El vostre nom"
       first_name: "Nom"
       last_name: "Cognom"
@@ -514,9 +511,9 @@ ca:
         many: "%{count} amics"
         other: "%{count} amics"
       not_connected: "no connectat"
-      remote_friend:
-        resend: "torna a enviar"
-        invite: "convida"
+    remote_friend:
+      resend: "torna a enviar"
+      invite: "convida"
 
 
   shared:

From a60912bc22d2f23662e87fb1284061e81ff6ad02 Mon Sep 17 00:00:00 2001
From: Jordi Mallach <jordi@softcatala.org>
Date: Thu, 17 Mar 2011 15:57:12 +0100
Subject: [PATCH 18/20] Updated Catalan translation to a787106.

---
 config/locales/diaspora/ca.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/config/locales/diaspora/ca.yml b/config/locales/diaspora/ca.yml
index 454fd0309..09c3d2da0 100644
--- a/config/locales/diaspora/ca.yml
+++ b/config/locales/diaspora/ca.yml
@@ -331,6 +331,11 @@ ca:
 
 
   people:
+    zero: "cap persona"
+    one: "1 persona"
+    few: "%{count} persones"
+    many: "%{count} persones"
+    other: "%{count} persones"
     person:
       pending_request: "petició pendent"
       already_connected: "Ja connectat"
@@ -413,13 +418,12 @@ ca:
 
 
   posts:
+    doesnt_exist: "aquest post no existeix!"
     index:
       whatup: "Què està passant a %{pod}"
       posts_tagged_with: "Publicacions etiquetades amb #%{tag}"
       nobody_talking: "Ningú està parlant de %{tag} encara."
       people_tagged_with: "Gent etiquetada amb %{tag}"
-      people: "gent"
-      person: "persona"
 
 
   profiles:
@@ -528,6 +532,7 @@ ca:
       all_contacts: "tots els contactes"
       share_with: "comparteix amb"
       whats_on_your_mind: "què teniu al cap?"
+      publishing_to: "s'està publicant a: "
     add_contact:
       enter_a_diaspora_username: "Introduïu un nom d'usuari de Diàspora:"
       your_diaspora_username_is: "El vostre nom d'usuari de Diàspora és: %{diaspora_handle}"
@@ -559,7 +564,7 @@ ca:
 
   status_messages:
     new:
-      mentioning: "Mencionant: "
+      mentioning: "Mencionant: %{person}"
     show:
       destroy: "Suprimeix"
       permalink: "enllaç permanent"

From 3c64da8981a3ef7cb338178554241c602ade25ae Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Thu, 17 Mar 2011 16:59:02 +0100
Subject: [PATCH 19/20] fixed #935

---
 app/views/people/_profile_sidebar.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/people/_profile_sidebar.html.haml b/app/views/people/_profile_sidebar.html.haml
index 843fec32e..78ed5c137 100644
--- a/app/views/people/_profile_sidebar.html.haml
+++ b/app/views/people/_profile_sidebar.html.haml
@@ -9,7 +9,7 @@
         $(this).closest('li').fadeOut(200);
       });
       $('.delete').bind('ajax:failure', function() {
-        alert("#{t('status_message.destroy.failure')}");
+        alert("#{t('status_messages.destroy.failure')}");
       });
     });
 

From 388423a76a81ef43f79fe9c6496a3e87bb7e4836 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Thu, 17 Mar 2011 10:50:11 -0700
Subject: [PATCH 20/20] add a missing space for notifications with less than 4
 people

---
 app/helpers/notifications_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index 3a22c8738..e8a1d30cf 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -48,7 +48,7 @@ module NotificationsHelper
     number_of_actors = actors.count
     actor_links = actors.collect{ |person| link_to("#{h(person.name.titlecase)}", person_path(person))}
     if number_of_actors < 4
-      message =  actor_links.join(',')
+      message =  actor_links.join(', ')
     else
       message  = actor_links[0..2].join(', ') << "<a class='more' href='#'> #{t('.and_others', :number =>(number_of_actors - 3))}</a><span class='hidden'>, " << actor_links[3..(number_of_actors-2)].join(', ')<< " #{t('.and')} "<< actor_links.last << '</span>'
     end