Merge branch 'master' of git://github.com/diaspora/diaspora

87 files changed, 2049 insertions, 1033 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 50650d9f6..cbe9d5ea7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -336,7 +336,7 @@ GEM
       activesupport (= 3.0.9)
       bundler (~> 1.0)
       railties (= 3.0.9)
-    rails-i18n (0.1.0)
+    rails-i18n (0.1.2)
       activesupport (~> 3)
     railties (3.0.9)
       actionpack (= 3.0.9)
diff --git a/app/models/invitation.rb b/app/models/invitation.rb
index e600f8a0a..23dcb2c9e 100644
--- a/app/models/invitation.rb
+++ b/app/models/invitation.rb
@@ -2,12 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 #
-class OpenSSL::PKey::RSA
-  def to_yaml
-    self.to_s
-  end
-end
-
 class Invitation < ActiveRecord::Base
 
   belongs_to :sender, :class_name => 'User'
diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml
index aa6a26ca6..5014a8ba3 100644
--- a/app/views/aspects/index.html.haml
+++ b/app/views/aspects/index.html.haml
@@ -29,7 +29,7 @@
           - else
             %li
               %span.new_aspect
-                No tags
+                = t('aspects.index.no_tags')
 
 .span-13.append-1
   #aspect_stream_container.stream_container
diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml
index 909398112..64c537d47 100644
--- a/app/views/comments/_comment.html.haml
+++ b/app/views/comments/_comment.html.haml
@@ -21,7 +21,7 @@
         = comment.created_at ? timeago(comment.created_at) : timeago(Time.now)
 
       .likes
-        = render "likes/likes_container", :target_id => comment.id, :likes_count => comment.likes_count
+        = render "likes/likes_container", :target_id => comment.id, :likes_count => comment.likes_count, :target_type => "Comment"
 
       - unless (defined?(@commenting_disabled) && @commenting_disabled)
         %span.like_action
diff --git a/app/views/likes/_likes_container.haml b/app/views/likes/_likes_container.haml
index 0a8ea4de0..ef278ac05 100644
--- a/app/views/likes/_likes_container.haml
+++ b/app/views/likes/_likes_container.haml
@@ -6,9 +6,15 @@
   - if likes_count > 0
     = image_tag('icons/heart.svg')
     - if defined?(likes_index_link) && likes_index_link
-      = link_to t('likes.likes.people_like_this', :count => likes_count), post_likes_path(target_id), :class => "expand_likes"
+      - if target_type == "Comment"
+        = link_to t('likes.likes.people_like_this_comment', :count => likes_count), post_likes_path(target_id), :class => "expand_likes"
+      - else
+        = link_to t('likes.likes.people_like_this', :count => likes_count), post_likes_path(target_id), :class => "expand_likes"
     - else
-      = t('likes.likes.people_like_this', :count => likes_count)
+      - if target_type == "Comment"
+        = t('likes.likes.people_like_this_comment', :count => likes_count)
+      - else
+        = t('likes.likes.people_like_this', :count => likes_count)
     %span.hidden.likes_list
       /= render 'likes/likes', :likes => likes
 
diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml
index 5de61e812..70375a2ed 100644
--- a/app/views/shared/_stream_element.html.haml
+++ b/app/views/shared/_stream_element.html.haml
@@ -67,6 +67,6 @@
           = link_to t('comments.new_comment.comment'), '#', :class => 'focus_comment_textarea'
 
       .likes.on_post
-        = render "likes/likes_container", :target_id => post.id, :likes_count => post.likes_count, :current_user => current_user, :likes_index_link => true
+        = render "likes/likes_container", :target_id => post.id, :likes_count => post.likes_count, :current_user => current_user, :likes_index_link => true, :target_type => "Post"
 
       = render "comments/comments", :post => post, :current_user => current_user, :commenting_disabled => (defined?(@commenting_disabled) && @commenting_disabled)
diff --git a/config/initializers/patch_openssl_pkey.rb b/config/initializers/patch_openssl_pkey.rb
new file mode 100644
index 000000000..ef6b1ddfe
--- /dev/null
+++ b/config/initializers/patch_openssl_pkey.rb
@@ -0,0 +1,14 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+#
+#
+#
+#Why? as of rails 3.0.4, objects are marshalled by calling to yaml, if it is a text field in the db. since we assume things are strings coming out, and pkey does not seem to define a to_yaml, it was getting set to nil
+class OpenSSL::PKey::RSA
+  def to_yaml
+    self.to_s
+  end
+end
+
+
diff --git a/config/locale_settings.yml b/config/locale_settings.yml
index 4a3fabd6a..2aaf6290e 100644
--- a/config/locale_settings.yml
+++ b/config/locale_settings.yml
@@ -11,6 +11,7 @@ available:
   el: "Ελληνικά"
   en: "English"
   en_shaw: "𐑦𐑙𐑤𐑦𐑖"
+  eo: "Esperanto"
   es: "Español"
   es-AR: "Castellano"
   es-CL: "Español Chileno"
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index a802f8959..dc9ca461c 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -4,9 +4,9 @@
 
 
 ar: 
-  _applications: "Applications"
+  _applications: "التطبيقات"
   _comments: "تعليقات"
-  _contacts: "Contacts"
+  _contacts: "جهات الاتصال"
   _home: "الرئيسية"
   _photos: "صور"
   _services: "خدمات"
@@ -26,6 +26,10 @@ ar:
           attributes: 
             from_id: 
               taken: "نسخة من طلب سابق"
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "لقد أعدت نشر هذه المشاركة بالفعل!"
         user: 
           attributes: 
             email: 
@@ -48,14 +52,14 @@ ar:
       add_to_aspect: "أضف إلى فئة"
       toggle: 
         few: "في %{count} فئات"
-        many: "في %{count} فئات"
-        one: "في %{count} فئات"
+        many: "في %{count} فئة"
+        one: "في فئة واحدة"
         other: "في %{count} فئات"
         zero: "أضف إلى فئة"
     destroy: 
       failure: "فشل في حذف عضو من الفئة"
       no_membership: "لم يتم إيجاد العضو المحدد في هذه الفئة"
-      success: "حذف العضو من الفئة بنجاح"
+      success: "حُذِفَ العضو من الفئة بنجاح"
   aspects: 
     add_to_aspect: 
       failure: "فشل في إضافة صديق إلى الفئة"
@@ -63,12 +67,12 @@ ar:
     aspect_contacts: 
       done_editing: "اتمام التغييرات"
     aspect_listings: 
-      add_an_aspect: "+ Add an aspect"
+      add_an_aspect: "+ أضف فئة جديدة"
     aspect_stream: 
-      commented_on: "commented on"
-      posted: "posted"
-      recently: "recently:"
-      stream: "Stream"
+      commented_on: "علق عليها"
+      posted: "أُرسِلت"
+      recently: "مؤخرًا:"
+      stream: "البث"
     contacts_not_visible: "رؤية عضو لآخر في هاته الفئة غير متاحة"
     contacts_visible: "رؤية عضو لآخر في هاته الفئة متاحة"
     create: 
@@ -95,22 +99,22 @@ ar:
       remove: "حذف"
     index: 
       cubbies: 
-        explanation: "Cubbi.es is the first Diaspora application under development."
-        heading: "Connect to Cubbi.es"
-        learn_more: "Learn more"
+        explanation: "Cubbi.es هو أول تطبيق تحت التطوير لديسبورا."
+        heading: "صِل حسابك بـ Cubbi.es"
+        learn_more: "اعرف المزيد"
       diaspora_id: 
-        content_1: "Your Diaspora ID is:"
-        content_2: "Give it to anyone and they'll be able to find you on Diaspora."
-        heading: "Diaspora ID"
-      handle_explanation: "هذا وسيط دياسبرا. مثل البريد الالكتروني, يمكنك منحه للأصدقاء حتى تستطيع التواصل معهم"
+        content_1: "وسيط ديسبورا خاصتك هو:"
+        content_2: "أعطه لأي شخص وسيتمكن من إيجادك على ديسبورا."
+        heading: "وسيط ديسبورا"
+      handle_explanation: "هذا وسيط دياسبرا. مثل البريد الالكتروني، يمكنك منحه للأصدقاء حتى تستطيع التواصل معهم."
       no_contacts: "لا أعضاء"
       people_sharing_with_you: "أعضاء يتشاركون معك"
       post_a_message: "انشر رسالة >>"
       services: 
-        content: "You can connect the following services to Diaspora:"
-        heading: "Connect Services"
-      tags_following: "Followed Tags"
-      your_aspects: "Your Aspects"
+        content: "يمكنك وصل حساب ديسبورا الخاص بك بالخدمات الآتية:"
+        heading: "صل حسابك بالخدمات"
+      tags_following: "الوسوم المتابعة"
+      your_aspects: "فئاتك"
     many: "%{count} فئات"
     move_contact: 
       error: "خطأ خلال تحريك عضو: %{inspect}"
@@ -120,17 +124,17 @@ ar:
       create: "أنشئ"
       name: "إسم"
     no_posts_message: 
-      start_talking: "لم تنشر أي رسالة بعد، إبدأ المحادثة"
-      try_adding_some_more_contacts: "Try adding some more contacts."
+      start_talking: "لم يتحدث أحد بعد!"
+      try_adding_some_more_contacts: "حاول إضافة المزيد من جهات الاتصال."
     one: "فئة"
     other: "%{count} فئات"
     seed: 
       family: "العائلة"
       work: "العمل"
     selected_contacts: 
-      manage_your_aspects: "Manage your aspects."
-      no_contacts: "You don't have any contacts here yet."
-      view_all_contacts: "View all contacts"
+      manage_your_aspects: "أَدِر فئاتك."
+      no_contacts: "لا تملك أية جهات اتصال هنا بعد."
+      view_all_contacts: "أظهر كل جهات الاتصال"
     show: 
       edit_aspect: "تحرير الفئة"
     update: 
@@ -139,12 +143,12 @@ ar:
     zero: "لا فئات"
   authorizations: 
     index: 
-      revoke_access: "Revoke Access"
+      revoke_access: "إلغاء الوصول"
   back: "عودة"
   bookmarklet: 
-    explanation: "%{link} من أي مكان بحفظ هذا الرابط في المفضلة"
-    explanation_link_text: "انشر على دياسبرا"
-    heading: "Diaspora Bookmarklet"
+    explanation: "%{link} انشر في ديسبورا من أي مكان بحفظ الرابط في مفضلتك/علاماتك"
+    explanation_link_text: "هذا الرابط"
+    heading: "زر المفضلة"
     post_something: "انشر شيئا على دياسبرا"
     post_success: "تم النشر, إغلاق"
   cancel: "إلغاء"
@@ -152,7 +156,7 @@ ar:
     few: "%{count} تعليقات"
     many: "%{count} تعليقات"
     new_comment: 
-      comment: "تعليق"
+      comment: "علِّق"
       commenting: "تعليق..."
     one: "1 تعليق"
     other: "%{count} تعليقات"
@@ -162,17 +166,17 @@ ar:
       failure: "فشل في إنشاء الإتصال"
     few: "%{count} أعضاء"
     index: 
-      add_a_new_aspect: "Add a new aspect"
-      all_contacts: "All Contacts"
-      edit_aspect: "Edit %{name}"
-      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
-      my_contacts: "My Contacts"
-      no_contacts: "No contacts."
-      only_sharing_with_me: "Only sharing with me"
-      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
-      start_a_conversation: "Start a conversation"
-      title: "Contacts"
-      your_contacts: "Your Contacts"
+      add_a_new_aspect: "أضف فئة جديدة"
+      all_contacts: "كل جهات الاتصال"
+      edit_aspect: "عدل %{name}"
+      many_people_are_you_sure: "هل أنت متأكد من بدأ هذه المحادثة الخاصة مع أكثر من %{suggested_limit} جهات اتصال? من الأفضل إرسال مشاركة لهذه الفئة لتتصل بهم."
+      my_contacts: "جهات الاتصال الخاصة بي"
+      no_contacts: "لا توجد جهات اتصال."
+      only_sharing_with_me: "فقط يتشاركون معي"
+      remove_person_from_aspect: "احذف %{person_name} من \"%{aspect_name}\""
+      start_a_conversation: "ابدأ محادثة"
+      title: "جهات الاتصال"
+      your_contacts: "جهات الاتصال"
     many: "%{count} أعضاء"
     one: "1 عضو"
     other: "%{count} أعضاء"
@@ -190,7 +194,7 @@ ar:
         many: "%{count} رسائل جديدة"
         one: "1 رسالة جديدة"
         other: "%{count} رسائل جديدة"
-        zero: "لايوجد رسائل جديدة"
+        zero: "لا يوجد رسائل جديدة"
     index: 
       create_a_new_message: "إنشاء رسالة جديدة"
       inbox: "الوارد"
@@ -199,7 +203,7 @@ ar:
       no_conversation_selected: "لم تحدد أية محادثة"
       no_messages: "لا يوجد رسائل"
     new: 
-      abandon_changes: "Abandon changes?"
+      abandon_changes: "أأتجاهل التغييرات؟"
       send: "إرسال"
       subject: "العنوان"
       to: "إلى"
@@ -208,9 +212,9 @@ ar:
       reply: "رد"
   date: 
     formats: 
-      birthday: "%B %d"
-      birthday_with_year: "%B %d %Y"
-      fullmonth_day: "%B %d"
+      birthday: "%d %B"
+      birthday_with_year: "%d %B %Y"
+      fullmonth_day: "%d %B"
   delete: "حذف"
   email: "بريد إلكتروني"
   error_messages: 
@@ -218,7 +222,7 @@ ar:
       correct_the_following_errors_and_try_again: ".صحح الأخطاء التالية ثم أعد المحاولة"
       invalid_fields: "مدخلات غير صحيحة"
   fill_me_out: "إملأ"
-  find_people: "Find people"
+  find_people: "ابحث عن الناس"
   hide: "إخفاء"
   home: 
     show: 
@@ -247,7 +251,7 @@ ar:
     edit: 
       sign_up: "تسجيل"
     new: 
-      already_invited: "تم دعوته مسبقا"
+      already_invited: "لم يقبل هؤلاء الأشخاص دعوتك:"
       aspect: "فئة"
       comma_seperated_plz: "يمكن إدخال أكثر من بريد إلكتروني واحد باستعمال علامة التوقف فاصلة, بين كل بريد وآخر"
       if_they_accept_info: "إذا قبلوا دعوتك ، سيتم إضافتهم إلى الفئة التي دعوتهم إليها"
@@ -261,34 +265,41 @@ ar:
     application: 
       have_a_problem: "واجهت مشكلة؟ اعثر على حل هنا"
       powered_by: "بدعم DIASPORA*"
-      public_feed: "فيد دياسبرا العام لـ %{name}"
+      public_feed: "ملقم دياسبرا العام لـ %{name}"
       toggle: "التحول إلى الموقع الخاص بالهواتف المحمولة"
       whats_new: "ما الجديد؟"
       your_aspects: "فئاتك"
     header: 
-      admin: "admin"
+      admin: "المشرف"
       blog: "مدونة"
       code: "شيفرة"
       login: "لُج"
       logout: "خروج"
       profile: "الصفحة الشخصية"
+      recent_notifications: "آخر التنبيهات"
       settings: "إعدادات"
-      view_all: "View all"
+      view_all: "أظهر الكل"
   likes: 
     likes: 
       people_dislike_this: 
-        few: "%{count} أشخاص لم يعجبهم هذا"
-        many: "%{count} أشخاص لم يعجبهم هذا"
-        one: "1 لم يعجبه هذا"
-        other: "%{count} أشخاص لم يعجبهم هذا"
+        few: "%{count} كرهوا هذا"
+        many: "%{count} كرهوا هذا"
+        one: "%{count} كره هذا"
+        other: "%{count} كرهو هذا"
         zero: "لا أحد يكره هذا"
       people_like_this: 
-        few: "%{count} أشخاص يعجبهم هذا"
-        many: "%{count} أشخاص يعجبهم هذا"
-        one: "1 أعجبه هذا"
-        other: "%{count} أشخاص أعجبهم هذا"
-        zero: "لا أحد أحب هذا"
-  limited: "Limited"
+        few: "%{count} إعجابًا"
+        many: "%{count} إعجابات"
+        one: "%{count} أعجبه هذا"
+        other: "%{count} إعجابًا"
+        zero: "لا إعجابات"
+      people_like_this_comment: 
+        few: "أعجب %{count} أشخاص هذا"
+        many: "أعجب %{count} شخص هذا"
+        one: "أعجب هذا %{count} شخصًا واحدًا"
+        other: "أعجب %{count} شخص بهذا"
+        zero: "لا أحد أعجبه هذا"
+  limited: "محدود"
   more: "أكثر"
   next: "التالي"
   no_results: "لا نتائج موجودة"
@@ -352,7 +363,7 @@ ar:
       one: "%{actors} أشار إليك في منشور محذوف."
       other: "%{actors} أشاروا إليك في منشور محذوف."
       zero: "%{actors} أشار إليك في منشور محذوف."
-    post: "منشور"
+    post: "مشاركة"
     private_message: 
       few: "%{actors} راسلوك."
       many: "%{actors} راسلوك."
@@ -366,39 +377,31 @@ ar:
       other: "%{actors} بدؤوا المشاركة معك."
       zero: "%{actors} بدأ المشاركة معك."
   notifier: 
-    also_commented: 
-      commented: "علق أيضا على مشاركة %{post_author}:"
-      sign_in: "لُج لمشاهدته"
-      subject: "%{name} على أيضا على منشور %{post_author}."
+    click_here: "اضغط هنا"
     comment_on_post: 
-      commented: "علق على مشاركتك"
-      sign_in: "لُج لمشاهدته"
-      subject: "%{name} علق على مشاركتك"
-    diaspora: "البريد الآلي لدياسبرا"
+      reply: "رُد أو اعرض مشاركة %{name} >"
+    confirm_email: 
+      click_link: "لتفعيل عنوان بريدك الإلكتروني الجديد %{unconfirmed_email}, من فضلك اضغط على هذا الرابط:"
+      subject: "من فضلك، فَعِّل عنوان بريدك الإلكتروني الجديد %{unconfirmed_email}"
+    email_sent_by_diaspora: "أُرسِلَت هذه الرسالة بواسطة ديسبورا.  إذا أردت إيقاف مثل هذه الرسالة، "
     hello: "مرحبا %{name}!"
     liked: 
-      liked: "%{name} أعجبه منشورك: "
-      sign_in: "لج لمشاهدته"
-      subject: "%{name} أعجبه منشورك"
-    love: "كل الود,"
-    manage_your_email_settings: "إدارة إعدادات بريدك الإلكتروني"
+      liked: "%{name} أعجبه منشورك"
+      view_post: "اعرض المشاركة >"
     mentioned: 
       mentioned: "قام بذكرك في مشاركة:"
-      sign_in: "لُج لمشاهدته"
       subject: "%{name} قام بذكرك في دياسبرا"
     private_message: 
-      message_subject: "العنوان: %{subject}"
-      private_message: "راسلك برسالة خاصة:"
-      sign_in: "لُج لمشاهدته"
-      subject: "%{name} راسلك برسالة خاصة في دياسبرا"
+      reply_to_or_view: "رُد أو اعرض هذه المحادثة >"
     single_admin: 
       admin: "إدارة دياسبرا"
       subject: "رسالة من إدارة دياسبرا:"
     started_sharing: 
       sharing: "بدأ المشاركة معك!"
-      sign_in: "لُج هنا"
       subject: "%{name} بدأ المشاركة معك بدياسبرا"
+      view_profile: "اعرض ملف %{name} الشخصي"
     thanks: "شكرا,"
+    to_change_your_notification_settings: "لتعديل إعدادات التنبيهات خاصتك"
   ok: "حسنا"
   or: "أو"
   password: "كلمة المرور"
@@ -492,32 +495,32 @@ ar:
       post_hidden: "تم إخفاء مشاركة %{name}"
   posts: 
     show: 
-      destroy: "Delete"
-      not_found: "Sorry, we couldn't find that post."
-      permalink: "permalink"
+      destroy: "احذف"
+      not_found: "عفوًا، لم نجد هذه المشاركة."
+      permalink: "رابط دائم"
   previous: "السابق"
   profile: "الصفحة الشخصية"
   profiles: 
     edit: 
       allow_search: "السماح للجميع بالبحث عنك من خلال دياسبرا"
-      edit_profile: "تحرير الصفحة الشخصية"
+      edit_profile: "حَرِّر صفحتك الشخصية"
       first_name: "الإسم"
       last_name: "اللقب"
       update_profile: "تحديث الصفحة الشخصية"
       your_bio: "سيرتك الشخصية"
-      your_birthday: "تاريخ الميلاد"
+      your_birthday: "تاريخ مولدك"
       your_gender: "الجنس"
       your_location: "المكان"
-      your_name: "إسمك"
+      your_name: "اسمك"
       your_photo: "صورتك"
       your_private_profile: "صفحتك الخاصة"
       your_public_profile: "صفحتك العامة"
-      your_tags: "أنت: في 5 #tags"
-      your_tags_placeholder: "مثال: #diaspora #ironing #kittens #music"
+      your_tags: "صف نفسك في 5 كلمات"
+      your_tags_placeholder: "مثال: #دياسبرا #إسلام #عرب #موسيقى #فن"
     update: 
       failed: "فشل في تحديث حسابك الشخصي"
       updated: "تم تحديث حسابك الشخصي"
-  public: "Public"
+  public: "عام"
   registrations: 
     closed: "التسجيلات مغلقة على هذه المنصة"
     create: 
@@ -530,7 +533,7 @@ ar:
       unhappy: "غير راض?"
       update: "تحديث"
     new: 
-      enter_email: "أدخل بريد إلكتروني"
+      enter_email: "أدخل عنوان بريد إلكتروني"
       enter_password: "أدخل كلمة مرور"
       enter_password_again: "أعد إدخال كلمة المرور"
       enter_username: "اختر معرف (فقط حروف, أرقام, و الإشارات الخطية)"
@@ -556,6 +559,19 @@ ar:
       manage_within: "إدارة الأعضاء"
     new_request_to_person: 
       sent: "إرسال!"
+  reshares: 
+    create: 
+      failure: "هناك خطأ ما في إعادة نشر هذه المشاركة."
+    reshare: 
+      deleted: "لقد حذف المؤلف مشاركته الأصلية."
+      reshare: 
+        few: "أُعِيدَ نشرها %{count} مرات"
+        many: "أُعِيدَ نشرها %{count} مرة"
+        one: "أُعِيدَ نشرها مرة واحدة"
+        other: "أُعِيدَ نشرها %{count} مرة"
+        zero: "أَعِد النشر"
+      reshare_confirmation: "هل أُعِد نشر مشاركة %{author} - ومحتواها: %{text} ?"
+      show_original: "اعرض الأصلية"
   search: "بحث"
   services: 
     create: 
@@ -574,13 +590,13 @@ ar:
       invite_your_friends_from: "دعوة أصدقائك من %{service}"
       not_connected: "غير متصل"
     index: 
-      connect_to_facebook: "إتصل بـ فسبوك"
-      connect_to_tumblr: "Connect to Tumblr"
+      connect_to_facebook: "إتصل بـ فيسبوك"
+      connect_to_tumblr: "صل حسابك بـ Tumblr"
       connect_to_twitter: "إتصل بتويتر"
       disconnect: "فصل الإتصال"
       edit_services: "تعديل الخدمات"
       logged_in_as: "متصل بحساب"
-      no_services: "You have not connected any services yet."
+      no_services: "لم تَصِل أي خدمة بحسابك بعد."
       really_disconnect: "فصل إتصال %{service}?"
     inviter: 
       click_link_to_accept_invitation: "إضغط على هذا الرابط لقبول دعوتك"
@@ -591,9 +607,9 @@ ar:
   settings: "إعدادات"
   shared: 
     add_contact: 
-      add_new_contact: "Add a new contact"
-      create_request: "ابحث باستخدام وسيط دياسبرا"
-      diaspora_handle: "وسيط دياسبرا"
+      add_new_contact: "أضف جهة اتصال جديدة"
+      create_request: "ابحث باستخدام وسيط ديسبورا"
+      diaspora_handle: "ديسبورا@فرع.org"
       enter_a_diaspora_username: "أدخل وسيط دياسبرا:"
       know_email: "تعرف بريد الإلكتروني؟ يجدر بك دعوتهم"
       your_diaspora_username_is: "وسيط دياسبورا خاصتك هو: %{diaspora_handle}"
@@ -603,12 +619,12 @@ ar:
       logged_in_as: "ولوج بـ %{name}"
       your_aspects: "الفئات خاصتك"
     invitations: 
-      by_email: "عبر البريد الإلكتروني"
+      by_email: "عبر رسالة بالبريد الإلكتروني"
       dont_have_now: "لا تملك دعوات حاليا، لكنها قادمة قريبا"
       from_facebook: "عبر فسبوك"
-      invitations_left: "(%{count} متبقية)"
+      invitations_left: "%{count} متبقية"
       invite_someone: "دعوة شخص"
-      invite_your_friends: "دعوات لأصدقائك"
+      invite_your_friends: "ادعُ أصدقاءك"
       invites: "دعوات"
       invites_closed: "الدعوات غير متاحة على هذه المنصة حاليا"
     notification: 
@@ -622,7 +638,7 @@ ar:
       all: "الجميع"
       all_contacts: "جميع الفئات"
       click_to_share_with: "إضغط للمشاركة مع: "
-      discard_post: "Discard post"
+      discard_post: "تجاهل المشاركة"
       make_public: "عممها"
       post_a_message_to: "انشر رسالة إلى %{aspect}"
       posting: "نشر..."
@@ -630,17 +646,17 @@ ar:
       publishing_to: "نشر إلى: "
       share: "مشاركة"
       share_with: "مشاركة مع %{aspect}"
-      upload_photos: "Upload photos"
-      whats_on_your_mind: "ما يجول في خاطرك؟"
+      upload_photos: "ارفع صور"
+      whats_on_your_mind: "ماذا يجول في خاطرك؟"
     reshare: 
-      reshare: "إعادة مشاركة"
+      reshare: "أَعِد النشر"
     stream_element: 
       dislike: "لم يعجبني"
       like: "أعجبني"
-      shared_with: "Shared with: %{aspect_names}"
+      shared_with: "مُشَارك مع: %{aspect_names}"
       unlike: "إلغاء إعجابي"
       via: "بواسطة %{link}"
-      viewable_to_anyone: "This post is viewable to anyone on the web"
+      viewable_to_anyone: "يستطيع أي شخص على الشابكة رؤية هذه المشاركة."
   status_messages: 
     create: 
       success: "ذكرت بنجاح: %{names}"
@@ -657,29 +673,29 @@ ar:
       other: "رجاء لا تتجاوز في منشوراتك حد %{count} حرفا"
       zero: "رجاء لا تتجاوز في منشوراتك حد %{count} حرفا"
   stream_helper: 
-    hide_comments: "إخفاء التعليقات"
-    show_more_comments: "Show %{number} more comments"
+    hide_comments: "أخْفِ كل التعليقات"
+    show_more_comments: "أظهر %{number} من التعليقات"
   tag_followings: 
     create: 
-      failure: "Failed to follow: #%{name}"
-      success: "Successfully following: #%{name}"
+      failure: "فشل في متابعة: #%{name}"
+      success: "بدأت بنجاح متابعة: #%{name}"
     destroy: 
-      failure: "Failed to stop following: #%{name}"
-      success: "Successfully stopped following: #%{name}"
+      failure: "فشل في إيقاف متابعة: #%{name}"
+      success: "أوقف بنجاح متابعة: #%{name}"
   tags: 
     show: 
-      follow: "Follow #%{tag}"
-      following: "Following #%{tag}"
+      follow: "تابع #%{tag}"
+      following: "أنت تتابع #%{tag}"
       nobody_talking: "لا أحد يتكلم %{tag} بعد"
       people_tagged_with: "أشخاص tagged بـ %{tag}"
       posts_tagged_with: "رسائل tagged بـ #%{tag}"
-      stop_following: "Stop Following #%{tag}"
+      stop_following: "أوقف متابعة #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "اتصل بـ Cubbi.es"
-      connecting_is_simple: "صِل حساب دياسبرا خاصتك عن طريق ملأ حقلين بـصفحة حساب Cubbi.es خاصتك."
+      connecting_is_simple: "اتصال حسابك في ديسبورا بسيط! فقط أدخل وسيط ديسبورا الخاص بك (<b>%{diaspora_id}</b>) من <a href='%{href_link}'>صفحة إعداداتك</a> في Cubbies ثم اضغط \"اتصِل\"."
       daniels_account: "حساب دياسبرا الخاص بدانييل"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
+      log_in_with_diaspora_is_comming: "قريبًا جدًا .. ستتمكن من الاتصال بتطبيق جديد دون إنشاء حساب منفصل عن حسابك في ديسبورا."
       love_to_try: "نحبذ أن تجربه."
       making_the_connection: "جارِ الإتصال"
       screenshot_explanation: "%{link1}.  هذا الـ cubby خاص بـ %{link2}."
@@ -690,11 +706,15 @@ ar:
   undo: "تراجع؟"
   username: "معرف"
   users: 
-    destroy: "تم إغلاق الحساب بنجاح"
+    confirm_email: 
+      email_confirmed: "فُعِّل البريد الإلكتروني %{email} بنجاح"
+      email_not_confirmed: "لا يمكن تفعيل البريد الإلكتروني، أهو رابط خاطئ؟"
+    destroy: "أُغلِق حسابك بنجاح. قد يستغرق إغلاق الحساب تمامًا 20 دقيقة. شكرًا لتجريبك ديسبورا."
     edit: 
       also_commented: "...علق أحدهم على منشور مراسلك"
       change: "تغيير"
-      change_language: "تغيير اللعة"
+      change_email: "عدِّل البريد الإلكتروني"
+      change_language: "تغيير اللغة"
       change_password: "تغيير كلمة المرور"
       close_account: "غلق الحساب"
       comment_on_post: "...علق أحدهم على رسالتك"
@@ -702,6 +722,7 @@ ar:
       download_photos: "تحميل صوري"
       download_xml: "تحميل xml خاصتي"
       edit_account: "تعديل الحساب"
+      email_awaiting_confirmation: "لقد أرسلنا إليك رابط تفعيل إلى %{unconfirmed_email}. وحتى تتبع هذا الرابط وتفعل العنوان الجديد، سنستمر في استخدام بريدك الأساسي %{email}."
       export_data: "تصدير البيانات"
       liked: "...أعجب أحدهم بمنشورك"
       mentioned: "...تم ذكرك في رسالة"
@@ -710,7 +731,7 @@ ar:
       receive_email_notifications: "استقبال تنبيهات عبر البريد الإلكتروني؟"
       started_sharing: "...بدأ أحدهم المشاركة معك؟"
       your_email: "بريدك الإلكتروني"
-      your_handle: "وسيط دياسبرا خاصتك"
+      your_handle: "وسيط ديسبورا الخاص بك"
     getting_started: 
       connect_on_diaspora: "الإتصال بدياسبورا"
       connect_services: "الإتصال بخدماتك"
@@ -731,10 +752,12 @@ ar:
       does_not_exist: "هذا المستخدم %{username} غير موجود"
     update: 
       email_notifications_changed: "فشل تغيير اللغة"
-      language_changed: "تم تغيير اللغة"
+      language_changed: "غُيِّرت اللغة بنجاح"
       language_not_changed: "فشل تغيير اللغة"
-      password_changed: "تم تغيير كلمة المرور"
+      password_changed: "غُيِّرت كلمة المرور بنجاح. يمكنك الولوج بكلمة سرك الجديدة."
       password_not_changed: "فشل تغيير كلمة المرور"
+      unconfirmed_email_changed: "عُدَِل البريد الإلكتروني. بحاجة إلى التفعيل."
+      unconfirmed_email_not_changed: "فشل تعديل البريد الإلكتروني"
   webfinger: 
     fetch_failed: "فشل تحميل webfinger الحساب لـ %{profile_url}"
     hcard_fetch_failed: "خطأ خلال تحميل hcard الخاص بـ #{@account}"
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index 278be5064..224aac056 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -26,6 +26,10 @@ bg:
           attributes: 
             from_id: 
               taken: "is a duplicate of a pre-existing request."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ bg:
       login: "вписване"
       logout: "отписване"
       profile: "профил"
+      recent_notifications: "Recent notifications"
       settings: "настройки"
       view_all: "Показване на всички"
   likes: 
@@ -288,6 +293,12 @@ bg:
         one: "харесана %{count} път"
         other: "харесана %{count} пъти"
         zero: "не е харесана"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Ограничено"
   more: "Още"
   next: "следваща"
@@ -366,39 +377,31 @@ bg:
       other: "%{actors} започна да споделя с вас."
       zero: "%{actors} започна да споделя с вас."
   notifier: 
-    also_commented: 
-      commented: "също коментира публикацията на %{post_author}:"
-      sign_in: "Впишете се, за да я прегледате."
-      subject: "%{name} коментира публикация на %{post_author}."
+    click_here: "click here"
     comment_on_post: 
-      commented: "добави коментар на ваша публикация:"
-      sign_in: "Впишете се, за да го прегледате."
-      subject: "%{name} коментира ваша публикация."
-    diaspora: "системата за ел. поща на Diaspora"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Здравейте %{name}!"
     liked: 
       liked: "току-що %{name} хареса вашата публикация:"
-      sign_in: "Впишете се, за да я прегледате"
-      subject: "току-що %{name} хареса ваша публикация"
-    love: "с уважение,"
-    manage_your_email_settings: "променяне на настройките за известяване"
+      view_post: "View post >"
     mentioned: 
       mentioned: "ви спомена в публикация:"
-      sign_in: "Впишете се, за да я прегледате."
       subject: "%{name} ви спомена в Diaspora*"
     private_message: 
-      message_subject: "Тема: %{subject}"
-      private_message: "ви изпрати лично съобщение:"
-      sign_in: "Впишете се, за да го прегледате."
-      subject: "%{name} ви изпрати лично съобщение в Diaspora*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "Вашият администратор на Diaspora"
       subject: "Съобщение относно акаунта ви в Diaspora:"
     started_sharing: 
       sharing: "започна да споделя с вас!"
-      sign_in: "Впишете се тук"
       subject: "%{name} започна да споделя с вас в Diaspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "Благодаря,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "Добре"
   or: "или"
   password: "Парола"
@@ -512,7 +515,7 @@ bg:
       your_photo: "Снимка"
       your_private_profile: "Вашият личен профил"
       your_public_profile: "Вашият публичен профил"
-      your_tags: "Опишете се с до 5 #думи"
+      your_tags: "Опишете се с до 5 #думи (тагове)"
       your_tags_placeholder: "например: #България #diaspora #фитнес #музика #котки"
     update: 
       failed: "Профилът не бе обновен"
@@ -556,6 +559,19 @@ bg:
       manage_within: "Manage contacts within"
     new_request_to_person: 
       sent: "изпратена!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Търсене"
   services: 
     create: 
@@ -690,10 +706,14 @@ bg:
   undo: "Отмяна?"
   username: "Потребителско име"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Акаунтът ви в Diaspora е заключен. Затварянето може да отнеме до 20 минути. Благодарим ви, че пробвахте Diaspora."
     edit: 
       also_commented: "...някой коментира публикация на ваш контакт?"
       change: "Промяна"
+      change_email: "Change E-Mail"
       change_language: "Промяна на езика"
       change_password: "Промяна на паролата"
       close_account: "Затваряне на акаунта"
@@ -702,6 +722,7 @@ bg:
       download_photos: "снимките ви"
       download_xml: "данните ви (XML формат)"
       edit_account: "Редактиране на акаунта"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Сваляне на..."
       liked: "...някой хареса ваша публикация?"
       mentioned: "...бъдете споменат в публикация?"
@@ -735,6 +756,8 @@ bg:
       language_not_changed: "Езикът не бе променен"
       password_changed: "Паролата е променена. Можете да се впишете с новата парола."
       password_not_changed: "Паролата не бе променена"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for %{account}"
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index 574f7d767..6b9916fca 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -26,6 +26,10 @@ br:
           attributes: 
             from_id: 
               taken: "is a duplicate of a pre-existing request."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ br:
       login: "login"
       logout: "mont kuit"
       profile: "patrom"
+      recent_notifications: "Recent notifications"
       settings: "dibaboù"
       view_all: "View all"
   likes: 
@@ -288,6 +293,12 @@ br:
         one: "1 den zo bet plijet ganti"
         other: "%{count} den zo bet plijet ganti"
         zero: "den ebet zo bet plijet ganti"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Muioc'h"
   next: "next"
@@ -366,39 +377,31 @@ br:
       other: "%{actors} started sharing with you."
       zero: "%{actors} started sharing with you."
   notifier: 
-    also_commented: 
-      commented: "has also commented on %{post_author}'s post:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has also commented on %{post_author}'s post."
+    click_here: "click here"
     comment_on_post: 
-      commented: "has commented on your post:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has commented on your post."
-    diaspora: "the diaspora email robot"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Hello %{name}!"
     liked: 
       liked: "%{name} has just liked your post: "
-      sign_in: "Sign to view it"
-      subject: "%{name} has just liked your post"
-    love: "love,"
-    manage_your_email_settings: "manage your email settings"
+      view_post: "View post >"
     mentioned: 
       mentioned: "mentioned you in a post:"
-      sign_in: "Sign in to view it."
       subject: "%{name} has mentioned you on Diaspora*"
     private_message: 
-      message_subject: "Danvez: %{subject}"
-      private_message: "en/hi deus kaset deoc'h ur gemennadenn prevez:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} en/hi deus kaset deoc'h ur gemennadenn prevez gant Diaspora*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "Your Diaspora administrator"
       subject: "A message about your Diaspora account:"
     started_sharing: 
       sharing: "has started sharing with you!"
-      sign_in: "Sign in here"
       subject: "%{name} has started sharing with you on Diaspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "Thanks,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "MAT EO"
   or: "pe"
   password: "Ger-kuzh"
@@ -556,6 +559,19 @@ br:
       manage_within: "Manage contacts within"
     new_request_to_person: 
       sent: "kaset!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Klask"
   services: 
     create: 
@@ -690,10 +706,14 @@ br:
   undo: "Mont war-gil?"
   username: "Anv-implijer"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Ar c'hont zo bet klozet mat."
     edit: 
       also_commented: "...someone also comments on your contact's post?"
       change: "Cheñch"
+      change_email: "Change E-Mail"
       change_language: "Cheñch Yezh"
       change_password: "Cheñch ar Ger-Kuzh"
       close_account: "Klozañ ar C'hont"
@@ -702,6 +722,7 @@ br:
       download_photos: "download my photos"
       download_xml: "download my xml"
       edit_account: "Edit account"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Export Data"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
@@ -735,6 +756,8 @@ br:
       language_not_changed: "Kudennoù zo bet o cheñch ar yezh"
       password_changed: "Ger-Kuzh Cheñchet"
       password_not_changed: "Ur gudenn zo bet o cheñch ar ger-kuzh"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for %{account}"
diff --git a/config/locales/diaspora/ca.yml b/config/locales/diaspora/ca.yml
index 3f45cc9b0..d38c26b9d 100644
--- a/config/locales/diaspora/ca.yml
+++ b/config/locales/diaspora/ca.yml
@@ -66,6 +66,10 @@ ca:
           attributes:
             from_id:
               taken: "és un duplicat d'una petició ja existent."
+        reshare:
+          attributes:
+            root_guid:
+              taken: "Ja heu tornat a compartir aquesta publicació!"
 
 
   error_messages:
@@ -149,6 +153,7 @@ ca:
     index:
       your_aspects: "Els vostres aspectes"
       tags_following: "Etiquetes que seguiu"
+      no_tags: "Cap etiqueta"
       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"
       post_a_message: "publica un missatge »"
@@ -294,7 +299,7 @@ ca:
       send_an_invitation: "Envia una invitació"
       send_invitation: "Envia una invitació"
       aspect: "Aspecte"
-      already_invited: "Ja convidat"
+      already_invited: "Les persones següents no han acceptat la vostra invitació:"
       resend: "Torna-la a enviar"
     check_token:
       not_found: "No s'ha trobat el testimoni de la invitació"
@@ -312,6 +317,7 @@ ca:
       code: "codi"
       admin: "administra"
       view_all: "Mostra-ho tot"
+      recent_notifications: "Notificacions recents"
     application:
       powered_by: "FUNCIONA AMB DIÀSPORA*"
       whats_new: "què és nou?"
@@ -329,6 +335,12 @@ ca:
         few: "li agrada a %{count} persones"
         many: "li agrada a %{count} persones"
         other: "li agrada a %{count} persones"
+      people_like_this_comment:
+        zero: "a cap persona li agrada"
+        one: "li agrada a 1 persona"
+        few: "li agrada a %{count} persones"
+        many: "li agrada a %{count} persones"
+        other: "li agrada a %{count} persones"
       people_dislike_this:
         zero: "a cap persona li desagrada"
         one: "li desagrada a 1 persona"
@@ -413,39 +425,31 @@ ca:
 
 
   notifier:
+    email_sent_by_diaspora: "Aquest correu electrònic ha sigut enviat per Diàspora. Si voleu deixar de rebre correus com aquest,"
+    click_here: "feu clic aquí"
     hello: "Hola %{name}!"
-    love: "Amb amor,"
     thanks: "Gràcies,"
-    diaspora: "el robot del correu del Diàspora"
-    manage_your_email_settings: "gestioneu els paràmetres del correu"
+    to_change_your_notification_settings: "per canviar els paràmetres del correu"
     single_admin:
       subject: "Un missatge sobre el vostre compte de Diàspora:"
       admin: "L'administrador de Diàspora"
     started_sharing:
       subject: "%{name} ha començat a compartir amb vosaltres al Diàspora*"
       sharing: "ha començat a compartir amb vosaltres!"
-      sign_in: "Identifiqueu-vos aquí"
+      view_profile: "Visualitza el perfil de %{name}"
     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."
+      reply: "Contesta o visualitza la publicació de %{name} >"
     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."
+      reply_to_or_view: "Contesta o visualitza aquesta conversa >"
     liked:
-      subject: "A %{name} li ha agradat la vostra publicació"
-      liked: "A %{name} li ha agradat la vostra publicació: "
-      sign_in: "Entreu per a veure-ho"
+      liked: "A %{name} li ha agradat la vostra publicació"
+      view_post: "visualitza la publicació >"
+    confirm_email:
+      subject: "Activeu la vostra adreça de correu electrònic %{unconfirmed_email}"
+      click_link: "Per activar la vostra adreça de correu electrònic %{unconfirmed_email}, seguiu aquest enllaç:"
 
 
   people:
@@ -612,6 +616,21 @@ ca:
         other: "%{count} peticions noves!"
 
 
+  reshares:
+    reshare:
+      reshare:
+        zero: "Torna a compartir"
+        one: "1 vegada tornat a compartir"
+        few: "%{count} vegades tornat a compartir"
+        many: "%{count} vegades tornat a compatir"
+        other: "%{count} vegades tornat a compatir"
+      show_original: "Mostra l'original"
+      reshare_confirmation: "Voleu tornat a compartir %{author} - %{text}?"
+      deleted: "Publicació original suprimida per l'autor."
+    create:
+      failure: "S'ha produït un error en tornar a compartir aquesta publicació."
+
+
   services:
     index:
       logged_in_as: "s'ha autenticat com a"
@@ -767,6 +786,7 @@ També és la millor forma de coŀleccionar fotos en línia."
       close_account: "Tanca el compte"
       change_language: "Canvia la llengua"
       change_password: "Canvia la contrasenya"
+      change_email: "Canvia el correu electrònic"
       new_password: "Contrasenya nova"
       current_password: "Contrasenya actual"
       download_xml: "baixa el meu XML"
@@ -782,6 +802,7 @@ També és la millor forma de coŀleccionar fotos en línia."
       private_message: "… rebeu un missatge privat?"
       liked: "… a algú li agradi una publicació vostra?"
       change: "Canvia"
+      email_awaiting_confirmation: "Us hem enviat un enllaç d'activació per a %{unconfirmed_email}. Fins que no seguiu aquest enllaç i activeu l'adreça nova, continuarem emprant la vostra adreça original %{email}."
     destroy: "S'ha blocat el vostre compte. Trigarem fins a 20 minuts en tancar el compte. Moltes gràcies per provar Diàspora."
     getting_started:
       welcome: "Benvingut/da al Diàspora!"
@@ -806,8 +827,13 @@ la contrasenya nova."
       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"
+      unconfirmed_email_changed: "S'ha canviat l'adreça de correu electrònic. Necessita activació."
+      unconfirmed_email_not_changed: "Ha fallat el canvi d'adreça de correu electrònic"
     public:
       does_not_exist: "L'usuari %{username} no existeix!"
+    confirm_email:
+      email_confirmed: "S'ha activat l'adreça de correu %{email}"
+      email_not_confirmed: "No s'ha pogut activar l'adreça de correu electrònic. Heu emprat un enllaç erroni?"
 
 
   webfinger:
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index eb7c79d11..b0ff7a901 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -26,6 +26,10 @@ cs:
           attributes: 
             from_id: 
               taken: "je duplicitní k dříve existující žádosti."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -247,7 +251,7 @@ cs:
     edit: 
       sign_up: "sign_up"
     new: 
-      already_invited: "Již byl pozván"
+      already_invited: "Následující lidé nepřijali vaše pozvání:"
       aspect: "Aspekt"
       comma_seperated_plz: "Můžete zadat více emailových adres oddělených čárkami."
       if_they_accept_info: "pokud přijmou, budou přidáni do aspektu, do kterého byly pozváni."
@@ -272,6 +276,7 @@ cs:
       login: "přihlásit"
       logout: "odhlásit"
       profile: "profil"
+      recent_notifications: "Recent notifications"
       settings: "nastavení"
       view_all: "Zobrazit všechno"
   likes: 
@@ -288,6 +293,12 @@ cs:
         one: "1 osobě se to líbí"
         other: "%{count} lidem se to líbí"
         zero: "žádná kladná hodnocení"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Omezený"
   more: "Více"
   next: "další"
@@ -366,39 +377,31 @@ cs:
       other: "%{actors} s vámi začali sdílet."
       zero: "%{actors} s vámi začali sdílet."
   notifier: 
-    also_commented: 
-      commented: "také komentoval příspěvek od %{post_author}:"
-      sign_in: "Přihlašte se pro zobrazení."
-      subject: "%{name} se také vyjádřil k vašemu %{post_author} příspěvku."
+    click_here: "click here"
     comment_on_post: 
-      commented: "komentoval váš příspěvek:"
-      sign_in: "Přihlašte se pro zobrazení."
-      subject: "%{name} komentoval váš příspěvek."
-    diaspora: "diaspora email robot"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Vítej %{name}!"
     liked: 
       liked: "%{name} si právě oblíbil váš příspěvek: "
-      sign_in: "Přihlaste se pro zobrazení"
-      subject: "%{name} si právě oblíbil váš příspěvek"
-    love: "s láskou,"
-    manage_your_email_settings: "spravovat nastavení emailu"
+      view_post: "View post >"
     mentioned: 
       mentioned: "zmínil jste v příspěvku:"
-      sign_in: "Přihlaste se pro zobrazení."
       subject: "%{name} vás zmínil na Diaspoře*"
     private_message: 
-      message_subject: "Předmět: %{subject}"
-      private_message: "vám poslal soukromou zprávu:"
-      sign_in: "Přihlaste se pro zobrazení."
-      subject: "%{name} vám poslal soukromou zprávu na Diasporu*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "Váš Diaspora administrátor"
       subject: "Zpráva o vašem účtu na Diaspoře:"
     started_sharing: 
       sharing: "s vámi začal sdílet!"
-      sign_in: "Přihlaste se zde"
       subject: "%{name} s vámi začal sdílet na Diaspoře*"
+      view_profile: "View %{name}'s profile"
     thanks: "Díky,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "OK"
   or: "nebo"
   password: "Heslo"
@@ -556,6 +559,19 @@ cs:
       manage_within: "Spravovat kontakty uvnitř"
     new_request_to_person: 
       sent: "odesláno!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Hledat"
   services: 
     create: 
@@ -690,10 +706,14 @@ cs:
   undo: "Vrátit?"
   username: "Uživatelské jméno"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Váš účet byl uzamčen. Dokončení uzavření vašeho účtu může trvat 20 minut. Děkujeme vám za vyzkoušení Diaspory."
     edit: 
       also_commented: "...někdo komentoval váš příspěvek?"
       change: "Změnit"
+      change_email: "Change E-Mail"
       change_language: "Změnit jazyk"
       change_password: "Změnit heslo"
       close_account: "Uzavřít účet"
@@ -702,6 +722,7 @@ cs:
       download_photos: "stáhnout moje fotky"
       download_xml: "stáhnout moje xml"
       edit_account: "Upravit účet"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Exportovat data"
       liked: "...někomu se líbí váš příspěvek?"
       mentioned: "...jste zmíněn v příspěvku?"
@@ -735,6 +756,8 @@ cs:
       language_not_changed: "Změna jazyka selhala"
       password_changed: "Heslo bylo změněno. Nyní se můžete přihlásit s novým heslem."
       password_not_changed: "Změna hesla selhala"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "Selhalo načtení webfinger profilu pro %{profile_url}"
     hcard_fetch_failed: "Nepodařilo se získat hcard pro %{@account}"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index ba53e1fc6..11b9cd7b9 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -26,6 +26,10 @@ cy:
           attributes: 
             from_id: 
               taken: "is a duplicate of a pre-existing request."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ cy:
       login: "login"
       logout: "logout"
       profile: "profile"
+      recent_notifications: "Recent notifications"
       settings: "settings"
       view_all: "View all"
   likes: 
@@ -288,6 +293,12 @@ cy:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "More"
   next: "next"
@@ -366,39 +377,31 @@ cy:
       other: "%{actors} started sharing with you."
       zero: "%{actors} started sharing with you."
   notifier: 
-    also_commented: 
-      commented: "has also commented on %{post_author}'s post:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has also commented."
+    click_here: "click here"
     comment_on_post: 
-      commented: "has commented on your post!"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has commented on your post."
-    diaspora: "the diaspora email robot"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Hello %{name}!"
     liked: 
       liked: "%{name} has just liked your post: "
-      sign_in: "Sign to view it"
-      subject: "%{name} has just liked your post"
-    love: "love,"
-    manage_your_email_settings: "manage your email settings"
+      view_post: "View post >"
     mentioned: 
       mentioned: "mentioned you in a post:"
-      sign_in: "Sign in to view it."
       subject: "%{name} has mentioned you on Diaspora*"
     private_message: 
-      message_subject: "Subject: %{subject}"
-      private_message: "has sent you a private message:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "Your Diaspora administrator"
       subject: "A message from your Diaspora administrator:"
     started_sharing: 
       sharing: "has started sharing with you!"
-      sign_in: "Sign in here"
       subject: "%{name} has started sharing with you on Diaspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "Thanks,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "OK"
   or: "or"
   password: "Password"
@@ -556,6 +559,19 @@ cy:
       manage_within: "Manage contacts within"
     new_request_to_person: 
       sent: "sent!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Search"
   services: 
     create: 
@@ -690,10 +706,14 @@ cy:
   undo: "Undo?"
   username: "Username"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Account successfully closed."
     edit: 
       also_commented: "...someone also comments on your contact's post?"
       change: "Change"
+      change_email: "Change E-Mail"
       change_language: "Change Language"
       change_password: "Change Password"
       close_account: "Close Account"
@@ -702,6 +722,7 @@ cy:
       download_photos: "download my photos"
       download_xml: "download my xml"
       edit_account: "Edit account"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Export Data"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
@@ -735,6 +756,8 @@ cy:
       language_not_changed: "Language Change Failed"
       password_changed: "Password Changed"
       password_not_changed: "Password Change Failed"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index cdd89e3b4..6fe723fe7 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -26,6 +26,10 @@ da:
           attributes: 
             from_id: 
               taken: "er en kopi af en allerede eksisterende forespørgsel."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ da:
       login: "Log ind"
       logout: "Log ud"
       profile: "profil"
+      recent_notifications: "Recent notifications"
       settings: "indstillinger"
       view_all: "View all"
   likes: 
@@ -288,6 +293,12 @@ da:
         one: "1 person kunne lide det"
         other: "%{count} personer kunne lide det"
         zero: "ingen personer kunne lide det"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Mere"
   next: "Næste"
@@ -366,39 +377,31 @@ da:
       other: "%{actors} started sharing with you."
       zero: "%{actors} started sharing with you."
   notifier: 
-    also_commented: 
-      commented: "har også kommenteret på %{post_author}'s post:"
-      sign_in: "Log in for at se det."
-      subject: "%{name} har også kommenteret på %{post_author}'s post."
+    click_here: "click here"
     comment_on_post: 
-      commented: "har kommenteret på din post:"
-      sign_in: "Log in for at se det."
-      subject: "%{name} har kommenteret på din post!"
-    diaspora: "Diaspora e-mail robotten"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Hej %{name}!"
     liked: 
       liked: "%{name} har lige syntes om din post: "
-      sign_in: "Sign to view it"
-      subject: "%{name} synes godt om din post"
-    love: "Hilsen,"
-    manage_your_email_settings: "rediger dine email indstillinger"
+      view_post: "View post >"
     mentioned: 
       mentioned: "omtalte dig i en post:"
-      sign_in: "Log in for at se det."
       subject: "%{name} har omtalt dig på Diaspora*"
     private_message: 
-      message_subject: "Emne: %{subject}"
-      private_message: "har sendt dig en privat besked:"
-      sign_in: "Log in for at se."
-      subject: "%{name} har sendt dig en privat meddelelse på Diaspora*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "Din Diaspora administrator"
       subject: "En besked fra din Diaspora administrator:"
     started_sharing: 
       sharing: "er begyndt at dele med dig!"
-      sign_in: "Log in her"
       subject: "%{name} er begyndt at dele med dig på Diaspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "Tak,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "OK"
   or: "eller"
   password: "Adgangskode"
@@ -556,6 +559,19 @@ da:
       manage_within: "Administrér kontaktpersoner indenfor"
     new_request_to_person: 
       sent: "afsendt!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Søg"
   services: 
     create: 
@@ -690,10 +706,14 @@ da:
   undo: "Fortryd?"
   username: "Brugernavn"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Kontoen er nu lukket."
     edit: 
       also_commented: "...en eller anden har også kommenteret på din kontakts post?"
       change: "Skift"
+      change_email: "Change E-Mail"
       change_language: "Skift sprog"
       change_password: "Skift adgangskode"
       close_account: "Luk konto"
@@ -702,6 +722,7 @@ da:
       download_photos: "Download mine billeder"
       download_xml: "Download min XML"
       edit_account: "Rediger konto"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Exportér data"
       liked: "...nogen synes godt om din post?"
       mentioned: "...du er nævnt i en post?"
@@ -735,6 +756,8 @@ da:
       language_not_changed: "Kunne ikke ændre sprog"
       password_changed: "Adgangskode ændret"
       password_not_changed: "Kunne ikke ændre adgangskode"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "kunne ikke hente webfinger profil for %{profile_url}"
     hcard_fetch_failed: "der opstod et problem i forbindelse med hentning af hcard for %{account}"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 59f99ee2e..ce9541c2b 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -26,6 +26,10 @@ de:
           attributes: 
             from_id: 
               taken: "wurde schon einmal angefordert."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "Due hast diesen Beitrag bereits wiederholt!"
         user: 
           attributes: 
             email: 
@@ -109,7 +113,7 @@ de:
       services: 
         content: "Du kannst die folgenden Dienste mit Diaspora verbinden:"
         heading: "Verbinde Dienste"
-      tags_following: "Followed Tags"
+      tags_following: "Tags, denen ich folge"
       your_aspects: "Deine Aspekte"
     many: "%{count} Aspekte"
     move_contact: 
@@ -272,6 +276,7 @@ de:
       login: "Anmelden"
       logout: "Abmelden"
       profile: "Profil"
+      recent_notifications: "Kürzliche Benachrichtigungen"
       settings: "Einstellungen"
       view_all: "alle anzeigen"
   likes: 
@@ -288,6 +293,12 @@ de:
         one: "1 Person gefällt das"
         other: "%{count} Personen gefällt das"
         zero: "Keinem gefällt das"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Begrenzt"
   more: "Mehr"
   next: "Nächste"
@@ -366,39 +377,31 @@ de:
       other: "%{actors} haben angefangen mit dir zu teilen."
       zero: "Niemand hat angefangen mit dir zu teilen."
   notifier: 
-    also_commented: 
-      commented: "hat den Beitrag von %{post_author} ebenfalls kommentiert:"
-      sign_in: "Melde dich an, um ihn anzuzeigen."
-      subject: "%{name} hat den Beitrag von %{post_author} auch kommentiert."
+    click_here: "hier klicken"
     comment_on_post: 
-      commented: "hat deinen Beitrag kommentiert:"
-      sign_in: "Melde dich an, um ihn anzuzeigen."
-      subject: "%{name} hat deinen Beitrag kommentiert."
-    diaspora: "der Diaspora E-Mail-Roboter"
+      reply: "Antworte oder schau dir %{name}s Beitrag an >"
+    confirm_email: 
+      click_link: "Um deine neue E-Mail-Adresse %{unconfirmed_email} zu aktivieren, klicke bitte auf diesen Link:"
+      subject: "Bitte aktiviere deine neue E-Mail-Adresse %{unconfirmed_email}"
+    email_sent_by_diaspora: "Diese E-Mail wurde von Diaspora verschickt. Falls du solche E-Mails nicht mehr erhalten willst,"
     hello: "Hallo %{name}!"
     liked: 
-      liked: "%{name} gefällt dein Beitrag: "
-      sign_in: "Melde dich an um es zu sehen"
-      subject: "%{name} gefällt dein Beitrag"
-    love: "Gruß,"
-    manage_your_email_settings: "E-Mail  Einstellungen"
+      liked: "%{name} gefällt dein Beitrag"
+      view_post: "Beitrag betrachten >"
     mentioned: 
       mentioned: "hat dich in einem Beitrag erwähnt:"
-      sign_in: "Melde dich an um sie zu sehen."
       subject: "%{name} hat dich auf Diaspora* erwähnt"
     private_message: 
-      message_subject: "Betreff: %{subject}"
-      private_message: "hat dir eine Private Nachricht gesendet."
-      sign_in: "Melde dich an um sie Anzuschauen"
-      subject: "%{name} hat dir eine Private Nachricht bei Diaspora* gesendet"
+      reply_to_or_view: "Antworte oder sieh dir diese Unterhaltung an >"
     single_admin: 
       admin: "Dein Diaspora-Administrator"
       subject: "Eine Nachricht dein Diaspora*-Konto betreffend:"
     started_sharing: 
       sharing: "hat angefangen mit dir zu teilen!"
-      sign_in: "Hier anmelden"
-      subject: "Auf Diaspora* hat %{name} angefangen mit dir zu teilen"
+      subject: "%{name} hat angefangen auf Diaspora* mit dir zu teilen"
+      view_profile: "Schau dir %{name}s Profil an"
     thanks: "Danke,"
+    to_change_your_notification_settings: "um deine Benachrichtigungs-Einstellungen zu ändern"
   ok: "OK"
   or: "oder"
   password: "Passwort"
@@ -556,6 +559,19 @@ de:
       manage_within: "Kontakte verwalten in"
     new_request_to_person: 
       sent: "Gesendet!"
+  reshares: 
+    create: 
+      failure: "Ein Fehler trat beim Wiederholen dieses Beitrags auf."
+    reshare: 
+      deleted: "Originalbeitrag wurde vom Autor entfernt."
+      reshare: 
+        few: "%{count} Wiederholungen"
+        many: "%{count} Wiederholungen"
+        one: "1 Wiederholung"
+        other: "%{count} Wiederholungen"
+        zero: "Wiederholen"
+      reshare_confirmation: "%{author} - „%{text}“ wiederholen?"
+      show_original: "Original anzeigen"
   search: "Suche"
   services: 
     create: 
@@ -661,11 +677,11 @@ de:
     show_more_comments: "Zeige %{number} weitere Kommentare"
   tag_followings: 
     create: 
-      failure: "Failed to follow: #%{name}"
-      success: "Successfully following: #%{name}"
+      failure: "Fehler beim Folgen von: #%{name}"
+      success: "Du folgst nun: #%{name}"
     destroy: 
-      failure: "Failed to stop following: #%{name}"
-      success: "Successfully stopped following: #%{name}"
+      failure: "Fehler beim Beenden des Folgens von: #%{name}"
+      success: "Du folgst #%{name} nicht mehr"
   tags: 
     show: 
       follow: "#%{tag} folgen"
@@ -677,7 +693,7 @@ de:
   tokens: 
     show: 
       connect_to_cubbies: "Mit Cubbi.es verbinden"
-      connecting_is_simple: "Um dein Diaspora Konto zu verbinden, kopiere einfach die zwei Felder in deine Cubbi.es Kontoseite."
+      connecting_is_simple: "Dein Diaspora-Konto mit Cubbi.es zu verbinden ist einfach! Trage einfach deine Diaspora-ID in der Cubbi.es <a href='%{href_link}'>Einstellungenseite</a> ein und verbinde die Konten!"
       daniels_account: "Daniels Diaspora-Konto"
       log_in_with_diaspora_is_comming: "Schon bald wirst du in der Lage sein eine Verbindung zu einer neuen Anwendung herzustellen, ohne ein seperates Konto neben deinem Konto auf Diaspora anzulegen."
       love_to_try: "Es wäre toll wenn Du es ausprobieren würdest."
@@ -690,10 +706,14 @@ de:
   undo: "Rückgängig machen?"
   username: "Benutzername"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} wurde aktiviert"
+      email_not_confirmed: "Die E-Mail-Adresse konnte nicht aktiviert werden. Falscher Link?"
     destroy: "Dein Konto wurde gesperrt. Es kann 20 Minuten dauern, bis wir die Schließung deines Kontos abgeschlossen haben. Vielen Dank, dass du Diaspora ausprobiert hast."
     edit: 
       also_commented: "… jemand ebenfalls den Beitrag eines Kontaktes kommentiert hat?"
       change: "Ändern"
+      change_email: "E-Mail-Adresse ändern"
       change_language: "Sprache ändern"
       change_password: "Passwort ändern"
       close_account: "Konto schließen"
@@ -702,6 +722,7 @@ de:
       download_photos: "Fotos herunterladen"
       download_xml: "Daten herunterladen (XML)"
       edit_account: "Konto bearbeiten"
+      email_awaiting_confirmation: "Wir haben dir einen Aktivierungslink zu %{unconfirmed_email} geschickt. Solange du dem Link nicht gefolgt bist und die neue Adresse aktiviert hast, werden wir weiterhin deine ursprüngliche E-Mail-Adresse %{email} verwenden."
       export_data: "Daten exportieren"
       liked: "... wenn jemandem dein Beitrag gefällt?"
       mentioned: "… du in einem Beitrag erwähnt wirst?"
@@ -735,6 +756,8 @@ de:
       language_not_changed: "Ändern der Sprache fehlgeschlagen"
       password_changed: "Passwort geändert"
       password_not_changed: "Ändern des Passworts fehlgeschlagen"
+      unconfirmed_email_changed: "E-Mail-Adresse geändert. Braucht Aktivierung."
+      unconfirmed_email_not_changed: "E-Mail-Adressen-Änderung fehlgeschlagen"
   webfinger: 
     fetch_failed: "konnte Webfinger-Profil für %{profile_url} nicht laden"
     hcard_fetch_failed: "es gab Probleme beim Laden der hcard für %{account}"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 2d6c9818e..45287357b 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -26,6 +26,10 @@ el:
           attributes: 
             from_id: 
               taken: "είναι αντίγραφο ενός προϋπάρχοντος αιτήματος."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ el:
       login: "Είσοδος"
       logout: "αποσύνδεση"
       profile: "προφίλ"
+      recent_notifications: "Πρόσφατες ειδοποιήσεις"
       settings: "ρυθμίσεις"
       view_all: "Προβολή όλων"
   likes: 
@@ -288,6 +293,12 @@ el:
         one: "Αρέσει σε 1 άτομο"
         other: "Αρέσει σε %{count} άτομα"
         zero: "δεν αρέσει σε κανέναν"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Περιορισμένο"
   more: "Περισσότερα"
   next: "επόμενο"
@@ -366,39 +377,31 @@ el:
       other: "Οι χρήστες %{actors} άρχισαν να διαμοιράζονται μαζί σας."
       zero: "Οι χρήστες %{actors} άρχισαν να διαμοιράζονται μαζί σας."
   notifier: 
-    also_commented: 
-      commented: "σχολίασε επίσης τη δημοσίευση του χρήστη %{post_author} :"
-      sign_in: "Συνδεθείτε για να το δείτε."
-      subject: "Ο/Η %{name} επίσης σχολίασε τη δημοσίευση του χρήστη %{post_author}."
+    click_here: "πατήστε εδώ"
     comment_on_post: 
-      commented: "έχει σχολιάσει σε δημοσίευση σας:"
-      sign_in: "Συνδεθείτε για να το δείτε."
-      subject: "Ο χρήστης %{name} σχολίασε τη δημοσίευση σας."
-    diaspora: "το ρομποτάκι για τα email του δικτύου Diaspora.."
+      reply: "Απαντήστε ή δείτε τη δημοσίευση του χρήστη %{name} >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Γειά σου %{name}!"
     liked: 
       liked: "στο χρήστη %{name} αρέσει η δημοσίευση σας: "
-      sign_in: "Συνδεθείτε για να το δείτε"
-      subject: "στο χρήστη %{name} αρέσει η δημοσίευση σας"
-    love: "Με αγάπη,"
-    manage_your_email_settings: "διαχείριση των ρυθμίσεων ηλεκτρονικού ταχυδρομείου"
+      view_post: "View post >"
     mentioned: 
       mentioned: "αναφέρεται σε σας σε μια δημοσίευση:"
-      sign_in: "Συνδεθείτε για να το δείτε."
       subject: "Ο/Η %{name} σας αναφέρει στο Diaspora*"
     private_message: 
-      message_subject: "Θέμα: %{subject}"
-      private_message: "σας έστειλε ένα ιδιωτικό μήνυμα:"
-      sign_in: "Συνδεθείτε για να το δείτε."
-      subject: "Ο χρήστης %{name} σας έστειλε ένα ιδιωτικό μήνυμα στο Diaspora*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "Ο διαχειριστής Diaspora σας"
       subject: "Μήνυμα για τον Diaspora λογαριασμό σας:"
     started_sharing: 
       sharing: "ξεκίνησε το διαμοιρασμό μαζί σας!"
-      sign_in: "Συνδεθείτε εδώ"
       subject: "Ο χρήστης %{name} ξεκίνησε το διαμοιρασμό μαζί σας στο Diaspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "Ευχαριστώ,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "OK"
   or: "ή"
   password: "Κωδικός"
@@ -492,8 +495,8 @@ el:
       post_hidden: "Στη δημοσίευση του χρήστη %{name} έχει γίνει απόκρυψη."
   posts: 
     show: 
-      destroy: "Delete"
-      not_found: "Sorry, we couldn't find that post."
+      destroy: "Διαγραφή"
+      not_found: "Λυπούμαστε, δεν καταφέραμε να βρούμε αυτή τη δημοσίευση."
       permalink: "permalink"
   previous: "προηγούμενο"
   profile: "Προφίλ"
@@ -556,6 +559,19 @@ el:
       manage_within: "Διαχειριστείτε τις επαφές της πτυχής"
     new_request_to_person: 
       sent: "εστάλη!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Αναζήτηση"
   services: 
     create: 
@@ -690,10 +706,14 @@ el:
   undo: "Αναίρεση;"
   username: "Όνομα Χρήστη"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Ο λογαριασμός σας έχει κλειδωθεί. Μπορεί να διαρκέσει μέχρι και 20 λεπτά για να τελειώσουμε το κλείσιμο του λογαριασμού. Σας ευχαριστούμε που δοκιμάσατε το Diaspora."
     edit: 
       also_commented: "...κάποιος επίσης σχολίασε σε δημοσίευση επαφής σας;"
       change: "Αλλαγή"
+      change_email: "Change E-Mail"
       change_language: "Αλλαγή Γλώσσας"
       change_password: "Αλλαγή κωδικού πρόσβασης"
       close_account: "Κλείσιμο Λογαριασμού"
@@ -702,6 +722,7 @@ el:
       download_photos: "κατέβασε τις φωτογραφίες μου"
       download_xml: "κατέβασε το xml μου"
       edit_account: "Επεξεργασία λογαριασμού"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Εξαγωγή Δεδομένων"
       liked: "...σε κάποιον αρέσει η δημοσίευση σας;"
       mentioned: "...επισημανθήκατε σε μία φωτογραφία?"
@@ -735,6 +756,8 @@ el:
       language_not_changed: "Η αλλαγή γλώσσας απέτυχε"
       password_changed: "Ο κωδικός σας άλλαξε. Μπορείτε τώρα να συνδεθείτε με τον νέο κωδικό. "
       password_not_changed: "Η αλλαγή κωδικού απέτυχε"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 24a291caf..9e49d7e23 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -149,6 +149,7 @@ en:
     index: 
       your_aspects: "Your Aspects"
       tags_following: "Followed Tags"
+      no_tags: "No tags"
       handle_explanation: "This is your diaspora id. Like an email address, you can give this to people to reach you."
       no_contacts: "No contacts"
       post_a_message: "post a message >>"
@@ -318,6 +319,12 @@ en:
         few: "%{count} likes"
         many: "%{count} likes"
         other: "%{count} likes"
+      people_like_this_comment:
+        zero: "no likes"
+        one: "%{count} like"
+        few: "%{count} likes"
+        many: "%{count} likes"
+        other: "%{count} likes"
       people_dislike_this:
         zero: "no dislikes"
         one: "%{count} dislike"
@@ -423,8 +430,8 @@ en:
         liked: "%{name} just liked your post"
         view_post: "View post >"
     confirm_email:
-        subject: "Please activate your new e-mail address %{unconfirmed_email}"
-        click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+        subject: "Please activate your new email address %{unconfirmed_email}"
+        click_link: "To activate your new email address %{unconfirmed_email}, please click this link:"
   people:
     zero: "no people"
     one: "1 person"
@@ -546,7 +553,7 @@ en:
     new:
       sign_up: "Sign up"
       sign_up_for_diaspora: "Sign up for Diaspora"
-      enter_email: "Enter an e-mail"
+      enter_email: "Enter an email"
       enter_username: "Pick a username (only letters, numbers, and underscores)"
       enter_password: "Enter a password"
       enter_password_again: "Enter the same password as before"
@@ -585,11 +592,11 @@ en:
     reshare:
       reshare:
         zero: "Reshare"
-        one: "1 Reshare"
-        few: "%{count} Reshares"
-        many: "%{count} Reshares"
-        other: "%{count} Reshares"
-      show_original: "Show Original"
+        one: "1 reshare"
+        few: "%{count} reshares"
+        many: "%{count} reshares"
+        other: "%{count} reshares"
+      show_original: "Show original"
       reshare_confirmation: "Reshare %{author} - %{text}?"
       deleted: "Original post deleted by author."
     create:
@@ -656,7 +663,7 @@ en:
       invites_closed: "Invites are currently closed on this Diaspora pod"
       invite_your_friends: "Invite your friends"
       from_facebook: "From Facebook"
-      by_email: "By Email"
+      by_email: "By email"
     reshare:
       reshare: "Reshare"
     public_explain:
@@ -737,10 +744,10 @@ en:
     edit:
       export_data: "Export Data"
       close_account: "Close Account"
-      change_language: "Change Language"
-      change_password: "Change Password"
-      change_email: "Change E-Mail"
-      new_password: "New Password"
+      change_language: "Change language"
+      change_password: "Change password"
+      change_email: "Change email"
+      new_password: "New password"
       current_password: "Current password"
       download_xml: "download my xml"
       download_photos: "download my photos"
@@ -755,7 +762,7 @@ en:
       private_message: "...you receive a private message?"
       liked: "...someone likes your post?"
       change: "Change"
-      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Until you follow this link and activate the new address, we will continue to use your original address %{email}."
     destroy: "Your account has been locked.  It may take 20 minutes for us to finish closing your account.  Thank you for trying Diaspora."
     getting_started:
       welcome: "Welcome to Diaspora!"
@@ -774,18 +781,18 @@ en:
         find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
         skip: "Skip"
     update:
-      password_changed: "Password Changed.  You can now log in with your new password."
-      password_not_changed: "Password Change Failed"
-      language_changed: "Language Changed"
-      language_not_changed: "Language Change Failed"
+      password_changed: "Password changed.  You can now log in with your new password."
+      password_not_changed: "Password change failed"
+      language_changed: "Language changed"
+      language_not_changed: "Language change failed"
       email_notifications_changed: "Email notifications changed"
-      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
-      unconfirmed_email_not_changed: "E-Mail Change Failed"
+      unconfirmed_email_changed: "Email changed. Needs activation."
+      unconfirmed_email_not_changed: "Email change failed"
     public:
       does_not_exist: "User %{username} does not exist!"
     confirm_email:
-      email_confirmed: "E-Mail %{email} activated"
-      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
+      email_confirmed: "Email %{email} activated"
+      email_not_confirmed: "Email could not be activated. Wrong link?"
 
   webfinger:
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 3e51f1876..3cbb56f1c 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -6,7 +6,7 @@
 en_shaw: 
   _applications: "𐑨𐑐𐑤𐑦𐑒𐑱𐑖𐑩𐑯"
   _comments: "𐑒𐑪𐑥𐑩𐑯𐑑𐑕"
-  _contacts: "Contacts"
+  _contacts: "𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
   _home: "Home"
   _photos: "𐑓𐑴𐑑𐑴𐑟"
   _services: "Services"
@@ -26,6 +26,10 @@ en_shaw:
           attributes: 
             from_id: 
               taken: "𐑦𐑟 𐑛𐑵𐑐𐑤𐑦𐑒𐑩𐑑 𐑝 𐑩 𐑐𐑮𐑦-𐑧𐑜𐑟𐑦𐑕𐑑𐑦𐑙 𐑮𐑦𐑒𐑢𐑧𐑕𐑑."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -63,12 +67,12 @@ en_shaw:
     aspect_contacts: 
       done_editing: "𐑛𐑳𐑯 𐑧𐑛𐑦𐑑𐑦𐑙"
     aspect_listings: 
-      add_an_aspect: "+ Add an aspect"
+      add_an_aspect: "+ 𐑨𐑛 𐑩𐑯 𐑨𐑕𐑐𐑧𐑒𐑑"
     aspect_stream: 
-      commented_on: "commented on"
-      posted: "posted"
-      recently: "recently:"
-      stream: "Stream"
+      commented_on: "𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯"
+      posted: "𐑐𐑴𐑕𐑑𐑩𐑛"
+      recently: "𐑮𐑰𐑕𐑩𐑯𐑑𐑤𐑦:"
+      stream: "𐑕𐑑𐑮𐑰𐑥"
     contacts_not_visible: "𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕 𐑦𐑯 𐑞𐑦𐑕 𐑨𐑕𐑐𐑧𐑒𐑑 𐑢𐑦𐑤 𐑯𐑪𐑑 𐑚𐑰 𐑱𐑚𐑩𐑤 𐑑 𐑕𐑰 𐑰𐑗 𐑳𐑞𐑼."
     contacts_visible: "𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕 𐑦𐑯 𐑞𐑦𐑕 𐑨𐑕𐑐𐑧𐑒𐑑 𐑢𐑦𐑤 𐑯𐑪𐑑 𐑚𐑰 𐑱𐑚𐑩𐑤 𐑑 𐑕𐑰 𐑰𐑗 𐑳𐑞𐑼."
     create: 
@@ -99,18 +103,18 @@ en_shaw:
         heading: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑑 Cubbi.es"
         learn_more: "𐑤𐑻𐑯 𐑥𐑹"
       diaspora_id: 
-        content_1: "Your Diaspora ID is:"
-        content_2: "Give it to anyone and they'll be able to find you on Diaspora."
-        heading: "Diaspora ID"
-      handle_explanation: "𐑞𐑦𐑕 𐑦𐑟 𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑣𐑨𐑯𐑛𐑩𐑤. 𐑤𐑲𐑒 𐑩𐑯 𐑦-𐑥𐑱𐑤 𐑩𐑛𐑮𐑧𐑕, 𐑿 𐑒 𐑜𐑦𐑝 𐑞𐑦𐑕 𐑑 𐑐𐑰𐑐𐑩𐑤 𐑑 𐑮𐑰𐑗 𐑿."
+        content_1: "𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑲𐑛𐑧𐑯𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑯 𐑦𐑟:"
+        content_2: "𐑜𐑦𐑝 𐑦𐑑 𐑑 𐑧𐑯𐑦𐑢𐑩𐑯 𐑯 𐑞𐑱𐑤 𐑚𐑰 𐑱𐑚𐑩𐑤 𐑑 𐑓𐑲𐑯𐑛 𐑿 𐑪𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩."
+        heading: "·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑲𐑛𐑧𐑯𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯"
+      handle_explanation: "𐑞𐑦𐑕 𐑦𐑟 𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑲𐑛𐑧𐑯𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯. 𐑤𐑲𐑒 𐑩𐑯 𐑦-𐑥𐑱𐑤 𐑨𐑛𐑮𐑧𐑕, 𐑿 𐑒𐑨𐑯 𐑜𐑦𐑝 𐑞𐑦𐑕 𐑑 𐑐𐑰𐑐𐑩𐑤 𐑑 𐑮𐑰𐑗 𐑿."
       no_contacts: "𐑯𐑴 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
       people_sharing_with_you: "𐑐𐑰𐑐𐑩𐑤 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿"
       post_a_message: "𐑐𐑴𐑕𐑑 𐑩 𐑥𐑧𐑕𐑩𐑡 >>"
       services: 
-        content: "You can connect the following services to Diaspora:"
-        heading: "Connect Services"
-      tags_following: "Followed Tags"
-      your_aspects: "Your Aspects"
+        content: "𐑿 𐑒𐑨𐑯 𐑒𐑩𐑯𐑧𐑒𐑑 𐑞 𐑓𐑪𐑤𐑴𐑦𐑙 𐑕𐑻𐑝𐑦𐑕𐑩𐑟 𐑑 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩:"
+        heading: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑕𐑻𐑝𐑦𐑕𐑩𐑟"
+      tags_following: "𐑓𐑪𐑤𐑴𐑛 𐑑𐑨𐑜𐑟"
+      your_aspects: "𐑿𐑼 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
     many: "%{count} 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
     move_contact: 
       error: "𐑺𐑼 𐑥𐑵𐑝𐑦𐑙 𐑒𐑪𐑯𐑑𐑨𐑒𐑑: %{inspect}"
@@ -120,17 +124,17 @@ en_shaw:
       create: "𐑒𐑮𐑦𐑱𐑑"
       name: "𐑯𐑱𐑥"
     no_posts_message: 
-      start_talking: "𐑯𐑴𐑚𐑩𐑛𐑦 𐑣𐑨𐑟 𐑕𐑧𐑛 𐑨𐑯𐑦𐑔𐑦𐑙 𐑘𐑧𐑑.  𐑜𐑧𐑑 𐑞 𐑒𐑪𐑯𐑝𐑼𐑕𐑱𐑖𐑩𐑯 𐑕𐑑𐑸𐑑𐑩𐑛!"
-      try_adding_some_more_contacts: "Try adding some more contacts."
+      start_talking: "𐑯𐑴𐑚𐑩𐑛𐑦 𐑣𐑨𐑟 𐑕𐑧𐑛 𐑧𐑯𐑦𐑔𐑦𐑙 𐑘𐑧𐑑!"
+      try_adding_some_more_contacts: "𐑑𐑮𐑲 𐑨𐑛𐑦𐑙 𐑕𐑳𐑥 𐑥𐑹 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕."
     one: "1 𐑨𐑕𐑐𐑧𐑒𐑑"
     other: "%{count} 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
     seed: 
       family: "𐑓𐑨𐑥𐑦𐑤𐑦"
       work: "𐑢𐑻𐑒"
     selected_contacts: 
-      manage_your_aspects: "Manage your aspects."
-      no_contacts: "You don't have any contacts here yet."
-      view_all_contacts: "View all contacts"
+      manage_your_aspects: "𐑥𐑨𐑯𐑩𐑡 𐑿𐑼 𐑨𐑕𐑐𐑧𐑒𐑑𐑕."
+      no_contacts: "𐑿 𐑛𐑴𐑯𐑑 𐑣𐑨𐑝 𐑧𐑯𐑦 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕 𐑣𐑽 𐑘𐑧𐑑."
+      view_all_contacts: "𐑝𐑿 𐑷𐑤 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
     show: 
       edit_aspect: "𐑧𐑛𐑦𐑑 𐑨𐑕𐑐𐑧𐑒𐑑"
     update: 
@@ -144,7 +148,7 @@ en_shaw:
   bookmarklet: 
     explanation: "𐑐𐑴𐑕𐑑 𐑑 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑓𐑮𐑳𐑥 𐑨𐑯𐑦𐑢𐑺 𐑚𐑲 𐑚𐑫𐑒𐑥𐑸𐑒𐑦𐑙 %{link}."
     explanation_link_text: "𐑞𐑦𐑕 𐑤𐑦𐑙𐑒"
-    heading: "·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑚𐑫𐑒𐑥𐑸𐑒𐑤𐑧𐑑"
+    heading: "𐑚𐑫𐑒𐑥𐑸𐑒𐑤𐑧𐑑"
     post_something: "𐑐𐑴𐑕𐑑 𐑕𐑳𐑥𐑔𐑦𐑙 𐑑 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩"
     post_success: "𐑐𐑴𐑕𐑑𐑩𐑛! 𐑒𐑤𐑴𐑟𐑦𐑙!"
   cancel: "𐑒𐑨𐑯𐑕𐑩𐑤"
@@ -164,13 +168,13 @@ en_shaw:
     index: 
       add_a_new_aspect: "𐑨𐑛 𐑯𐑿 𐑨𐑕𐑐𐑧𐑒𐑑"
       all_contacts: "𐑷𐑤 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
-      edit_aspect: "Edit %{name}"
-      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
+      edit_aspect: "𐑧𐑛𐑦𐑑 %{name}"
+      many_people_are_you_sure: "𐑸 𐑿 𐑖𐑻 𐑿 𐑢𐑳𐑯𐑑 𐑑 𐑕𐑑𐑸𐑑 𐑩 𐑐𐑮𐑲𐑝𐑩𐑑 𐑒𐑪𐑯𐑝𐑼𐑕𐑱𐑖𐑩𐑯 𐑢𐑦𐑞 𐑥𐑹 𐑞𐑨𐑯 %{suggested_limit} 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕? 𐑐𐑴𐑕𐑑𐑦𐑙 𐑑 𐑞𐑦𐑕 𐑨𐑕𐑐𐑧𐑒𐑑 𐑥𐑱 𐑚𐑰 𐑩 𐑚𐑧𐑑𐑼 𐑢𐑱 𐑑 𐑒𐑪𐑯𐑑𐑨𐑒𐑑 𐑞𐑧𐑥."
       my_contacts: "𐑥𐑲 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
       no_contacts: "𐑯𐑴 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕."
       only_sharing_with_me: "𐑴𐑯𐑤𐑦 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑥𐑰"
       remove_person_from_aspect: "𐑮𐑦𐑥𐑵𐑝 %{person_name} 𐑓𐑮𐑳𐑥 \"%{aspect_name}\""
-      start_a_conversation: "Start a conversation"
+      start_a_conversation: "𐑕𐑑𐑸𐑑 𐑩 𐑒𐑪𐑯𐑝𐑼𐑕𐑱𐑖𐑩𐑯"
       title: "𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
       your_contacts: "𐑿𐑼 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
     many: "%{count} 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
@@ -199,7 +203,7 @@ en_shaw:
       no_conversation_selected: "𐑯𐑴 𐑒𐑪𐑯𐑝𐑼𐑕𐑱𐑖𐑩𐑯 𐑕𐑩𐑤𐑧𐑒𐑑𐑩𐑛"
       no_messages: "𐑯𐑴 𐑥𐑧𐑕𐑩𐑡𐑩𐑟"
     new: 
-      abandon_changes: "Abandon changes?"
+      abandon_changes: "𐑩𐑚𐑨𐑯𐑛𐑩𐑯 𐑗𐑱𐑯𐑡𐑩𐑟?"
       send: "𐑕𐑧𐑯𐑛"
       subject: "𐑕𐑳𐑚𐑡𐑧𐑒𐑑"
       to: "𐑑"
@@ -218,7 +222,7 @@ en_shaw:
       correct_the_following_errors_and_try_again: "𐑒𐑩𐑮𐑧𐑒𐑑 𐑞 𐑓𐑪𐑤𐑴𐑦𐑙 𐑺𐑼𐑟 𐑯 𐑑𐑮𐑲 𐑩𐑜𐑧𐑯."
       invalid_fields: "𐑦𐑯𐑝𐑨𐑤𐑦𐑛 𐑓𐑰𐑤𐑛𐑟"
   fill_me_out: "𐑓𐑦𐑤 𐑥𐑰 𐑬𐑑"
-  find_people: "Find people"
+  find_people: "𐑓𐑲𐑯𐑛 𐑐𐑰𐑐𐑩𐑤"
   hide: "𐑣𐑲𐑛"
   home: 
     show: 
@@ -247,7 +251,7 @@ en_shaw:
     edit: 
       sign_up: "𐑕𐑲𐑯_𐑳𐑐"
     new: 
-      already_invited: "𐑷𐑤𐑮𐑧𐑛𐑦 𐑦𐑯𐑝𐑲𐑑𐑩𐑛"
+      already_invited: "𐑞 𐑓𐑪𐑤𐑴𐑦𐑙 𐑐𐑰𐑐𐑩𐑤 𐑣𐑨𐑝 𐑯𐑪𐑑 𐑩𐑒𐑕𐑧𐑐𐑑𐑩𐑛 𐑿𐑼 𐑦𐑯𐑝𐑦𐑑𐑱𐑖𐑩𐑯:"
       aspect: "𐑨𐑕𐑐𐑧𐑒𐑑"
       comma_seperated_plz: "𐑿 𐑒𐑨𐑯 𐑧𐑯𐑑𐑼 𐑥𐑫𐑤𐑑𐑦𐑐𐑩𐑤 𐑦-𐑥𐑱𐑤 𐑩𐑛𐑮𐑧𐑕𐑩𐑟 𐑕𐑧𐑐𐑼𐑱𐑑𐑩𐑛 𐑚𐑲 𐑒𐑪𐑥𐑩𐑟."
       if_they_accept_info: "𐑦𐑓 𐑞𐑱 𐑩𐑒𐑕𐑧𐑐𐑑, 𐑞𐑱 𐑢𐑦𐑤 𐑚𐑰 𐑨𐑛𐑩𐑛 𐑑 𐑞 𐑨𐑕𐑐𐑧𐑒𐑑 𐑿 𐑦𐑯𐑝𐑲𐑑𐑩𐑛 𐑞𐑧𐑥."
@@ -272,8 +276,9 @@ en_shaw:
       login: "𐑤𐑪𐑜 𐑦𐑯"
       logout: "𐑤𐑪𐑜 𐑬𐑑"
       profile: "𐑐𐑮𐑴𐑓𐑲𐑤"
+      recent_notifications: "Recent notifications"
       settings: "𐑕𐑧𐑑𐑦𐑙𐑟"
-      view_all: "View all"
+      view_all: "𐑝𐑿 𐑷𐑤"
   likes: 
     likes: 
       people_dislike_this: 
@@ -288,7 +293,13 @@ en_shaw:
         one: "%{count} 𐑤𐑲𐑒"
         other: "%{count} 𐑤𐑲𐑒𐑕"
         zero: "𐑯𐑴 𐑤𐑲𐑒𐑕"
-  limited: "Limited"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
+  limited: "𐑤𐑦𐑥𐑦𐑑𐑩𐑛"
   more: "𐑥𐑹"
   next: "𐑯𐑧𐑒𐑕𐑑"
   no_results: "𐑯𐑴 𐑮𐑦𐑟𐑫𐑤𐑑𐑕 𐑓𐑬𐑯𐑛"
@@ -366,39 +377,31 @@ en_shaw:
       other: "%{actors} 𐑕𐑑𐑸𐑑𐑩𐑛 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿."
       zero: "%{actors} 𐑕𐑑𐑸𐑑𐑩𐑛 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿."
   notifier: 
-    also_commented: 
-      commented: "𐑣𐑨𐑟 𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 %{post_author}𐑟 𐑐𐑴𐑕𐑑:"
-      sign_in: "𐑕𐑲𐑯 𐑦𐑯 𐑑 𐑝𐑿 𐑦𐑑."
-      subject: "%{name}(e)k ere iruzkindu du %{post_author}(r)en mezua."
+    click_here: "click here"
     comment_on_post: 
-      commented: "𐑣𐑨𐑟 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑿𐑼 𐑐𐑴𐑕𐑑:"
-      sign_in: "𐑕𐑲𐑯 𐑦𐑯 𐑑 𐑝𐑿 𐑦𐑑."
-      subject: "%{name} 𐑣𐑨𐑟 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑿𐑼 𐑐𐑴𐑕𐑑."
-    diaspora: "𐑞 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑦-𐑥𐑱𐑤 𐑮𐑴𐑚𐑪𐑑"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "𐑣𐑧𐑤𐑴 %{name}!"
     liked: 
       liked: "%{name} 𐑣𐑨𐑟 𐑡𐑳𐑕𐑑 𐑤𐑲𐑒𐑑 𐑿𐑼 𐑐𐑴𐑕𐑑: "
-      sign_in: "𐑕𐑲𐑯 𐑦𐑯 𐑑 𐑝𐑿 𐑦𐑑"
-      subject: "%{name} 𐑣𐑨𐑟 𐑡𐑳𐑕𐑑 𐑤𐑲𐑒𐑑 𐑿𐑼 𐑐𐑴𐑕𐑑"
-    love: "𐑤𐑳𐑝,"
-    manage_your_email_settings: "𐑥𐑨𐑯𐑩𐑡 𐑿𐑼 𐑦-𐑥𐑱𐑤 𐑕𐑧𐑑𐑦𐑙𐑟"
+      view_post: "View post >"
     mentioned: 
       mentioned: "𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩 𐑐𐑴𐑕𐑑:"
-      sign_in: "𐑕𐑲𐑯 𐑦𐑯 𐑑 𐑝𐑿 𐑦𐑑."
       subject: "%{name} 𐑣𐑨𐑟 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑪𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩*"
     private_message: 
-      message_subject: "𐑕𐑳𐑚𐑡𐑧𐑒𐑑: %{subject}"
-      private_message: "𐑣𐑨𐑟 𐑕𐑧𐑯𐑑 𐑿 𐑩 𐑐𐑮𐑲𐑝𐑩𐑑 𐑥𐑧𐑕𐑩𐑡:"
-      sign_in: "𐑕𐑲𐑯 𐑦𐑯 𐑑 𐑝𐑿 𐑦𐑑."
-      subject: "%{name} 𐑣𐑨𐑟 𐑕𐑧𐑯𐑑 𐑿 𐑩 𐑐𐑮𐑲𐑝𐑩𐑑 𐑥𐑧𐑕𐑩𐑡 𐑪𐑯 *𐑛𐑦𐑨𐑕𐑐𐑹𐑩"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑨𐑛𐑥𐑦𐑯𐑦𐑕𐑑𐑮𐑱𐑑𐑼"
       subject: "𐑩 𐑥𐑧𐑕𐑩𐑡 𐑑 𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑩𐑒𐑬𐑯𐑑:"
     started_sharing: 
       sharing: "𐑣𐑨𐑟 𐑕𐑑𐑸𐑑𐑩𐑛 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿!"
-      sign_in: "𐑕𐑲𐑯 𐑦𐑯 𐑣𐑽"
       subject: "%{name} 𐑣𐑨𐑟 𐑕𐑑𐑸𐑑𐑩𐑛 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑪𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩*"
+      view_profile: "View %{name}'s profile"
     thanks: "𐑔𐑱𐑙𐑒𐑕,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "𐑴𐑒𐑱"
   or: "𐑹"
   password: "Password"
@@ -492,9 +495,9 @@ en_shaw:
       post_hidden: "%{name}𐑟 𐑐𐑴𐑕𐑑 𐑣𐑨𐑟 𐑚𐑧𐑯 𐑣𐑦𐑛𐑩𐑯."
   posts: 
     show: 
-      destroy: "Delete"
-      not_found: "Sorry, we couldn't find that post."
-      permalink: "permalink"
+      destroy: "𐑛𐑦𐑤𐑰𐑑"
+      not_found: "𐑕𐑪𐑮𐑦, 𐑢𐑰 𐑒𐑫𐑛𐑯𐑑 𐑓𐑲𐑯𐑛 𐑞𐑨𐑑 𐑐𐑴𐑕𐑑."
+      permalink: "𐑐𐑻𐑥𐑩𐑤𐑦𐑙𐑒"
   previous: "𐑐𐑮𐑰𐑝𐑾𐑕"
   profile: "𐑐𐑮𐑴𐑓𐑲𐑤"
   profiles: 
@@ -517,7 +520,7 @@ en_shaw:
     update: 
       failed: "𐑓𐑱𐑤𐑛 𐑑 𐑳𐑐𐑛𐑱𐑑 𐑐𐑮𐑴𐑓𐑲𐑤"
       updated: "𐑐𐑮𐑴𐑓𐑲𐑤 𐑳𐑐𐑛𐑱𐑑𐑩𐑛"
-  public: "Public"
+  public: "𐑐𐑳𐑚𐑤𐑦𐑒"
   registrations: 
     closed: "𐑕𐑲𐑯𐑩𐑐𐑕 𐑸 𐑒𐑤𐑴𐑟𐑛 𐑪𐑯 𐑞𐑦𐑕 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑐𐑪𐑛."
     create: 
@@ -556,6 +559,19 @@ en_shaw:
       manage_within: "𐑥𐑨𐑯𐑩𐑡 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕 𐑢𐑦𐑞𐑦𐑯"
     new_request_to_person: 
       sent: "𐑕𐑧𐑯𐑑!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "𐑕𐑻𐑗"
   services: 
     create: 
@@ -580,7 +596,7 @@ en_shaw:
       disconnect: "𐑛𐑦𐑕𐑒𐑩𐑯𐑧𐑒𐑑"
       edit_services: "𐑧𐑛𐑦𐑑 𐑕𐑻𐑝𐑦𐑕𐑩𐑟"
       logged_in_as: "𐑤𐑪𐑜𐑛 𐑦𐑯 𐑨𐑟"
-      no_services: "You have not connected any services yet."
+      no_services: "𐑿 𐑣𐑨𐑝 𐑯𐑪𐑑 𐑒𐑩𐑯𐑧𐑒𐑑𐑩𐑛 𐑑 𐑧𐑯𐑦 𐑕𐑻𐑝𐑦𐑕𐑩𐑟 𐑘𐑧𐑑."
       really_disconnect: "𐑛𐑦𐑕𐑒𐑩𐑯𐑧𐑒𐑑 %{service}?"
     inviter: 
       click_link_to_accept_invitation: "𐑒𐑤𐑦𐑒 𐑞𐑦𐑕 𐑤𐑦𐑙𐑒 𐑑 𐑩𐑒𐑕𐑧𐑐𐑑 𐑿𐑼 𐑦𐑯𐑝𐑦𐑑𐑱𐑖𐑩𐑯"
@@ -592,7 +608,7 @@ en_shaw:
   shared: 
     add_contact: 
       add_new_contact: "𐑨𐑛 𐑯𐑿 𐑒𐑪𐑯𐑑𐑨𐑒𐑑"
-      create_request: "𐑓𐑲𐑯𐑛 𐑚𐑲 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑣𐑨𐑯𐑛𐑩𐑤"
+      create_request: "𐑓𐑲𐑯𐑛 𐑚𐑲·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑲𐑛𐑧𐑯𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "𐑧𐑯𐑑𐑼 𐑩 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑿𐑟𐑼𐑯𐑱𐑥:"
       know_email: "𐑯𐑴 𐑞𐑺 𐑦-𐑥𐑱𐑤 𐑩𐑛𐑮𐑧𐑕? 𐑿 𐑖𐑫𐑛 𐑦𐑯𐑝𐑲𐑑 𐑞𐑧𐑥"
@@ -622,7 +638,7 @@ en_shaw:
       all: "𐑷𐑤"
       all_contacts: "𐑷𐑤 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
       click_to_share_with: "𐑒𐑤𐑦𐑒 𐑑 𐑖𐑺 𐑢𐑦𐑞:"
-      discard_post: "Discard post"
+      discard_post: "𐑛𐑦𐑕𐑒𐑸𐑛 𐑐𐑴𐑕𐑑"
       make_public: "𐑥𐑱𐑒 𐑐𐑳𐑚𐑤𐑦𐑒"
       post_a_message_to: "𐑐𐑴𐑕𐑑 𐑩 𐑥𐑧𐑕𐑩𐑡 𐑑 %{aspect}"
       posting: "𐑐𐑴𐑕𐑑𐑦𐑙..."
@@ -630,17 +646,17 @@ en_shaw:
       publishing_to: "𐑐𐑳𐑚𐑤𐑦𐑖𐑦𐑙 𐑑: "
       share: "𐑖𐑺"
       share_with: "𐑖𐑺 𐑢𐑦𐑞 %{aspect}"
-      upload_photos: "Upload photos"
-      whats_on_your_mind: "𐑢𐑪𐑑𐑕 𐑪𐑯 𐑿𐑼 𐑥𐑲𐑯𐑛?"
+      upload_photos: "𐑳𐑐𐑤𐑴𐑛 𐑓𐑴𐑑𐑴𐑟"
+      whats_on_your_mind: "𐑢𐑳𐑑𐑕 𐑪𐑯 𐑿𐑼 𐑥𐑲𐑯𐑛?"
     reshare: 
       reshare: "𐑮𐑦𐑖𐑺"
     stream_element: 
       dislike: "𐑛𐑦𐑕𐑤𐑲𐑒"
       like: "𐑤𐑲𐑒"
-      shared_with: "Shared with: %{aspect_names}"
+      shared_with: "𐑖𐑺𐑛 𐑢𐑦𐑞: %{aspect_names}"
       unlike: "𐑩𐑯𐑤𐑲𐑒"
       via: "𐑝𐑾 %{link}"
-      viewable_to_anyone: "This post is viewable to anyone on the web"
+      viewable_to_anyone: "𐑞𐑦𐑕 𐑐𐑴𐑕𐑑 𐑦𐑟 𐑝𐑿𐑩𐑚𐑩𐑤 𐑑 𐑧𐑯𐑦𐑢𐑩𐑯 𐑪𐑯 𐑞 𐑢𐑧𐑚"
   status_messages: 
     create: 
       success: "𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑥𐑧𐑯𐑖𐑩𐑯𐑛: %{names}"
@@ -657,29 +673,29 @@ en_shaw:
       other: "𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼𐑟"
       zero: "𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼𐑟"
   stream_helper: 
-    hide_comments: "𐑣𐑲𐑛 𐑒𐑪𐑥𐑩𐑯𐑑𐑕"
-    show_more_comments: "Show %{number} more comments"
+    hide_comments: "𐑣𐑲𐑛 𐑷𐑤 𐑒𐑪𐑥𐑩𐑯𐑑𐑕"
+    show_more_comments: "𐑖𐑴 %{number} 𐑥𐑹 𐑒𐑪𐑥𐑩𐑯𐑑𐑕"
   tag_followings: 
     create: 
-      failure: "Failed to follow: #%{name}"
-      success: "Successfully following: #%{name}"
+      failure: "𐑓𐑱𐑤𐑛 𐑑 𐑓𐑪𐑤𐑴: #%{name}"
+      success: "𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑓𐑪𐑤𐑴𐑦𐑙: #%{name}"
     destroy: 
-      failure: "Failed to stop following: #%{name}"
-      success: "Successfully stopped following: #%{name}"
+      failure: "𐑓𐑱𐑤𐑛 𐑑 𐑕𐑑𐑪𐑐 𐑓𐑪𐑤𐑴𐑦𐑙: #%{name}"
+      success: "𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑕𐑑𐑪𐑐𐑑 𐑓𐑪𐑤𐑴𐑦𐑙: #%{name}"
   tags: 
     show: 
-      follow: "Follow #%{tag}"
-      following: "Following #%{tag}"
+      follow: "𐑓𐑪𐑤𐑴 #%{tag}"
+      following: "𐑓𐑪𐑤𐑴𐑦𐑙 #%{tag}"
       nobody_talking: "𐑯𐑴𐑚𐑩𐑛𐑦 𐑦𐑟 𐑑𐑷𐑒𐑦𐑙 𐑩𐑚𐑬𐑑 %{tag} 𐑘𐑧𐑑."
       people_tagged_with: "𐑐𐑰𐑐𐑩𐑤 𐑑𐑨𐑜𐑛 𐑢𐑦𐑞 %{tag}"
       posts_tagged_with: "𐑐𐑴𐑕𐑑𐑕 𐑑𐑨𐑜𐑛 𐑢𐑦𐑞 #%{tag}"
-      stop_following: "Stop Following #%{tag}"
+      stop_following: "𐑕𐑑𐑪𐑐 𐑓𐑪𐑤𐑴𐑦𐑙 #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑑 Cubbi.es"
-      connecting_is_simple: "𐑒𐑩𐑯𐑧𐑒𐑑𐑦𐑙 𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑩𐑒𐑬𐑯𐑑 𐑦𐑟 𐑨𐑟 𐑕𐑦𐑥𐑐𐑩𐑤 𐑨𐑟 𐑓𐑦𐑤𐑦𐑙 𐑬𐑑 𐑑𐑵 𐑓𐑰𐑤𐑛𐑟 𐑪𐑯 𐑿𐑼 Cubbi.es 𐑩𐑒𐑬𐑯𐑑 𐑐𐑱𐑡."
+      connecting_is_simple: "𐑒𐑩𐑯𐑧𐑒𐑑𐑦𐑙 𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑩𐑒𐑬𐑯𐑑 𐑦𐑟 𐑕𐑦𐑥𐑐𐑩𐑤! 𐑡𐑳𐑕𐑑 𐑧𐑯𐑑𐑼 𐑿𐑼 𐑲𐑛𐑧𐑯𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯 (<b>%{diaspora_id}</b>) 𐑓𐑮𐑳𐑥 𐑿𐑼 𐑒𐑳𐑚𐑦𐑟 <a href='%{href_link}'>settings page</a> 𐑯 𐑣𐑦𐑑 𐑒𐑩𐑯𐑧𐑒𐑑."
       daniels_account: "·𐑛𐑨𐑯𐑘𐑩𐑤𐑟 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑩𐑒𐑬𐑯𐑑"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
+      log_in_with_diaspora_is_comming: "𐑐𐑮𐑦𐑑𐑦 𐑕𐑵𐑯, 𐑿𐑤 𐑚𐑰 𐑱𐑚𐑩𐑤 𐑑 𐑒𐑩𐑯𐑧𐑒𐑑 𐑑 𐑩 𐑯𐑿 𐑨𐑐𐑤𐑦𐑒𐑱𐑖𐑩𐑯 𐑢𐑦𐑞𐑬𐑑 𐑒𐑮𐑦𐑱𐑑𐑦𐑙 𐑩𐑯 𐑩𐑒𐑬𐑯𐑑 𐑕𐑧𐑐𐑮𐑩𐑑 𐑓𐑮𐑳𐑥 𐑿𐑼 𐑢𐑳𐑯 𐑪𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩."
       love_to_try: "𐑢𐑰'𐑛 𐑤𐑳𐑝 𐑓𐑹 𐑿 𐑑 𐑑𐑮𐑲 𐑦𐑑 𐑬𐑑."
       making_the_connection: "𐑥𐑱𐑒𐑦𐑙 𐑞 𐑒𐑩𐑯𐑧𐑒𐑖𐑩𐑯"
       screenshot_explanation: "%{link1}.  𐑞𐑦𐑕 𐑐𐑼𐑑𐑦𐑒𐑿𐑤𐑼 𐑒𐑩𐑚𐑦 𐑦𐑟 𐑤𐑦𐑙𐑒𐑑 𐑑 %{link2}."
@@ -690,10 +706,14 @@ en_shaw:
   undo: "𐑩𐑯𐑛𐑵?"
   username: "𐑿𐑟𐑼𐑯𐑱𐑥"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "𐑿𐑼 𐑩𐑒𐑬𐑯𐑑 𐑣𐑨𐑟 𐑚𐑧𐑯 𐑤𐑪𐑒𐑑. 𐑦𐑑 𐑥𐑱 𐑑𐑱𐑒 20 𐑥𐑦𐑯𐑩𐑑𐑕 𐑓𐑹 𐑳𐑕 𐑑 𐑓𐑦𐑯𐑦𐑖 𐑒𐑤𐑴𐑟𐑦𐑙 𐑿𐑼 𐑩𐑒𐑬𐑯𐑑. 𐑔𐑱𐑙𐑒 𐑿 𐑓𐑹 𐑑𐑮𐑲𐑦𐑙 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩."
     edit: 
       also_commented: "...𐑕𐑳𐑥𐑢𐑩𐑯 𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑕 𐑪𐑯 𐑿𐑼 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕 𐑐𐑴𐑕𐑑?"
       change: "𐑗𐑱𐑯𐑡"
+      change_email: "Change E-Mail"
       change_language: "𐑗𐑱𐑯𐑡 𐑤𐑱𐑙𐑜𐑢𐑩𐑡"
       change_password: "𐑗𐑱𐑯𐑡 𐑐𐑨𐑕𐑢𐑼𐑛"
       close_account: "𐑒𐑤𐑴𐑟 𐑩𐑒𐑬𐑯𐑑"
@@ -702,6 +722,7 @@ en_shaw:
       download_photos: "𐑛𐑬𐑯𐑤𐑴𐑛 𐑥𐑲 𐑓𐑴𐑑𐑴𐑟"
       download_xml: "𐑛𐑬𐑯𐑤𐑴𐑛 𐑥𐑲 𐑧.𐑥.𐑤."
       edit_account: "𐑧𐑛𐑦𐑑 𐑩𐑒𐑬𐑯𐑑"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "𐑧𐑒𐑕𐑐𐑹𐑑 𐑛𐑱𐑑𐑩"
       liked: "...𐑕𐑳𐑥𐑢𐑩𐑯 𐑤𐑲𐑒𐑕 𐑿𐑼 𐑐𐑴𐑕𐑑?"
       mentioned: "...𐑿 𐑸 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑦𐑯 𐑩 𐑐𐑴𐑕𐑑?"
@@ -710,7 +731,7 @@ en_shaw:
       receive_email_notifications: "𐑮𐑦𐑕𐑰𐑝 𐑦-𐑥𐑱𐑤 𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟 𐑢𐑧𐑯..."
       started_sharing: "...𐑕𐑳𐑥𐑢𐑩𐑯 𐑕𐑑𐑸𐑑𐑕 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿?"
       your_email: "𐑿𐑼 𐑦-𐑥𐑱𐑤"
-      your_handle: "𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑣𐑨𐑯𐑛𐑩𐑤"
+      your_handle: "𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑲𐑛𐑧𐑯𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯"
     getting_started: 
       connect_on_diaspora: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑪𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩"
       connect_services: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑿𐑼 𐑳𐑞𐑼 𐑕𐑻𐑝𐑦𐑕𐑩𐑟"
@@ -735,6 +756,8 @@ en_shaw:
       language_not_changed: "𐑤𐑱𐑙𐑜𐑢𐑩𐑡 𐑗𐑱𐑯𐑡 𐑓𐑱𐑤𐑛"
       password_changed: "𐑐𐑨𐑕𐑢𐑼𐑛 𐑗𐑱𐑯𐑡. 𐑿 𐑒𐑨𐑯 𐑯𐑬 𐑤𐑪𐑜 𐑦𐑯 𐑢𐑦𐑞 𐑿𐑼 𐑯𐑿 𐑐𐑨𐑕𐑢𐑼𐑛."
       password_not_changed: "𐑐𐑨𐑕𐑢𐑼𐑛 𐑗𐑱𐑯𐑡 𐑓𐑱𐑤𐑛"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for %{account}"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index b71864e54..edbed565c 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -6,7 +6,7 @@
 eo: 
   _applications: "Aplikaĵoj"
   _comments: "Komentoj"
-  _contacts: "Contacts"
+  _contacts: "Kontaktoj"
   _home: "Hejmo"
   _photos: "Bildoj"
   _services: "Servoj"
@@ -26,6 +26,10 @@ eo:
           attributes: 
             from_id: 
               taken: "estas multobliga de ekzistanta peto."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "Vi jam repartoprenis tiun afiŝon!"
         user: 
           attributes: 
             email: 
@@ -63,12 +67,12 @@ eo:
     aspect_contacts: 
       done_editing: "finita redakti"
     aspect_listings: 
-      add_an_aspect: "+ Add an aspect"
+      add_an_aspect: "+ Aldoni aspekton"
     aspect_stream: 
-      commented_on: "commented on"
-      posted: "posted"
-      recently: "recently:"
-      stream: "Stream"
+      commented_on: " komentis pri "
+      posted: "afiŝita"
+      recently: "antaŭ nelonge:"
+      stream: "Novaĵlisto"
     contacts_not_visible: "Kontaktoj en tiu aspekto ne povos vidi unu la aliajn."
     contacts_visible: "Kontaktoj en tiu aspekto povos vidi unu la alian."
     create: 
@@ -99,18 +103,18 @@ eo:
         heading: "Konekti al Cubbi.es"
         learn_more: "Lerni pli"
       diaspora_id: 
-        content_1: "Your Diaspora ID is:"
-        content_2: "Give it to anyone and they'll be able to find you on Diaspora."
-        heading: "Diaspora ID"
-      handle_explanation: "Tiu ĉi estas via DIASPORA* nomo.  Kiel retpoŝtadreso, vi povas doni tiun ĉi al homoj, por ke ili vin kontaktu."
+        content_1: "Via DIASPORA* uzantnomo estas:"
+        content_2: "Donu ĝin al iu ajn, kaj tiu povos trovi vin ĉe DIASPORA*."
+        heading: "DIASPORA* uzantnomo"
+      handle_explanation: "Tiu ĉi estas via DIASPORA* uzantnomo.  Kiel retpoŝtadreso, vi povas doni tiun ĉi al homoj, por ke ili vin kontaktu."
       no_contacts: "Nul kontaktoj"
       people_sharing_with_you: "Homoj, kiuj konigas kun vi"
       post_a_message: "Afiŝi mesaĝon »"
       services: 
-        content: "You can connect the following services to Diaspora:"
-        heading: "Connect Services"
-      tags_following: "Followed Tags"
-      your_aspects: "Your Aspects"
+        content: "Vi povas konekti la postajn servojn kun DIASPORA*:"
+        heading: "Konekti Servojn"
+      tags_following: "Abonitaj Etikedoj"
+      your_aspects: "Viaj Aspektoj"
     many: "%{count} aspektoj"
     move_contact: 
       error: "Ne povis movi kontakton: %{inspect}"
@@ -120,17 +124,17 @@ eo:
       create: "Krei"
       name: "Nomo"
     no_posts_message: 
-      start_talking: "Neniu jam diris iun ajn.  Mem komencu la interparoladon!"
-      try_adding_some_more_contacts: "Try adding some more contacts."
+      start_talking: "Neniu jam diris iun ajn!"
+      try_adding_some_more_contacts: "Aldonu pli kontaktojn."
     one: "1 aspekto"
     other: "%{count} aspektoj"
     seed: 
       family: "Familio"
       work: "Verkejo"
     selected_contacts: 
-      manage_your_aspects: "Manage your aspects."
-      no_contacts: "You don't have any contacts here yet."
-      view_all_contacts: "View all contacts"
+      manage_your_aspects: "Redakti viajn aspektojn."
+      no_contacts: "Vi ne jam havas iujn ajn kontaktojn tie ĉi."
+      view_all_contacts: "Vidi ĉiujn kontaktojn"
     show: 
       edit_aspect: "redakti aspekton"
     update: 
@@ -139,12 +143,12 @@ eo:
     zero: "neniu aspektoj"
   authorizations: 
     index: 
-      revoke_access: "Revoke Access"
+      revoke_access: "Revoki Permeson"
   back: "Antaŭen"
   bookmarklet: 
     explanation: "Vi povas poŝti al DIASPORA* el ĉie per legosignado la ligilon %{link}."
     explanation_link_text: "tiu ĉi ligilo"
-    heading: "DIASPORA* Legosigneto"
+    heading: "Legosigneto"
     post_something: "Afiŝi iujn al DIASPORA*"
     post_success: "Afiŝita!  Fermanta!"
   cancel: "Rezigni"
@@ -152,7 +156,7 @@ eo:
     few: "%{count} komentoj"
     many: "%{count} komentoj"
     new_comment: 
-      comment: "Komento"
+      comment: "Komenti"
       commenting: "Komentanta..."
     one: "1 komento"
     other: "%{count} komentoj"
@@ -164,13 +168,13 @@ eo:
     index: 
       add_a_new_aspect: "Aldoni novan aspekton"
       all_contacts: "Ĉiuj kontaktoj"
-      edit_aspect: "Edit %{name}"
-      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
+      edit_aspect: "Redakti je %{name}"
+      many_people_are_you_sure: "Ĉu vi certas, ke vi volas mesaĝi pli ol {suggested_limit} homojn? Afiŝi al tiu ĉi aspekto eble estas pli bona metodo kontakti ilin."
       my_contacts: "Miaj kontaktoj"
       no_contacts: "Neniuj kontaktoj."
       only_sharing_with_me: "Nur partoprenata al mi"
       remove_person_from_aspect: "Forigi %{person_name} de \"%{aspect_name}\""
-      start_a_conversation: "Start a conversation"
+      start_a_conversation: "Komenci interparoladon"
       title: "Kontaktoj"
       your_contacts: "Viaj kontaktoj"
     many: "%{count} kontaktoj"
@@ -190,7 +194,7 @@ eo:
         many: "%{count} novaj mesaĝoj"
         one: "1 nova mesaĝo"
         other: "%{count} novaj mesaĝoj"
-        zero: "neniu nova mesaĝo"
+        zero: "neniuj novaj mesaĝoj"
     index: 
       create_a_new_message: "krei novan mesaĝon"
       inbox: "Mesaĝujo"
@@ -199,7 +203,7 @@ eo:
       no_conversation_selected: "ne interparolado estas elektita"
       no_messages: "neniuj mesaĝoj"
     new: 
-      abandon_changes: "Abandon changes?"
+      abandon_changes: "Ĉu forlasi ŝanĝojn?"
       send: "Sendi"
       subject: "subjekto"
       to: "al"
@@ -218,7 +222,7 @@ eo:
       correct_the_following_errors_and_try_again: "Ĝustigu la postajn erarojn kaj reprovu."
       invalid_fields: "Malvalidaj Kampoj"
   fill_me_out: "Kompletu min"
-  find_people: "Find people"
+  find_people: "Trovi homojn"
   hide: "Kaŝi"
   home: 
     show: 
@@ -229,7 +233,7 @@ eo:
       login_here: "ensaluti tie ĉi"
       ownership: "Proprieto"
       ownership_explanation: "Vi posedas viajn bildojn, kaj vi ne devus rezigni tiun, por konigi ilin.  Vi ankoraŭ havas proprieton de ĉiu, kiun vi konigi per DIASPORA*, donante al vi kompletan administradon pri tiel, kiel aĵoj disdoniĝas."
-      share_what_you_want: "Share what you want, with whom you want."
+      share_what_you_want: "Partopreni tiun, kiun vi volas, kun kiu vi volas."
       simplicity: "Simpleco"
       simplicity_explanation: "DIASPORA* igas konigadon facilan – kaj ankaŭ privatecon.  Private per plano, DIASPORA* ne direktas tra multajn paĝojn de agordoj kaj opcioj, por sekurigi vian profilon."
       tagline_first_half: "Konigi tio, kio vi volas,"
@@ -247,7 +251,7 @@ eo:
     edit: 
       sign_up: "registriĝi"
     new: 
-      already_invited: "Jam invitita"
+      already_invited: "Tiuj homoj ankoraŭ ne akceptis vian inviton:"
       aspect: "Aspekto"
       comma_seperated_plz: "Vi povas aldoni multajn retpoŝtadresojn, apartate de komoj."
       if_they_accept_info: "se tiu akceptos, tiu aldoniĝos al la aspekto, en kiun vi invitis tiun."
@@ -272,8 +276,9 @@ eo:
       login: "ensaluti"
       logout: "elsaluti"
       profile: "profilo"
+      recent_notifications: "Freŝaj sciigoj"
       settings: "agordoj"
-      view_all: "View all"
+      view_all: "Vidi ĉiujn"
   likes: 
     likes: 
       people_dislike_this: 
@@ -288,7 +293,13 @@ eo:
         one: "%{count} ŝato"
         other: "%{count} ŝatoj"
         zero: "nul ŝatoj"
-  limited: "Limited"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
+  limited: "Malpublika"
   more: "Pli"
   next: "poste"
   no_results: "Neniuj Resultoj Trovitaj"
@@ -317,7 +328,7 @@ eo:
         many: "%{count} novaj sciigoj"
         one: "1 nova sciigo"
         other: "%{count} novaj sciigoj"
-        zero: "neniu nova sciigo"
+        zero: "neniuj novaj sciigoj"
     index: 
       and: "kaj"
       and_others: 
@@ -366,39 +377,31 @@ eo:
       other: "%{actors} komencis konigi kun vi."
       zero: "%{actors} komencis konigi kun vi."
   notifier: 
-    also_commented: 
-      commented: "ankaŭ komentis pri la afiŝo de %{post_author}:"
-      sign_in: "Ensalutu por vidi ĝin."
-      subject: "%{name} ankaŭ komentis pri la afiŝo de %{post_author}."
+    click_here: "kliku tie ĉi"
     comment_on_post: 
-      commented: "komentis pri via afiŝo:"
-      sign_in: "Ensalutu por vidi ĝin."
-      subject: "%{name} komentis pri via afiŝo"
-    diaspora: "la diaspora retpoŝtroboto"
+      reply: "Respondi aŭ vidi afiŝon de %{name} >"
+    confirm_email: 
+      click_link: "Por aktivigi vian novan retpoŝtadreson %{unconfirmed_email}, bonvolu kliki tiun ligilon:"
+      subject: "Bonvolu aktivigi vian novan retpoŝtadreson %{unconfirmed_email}"
+    email_sent_by_diaspora: "Tiu ĉi retpoŝton poŝtiĝi de DIASPORA*.  Se vi volus recivi tiajn ĉi retpoŝtojn ne plu,"
     hello: "Saluton %{name}!"
     liked: 
-      liked: "%{name} ĵus ŝatis vian afiŝon: "
-      sign_in: "Ensaluti por vidi ĝin"
-      subject: "%{name} ĵus ŝatis vian afiŝon"
-    love: "ame,"
-    manage_your_email_settings: "administrigi viajn retpoŝtajn agordojn"
+      liked: "%{name} ĵus ŝatis vian afiŝon"
+      view_post: "Vidi afiŝon >"
     mentioned: 
       mentioned: "menciis vin en afiŝon:"
-      sign_in: "Ensalutu por vidi ĝin."
       subject: "%{name} menciis vin ĉe DIASPORA*"
     private_message: 
-      message_subject: "Subjekto: %{subject}"
-      private_message: "sendis al vin nepublikan mesaĝon:"
-      sign_in: "Ensaluti por vidi ĝin."
-      subject: "%{name} sendis al vin nepublikan mesaĝon per DIASPORA*"
+      reply_to_or_view: "Respondi al aŭ vidi tiun ĉi interparoladon >"
     single_admin: 
       admin: "Via DIASPORA* administristo"
       subject: "Mesaĝo pri via DIASPORA* konto:"
     started_sharing: 
       sharing: "komencis konigi kun vi!"
-      sign_in: "Ensaluti tie ĉi"
       subject: "%{name} komencis konigi kun vi ĉe DIASPORA*"
+      view_profile: "Vidi la profilo de %{name}"
     thanks: "Dankon,"
+    to_change_your_notification_settings: "ŝanĝi viajn sciigajn agordojn"
   ok: "Nu"
   or: "aŭ"
   password: "Pasvorto"
@@ -451,7 +454,7 @@ eo:
       to_accept_or_ignore: "akcepti aŭ ignori ĝin."
       you_have_no_tags: "vi ne havas etikedon!"
     webfinger: 
-      fail: "Ni bedauras, sed ni ne povis trovi je %{handle}."
+      fail: "Ni bedaŭras, sed ni ne povis trovi je %{handle}."
     zero: "neniu homo"
   photos: 
     create: 
@@ -492,9 +495,9 @@ eo:
       post_hidden: "Afiŝo de %{name} kaŝiĝas."
   posts: 
     show: 
-      destroy: "Delete"
-      not_found: "Sorry, we couldn't find that post."
-      permalink: "permalink"
+      destroy: "Forlasi"
+      not_found: "Ni bedaŭras, sed ni ne povis trovi tiun afiŝon."
+      permalink: "malŝanĝantligilo"
   previous: "antaŭe"
   profile: "Profilo"
   profiles: 
@@ -517,7 +520,7 @@ eo:
     update: 
       failed: "Ne povis ĝisdatigi profilon"
       updated: "Ĝisdatigi profilon"
-  public: "Public"
+  public: "Publika"
   registrations: 
     closed: "Registrado estas ferma ĉe tiu ĉi DIASPORA* guŝo."
     create: 
@@ -556,6 +559,19 @@ eo:
       manage_within: "Administrigi kontaktojn ene de"
     new_request_to_person: 
       sent: "sendita!"
+  reshares: 
+    create: 
+      failure: "Estis eraro, kiam repartoprenanta tiun ĉi afiŝon."
+    reshare: 
+      deleted: "Originala afiŝo forlasiĝis de afiŝinto."
+      reshare: 
+        few: "%{count} Repartoprenadoj"
+        many: "%{count} Repartoprenadoj"
+        one: "1 Repartoprenado"
+        other: "%{count} Repartoprenadoj"
+        zero: "Repartopreni"
+      reshare_confirmation: "Ĉu repartopreni je %{author} - %{text}?"
+      show_original: "Videbligi originalan"
   search: "Serĉi"
   services: 
     create: 
@@ -580,7 +596,7 @@ eo:
       disconnect: "malkonekti"
       edit_services: "Redakti servojn"
       logged_in_as: "ensalutis, kiel"
-      no_services: "You have not connected any services yet."
+      no_services: "Vi ankoraŭ ne konektis iujn ajn servojn."
       really_disconnect: "ĉu malkonektu el %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Kliki tiun ligilon por akcepti vian inviton"
@@ -593,7 +609,7 @@ eo:
     add_contact: 
       add_new_contact: "Aldoni novan kontakton"
       create_request: "Trovi per DIASPORA* uzantnomo"
-      diaspora_handle: "diaspora@handle.org"
+      diaspora_handle: "diaspora@pod.org"
       enter_a_diaspora_username: "Aldonu DIASPORA* uzantnomo:"
       know_email: "Ĉu vi scias ties retpoŝtadreson?  Vi devus inviti tiun."
       your_diaspora_username_is: "Via DIASPORA* uzantnomo estas: %{diaspora_handle}"
@@ -622,7 +638,7 @@ eo:
       all: "ĉiuj"
       all_contacts: "ĉiuj kontaktoj"
       click_to_share_with: "Kliki por konigi kun:"
-      discard_post: "Discard post"
+      discard_post: "Forlasi afiŝon"
       make_public: "publikigi"
       post_a_message_to: "Afiŝi al %{aspect}"
       posting: "Afiŝanta..."
@@ -630,17 +646,17 @@ eo:
       publishing_to: "eldonanta al: "
       share: "Partopreni"
       share_with: "kontigi kun"
-      upload_photos: "Upload photos"
-      whats_on_your_mind: "kio vi nun pensas?"
+      upload_photos: "Alŝuti bildojn"
+      whats_on_your_mind: "Kion vi nun pensas?"
     reshare: 
       reshare: "Rekontigi"
     stream_element: 
       dislike: "Malŝati"
       like: "ŝati"
-      shared_with: "Shared with: %{aspect_names}"
+      shared_with: "Partoprenita kun: %{aspect_names}"
       unlike: "Ne plu ŝati"
       via: "de %{link}"
-      viewable_to_anyone: "This post is viewable to anyone on the web"
+      viewable_to_anyone: "Tiu ĉi afiŝo videblas de iu ajn ĉe la reto"
   status_messages: 
     create: 
       success: "Sukcese mencigis: %{names}"
@@ -657,29 +673,29 @@ eo:
       other: "bonvolu farigi viajn afiŝojn malpli longajn ol %{count} signoj"
       zero: "bonvolu farigi viajn afiŝojn malpli longajn ol %{count} signoj"
   stream_helper: 
-    hide_comments: "kaŝi komentojn"
-    show_more_comments: "Show %{number} more comments"
+    hide_comments: "kaŝi ĉiujn komentojn"
+    show_more_comments: "Videbligi %{number} pli komentojn"
   tag_followings: 
     create: 
-      failure: "Failed to follow: #%{name}"
-      success: "Successfully following: #%{name}"
+      failure: "Ne povis aboni: #%{name}"
+      success: "Sukcese abonis: #%{name}"
     destroy: 
-      failure: "Failed to stop following: #%{name}"
-      success: "Successfully stopped following: #%{name}"
+      failure: "Ne povis malaboni: #%{name}"
+      success: "Sukcese malabonis: #%{name}"
   tags: 
     show: 
-      follow: "Follow #%{tag}"
-      following: "Following #%{tag}"
+      follow: "Aboni al #%{tag}"
+      following: "Abonita al #%{tag}"
       nobody_talking: "Neniu jam parolas pri %{tag}."
       people_tagged_with: "Homoj etikediĝis kun %{tag}"
       posts_tagged_with: "Afiŝoj etikediĝis kun #%{tag}"
-      stop_following: "Stop Following #%{tag}"
+      stop_following: "Malaboni de #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Konekti al Cubbi.es"
-      connecting_is_simple: "Konekti vian DIASPORA* konton estas tiel facila, kiel kompleti du kampojn ĉe via Cubbi.es kontpaĝo."
+      connecting_is_simple: "Konekti vian DIASPORA* konton estas tiel facila!  Skribu vian DIASPORA* uzantnomon (<b>%{diaspora_id}</b>) de via cubbi.es <a href='%{href_link}'>settings page</a> kaj kliku \"connect\"."
       daniels_account: "La DIASPORA* konto de Daniel"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
+      log_in_with_diaspora_is_comming: "Baldaŭ, vi povos konekti novan aplikaĵon sen devon krei konton, kiu estas malsama ol via DIASPORA* konto."
       love_to_try: "Ni vin amus, se vi provi ĝin."
       making_the_connection: "Konektanta"
       screenshot_explanation: "%{link1}.  Tiu aparta cubby ligas kun %{link2}."
@@ -690,10 +706,14 @@ eo:
   undo: "Ĉu malfarigi?"
   username: "Uzantnomo"
   users: 
+    confirm_email: 
+      email_confirmed: "Retpoŝtadreso %{email} aktiviĝis"
+      email_not_confirmed: "Retpoŝtadreso ne povis aktiviĝi. Ĉu malĝusta ligilo?"
     destroy: "Via konto ŝlositas. Eble esti ĝis 20 minutoj antaŭ ni fini forigi vian konton.  Dankon por via provado je DIASPORA*"
     edit: 
       also_commented: "...iu ankaŭ komentis pri la afiŝo de via kontakto?"
       change: "Ŝanĝi"
+      change_email: "Redakti Retpoŝtadreso"
       change_language: "Ŝanĝi Lingvon"
       change_password: "Ŝanĝi Pasvorton"
       close_account: "Malaniĝi"
@@ -702,6 +722,7 @@ eo:
       download_photos: "elŝuti mian bildojn"
       download_xml: "elŝuti mian xml"
       edit_account: "Redakti konton"
+      email_awaiting_confirmation: "Ni poŝtis al vin aktivigadan ligilon ĉe %{unconfirmed_email}.  Ni uzados vian malŝanĝitan retpoŝtadreson %{email} ĝis vi klikos tiun ĉi ligilo kaj aktivigos la novan repoŝtadreson."
       export_data: "Eksporti Datumojn"
       liked: "...iu ŝatis vian afiŝon?"
       mentioned: "...vi menciatas en afiŝo?"
@@ -735,6 +756,8 @@ eo:
       language_not_changed: "Ne povis ŝanĝi lingvon"
       password_changed: "Pasvorto Ŝanĝita.  Vi nun povas ensaluti per via nova pasvorto."
       password_not_changed: "Ne povis ŝanĝi pasvorton"
+      unconfirmed_email_changed: "Retpoŝtadreso ŝanĝiĝis.  Tio ĉi devas aktivigado."
+      unconfirmed_email_not_changed: "Ne povis ŝanĝigis retpoŝtadreson."
   webfinger: 
     fetch_failed: "ne povas alporti webfinger-an profilon por %{profile_url}"
     hcard_fetch_failed: "estis problemo, kiam ni alportis la hcard-on de #{@account}"
diff --git a/config/locales/diaspora/es-AR.yml b/config/locales/diaspora/es-AR.yml
index 9acd7a5c7..bef713436 100644
--- a/config/locales/diaspora/es-AR.yml
+++ b/config/locales/diaspora/es-AR.yml
@@ -26,6 +26,10 @@ es-AR:
           attributes: 
             from_id: 
               taken: "es un duplicado de una solicitud preexistente."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ es-AR:
       login: "conectarse"
       logout: "desconectarse"
       profile: "perfil"
+      recent_notifications: "Recent notifications"
       settings: "configuración"
       view_all: "View all"
   likes: 
@@ -288,6 +293,12 @@ es-AR:
         one: "%{count} le gusta"
         other: "%{count} les gusta"
         zero: "a nadie le gusta"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Más"
   next: "siguiente"
@@ -366,39 +377,31 @@ es-AR:
       other: "%{actors} comparten con vos."
       zero: "%{actors} comparte con vos."
   notifier: 
-    also_commented: 
-      commented: "también comentó en la publicación de %{post_author}:"
-      sign_in: "Conectate para verlo."
-      subject: "%{name} también comentó en la publicación de %{post_author}."
+    click_here: "click here"
     comment_on_post: 
-      commented: "comentó en tu publicación:"
-      sign_in: "Conectate para verlo."
-      subject: "%{name} comentó en tu publicación."
-    diaspora: "el robot de correos de Diáspora*"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "¡Hola %{name}!"
     liked: 
       liked: "%{name} le gusta tu publicación: "
-      sign_in: "Conectate para verlo"
-      subject: "%{name} le gusta tu publicación"
-    love: "con amor,"
-    manage_your_email_settings: "configurá tu correo"
+      view_post: "View post >"
     mentioned: 
       mentioned: "te mencionó en una publicación:"
-      sign_in: "Conectate para verlo."
       subject: "%{name} te mencionó en Diáspora*"
     private_message: 
-      message_subject: "Asunto: %{subject}"
-      private_message: "te envió un mensaje privado:"
-      sign_in: "Conectate para verlo."
-      subject: "%{name} te envió un mensaje privado en Diáspora*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "Tu administrador de Diáspora*"
       subject: "Un mensaje sobre tu cuenta Diáspora*:"
     started_sharing: 
       sharing: "comenzó a compartir con vos."
-      sign_in: "Conectate acá"
       subject: "%{name} comenzó a compartir con vos en Diáspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "Gracias,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "OK"
   or: "o"
   password: "Contraseña"
@@ -556,6 +559,19 @@ es-AR:
       manage_within: "Gestioná tus contactos"
     new_request_to_person: 
       sent: "¡Enviado!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Buscar"
   services: 
     create: 
@@ -690,10 +706,14 @@ es-AR:
   undo: "¿Deshacer?"
   username: "Nombre de usuario"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Cuenta cerrada satisfactoriamente."
     edit: 
       also_commented: "...alguien también comenta en una publicación en la que comentaste?"
       change: "Cambiar"
+      change_email: "Change E-Mail"
       change_language: "Cambiar idioma"
       change_password: "Cambiar contraseña"
       close_account: "Cerrar cuenta"
@@ -702,6 +722,7 @@ es-AR:
       download_photos: "descargar mis fotos"
       download_xml: "decargar mi XML"
       edit_account: "Editar cuenta"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Exportar datos"
       liked: "...a alguien le gusta una publicación tuya?"
       mentioned: "...te mencionan en una publicación?"
@@ -735,6 +756,8 @@ es-AR:
       language_not_changed: "No pudo cambiarse tu idioma"
       password_changed: "Tu contraseña se cambió.  Ya podés conectarte con tu nueva contraseña."
       password_not_changed: "No pudo cambiarse tu contraseña"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "No pudo encontrarse el perfil webfinger de %{profile_url}"
     hcard_fetch_failed: "Hubo un problema al buscar el 'hcard' de %{account}"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index bf4855719..a67a83aa4 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -26,6 +26,10 @@ es-CL:
           attributes: 
             from_id: 
               taken: "es un duplicado de una solicitud que ya existe."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "Ya compartiste ese post!"
         user: 
           attributes: 
             email: 
@@ -247,7 +251,7 @@ es-CL:
     edit: 
       sign_up: "regístrate"
     new: 
-      already_invited: "Ya invitado"
+      already_invited: "Las siguientes personas no aceptaron tu invitación:"
       aspect: "Aspecto"
       comma_seperated_plz: "Puedes escribir varias direcciones de correo separadas por comas."
       if_they_accept_info: "Si aceptan, ellos se agregarán al aspecto que los invitaste."
@@ -272,6 +276,7 @@ es-CL:
       login: "entrar"
       logout: "salir"
       profile: "perfil"
+      recent_notifications: "Notificaciones recientes"
       settings: "Configuración"
       view_all: "Ver todo"
   likes: 
@@ -287,7 +292,13 @@ es-CL:
         many: "%{count} personas les gusta esto"
         one: "1 persona le gusta esto"
         other: "%{count} personas les gusta esto"
-        zero: "a ninguna persona le gusta esto"
+        zero: "a nadie le gusta esto aun"
+      people_like_this_comment: 
+        few: "a %{count} les gusta esto"
+        many: "a %{count} les gusta esto"
+        one: "a %{count} le gusta esto"
+        other: "a %{count} les gusta esto"
+        zero: "a nadie le gusta esto aun"
   limited: "Restringido"
   more: "Más"
   next: "Siguiente"
@@ -366,39 +377,31 @@ es-CL:
       other: "%{actors} comenzaron a compartir contigo."
       zero: "%{actors} comenzó a compartir contigo."
   notifier: 
-    also_commented: 
-      commented: "También comentó en el post de %{post_author}:"
-      sign_in: "Conéctate para verlo."
-      subject: "%{name} también comentó en el post de %{post_author}."
+    click_here: "haz click aquí"
     comment_on_post: 
-      commented: "Comentó en tu post!"
-      sign_in: "Conéctate para verlo."
-      subject: "%{name} comentó en tu post."
-    diaspora: "correo robot de diaspora"
+      reply: "Responde o mira el post de %{name}>"
+    confirm_email: 
+      click_link: "Para activar la nueva dirección de email %{unconfirmed_email}, por favor haz click en este link:"
+      subject: "Por favor activa tu nueva dirección de email %{unconfirmed_email}"
+    email_sent_by_diaspora: "Este email fue enviado por Diaspora.  Si no quieres seguir recibiendo emails como este, "
     hello: "¡Hola %{name}!"
     liked: 
-      liked: "a %{name} le gustó tu post: "
-      sign_in: "Entra para verlo"
-      subject: "a %{name} le gustó tu post"
-    love: "cariño,"
-    manage_your_email_settings: "maneja tus configuraciones de email"
+      liked: "a %{name} le gustó tu post"
+      view_post: "Ver post >"
     mentioned: 
       mentioned: "Te mencionó en un post:"
-      sign_in: "Conéctate para verlo."
       subject: "%{name} te mencionó en Diaspora*"
     private_message: 
-      message_subject: "Asunto: %{subject}"
-      private_message: "te envió un mensaje privado:"
-      sign_in: "Conéctate para verlo."
-      subject: "%{name} te envió un mensaje privado en Diaspora*"
+      reply_to_or_view: "Responder o ver esta conversación >"
     single_admin: 
       admin: "Tu administrador de Diaspora"
       subject: "Un mensaje sobre tu cuenta de Diaspora:"
     started_sharing: 
       sharing: "Ha comenzado a compartir contigo!"
-      sign_in: "Conectate aqui"
       subject: "%{name} ha comenzado a compartir contigo en Diaspora*"
+      view_profile: "Ver el perfil de %{name}"
     thanks: "Gracias,"
+    to_change_your_notification_settings: "para cambiar tu configuración de notificaciones"
   ok: "OK"
   or: "o"
   password: "Contraseña"
@@ -530,7 +533,7 @@ es-CL:
       unhappy: "¿Triste?"
       update: "Actualizar"
     new: 
-      enter_email: "Ingresa un correo"
+      enter_email: "Ingresa un email"
       enter_password: "Ingresar contraseña"
       enter_password_again: "Ingresa la misma contraseña anterior"
       enter_username: "Escoge un nick (solo letras, números, y guión bajo)"
@@ -556,6 +559,19 @@ es-CL:
       manage_within: "Manejar los contactos en"
     new_request_to_person: 
       sent: "¡enviado!"
+  reshares: 
+    create: 
+      failure: "Hubo un error al compartir este post."
+    reshare: 
+      deleted: "Post original eliminado por el autor."
+      reshare: 
+        few: "Se ha compartido %{count} veces"
+        many: "Se ha compartido %{count} veces"
+        one: "Se ha compartido 1 vez"
+        other: "Se ha compartido %{count} veces"
+        zero: "Compartir"
+      reshare_confirmation: "Compartir %{author} - %{text}?"
+      show_original: "Mostrar Original"
   search: "Buscar"
   services: 
     create: 
@@ -677,7 +693,7 @@ es-CL:
   tokens: 
     show: 
       connect_to_cubbies: "Conectarse a Cubbi.es"
-      connecting_is_simple: "Conectar la cuenta de diáspora es tan simple! Solo ingresa tu ID de Diaspora (<b>%{diaspora_id}</b>) de tu <a href='%{href_link}'>pagina de configuración</a> de cubbies y presiona conectar."
+      connecting_is_simple: "Conectar la cuenta de diáspora es simple! Solo ingresa tu ID de Diaspora (<b>%{diaspora_id}</b>) en la <a href='%{href_link}'>pagina de configuración</a> de cubbies y presiona conectar."
       daniels_account: "La cuenta de Diaspora de Daniel"
       log_in_with_diaspora_is_comming: "Muy pronto, podrás conectarte a nuevas aplicaciones sin crear una cuenta separada de la de Diaspora."
       love_to_try: "Nos encantaría que lo pruebes."
@@ -690,10 +706,14 @@ es-CL:
   undo: "Deshacer?"
   username: "Nombre de usuario"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activado"
+      email_not_confirmed: "El email no se pudo activar. Es la dirección correcta?"
     destroy: "Tu cuenta ha sido bloqueada. Nos puede tomar hasta 20 minutos cerrar tu cuenta. Gracias por probar Diaspora."
     edit: 
       also_commented: "...alguien comenta en el post de tu amigo?"
       change: "Modificar"
+      change_email: "Cambiar email"
       change_language: "Cambiar Idioma"
       change_password: "Cambiar Contraseña"
       close_account: "Cerrar Cuenta"
@@ -702,6 +722,7 @@ es-CL:
       download_photos: "descargar mis fotos"
       download_xml: "descargar mi xml"
       edit_account: "Editar cuenta"
+      email_awaiting_confirmation: "Te enviamos un link de activación a %{unconfirmed_email}. Hasta que sigas ese link y actives la nueva dirección, nosotros seguiremos usando tu dirección original %{email}."
       export_data: "Exportar Datos"
       liked: "...a alguien le gusta tu post?"
       mentioned: "...te mencionan en un post?"
@@ -735,6 +756,8 @@ es-CL:
       language_not_changed: "Error al cambiar de idioma"
       password_changed: "Contraseña Cambiada. Ahora puedes conectarte con la nueva contraseña."
       password_not_changed: "Error al cambiar la contraseña"
+      unconfirmed_email_changed: "Se ha cambiado el email. Pero se requiere su activación."
+      unconfirmed_email_not_changed: "Error al cambiar el email"
   webfinger: 
     fetch_failed: "error al buscar el perfil webfinger para %{profile_url}"
     hcard_fetch_failed: "hubo un problema buscando la hcard de %{account}"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index e89a49b9c..a958edb4f 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -26,6 +26,10 @@ es:
           attributes: 
             from_id: 
               taken: "es un duplicado de una solicitud que ya existe."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ es:
       login: "acceder"
       logout: "salir"
       profile: "perfil"
+      recent_notifications: "Recent notifications"
       settings: "configuración"
       view_all: "Ver todo"
   likes: 
@@ -288,6 +293,12 @@ es:
         one: "A 1 le gusta"
         other: "A %{count} les gusta"
         zero: "A nadie le gusta"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Restringido"
   more: "Más"
   next: "siguiente"
@@ -366,39 +377,31 @@ es:
       other: "%{actors} comenzaron a compartir contigo."
       zero: "%{actors} comenzó a compartir contigo."
   notifier: 
-    also_commented: 
-      commented: "ha participado también en la publicación de %{post_author}:"
-      sign_in: "Conéctate para verlo."
-      subject: "%{name} ha participado también en la publicación de %{post_author}."
+    click_here: "click here"
     comment_on_post: 
-      commented: "ha participado en tu publicación:"
-      sign_in: "Conéctate para verlo."
-      subject: "%{name} ha participado en tu publicación."
-    diaspora: "el robot de email de Diaspora*"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "¡Hola %{name}!"
     liked: 
       liked: "a %{name} le gustó tu publicación:"
-      sign_in: "Conéctate para poder verlo"
-      subject: "a %{name} le gustó tu publicación"
-    love: "¡Qué pasa!"
-    manage_your_email_settings: "configura tu email"
+      view_post: "View post >"
     mentioned: 
       mentioned: "te mencionó en una publicación:"
-      sign_in: "Conéctate para verlo."
       subject: "%{name} te mencionó en Diaspora*"
     private_message: 
-      message_subject: "Asunto: %{subject}"
-      private_message: "te envió un mensaje privado:"
-      sign_in: "Conéctate para verlo."
-      subject: "%{name} te envió un mensaje privado en Diaspora*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "Tu administrador Diaspora*"
       subject: "Un mensaje sobre tu cuenta Diaspora*:"
     started_sharing: 
       sharing: "ha empezado a compartir contigo!"
-      sign_in: "Accede aquí"
       subject: "%{name} ha empezado a compartir contigo en Diaspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "Gracias,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "OK"
   or: "o"
   password: "Contraseña"
@@ -556,6 +559,19 @@ es:
       manage_within: "Gestión de contactos"
     new_request_to_person: 
       sent: "¡Enviado!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Buscar"
   services: 
     create: 
@@ -690,10 +706,14 @@ es:
   undo: "¿Deshacer?"
   username: "Nombre de usuario"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Tu cuenta ha sido bloqueada. En unos 20 minutos se cerrará totalmente. Gracias por probar Diaspora*. "
     edit: 
       also_commented: "...alguien comenta en la publicación de tu contacto?"
       change: "Cambiar"
+      change_email: "Change E-Mail"
       change_language: "Cambiar idioma"
       change_password: "Cambiar contraseña"
       close_account: "Cerrar cuenta"
@@ -702,6 +722,7 @@ es:
       download_photos: "Descargar mis fotos"
       download_xml: "Descargar mi XML"
       edit_account: "Editar cuenta"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Exportar datos"
       liked: "...a alguien le gusta tu publicación?"
       mentioned: "...eres mencionado en una publicación?"
@@ -735,6 +756,8 @@ es:
       language_not_changed: "Error cambiando de idioma"
       password_changed: "Contraseña cambiada. Ya puedes acceder con tu nueva contraseña."
       password_not_changed: "Error cambiando la contraseña"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "Error al buscar el perfil webfinger de %{profile_url}"
     hcard_fetch_failed: "Hubo un problema al buscar el hcard para #{@account}"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index a1db74ce3..a3d89a11d 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -26,6 +26,10 @@ eu:
           attributes: 
             from_id: 
               taken: "lehenago egindako eskaera baten bikoizketa bat da."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -247,7 +251,7 @@ eu:
     edit: 
       sign_up: "izena_eman"
     new: 
-      already_invited: "Gonbidatuta jadanik"
+      already_invited: "Pertsona hauek ez dute zure gonbidapena onartu:"
       aspect: "Alderdia"
       comma_seperated_plz: "Nahi dituzun e-posta guztiak idatzi ditzakezu, koma batez bananduta."
       if_they_accept_info: "eskaera onartzen badute, gonbidatutako alderdira batuko dira"
@@ -272,6 +276,7 @@ eu:
       login: "sartu"
       logout: "irten"
       profile: "profila"
+      recent_notifications: "Recent notifications"
       settings: "lehentasunak"
       view_all: "Guztiak ikusi"
   likes: 
@@ -288,6 +293,12 @@ eu:
         one: "%{count}ek du gustoko"
         other: "%{count} pertsonek gustoko dute hau"
         zero: "oraindik ez du inork gustoko"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Mugatua"
   more: "Gehiago"
   next: "hurrengoa"
@@ -366,39 +377,31 @@ eu:
       other: "%{actors} zurekin harremanetan hasi d(ir)a"
       zero: "%{actors} zurekin harremanetan hasi d(ir)a"
   notifier: 
-    also_commented: 
-      commented: "(e)k ere iruzkindu du %{post_author}(r)en mezuan:"
-      sign_in: "Sartu zaitez ikusteko."
-      subject: "%{name}(e)k ere iruzkindu du."
+    click_here: "click here"
     comment_on_post: 
-      commented: "zure mezua iruzkindu du:"
-      sign_in: "Sartu zaitez ikusteko."
-      subject: "%{name}(e)k zure mezua iruzkindu du."
-    diaspora: "diasporaren e-posta robota"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Kaixo, %{name}!"
     liked: 
       liked: "%{name}(e)k zure mezua gustoko du:"
-      sign_in: "Sartu zaitez ikusteko"
-      subject: "%{name}(e)k zure mezua atsegin du"
-    love: "ikusi arte,"
-    manage_your_email_settings: "kudeatu zure e-posta ezarpenak"
+      view_post: "View post >"
     mentioned: 
       mentioned: "zu aipatu zaituzte mezu batean:"
-      sign_in: "Sartu ikusteko."
       subject: "%{name}(e)k Diasporan aipatu zaitu"
     private_message: 
-      message_subject: "Gaia: %{subject}"
-      private_message: "(e)k mezu pribatu bat bidali dizu:"
-      sign_in: "Sartu zaitez ikusteko."
-      subject: "%{name}(e)k mezu pribatu bat bidali dizu Diasporan"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "Zure Diaspora administratzailea"
       subject: "Mezu bat zure Diaspora kontuari buruz:"
     started_sharing: 
       sharing: "zurekin harremanetan hasi da!"
-      sign_in: "Sartu hemen"
       subject: "%{name} zurekin harremanetan hasi da Diasporan"
+      view_profile: "View %{name}'s profile"
     thanks: "Milesker,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "Onartu"
   or: "edo"
   password: "Pasahitza"
@@ -492,8 +495,8 @@ eu:
       post_hidden: "%{name}(r)en mezua ezkutatua izan da."
   posts: 
     show: 
-      destroy: "Delete"
-      not_found: "Sorry, we couldn't find that post."
+      destroy: "Ezabatu"
+      not_found: "Barkatu, baina ezin izan dugu mezu hori aurkitu."
       permalink: "permalink"
   previous: "aurrekoa"
   profile: "Profila"
@@ -556,6 +559,19 @@ eu:
       manage_within: "Adiskideak kudeatu hemen:"
     new_request_to_person: 
       sent: "bidalia!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Bilatu"
   services: 
     create: 
@@ -690,10 +706,14 @@ eu:
   undo: "Desegin?"
   username: "Erabiltzailea"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Zure kontua giltzapetuta dago. 20 minutu eraman dezake kontua ezabatzeak. Eskerrik asko Diaspora erabiltzeagatik."
     edit: 
       also_commented: "...beste norbaitek zure adiskide baten mezua iruzkintzen duenean?"
       change: "Aldatu"
+      change_email: "Change E-Mail"
       change_language: "Hizkuntza Aldatu"
       change_password: "Pasahitza aldatu"
       close_account: "Kontua Ezabatu"
@@ -702,6 +722,7 @@ eu:
       download_photos: "nire argazkiak jaitsi"
       download_xml: "nire xml jaitsi"
       edit_account: "Kontua aldatu"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Datuak esportatu"
       liked: "...norbaitek zure mezu bat gustoko duenean?"
       mentioned: "...mezu batean aipatzen zaituztenean?"
@@ -735,6 +756,8 @@ eu:
       language_not_changed: "Hizkuntza aldaketak huts egin du"
       password_changed: "Pasahitza aldatu duzu. Orain zure pasahitz berria erabiliz sar zaitezke."
       password_not_changed: "Pasahitz Aldaketak Huts egin du"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "ezin izan da webfinger profila hartu %{profile_url} webgunetik"
     hcard_fetch_failed: "%{account} kontutik ezin izan da hcard sortu"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index bccaea8a6..891777a2e 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -26,6 +26,10 @@ fi:
           attributes: 
             from_id: 
               taken: "on jo tehdyn pyynnön kaksoiskappale."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ fi:
       login: "kirjaudu sisään"
       logout: "kirjaudu ulos"
       profile: "Profiili"
+      recent_notifications: "Recent notifications"
       settings: "Asetukset"
       view_all: "View all"
   likes: 
@@ -288,6 +293,12 @@ fi:
         one: "%{count} tykkää"
         other: "%{count} tykkää"
         zero: "ei tykkäyksiä"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Lisää"
   next: "seuraava"
@@ -366,39 +377,31 @@ fi:
       other: "%{actors} started sharing with you."
       zero: "%{actors} started sharing with you."
   notifier: 
-    also_commented: 
-      commented: "kommentoi myös käyttäjän %{post_author} viestiin:"
-      sign_in: "Kirjaudu sisään nähdäksesi."
-      subject: "%{name} on myös kommentoinut %{post_author}:n viestiin."
+    click_here: "click here"
     comment_on_post: 
-      commented: "on kommentoinut viestiisi:"
-      sign_in: "Kirjaudu sisään nähdäksesi."
-      subject: "%{name} on kommentoinut viestiisi."
-    diaspora: "Diasporan sähköpostirobotti"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Hei %{name}!"
     liked: 
       liked: "%{name} tykkäsi kirjoituksestasi: "
-      sign_in: "Kirjaudu sisään nähdäksesi"
-      subject: "%{name} tykkäsi juuri kirjoituksestasi"
-    love: "Terveisin,"
-    manage_your_email_settings: "manage your email settings"
+      view_post: "View post >"
     mentioned: 
       mentioned: "mainitsi sinut viestissään:"
-      sign_in: "Kirjaudu sisään nähdäksesi."
       subject: "%{name} on maininnut sinut Diaspora*:ssa"
     private_message: 
-      message_subject: "Aihe: %{subject}"
-      private_message: "on lähettänyt sinulle henkilökohtaisen viestin:"
-      sign_in: "Kirjaudu sisään nähdäksesi."
-      subject: "%{name} on lähettänyt sinulle henkilökohtaisen viestin Diaspora*:ssa"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "Diasporasi ylläpitäjä"
       subject: "Viesti Diaspora-käyttäjätilistäsi:"
     started_sharing: 
       sharing: "has started sharing with you!"
-      sign_in: "Kirjaudu sisään täältä"
       subject: "%{name} has started sharing with you on Diaspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "Kiitos,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "OK"
   or: "tai"
   password: "Salasana"
@@ -556,6 +559,19 @@ fi:
       manage_within: "Muokkaa kontakteja näkymässä"
     new_request_to_person: 
       sent: "lähetetty!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Etsi"
   services: 
     create: 
@@ -690,10 +706,14 @@ fi:
   undo: "Peruuta?"
   username: "Käyttäjätunnus"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Käyttäjätilin sulkeminen onnistui."
     edit: 
       also_commented: "...joku myös kommentoi kontaktisi viestiin?"
       change: "Vaihda"
+      change_email: "Change E-Mail"
       change_language: "Vaihda kieli"
       change_password: "Vaihda salasana"
       close_account: "Sulje käyttäjätili"
@@ -702,6 +722,7 @@ fi:
       download_photos: "Lataa kaikki kuvat"
       download_xml: "Lataa tiedot XML-muodossa"
       edit_account: "Muokkaa käyttäjätiliä"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Vie tietoja"
       liked: "...tykkää kirjoituksistasi?"
       mentioned: "...sinut mainitaan viestissä?"
@@ -735,6 +756,8 @@ fi:
       language_not_changed: "Kielen vaihtaminen epäonnistui"
       password_changed: "Salasana vaihdettu. Voit nyt kirjautua uudella salasanallasi."
       password_not_changed: "Salasanan vaihto epäonnistui"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "webfinger-profiilin %{profile_url} haku epäonnistui"
     hcard_fetch_failed: "tapahtui virhe haettaessa hcard:ia tilille %{account}"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index f9b9df85b..84498a684 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -26,6 +26,10 @@ fr:
           attributes: 
             from_id: 
               taken: "est un doublon d'une requête déjà existante."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ fr:
       login: "connexion"
       logout: "déconnexion"
       profile: "profil"
+      recent_notifications: "Recent notifications"
       settings: "paramètres"
       view_all: "Tout afficher"
   likes: 
@@ -288,6 +293,12 @@ fr:
         one: "%{count} personne aime"
         other: "%{count} personnes aiment"
         zero: "Personne n'aime ça"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Plus"
   next: "suivant"
@@ -366,39 +377,31 @@ fr:
       other: "%{actors} a/ont commencé à partager avec vous."
       zero: "%{actors} a/ont commencé à partager avec vous."
   notifier: 
-    also_commented: 
-      commented: "a également commenté le message de %{post_author} :"
-      sign_in: "Connectez-vous pour le voir."
-      subject: "%{name} a également commenté le message de %{post_author}."
+    click_here: "click here"
     comment_on_post: 
-      commented: "a commenté votre message:"
-      sign_in: "Connectez-vous pour le voir."
-      subject: "%{name} a commenté votre message."
-    diaspora: "le robot de messagerie électronique de Diaspora"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Bonjour %{name} !"
     liked: 
       liked: "%{name} vient juste d'aimer votre message : "
-      sign_in: "Identifiez-vous pour le voir"
-      subject: "%{name} vient juste d'aimer votre message"
-    love: "affectueusement,"
-    manage_your_email_settings: "modifier vos paramètres de courriel"
+      view_post: "View post >"
     mentioned: 
       mentioned: "vous a mentionné(e) dans un message :"
-      sign_in: "Connectez-vous pour le/la voir."
       subject: "%{name} vous a mentionné(e) sur Diaspora*"
     private_message: 
-      message_subject: "Sujet : %{subject}"
-      private_message: "vous a envoyé un message privé :"
-      sign_in: "Connectez-vous pour le voir."
-      subject: "%{name} vous a envoyé un message privé sur Diaspora*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "Votre administrateur Diaspora"
       subject: "Un message concernant votre compte Diaspora :"
     started_sharing: 
       sharing: "a commencé à partager avec vous !"
-      sign_in: "Identifiez-vous ici"
       subject: "%{name} a commencé à partager avec vous sur Diaspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "Merci,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "OK"
   or: "ou"
   password: "Mot de passe"
@@ -556,6 +559,19 @@ fr:
       manage_within: "Gérer les contacts de"
     new_request_to_person: 
       sent: "envoyée !"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Rechercher"
   services: 
     create: 
@@ -690,10 +706,14 @@ fr:
   undo: "Annuler ?"
   username: "Nom d'utilisateur"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Votre compte a été clôturé. Il faudra peut-être 20 minutes pour terminer la fermeture de votre compte. Merci d'essayer Diaspora."
     edit: 
       also_commented: "…quelqu'un d'autre commente une publication de votre contact ?"
       change: "Modifier"
+      change_email: "Change E-Mail"
       change_language: "Changer la langue"
       change_password: "Changer le mot de passe"
       close_account: "Clôturer le compte"
@@ -702,6 +722,7 @@ fr:
       download_photos: "télécharger mes photos"
       download_xml: "télécharger mon XML"
       edit_account: "Modifier le compte"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Exporter des données"
       liked: "...quelqu'un aime votre message ?"
       mentioned: "…vous êtes mentionné(e) dans une publication ?"
@@ -735,6 +756,8 @@ fr:
       language_not_changed: "Échec lors de la mise à jour de la langue"
       password_changed: "Mot de passe mis à jour. Vous pouvez maintenant vous identifier avec votre nouveau mot de passe."
       password_not_changed: "Échec de la mise à jour du mot de passe"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "impossible de télécharger le profil webfinger pour %{profile_url}"
     hcard_fetch_failed: "une erreur est survenue lors du téléchargement de la hcard de %{account}"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index b881eae0c..96383b96b 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -26,6 +26,10 @@ ga:
           attributes: 
             from_id: 
               taken: "is a duplicate of a pre-existing request."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ ga:
       login: "logáil isteach"
       logout: "logáil amach"
       profile: "profile"
+      recent_notifications: "Recent notifications"
       settings: "settings"
       view_all: "View all"
   likes: 
@@ -288,6 +293,12 @@ ga:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "More"
   next: "ar aghaidh"
@@ -366,39 +377,31 @@ ga:
       other: "%{actors} started sharing with you."
       zero: "%{actors} started sharing with you."
   notifier: 
-    also_commented: 
-      commented: "has also commented on %{post_author}'s post:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has also commented."
+    click_here: "click here"
     comment_on_post: 
-      commented: "has commented on your post!"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has commented on your post."
-    diaspora: "an róbat ríomhpost diaspora"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Haileo %{name}!"
     liked: 
       liked: "%{name} has just liked your post: "
-      sign_in: "Sign to view it"
-      subject: "%{name} has just liked your post"
-    love: "le meas,"
-    manage_your_email_settings: "manage your email settings"
+      view_post: "View post >"
     mentioned: 
       mentioned: "mentioned you in a post:"
-      sign_in: "Sign in to view it."
       subject: "%{name} has mentioned you on Diaspora*"
     private_message: 
-      message_subject: "Subject: %{subject}"
-      private_message: "has sent you a private message:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "Do riarthóir Diaspora"
       subject: "Fógra faoi do chúntas Diaspora:"
     started_sharing: 
       sharing: "has started sharing with you!"
-      sign_in: "Sign in here"
       subject: "%{name} has started sharing with you on Diaspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "Gur raibh maith agat,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "OK"
   or: "nó"
   password: "Pasfhocal"
@@ -556,6 +559,19 @@ ga:
       manage_within: "Bainistiú teagmháilí istigh"
     new_request_to_person: 
       sent: "seolta!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Search"
   services: 
     create: 
@@ -690,10 +706,14 @@ ga:
   undo: "Undo?"
   username: "Ainm úsáideora"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "D'eirigh le dúna do cúntas"
     edit: 
       also_commented: "...someone also comments on your contact's post?"
       change: "Athraigh"
+      change_email: "Change E-Mail"
       change_language: "Athraigh Teanga"
       change_password: "Athraigh Pasfhocal"
       close_account: "Dún Cúntas"
@@ -702,6 +722,7 @@ ga:
       download_photos: "íoslódáil mo phictiúrí"
       download_xml: "íoslódáil mo xml"
       edit_account: "Athraigh cúntas"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Easpórtáil Sonraí"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
@@ -735,6 +756,8 @@ ga:
       language_not_changed: "Níor Éirigh le Athrú Teanga"
       password_changed: "Pasfhocal Athraithe"
       password_not_changed: "Níor Éirigh le Athrú Pasfhocal"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "níor d'éirigh le próifíl webfinger a fháil do %{profile_url}"
     hcard_fetch_failed: "bhí fadbh ag fháil an hcard do %{account}"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index ecb785210..aa873b172 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -26,6 +26,10 @@ he:
           attributes: 
             from_id: 
               taken: "הוא כפיל של בקשה שהתקבלה קודם לכן."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ he:
       login: "כניסה"
       logout: "יציאה"
       profile: "פרופיל"
+      recent_notifications: "Recent notifications"
       settings: "הגדרות"
       view_all: "View all"
   likes: 
@@ -288,6 +293,12 @@ he:
         one: "אדם אחד אהב את זה"
         other: "%{count} אנשים אהבו את זה"
         zero: "אף אחד לא אהב את זה"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "המשך"
   next: "הבאה"
@@ -366,39 +377,31 @@ he:
       other: "%{actors} החל/ה לשתף אתך."
       zero: "%{actors} החלו לשתף אתך."
   notifier: 
-    also_commented: 
-      commented: "גם כן הגיב/ה על הרשומה של %{post_author}:"
-      sign_in: "יש להיכנס כדי לצפות בזה."
-      subject: "%{name} גם כן הגיב/ה על הרשומה של %{post_author}."
+    click_here: "click here"
     comment_on_post: 
-      commented: "הגיב/ה על הרשומה שלך:"
-      sign_in: "יש להיכנס כדי לצפות בזה."
-      subject: "%{name} הגיב/ה על הרשומה שלך."
-    diaspora: "רובוט הדוא״ל של דיאספורה"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "שלום %{name}!"
     liked: 
       liked: "%{name} בדיוק עכשיו סימן/נה את הרשומה שלך כאהובה: "
-      sign_in: "יש להיכנס כדי לצפות בזה"
-      subject: "%{name} בדיוק עכשיו סימן/נה את הרשומה שלך כאהובה"
-    love: "באהבה,"
-    manage_your_email_settings: "ניהול הגדרות הדוא״ל שלך"
+      view_post: "View post >"
     mentioned: 
       mentioned: "ציין/ה אותך ברשומה:"
-      sign_in: "יש להיכנס כדי לצפות בזה."
       subject: "הוזכרת על ידי %{name} בדיאספורה*"
     private_message: 
-      message_subject: "נושא: %{subject}"
-      private_message: "שלח/ה לך הודעה פרטית:"
-      sign_in: "יש להיכנס כדי לצפות בזה."
-      subject: "נשלחה אליך הודעה פרטית מאת %{name} דרך דיאספורה*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "מנהל הדיאספורה שלך"
       subject: "הודעה בנוגע לחשבונך בדיאספורה:"
     started_sharing: 
       sharing: "החל/ה לשתף אתך!"
-      sign_in: "כניסה מכאן"
       subject: "%{name} החל/ה לשתף אתך בדיאספורה*"
+      view_profile: "View %{name}'s profile"
     thanks: "רב תודות,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "אישור"
   or: "או"
   password: "ססמה"
@@ -556,6 +559,19 @@ he:
       manage_within: "ניהול אנשי קשר בתוך"
     new_request_to_person: 
       sent: "נשלחה!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "חיפוש"
   services: 
     create: 
@@ -690,10 +706,14 @@ he:
   undo: "האם לבטל?"
   username: "שם משתמש"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "חשבונך ננעל. סגירת חשבונך עלולה להימשך כ־20 דקות. תודה על שהתנסית בדיאספורה."
     edit: 
       also_commented: "...מישהו הגיב גם על הרשומה של איש הקשר שלך?"
       change: "שינוי"
+      change_email: "Change E-Mail"
       change_language: "החלפת השפה"
       change_password: "החלפת הססמה"
       close_account: "סגירת החשבון"
@@ -702,6 +722,7 @@ he:
       download_photos: "הורדת התמונות שלי"
       download_xml: "הורדת ה־xml שלי"
       edit_account: "עריכת החשבון"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "יצוא הנתונים"
       liked: "...מישהו אהב את הרשומה שלך?"
       mentioned: "...מישהו ציין אותך ברשומה?"
@@ -735,6 +756,8 @@ he:
       language_not_changed: "החלפת השפה נכשלה"
       password_changed: "הססמה הוחלפה. כעת באפשרותך להיכנס עם הססמה החדשה שלך."
       password_not_changed: "החלפת הססמה נכשלה"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "אירע כשל בקבלת פרופיל ה־webfinger שלך ל־%{profile_url}"
     hcard_fetch_failed: "אירעה שגיאה בעת קבלת ה־hcard לחשבון %{account}"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 0fbae8ddf..fe0257624 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -26,6 +26,10 @@ hu:
           attributes: 
             from_id: 
               taken: "már létező kérés."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ hu:
       login: "bejelentkezés"
       logout: "kijelentkezés"
       profile: "profil"
+      recent_notifications: "Recent notifications"
       settings: "beállítások"
       view_all: "View all"
   likes: 
@@ -288,6 +293,12 @@ hu:
         one: "1 személy kedveli"
         other: "%{count} személy kedveli"
         zero: "senki nem kedveli"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Bővebben"
   next: "következő"
@@ -366,39 +377,31 @@ hu:
       other: "%{actors} started sharing with you."
       zero: "%{actors} started sharing with you."
   notifier: 
-    also_commented: 
-      commented: "hozzászólt még %{post_author} bejegyzéséhez is:"
-      sign_in: "Jelentkezz be, hogy megnézhesd."
-      subject: "%{name} is hozzászólt %{post_author} bejegyzéséhez."
+    click_here: "click here"
     comment_on_post: 
-      commented: "hozzászólt a bejegyzésedhez:"
-      sign_in: "Jelentkezz be, hogy megnézd."
-      subject: "%{name} hozzászólt a bejegyzésedhez."
-    diaspora: "A diaspora email robot"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Szia %{name}!"
     liked: 
       liked: "%{name} kedveli a bejegyzésedet:"
-      sign_in: "Sign to view it"
-      subject: "%{name} kedveli a bejegyzésed"
-    love: "Szeretettel,"
-    manage_your_email_settings: "Kezeld az email beállításaidat"
+      view_post: "View post >"
     mentioned: 
       mentioned: "megemlített téged egy bejegyzésében:"
-      sign_in: "Jelentkezz be, hogy megnézhesd."
       subject: "%{name} megemlített téged a Diaspora* közösségi oldalon."
     private_message: 
-      message_subject: "Tárgy: %{subject}"
-      private_message: "egy személyes üzenetet küldött neked:"
-      sign_in: "Jelentkezz be, hogy megnézd."
-      subject: "%{name} egy személyes üzenetet küldött neked a Diaspora-n"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "A Te Diaspora* rendszergazdád"
       subject: "Üzenet a Diaspora* rendszergazdától:"
     started_sharing: 
       sharing: "has started sharing with you!"
-      sign_in: "Sign in here"
       subject: "%{name} has started sharing with you on Diaspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "Köszi,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "Rendben"
   or: "vagy"
   password: "Jelszó"
@@ -556,6 +559,19 @@ hu:
       manage_within: "Kapcsolatok kezelése"
     new_request_to_person: 
       sent: "elküldve!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Keresés"
   services: 
     create: 
@@ -690,10 +706,14 @@ hu:
   undo: "Visszavonod?"
   username: "Felhasználónév"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Fiók sikeresen lezárult."
     edit: 
       also_commented: "...más is hozzászólt az ismerősöd bejegyzéséhez?"
       change: "Módosítás"
+      change_email: "Change E-Mail"
       change_language: "Nyelv megváltoztatása"
       change_password: "Jelszó módosítása"
       close_account: "Fiók bezárása"
@@ -702,6 +722,7 @@ hu:
       download_photos: "Képeim letöltése"
       download_xml: "Saját XML letöltése"
       edit_account: "Fiók szerkesztése"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Adatok exportálása"
       liked: "... valakinek tetszik a bejegyzésed?"
       mentioned: "...meg vagy említve egy bejegyzésben?"
@@ -735,6 +756,8 @@ hu:
       language_not_changed: "Nyelv megváltoztatása nem sikerült"
       password_changed: "A jelszó megváltozott"
       password_not_changed: "Jelszó megváltoztatása nem sikerült"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "Nem sikerült lekérni webfinger profilt %{profile_url} számára"
     hcard_fetch_failed: "nem sikerült lekérni a hCard-ot #{@account} számára"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index d14c18abb..7d61e2214 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -26,6 +26,10 @@ id:
           attributes: 
             from_id: 
               taken: "is a duplicate of a pre-existing request."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ id:
       login: "login"
       logout: "logout"
       profile: "profile"
+      recent_notifications: "Recent notifications"
       settings: "settings"
       view_all: "View all"
   likes: 
@@ -288,6 +293,12 @@ id:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "More"
   next: "next"
@@ -366,39 +377,31 @@ id:
       other: "%{actors} started sharing with you."
       zero: "%{actors} started sharing with you."
   notifier: 
-    also_commented: 
-      commented: "has also commented on %{post_author}'s post:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has also commented."
+    click_here: "click here"
     comment_on_post: 
-      commented: "has commented on your post!"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has commented on your post."
-    diaspora: "the diaspora email robot"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Hello %{name}!"
     liked: 
       liked: "%{name} has just liked your post: "
-      sign_in: "Sign to view it"
-      subject: "%{name} has just liked your post"
-    love: "love,"
-    manage_your_email_settings: "manage your email settings"
+      view_post: "View post >"
     mentioned: 
       mentioned: "mentioned you in a post:"
-      sign_in: "Sign in to view it."
       subject: "%{name} has mentioned you on Diaspora*"
     private_message: 
-      message_subject: "Subject: %{subject}"
-      private_message: "has sent you a private message:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "Your Diaspora administrator"
       subject: "A message from your Diaspora administrator:"
     started_sharing: 
       sharing: "has started sharing with you!"
-      sign_in: "Sign in here"
       subject: "%{name} has started sharing with you on Diaspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "Thanks,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "OK"
   or: "or"
   password: "Password"
@@ -556,6 +559,19 @@ id:
       manage_within: "Manage contacts within"
     new_request_to_person: 
       sent: "sent!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Search"
   services: 
     create: 
@@ -690,10 +706,14 @@ id:
   undo: "Undo?"
   username: "Username"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Account successfully closed."
     edit: 
       also_commented: "...someone also comments on your contact's post?"
       change: "Change"
+      change_email: "Change E-Mail"
       change_language: "Change Language"
       change_password: "Change Password"
       close_account: "Close Account"
@@ -702,6 +722,7 @@ id:
       download_photos: "download my photos"
       download_xml: "download my xml"
       edit_account: "Edit account"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Export Data"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
@@ -735,6 +756,8 @@ id:
       language_not_changed: "Language Change Failed"
       password_changed: "Password Changed"
       password_not_changed: "Password Change Failed"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index 0fb866767..f1666d12e 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -26,6 +26,10 @@ is:
           attributes: 
             from_id: 
               taken: "er afrit af fyrirliggjandi beiðni."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ is:
       login: "Innskráning"
       logout: "Útskrá"
       profile: "profile"
+      recent_notifications: "Recent notifications"
       settings: "settings"
       view_all: "View all"
   likes: 
@@ -288,6 +293,12 @@ is:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Meira"
   next: "næsta"
@@ -366,39 +377,31 @@ is:
       other: "%{actors} started sharing with you."
       zero: "%{actors} started sharing with you."
   notifier: 
-    also_commented: 
-      commented: "hefur einnig gert athugasemd við færslu notandans %{post_author}:"
-      sign_in: "Skráðu þig inn til að skoða það."
-      subject: "%{name} hefur einnig gert athugasemd við færslu tengiliðar þíns. "
+    click_here: "click here"
     comment_on_post: 
-      commented: "hefur gert athugasemd við færsluna þína!"
-      sign_in: "Skráðu þig inn til að sjá það."
-      subject: "%{name} hefur gert atugasemd við þína færslu."
-    diaspora: "the diaspora email robot"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Halló %{name}!"
     liked: 
       liked: "%{name} has just liked your post: "
-      sign_in: "Sign to view it"
-      subject: "%{name} has just liked your post"
-    love: "ást,"
-    manage_your_email_settings: "manage your email settings"
+      view_post: "View post >"
     mentioned: 
       mentioned: "gat þín í pósti:"
-      sign_in: "Skráðu þig inn til að sjá það."
       subject: "% {Nafn} hefur getið þín á Diaspora*"
     private_message: 
-      message_subject: "Subject: %{subject}"
-      private_message: "has sent you a private message:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "Your Diaspora administrator"
       subject: "Skilaboð um notandastillingar þínar í Diaspora:"
     started_sharing: 
       sharing: "has started sharing with you!"
-      sign_in: "Sign in here"
       subject: "%{name} has started sharing with you on Diaspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "Takk,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "OK"
   or: "eða"
   password: "Lykilorð"
@@ -556,6 +559,19 @@ is:
       manage_within: "Umsjón tengiliða innan"
     new_request_to_person: 
       sent: "sent!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Leita"
   services: 
     create: 
@@ -690,10 +706,14 @@ is:
   undo: "Undo?"
   username: "Notandanafn"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Notandastillingar voru afskráðar."
     edit: 
       also_commented: "...someone also comments on your contact's post?"
       change: "Breyting"
+      change_email: "Change E-Mail"
       change_language: "Breyta um tungumál"
       change_password: "Breyta lykilorði"
       close_account: "Loka notendastillingum."
@@ -702,6 +722,7 @@ is:
       download_photos: "download my photos"
       download_xml: "download my xml"
       edit_account: "Breyta notandastillingum"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Export Data"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
@@ -735,6 +756,8 @@ is:
       language_not_changed: "ekki tókst að breyta um tungumál"
       password_changed: "Lykilorði var breytt"
       password_not_changed: "Breyting á lykilorði mistókst"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for %{account}"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index d68a7e9fa..27179fcaf 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -26,6 +26,10 @@ it:
           attributes: 
             from_id: 
               taken: "è un duplicato di una richiesta pre-esistente."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "Hai già condiviso quel post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ it:
       login: "accedi"
       logout: "esci"
       profile: "profilo"
+      recent_notifications: "Notifiche recenti"
       settings: "impostazioni"
       view_all: "Elenco completo"
   likes: 
@@ -288,6 +293,12 @@ it:
         one: "%{count} Mi piace"
         other: "%{count} Mi piace"
         zero: "0 Mi piace"
+      people_like_this_comment: 
+        few: "%{count} mi piace"
+        many: "%{count} mi piace"
+        one: "%{count} mi piace"
+        other: "%{count} mi piace"
+        zero: "0 mi piace"
   limited: "Non pubblico"
   more: "Altro"
   next: "successivo"
@@ -366,39 +377,31 @@ it:
       other: "%{actors} hanno iniziato a condividere con te."
       zero: "%{actors} ha iniziato a condividere con te."
   notifier: 
-    also_commented: 
-      commented: "ha anche commentato sul post di %{post_author}:"
-      sign_in: "Accedi per vederlo."
-      subject: "%{name} ha anche commentato sul post di %{post_author}."
+    click_here: "clicca qui"
     comment_on_post: 
-      commented: "ha commentato il tuo post:"
-      sign_in: "Accedi per vederlo."
-      subject: "%{name} ha commentato il tuo post."
-    diaspora: "il robot che manda email per diaspora"
+      reply: "Rispondi o leggi il post di %{name} >"
+    confirm_email: 
+      click_link: "Per attivare il nuo nuovo indirizzo email %{unconfirmed_email}, per favore clicca su questo link:"
+      subject: "Per favore attiva il tuo nuovo indirizzo email %{unconfirmed_email}"
+    email_sent_by_diaspora: "Questo messaggio è stato spedito da Diaspora.  Se preferisci smettere di ricevere questo tipo di email,"
     hello: "Ciao %{name}!"
     liked: 
       liked: "%{name} ha appena apprezzato il tuo post: "
-      sign_in: "Per vedere è necessario accedere"
-      subject: "%{name} ha appena apprezzato il tuo post"
-    love: "pace e bene,"
-    manage_your_email_settings: "gestisci le tue impostazioni email"
+      view_post: "Leggi il post >"
     mentioned: 
       mentioned: "ti ha menzionato in un post:"
-      sign_in: "Accedi per vederlo."
       subject: "%{name} ti ha menzionato su Diaspora*"
     private_message: 
-      message_subject: "Oggetto: %{subject}"
-      private_message: "ti ha inviato un messaggio privato:"
-      sign_in: "Accedi per vederlo."
-      subject: "%{name} ti ha inviato un messaggio privato su Diaspora*"
+      reply_to_or_view: "Rispondi o leggi questa conversazione >"
     single_admin: 
       admin: "Il tuo amministratore Diaspora"
       subject: "Un messaggio sul tuo account Diaspora:"
     started_sharing: 
       sharing: "ha iniziato a condividere con te!"
-      sign_in: "Accedi qui"
       subject: "%{name} ha iniziato a condividere con te su Diaspora*"
+      view_profile: "Guarda il profilo di %{name}"
     thanks: "Grazie,"
+    to_change_your_notification_settings: "per cambiare le opzioni delle notifiche"
   ok: "OK"
   or: "o"
   password: "Password"
@@ -530,7 +533,7 @@ it:
       unhappy: "Triste?"
       update: "Aggiorna"
     new: 
-      enter_email: "Inserisci un e-mail"
+      enter_email: "Inserisci un indirizzo email"
       enter_password: "Inserisci una password"
       enter_password_again: "Inserisci la stessa password di prima"
       enter_username: "Scegli un nome utente (inserisci solo lettere, numeri e trattino basso)"
@@ -556,6 +559,19 @@ it:
       manage_within: "Amministra contatti"
     new_request_to_person: 
       sent: "richiesta inviata!"
+  reshares: 
+    create: 
+      failure: "C'è stato un errore nel ricondividere questo post."
+    reshare: 
+      deleted: "Il post originale è stato eliminato dall'autore."
+      reshare: 
+        few: "%{count} Ricondivisioni"
+        many: "%{count} Ricondivisioni"
+        one: "1 Ricondivisione"
+        other: "%{count} Ricondivisioni"
+        zero: "Ricondividi"
+      reshare_confirmation: "Vuoi ricondividere %{author} - %{text}?"
+      show_original: "Mostra l'originale"
   search: "Cerca"
   services: 
     create: 
@@ -603,7 +619,7 @@ it:
       logged_in_as: "accesso effettuato come %{name}"
       your_aspects: "i tuoi aspetti"
     invitations: 
-      by_email: "Via Email"
+      by_email: "Via email"
       dont_have_now: "Non ne hai alcuno per il momento, ma altri arriveranno presto!"
       from_facebook: "Da Facebook"
       invitations_left: "%{count} rimanenti"
@@ -690,22 +706,27 @@ it:
   undo: "Annullare?"
   username: "Nome Utente"
   users: 
+    confirm_email: 
+      email_confirmed: "Email %{email} attivata"
+      email_not_confirmed: "L'email non è stata attivata. C'è un errore nel link?"
     destroy: "Il tuo account è stato bloccato. Potrebbero occorrerci 20 minuti per terminare la chiusura del tuo account. Grazie per aver provato Diaspora."
     edit: 
       also_commented: "...qualcun altro ha commentato il post del tuo contatto?"
       change: "Cambia"
+      change_email: "Cambia email"
       change_language: "Cambia lingua"
-      change_password: "Cambia Password"
+      change_password: "Cambia password"
       close_account: "Chiudi account"
       comment_on_post: "...qualcuno ha commentato il tuo post?"
       current_password: "Password attuale"
       download_photos: "scarica le mie foto"
       download_xml: "scarica il mio xml"
       edit_account: "Modifica account"
+      email_awaiting_confirmation: "È stato spedito su %{unconfirmed_email} un link di attivazione. Continueremo ad usare la tua email originale %{email} finché non cliccherai sul link e attiverai il nuovo indirizzo."
       export_data: "Esporta Dati"
       liked: "...a qualcuno piace il tuo post?"
       mentioned: "...sei menzionato in un post?"
-      new_password: "Nuova Password"
+      new_password: "Nuova password"
       private_message: "...hai ricevuto un messaggio privato?"
       receive_email_notifications: "Ricevi notifiche via email quando..."
       started_sharing: "...qualcuno vuole condividere con te?"
@@ -732,9 +753,11 @@ it:
     update: 
       email_notifications_changed: "Notifiche email modificate con successo"
       language_changed: "Lingua cambiata"
-      language_not_changed: "Cambio di lingua fallito"
+      language_not_changed: "Il cambio di lingua è fallito"
       password_changed: "Password cambiata. Ora puoi effettuare l'accesso con la tua nuova password."
-      password_not_changed: "Cambio di password fallito"
+      password_not_changed: "Il cambio di password è fallito"
+      unconfirmed_email_changed: "L'email è cambiata. E' necessario attivare l'indirizzo."
+      unconfirmed_email_not_changed: "Il cambio di email è fallito"
   webfinger: 
     fetch_failed: "impossibile recuperare il profilo webfinger da %{profile_url}"
     hcard_fetch_failed: "impossibile recuperare l'hcard di %{account}"
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index a34fbf64a..8e6f075a9 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -26,6 +26,10 @@ ja:
           attributes: 
             from_id: 
               taken: "既存のリクエストと重複しています。"
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ ja:
       login: "ログイン"
       logout: "ログアウト"
       profile: "プロフィール"
+      recent_notifications: "Recent notifications"
       settings: "設定"
       view_all: "View all"
   likes: 
@@ -288,6 +293,12 @@ ja:
         one: "これが好きな人：1人"
         other: "これが好きな人：%{count}人"
         zero: "これが好きな人：0人"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "続き"
   next: "次へ"
@@ -366,39 +377,31 @@ ja:
       other: "%{actors} started sharing with you."
       zero: "%{actors} started sharing with you."
   notifier: 
-    also_commented: 
-      commented: "も%{post_author}さんの投稿にコメントしました："
-      sign_in: "コメントを見るにはログインしてください。"
-      subject: "%{name}も%{post_author}さんの投稿にコメントしました。"
+    click_here: "click here"
     comment_on_post: 
-      commented: "は次の投稿にコメントしました："
-      sign_in: "見るにはログインしてください。"
-      subject: "%{name}は投稿にコメントしました。"
-    diaspora: "ダイアスポラ＊メールロボット"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "%{name}さん、こんにちは！"
     liked: 
       liked: "%{name} has just liked your post: "
-      sign_in: "Sign to view it"
-      subject: "%{name} has just liked your post"
-    love: "それでは、"
-    manage_your_email_settings: "メール設定を管理する"
+      view_post: "View post >"
     mentioned: 
       mentioned: "さんは投稿であなたをメンションしました。"
-      sign_in: "見るのにログインして下さい。"
       subject: "%{name}さんはダイアスポラ＊であなたをメンションしました。"
     private_message: 
-      message_subject: "件名：%{subject}"
-      private_message: "からメッセージが届いています。"
-      sign_in: "見るにはログインしてください。"
-      subject: "ダイアスポラ＊で%{name}さんからの非公開メッセージが届いています。"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "ダイアスポラ＊管理者"
       subject: "ダイアスポラ＊アカウントの重要なお知らせ："
     started_sharing: 
       sharing: "has started sharing with you!"
-      sign_in: "Sign in here"
       subject: "%{name} has started sharing with you on Diaspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "ありがとうございます。"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "了解"
   or: "または"
   password: "パスワード"
@@ -556,6 +559,19 @@ ja:
       manage_within: "次のアスペクトの連絡先を管理："
     new_request_to_person: 
       sent: "送信しました！"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "検索"
   services: 
     create: 
@@ -690,10 +706,14 @@ ja:
   undo: "元に戻す"
   username: "ユーザ名"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "アカウント閉鎖に成功しました。"
     edit: 
       also_commented: "他の人も連絡先の投稿にコメントしたとき"
       change: "変更"
+      change_email: "Change E-Mail"
       change_language: "言語変更"
       change_password: "パスワード変更"
       close_account: "アカウント閉鎖"
@@ -702,6 +722,7 @@ ja:
       download_photos: "写真をダウンロードする"
       download_xml: "XMLをダウンロードする"
       edit_account: "アカウント編集"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "データ出力"
       liked: "...someone likes your post?"
       mentioned: "投稿に自分がメンションされたとき"
@@ -735,6 +756,8 @@ ja:
       language_not_changed: "言語の選択に失敗しました"
       password_changed: "パスワードを変更しました"
       password_not_changed: "パスワードの変更に失敗しました"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "%{profile_url} のwebfingerプロフィールの取得に失敗しました。"
     hcard_fetch_failed: "%{account}のhcard取得に問題が発生しました。"
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index 560bd00c7..1baae0db6 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -26,6 +26,10 @@ ko:
           attributes: 
             from_id: 
               taken: "이미 요청했습니다."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ ko:
       login: "로그인"
       logout: "로그아웃"
       profile: "프로필"
+      recent_notifications: "Recent notifications"
       settings: "설정"
       view_all: "모두 보기"
   likes: 
@@ -288,7 +293,13 @@ ko:
         one: "한 명이 좋아합니다"
         other: "%{count}명이 좋아합니다"
         zero: "아무도 좋아하지 않습니다"
-  limited: "Limited"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
+  limited: "제한됨"
   more: "더"
   next: "다음"
   no_results: "결과 없음"
@@ -366,39 +377,31 @@ ko:
       other: "%{actors}님이 나와 공유를 시작했습니다."
       zero: "%{actors}님이 나와 공유를 시작했습니다."
   notifier: 
-    also_commented: 
-      commented: "님도 %{post_author}님의 공유물에 댓글을 달았습니다:"
-      sign_in: "로그인하기"
-      subject: "%{name}님도 %{post_author}님의 공유물에 댓글을 달았습니다."
+    click_here: "click here"
     comment_on_post: 
-      commented: "님이 내 공유물에 댓글을 달았습니다:"
-      sign_in: "로그인하기"
-      subject: "%{name}님이 내 공유물에 댓글을 달았습니다."
-    diaspora: "디아스포라 자동 이메일"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "%{name}님!"
     liked: 
       liked: "%{name}님이 내 공유물을 좋아합니다:"
-      sign_in: "Sign to view it"
-      subject: "%{name}님이 내 공유물을 좋아합니다."
-    love: ""
-    manage_your_email_settings: "이메일 설정 관리"
+      view_post: "View post >"
     mentioned: 
       mentioned: "님이 공유물에서 나를 멘션했습니다:"
-      sign_in: "로그인하기"
       subject: "%{name}님이 디아스포라*에서 나를 멘션했습니다"
     private_message: 
-      message_subject: "제목: %{subject}"
-      private_message: "님이 디아스포라*에서 쪽지를 보냈습니다:"
-      sign_in: "로그인하기"
-      subject: "%{name}님이 디아스포라*에서 쪽지를 보냈습니다"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "디아스포라 관리자"
       subject: "내 디아스포라 계정에 대한 메시지:"
     started_sharing: 
       sharing: "님이 나와 공유를 시작했습니다!"
-      sign_in: "여기서 로그인하세요"
       subject: "%{name}님이 디아스포라*에서 나와 공유를 시작했습니다."
+      view_profile: "View %{name}'s profile"
     thanks: "고맙습니다."
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "확인"
   or: "또는"
   password: "암호"
@@ -492,9 +495,9 @@ ko:
       post_hidden: "%{name}님의 공유물을 감췄습니다."
   posts: 
     show: 
-      destroy: "Delete"
-      not_found: "Sorry, we couldn't find that post."
-      permalink: "permalink"
+      destroy: "지우기"
+      not_found: "해당 공유물을 찾을 수 없습니다."
+      permalink: "영구 링크"
   previous: "이전"
   profile: "프로필"
   profiles: 
@@ -556,6 +559,19 @@ ko:
       manage_within: "컨택 관리하기:"
     new_request_to_person: 
       sent: "보냈습니다."
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "검색"
   services: 
     create: 
@@ -690,10 +706,14 @@ ko:
   undo: "돌이키겠습니까?"
   username: "사용자명"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "계정을 성공적으로 없앴습니다."
     edit: 
       also_commented: "댓글 달았던 공유물에 내 컨택도 댓글을 달았을 때"
       change: "바꾸기"
+      change_email: "Change E-Mail"
       change_language: "언어 바꾸기"
       change_password: "암호 바꾸기"
       close_account: "계정 없애기"
@@ -702,6 +722,7 @@ ko:
       download_photos: "내 사진 다운로드"
       download_xml: "내 xml 다운로드"
       edit_account: "계정 고치기"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "자료 뽑아내기"
       liked: "누군가가 내 공유물을 좋아할 때"
       mentioned: "내가 멘션되었을 때"
@@ -735,6 +756,8 @@ ko:
       language_not_changed: "언어를 바꿀 수 없습니다"
       password_changed: "암호를 바꿨습니다"
       password_not_changed: "암호를 바꿀 수 없습니다"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for %{account}"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index c36257d2f..e3882308b 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -26,6 +26,10 @@ lt:
           attributes: 
             from_id: 
               taken: "is a duplicate of a pre-existing request."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ lt:
       login: "prisijungti"
       logout: "atsijungti"
       profile: "profile"
+      recent_notifications: "Recent notifications"
       settings: "settings"
       view_all: "View all"
   likes: 
@@ -288,6 +293,12 @@ lt:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "More"
   next: "next"
@@ -366,39 +377,31 @@ lt:
       other: "%{actors} started sharing with you."
       zero: "%{actors} started sharing with you."
   notifier: 
-    also_commented: 
-      commented: "has also commented on %{post_author}'s post:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has also commented."
+    click_here: "click here"
     comment_on_post: 
-      commented: "has commented on your post!"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has commented on your post."
-    diaspora: "Diasporos pašto robotas"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Labas, %{name}!"
     liked: 
       liked: "%{name} has just liked your post: "
-      sign_in: "Sign to view it"
-      subject: "%{name} has just liked your post"
-    love: "su meile,"
-    manage_your_email_settings: "manage your email settings"
+      view_post: "View post >"
     mentioned: 
       mentioned: "mentioned you in a post:"
-      sign_in: "Sign in to view it."
       subject: "%{name} has mentioned you on Diaspora*"
     private_message: 
-      message_subject: "Subject: %{subject}"
-      private_message: "has sent you a private message:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "Your Diaspora administrator"
       subject: "A message from your Diaspora administrator:"
     started_sharing: 
       sharing: "has started sharing with you!"
-      sign_in: "Sign in here"
       subject: "%{name} has started sharing with you on Diaspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "Thanks,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "gerai"
   or: "arba"
   password: "Slaptažodis"
@@ -556,6 +559,19 @@ lt:
       manage_within: "Valdyti kontaktus ties"
     new_request_to_person: 
       sent: "išsiųsta!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Paieška"
   services: 
     create: 
@@ -690,10 +706,14 @@ lt:
   undo: "Undo?"
   username: "Vartotojo vardas"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Paskyra uždaryta sėkmingai."
     edit: 
       also_commented: "...someone also comments on your contact's post?"
       change: "Change"
+      change_email: "Change E-Mail"
       change_language: "Keisti kalbą"
       change_password: "Keisti slaptažodį"
       close_account: "Uždaryti paskyrą"
@@ -702,6 +722,7 @@ lt:
       download_photos: "atsisiųsti mano nuotraukas"
       download_xml: "atsisiųsti mano duomenis xml formatu"
       edit_account: "Edit account"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Eksportuoti duomenis"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
@@ -735,6 +756,8 @@ lt:
       language_not_changed: "Kalbos pakeisti nepavyko"
       password_changed: "Slaptažodis pakeistas"
       password_not_changed: "Slaptažodžio pakeisti nepavyko"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index ef0835864..43c002bb9 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -26,6 +26,10 @@ mk:
           attributes: 
             from_id: 
               taken: "is a duplicate of a pre-existing request."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ mk:
       login: "најави се"
       logout: "одјави се"
       profile: "profile"
+      recent_notifications: "Recent notifications"
       settings: "settings"
       view_all: "View all"
   likes: 
@@ -288,6 +293,12 @@ mk:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "More"
   next: "next"
@@ -366,39 +377,31 @@ mk:
       other: "%{actors} started sharing with you."
       zero: "%{actors} started sharing with you."
   notifier: 
-    also_commented: 
-      commented: "has also commented on %{post_author}'s post:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has also commented."
+    click_here: "click here"
     comment_on_post: 
-      commented: "has commented on your post!"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has commented on your post."
-    diaspora: "diaspora е-маил робот"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Здраво %{name}!"
     liked: 
       liked: "%{name} has just liked your post: "
-      sign_in: "Sign to view it"
-      subject: "%{name} has just liked your post"
-    love: "со љубов,"
-    manage_your_email_settings: "manage your email settings"
+      view_post: "View post >"
     mentioned: 
       mentioned: "mentioned you in a post:"
-      sign_in: "Sign in to view it."
       subject: "%{name} has mentioned you on Diaspora*"
     private_message: 
-      message_subject: "Subject: %{subject}"
-      private_message: "has sent you a private message:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "Your Diaspora administrator"
       subject: "A message from your Diaspora administrator:"
     started_sharing: 
       sharing: "has started sharing with you!"
-      sign_in: "Sign in here"
       subject: "%{name} has started sharing with you on Diaspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "Thanks,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "ОК"
   or: "или"
   password: "Лозинка"
@@ -556,6 +559,19 @@ mk:
       manage_within: "Менаџирај контакти во"
     new_request_to_person: 
       sent: "испратено!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Барај"
   services: 
     create: 
@@ -690,10 +706,14 @@ mk:
   undo: "Undo?"
   username: "Корисничко име"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Корисничката сметка е успешно затворена."
     edit: 
       also_commented: "...someone also comments on your contact's post?"
       change: "Change"
+      change_email: "Change E-Mail"
       change_language: "Промени јазик"
       change_password: "Промени лозинка"
       close_account: "Затвори корисничка сметка"
@@ -702,6 +722,7 @@ mk:
       download_photos: "симни ги моите слики"
       download_xml: "симни го мојот xml"
       edit_account: "Edit account"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Изнеси податоци"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
@@ -735,6 +756,8 @@ mk:
       language_not_changed: "Изменувањето на јазик е неуспешно"
       password_changed: "Лозинката е променета"
       password_not_changed: "Промената на лозинка е неуспешна"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 6e539700d..21aadabb9 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -26,6 +26,10 @@ nb:
           attributes: 
             from_id: 
               taken: "er en kopi av en pre-eksisterende forespørsel."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ nb:
       login: "logg inn"
       logout: "logg ut"
       profile: "profil"
+      recent_notifications: "Recent notifications"
       settings: "innstillinger"
       view_all: "View all"
   likes: 
@@ -288,6 +293,12 @@ nb:
         one: "1 person liker dette"
         other: "%{count} personer liker dette"
         zero: "ingen liker dette"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Mer"
   next: "neste"
@@ -366,39 +377,31 @@ nb:
       other: "%{actors} started sharing with you."
       zero: "%{actors} started sharing with you."
   notifier: 
-    also_commented: 
-      commented: "har også kommentert på %{post_author} sitt innlegg:"
-      sign_in: "Logg inn for å se det."
-      subject: "%{name} has also commented."
+    click_here: "click here"
     comment_on_post: 
-      commented: "has commented on your post!"
-      sign_in: "Logg inn for å se det."
-      subject: "%{name} har kommentert på ditt innlegg."
-    diaspora: "diasporas epostrobot"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Hei %{name}!"
     liked: 
       liked: "%{name} has just liked your post: "
-      sign_in: "Sign to view it"
-      subject: "%{name} has just liked your post"
-    love: "vennlig hilsen,"
-    manage_your_email_settings: "administrer e-postinnstillingene"
+      view_post: "View post >"
     mentioned: 
       mentioned: "nevnte deg i et innlegg:"
-      sign_in: "Logg inn for å se det."
       subject: "%{name} har nevnt deg på Diaspora*"
     private_message: 
-      message_subject: "Emne: %{subject}"
-      private_message: "har sendt deg en privat melding:"
-      sign_in: "Logg inn for å se den."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "Din Diaspora administrator"
       subject: "A message from your Diaspora administrator:"
     started_sharing: 
       sharing: "has started sharing with you!"
-      sign_in: "Sign in here"
       subject: "%{name} has started sharing with you on Diaspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "Takk,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "OK"
   or: "eller"
   password: "Passord"
@@ -556,6 +559,19 @@ nb:
       manage_within: "Administrer kontakter innen"
     new_request_to_person: 
       sent: "sendt!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Søk"
   services: 
     create: 
@@ -690,10 +706,14 @@ nb:
   undo: "Angre?"
   username: "Brukernavn"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Kontoen er stengt."
     edit: 
       also_commented: " noen andre også kommenterte på din kontakts innlegg?"
       change: "Endre"
+      change_email: "Change E-Mail"
       change_language: "Endre Språk"
       change_password: "Endre Passord"
       close_account: "Steng Konto"
@@ -702,6 +722,7 @@ nb:
       download_photos: "last ned mine bilder"
       download_xml: "last ned min xml"
       edit_account: "Endre konto"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Eksporter Data"
       liked: "...someone likes your post?"
       mentioned: " du nevnes i et innlegg?"
@@ -735,6 +756,8 @@ nb:
       language_not_changed: "Endring av språk mislyktes"
       password_changed: "Passord Endret"
       password_not_changed: "Endring av Passord mislyktes"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "klarte ikke å hente webfinger profil for % {profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index e4d22f461..33d4e2880 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -26,6 +26,10 @@ nl:
           attributes: 
             from_id: 
               taken: "is een duplicaat van een reeds bestaande aanvraag."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ nl:
       login: "inloggen"
       logout: "log uit"
       profile: "profiel"
+      recent_notifications: "Recent notifications"
       settings: "instellingen"
       view_all: "Bekijk alles"
   likes: 
@@ -288,6 +293,12 @@ nl:
         one: "%{count} persoon vindt dit leuk"
         other: "%{count} mensen vinden dit leuk"
         zero: "niemand vindt dit leuk"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Beperkt"
   more: "Meer"
   next: "volgende"
@@ -366,39 +377,31 @@ nl:
       other: "%{actors} delen nu met jou."
       zero: "%{actors} deelt nu met jou."
   notifier: 
-    also_commented: 
-      commented: "heeft ook op %{post_author}'s post gereageerd:"
-      sign_in: "Log in om het te zien."
-      subject: "%{name} heeft ook gereageerd op %{post_author}'s post."
+    click_here: "click here"
     comment_on_post: 
-      commented: "heeft gereageerd op jouw post:"
-      sign_in: "Log in om het te zien."
-      subject: "%{name} heeft op jouw post gereageerd."
-    diaspora: "de diaspora email robot"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Hoi %{name}!"
     liked: 
       liked: "%{name} vind je post leuk: "
-      sign_in: "Sign to view it"
-      subject: "%{name} vindt jouw post leuk"
-    love: "liefs,"
-    manage_your_email_settings: "beheer je e-mail instellingen"
+      view_post: "View post >"
     mentioned: 
       mentioned: "heeft jou genoemd in een post:"
-      sign_in: "Log in om het te bekijken."
       subject: "%{name} heeft jou genoemd op Diaspora*"
     private_message: 
-      message_subject: "Onderwerp: %{subject}"
-      private_message: "heeft je een persoonlijk bericht gestuurd:"
-      sign_in: "Log in om het te zien."
-      subject: "%{name} heeft je een persoonlijk bericht gestuurd op Diaspora*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "Je Diaspora administrator"
       subject: "Een bericht over je Diaspora account:"
     started_sharing: 
       sharing: "deelt vanaf nu met jou!"
-      sign_in: "Log hier in"
       subject: "%{name} deelt vanaf nu met je op Diaspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "Bedankt,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "OK"
   or: "of"
   password: "Wachtwoord"
@@ -556,6 +559,19 @@ nl:
       manage_within: "Beheer contacten in"
     new_request_to_person: 
       sent: "verzonden!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Zoek"
   services: 
     create: 
@@ -690,10 +706,14 @@ nl:
   undo: "Ongedaan maken?"
   username: "Gebruikersnaam"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Je account is geblokkeerd. Het sluiten van je account kan twintig minuten in beslag nemen. Bedankt voor je interesse in Diaspora."
     edit: 
       also_commented: "...iemand na jou op de post van jouw contact reageert?"
       change: "Verander"
+      change_email: "Change E-Mail"
       change_language: "Taal wijzigen"
       change_password: "Verander wachtwoord"
       close_account: "Verwijder account"
@@ -702,6 +722,7 @@ nl:
       download_photos: "download mijn foto's"
       download_xml: "download mijn xml"
       edit_account: "Bewerk account"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Exporteer data"
       liked: "... iemand je post leuk vind?"
       mentioned: "...je genoemd word in een post?"
@@ -735,6 +756,8 @@ nl:
       language_not_changed: "Taal wijzigen mislukt"
       password_changed: "Wachtwoord gewijzigd. Je kunt nu inloggen met je nieuwe wachtwoord."
       password_not_changed: "Wachtwoord wijzigen mislukt"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "ophalen van webfinger profiel is mislukt voor %{profile_url}"
     hcard_fetch_failed: "er was een probleem bij het ophalen van de hcard voor %{account}"
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index c6539e9f5..c69c2a680 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -26,6 +26,10 @@ pa:
           attributes: 
             from_id: 
               taken: "is a duplicate of a pre-existing request."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ pa:
       login: "ਲਾਗਇਨ"
       logout: "ਲਾਗਆਉਟ"
       profile: "profile"
+      recent_notifications: "Recent notifications"
       settings: "settings"
       view_all: "View all"
   likes: 
@@ -288,6 +293,12 @@ pa:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "ਹੋਰ"
   next: "ਅੱਗੇ"
@@ -366,39 +377,31 @@ pa:
       other: "%{actors} started sharing with you."
       zero: "%{actors} started sharing with you."
   notifier: 
-    also_commented: 
-      commented: "has also commented on %{post_author}'s post:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has also commented."
+    click_here: "click here"
     comment_on_post: 
-      commented: "has commented on your post!"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has commented on your post."
-    diaspora: "the diaspora email robot"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "ਹੈਲੋ %{name}!"
     liked: 
       liked: "%{name} has just liked your post: "
-      sign_in: "Sign to view it"
-      subject: "%{name} has just liked your post"
-    love: "love,"
-    manage_your_email_settings: "manage your email settings"
+      view_post: "View post >"
     mentioned: 
       mentioned: "mentioned you in a post:"
-      sign_in: "Sign in to view it."
       subject: "%{name} has mentioned you on Diaspora*"
     private_message: 
-      message_subject: "Subject: %{subject}"
-      private_message: "has sent you a private message:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "Your Diaspora administrator"
       subject: "A message about your Diaspora account:"
     started_sharing: 
       sharing: "has started sharing with you!"
-      sign_in: "Sign in here"
       subject: "%{name} has started sharing with you on Diaspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "Thanks,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "ਠੀਕ ਹੈ"
   or: "ਜਾਂ"
   password: "ਪਾਸਵਰਡ"
@@ -556,6 +559,19 @@ pa:
       manage_within: "Manage contacts within"
     new_request_to_person: 
       sent: "ਭੇਜਿਆ!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "ਖੋਜ"
   services: 
     create: 
@@ -690,10 +706,14 @@ pa:
   undo: "Undo?"
   username: "ਯੂਜ਼ਰ ਨਾਂ"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Account successfully closed."
     edit: 
       also_commented: "...someone also comments on your contact's post?"
       change: "Change"
+      change_email: "Change E-Mail"
       change_language: "Change Language"
       change_password: "Change Password"
       close_account: "Close Account"
@@ -702,6 +722,7 @@ pa:
       download_photos: "download my photos"
       download_xml: "download my xml"
       edit_account: "Edit account"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Export Data"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
@@ -735,6 +756,8 @@ pa:
       language_not_changed: "Language Change Failed"
       password_changed: "ਪਾਸਵਰਡ ਬਦਲਿਆ ਗਿਆ"
       password_not_changed: "Password Change Failed"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for %{account}"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 6a02a4d78..52f835379 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -26,6 +26,10 @@ pl:
           attributes: 
             from_id: 
               taken: "is a duplicate of a pre-existing request."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ pl:
       login: "logowanie"
       logout: "wyloguj"
       profile: "profil"
+      recent_notifications: "Recent notifications"
       settings: "ustawienia"
       view_all: "View all"
   likes: 
@@ -288,6 +293,12 @@ pl:
         one: "1 osoba to polubiła"
         other: "%{count} osób polubiło to"
         zero: "nikt tego nie polubił"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Więcej"
   next: "następny"
@@ -366,39 +377,31 @@ pl:
       other: "%{actors} started sharing with you."
       zero: "%{actors} started sharing with you."
   notifier: 
-    also_commented: 
-      commented: "skomentował też wpis użytkownika %{post_author}:"
-      sign_in: "Zaloguj się, aby je obejrzeć."
-      subject: "%{name} skomentował również wpis użytkownika %{post_author}."
+    click_here: "click here"
     comment_on_post: 
-      commented: "skomentował twój wpis:"
-      sign_in: "Zaloguj się, aby go obejrzeć."
-      subject: "Użytkownik %{name} skomentował Twój wpis."
-    diaspora: "robot e-mailowy diaspory"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Cześć %{name}!"
     liked: 
       liked: "użytkownik %{name} polubił twój post: "
-      sign_in: "Zaloguj się, aby zobaczyć"
-      subject: "użytkownik %{name} polubił twój wpis"
-    love: "uściski,"
-    manage_your_email_settings: "zarządzaj ustawieniami emaila"
+      view_post: "View post >"
     mentioned: 
       mentioned: "wspomniał(a) o tobie we wpisie:"
-      sign_in: "Zaloguj się, aby uzyskać dostęp."
       subject: "%{name} wspomniał o tobie w serwisie Diaspora*"
     private_message: 
-      message_subject: "Temat: %{subject}"
-      private_message: "wysłał ci wiadomość prywatną:"
-      sign_in: "Zarejestruj się, aby zobaczyć."
-      subject: "%{name} wysłał ci prywatną wiadomość w serwisie Diaspora*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "Twój panel zarządzania Diaspora"
       subject: "Wiadomość od twojego panelu zarządzania Diaspora:"
     started_sharing: 
       sharing: "zaczął dzielić się z tobą!"
-      sign_in: "Zaloguj się"
       subject: "%{name} zaczął dzielić się z tobą na Diasporze*"
+      view_profile: "View %{name}'s profile"
     thanks: "Dzięki,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "OK"
   or: "lub"
   password: "Hasło"
@@ -556,6 +559,19 @@ pl:
       manage_within: "Zarządzanie kontaktami w"
     new_request_to_person: 
       sent: "wysłano!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Szukaj"
   services: 
     create: 
@@ -690,10 +706,14 @@ pl:
   undo: "Cofnąć?"
   username: "Nazwa użytkownika"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Konto zostało pomyślnie zamknięte."
     edit: 
       also_commented: "...ktoś także skomentuje wpis jednego z twoich kontaktów?"
       change: "Zmień"
+      change_email: "Change E-Mail"
       change_language: "Zmień język"
       change_password: "Zmiana hasła"
       close_account: "Zamknij konto"
@@ -702,6 +722,7 @@ pl:
       download_photos: "pobierz moje zdjęcia"
       download_xml: "pobierz mój xml"
       edit_account: "Edytuj konto"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Eksportowanie danych"
       liked: "...ktoś polubił twój wpis?"
       mentioned: "...zostałeś wspomniany(a) we wpisie?"
@@ -735,6 +756,8 @@ pl:
       language_not_changed: "Nie udało się zmienić języka"
       password_changed: "Zmieniono hasło"
       password_not_changed: "Nie udało się zmienić hasła"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "Nie udało się pobrać profilu Webfinger dla %{profile_url}"
     hcard_fetch_failed: "Wystąpił problem podczas pobierania wizytówki hcard użytkownika %{account}"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 2551c2998..4810d2d65 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -26,6 +26,10 @@ pt-BR:
           attributes: 
             from_id: 
               taken: "is a duplicate of a pre-existing request."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ pt-BR:
       login: "Entrar"
       logout: "Sair"
       profile: "profile"
+      recent_notifications: "Recent notifications"
       settings: "settings"
       view_all: "View all"
   likes: 
@@ -288,6 +293,12 @@ pt-BR:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Mais"
   next: "Próximo"
@@ -366,39 +377,31 @@ pt-BR:
       other: "%{actors} started sharing with you."
       zero: "%{actors} started sharing with you."
   notifier: 
-    also_commented: 
-      commented: "também comentou sobre a postagem de %{post_author}:"
-      sign_in: "Entre para ver."
-      subject: "%{name} também comentou."
+    click_here: "click here"
     comment_on_post: 
-      commented: "comentou sua postagem!"
-      sign_in: "Entre para ver."
-      subject: "%{name} comentou sua postagem."
-    diaspora: "o robô de email da Diaspora*"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Olá, %{name}!"
     liked: 
       liked: "%{name} has just liked your post: "
-      sign_in: "Sign to view it"
-      subject: "%{name} has just liked your post"
-    love: "Com carinho,"
-    manage_your_email_settings: "manage your email settings"
+      view_post: "View post >"
     mentioned: 
       mentioned: "mentioned you in a post:"
-      sign_in: "Sign in to view it."
       subject: "%{name} has mentioned you on Diaspora*"
     private_message: 
-      message_subject: "Subject: %{subject}"
-      private_message: "has sent you a private message:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "O administrador de sua Diaspora*"
       subject: "Uma mensagem do administrador de sua Diaspora*:"
     started_sharing: 
       sharing: "has started sharing with you!"
-      sign_in: "Sign in here"
       subject: "%{name} has started sharing with you on Diaspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "Obrigado,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "OK"
   or: "ou"
   password: "Senha"
@@ -556,6 +559,19 @@ pt-BR:
       manage_within: "Gerenciar contatos de"
     new_request_to_person: 
       sent: "Enviado!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Busca"
   services: 
     create: 
@@ -690,10 +706,14 @@ pt-BR:
   undo: "Undo?"
   username: "Usuário"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Conta encerrada com sucesso."
     edit: 
       also_commented: "...someone also comments on your contact's post?"
       change: "Trocar"
+      change_email: "Change E-Mail"
       change_language: "Trocar idioma"
       change_password: "Trocar senha"
       close_account: "Encerrar minha conta"
@@ -702,6 +722,7 @@ pt-BR:
       download_photos: "Baixar minhas fotos"
       download_xml: "Baixar meu XML"
       edit_account: "Alterar conta"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Exportar dados"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
@@ -735,6 +756,8 @@ pt-BR:
       language_not_changed: "Falha ao alterar o idioma"
       password_changed: "Senha alterada"
       password_not_changed: "Falha ao alterar a senha"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "falha ao trazer perfil webfinger de %{profile_url}"
     hcard_fetch_failed: "ocorreu um problema ao obter o hcard de #{@account}"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index b053c4320..e957ba5a2 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -26,6 +26,10 @@ pt-PT:
           attributes: 
             from_id: 
               taken: "é um duplicado de um pedido pré-existente."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ pt-PT:
       login: "iniciar sessão"
       logout: "Terminar sessão"
       profile: "perfil"
+      recent_notifications: "Recent notifications"
       settings: "definições"
       view_all: "View all"
   likes: 
@@ -288,6 +293,12 @@ pt-PT:
         one: "%{count} pessoa gosta"
         other: "%{count} pessoas gostam"
         zero: "ninguém gosta"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Mais"
   next: "próximo"
@@ -366,39 +377,31 @@ pt-PT:
       other: "%{actors} começaram a partilhar consigo."
       zero: "%{actors} começou a partilhar consigo."
   notifier: 
-    also_commented: 
-      commented: "também comentou na publicação de %{post_author}:"
-      sign_in: "Inicie sessão para ver."
-      subject: "%{name} também comentou na publicação de %{post_author}."
+    click_here: "click here"
     comment_on_post: 
-      commented: "comentou na sua publicação!"
-      sign_in: "Inicie sessão para ver."
-      subject: "%{name} comentou na sua publicação."
-    diaspora: "o robot de email do diaspora"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Olá %{name}!"
     liked: 
       liked: "%{name} gostou da sua publicação: "
-      sign_in: "Inicie sessão para ver"
-      subject: "%{name} gostou da sua publicação"
-    love: "com carinho,"
-    manage_your_email_settings: "gerir as suas definições de email"
+      view_post: "View post >"
     mentioned: 
       mentioned: "mencionou-o numa publicação:"
-      sign_in: "Inicie sessão para ver."
       subject: "%{name} mencionou-o no Diaspora*"
     private_message: 
-      message_subject: "Assunto: %{subject}"
-      private_message: "enviou-lhe uma mensagem privada:"
-      sign_in: "Inicie a sessão para ver."
-      subject: "%{name} enviou-lhe uma mensagem privada no Diaspora*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "O seu administrador do Diaspora"
       subject: "Uma mensagem sobre a sua conta do Diaspora:"
     started_sharing: 
       sharing: "começou a partilhar consigo!"
-      sign_in: "Inicie a sessão aqui"
       subject: "%{name} começou a partilhar consigo no Diaspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "Obrigado,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "OK"
   or: "ou"
   password: "Palavra-passe"
@@ -556,6 +559,19 @@ pt-PT:
       manage_within: "Gerir contactos dentro de"
     new_request_to_person: 
       sent: "enviado!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Procurar"
   services: 
     create: 
@@ -690,10 +706,14 @@ pt-PT:
   undo: "Anular?"
   username: "Nome de utilizador"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "A sua conta foi encerrada. Pode demorar até 20 minutos para que terminemos o processo de encerramento da sua conta. Obrigado por experimentar o Diaspora."
     edit: 
       also_commented: "...alguém também comenta na publicação do seu contacto?"
       change: "Alterar"
+      change_email: "Change E-Mail"
       change_language: "Mudar de Idioma"
       change_password: "Alterar a Palavra-passe"
       close_account: "Encerrar a Conta"
@@ -702,6 +722,7 @@ pt-PT:
       download_photos: "descarregar as minhas fotografias"
       download_xml: "descarregar o meu xml"
       edit_account: "Editar conta"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Exportar Dados"
       liked: "...alguém gosta da sua publicação?"
       mentioned: "...é mencionado numa publicação?"
@@ -735,6 +756,8 @@ pt-PT:
       language_not_changed: "Falha ao Alterar o Idioma"
       password_changed: "A palavra-passe foi alterada. Já pode iniciar sessão com a sua nova palavra-passe."
       password_not_changed: "Falhou ao alterar a palavra-passe"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "erro a obter perfil webfinger profile para %{profile_url}"
     hcard_fetch_failed: "ocorreu um problema a obter a hcard para %{account}"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 880f20f1b..d882b6a27 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -26,6 +26,10 @@ ro:
           attributes: 
             from_id: 
               taken: "is a duplicate of a pre-existing request."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ ro:
       login: "login"
       logout: "Ieşire"
       profile: "profile"
+      recent_notifications: "Recent notifications"
       settings: "settings"
       view_all: "View all"
   likes: 
@@ -288,6 +293,12 @@ ro:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Mai mult"
   next: "următorul"
@@ -366,39 +377,31 @@ ro:
       other: "%{actors} started sharing with you."
       zero: "%{actors} started sharing with you."
   notifier: 
-    also_commented: 
-      commented: "has also commented on %{post_author}'s post:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has also commented."
+    click_here: "click here"
     comment_on_post: 
-      commented: "has commented on your post!"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has commented on your post."
-    diaspora: "robotul e-mail Diaspora"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Bună %{name}!"
     liked: 
       liked: "%{name} has just liked your post: "
-      sign_in: "Sign to view it"
-      subject: "%{name} has just liked your post"
-    love: "cu dragoste,"
-    manage_your_email_settings: "manage your email settings"
+      view_post: "View post >"
     mentioned: 
       mentioned: "te-a menţionat întrun post:  "
-      sign_in: "Sign in to view it."
       subject: "%{name} te-a menţionat pe Diaspora*"
     private_message: 
-      message_subject: "Subject: %{subject}"
-      private_message: "has sent you a private message:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "Your Diaspora administrator"
       subject: "A message from your Diaspora administrator:"
     started_sharing: 
       sharing: "has started sharing with you!"
-      sign_in: "Sign in here"
       subject: "%{name} has started sharing with you on Diaspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "Mulţumim,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "OK"
   or: "sau"
   password: "Parola"
@@ -556,6 +559,19 @@ ro:
       manage_within: "Manage contacts within"
     new_request_to_person: 
       sent: "trimis!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Caută"
   services: 
     create: 
@@ -690,10 +706,14 @@ ro:
   undo: "Undo?"
   username: "Nume de utilizator"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Contul a fost închis cu succes."
     edit: 
       also_commented: "...someone also comments on your contact's post?"
       change: "Modifică"
+      change_email: "Change E-Mail"
       change_language: "Modificare limbă"
       change_password: "Modificare parolă"
       close_account: "Închide cont"
@@ -702,6 +722,7 @@ ro:
       download_photos: "descarcă fotografiile mele"
       download_xml: "descarcă datele mele (xml)"
       edit_account: "Editează cont"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Exportare de date"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
@@ -735,6 +756,8 @@ ro:
       language_not_changed: "Nu sa putut modifica limba"
       password_changed: "S-a modificat parola"
       password_not_changed: "Nu sa putut schimba parola"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index f45d3dc71..2a015e4be 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -26,6 +26,10 @@ ru:
           attributes: 
             from_id: 
               taken: "дубликат ранних запросов."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ ru:
       login: "логин"
       logout: "выйти"
       profile: "профиль"
+      recent_notifications: "Recent notifications"
       settings: "настройки"
       view_all: "View all"
   likes: 
@@ -288,6 +293,12 @@ ru:
         one: "%{count} понравилось"
         other: "%{count} понравилось"
         zero: "никому не понравилось"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Подробнее"
   next: "далее"
@@ -366,39 +377,31 @@ ru:
       other: "%{actors} начали делиться с вами."
       zero: "%{actors} начали делиться с вами."
   notifier: 
-    also_commented: 
-      commented: "также прокомментировал %{post_author} сообщение:\n"
-      sign_in: "Войдите в систему, для дальнейшего просмотра."
-      subject: "%{name} прокомментировал сообщение от %{post_author}."
+    click_here: "click here"
     comment_on_post: 
-      commented: "прокомментировал ваше сообщение:"
-      sign_in: "Войдите в систему, для дальнейшего просмотра."
-      subject: "%{name} прокомментировал ваше сообщение."
-    diaspora: "почтовый робот Диаспоры"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Привет %{name}!"
     liked: 
       liked: "%{name} понравилось Ваше сообщение:"
-      sign_in: "Войдите в систему, чтобы увидеть это"
-      subject: "%{name} понравилось Ваше сообщение"
-    love: "С уважением,"
-    manage_your_email_settings: "администрировать настройки электронной почты"
+      view_post: "View post >"
     mentioned: 
       mentioned: "упомянул вас в сообщении:"
-      sign_in: "Войти в систему, чтобы посмотреть."
       subject: "% {name} упомянул вас в диаспоре*"
     private_message: 
-      message_subject: "Тема: %{subject}"
-      private_message: "отправил вам личное сообщение:"
-      sign_in: "Войдите в систему, чтобы посмотреть."
-      subject: "%{name} прислал вам личное сообщение в диаспоре*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "Ваш администратор Диаспоры"
       subject: "Сообщение о вашем аккаунте Диаспоры:"
     started_sharing: 
       sharing: "начал делиться с вами!"
-      sign_in: "Войти сюда"
       subject: "%{name} начал делиться с вами в диаспоре*"
+      view_profile: "View %{name}'s profile"
     thanks: "Спасибо,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "Ок"
   or: "или"
   password: "Пароль"
@@ -556,6 +559,19 @@ ru:
       manage_within: "Управление контактами в"
     new_request_to_person: 
       sent: "отправлено!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Поиск"
   services: 
     create: 
@@ -690,10 +706,14 @@ ru:
   undo: "Отменить?"
   username: "Имя пользователя"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Ваш Аккаунт заблокирован. Примерно через 20 минут Аккаунт будет закрыт. Благодарим Вас."
     edit: 
       also_commented: "... кто-то комментировал сообщения ваших контактов?"
       change: "Изменение"
+      change_email: "Change E-Mail"
       change_language: "Изменить язык"
       change_password: "Сменить пароль"
       close_account: "Закрыть аккаунт"
@@ -702,6 +722,7 @@ ru:
       download_photos: "Скачать мои фотографии"
       download_xml: "Скачать мою информацию в xml"
       edit_account: "Редактировать аккаунт"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Экспорт информации"
       liked: "... кому-нибудь нравится ваше сообщение?"
       mentioned: "... Вы упомянуты в сообщении?"
@@ -735,6 +756,8 @@ ru:
       language_not_changed: "Не удалось изменить язык"
       password_changed: "Пароль изменён. Теперь вы можете войти в систему с новым паролем."
       password_not_changed: "Изменить пароль не удалось"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "Не удалось получить профиль для %{profile_url}"
     hcard_fetch_failed: "Возникла проблема при получении hcard для %{account}"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 96ab3c75f..15ae41e47 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -26,6 +26,10 @@ sk:
           attributes: 
             from_id: 
               taken: "je duplikát už existujúcej požiadavky."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ sk:
       login: "prihlásenie"
       logout: "odhlásiť sa"
       profile: "profile"
+      recent_notifications: "Recent notifications"
       settings: "settings"
       view_all: "View all"
   likes: 
@@ -288,6 +293,12 @@ sk:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Viac"
   next: "ďalej"
@@ -366,39 +377,31 @@ sk:
       other: "%{actors} started sharing with you."
       zero: "%{actors} started sharing with you."
   notifier: 
-    also_commented: 
-      commented: "tiež komentoval príspevok užívateľa %{post_author} :"
-      sign_in: "Pre zobrazenie musíte byť prihlásený."
-      subject: "%{name} tiež komentoval."
+    click_here: "click here"
     comment_on_post: 
-      commented: "has commented on your post!"
-      sign_in: "Pre zobrazenie musíte byť prihlásený."
-      subject: "Užívateľ %{name} komentoval Váš príspevok."
-    diaspora: "e-mail robot Diaspory"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Ahoj %{name}!"
     liked: 
       liked: "%{name} has just liked your post: "
-      sign_in: "Sign to view it"
-      subject: "%{name} has just liked your post"
-    love: "miluje,"
-    manage_your_email_settings: "manage your email settings"
+      view_post: "View post >"
     mentioned: 
       mentioned: "ťa spomenul v príspevku:"
-      sign_in: "K prezeraniu sa prihlás."
       subject: "%{name} ťa spomenul na Diaspore*"
     private_message: 
-      message_subject: "Predmet: %{subject}"
-      private_message: "ti poslal súkromnú správu:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "Váš administrátor"
       subject: "A message from your Diaspora administrator:"
     started_sharing: 
       sharing: "has started sharing with you!"
-      sign_in: "Sign in here"
       subject: "%{name} has started sharing with you on Diaspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "Vďaka,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "OK"
   or: "alebo"
   password: "Heslo"
@@ -556,6 +559,19 @@ sk:
       manage_within: "Spravovať kontakty v rámci"
     new_request_to_person: 
       sent: "Poslané!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Hľadať"
   services: 
     create: 
@@ -690,10 +706,14 @@ sk:
   undo: "Undo?"
   username: "Užívateľské meno"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Účet bol úspešne zrušený."
     edit: 
       also_commented: "...someone also comments on your contact's post?"
       change: "Zmeniť"
+      change_email: "Change E-Mail"
       change_language: "Zmeniť jazyk"
       change_password: "Zmeniť heslo"
       close_account: "Zrušiť účet"
@@ -702,6 +722,7 @@ sk:
       download_photos: "Stiahnuť moje fotky"
       download_xml: "stiahnuť moje xml"
       edit_account: "Upraviť účet"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Exportovať dáta"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
@@ -735,6 +756,8 @@ sk:
       language_not_changed: "Zmena jazyka zlyhala"
       password_changed: "Heslo zmenené"
       password_not_changed: "Zmena hesla zlyhala"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "Nepodarilo sa získať webfinger profil pre %{profile_url}"
     hcard_fetch_failed: "Nepodarilo sa získať hcard pre %{@account}"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 20037b230..ff5fbe4d8 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -26,6 +26,10 @@ sl:
           attributes: 
             from_id: 
               taken: "is a duplicate of a pre-existing request."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ sl:
       login: "prijava"
       logout: "odjavi me"
       profile: "profile"
+      recent_notifications: "Recent notifications"
       settings: "settings"
       view_all: "View all"
   likes: 
@@ -288,6 +293,12 @@ sl:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Več"
   next: "naslednja"
@@ -366,39 +377,31 @@ sl:
       other: "%{actors} started sharing with you."
       zero: "%{actors} started sharing with you."
   notifier: 
-    also_commented: 
-      commented: "prav tako komentirano na objavo osebe %{post_author}:"
-      sign_in: "Za ogled se prijavite."
-      subject: "oseba %{name} je prav tako komentirala %{post_author}."
+    click_here: "click here"
     comment_on_post: 
-      commented: "oseba je komentirala na vašo objavo:"
-      sign_in: "Za ogled se prijavite."
-      subject: "Oseba %{name} je komentirala vašo objavo."
-    diaspora: "diaspora email robot"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Pozdravljeni %{name}!"
     liked: 
       liked: "%{name} has just liked your post: "
-      sign_in: "Sign to view it"
-      subject: "%{name} has just liked your post"
-    love: "vas pozdravlja,"
-    manage_your_email_settings: "manage your email settings"
+      view_post: "View post >"
     mentioned: 
       mentioned: "mentioned you in a post:"
-      sign_in: "Sign in to view it."
       subject: "%{name} has mentioned you on Diaspora*"
     private_message: 
-      message_subject: "Subject: %{subject}"
-      private_message: "has sent you a private message:"
-      sign_in: "Sign in to view it."
-      subject: "oseba %{name} vam je poslala privatno sporočilo v Diaspori*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "Vaš administrator Diaspore"
       subject: "Sporočilo o vašem Diaspora računu:"
     started_sharing: 
       sharing: "has started sharing with you!"
-      sign_in: "Sign in here"
       subject: "%{name} has started sharing with you on Diaspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "Hvala,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "OK"
   or: "ali"
   password: "Geslo"
@@ -556,6 +559,19 @@ sl:
       manage_within: "Uredi stike znotraj"
     new_request_to_person: 
       sent: "poslano!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Najdi"
   services: 
     create: 
@@ -690,10 +706,14 @@ sl:
   undo: "Undo?"
   username: "Uporabniško ime"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Uporabniški račun je uspešno zaprt."
     edit: 
       also_commented: "...someone also comments on your contact's post?"
       change: "Spremeni"
+      change_email: "Change E-Mail"
       change_language: "Spremeni jezik"
       change_password: "Spremeni geslo"
       close_account: "Zapri uporabniški račun"
@@ -702,6 +722,7 @@ sl:
       download_photos: "prenesi slike"
       download_xml: "prenesi v xml"
       edit_account: "Uredi uporabniški račun"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Izvozi podatke"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
@@ -735,6 +756,8 @@ sl:
       language_not_changed: "Sprememba jezika ni uspela"
       password_changed: "Geslo spremenjeno"
       password_not_changed: "Sprememba gesla ni uspela"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "'webfinger' profil ni bilo mogoče prenesti za %{profile_url}"
     hcard_fetch_failed: "prišlo je do težave pri prenosu 'hCard' kartice za %{account}"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 7eda2db92..6db83d222 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -26,6 +26,10 @@ sv:
           attributes: 
             from_id: 
               taken: "är en kopia av en redan existerande förfrågan."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ sv:
       login: "Logga in"
       logout: "Logga ut"
       profile: "profil"
+      recent_notifications: "Recent notifications"
       settings: "Inställningar"
       view_all: "View all"
   likes: 
@@ -288,6 +293,12 @@ sv:
         one: "1 person gillar det här"
         other: "%{count} personer gillar det här"
         zero: "inga personer gillar det här"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Mer"
   next: "nästa"
@@ -366,39 +377,31 @@ sv:
       other: "%{actors} started sharing with you."
       zero: "%{actors} started sharing with you."
   notifier: 
-    also_commented: 
-      commented: "har också kommenterat %{post_author}'s inlägg:"
-      sign_in: "Logga in för att se den."
-      subject: "%{name} har också kommenterat %{post_author}s inlägg."
+    click_here: "click here"
     comment_on_post: 
-      commented: "Har kommenterat ditt inlägg"
-      sign_in: "Logga in för att visa den."
-      subject: "%{name} har kommenterat ditt inlägg."
-    diaspora: "Diasporas mailrobot"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Hej %{name}!"
     liked: 
       liked: "%{name} har precis gillat ditt inlägg: "
-      sign_in: "Logga in för att se"
-      subject: "%{name} har precis gillat ditt inlägg"
-    love: "hälsningar,"
-    manage_your_email_settings: "administrera dina epost-inställningar"
+      view_post: "View post >"
     mentioned: 
       mentioned: "nämnde dig i ett inlägg:"
-      sign_in: "Logga in för att kunna se det."
       subject: "%{name} har nämnt dig på Diaspora*"
     private_message: 
-      message_subject: "Ämne: %{subject}"
-      private_message: "har skickat dig ett private meddelande:"
-      sign_in: "Logga in för att se det."
-      subject: "%{name} har skickat ett privat meddelande till dig på Diaspora*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "Din Diaspora administratör"
       subject: "Ett meddelande gällande ditt Diaspora-konto:"
     started_sharing: 
       sharing: "har börjat dela med dig!"
-      sign_in: "Logga in här"
       subject: "%{name} har börjat dela med dig på Diaspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "Tack,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "OK"
   or: "eller"
   password: "Lösenord"
@@ -556,6 +559,19 @@ sv:
       manage_within: "Hantera kontakter i "
     new_request_to_person: 
       sent: "skickat!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Sök"
   services: 
     create: 
@@ -690,10 +706,14 @@ sv:
   undo: "Ångra?"
   username: "Användarnamn"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Ditt konto är nu stängt."
     edit: 
       also_commented: "...någon har också kommenterat på din kontakts post?"
       change: "Ändra"
+      change_email: "Change E-Mail"
       change_language: "Ändra språk"
       change_password: "Ändra lösenord"
       close_account: "Stäng kontot"
@@ -702,6 +722,7 @@ sv:
       download_photos: "Ladda ner mina foton"
       download_xml: "Ladda ner min xml"
       edit_account: "Ändra konto"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Exportera data"
       liked: "...någon gillar ditt inlägg?"
       mentioned: "...du är omnämnd i en post?"
@@ -735,6 +756,8 @@ sv:
       language_not_changed: "Språket kunde inte ändras"
       password_changed: "Lösenordet är nu ändrat."
       password_not_changed: "Lösenordet kunde inte ändras"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "Kunde inte hämta webfinger-profil för %{profile_url}"
     hcard_fetch_failed: "Kunde inte hämta hcard för #{@account}"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 69fa6c289..014a418ba 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -26,6 +26,10 @@ tr:
           attributes: 
             from_id: 
               taken: "is a duplicate of a pre-existing request."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ tr:
       login: "login"
       logout: "Çıkış"
       profile: "profile"
+      recent_notifications: "Recent notifications"
       settings: "settings"
       view_all: "View all"
   likes: 
@@ -288,6 +293,12 @@ tr:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "More"
   next: "next"
@@ -366,39 +377,31 @@ tr:
       other: "%{actors} started sharing with you."
       zero: "%{actors} started sharing with you."
   notifier: 
-    also_commented: 
-      commented: "has also commented on %{post_author}'s post:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has also commented."
+    click_here: "click here"
     comment_on_post: 
-      commented: "has commented on your post!"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has commented on your post."
-    diaspora: "Diaspora e-posta robotu"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Merhaba %{name}!"
     liked: 
       liked: "%{name} has just liked your post: "
-      sign_in: "Sign to view it"
-      subject: "%{name} has just liked your post"
-    love: "love,"
-    manage_your_email_settings: "manage your email settings"
+      view_post: "View post >"
     mentioned: 
       mentioned: "mentioned you in a post:"
-      sign_in: "Sign in to view it."
       subject: "%{name} has mentioned you on Diaspora*"
     private_message: 
-      message_subject: "Subject: %{subject}"
-      private_message: "has sent you a private message:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "Your Diaspora administrator"
       subject: "A message from your Diaspora administrator:"
     started_sharing: 
       sharing: "has started sharing with you!"
-      sign_in: "Sign in here"
       subject: "%{name} has started sharing with you on Diaspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "Thanks,"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "Tamam"
   or: "ya da"
   password: "Parola"
@@ -556,6 +559,19 @@ tr:
       manage_within: "Manage contacts within"
     new_request_to_person: 
       sent: "yollandı!"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "Ara"
   services: 
     create: 
@@ -690,10 +706,14 @@ tr:
   undo: "Undo?"
   username: "Kullanıcı Adı"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "Hesap başarıyla kapatıldı"
     edit: 
       also_commented: "...someone also comments on your contact's post?"
       change: "Change"
+      change_email: "Change E-Mail"
       change_language: "Dili Değiştir"
       change_password: "Şifremi Değiştir"
       close_account: "Hesabımı kapat"
@@ -702,6 +722,7 @@ tr:
       download_photos: "fotoğraflarımı kaydet"
       download_xml: "xml dosyamı kaydet"
       edit_account: "Edit account"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Bilgilerimi Dışarı taşı"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
@@ -735,6 +756,8 @@ tr:
       language_not_changed: "Dil Değişikliği Başarılamadı"
       password_changed: "Şifre Değişti"
       password_not_changed: "Şifre Değişikliği Başarılamadı"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index ff28247d3..d52cc9c41 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -26,6 +26,10 @@ zh-CN:
           attributes: 
             from_id: 
               taken: "与已存在的请求重复。"
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
         user: 
           attributes: 
             email: 
@@ -272,6 +276,7 @@ zh-CN:
       login: "登录"
       logout: "登出"
       profile: "个人档案"
+      recent_notifications: "Recent notifications"
       settings: "设置"
       view_all: "View all"
   likes: 
@@ -288,6 +293,12 @@ zh-CN:
         one: "有1个人觉得好"
         other: "有%{count}个人觉得好"
         zero: "没有人觉得好"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "更多"
   next: "下一步"
@@ -366,39 +377,31 @@ zh-CN:
       other: "%{actors} started sharing with you."
       zero: "%{actors} started sharing with you."
   notifier: 
-    also_commented: 
-      commented: "也对 %{post_author} 的贴文发布了意见:"
-      sign_in: "登录后可以查看。"
-      subject: "%{name} 也评论了 %{post_author} 发布的内容。"
+    click_here: "click here"
     comment_on_post: 
-      commented: "对评论了您发布的内容："
-      sign_in: "登录后可以查看。"
-      subject: "%{name} 评论了您发布的内容。"
-    diaspora: "diaspora邮件机器人"
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "您好 %{name}！"
     liked: 
       liked: "%{name}刚说喜欢您发布的内容："
-      sign_in: "Sign to view it"
-      subject: "%{name}刚说喜欢您发布的内容"
-    love: "衷心祝福，"
-    manage_your_email_settings: "管理邮件设置"
+      view_post: "View post >"
     mentioned: 
       mentioned: "在 Diaspora* 发布的内容中提到了您："
-      sign_in: "登录后可以查看。"
       subject: "%{name} 在 Diaspora* 上发布的内容中提到了您"
     private_message: 
-      message_subject: "主题: %{subject}"
-      private_message: "已发送了私人信息给您："
-      sign_in: "登录进来看看。"
-      subject: "%{name} 在 Diaspora* 给您发送了私人信息"
+      reply_to_or_view: "Reply to or view this conversation >"
     single_admin: 
       admin: "为您服务的 Diaspora 管理员"
       subject: "关于您 Diaspora 帐号的信息:"
     started_sharing: 
       sharing: "刚开始与您分享！"
-      sign_in: "在这里登录"
       subject: "%{name}刚开始在Diaspora*与您分享"
+      view_profile: "View %{name}'s profile"
     thanks: "谢谢，"
+    to_change_your_notification_settings: "to change your notification settings"
   ok: "确定"
   or: "或"
   password: "密码"
@@ -556,6 +559,19 @@ zh-CN:
       manage_within: "管理好友："
     new_request_to_person: 
       sent: "发送成功！"
+  reshares: 
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        one: "1 Reshare"
+        other: "%{count} Reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      show_original: "Show Original"
   search: "搜索"
   services: 
     create: 
@@ -690,10 +706,14 @@ zh-CN:
   undo: "撤消？"
   username: "帐号"
   users: 
+    confirm_email: 
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     destroy: "帐号关闭成功。"
     edit: 
       also_commented: "……当有人也对您的好友的内容发表评论时？"
       change: "更改"
+      change_email: "Change E-Mail"
       change_language: "更改语言"
       change_password: "更改密码"
       close_account: "关闭帐号"
@@ -702,6 +722,7 @@ zh-CN:
       download_photos: "下载我的照片"
       download_xml: "下载我的 xml"
       edit_account: "编辑帐号"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "资料导出"
       liked: "…有人喜欢您发布的内容？"
       mentioned: "……当贴文中提到您时？"
@@ -735,6 +756,8 @@ zh-CN:
       language_not_changed: "语言更改失败"
       password_changed: "密码更改成功"
       password_not_changed: "密码更改失败"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
     fetch_failed: "获取 %{profile_url} 的 webfinger 个人档案失败"
     hcard_fetch_failed: "获取 %{account} 的 hcard 资料时发生错误"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index d41b71f9e..55cc55d13 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -26,6 +26,10 @@ zh-TW:
           attributes: 
             from_id: 
               taken: "與已存在的請求重複."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "你已經轉貼過該篇貼文了!"
         user: 
           attributes: 
             email: 
@@ -67,7 +71,7 @@ zh-TW:
     aspect_stream: 
       commented_on: "有意見的"
       posted: "發表的"
-      recently: "近來:"
+      recently: "最近:"
       stream: "事件流"
     contacts_not_visible: "此面向中的聯繫無法看見彼此."
     contacts_visible: "此面向中的聯繫可以看見彼此."
@@ -181,7 +185,7 @@ zh-TW:
     zero: "沒有任何聯繫"
   conversations: 
     create: 
-      sent: "訊息已送出"
+      sent: "已送出訊息"
     destroy: 
       success: "對話移除成功"
     helper: 
@@ -247,7 +251,7 @@ zh-TW:
     edit: 
       sign_up: "登記"
     new: 
-      already_invited: "已邀請了"
+      already_invited: "這些人尚未接受你的邀請:"
       aspect: "面向"
       comma_seperated_plz: "你可以輸入多個電子信箱, 只要以逗號分隔即可."
       if_they_accept_info: "如果他們接受, 就會被加入至你所邀請的面向中."
@@ -272,6 +276,7 @@ zh-TW:
       login: "登入"
       logout: "登出"
       profile: "個人檔案"
+      recent_notifications: "最近消息"
       settings: "設定"
       view_all: "檢視全部"
   likes: 
@@ -288,6 +293,12 @@ zh-TW:
         one: "有%{count}個讚"
         other: "有%{count}個讚"
         zero: "沒有讚"
+      people_like_this_comment: 
+        few: "有%{count}個人說讚"
+        many: "有%{count}個人說讚"
+        one: "有%{count}個人說讚"
+        other: "有%{count}個人說讚"
+        zero: "沒人說讚"
   limited: "有限分享"
   more: "更多"
   next: "後面"
@@ -366,39 +377,31 @@ zh-TW:
       other: "%{actors}開始跟你分享了."
       zero: "%{actors}開始跟你分享了."
   notifier: 
-    also_commented: 
-      commented: "也對 %{post_author} 的貼文發表了意見:"
-      sign_in: "登入來看看."
-      subject: "%{name} 也對 %{post_author} 的貼文發表了意見."
+    click_here: "按這裡"
     comment_on_post: 
-      commented: "對你的貼文發表了意見:"
-      sign_in: "登入來看看."
-      subject: "%{name} 對你的貼文發表了意見."
-    diaspora: "diaspora 電郵機器人"
+      reply: "回或看 %{name} 的貼文 >"
+    confirm_email: 
+      click_link: "請按一下以下連結, 來啟用你新的電子郵件信箱 %{unconfirmed_email}:"
+      subject: "請啟用你新的電子信箱 %{unconfirmed_email}"
+    email_sent_by_diaspora: "這封電子郵件是從 Diaspora 寄出. 如果你不想再收到這類的信件,"
     hello: "%{name}你好!"
     liked: 
-      liked: "%{name}剛剛說你的貼文讚: "
-      sign_in: "登入來看看"
-      subject: "%{name}剛剛說你的貼文讚"
-    love: "衷心祝福,"
-    manage_your_email_settings: "管理電郵設定"
+      liked: "%{name}剛剛說你的貼文讚"
+      view_post: "看貼文 >"
     mentioned: 
       mentioned: "在貼文中提到你:"
-      sign_in: "登入來看看."
       subject: "%{name} 在 Diaspora* 提到你"
     private_message: 
-      message_subject: "主旨: %{subject}"
-      private_message: "已傳送私人訊息給你:"
-      sign_in: "登入來看看."
-      subject: "%{name} 在 Diaspora* 傳送私人訊息給你"
+      reply_to_or_view: "回或看這次對話 >"
     single_admin: 
       admin: "為您服務的 Diaspora 管理員"
       subject: "關於你的 Diaspora 帳號的訊息:"
     started_sharing: 
       sharing: "開始跟你分享了!"
-      sign_in: "由此登入"
-      subject: "%{name} 在 Diaspora* 開始跟你分享了"
+      subject: "%{name} 開始在 Diaspora* 跟你分享了"
+      view_profile: "看 %{name} 的個人檔案"
     thanks: "謝謝,"
+    to_change_your_notification_settings: "來更改消息通知的設定"
   ok: "好了"
   or: "或是"
   password: "密碼"
@@ -443,8 +446,8 @@ zh-TW:
       message: "送訊息"
       no_posts: "沒有貼文可顯示!"
       not_connected: "你不跟這個人分享"
-      recent_posts: "近來貼文"
-      recent_public_posts: "近來公開貼文"
+      recent_posts: "最近貼文"
+      recent_public_posts: "最近公開貼文"
       return_to_aspects: "回你的面向主頁"
       see_all: "看全部"
       start_sharing: "開始分享"
@@ -459,7 +462,7 @@ zh-TW:
       runtime_error: "相片上傳失敗. 你確定有扣安全帶嗎?"
       type_error: "相片上傳失敗. 你確定有加入任何圖片嗎?"
     destroy: 
-      notice: "相片已刪除."
+      notice: "已刪除相片."
     edit: 
       editing: "編輯中"
     new: 
@@ -501,8 +504,8 @@ zh-TW:
     edit: 
       allow_search: "讓別人可以在 Diaspora 搜尋到你"
       edit_profile: "編輯個人檔案"
-      first_name: "First name"
-      last_name: "Last name"
+      first_name: "名字(前)"
+      last_name: "名字(後)"
       update_profile: "更新個人檔案"
       your_bio: "你的自我介紹"
       your_birthday: "你的生日"
@@ -516,7 +519,7 @@ zh-TW:
       your_tags_placeholder: "像是: #電影 #貓咪 #旅行 #老師 #紐約"
     update: 
       failed: "個人檔案更新失敗"
-      updated: "個人檔案已更新"
+      updated: "已更新個人檔案"
   public: "公開"
   registrations: 
     closed: "本 Diaspora pod 不開放登記."
@@ -556,6 +559,19 @@ zh-TW:
       manage_within: "管理聯繫:"
     new_request_to_person: 
       sent: "已送出!"
+  reshares: 
+    create: 
+      failure: "轉貼這篇貼文時發生錯誤."
+    reshare: 
+      deleted: "原貼文已經被作者刪除了."
+      reshare: 
+        few: "被轉貼%{count}次"
+        many: "被轉貼%{count}次"
+        one: "被轉貼1次"
+        other: "被轉貼%{count}次"
+        zero: "轉貼"
+      reshare_confirmation: "要轉貼 %{author} - %{text} 嗎?"
+      show_original: "顯示原文"
   search: "搜尋"
   services: 
     create: 
@@ -633,7 +649,7 @@ zh-TW:
       upload_photos: "上傳照片"
       whats_on_your_mind: "在想什麼?"
     reshare: 
-      reshare: "重新分享"
+      reshare: "轉貼"
     stream_element: 
       dislike: "遜"
       like: "讚"
@@ -690,10 +706,14 @@ zh-TW:
   undo: "復原?"
   username: "用戶名稱"
   users: 
+    confirm_email: 
+      email_confirmed: "已啟用E-Mail %{email}"
+      email_not_confirmed: "無法啟用E-Mail. 連結有誤嗎?"
     destroy: "帳號已鎖定. 關閉帳號可能需要20分鐘才能完成. 感謝你試用 Diaspora."
     edit: 
       also_commented: "...當有人也對你的聯繫的貼文發表意見時?"
       change: "更改"
+      change_email: "更改E-Mail"
       change_language: "更改語言"
       change_password: "更改密碼"
       close_account: "關閉帳號"
@@ -702,6 +722,7 @@ zh-TW:
       download_photos: "下載我的相片"
       download_xml: "下載我的 xml"
       edit_account: "編輯帳號"
+      email_awaiting_confirmation: "我們已經將啟用連結寄到 %{unconfirmed_email} 給你. 在你使用該連結啟用新的位址前, 我們還會繼續使用你原來的位址, 也就是 %{email}."
       export_data: "資料匯出"
       liked: "...有人對你的貼文說讚時?"
       mentioned: "...當貼文中提到你時?"
@@ -730,11 +751,13 @@ zh-TW:
     public: 
       does_not_exist: "不存在 %{username} 這個用戶!"
     update: 
-      email_notifications_changed: "電郵通知已更改"
-      language_changed: "語言已更改"
+      email_notifications_changed: "已更改電郵通知"
+      language_changed: "已更改語言"
       language_not_changed: "語言更改失敗"
-      password_changed: "密碼已變更. 現在起你可以用新密碼登入了."
+      password_changed: "已更改密碼. 現在起你可以用新的密碼登入了."
       password_not_changed: "密碼更改失敗"
+      unconfirmed_email_changed: "已更改E-Mail. 必須要啟動使用."
+      unconfirmed_email_not_changed: "E-Mail更改失敗"
   webfinger: 
     fetch_failed: "擷取 %{profile_url} 的 webfinger 個人檔案失敗"
     hcard_fetch_failed: "擷取 %{account} 的 hcard 資料時發生錯誤"
diff --git a/config/locales/javascript/javascript.ar.yml b/config/locales/javascript/javascript.ar.yml
index 6edddede6..5313eb9c4 100644
--- a/config/locales/javascript/javascript.ar.yml
+++ b/config/locales/javascript/javascript.ar.yml
@@ -23,6 +23,7 @@ ar:
       no_more: "لا توجد أية رسائل أخرى"
     publisher: 
       at_least_one_aspect: "حدد فئة واحدة على الأقل"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "إبحث عن {{name}}"
     show_more: "المزيد"
     timeago: 
diff --git a/config/locales/javascript/javascript.bg.yml b/config/locales/javascript/javascript.bg.yml
index 5c706f014..670c667d7 100644
--- a/config/locales/javascript/javascript.bg.yml
+++ b/config/locales/javascript/javascript.bg.yml
@@ -23,6 +23,7 @@ bg:
       no_more: "Няма повече публикации."
     publisher: 
       at_least_one_aspect: "Трябва да публикувате в поне един аспект"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "Търсене за {{name}}"
     show_more: "покажи още"
     timeago: 
diff --git a/config/locales/javascript/javascript.br.yml b/config/locales/javascript/javascript.br.yml
index 198fcbec6..994532f57 100644
--- a/config/locales/javascript/javascript.br.yml
+++ b/config/locales/javascript/javascript.br.yml
@@ -23,6 +23,7 @@ br:
       no_more: "No more posts."
     publisher: 
       at_least_one_aspect: "Dav eo deoc'h embann un arvez da'n nebeutañ"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "Klask war-lerc'h {{name}}"
     show_more: "show more"
     timeago: 
diff --git a/config/locales/javascript/javascript.ca.yml b/config/locales/javascript/javascript.ca.yml
index 0d18ed3c4..650c99027 100644
--- a/config/locales/javascript/javascript.ca.yml
+++ b/config/locales/javascript/javascript.ca.yml
@@ -49,3 +49,5 @@ ca:
       comments:
         show: "mostra tots els comentaris"
         hide: "amaga els comentaris"
+      reshares:
+        duplicate: "Ja heu tornat a compartir aquesta publicació!"
diff --git a/config/locales/javascript/javascript.cs.yml b/config/locales/javascript/javascript.cs.yml
index 7aa0ad97c..4a1e146ca 100644
--- a/config/locales/javascript/javascript.cs.yml
+++ b/config/locales/javascript/javascript.cs.yml
@@ -23,6 +23,7 @@ cs:
       no_more: "Žádné další příspěvky."
     publisher: 
       at_least_one_aspect: "Musíte publikovat alespoň do jednoho aspektu"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "Hledat {{name}}"
     show_more: "zobrazit více"
     timeago: 
diff --git a/config/locales/javascript/javascript.da.yml b/config/locales/javascript/javascript.da.yml
index 292507ec4..8d41cbae8 100644
--- a/config/locales/javascript/javascript.da.yml
+++ b/config/locales/javascript/javascript.da.yml
@@ -23,6 +23,7 @@ da:
       no_more: "Ikke flere poster."
     publisher: 
       at_least_one_aspect: "Du skal dele med mindst et aspekt"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "Søg efter {{name}}"
     show_more: "Vis mere"
     timeago: 
diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml
index 2a68410d0..04af0e0f4 100644
--- a/config/locales/javascript/javascript.de.yml
+++ b/config/locales/javascript/javascript.de.yml
@@ -23,6 +23,7 @@ de:
       no_more: "Keine weiteren Beiträge."
     publisher: 
       at_least_one_aspect: "Du musst zumindest zu einem Aspekt posten"
+    reshares: "Doppel: \"Du hast diesen Beitrag bereits wiederholt!\""
     search_for: "Nach {{name}} suchen"
     show_more: "Mehr zeigen"
     timeago: 
diff --git a/config/locales/javascript/javascript.el.yml b/config/locales/javascript/javascript.el.yml
index 0c51c6023..09047b8b1 100644
--- a/config/locales/javascript/javascript.el.yml
+++ b/config/locales/javascript/javascript.el.yml
@@ -23,6 +23,7 @@ el:
       no_more: "Δεν υπάρχουν άλλες δημοσιεύσεις."
     publisher: 
       at_least_one_aspect: "πρέπει να κάνετε δημοσίευση σε τουλάχιστον μια πτυχή"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "Αναζήτηση για {{name}}"
     show_more: "Προβολή περισσότερων"
     timeago: 
diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml
index bd393d873..ac4ac2ff4 100644
--- a/config/locales/javascript/javascript.en.yml
+++ b/config/locales/javascript/javascript.en.yml
@@ -48,4 +48,4 @@ en:
         show: "show all comments"
         hide: "hide comments"
       reshares:
-        duplicate:"You've already reshared that post!"
+        duplicate: "You've already reshared that post!"
diff --git a/config/locales/javascript/javascript.en_shaw.yml b/config/locales/javascript/javascript.en_shaw.yml
index 6f97157c5..c827069c6 100644
--- a/config/locales/javascript/javascript.en_shaw.yml
+++ b/config/locales/javascript/javascript.en_shaw.yml
@@ -23,6 +23,7 @@ en_shaw:
       no_more: "𐑯𐑴 𐑥𐑹 𐑐𐑴𐑕𐑑𐑕."
     publisher: 
       at_least_one_aspect: "𐑿 𐑥𐑳𐑕𐑑 𐑐𐑳𐑚𐑤𐑦𐑖 𐑑 𐑨𐑑 𐑤𐑰𐑕𐑑 𐑢𐑳𐑯 𐑨𐑕𐑐𐑧𐑒𐑑"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "𐑕𐑻𐑗 𐑓𐑹 {{name}}"
     show_more: "𐑖𐑴 𐑥𐑹"
     timeago: 
diff --git a/config/locales/javascript/javascript.eo.yml b/config/locales/javascript/javascript.eo.yml
index 83bb2ac9b..19c8487c7 100644
--- a/config/locales/javascript/javascript.eo.yml
+++ b/config/locales/javascript/javascript.eo.yml
@@ -23,6 +23,7 @@ eo:
       no_more: "Ne pli afiŝoj."
     publisher: 
       at_least_one_aspect: "Vi devus eldoni al almenaŭ unu aspekto"
+    reshares: "multobligaĵo:\"Vi jam repartoprenis tiun ĉi afiŝon!\""
     search_for: "Serĉi por {{name}}"
     show_more: "vidi plu"
     timeago: 
diff --git a/config/locales/javascript/javascript.es-AR.yml b/config/locales/javascript/javascript.es-AR.yml
index 416cc554d..896337301 100644
--- a/config/locales/javascript/javascript.es-AR.yml
+++ b/config/locales/javascript/javascript.es-AR.yml
@@ -23,6 +23,7 @@ es-AR:
       no_more: "No hay más publicaciones."
     publisher: 
       at_least_one_aspect: "Tenés que publicarlo en, por lo menos, un aspecto"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "Buscar a {{name}}"
     show_more: "mostrar más"
     timeago: 
diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml
index 029b53026..748ac9b9a 100644
--- a/config/locales/javascript/javascript.es.yml
+++ b/config/locales/javascript/javascript.es.yml
@@ -23,6 +23,7 @@ es:
       no_more: "No hay más publicaciones."
     publisher: 
       at_least_one_aspect: "Debes publicarlo en al menos un aspecto"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "Buscar a {{name}}"
     show_more: "ver más"
     timeago: 
diff --git a/config/locales/javascript/javascript.eu.yml b/config/locales/javascript/javascript.eu.yml
index fb15bebdd..aab980713 100644
--- a/config/locales/javascript/javascript.eu.yml
+++ b/config/locales/javascript/javascript.eu.yml
@@ -23,6 +23,7 @@ eu:
       no_more: "Mezu gehiagorik ez dago."
     publisher: 
       at_least_one_aspect: "Gutxienez alderdi batean partekatu behar duzu"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "Bilatu {{name}}"
     show_more: "erakutsi gehiago"
     timeago: 
diff --git a/config/locales/javascript/javascript.fi.yml b/config/locales/javascript/javascript.fi.yml
index d4976fbc0..126a64724 100644
--- a/config/locales/javascript/javascript.fi.yml
+++ b/config/locales/javascript/javascript.fi.yml
@@ -23,6 +23,7 @@ fi:
       no_more: "Ei enempää viestejä."
     publisher: 
       at_least_one_aspect: "Sinun täytyy julkaista vähintään yhdelle näkymälle."
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "Etsi nimellä {{name}}"
     show_more: "näytä lisää"
     timeago: 
diff --git a/config/locales/javascript/javascript.fr.yml b/config/locales/javascript/javascript.fr.yml
index 085b136a8..1c80f4202 100644
--- a/config/locales/javascript/javascript.fr.yml
+++ b/config/locales/javascript/javascript.fr.yml
@@ -23,6 +23,7 @@ fr:
       no_more: "Pas d'autre messages."
     publisher: 
       at_least_one_aspect: "Vous devez créer au moins un aspect"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "Chercher {{name}}"
     show_more: "voir plus"
     timeago: 
diff --git a/config/locales/javascript/javascript.he.yml b/config/locales/javascript/javascript.he.yml
index b1c9fa8ba..df411cfcb 100644
--- a/config/locales/javascript/javascript.he.yml
+++ b/config/locales/javascript/javascript.he.yml
@@ -23,6 +23,7 @@ he:
       no_more: "אין רשומות נוספות."
     publisher: 
       at_least_one_aspect: "עליך לפרסם היבט אחד לפחות"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "חיפוש אחר {{name}}"
     show_more: "הצגת עוד"
     timeago: 
diff --git a/config/locales/javascript/javascript.hu.yml b/config/locales/javascript/javascript.hu.yml
index e2e8f4720..266c7f546 100644
--- a/config/locales/javascript/javascript.hu.yml
+++ b/config/locales/javascript/javascript.hu.yml
@@ -23,6 +23,7 @@ hu:
       no_more: "Nincs több bejegyzés."
     publisher: 
       at_least_one_aspect: "Minimum 1 csoportnak meg kell osztanod!"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "{{name}} keresése."
     show_more: "show more"
     timeago: 
diff --git a/config/locales/javascript/javascript.id.yml b/config/locales/javascript/javascript.id.yml
index 81f26da02..a9320278f 100644
--- a/config/locales/javascript/javascript.id.yml
+++ b/config/locales/javascript/javascript.id.yml
@@ -23,6 +23,7 @@ id:
       no_more: "No more posts."
     publisher: 
       at_least_one_aspect: "You must publish to at least one aspect"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "Search for {{name}}"
     show_more: "show more"
     timeago: 
diff --git a/config/locales/javascript/javascript.is.yml b/config/locales/javascript/javascript.is.yml
index 265778c43..ffee7a4ee 100644
--- a/config/locales/javascript/javascript.is.yml
+++ b/config/locales/javascript/javascript.is.yml
@@ -23,6 +23,7 @@ is:
       no_more: "No more posts."
     publisher: 
       at_least_one_aspect: "You must publish to at least one aspect"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "Search for {{name}}"
     show_more: "show more"
     timeago: 
diff --git a/config/locales/javascript/javascript.it.yml b/config/locales/javascript/javascript.it.yml
index 0a9bf78ba..31fd5413e 100644
--- a/config/locales/javascript/javascript.it.yml
+++ b/config/locales/javascript/javascript.it.yml
@@ -23,6 +23,7 @@ it:
       no_more: "Non ci sono altri post."
     publisher: 
       at_least_one_aspect: "Devi condividere almeno con un aspetto"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "Ricerca per {{name}}"
     show_more: "mostra altro"
     timeago: 
diff --git a/config/locales/javascript/javascript.ja.yml b/config/locales/javascript/javascript.ja.yml
index 96537a1d4..3e5c2450f 100644
--- a/config/locales/javascript/javascript.ja.yml
+++ b/config/locales/javascript/javascript.ja.yml
@@ -23,6 +23,7 @@ ja:
       no_more: "投稿はこれ以上ありません。"
     publisher: 
       at_least_one_aspect: "アスペクトを選択してから投稿してください。"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "{{name}}を検索する"
     show_more: "show more"
     timeago: 
diff --git a/config/locales/javascript/javascript.ko.yml b/config/locales/javascript/javascript.ko.yml
index 4d1968fd7..085c19422 100644
--- a/config/locales/javascript/javascript.ko.yml
+++ b/config/locales/javascript/javascript.ko.yml
@@ -23,6 +23,7 @@ ko:
       no_more: "공유물이 더 없습니다."
     publisher: 
       at_least_one_aspect: "공유하려면 적어도 한 애스펙을 골라야 합니다."
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "{{name}} 검색"
     show_more: "더 보기"
     timeago: 
diff --git a/config/locales/javascript/javascript.nb.yml b/config/locales/javascript/javascript.nb.yml
index 6f01e2eec..82f9fa7c0 100644
--- a/config/locales/javascript/javascript.nb.yml
+++ b/config/locales/javascript/javascript.nb.yml
@@ -23,6 +23,7 @@ nb:
       no_more: "No more posts."
     publisher: 
       at_least_one_aspect: "Du må poste til minst ett aspekt"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "Søk etter {{name}}"
     show_more: "show more"
     timeago: 
diff --git a/config/locales/javascript/javascript.nl.yml b/config/locales/javascript/javascript.nl.yml
index 9874005e7..57e3c9611 100644
--- a/config/locales/javascript/javascript.nl.yml
+++ b/config/locales/javascript/javascript.nl.yml
@@ -23,6 +23,7 @@ nl:
       no_more: "Geen posts meer."
     publisher: 
       at_least_one_aspect: "Je moet op zijn minst één aspect publiceren"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "Zoek naar {{name}}"
     show_more: "laat meer zien"
     timeago: 
diff --git a/config/locales/javascript/javascript.pl.yml b/config/locales/javascript/javascript.pl.yml
index 49672a37f..79f0bf990 100644
--- a/config/locales/javascript/javascript.pl.yml
+++ b/config/locales/javascript/javascript.pl.yml
@@ -23,6 +23,7 @@ pl:
       no_more: "No more posts."
     publisher: 
       at_least_one_aspect: "Musisz udostępnić dla co najmniej jednego aspektu"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "Szukaj: {{name}}"
     show_more: "show more"
     timeago: 
diff --git a/config/locales/javascript/javascript.pt-BR.yml b/config/locales/javascript/javascript.pt-BR.yml
index 83ee40118..3cd614b3a 100644
--- a/config/locales/javascript/javascript.pt-BR.yml
+++ b/config/locales/javascript/javascript.pt-BR.yml
@@ -23,6 +23,7 @@ pt-BR:
       no_more: "No more posts."
     publisher: 
       at_least_one_aspect: "You must publish to at least one aspect"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "Search for {{name}}"
     show_more: "show more"
     timeago: 
diff --git a/config/locales/javascript/javascript.pt-PT.yml b/config/locales/javascript/javascript.pt-PT.yml
index e49ab50e0..16d0d981d 100644
--- a/config/locales/javascript/javascript.pt-PT.yml
+++ b/config/locales/javascript/javascript.pt-PT.yml
@@ -23,6 +23,7 @@ pt-PT:
       no_more: "Não há mais publicações."
     publisher: 
       at_least_one_aspect: "Tem de publicar para pelo menos um aspecto"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "Procurar por {{name}}"
     show_more: "mostrar mais"
     timeago: 
diff --git a/config/locales/javascript/javascript.ro.yml b/config/locales/javascript/javascript.ro.yml
index de402ce4f..1e7a17462 100644
--- a/config/locales/javascript/javascript.ro.yml
+++ b/config/locales/javascript/javascript.ro.yml
@@ -23,6 +23,7 @@ ro:
       no_more: "Nu mai sunt posturi."
     publisher: 
       at_least_one_aspect: "Trebuie sa publici pe cel puţin un aspect"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "Caută {{name}}"
     show_more: "show more"
     timeago: 
diff --git a/config/locales/javascript/javascript.ru.yml b/config/locales/javascript/javascript.ru.yml
index c33a6bd5b..69cf796ec 100644
--- a/config/locales/javascript/javascript.ru.yml
+++ b/config/locales/javascript/javascript.ru.yml
@@ -23,6 +23,7 @@ ru:
       no_more: "Сообщений больше нет."
     publisher: 
       at_least_one_aspect: "Вам надо минимум один аспект создать"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "Искать {{name}}"
     show_more: "показать больше"
     timeago: 
diff --git a/config/locales/javascript/javascript.sk.yml b/config/locales/javascript/javascript.sk.yml
index 48b21f929..82dacb859 100644
--- a/config/locales/javascript/javascript.sk.yml
+++ b/config/locales/javascript/javascript.sk.yml
@@ -23,6 +23,7 @@ sk:
       no_more: "No more posts."
     publisher: 
       at_least_one_aspect: "You must publish to at least one aspect"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "Hľadať {{name}}"
     show_more: "show more"
     timeago: 
diff --git a/config/locales/javascript/javascript.sl.yml b/config/locales/javascript/javascript.sl.yml
index eaffc2a11..fb575e5b9 100644
--- a/config/locales/javascript/javascript.sl.yml
+++ b/config/locales/javascript/javascript.sl.yml
@@ -23,6 +23,7 @@ sl:
       no_more: "No more posts."
     publisher: 
       at_least_one_aspect: "You must publish to at least one aspect"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "Search for {{name}}"
     show_more: "show more"
     timeago: 
diff --git a/config/locales/javascript/javascript.sv.yml b/config/locales/javascript/javascript.sv.yml
index b412a043d..1966a9f2c 100644
--- a/config/locales/javascript/javascript.sv.yml
+++ b/config/locales/javascript/javascript.sv.yml
@@ -23,6 +23,7 @@ sv:
       no_more: "Inga fler inlägg."
     publisher: 
       at_least_one_aspect: "Du måste publicera till minst en aspekt."
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "Sök efter {{name}}"
     show_more: "show more"
     timeago: 
diff --git a/config/locales/javascript/javascript.tr.yml b/config/locales/javascript/javascript.tr.yml
index 3b032b00a..d20cb684a 100644
--- a/config/locales/javascript/javascript.tr.yml
+++ b/config/locales/javascript/javascript.tr.yml
@@ -23,6 +23,7 @@ tr:
       no_more: "No more posts."
     publisher: 
       at_least_one_aspect: "You must publish to at least one aspect"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "{{name}}'i ara"
     show_more: "show more"
     timeago: 
diff --git a/config/locales/javascript/javascript.zh-CN.yml b/config/locales/javascript/javascript.zh-CN.yml
index 675c55ed7..5965db94f 100644
--- a/config/locales/javascript/javascript.zh-CN.yml
+++ b/config/locales/javascript/javascript.zh-CN.yml
@@ -23,6 +23,7 @@ zh-CN:
       no_more: "没有更多的内容了。"
     publisher: 
       at_least_one_aspect: "发布时请选择至少一个情景"
+    reshares: "duplicate:\"You've already reshared that post!\""
     search_for: "搜索 {{name}}"
     show_more: "查看更多"
     timeago: 
diff --git a/config/locales/javascript/javascript.zh-TW.yml b/config/locales/javascript/javascript.zh-TW.yml
index f6e3c58fb..624358aa6 100644
--- a/config/locales/javascript/javascript.zh-TW.yml
+++ b/config/locales/javascript/javascript.zh-TW.yml
@@ -23,6 +23,7 @@ zh-TW:
       no_more: "沒有貼文了."
     publisher: 
       at_least_one_aspect: "發表時請至少選擇一個面向"
+    reshares: "重複了:\"你已經重新分享過該篇貼文了!\""
     search_for: "搜尋 {{name}}"
     show_more: "顯示更多"
     timeago: 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index a3abdba86..6177a88de 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -5,10 +5,22 @@
 require 'spec_helper'
 
 describe User do
+
   it 'should have a key' do
     alice.encryption_key.should_not be nil
   end
 
+  it 'the key should marshall to and from the db correctly' do
+    user = User.build(:username => 'max', :email => 'foo@bar.com', :password => 'password', :password_confirmation => 'password')
+    user.save!
+
+    expect{
+      user.reload.encryption_key
+    }.should_not raise_error
+
+  end
+
+
   describe 'overwriting people' do
     it 'does not overwrite old users with factory' do
       lambda {