updated locales

79 files changed, 1207 insertions, 964 deletions

diff --git a/config/locales/devise/devise.bg.yml b/config/locales/devise/devise.bg.yml
index 643047ca6..61fd1f186 100644
--- a/config/locales/devise/devise.bg.yml
+++ b/config/locales/devise/devise.bg.yml
@@ -29,7 +29,7 @@ bg:
         you_can_confirm: "Можете да потвърдите акаунта си чрез линка по-долу:"
       hello: "Здравейте %{email}!"
       invitation_instructions: 
-        accept: "Accept invitation"
+        accept: "Приемане на поканата"
         ignore: "Ако не желаете да приемете поканата, моля игнорирайте писмото."
         no_account_till: "Акаунтът няма да бъде създаден докато не посетите горната връзката и се регистрирате."
         subject: "Поканени сте да се присъедините към Diaspora!"
diff --git a/config/locales/devise/devise.de.yml b/config/locales/devise/devise.de.yml
index 74c7d7b88..caea5953b 100644
--- a/config/locales/devise/devise.de.yml
+++ b/config/locales/devise/devise.de.yml
@@ -29,10 +29,10 @@ de:
         you_can_confirm: "Du kannst dein Konto über den nachfolgenden Link bestätigen:"
       hello: "Hallo %{email}!"
       invitation_instructions: 
-        accept: "Accept invitation"
-        ignore: "If you don't want to accept the invitation, please ignore this email."
-        no_account_till: "Your account won't be created until you access the link above and sign up."
-        subject: "You've been invited to join Diaspora!"
+        accept: "Einladung annehmen"
+        ignore: "Wenn du die Einladung nicht annehmen möchtest ignoriere diese E-Mail einfach."
+        no_account_till: "Dein Konto wird nicht erstellt solange du dich nicht über den oberen Link registrierst."
+        subject: "Du wurdest zu Diaspora eingeladen!"
       inviters: 
         accept_at: "%{url} teilzunehmen. Du kannst die Einladung durch den Link unten annehmen."
         has_invited_you: "%{name} hat dich dazu eingeladen, bei Diaspora auf"
diff --git a/config/locales/devise/devise.es.yml b/config/locales/devise/devise.es.yml
index 3d297013a..ac1337316 100644
--- a/config/locales/devise/devise.es.yml
+++ b/config/locales/devise/devise.es.yml
@@ -29,10 +29,10 @@ es:
         you_can_confirm: "Puedes confirmar tu cuenta a través del siguiente enlace:"
       hello: "Hola %{email}!"
       invitation_instructions: 
-        accept: "Accept invitation"
-        ignore: "If you don't want to accept the invitation, please ignore this email."
-        no_account_till: "Your account won't be created until you access the link above and sign up."
-        subject: "You've been invited to join Diaspora!"
+        accept: "Aceptar invitación"
+        ignore: "Si no quieres aceptar la invitación, ignora este email."
+        no_account_till: "Tu cuenta no será creada hasta que no accedas al enlace de arriba para registrarte."
+        subject: "¡Has sido invitado a unirte a Diaspora*!"
       inviters: 
         accept_at: ", en %{url}, puedes aceptar en el siguiente enlace."
         has_invited_you: "%{name} te ha invitado a unirte a Diaspora"
diff --git a/config/locales/devise/devise.fr.yml b/config/locales/devise/devise.fr.yml
index 4d241ee34..712cfbe57 100644
--- a/config/locales/devise/devise.fr.yml
+++ b/config/locales/devise/devise.fr.yml
@@ -29,10 +29,10 @@ fr:
         you_can_confirm: "Vous pouvez confirmer votre compte à travers le lien ci-dessous :"
       hello: "Bonjour %{email} !"
       invitation_instructions: 
-        accept: "Accept invitation"
-        ignore: "If you don't want to accept the invitation, please ignore this email."
-        no_account_till: "Your account won't be created until you access the link above and sign up."
-        subject: "You've been invited to join Diaspora!"
+        accept: "Accepter l'invitation"
+        ignore: "Si vous ne voulez pas accepter l'invitation, merci d'ignorer ce courriel."
+        no_account_till: "Votre compte ne sera pas que lorsque vous irez sur le lien ci-dessus et que vous vous inscrirez."
+        subject: "Vous avez été invité à rejoindre Diaspora!"
       inviters: 
         accept_at: ", sur %{url}, vous pouvez accepter à travers le lien ci-dessous."
         has_invited_you: "%{name} vous a invité à rejoindre Diaspora"
diff --git a/config/locales/devise/devise.ko.yml b/config/locales/devise/devise.ko.yml
index 67f0c977a..431c606fb 100644
--- a/config/locales/devise/devise.ko.yml
+++ b/config/locales/devise/devise.ko.yml
@@ -6,7 +6,7 @@
 ko: 
   devise: 
     confirmations: 
-      confirmed: "계정을 성공적으로 확인한 뒤 로그인하였습니다."
+      confirmed: "계정을 성공적으로 확인한 뒤 로그인했습니다."
       new: 
         resend_confirmation: "확인 메일 다시 보내기"
       send_instructions: "몇 분 안으로 계정을 확인하기 위한 메일이 도착합니다."
@@ -21,7 +21,7 @@ ko:
     invitations: 
       invitation_token_invalid: "초대장 토큰이 유효하지 않습니다!"
       send_instructions: "초대장을 보냈습니다"
-      updated: "암호를 성공적으로 바꾼 뒤 로그인하였습니다."
+      updated: "암호를 성공적으로 바꾼 뒤 로그인했습니다."
     mailer: 
       confirmation_instructions: 
         confirm: "계정 확인하기"
@@ -35,8 +35,8 @@ ko:
         subject: "디아스포라로 초대합니다!"
       inviters: 
         accept_at: "이 링크로 수락할 수 있습니다: %{url}"
-        has_invited_you: "%{name} 님이 귀하를 디아스포라에 초대하였습니다."
-        have_invited_you: "%{name} 님이 귀하를 디아스포라에 초대하였습니다."
+        has_invited_you: "%{name} 님이 나를 디아스포라에 초대했습니다"
+        have_invited_you: "%{name} 님이 나를 디아스포라에 초대했습니다"
       reset_password_instructions: 
         change: "암호 바꾸기"
         ignore: "암호 초기화를 요청하지 않았다면 이 메일을 무시하세요."
@@ -57,11 +57,11 @@ ko:
         no_account: "등록되지 않은 이메일 주소입니다."
         send_password_instructions: "암호 초기화 메일 보내기"
       send_instructions: "몇 분 안으로 암호를 초기화하기 위한 메일이 도착합니다."
-      updated: "암호를 성공적으로 바꾼 뒤 로그인하였습니다."
+      updated: "암호를 성공적으로 바꾼 뒤 로그인했습니다."
     registrations: 
-      destroyed: "계정을 성공적으로 취소하였습니다."
-      signed_up: "성공적으로 가입하였습니다."
-      updated: "계정을 성공적으로 갱신하였습니다."
+      destroyed: "계정을 성공적으로 없앴습니다. 다시 만나길."
+      signed_up: "성공적으로 가입했습니다. 활성화되었다면 확인 메일이 보내집니다."
+      updated: "계정을 성공적으로 갱신했습니다."
     sessions: 
       new: 
         alpha_software: "이 소프트웨어는 알파 실험 단계입니다."
@@ -73,13 +73,13 @@ ko:
         remember_me: "로그인 유지"
         sign_in: "로그인"
         username: "사용자명"
-      signed_in: "성공적으로 로그인하였습니다."
-      signed_out: "성공적으로 로그아웃하였습니다."
+      signed_in: "성공적으로 로그인했습니다."
+      signed_out: "성공적으로 로그아웃했습니다."
     shared: 
       links: 
         forgot_your_password: "암호를 잊었습니까?"
         receive_confirmation: "확인 안내를 받지 못했습니까?"
-        receive_unlock: "풀기 안내를 받지 못했슸니까?"
+        receive_unlock: "풀기 안내를 받지 못했습니까?"
         sign_in: "로그인"
         sign_up: "가입하기"
         sign_up_closed: "공개 가입이 닫혀있습니다."
@@ -89,7 +89,7 @@ ko:
       new: 
         resend_unlock: "풀기 메일 다시 보내기"
       send_instructions: "몇 분 안으로 계정을 풀기 위한 메일이 도착합니다."
-      unlocked: "계정을 성공적으로 풀은 뒤 로그인하였습니다."
+      unlocked: "계정을 성공적으로 풀은 뒤 로그인했습니다."
   errors: 
     messages: 
       already_confirmed: ": 이미 확인되었습니다"
diff --git a/config/locales/devise/devise.ro.yml b/config/locales/devise/devise.ro.yml
index c74514abb..745c083d6 100644
--- a/config/locales/devise/devise.ro.yml
+++ b/config/locales/devise/devise.ro.yml
@@ -29,10 +29,10 @@ ro:
         you_can_confirm: "Puteţi confirma contul dvs. prin intermediul link-ul de mai jos:"
       hello: "Bună %{email}!"
       invitation_instructions: 
-        accept: "Accept invitation"
-        ignore: "If you don't want to accept the invitation, please ignore this email."
-        no_account_till: "Your account won't be created until you access the link above and sign up."
-        subject: "You've been invited to join Diaspora!"
+        accept: "Acceptă invitaţia"
+        ignore: "Dacă nu doreşti sa accepţi invitaţia, ignoră acest mesaj."
+        no_account_till: "Contul dvs. nu va fi creat până când nu veţi accesa linkul de mai sus şi vă veţi înscrie."
+        subject: "Un prieten te-a invitat pe Diaspora!"
       inviters: 
         accept_at: ", la %{url}, puteţi să-l acceptaţi prin link-ul de mai jos"
         has_invited_you: "%{name} v-a invitat pe Diaspora"
@@ -47,30 +47,30 @@ ro:
         account_locked: "Contul dvs. a fost blocat din cauza unei cantitaţi excesive de încercări nereuşite de autentificare."
         click_to_unlock: "Clic pe link-ul de mai jos pentru a debloca contul dvs."
         subject: "Instrucţiuni pentru a debloca"
-        unlock: "Deblochează contul meu"
+        unlock: "Deblochează-mi contul"
       welcome: "Bine ai revenit %{email}!"
     passwords: 
       edit: 
         change_password: "Schimbă-mi parola"
       new: 
         forgot_password: "Aţi uitat parola?"
-        no_account: "Nici un cont cu acest e-mail există. Dacă sunteţi ȋn aşteptare pentru o invitaţie, cât mai curând posibil vor fi disponibile\n"
+        no_account: "Nici un cont cu acest e-mail există. Dacă sunteţi în aşteptare pentru o invitaţie, le vom trimite cât mai curând posibil.\n"
         send_password_instructions: "Trimite-mi instrucţiunile pentru a reseta parola"
       send_instructions: "În scurt timp veți primi un email cu instrucțiuni pentru resetarea parolei."
       updated: "Parolă schimbată cu success. Sunteți acum autentificat(ă)."
     registrations: 
-      destroyed: "Pa! Contul dvs. a fost dezactivat cu succes. Sperăm să vă revedem în curând."
+      destroyed: "La revedere! Contul dvs. a fost dezactivat cu succes. Sperăm să vă revedem în curând."
       signed_up: "Sunteți autentificat(ă). Dacă este cazul, un mesaj de confirmare a fost trimis pe email-ul dvs."
       updated: "Cont actualizat cu succes."
     sessions: 
       new: 
         alpha_software: "Sunteţi pe cale de a utiliza software alfa."
-        bugs_and_feedback: "Aveţi grijă, puteţi experimenta probleme. Vă încurajăm să utilizaţi butonul Feedback pe partea dreaptă a browser-ului pentru a raporta orice problemă! Vom lucra cât de repede putem pentru a rezolva orice dificultaţi veţi întâmpina."
-        bugs_and_feedback_mobile: "Aveţi grijă, veţi experimenta probeleme. Vă încurajăm să raportaţi orice problemă! Vom lucra cât de repede putem pentru a rezolva orice dificultaţi veţi întâmpina."
+        bugs_and_feedback: "Aveţi grijă, puteţi experimenta probleme. Vă încurajăm să utilizaţi butonul Feedback de pe partea dreaptă a browser-ului pentru a raporta orice problemă! Vom lucra cât mai repede posibil pentru a rezolva orice dificultăţi veţi întâmpina."
+        bugs_and_feedback_mobile: "Aveţi grijă, veţi experimenta probleme. Vă încurajăm să raportaţi orice problemă! Vom lucra cât mai repede posibil pentru a rezolva orice dificultăţi veţi întâmpina."
         login: "Autentificare"
         modern_browsers: "suportă doar browser-ele moderne."
         password: "Parola"
-        remember_me: "Amintește-mă"
+        remember_me: "Nu mă uita"
         sign_in: "Autentificare"
         username: "Nume de utilizator"
       signed_in: "Autentificare cu succes."
@@ -93,5 +93,5 @@ ro:
   errors: 
     messages: 
       already_confirmed: "a fost deja confirmat"
-      not_found: "inexistent"
+      not_found: "Inexistent"
       not_locked: "nu a fost blocat"
diff --git a/config/locales/devise/devise.zh-TW.yml b/config/locales/devise/devise.zh-TW.yml
index fcbe4ad4c..b271acc91 100644
--- a/config/locales/devise/devise.zh-TW.yml
+++ b/config/locales/devise/devise.zh-TW.yml
@@ -29,7 +29,7 @@ zh-TW:
         you_can_confirm: "你可以使用以下連結確認帳號:"
       hello: "你好, %{email}!"
       invitation_instructions: 
-        accept: "Accept invitation"
+        accept: "接受邀請"
         ignore: "If you don't want to accept the invitation, please ignore this email."
         no_account_till: "Your account won't be created until you access the link above and sign up."
         subject: "You've been invited to join Diaspora!"
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 5db8cfb22..eea660804 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -83,6 +83,7 @@ ar:
     index: 
       handle_explanation: "هذا وسيط دياسبرا. مثل البريد الالكتروني, يمكنك منحه للأصدقاء حتى تستطيع التواصل معهم"
       no_contacts: "لا أعضاء"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "انشر رسالة >>"
     manage: 
       add_a_new_aspect: "أضف فئة جديدة"
@@ -96,9 +97,9 @@ ar:
       error: "خطأ خلال تحريك عضو: %{inspect}"
       failure: "لم يعمل %{inspect}"
       success: "تم تحريك عضو إلى الفئة الجديدة"
-    new_aspect: 
-      create: "إنشاء فئة جديدة"
-      name: "إسم الفئة"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "لم تنشر أي رسالة بعد، إبدأ المحادثة"
     one: "فئة"
@@ -129,6 +130,14 @@ ar:
     other: "%{count} تعليقات"
     zero: "لا تعليقات"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "فشل في إنشاء الإتصال"
     destroy: 
@@ -139,9 +148,11 @@ ar:
     one: "1 عضو"
     other: "%{count} أعضاء"
     share_with_pane: 
-      accepts: "حالما يقبل %{name}, ستتمكنان من رؤية رسائل بعضكما البعض"
       add_new_aspect: "إضافة إلى فئة جديدة"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "ابدأ المشاركة مع %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "لا يوجد أعضاء"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ ar:
     new_request: "عرض المشاركة معك"
     post: "منشور"
     private_message: "أرسل لك رسالة"
-    request_accepted: "وافق على عرضك للمشاركة"
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "علق أيضا على مشاركة %{post_author}:"
@@ -294,23 +305,18 @@ ar:
       mentioned: "قام بذكرك في مشاركة:"
       sign_in: "لُج لمشاهدته"
       subject: "%{name} قام بذكرك في دياسبرا"
-    new_request: 
-      just_sent_you: "أرسل لك لتوه طلب مشاركة*"
-      sign_in: "لُج هنا"
-      subject: "طلب مشاركة جديد بدياسبرا %{from}"
-      try_it_out: "ينصح بشدة الإطلاع عليه"
     private_message: 
       message_subject: "العنوان: %{subject}"
       private_message: "راسلك برسالة خاصة:"
       sign_in: "لُج لمشاهدته"
       subject: "%{name} راسلك برسالة خاصة في دياسبرا"
-    request_accepted: 
-      accepted: "وافق على عرضك للمشاركة"
-      sign_in: "لُج لمشاهدته"
-      subject: "%{name} وافق على عرضك للمشاركة في دياسبرا"
     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*"
     thanks: "شكرا,"
   ok: "حسنا"
   or: "أو"
@@ -341,12 +347,10 @@ ar:
     profile_sidebar: 
       bio: "سيرة"
       born: "تاريخ الميلاد"
-      cannot_remove: "استحالة حذف %{name} من الفئة"
       edit_my_profile: "تحرير صفحتي الشخصية"
       gender: "الجنس"
       in_aspects: "في الفئة"
       location: "المكان"
-      remove_contact: "حذف العضو"
       remove_from: "حذف %{name} من %{aspect}?"
     show: 
       add_some: "إضافة"
@@ -507,7 +511,6 @@ ar:
       your_diaspora_username_is: "معرف دياسبورا خاصتك هو: %{diaspora_handle}"
     contact_list: 
       all_contacts: "جميع الأعضاء"
-      cannot_remove: "استحالة حذف هذا الشخص من الفئة"
     footer: 
       logged_in_as: "ولوج بـ %{name}"
       your_aspects: "الفئات خاصتك"
@@ -589,8 +592,7 @@ ar:
       new_password: "كلمة مرور جديدة"
       private_message: "...وصلتك راسلة خاصة"
       receive_email_notifications: "استقبال تنبيهات عبر البريد الإلكتروني؟"
-      request_acceptence: "...عروض مشاركتك المقبولة"
-      request_received: "...استقبالك لعروض مشاركة"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "بريدك الإلكتروني"
       your_handle: "وسيط دياسبرا خاصتك"
     getting_started: 
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index 09be15b14..db18e1c08 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -44,7 +44,7 @@ bg:
   aspect_memberships: 
     destroy: 
       failure: "Лицето не бе премахнато от аспекта"
-      no_membership: "Избраното лице не може да бъде намерено в този апект"
+      no_membership: "Избраното лице не може да бъде намерено в този аспект"
       success: "Лицето е премахнато от аспекта"
   aspects: 
     add_to_aspect: 
@@ -83,6 +83,7 @@ bg:
     index: 
       handle_explanation: "Това е вашият адрес в Diaspora. Наподобява адрес на ел. поща - давате го на хора, за да се свържат с вас."
       no_contacts: "Няма контакти"
+      people_sharing_with_you: "Хора споделящи с вас"
       post_a_message: "публикуване на съобщение >>"
     manage: 
       add_a_new_aspect: "Добавяне на аспект"
@@ -96,7 +97,7 @@ bg:
       error: "Грешка при преместване на контакт: %{inspect}"
       failure: "didn't work %{inspect}"
       success: "Лицето е преместено в нов аспект"
-    new_aspect: 
+    new: 
       create: "Създаване"
       name: "Име"
     no_posts_message: 
@@ -123,12 +124,20 @@ bg:
     few: "%{count} коментара"
     many: "%{count} коментара"
     new_comment: 
-      comment: "Kоментар"
+      comment: "Коментар"
       commenting: "Коментиране..."
     one: "1 коментар"
     other: "%{count} коментара"
     zero: "няма коментари"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Добавяне в аспект"
+      toggle: 
+        few: "В %{count} аспекта"
+        many: "В %{count} аспекта"
+        one: "В %{count} аспект"
+        other: "В %{count} аспекта"
+        zero: "Добавяне в аспект"
     create: 
       failure: "Контактът не бе създаден"
     destroy: 
@@ -139,9 +148,11 @@ bg:
     one: "1 контакт"
     other: "%{count} контакта"
     share_with_pane: 
-      accepts: "Щом %{name} приеме поканата ще можете да следите публикациите си в Diaspora"
       add_new_aspect: "добавяне на нов аспект"
+      following: "Поставяйки %{name} в аспект ще започнете да следвате и изпращате публикации до тях."
       share_with: "Започнете да споделяте с %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "няма контакти"
   conversations: 
     create: 
@@ -167,7 +178,7 @@ bg:
       subject: "тема"
       to: "до"
     show: 
-      delete: "изтриване и блокиране"
+      delete: "изтриване и блокиране на разговора"
       reply: "отговор"
   date: 
     formats: 
@@ -221,9 +232,9 @@ bg:
   layouts: 
     application: 
       have_a_problem: "Имате проблем? Открийте решението тук"
-      powered_by: "POWERED BY DIASPORA*"
-      public_feed: "Public Diaspora Feed for %{name}"
-      toggle: "toggle mobile site"
+      powered_by: "Благодарение на DIASPORA*"
+      public_feed: "Публична емисия от Diaspora за %{name}"
+      toggle: "вкл./изкл. на мобилния изглед"
       whats_new: "какво ново?"
       your_aspects: "вашите аспекти"
     header: 
@@ -248,7 +259,7 @@ bg:
         other: "харесана %{count} пъти"
         zero: "не е харесана"
   more: "Още"
-  next: "next"
+  next: "следваща"
   no_results: "Няма намерени резултати"
   notifications: 
     also_commented: "also commented on %{post_author}'s"
@@ -267,50 +278,45 @@ bg:
       and_others: "и %{number} други"
       mark_all_as_read: "Маркиране на всички като прочетени"
       notifications: "Известия"
-    liked: "току-що хареса ваша публикация"
+    liked: "току-що хареса ваша публикация."
     mentioned: "ви спомена в"
     new_request: "ви предложи да споделяте."
     post: "публикация."
     private_message: "ви изпрати съобщение."
-    request_accepted: "прие поканата ви за споделяне."
+    started_sharing: "започна да споделя с вас."
   notifier: 
     also_commented: 
       commented: "has also commented on %{post_author}'s post:"
-      sign_in: "Sign in to view it."
+      sign_in: "Впишете се, за да я прегледате."
       subject: "%{name} has also commented on %{post_author}'s post."
     comment_on_post: 
-      commented: "has commented on your post:"
-      sign_in: "Sign in to view it."
+      commented: "добави коментар на ваша публикация:"
+      sign_in: "Впишете се, за да го прегледате."
       subject: "%{name} коментира ваша публикация."
-    diaspora: "the diaspora email robot"
+    diaspora: "системата за ел. поща на diaspora"
     hello: "Здравейте %{name}!"
     liked: 
       liked: "току-що %{name} хареса вашата публикация:"
-      sign_in: "Sign to view it"
+      sign_in: "Впишете се, за да я прегледате"
       subject: "току-що %{name} хареса ваша публикация"
-    love: "love,"
-    manage_your_email_settings: "manage your email settings"
+    love: "с уважение,"
+    manage_your_email_settings: "променяне на настройките за известяване"
     mentioned: 
       mentioned: "ви спомена в публикация:"
       sign_in: "Впишете се, за да я прегледате."
       subject: "%{name} ви спомена в Diaspora*"
-    new_request: 
-      just_sent_you: "just sent you a contact request on Diaspora*"
-      sign_in: "Впишете се тук"
-      subject: "new Diaspora* contact request from %{from}"
-      try_it_out: "You should really think about checking it out."
     private_message: 
       message_subject: "Тема: %{subject}"
       private_message: "ви изпрати лично съобщение:"
       sign_in: "Впишете се, за да го прегледате."
-      subject: "%{name} ви изпрати лично съобщени в Diaspora*"
-    request_accepted: 
-      accepted: "has accepted your contact request!"
-      sign_in: "Впишете се тук"
-      subject: "%{name} has accepted your contact request on Diaspora*"
+      subject: "%{name} ви изпрати лично съобщение в Diaspora*"
     single_admin: 
       admin: "Вашият администратор на Diaspora"
       subject: "Съобщение относно акаунта ви в Diaspora:"
+    started_sharing: 
+      sharing: "започна да споделя с вас!"
+      sign_in: "Sign in here"
+      subject: "%{name} започна да споделя с вас в Diaspora*"
     thanks: "Благодаря,"
   ok: "Добре"
   or: "или"
@@ -326,7 +332,7 @@ bg:
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " резултата за %{params}"
     index: 
-      couldnt_find_them_send_invite: "Не можете да ги намерите?  Пратете им покана!"
+      couldnt_find_them_send_invite: "Не можете да намерите приятелите си? Пратете им покана!"
       no_one_found: "...и никой не е намерен."
       no_results: "Hey! You need to search for something."
       results_for: "резултат от търсенето за"
@@ -336,24 +342,22 @@ bg:
     person: 
       add_contact: "добавяне на контакт"
       already_connected: "Вече сте свързани"
-      pending_request: "Pending request"
+      pending_request: "Неразгледана покана"
       thats_you: "Това сте вие!"
     profile_sidebar: 
       bio: "биографични данни"
       born: "рожден ден"
-      cannot_remove: "Лицето %{name} не може да бъде премахнато от последния аспект. (Ако желаете да бъде прекратена връзката с лицето е необходимо да премахнете контакта.)"
       edit_my_profile: "Редактирайте профилът си"
       gender: "пол"
       in_aspects: "in aspects"
-      location: "местоположние"
-      remove_contact: "премахване на контакта"
+      location: "местоположение"
       remove_from: "Премахване на %{name} от %{aspect}?"
     show: 
       add_some: "add some"
       does_not_exist: "Лицето не съществува!"
       edit: "редактиране"
       incoming_request: "%{name} желае да споделя с вас"
-      mention: "Mention"
+      mention: "Споменете"
       message: "Съобщение"
       no_posts: "няма публикации за изобразяване!"
       not_connected: "Вие не споделяте с лицето"
@@ -407,7 +411,7 @@ bg:
       post_hidden: "Публикацията на %{name} е скрита."
   posts: 
     doesnt_exist: "публикацията не съществува!"
-  previous: "previous"
+  previous: "предишна"
   profile: "Профил"
   profiles: 
     edit: 
@@ -459,14 +463,14 @@ bg:
       new_requests: 
         few: "%{count} нови покани!"
         many: "%{count} нови покани!"
-        one: "нова покана!"
+        one: "имате нова покана!"
         other: "%{count} нови покани!"
         zero: "няма нови покани"
     manage_aspect_contacts: 
       existing: "Съществуващи контакти"
       manage_within: "Manage contacts within"
     new_request_to_person: 
-      sent: "sent!"
+      sent: "изпратена!"
   search: "Търсене"
   services: 
     create: 
@@ -492,11 +496,11 @@ bg:
       logged_in_as: "вписани сте като"
       really_disconnect: "Наистина ли желаете свързаността с %{service} да бъде изключена?"
     inviter: 
-      click_link_to_accept_invitation: "Click this link to accept your invitation"
-      join_me_on_diaspora: "Join me on DIASPORA*"
+      click_link_to_accept_invitation: "Кликнете върху връзката, за да приемете поканата"
+      join_me_on_diaspora: "Присъединете се към мен в DIASPORA*"
     remote_friend: 
       invite: "покани"
-      resend: "resend"
+      resend: "повторно изпращане"
   settings: "Настройки"
   shared: 
     add_contact: 
@@ -507,7 +511,6 @@ bg:
       your_diaspora_username_is: "Вашето потребителско име в Diaspora е %{diaspora_handle}"
     contact_list: 
       all_contacts: "Всички контакти"
-      cannot_remove: "Лицето не може да бъде премахнато от последния аспект. (Ако желаете да бъде прекратена връзката с лицето е необходимо да премахнете контакта.)"
     footer: 
       logged_in_as: "вписани сте като %{name}"
       your_aspects: "вашите аспекти"
@@ -517,7 +520,7 @@ bg:
       from_facebook: "от Facebook"
       invitations_left: "(остават още %{count} покани)"
       invite_someone: "Поканете някого"
-      invite_your_friends: "Намерете приятелите си"
+      invite_your_friends: "Поканете приятелите си"
       invites: "Покани"
       invites_closed: "Invites are currently closed on this Diaspora pod"
     notification: 
@@ -533,7 +536,7 @@ bg:
       all_contacts: "всички контакти"
       click_to_share_with: "Кликнете, за да споделите: "
       make_public: "направете публично"
-      post_a_message_to: "Публикувайте публично съобяение в %{aspect}"
+      post_a_message_to: "Публикувайте публично съобщение в %{aspect}"
       posting: "Публикуване..."
       public: "Публично"
       publishing_to: "публикуване в: "
@@ -545,7 +548,7 @@ bg:
     stream_element: 
       dislike: "Не ми харесва"
       like: "Харесва ми"
-      unlike: "Unlike"
+      unlike: "Не ми харесва"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -554,7 +557,7 @@ bg:
     helper: 
       no_message_to_display: "Няма съобщение за изобразяване."
     new: 
-      mentioning: "Mentioning: %{person}"
+      mentioning: "Споменаване на %{person}"
     show: 
       destroy: "Изтриване"
       not_found: "За съжаление публикацията не може да бъде намерена."
@@ -589,8 +592,7 @@ bg:
       new_password: "Нова парола"
       private_message: "...получите лично съобщение?"
       receive_email_notifications: "Получаване на известие по ел. поща когато..."
-      request_acceptence: "...бъде приета отправена от вас покана за споделяне?"
-      request_received: "...получите покана за споделяне?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "Вашата ел. поща"
       your_handle: "Вашият адрес в Diaspora"
     getting_started: 
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index b43d7cb62..c89866f5c 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -83,6 +83,7 @@ br:
     index: 
       handle_explanation: "Ar postel-mañ zo ho skor diaspora. E-giz ur chomlec'h-postel e c'hellit skignat anezhañ a-benn bezañ kavet gant an dud."
       no_contacts: "Darempred ebet"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
     manage: 
       add_a_new_aspect: "Add a new aspect"
@@ -96,9 +97,9 @@ br:
       error: "Error moving contact: %{inspect}"
       failure: "didn't work %{inspect}"
       success: "Person moved to new aspect"
-    new_aspect: 
-      create: "Krouiñ"
-      name: "Anv"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "Nobody has said anything yet.  Get the conversation started!"
     one: "1 arvez"
@@ -129,6 +130,14 @@ br:
     other: "%{count} embann"
     zero: "embann ebet"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Failed to create contact"
     destroy: 
@@ -139,9 +148,11 @@ br:
     one: "1 darempred"
     other: "%{count} a zarempredoù"
     share_with_pane: 
-      accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
       add_new_aspect: "ouzhpennañ da'n arvez nevez"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Start sharing with %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "darempred ebet"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ br:
     new_request: "offered to share with you."
     post: "post"
     private_message: "sent you a message."
-    request_accepted: "accepted your share request."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "has also commented on %{post_author}'s post:"
@@ -294,23 +305,18 @@ br:
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
       subject: "%{name} has mentioned you on Diaspora*"
-    new_request: 
-      just_sent_you: "just sent you a contact request on Diaspora*"
-      sign_in: "Sign in here"
-      subject: "new Diaspora* contact request from %{from}"
-      try_it_out: "You should really think about checking it out."
     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*"
-    request_accepted: 
-      accepted: "has accepted your contact request!"
-      sign_in: "Sign in here"
-      subject: "%{name} has accepted your contact request on Diaspora*"
     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*"
     thanks: "Thanks,"
   ok: "MAT EO"
   or: "pe"
@@ -341,12 +347,10 @@ br:
     profile_sidebar: 
       bio: "buhez"
       born: "deiziad-ganidigezh"
-      cannot_remove: "Cannot remove %{name} from last aspect. (If you want to disconnect from this person you must remove contact.)"
       edit_my_profile: "Edit my profile"
       gender: "reizh"
       in_aspects: "in aspects"
       location: "chomaj"
-      remove_contact: "skarzhañ an darempred"
       remove_from: "Fellout a ra deoc'h skarzhañ %{name} diwar %{aspect}?"
     show: 
       add_some: "add some"
@@ -507,7 +511,6 @@ br:
       your_diaspora_username_is: "Setu hoc'h anv-implijer war Diaspora: %{diaspora_handle}"
     contact_list: 
       all_contacts: "An holl zarempredoù"
-      cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     footer: 
       logged_in_as: "logged in as %{name}"
       your_aspects: "your aspects"
@@ -589,8 +592,7 @@ br:
       new_password: "Ger-Kuzh Nevez"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Receive email notifications when..."
-      request_acceptence: "...your share request is accepted?"
-      request_received: "...you receive a new share request?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "Ho postel"
       your_handle: "Ho skor diaspora"
     getting_started: 
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 2246af5ad..616465b44 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -83,6 +83,7 @@ cs:
     index: 
       handle_explanation: "Toto je váš Diaspora identifikátor. Podobně jako e-mailovou adresu ho můžete dál lidem a budete na něm dostupní."
       no_contacts: "Žádné kontakty"
+      people_sharing_with_you: "Lidé, kteří s vámi sdílí"
       post_a_message: "odeslat příspěvek >>"
     manage: 
       add_a_new_aspect: "Přidat aspekt"
@@ -96,7 +97,7 @@ cs:
       error: "Chyba při přesunu kontaktu: %{inspect}"
       failure: "%{inspect} nefunguje"
       success: "Kontakt přesunut do nového aspektu"
-    new_aspect: 
+    new: 
       create: "Vytvořit"
       name: "Název"
     no_posts_message: 
@@ -129,6 +130,14 @@ cs:
     other: "%{count} komentářů"
     zero: "žádné komentáře"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Přidat do aspektu"
+      toggle: 
+        few: "Ve %{count} aspektech"
+        many: "V %{count} aspektech"
+        one: "V %{count} aspektu"
+        other: "V %{count} aspektech"
+        zero: "Přidat do aspektu"
     create: 
       failure: "Nepodařilo se vytvořit kontakt"
     destroy: 
@@ -139,9 +148,11 @@ cs:
     one: "1 kontakt"
     other: "%{count} kontaktů"
     share_with_pane: 
-      accepts: "Jakmile %{name} pozvání přijme, uvidíte jeho další příspěvky na Diaspoře"
       add_new_aspect: "přidat do nového aspektu"
+      following: "Umístěním %{name} v aspektu, začnete sledovat jeho příspěvky a odesílat mu vaše vlastní."
       share_with: "Začít sdílet s %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "žádné kontakty"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ cs:
     new_request: "nabídnul vám sdílení."
     post: "zpráva"
     private_message: "vám poslal zprávu."
-    request_accepted: "akceptoval vaši žádost o sdílení."
+    started_sharing: "s vámi začal sdílet."
   notifier: 
     also_commented: 
       commented: "také komentoval příspěvek od %{post_author}:"
@@ -294,23 +305,18 @@ cs:
       mentioned: "zmínil jste v příspěvku:"
       sign_in: "Přihlaste se pro zobrazení."
       subject: "%{name} vás zmínil na Diaspoře*"
-    new_request: 
-      just_sent_you: "just sent you a contact request on Diaspora*"
-      sign_in: "Přihlaste se zde"
-      subject: "nová žádost na Diasporu* od %{from}"
-      try_it_out: "Měli byste o tom opravdu přemýšlet."
     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*"
-    request_accepted: 
-      accepted: "přijal vaši žádost!"
-      sign_in: "Přihlaste se zde"
-      subject: "%{name} přijal vaši žádost na Diasporu*"
     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*"
     thanks: "Díky,"
   ok: "OK"
   or: "nebo"
@@ -341,12 +347,10 @@ cs:
     profile_sidebar: 
       bio: "životopis"
       born: "datum narození"
-      cannot_remove: "Nelze odstranit %{name} z posledního aspektu. (Pokud se chcete odpojit od této osoby, musíte odstranit její kontakt.)"
       edit_my_profile: "Upravit můj profil"
       gender: "pohlaví"
       in_aspects: "v aspektech"
       location: "poloha"
-      remove_contact: "odstranit kontakt"
       remove_from: "Odstranit %{name} z %{aspect}?"
     show: 
       add_some: "přidat nějaké"
@@ -507,7 +511,6 @@ cs:
       your_diaspora_username_is: "Vaše uživatelské jméno na Diaspoře: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Všechny kontakty"
-      cannot_remove: "Nelze odstranit osobu z posledního aspektu. (Pokud se chcete odpojit od této osoby, musíte odstranit její kontakt.)"
     footer: 
       logged_in_as: "přihlášen jako %{name}"
       your_aspects: "vaše aspekty"
@@ -517,7 +520,7 @@ cs:
       from_facebook: "z Facebooku"
       invitations_left: "(%{count} zbývá)"
       invite_someone: "Pozvěte někoho"
-      invite_your_friends: "Najděte vaše přátele"
+      invite_your_friends: "Pozvěte vaše přátele"
       invites: "Pozvánky"
       invites_closed: "Pozvánky jsou aktuálně uzavřeny na tomto Diaspora podu"
     notification: 
@@ -589,8 +592,7 @@ cs:
       new_password: "Nové heslo"
       private_message: "...obdržíte soukromou zprávu?"
       receive_email_notifications: "Přijímat oznámení emailem když..."
-      request_acceptence: "...je vaše žádost o sdílení akceptována?"
-      request_received: "...obdržíte novou žádost o sdílení?"
+      started_sharing: "...někdo začne sdílet s vámi?"
       your_email: "Váš email"
       your_handle: "Vaše identifikace na Diaspoře"
     getting_started: 
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 7683b853b..8b96dfb4c 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -83,6 +83,7 @@ cy:
     index: 
       handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
       no_contacts: "No contacts"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
     manage: 
       add_a_new_aspect: "Add a new aspect"
@@ -96,7 +97,7 @@ cy:
       error: "Error moving contact: %{inspect}"
       failure: "didn't work %{inspect}"
       success: "Person moved to new aspect"
-    new_aspect: 
+    new: 
       create: "Create"
       name: "Name"
     no_posts_message: 
@@ -129,6 +130,14 @@ cy:
     other: "%{count} comments"
     zero: "no comments"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Failed to create contact"
     destroy: 
@@ -139,9 +148,11 @@ cy:
     one: "1 contact"
     other: "%{count} contacts"
     share_with_pane: 
-      accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
       add_new_aspect: "add to new aspect"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Start sharing with %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "no contacts"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ cy:
     new_request: "offered to share with you."
     post: "post"
     private_message: "sent you a message."
-    request_accepted: "accepted your share request."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "has also commented on %{post_author}'s post:"
@@ -294,23 +305,18 @@ cy:
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
       subject: "%{name} has mentioned you on Diaspora*"
-    new_request: 
-      just_sent_you: "just sent you a friend request on Diaspora*"
-      sign_in: "sign in here"
-      subject: "new Diaspora* friend request from %{from}"
-      try_it_out: "You should really think about checking it out."
     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*"
-    request_accepted: 
-      accepted: "has accepted your friend request. They are now in your"
-      sign_in: "Sign in here"
-      subject: "%{name} has accepted your friend request on Diaspora*"
     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*"
     thanks: "Thanks,"
   ok: "OK"
   or: "or"
@@ -341,12 +347,10 @@ cy:
     profile_sidebar: 
       bio: "bio"
       born: "born"
-      cannot_remove: "Cannot remove %{name} from last aspect."
       edit_my_profile: "Edit my profile"
       gender: "gender"
       in_aspects: "in aspects"
       location: "location"
-      remove_contact: "remove contact"
       remove_from: "Remove %{name} from %{aspect}?"
     show: 
       add_some: "add some"
@@ -507,7 +511,6 @@ cy:
       your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
     contact_list: 
       all_contacts: "All contacts"
-      cannot_remove: "Cannot remove person from last aspect."
     footer: 
       logged_in_as: "logged in as %{name}"
       your_aspects: "your aspects"
@@ -589,8 +592,7 @@ cy:
       new_password: "New Password"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Receive email notificaions?"
-      request_acceptence: "...your share request is accepted?"
-      request_received: "...you receive a new share request?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "Your email"
       your_handle: "Your diaspora handle"
     getting_started: 
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index d242581f2..545bd378e 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -83,6 +83,7 @@ da:
     index: 
       handle_explanation: "Dette er dit diaspora handle. Som med en e-mail-adresse, kan du give denne til folk, så de kan kontakte dig."
       no_contacts: "Ingen kontakter"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "post en besked >>"
     manage: 
       add_a_new_aspect: "Tilføj et nyt aspekt"
@@ -96,9 +97,9 @@ da:
       error: "Kunne ikke flytte kontaktperson: %{inspect}"
       failure: "virkede ikke %{inspect}"
       success: "Person flyttet til nyt aspekt"
-    new_aspect: 
-      create: "Opret"
-      name: "Navn"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "Ingen har sagt noget endnu. Start samtalen!"
     one: "1 aspekt"
@@ -129,6 +130,14 @@ da:
     other: "%{count} kommentarer"
     zero: "ingen kommentarer"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Kunne ikke oprette kontakt"
     destroy: 
@@ -139,9 +148,11 @@ da:
     one: "Én kontaktperson"
     other: "%{count} kontaktpersoner"
     share_with_pane: 
-      accepts: "Når %{name} acceptere, vil i kunne se hinandens indlæg på Diaspora"
       add_new_aspect: "tilføj til nyt aspekt"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Begynd at dele med %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "Ingen kontaktpersoner"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ da:
     new_request: "tilbød at dele med dig."
     post: "indlæg"
     private_message: "har sendt dig en besked."
-    request_accepted: "accepterede din anmodning."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "har også kommenteret på %{post_author}'s post:"
@@ -294,23 +305,18 @@ da:
       mentioned: "omtalte dig i en post:"
       sign_in: "Log in for at se det."
       subject: "%{name} har omtalt dig på Diaspora*"
-    new_request: 
-      just_sent_you: "har lige sendt dig en kontaktanmodning på Diaspora*"
-      sign_in: "Log ind her"
-      subject: "ny Diaspora* kontaktanmodning fra %{from}"
-      try_it_out: "Du bør virkelig overveje at tjekke den ud."
     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*"
-    request_accepted: 
-      accepted: "har accepteret din kontaktanmodning."
-      sign_in: "Log ind her"
-      subject: "% {name} har accepteret din kontaktanmodning på Diaspora*"
     single_admin: 
       admin: "Din Diaspora administrator"
       subject: "En besked fra din Diaspora administrator:"
+    started_sharing: 
+      sharing: "has started sharing with you!"
+      sign_in: "Sign in here"
+      subject: "%{name} has started sharing with you on Diaspora*"
     thanks: "Tak,"
   ok: "OK"
   or: "eller"
@@ -341,12 +347,10 @@ da:
     profile_sidebar: 
       bio: "bio"
       born: "fødselsdag"
-      cannot_remove: "Kan ikke fjerne %{name} fra sidste aspekt."
       edit_my_profile: "Redigér min profil"
       gender: "køn"
       in_aspects: "i aspekter"
       location: "placering"
-      remove_contact: "fjern kontaktperson"
       remove_from: "Fjern %{name} fra %{aspect}?"
     show: 
       add_some: "tilføj nogle"
@@ -507,7 +511,6 @@ da:
       your_diaspora_username_is: "Dit Diaspora handle er: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Alle kontaktpersoner"
-      cannot_remove: "Kan ikke fjerne person fra sidste aspekt."
     footer: 
       logged_in_as: "logget ind som %{name}"
       your_aspects: "Dine aspekter"
@@ -589,8 +592,7 @@ da:
       new_password: "Ny adgangskode"
       private_message: "...du har modtaget en besked?"
       receive_email_notifications: "Modtag e-mail notifikation når..."
-      request_acceptence: "...din anmodning om at dele er blevet accepteret?"
-      request_received: "...du har modtaget en nu dele anmodning?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "Din e-mail"
       your_handle: "Dit diaspora handle"
     getting_started: 
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 9a53f85e9..b270260b2 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -83,6 +83,7 @@ de:
     index: 
       handle_explanation: "Das ist deine Diaspora*-Adresse. Du kannst sie wie eine E-Mail-Adresse weitergeben, damit andere Nutzer mit dir Kontakt aufnehmen können."
       no_contacts: "Keine Kontakte"
+      people_sharing_with_you: "Leute die mit dir teilen"
       post_a_message: "schreibe eine Nachricht >>"
     manage: 
       add_a_new_aspect: "Neuen Aspekt hinzufügen"
@@ -96,7 +97,7 @@ de:
       error: "Fehler beim Verschieben des Kontakts: %{inspect}"
       failure: "hat nicht funktioniert: %{inspect}"
       success: "Person in neuen Aspekt verschoben"
-    new_aspect: 
+    new: 
       create: "Erstellen"
       name: "Name"
     no_posts_message: 
@@ -129,6 +130,14 @@ de:
     other: "%{count} Kommentare"
     zero: "%{count} Kommentare"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Zu Aspekt hinzufügen"
+      toggle: 
+        few: "In %{count} Aspekten"
+        many: "In %{count} Aspekten"
+        one: "In einem Aspekt"
+        other: "In %{count} Aspekten"
+        zero: "Zu Aspekt hinzufügen"
     create: 
       failure: "Konnte Kontakt nicht erstellen"
     destroy: 
@@ -139,9 +148,11 @@ de:
     one: "1 Kontakt"
     other: "%{count} Kontakte"
     share_with_pane: 
-      accepts: "Sobald %{name} die Anfrage akzeptiert hat, könnt ihr eure Beiträge auf Diaspora* sehen"
       add_new_aspect: "zu neuem Aspekt hinzufügen"
+      following: "Wenn du  %{name} einem Aspekt hinzufügst, fängst du an ihm zu folgen und Beiträge an ihn zu senden."
       share_with: "Beginne Inhalte mit %{name} zu teilen"
+    sharing: 
+      people_sharing: "Leute die mit dir teilen:"
     zero: "Keine Kontakte"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ de:
     new_request: "hat angeboten mit dir zu teilen."
     post: "Beitrag"
     private_message: "hat dir eine Nachricht gesendet."
-    request_accepted: "hat deine Teilen-Anfrage angenommen."
+    started_sharing: "hat angefangen mit dir zu teilen."
   notifier: 
     also_commented: 
       commented: "hat den Beitrag von %{post_author} ebenfalls kommentiert:"
@@ -294,23 +305,18 @@ de:
       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"
-    new_request: 
-      just_sent_you: "hat dir gerade eine Kontakt-Anfrage auf Diaspora* geschickt"
-      sign_in: "Melde dich hier an"
-      subject: "Neue Diaspora* Kontakt-Anfrage von %{from}"
-      try_it_out: "Probier’s aus!"
     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"
-    request_accepted: 
-      accepted: "hat deine Kontakt-Anfrage akzeptiert!"
-      sign_in: "Hier anmelden"
-      subject: "%{name} hat deine Kontakt-Anfrage auf Diaspora* akzeptiert"
     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"
     thanks: "Danke,"
   ok: "OK"
   or: "oder"
@@ -341,12 +347,10 @@ de:
     profile_sidebar: 
       bio: "Beschreibung"
       born: "Geburtstag"
-      cannot_remove: "%{name} kann nicht aus dem letzten Aspekt entfernt werden. (Wenn du nicht länger verbunden sein willst, lösche den Kontakt.)"
       edit_my_profile: "Mein Profil bearbeiten"
       gender: "Geschlecht"
       in_aspects: "in Aspekten"
       location: "Ort"
-      remove_contact: "Kontakt entfernen"
       remove_from: "%{name} aus %{aspect} entfernen?"
     show: 
       add_some: "Ein paar hinzufügen"
@@ -507,7 +511,6 @@ de:
       your_diaspora_username_is: "Dein Diaspora* Nutzername ist: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Alle Kontakte"
-      cannot_remove: "Kontakt kann nicht aus dem letzten Aspekt entfernt werden. (Wenn du nicht länger verbunden sein willst, lösche den Kontakt.)"
     footer: 
       logged_in_as: "Angemeldet als %{name}"
       your_aspects: "Deine Aspekte"
@@ -589,8 +592,7 @@ de:
       new_password: "Neues Passwort"
       private_message: "… du eine private Nachricht erhältst?"
       receive_email_notifications: "E-Mail-Benachrichtigungen empfangen, wenn …"
-      request_acceptence: "… deine Teilen-Anfrage akzeptiert wurde?"
-      request_received: "… du eine neue Teilen-Anfrage erhalten hast?"
+      started_sharing: "...jemand anfängt mit dir zu teilen?"
       your_email: "Deine E-Mail-Adresse"
       your_handle: "Deine Diaspora* Adresse"
     getting_started: 
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index a24ab02ca..dc0db66e7 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -83,6 +83,7 @@ el:
     index: 
       handle_explanation: "Αυτό είναι το αναγνωριστικό σας στο Diaspora. Όπως και με μια διεύθυνση ηλεκτρονικού ταχυδρομείου, μπορείτε να το δώσετε σε άλλους για να μπορέσουν να σας βρουν."
       no_contacts: "Καμία επαφή"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "δημοσιεύστε ένα μήνυμα >>"
     manage: 
       add_a_new_aspect: "Προσθέστε μια νέα πτυχή"
@@ -96,9 +97,9 @@ el:
       error: "Σφάλμα μεταφοράς επαφής: %{inspect}"
       failure: "δεν λειτούργησε %{inspect}"
       success: "Το άτομο μετακινήθηκε σε νέα πτυχή"
-    new_aspect: 
-      create: "Δημιουργία"
-      name: "Όνομα"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "Κανένας δεν έχει δημοσιεύσει κάτι ακόμα. Ξεκινήστε εσείς τη συζήτηση!"
     one: "1 πτυχή"
@@ -129,6 +130,14 @@ el:
     other: "%{count} σχόλια"
     zero: "κανένα σχόλιο"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Αποτυχία δημιουργίας επαφής"
     destroy: 
@@ -139,9 +148,11 @@ el:
     one: "1 επαφή"
     other: "%{count} επαφές"
     share_with_pane: 
-      accepts: "Όταν ο/η %{name} σας αποδεχτεί, θα ξεκινήσετε να βλέπετε μεταξύ σας τις δημοσιεύεσεις σας στο Diaspora"
       add_new_aspect: "προσθήκη σε νεα πτυχή"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Έναρξη διαμοιρασμού με τον/την %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "καμία επαφή"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ el:
     new_request: "προσφέρθηκε να μοιραστεί μαζί σας."
     post: "δημοσίευση."
     private_message: "σας έστειλε ένα μήνυμα"
-    request_accepted: "δέχτηκε το αίτημα σας για διαμοιρασμό. "
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "σχολίασε επίσης τη %{post_author} :"
@@ -294,23 +305,18 @@ el:
       mentioned: "αναφέρεται σε σας σε μια δημοσίευση:"
       sign_in: "Συνδεθείτε για να το δείτε."
       subject: "Ο/Η %{name} σας αναφέρει στο Diaspora*"
-    new_request: 
-      just_sent_you: "έχετε ένα νέο αίτημα φίλου στο Diaspora*"
-      sign_in: "Είσοδος εδώ"
-      subject: "έχετε νέο αίτημα επαφής Diaspora από τον χρήστη %{from}"
-      try_it_out: "Θα πρέπει πραγματικά να σκεφτείτε να το ελέγξετε."
     private_message: 
       message_subject: "Θέμα: %{subject}"
       private_message: "σας έστειλε ένα ιδιωτικό μήνυμα:"
       sign_in: "Συνδεθείτε για να το δείτε."
       subject: "Ο χρήστης %{name} σας έστειλε ένα ιδιωτικό μήνυμα στο Diaspora*"
-    request_accepted: 
-      accepted: "έχει αποδεχθεί το αίτημα φιλίας σας!"
-      sign_in: "Συνδεθείτε εδώ"
-      subject: "%{name} έχει αποδεχθεί το αίτημα φιλίας σας στο Diaspora*"
     single_admin: 
       admin: "Ο διαχειριστής Diaspora σας"
       subject: "Μήνυμα για τον Diaspora λογαριασμό σας:"
+    started_sharing: 
+      sharing: "has started sharing with you!"
+      sign_in: "Sign in here"
+      subject: "%{name} has started sharing with you on Diaspora*"
     thanks: "Ευχαριστώ,"
   ok: "OK"
   or: "ή"
@@ -341,12 +347,10 @@ el:
     profile_sidebar: 
       bio: "βιογραφικό"
       born: "γεννήθηκε"
-      cannot_remove: "Δεν μπορεί να αφαιρεθεί ο/η %{name} από την τελευταία πτυχή. (Εάν θέλετε να αποσυνδεθείτε από αυτό το άτομο θα πρέπει να αφαιρέσετε πρώτα την επαφή.)"
       edit_my_profile: "Επεξεργασία του προφίλ μου"
       gender: "φύλο"
       in_aspects: "στις πτυχές"
       location: "τοποθεσία"
-      remove_contact: "αφαίρεση επαφής"
       remove_from: "Αφαίρεση του χρήστη %{name} από τη πτυχή %{aspect}?"
     show: 
       add_some: "προσθέστε κάποιες"
@@ -507,7 +511,6 @@ el:
       your_diaspora_username_is: "Το όνομα χρήστη σας στο Diaspora είναι: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Όλες οι επαφές"
-      cannot_remove: "Δεν είναι δυνατή η αφαίρεση του ατόμου από την τελευταία πτυχή. (Αν θέλετε να αποσυνδεθείτε από το πρόσωπο αυτό πρέπει να καταργήσετε την αντίστοιχη επαφή.)"
     footer: 
       logged_in_as: "συνδεδεμένος/η ως %{name}"
       your_aspects: "οι πτυχές σας"
@@ -589,8 +592,7 @@ el:
       new_password: "Νέος κωδικός πρόσβασης"
       private_message: "...μόλις λάβατε μία προσωπική ειδοποίηση?"
       receive_email_notifications: "Να λαμβάνετε ειδοποιήσεις στο ηλεκτρονικό σας ταχυδρομείο όταν..."
-      request_acceptence: "...το αίτημα σας για διαμοιρασμό έγινε αποδεκτό?"
-      request_received: "...μόλις λάβατε ένα καινούριο αίτημα για διαμοιρασμό?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "Το email σας"
       your_handle: "Το αναγνωριστικό σας στο diaspora"
     getting_started: 
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 7710fff2d..e6cf61b72 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -83,6 +83,7 @@ en_shaw:
     index: 
       handle_explanation: "𐑞𐑦𐑕 𐑦𐑟 𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑣𐑨𐑯𐑛𐑩𐑤. 𐑤𐑲𐑒 𐑩𐑯 𐑦-𐑥𐑱𐑤 𐑩𐑛𐑮𐑧𐑕, 𐑿 𐑒 𐑜𐑦𐑝 𐑞𐑦𐑕 𐑑 𐑐𐑰𐑐𐑩𐑤 𐑑 𐑮𐑰𐑗 𐑿."
       no_contacts: "𐑯𐑴 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "𐑐𐑴𐑕𐑑 𐑩 𐑥𐑧𐑕𐑩𐑡 >>"
     manage: 
       add_a_new_aspect: "𐑨𐑛 𐑯𐑿 𐑨𐑕𐑐𐑧𐑒𐑑"
@@ -96,9 +97,9 @@ en_shaw:
       error: "𐑺𐑼 𐑥𐑵𐑝𐑦𐑙 𐑒𐑪𐑯𐑑𐑨𐑒𐑑: %{inspect}"
       failure: "𐑛𐑦𐑛𐑯𐑑 𐑢𐑻𐑒 %{inspect}"
       success: "𐑐𐑻𐑕𐑩𐑯 𐑥𐑵𐑝𐑛 𐑑 𐑯𐑿 𐑨𐑕𐑐𐑧𐑒𐑑"
-    new_aspect: 
-      create: "𐑒𐑮𐑦𐑱𐑑"
-      name: "𐑯𐑱𐑥"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "𐑯𐑴𐑚𐑩𐑛𐑦 𐑣𐑨𐑟 𐑕𐑧𐑛 𐑨𐑯𐑦𐑔𐑦𐑙 𐑘𐑧𐑑.  𐑜𐑧𐑑 𐑞 𐑒𐑪𐑯𐑝𐑼𐑕𐑱𐑖𐑩𐑯 𐑕𐑑𐑸𐑑𐑩𐑛!"
     one: "1 𐑨𐑕𐑐𐑧𐑒𐑑"
@@ -129,6 +130,14 @@ en_shaw:
     other: "%{count} 𐑒𐑪𐑥𐑩𐑯𐑑𐑕"
     zero: "𐑯𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑕"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "𐑓𐑱𐑤𐑛 𐑑 𐑒𐑮𐑦𐑱𐑑 𐑒𐑪𐑯𐑑𐑨𐑒𐑑"
     destroy: 
@@ -139,9 +148,11 @@ en_shaw:
     one: "1 𐑒𐑪𐑯𐑑𐑨𐑒𐑑"
     other: "%{count} 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
     share_with_pane: 
-      accepts: "𐑢𐑳𐑯𐑕 %{name} 𐑩𐑒𐑕𐑧𐑐𐑑𐑕, 𐑿'𐑤 𐑕𐑑𐑸𐑑 𐑕𐑰𐑦𐑙 𐑰𐑗 𐑳𐑞𐑼𐑟 𐑐𐑴𐑕𐑑𐑕 𐑪𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩"
       add_new_aspect: "𐑨𐑛 𐑑 𐑯𐑿 𐑨𐑕𐑐𐑧𐑒𐑑"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "𐑕𐑑𐑸𐑑 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "𐑯𐑴 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ en_shaw:
     new_request: "𐑪𐑓𐑼𐑛 𐑑 𐑖𐑺 𐑢𐑦𐑞 𐑿."
     post: "𐑐𐑴𐑕𐑑"
     private_message: "𐑕𐑧𐑯𐑑 𐑿 𐑩 𐑥𐑧𐑕𐑩𐑡."
-    request_accepted: "𐑩𐑒𐑕𐑧𐑐𐑑𐑩𐑛 𐑿𐑼 𐑖𐑺 𐑮𐑦𐑒𐑢𐑧𐑕𐑑."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "𐑣𐑨𐑟 𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 %{post_author}𐑟 𐑐𐑴𐑕𐑑:"
@@ -294,23 +305,18 @@ en_shaw:
       mentioned: "𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩 𐑐𐑴𐑕𐑑:"
       sign_in: "𐑕𐑲𐑯 𐑦𐑯 𐑑 𐑝𐑿 𐑦𐑑."
       subject: "%{name} 𐑣𐑨𐑟 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑪𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩*"
-    new_request: 
-      just_sent_you: "𐑡𐑳𐑕𐑑 𐑕𐑧𐑯𐑑 𐑿 𐑩 𐑒𐑪𐑯𐑑𐑨𐑒𐑑 𐑮𐑦𐑒𐑢𐑧𐑕𐑑 𐑪𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩*"
-      sign_in: "𐑕𐑲𐑯 𐑦𐑯 𐑣𐑽"
-      subject: "𐑯𐑿 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩* 𐑒𐑪𐑯𐑑𐑨𐑒𐑑 𐑮𐑦𐑒𐑢𐑧𐑕𐑑 𐑓𐑮𐑪𐑥 %{from}"
-      try_it_out: "𐑿 𐑖𐑫𐑛 𐑮𐑦𐑤𐑦 𐑔𐑦𐑙𐑒 𐑩𐑚𐑬𐑑 𐑗𐑧𐑒𐑦𐑙 𐑦𐑑 𐑬𐑑."
     private_message: 
       message_subject: "𐑕𐑳𐑚𐑡𐑧𐑒𐑑: %{subject}"
       private_message: "𐑣𐑨𐑟 𐑕𐑧𐑯𐑑 𐑿 𐑩 𐑐𐑮𐑲𐑝𐑩𐑑 𐑥𐑧𐑕𐑩𐑡:"
       sign_in: "𐑕𐑲𐑯 𐑦𐑯 𐑑 𐑝𐑿 𐑦𐑑."
       subject: "%{name} 𐑣𐑨𐑟 𐑕𐑧𐑯𐑑 𐑿 𐑩 𐑐𐑮𐑲𐑝𐑩𐑑 𐑥𐑧𐑕𐑩𐑡 𐑪𐑯 *𐑛𐑦𐑨𐑕𐑐𐑹𐑩"
-    request_accepted: 
-      accepted: "𐑣𐑨𐑟 𐑩𐑒𐑕𐑧𐑐𐑑𐑩𐑛 𐑿𐑼 𐑒𐑪𐑯𐑑𐑨𐑒𐑑 𐑮𐑦𐑒𐑢𐑧𐑕𐑑!"
-      sign_in: "𐑕𐑲𐑯 𐑦𐑯 𐑣𐑽"
-      subject: "%{name} 𐑣𐑨𐑟 𐑩𐑒𐑕𐑧𐑐𐑑𐑩𐑛 𐑿𐑼 𐑒𐑪𐑯𐑑𐑨𐑒𐑑 𐑮𐑦𐑒𐑢𐑧𐑕𐑑 𐑪𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩*"
     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*"
     thanks: "𐑔𐑱𐑙𐑒𐑕,"
   ok: "𐑴𐑒𐑱"
   or: "𐑹"
@@ -341,12 +347,10 @@ en_shaw:
     profile_sidebar: 
       bio: "𐑚𐑲𐑴"
       born: "𐑚𐑻𐑔𐑛𐑱"
-      cannot_remove: "𐑒𐑨𐑯𐑪𐑑 𐑮𐑦𐑥𐑵𐑝 %{name} 𐑓𐑮𐑪𐑥 𐑤𐑨𐑕𐑑 𐑨𐑕𐑐𐑧𐑒𐑑. (𐑦𐑓 𐑿 𐑢𐑳𐑯𐑑 𐑑 𐑛𐑦𐑕𐑒𐑩𐑥𐑧𐑒𐑑 𐑓𐑮𐑪𐑥 𐑞𐑦𐑕 𐑐𐑻𐑕𐑩𐑯 𐑿 𐑥𐑳𐑕𐑑 𐑮𐑦𐑥𐑵𐑝 𐑒𐑪𐑯𐑑𐑨𐑒𐑑.)"
       edit_my_profile: "𐑧𐑛𐑦𐑑 𐑥𐑲 𐑐𐑮𐑴𐑓𐑲𐑤"
       gender: "𐑡𐑧𐑯𐑛𐑼"
       in_aspects: "𐑦𐑯 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
       location: "𐑤𐑴𐑒𐑱𐑖𐑩𐑯"
-      remove_contact: "𐑮𐑦𐑥𐑵𐑝 𐑒𐑪𐑯𐑑𐑨𐑒𐑑"
       remove_from: "𐑮𐑦𐑥𐑵𐑝 %{name} 𐑓𐑮𐑪𐑥 %{aspect}?"
     show: 
       add_some: "𐑨𐑛 𐑕𐑳𐑥"
@@ -507,7 +511,6 @@ en_shaw:
       your_diaspora_username_is: "𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑿𐑟𐑼𐑯𐑱𐑥 𐑦𐑟: %{diaspora_handle}"
     contact_list: 
       all_contacts: "𐑷𐑤 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
-      cannot_remove: "𐑒𐑨𐑯𐑪𐑑 𐑮𐑦𐑥𐑵𐑝 𐑐𐑻𐑕𐑩𐑯 𐑓𐑮𐑪𐑥 𐑨𐑕𐑐𐑧𐑒𐑑. (𐑦𐑓 𐑿 𐑢𐑳𐑯𐑑 𐑑 𐑛𐑦𐑕𐑒𐑩𐑯𐑧𐑒𐑑 𐑓𐑮𐑪𐑥 𐑞𐑦𐑕 𐑐𐑻𐑕𐑩𐑯 𐑿 𐑥𐑳𐑕𐑑 𐑮𐑦𐑥𐑵𐑝 𐑒𐑪𐑯𐑑𐑨𐑒𐑑.)"
     footer: 
       logged_in_as: "𐑤𐑪𐑜𐑛 𐑦𐑯 𐑨𐑟 %{name}"
       your_aspects: "𐑿𐑼 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
@@ -589,8 +592,7 @@ en_shaw:
       new_password: "𐑯𐑿 𐑐𐑨𐑕𐑢𐑼𐑛"
       private_message: "...𐑿 𐑮𐑦𐑕𐑰𐑝 𐑩 𐑐𐑮𐑲𐑝𐑩𐑑 𐑥𐑧𐑕𐑩𐑡?"
       receive_email_notifications: "𐑮𐑦𐑕𐑰𐑝 𐑦-𐑥𐑱𐑤 𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟 𐑢𐑧𐑯..."
-      request_acceptence: "...𐑿𐑼 𐑖𐑺 𐑮𐑦𐑒𐑢𐑧𐑕𐑑 𐑦𐑟 𐑩𐑒𐑕𐑧𐑐𐑑𐑩𐑛?"
-      request_received: "...𐑿 𐑮𐑦𐑕𐑰𐑝 𐑩 𐑯𐑿 𐑖𐑺 𐑮𐑦𐑒𐑢𐑧𐑕𐑑?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "𐑿𐑼 𐑦-𐑥𐑱𐑤"
       your_handle: "𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑣𐑨𐑯𐑛𐑩𐑤"
     getting_started: 
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 32dc26b0f..5f2f55d05 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -83,6 +83,7 @@ eo:
     index: 
       handle_explanation: "This is your diaspora handle. Like an email address, you can give this to people to reach you."
       no_contacts: "No contacts"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
     manage: 
       add_a_new_aspect: "Aldoni novan aspekton"
@@ -96,9 +97,9 @@ eo:
       error: "Error moving contact: %{inspect}"
       failure: "didn't work %{inspect}"
       success: "Person moved to new aspect"
-    new_aspect: 
-      create: "Krei"
-      name: "Nomo"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "Nobody has said anything yet.  Get the conversation started!"
     one: "1 aspect"
@@ -129,6 +130,14 @@ eo:
     other: "%{count} comments"
     zero: "no comments"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Failed to create contact"
     destroy: 
@@ -139,9 +148,11 @@ eo:
     one: "1 contact"
     other: "%{count} contacts"
     share_with_pane: 
-      accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
       add_new_aspect: "add to new aspect"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Start sharing with %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "no contacts"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ eo:
     new_request: "offered to share with you."
     post: "post"
     private_message: "sent you a message."
-    request_accepted: "accepted your share request."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "has also commented on %{post_author}'s post:"
@@ -294,23 +305,18 @@ eo:
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
       subject: "%{name} has mentioned you on Diaspora*"
-    new_request: 
-      just_sent_you: "just sent you a contact request on Diaspora*"
-      sign_in: "sign in here"
-      subject: "new Diaspora* contact request from %{from}"
-      try_it_out: "You should really think about checking it out."
     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*"
-    request_accepted: 
-      accepted: "has accepted your contact request. They are now in your"
-      sign_in: "Sign in here"
-      subject: "%{name} has accepted your contact request on Diaspora*"
     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*"
     thanks: "Thanks,"
   ok: "Nu"
   or: "aŭ"
@@ -341,12 +347,10 @@ eo:
     profile_sidebar: 
       bio: "bio"
       born: "born"
-      cannot_remove: "Cannot remove %{name} from last aspect. (If you want to disconnect from this person you must remove contact.)"
       edit_my_profile: "Edit my profile"
       gender: "gender"
       in_aspects: "in aspects"
       location: "location"
-      remove_contact: "remove contact"
       remove_from: "Remove %{name} from %{aspect}?"
     show: 
       add_some: "add some"
@@ -507,7 +511,6 @@ eo:
       your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
     contact_list: 
       all_contacts: "All contacts"
-      cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     footer: 
       logged_in_as: "logged in as %{name}"
       your_aspects: "your aspects"
@@ -589,8 +592,7 @@ eo:
       new_password: "New Password"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Receive email notificaions?"
-      request_acceptence: "...your share request is accepted?"
-      request_received: "...you receive a new share request?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "Your email"
       your_handle: "Your diaspora handle"
     getting_started: 
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 408cda635..a3ffd49ad 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -83,6 +83,7 @@ es-CL:
     index: 
       handle_explanation: "Esta es tu dirección Diaspora. Como una dirección de correo, puedes dársela a la gente para que te encuentren."
       no_contacts: "No hay contactos"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "postea un mensaje >>"
     manage: 
       add_a_new_aspect: "Agregar un nuevo aspecto"
@@ -96,9 +97,9 @@ es-CL:
       error: "Error al mover el contacto: %{inspect}"
       failure: "no funcionó %{inspect}"
       success: "Persona movida al nuevo aspecto"
-    new_aspect: 
-      create: "Crear"
-      name: "Nombre"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "Nadie ha dicho nada aún.  ¡Que comiense la conversación!"
     one: "1 aspecto"
@@ -129,6 +130,14 @@ es-CL:
     other: "%{count} comentarios"
     zero: "no hay comentarios"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Error al crear contacto"
     destroy: 
@@ -139,9 +148,11 @@ es-CL:
     one: "1 contacto"
     other: "%{count} contactos"
     share_with_pane: 
-      accepts: "Una vez que %{name} acepte, podrán ver sus post mutuamente en Diaspora"
       add_new_aspect: "Agregar a un nuevo Aspecto"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Empezar a compartir con %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "no hay contactos"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ es-CL:
     new_request: "quiere compartir contigo."
     post: "post."
     private_message: "te envió un mensaje."
-    request_accepted: "aceptó tu solicitud de contacto."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "También comentó en el post de %{post_author}:"
@@ -294,23 +305,18 @@ es-CL:
       mentioned: "Te mencionó en un post:"
       sign_in: "Conéctate para verlo."
       subject: "%{name} te mencionó en Diaspora*"
-    new_request: 
-      just_sent_you: "acaban de enviarte una solicitud de contacto en Diaspora*"
-      sign_in: "Conéctate aquí"
-      subject: "nueva solicitud de contacto Diaspora* de %{from}"
-      try_it_out: "Deberías pensar en echarle un vistazo."
     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*"
-    request_accepted: 
-      accepted: "aceptó tu solicitud de contacto!"
-      sign_in: "Conéctate aquí"
-      subject: "%{name} ha aceptado tu solicitud de contacto en Diaspora*"
     single_admin: 
       admin: "Tu administrador de Diaspora"
       subject: "Un mensaje sobre tu cuenta de Diaspora:"
+    started_sharing: 
+      sharing: "has started sharing with you!"
+      sign_in: "Sign in here"
+      subject: "%{name} has started sharing with you on Diaspora*"
     thanks: "Gracias,"
   ok: "OK"
   or: "o"
@@ -341,12 +347,10 @@ es-CL:
     profile_sidebar: 
       bio: "biografía"
       born: "Cumpleaños"
-      cannot_remove: "No se puede eliminar a %{name} del último aspecto. (Si quieres desconectarte de esta persona primero debes eliminar al contacto.)"
       edit_my_profile: "Editar mi perfil"
       gender: "sexo"
       in_aspects: "en aspectos"
       location: "Ubicación"
-      remove_contact: "eliminar contacto"
       remove_from: "¿Eliminar a %{name} de %{aspect}?"
     show: 
       add_some: "agrega algunas"
@@ -507,7 +511,6 @@ es-CL:
       your_diaspora_username_is: "Tu nombre de usuario Diaspora es: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Todos los contactos"
-      cannot_remove: "No se puede eliminar a la persona del último aspecto. (Si quieres desconectarte de esta persona primero debes eliminar al contacto.)"
     footer: 
       logged_in_as: "Conectado como %{name}"
       your_aspects: "Tus Aspectos"
@@ -589,8 +592,7 @@ es-CL:
       new_password: "Nueva Contraseña"
       private_message: "...recibes un mensaje privado?"
       receive_email_notifications: "Recibir notificaciones por correo electrónico cuando..."
-      request_acceptence: "...aceptan tu solicitud de contacto?"
-      request_received: "...recibes una solicitud de contacto?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "Tu correo electrónico"
       your_handle: "Tu dirección diaspora"
     getting_started: 
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 0dff3beb8..f7f77fe15 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -83,6 +83,7 @@ es:
     index: 
       handle_explanation: "Ésta es tu dirección Diaspora*. Como una dirección de correo, puedes dársela a la gente para que te encuentren."
       no_contacts: "No hay contactos"
+      people_sharing_with_you: "Están compartiendo contigo"
       post_a_message: "publica un mensaje >>"
     manage: 
       add_a_new_aspect: "Añadir nuevo aspecto"
@@ -96,7 +97,7 @@ es:
       error: "Error moviendo el contacto: %{inspect}"
       failure: "%{inspect} no funcionó"
       success: "El contacto fue movido al nuevo aspecto"
-    new_aspect: 
+    new: 
       create: "Crear"
       name: "Nombre"
     no_posts_message: 
@@ -129,6 +130,14 @@ es:
     other: "%{count} comentarios"
     zero: "no hay comentarios"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Añadir al aspecto"
+      toggle: 
+        few: "En %{count} aspectos"
+        many: "En %{count} aspectos"
+        one: "En %{count} aspecto"
+        other: "En %{count} aspectos"
+        zero: "Añadir al aspecto"
     create: 
       failure: "No se pudo crear el contacto"
     destroy: 
@@ -139,9 +148,11 @@ es:
     one: "1 contacto"
     other: "%{count} contactos"
     share_with_pane: 
-      accepts: "Una vez que %{name} acepte, veras sus demás publicaciones en Diaspora*"
       add_new_aspect: "añadir nuevo aspecto"
+      following: "Colocando a %{name} en un aspecto, compartireis vuestras publicaciones."
       share_with: "Empezar a compartir con %{name}"
+    sharing: 
+      people_sharing: "Compartiendo contigo:"
     zero: "no hay contactos"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ es:
     new_request: "quisiera compartir contigo."
     post: "publicación."
     private_message: "te envió un mensaje."
-    request_accepted: "aceptó tu solicitud de contacto."
+    started_sharing: "empezó a compartir contigo."
   notifier: 
     also_commented: 
       commented: "participó en la publicación de %{post_author}:"
@@ -294,23 +305,18 @@ es:
       mentioned: "te mencionó en una publicación:"
       sign_in: "Conéctate para verlo."
       subject: "%{name} te mencionó en Diaspora*"
-    new_request: 
-      just_sent_you: "acaban de enviarte una solicitud de contacto Diaspora*"
-      sign_in: "Conéctate aquí"
-      subject: "nueva solicitud de contacto Diaspora* de %{from}"
-      try_it_out: "¡Pruébalo!"
     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*"
-    request_accepted: 
-      accepted: "aceptó tu solicitud de contacto."
-      sign_in: "Conectar aquí"
-      subject: "%{name} aceptó tu solicitud de contacto en Diaspora*"
     single_admin: 
       admin: "Tu administrador de Diaspora*"
       subject: "Un mensaje de tu administrador de Diaspora*:"
+    started_sharing: 
+      sharing: "ha empezado a compartir contigo!"
+      sign_in: "Accede aquí"
+      subject: "%{name} ha empezado a compartir contigo en Diaspora*"
     thanks: "Gracias,"
   ok: "OK"
   or: "o"
@@ -341,12 +347,10 @@ es:
     profile_sidebar: 
       bio: "Biografía"
       born: "Fecha de Nacimiento"
-      cannot_remove: "%{name} no puede eliminarse del último aspecto. (Si quieres dejar de compartir, deberas eliminarlo.)"
       edit_my_profile: "Editar mi perfil"
       gender: "Género / Sexo"
       in_aspects: "en aspectos"
       location: "Ubicación "
-      remove_contact: "eliminar contacto"
       remove_from: "¿Eliminar a %{name} de %{aspect}?"
     show: 
       add_some: "agrega algunos"
@@ -507,12 +511,11 @@ es:
       your_diaspora_username_is: "Su nombre de usuario Diaspora* es: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Todos los contactos"
-      cannot_remove: "No puede eliminarse a la persona del último aspecto. (Si quieres dejar de compartir deberas elminarla.)"
     footer: 
       logged_in_as: "Conectado como %{name}"
       your_aspects: "tus aspectos"
     invitations: 
-      by_email: "por Email"
+      by_email: "vía Email"
       dont_have_now: "No tienes invitaciones ahora mismo pero, ¡pronto llegarán más!"
       from_facebook: "Desde Facebook"
       invitations_left: "(%{count} restantes)"
@@ -589,8 +592,7 @@ es:
       new_password: "Nueva contraseña"
       private_message: "...recibes un mensaje privado?"
       receive_email_notifications: "Recibir notificaciones por correo cuando..."
-      request_acceptence: "...tu solicitud de contacto es aceptada?"
-      request_received: "...recibes una nueva solicitud de contacto?"
+      started_sharing: "...alquien empieza a compartir contigo?"
       your_email: "Tu dirección de correo"
       your_handle: "Tu dirección Diaspora*"
     getting_started: 
@@ -598,7 +600,7 @@ es:
       connect_services: "Conectar con otros servicios"
       could_not_find_anyone: "No se pudo encontrar a ningún amigo en Diaspora*. Use el buscador de amigos para invitarlos."
       edit_profile: "Edita tu perfil"
-      finished: "¡Finalizado!"
+      finished: "¡Terminado!"
       save_and_continue: "Guardar y continuar"
       signup_steps: "Termina tu registro en tres pasos:"
       skip: "saltar inicio"
@@ -607,7 +609,7 @@ es:
         skip: "Saltar"
       step_3: 
         finish: "Terminar"
-        people_already_on_diaspora: "Gente que ya está en Diaspora*"
+        people_already_on_diaspora: "Ya están en Diaspora*"
       welcome: "¡Bienvenido a Diaspora*!"
     public: 
       does_not_exist: "¡El usuario %{username} no existe!"
@@ -615,7 +617,7 @@ es:
       email_notifications_changed: "Notificaciones por correo cambiadas"
       language_changed: "Idioma cambiado"
       language_not_changed: "Error cambiando de idioma"
-      password_changed: "Contraseña cambiada"
+      password_changed: "Contraseña cambiada. Ya puedes acceder con tu nueva contraseña."
       password_not_changed: "Error cambiando la contraseña"
   webfinger: 
     fetch_failed: "Error al buscar el perfil webfinger de %{profile_url}"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 9b5b81775..cc495cd95 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -83,6 +83,7 @@ eu:
     index: 
       handle_explanation: "Hau da zure Diaspora erabiltzailea. Zure adiskideei emaiezu zu aurkitzearren."
       no_contacts: "Adiskiderik ez"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "mezu bat bidali >>"
     manage: 
       add_a_new_aspect: "Alderdi berri bat sortu"
@@ -96,9 +97,9 @@ eu:
       error: "Huts adiskidea mugitzean: %{inspect}"
       failure: "huts egin du %{inspect}"
       success: "Pertsona alderdi berrira gehitua"
-    new_aspect: 
-      create: "Sortu"
-      name: "Izena"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "Oraindik inork ez du ezer esan. Izan zaitez lehenengoa!"
     one: "alderdi 1"
@@ -129,6 +130,14 @@ eu:
     other: "%{count} iruzkin"
     zero: "iruzkinik ez"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Akatsa adiskide berria sortzean"
     destroy: 
@@ -139,9 +148,11 @@ eu:
     one: "adiskide 1"
     other: "%{count} adiskide"
     share_with_pane: 
-      accepts: "%{name}(e)k onartzen duenean, bakoitzak bestearen mezuak ikusiko ditu Diasporan"
       add_new_aspect: "alderdi berrira gehitu"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "%{name}(r)ekin harremanetan hasi"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "adiskiderik ez"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ eu:
     new_request: "(e)k zurekin partekatu nahi du."
     post: "mezua."
     private_message: "(e)k mezu bat bidali dizu."
-    request_accepted: "(e)k zure partekatze eskaera onartu du."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "(e)k ere iruzkindu du %{post_author}(r)en mezuan:"
@@ -294,23 +305,18 @@ eu:
       mentioned: "zu aipatu zaituzte mezu batean:"
       sign_in: "Sartu ikusteko."
       subject: "%{name}(e)k Diasporan aipatu zaitu"
-    new_request: 
-      just_sent_you: "oraintxe Diaspora* adiskide eskaera bidali zaizu"
-      sign_in: "sartu hemen"
-      subject: "Diaspora* adiskide eskaera berria %{from}(e)k bidalia"
-      try_it_out: "Hobe zenuke begiztatzea."
     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"
-    request_accepted: 
-      accepted: "(e)k zure adiskide eskaera onartu du. Orain hemen dago:"
-      sign_in: "Sartu hemen"
-      subject: "%{name}(e)k zure adiskide eskaera onartu du Diasporan"
     single_admin: 
       admin: "Zure Diaspora administratzailea"
       subject: "Mezu bat zure Diaspora kontuari buruz:"
+    started_sharing: 
+      sharing: "has started sharing with you!"
+      sign_in: "Sign in here"
+      subject: "%{name} has started sharing with you on Diaspora*"
     thanks: "Milesker,"
   ok: "Onartu"
   or: "edo"
@@ -341,12 +347,10 @@ eu:
     profile_sidebar: 
       bio: "niri buruz"
       born: "jaioteguna"
-      cannot_remove: "Ezin izan da %{name} ezabatu azken alderditik. (Pertsona honekin harremanak etendu nahi badituzu, adiskidea ezabatu egin beharko duzu.)"
       edit_my_profile: "Nire profila aldatu"
       gender: "sexua"
       in_aspects: "alderdietan"
       location: "kokalekua"
-      remove_contact: "adiskidea ezabatu"
       remove_from: "%{name} ezabatu %{aspect} alderditik?"
     show: 
       add_some: "gehitu batzuk"
@@ -507,7 +511,6 @@ eu:
       your_diaspora_username_is: "Zure Diaspora erabiltzailea honakoa da: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Adiskide Guztiak"
-      cannot_remove: "Ezin izan da pertsona azken alderditik ezabatu. (Pertsona honekin harremanak nahi ez badituzu, adiskidea ezabatu behar duzu.)"
     footer: 
       logged_in_as: "%{name} zara"
       your_aspects: "zure alderdiak"
@@ -589,8 +592,7 @@ eu:
       new_password: "Pasahitz Berria"
       private_message: "...mezu pribatu bat jasotzen duzunean?"
       receive_email_notifications: "E-posta jakinarazpenak jaso nahi dituzu..."
-      request_acceptence: "...zure partekatze eskaerak onartuak izan direnean?"
-      request_received: "...partekatze eskaera berriak dituzunean?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "Zure e-posta"
       your_handle: "Zure Diaspora erabiltzailea"
     getting_started: 
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index b30739718..1a2f2f0c2 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -83,6 +83,7 @@ fi:
     index: 
       handle_explanation: "Tämä on Diaspora-osoitteesi. Voit käyttää sitä kuten sähköpostiosoitettasi. Sen avulla sinut tavoitetaan Diasporasta."
       no_contacts: "Ei kontakteja"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
     manage: 
       add_a_new_aspect: "Lisää uusi näkymä"
@@ -96,9 +97,9 @@ fi:
       error: "Virhe siirrettäessä kontaktia: %{inspect}"
       failure: "ei toiminut %{inspect}"
       success: "Henkilö siirretty uuteen näkymään"
-    new_aspect: 
-      create: "Luo"
-      name: "Nimi"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "Kukaan ei ole sanonut vielä mitään. Aloita keskustelu!"
     one: "1 näkymä"
@@ -129,6 +130,14 @@ fi:
     other: "%{count} kommenttia"
     zero: "ei kommentteja"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Kontaktin luonti epäonnistui"
     destroy: 
@@ -139,9 +148,11 @@ fi:
     one: "1 kontakti"
     other: "%{count} kontaktia"
     share_with_pane: 
-      accepts: "Kunhan %{name} hyväksyy pyyntösi, alatte näkemään toisenne postit Diasporassa"
       add_new_aspect: "Lisää uusi näkymä"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Aloita jakamaan %{name} kanssa"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "ei kontakteja"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ fi:
     new_request: "haluaa jakaa kanssasi."
     post: "viesti."
     private_message: "sent you a message."
-    request_accepted: "hyväksyi jakopyyntösi."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "kommentoi myös käyttäjän %{post_author} viestiin:"
@@ -294,23 +305,18 @@ fi:
       mentioned: "mainitsi sinut viestissään:"
       sign_in: "Kirjaudu sisään nähdäksesi."
       subject: "%{name} on maininnut sinut Diaspora*:ssa"
-    new_request: 
-      just_sent_you: "lähetti juuri äsken sinulle kontaktipyynnön Diaspora*ssa"
-      sign_in: "Kirjaudu sisään täältä"
-      subject: "uusi Diaspora* kontaktipyyntö henkilöltä %{from}"
-      try_it_out: "Sinun todella kannattaisi tutustua siihen."
     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"
-    request_accepted: 
-      accepted: "on hyväksynyt kontaktipyyntösi!"
-      sign_in: "Enregistrez-vous ici"
-      subject: "%{name} on hyväksynyt kontaktipyyntösi Diaspora*ssa"
     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: "Sign in here"
+      subject: "%{name} has started sharing with you on Diaspora*"
     thanks: "Kiitos,"
   ok: "OK"
   or: "tai"
@@ -341,12 +347,10 @@ fi:
     profile_sidebar: 
       bio: "Biografia"
       born: "Syntymäpäivä"
-      cannot_remove: "Henkilöä, %{name}, ei voida poistaa viimeisestä näkymästä. (Jos haluat katkaista yhteyden henkilöön, täytyy sinun poistaa kontakti.)"
       edit_my_profile: "Muokkaa profiilia"
       gender: "Sukupuoli"
       in_aspects: "näkymissä"
       location: "location"
-      remove_contact: "poista kontakti"
       remove_from: "Poista %{name} näkymästä %{aspect}?"
     show: 
       add_some: "add some"
@@ -507,7 +511,6 @@ fi:
       your_diaspora_username_is: "Diaspora käyttäjätunnuksesi on: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Kaikki kontaktit"
-      cannot_remove: "Henkilöä ei voitu poistaa viimeisestä näkymästä. (Jos haluat katkaista yhteyden tähän henkilöön, tulee sinun poistaa kontakti.)"
     footer: 
       logged_in_as: "kirjauduttu sisään käyttäjällä %{name}"
       your_aspects: "näkymäsi"
@@ -589,8 +592,7 @@ fi:
       new_password: "Uusi salasana"
       private_message: "...saat uuden viestin?"
       receive_email_notifications: "Vastaanota sähköposti-ilmoituksia, kun.."
-      request_acceptence: "...jakopyyntösi hyväksytään?"
-      request_received: "...saat uuden jakopyynnön?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "Sähköpostiosoitteesi"
       your_handle: "Diaspora-tunnuksesi"
     getting_started: 
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 5aac0cf36..13385afa5 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -83,6 +83,7 @@ fr:
     index: 
       handle_explanation: "Ceci est votre handle diaspora. Comme une adresse de courrier électronique, vous pouvez le communiquer à d'autres personnes pour leur permettre de vous joindre."
       no_contacts: "Aucun contact"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "publier un message >>"
     manage: 
       add_a_new_aspect: "Ajouter un nouvel aspect"
@@ -96,9 +97,9 @@ fr:
       error: "Erreur lors du déplacement du contact : %{inspect}"
       failure: "n'a pas fonctionné %{inspect}"
       success: "Personne déplacée vers le nouvel aspect"
-    new_aspect: 
-      create: "Créer"
-      name: "Nom"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "Personne n’a encore rien dit.  Engagez dès à présent la conversation !"
     one: "1 aspect"
@@ -129,6 +130,14 @@ fr:
     other: "%{count} commentaires"
     zero: "aucun commentaire"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Impossible de créer le contact"
     destroy: 
@@ -139,9 +148,11 @@ fr:
     one: "1 contact"
     other: "%{count} contacts"
     share_with_pane: 
-      accepts: "Dès que %{name} acceptera, vous commencerez à voir mutuellement vos messages sur Diaspora"
       add_new_aspect: "ajouter à un nouvel aspect"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Commencer à partager avec %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "aucun contact"
   conversations: 
     create: 
@@ -238,15 +249,15 @@ fr:
       people_dislike_this: 
         few: "%{count} personnes n'aiment pas"
         many: "%{count} personnes n'aiment pas"
-        one: "1 personne n'aime pas"
+        one: "%{count} personne n'aime pas"
         other: "%{count} personnes n'aiment pas"
-        zero: "Personne n'aime pas"
+        zero: "Personne n'aime pas ça"
       people_like_this: 
-        few: "%{count} personnes n'aiment pas"
+        few: "%{count} personnes aiment"
         many: "%{count} personnes aiment"
-        one: "1 personne aime"
+        one: "%{count} personne aime"
         other: "%{count} personnes aiment"
-        zero: "Personne n'aime"
+        zero: "Personne n'aime ça"
   more: "Plus"
   next: "suivant"
   no_results: "Aucun résultat trouvé"
@@ -267,12 +278,12 @@ fr:
       and_others: "et %{number} autres"
       mark_all_as_read: "Tout marquer comme lu"
       notifications: "Notifications"
-    liked: "has just liked your post"
+    liked: "vient juste d'aimer votre message"
     mentioned: "vous a mentionné(e) dans un"
     new_request: "a proposé de partager avec vous."
     post: "message."
     private_message: "vous a envoyé un message."
-    request_accepted: "a accepté votre demande de partage."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "a également commenté le message de %{post_author} :"
@@ -285,32 +296,27 @@ fr:
     diaspora: "le robot de messagerie électronique de Diaspora"
     hello: "Bonjour %{name} !"
     liked: 
-      liked: "%{name} has just liked your post: "
-      sign_in: "Sign to view it"
-      subject: "%{name} has just liked your post"
+      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"
     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*"
-    new_request: 
-      just_sent_you: "vient juste de vous envoyer une requête de contact sur Diaspora*"
-      sign_in: "Connectez-vous ici"
-      subject: "nouvelle requête de contact Diaspora* de %{from}"
-      try_it_out: "Vous devriez vraiment envisager de l'essayer."
     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*"
-    request_accepted: 
-      accepted: "a accepté votre requête de contact !"
-      sign_in: "Enregistrez ici"
-      subject: "%{name} a accepté votre requête de contact sur Diaspora*"
     single_admin: 
       admin: "Votre administrateur Diaspora"
       subject: "Un message concernant votre compte Diaspora :"
+    started_sharing: 
+      sharing: "has started sharing with you!"
+      sign_in: "Sign in here"
+      subject: "%{name} has started sharing with you on Diaspora*"
     thanks: "Merci,"
   ok: "OK"
   or: "ou"
@@ -341,12 +347,10 @@ fr:
     profile_sidebar: 
       bio: "bio"
       born: "anniversaire"
-      cannot_remove: "Impossible de supprimer %{name} du dernier aspect. (Si vous voulez supprimer toute connexion avec cette personne vous devez la supprimer en tant que contact.)"
       edit_my_profile: "Modifier mon profil"
       gender: "sexe"
       in_aspects: "dans les aspects"
       location: "localisation"
-      remove_contact: "supprimer le contact"
       remove_from: "Supprimer %{name} de %{aspect} ?"
     show: 
       add_some: "ajouter"
@@ -507,7 +511,6 @@ fr:
       your_diaspora_username_is: "Votre nom d'utilisateur Diaspora est : %{diaspora_handle}"
     contact_list: 
       all_contacts: "Tous les contacts"
-      cannot_remove: "Impossible de supprimer la personne du dernier aspect. (Si vous voulez supprimer toute connexion avec cette personne vous devez la supprimer en tant que contact.)"
     footer: 
       logged_in_as: "Connecté en tant que %{name}"
       your_aspects: "vos aspects"
@@ -545,7 +548,7 @@ fr:
     stream_element: 
       dislike: "Je n'aime pas"
       like: "J'aime"
-      unlike: "Unlike"
+      unlike: "Je n'aime pas"
   status_messages: 
     create: 
       success: "Mention de : %{names}"
@@ -584,13 +587,12 @@ fr:
       download_xml: "télécharger mon XML"
       edit_account: "Modifier le compte"
       export_data: "Exporter des données"
-      liked: "...someone likes your post?"
+      liked: "...quelqu'un aime votre message ?"
       mentioned: "…vous êtes mentionné(e) dans une publication ?"
       new_password: "Nouveau mot de passe"
       private_message: "…vous recevez un message privé ?"
       receive_email_notifications: "Recevoir des notifications par courrier électronique lorsque…"
-      request_acceptence: "…votre demande de partage est acceptée ?"
-      request_received: "…vous recevez une nouvelle demande de partage ?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "Votre adresse électronique"
       your_handle: "Votre handle diaspora"
     getting_started: 
@@ -615,7 +617,7 @@ fr:
       email_notifications_changed: "Notifications par courriel modifiées"
       language_changed: "Langue mise à jour"
       language_not_changed: "Échec lors de la mise à jour de la langue"
-      password_changed: "Mot de passe mis à jour"
+      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"
   webfinger: 
     fetch_failed: "impossible de télécharger le profil webfinger pour %{profile_url}"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index cb79b258c..f8bfb8081 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -83,6 +83,7 @@ ga:
     index: 
       handle_explanation: "This is your diaspora handle. Like an email address, you can give this to people to reach you."
       no_contacts: "No contacts"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
     manage: 
       add_a_new_aspect: "Cuir gné nua leis"
@@ -96,9 +97,9 @@ ga:
       error: "Earráid ag boga teagmháil: %{inspect}"
       failure: "níor d'eirigh le %{inspect}"
       success: "Bogadh an duine chuig gné nua"
-    new_aspect: 
-      create: "Cruthaigh"
-      name: "Ainm"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "Níor deireadh aon rud fós. Cuir tús leis an comhrá!"
     one: "1 aspect"
@@ -129,6 +130,14 @@ ga:
     other: "%{count} comments"
     zero: "no comments"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Failed to create contact"
     destroy: 
@@ -139,9 +148,11 @@ ga:
     one: "teagmháil amháin"
     other: "%{count} teagmháil"
     share_with_pane: 
-      accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
       add_new_aspect: "add to new aspect"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Start sharing with %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "níl aon teagmháila"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ ga:
     new_request: "ofráiladh chun roint leant"
     post: "póst"
     private_message: "sent you a message."
-    request_accepted: "glacadh le do iarratas roinnt"
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "has also commented on %{post_author}'s post:"
@@ -294,23 +305,18 @@ ga:
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
       subject: "%{name} has mentioned you on Diaspora*"
-    new_request: 
-      just_sent_you: "díreach ag seoala iarratas teagmháil chugat ar Diaspora*"
-      sign_in: "síniú isteach anseo"
-      subject: "Iarratas teagmháil Diaspora* nua ó %{from}"
-      try_it_out: "Ba cheart duit smaoineamh faoi é a thriala."
     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*"
-    request_accepted: 
-      accepted: "tar éis do iarratas teagmháil a glacadh!"
-      sign_in: "Sign in here"
-      subject: "Glacadh %{name} le do iarratas teagmháil ar Diaspora*"
     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*"
     thanks: "Gur raibh maith agat,"
   ok: "OK"
   or: "nó"
@@ -341,12 +347,10 @@ ga:
     profile_sidebar: 
       bio: "beathaisnéis"
       born: "breithlá"
-      cannot_remove: "Ní féidir leat fháil ré le %{name} ón gné déarnach. (Má tá tú ag iarradh dínascadh ón duine seo, tá ort fháil ré le teagmháil.)"
       edit_my_profile: "Athraigh mo próifíl"
       gender: "inscne"
       in_aspects: "i gnéithe"
       location: "location"
-      remove_contact: "fhaíl ré le teagmháil"
       remove_from: "Fháil ré le %{name} ó %{aspect}?"
     show: 
       add_some: "add some"
@@ -507,7 +511,6 @@ ga:
       your_diaspora_username_is: "Is é %{diaspora_handle} do ainm úsáideora"
     contact_list: 
       all_contacts: "All contacts"
-      cannot_remove: "Ní féidir leat fháil ré leis an duine seo ón gné déarnach. (Má tá tú ag iarradh dínascadh ón duine seo, tá ort fháil ré le teagmháil.)"
     footer: 
       logged_in_as: "logged in as %{name}"
       your_aspects: "your aspects"
@@ -589,8 +592,7 @@ ga:
       new_password: "Pasfhocal nua"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Fháil fógraí ríomhphost?"
-      request_acceptence: "...your share request is accepted?"
-      request_received: "...you receive a new share request?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "Do seola ríomhphost"
       your_handle: "Do hanla diaspora"
     getting_started: 
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index c6913792b..cf17dcd16 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -83,6 +83,7 @@ he:
     index: 
       handle_explanation: "זהו שם המשתמש שלך בדיאספורה. כמו כתובת דואר אלקטרוני, ניתן לחלוק אותו עם אנשים כדי שיגיעו אליך."
       no_contacts: "אין אנשי קשר"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "פרסום הודעה >>"
     manage: 
       add_a_new_aspect: "הוספת היבט חדש"
@@ -96,9 +97,9 @@ he:
       error: "שגיאה בהעברת איש הקשר: %{inspect}"
       failure: "%{inspect} לא עבד"
       success: "האדם הועבר להיבט חדש"
-    new_aspect: 
-      create: "יציאה"
-      name: "שם"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "אף אחד לא דיבר עדיין. בואו נתחיל להתקשקש פה!"
     one: "היבט אחד"
@@ -129,6 +130,14 @@ he:
     other: "%{count} תגובות"
     zero: "אין תגובות"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "אירע כשל ביצירת איש קשר"
     destroy: 
@@ -139,9 +148,11 @@ he:
     one: "איש קשר אחד"
     other: "%{count} אנשי קשר"
     share_with_pane: 
-      accepts: "לאחר שיתקבל אישור מאיש הקשר %{name}, תתחילו לראות את הרשומות זה של זה בדיאספורה"
       add_new_aspect: "הוספה להיבט חדש"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "התחלת השיתוף עם %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "אין אנשי קשר"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ he:
     new_request: "הציע/ה לשתף אתך."
     post: "רשומה."
     private_message: "שלח/ה לך הודעה."
-    request_accepted: "קיבל/ה את בקשת השיתוף שלך."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "גם כן הגיב/ה על הרשומה של %{post_author}:"
@@ -294,23 +305,18 @@ he:
       mentioned: "הזכיר/ה אותך ברשומה:"
       sign_in: "יש להיכנס כדי לצפות בזה."
       subject: "הוזכרת על ידי %{name} ב־Diaspora*"
-    new_request: 
-      just_sent_you: "שלח/ה לך בקשת חברות בדיאספורה*"
-      sign_in: "כניסה מכאן"
-      subject: "בקשת התקשרות חדשה בדיאספורה* מאת %{from}"
-      try_it_out: "מאוד כדאי לבדוק זאת."
     private_message: 
       message_subject: "נושא: %{subject}"
       private_message: "שלח/ה לך הודעה פרטית:"
       sign_in: "יש להיכנס כדי לצפות בזה."
       subject: "נשלחה אליך הודעה פרטית מאת %{name} דרך דיאספורה*"
-    request_accepted: 
-      accepted: "קיבל/ה את בקשת ההתקשרות שלך!"
-      sign_in: "כניסה מכאן"
-      subject: "בקשת ההתקשרות שלך התקבלה על ידי %{name} בדיאספורה*"
     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*"
     thanks: "רב תודות,"
   ok: "אישור"
   or: "או"
@@ -341,12 +347,10 @@ he:
     profile_sidebar: 
       bio: "פרטים"
       born: "תאריך הלידה"
-      cannot_remove: "לא ניתן להסיר את %{name} מההיבט האחרון. (אם ברצונך להתנתק מאיש קשר זה, עליך להסירו מרשימת אנשי הקשר.)"
       edit_my_profile: "עריכת הפרופיל שלי"
       gender: "מגדר"
       in_aspects: "בהיבטים"
       location: "מיקום"
-      remove_contact: "הסרת איש קשר"
       remove_from: "האם להסיר את %{name} מההיבט %{aspect}?"
     show: 
       add_some: "הוספת אנשים"
@@ -507,7 +511,6 @@ he:
       your_diaspora_username_is: "שם המשתמש שלך בדיאספורה הוא: %{diaspora_handle}"
     contact_list: 
       all_contacts: "כל אנשי הקשר"
-      cannot_remove: "לא ניתן להסיר את איש הקשר מההיבט האחרון. (אם ברצונך להתנתק מאיש הקשר עליך להסירו מרשימת אנשי הקשר)."
     footer: 
       logged_in_as: "נכנסת בשם %{name}"
       your_aspects: "ההיבטים שלך"
@@ -589,8 +592,7 @@ he:
       new_password: "ססמה חדשה"
       private_message: "...קיבלת הודעה פרטית?"
       receive_email_notifications: "לקבל התרעות בדוא״ל כאשר..."
-      request_acceptence: "...בקשת השיתוף שלך נענתה בחיוב?"
-      request_received: "...קיבלת בקשת שיתוף חדשה?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "כתובת הדוא״ל שלך"
       your_handle: "שם המשתמש שלך בדיאספורה"
     getting_started: 
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 4cc6cf767..7a4f2638a 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -83,6 +83,7 @@ hu:
     index: 
       handle_explanation: "Ez a Te Diaspora felhasználóneved. Megadhatod elérhetőségként, mint egy email címet."
       no_contacts: "Nincs ismerős"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "üzenet küldése >>"
     manage: 
       add_a_new_aspect: "Új csoport hozzáadása"
@@ -96,9 +97,9 @@ hu:
       error: "Hiba a kapcsolat mozgatásakor: %{inspect}"
       failure: "nem működött: %{inspect}"
       success: "Más csoportba tett téged."
-    new_aspect: 
-      create: "Létrehoz"
-      name: "Név"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "Mindenki hallgat. Kezd el te a beszélgetést."
     one: "1 csoport"
@@ -129,6 +130,14 @@ hu:
     other: "%{count} hozzászólás"
     zero: "nincs hozzászólás"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Kapcsolat létrehozása sikertelen"
     destroy: 
@@ -139,9 +148,11 @@ hu:
     one: "1 ismerős"
     other: "%{count} ismerős"
     share_with_pane: 
-      accepts: "Ha %{name} elfogadja a felkérésed, akkor látjátok majd egymás bejegyzéseit."
       add_new_aspect: "hozzáadás új csoporthoz"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Megosztás indítása vele: %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "nincs ismerős"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ hu:
     new_request: "megosztást ajánlott neked."
     post: "bejegyzésben."
     private_message: "üzenetet küldött neked."
-    request_accepted: "elfogadta a megosztási kérésed."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "hozzászólt még %{post_author} bejegyzéséhez is:"
@@ -294,23 +305,18 @@ hu:
       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."
-    new_request: 
-      just_sent_you: "ismerősnek jelölt a Diaspora* közösségi oldalon."
-      sign_in: "Jelentkezz be"
-      subject: "új Diaspora* ismerősnek jelölt: %{from}"
-      try_it_out: "Tényleg ki kellene próbálnod."
     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"
-    request_accepted: 
-      accepted: "elfogadta a jelölésed."
-      sign_in: "Jelentkezz be"
-      subject: "%{name} elfogadta a felkérésed."
     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*"
     thanks: "Köszi,"
   ok: "Rendben"
   or: "vagy"
@@ -341,12 +347,10 @@ hu:
     profile_sidebar: 
       bio: "személyes"
       born: "születésnap"
-      cannot_remove: "Nem tudod törölni %{name}-t az utolsó csoportodból. (Ha nem kívánsz az ismerőse lenni, törölnöd kell a kapcsolatot.)"
       edit_my_profile: "Profilom szerkesztése"
       gender: "nem"
       in_aspects: "csoportokban"
       location: "hely"
-      remove_contact: "kapcsolat törlése"
       remove_from: "Törlöd %{name}-t a %{aspect} csoportból?"
     show: 
       add_some: "hozzáad"
@@ -507,7 +511,6 @@ hu:
       your_diaspora_username_is: "Diaspora felhasználóneved: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Összes kapcsolat"
-      cannot_remove: "Nem törölheted az utolsó csoportot. (Ha nem akarsz a személy ismerőse lenni, töröld a kapcsolatot.)"
     footer: 
       logged_in_as: "bejelentkezve, mint %{name}"
       your_aspects: "csoportjaid"
@@ -589,8 +592,7 @@ hu:
       new_password: "Új jelszó"
       private_message: "...privát üzenetet kaptál?"
       receive_email_notifications: "Email értesítést kérek amikor..."
-      request_acceptence: "...elfogadta a kérelmed?"
-      request_received: "...valaki meg szeretne osztani veled?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "E-mail címed"
       your_handle: "Diaspora felhasználóneved"
     getting_started: 
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index d8408ff5a..37759f89a 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -83,6 +83,7 @@ id:
     index: 
       handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
       no_contacts: "No contacts"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
     manage: 
       add_a_new_aspect: "Tambah aspek baru"
@@ -96,8 +97,8 @@ id:
       error: "Error moving contact: %{inspect}"
       failure: "didn't work %{inspect}"
       success: "Person moved to new aspect"
-    new_aspect: 
-      create: "Ciptakan"
+    new: 
+      create: "Create"
       name: "Name"
     no_posts_message: 
       start_talking: "Nobody has said anything yet.  Get the conversation started!"
@@ -129,6 +130,14 @@ id:
     other: "%{count} comments"
     zero: "no comments"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Failed to create contact"
     destroy: 
@@ -139,9 +148,11 @@ id:
     one: "1 contact"
     other: "%{count} contacts"
     share_with_pane: 
-      accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
       add_new_aspect: "add to new aspect"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Start sharing with %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "no contacts"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ id:
     new_request: "offered to share with you."
     post: "post"
     private_message: "sent you a message."
-    request_accepted: "accepted your share request."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "has also commented on %{post_author}'s post:"
@@ -294,23 +305,18 @@ id:
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
       subject: "%{name} has mentioned you on Diaspora*"
-    new_request: 
-      just_sent_you: "just sent you a friend request on Diaspora*"
-      sign_in: "sign in here"
-      subject: "new Diaspora* friend request from %{from}"
-      try_it_out: "You should really think about checking it out."
     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*"
-    request_accepted: 
-      accepted: "has accepted your friend request. They are now in your"
-      sign_in: "Sign in here"
-      subject: "%{name} has accepted your friend request on Diaspora*"
     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*"
     thanks: "Thanks,"
   ok: "OK"
   or: "or"
@@ -341,12 +347,10 @@ id:
     profile_sidebar: 
       bio: "bio"
       born: "born"
-      cannot_remove: "Cannot remove %{name} from last aspect."
       edit_my_profile: "Edit my profile"
       gender: "gender"
       in_aspects: "in aspects"
       location: "location"
-      remove_contact: "remove contact"
       remove_from: "Remove %{name} from %{aspect}?"
     show: 
       add_some: "add some"
@@ -507,7 +511,6 @@ id:
       your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
     contact_list: 
       all_contacts: "All contacts"
-      cannot_remove: "Cannot remove person from last aspect."
     footer: 
       logged_in_as: "logged in as %{name}"
       your_aspects: "your aspects"
@@ -589,8 +592,7 @@ id:
       new_password: "New Password"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Receive email notificaions?"
-      request_acceptence: "...your share request is accepted?"
-      request_received: "...you receive a new share request?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "Your email"
       your_handle: "Your diaspora handle"
     getting_started: 
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index 8d2df34a2..1889c5c07 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -83,6 +83,7 @@ is:
     index: 
       handle_explanation: "Þetta er netfangið þitt hjá Díaspora. Eins og með venjulegt netfang, geturðu gefið fólki það svo þau geti haft samband við þig. "
       no_contacts: "Engir tengiliðir"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
     manage: 
       add_a_new_aspect: "Bæta við nýrri ásýnd"
@@ -96,9 +97,9 @@ is:
       error: "Villa við að breyta tengiliði: %{inspect}"
       failure: "virkaði ekki %{inspect}"
       success: "Fólk flutt í nýja ásýnd"
-    new_aspect: 
-      create: "Búa til"
-      name: "Nafn"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "Enginn hefur sagt neitt enn.  Byrjaðu umræðurnar!"
     one: "1 aspect"
@@ -129,6 +130,14 @@ is:
     other: "%{count} comments"
     zero: "no comments"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Ekki tókst að mynda tengsl"
     destroy: 
@@ -139,9 +148,11 @@ is:
     one: "Ein tengsl"
     other: "%{count} tengsl"
     share_with_pane: 
-      accepts: "Þegar %{nafn} hefur samþykkt, munu þið byrja að sjá innlegg hvers annars á Díaspora"
       add_new_aspect: "bæta við í nýja ásýnd"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Byrja að deila með %{nafn}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "Engin tengsl"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ is:
     new_request: "bauð þér samnýtingu."
     post: "setja inn"
     private_message: "sent you a message."
-    request_accepted: "accepted your share request."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "hefur einnig gert athugasemd við færslu notandans %{post_author}:"
@@ -294,23 +305,18 @@ is:
       mentioned: "gat þín í pósti:"
       sign_in: "Skráðu þig inn til að sjá það."
       subject: "% {Nafn} hefur getið þín á Diaspora*"
-    new_request: 
-      just_sent_you: "var að senda þér vinabeiðni á Díaspora*"
-      sign_in: "innskráning hér"
-      subject: "ný Diaspora* vinabeiðni frá %{from}"
-      try_it_out: "Þú ættir virkilega að skoða það."
     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*"
-    request_accepted: 
-      accepted: "hefur samþykkt vinabeiðni þína!"
-      sign_in: "Innskráning hér"
-      subject: "%{name} hefur samþykkt vinabeiðni þína á Díaspora*"
     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*"
     thanks: "Takk,"
   ok: "OK"
   or: "eða"
@@ -341,12 +347,10 @@ is:
     profile_sidebar: 
       bio: "bio"
       born: "afmælisdagur"
-      cannot_remove: "Cannot remove %{name} from last aspect. (If you want to disconnect from this person you must remove contact.)"
       edit_my_profile: "Breyta síðunni minni"
       gender: "kyn"
       in_aspects: "í ásýnd"
       location: "location"
-      remove_contact: "fjarlægja tengilið"
       remove_from: "Fjarlægja %{name} úr %{aspect}?"
     show: 
       add_some: "add some"
@@ -507,7 +511,6 @@ is:
       your_diaspora_username_is: "Þitt Diaspora notandanafn er: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Allir tengiliðir"
-      cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     footer: 
       logged_in_as: "logged in as %{name}"
       your_aspects: "your aspects"
@@ -589,8 +592,7 @@ is:
       new_password: "Nýtt lykilorð"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Fá tilkynningar í tölvupósti?"
-      request_acceptence: "...your share request is accepted?"
-      request_received: "...you receive a new share request?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "Netfangið þitt"
       your_handle: "Díaspora netfangið þitt."
     getting_started: 
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index fa9acb6f5..4ad04bfc2 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -83,6 +83,7 @@ it:
     index: 
       handle_explanation: "Questo è il tuo contatto Diaspora. Lo puoi dare alle persone per farti trovare, come un indirizzo email."
       no_contacts: "Nessun contatto"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "invia un messaggio >>"
     manage: 
       add_a_new_aspect: "Aggiungi aspetto della vita"
@@ -96,7 +97,7 @@ it:
       error: "Errore nello spostare il contatto: %{inspect}"
       failure: "non ha funzionato %{inspect}"
       success: "Persona spostata nel nuovo aspetto"
-    new_aspect: 
+    new: 
       create: "Crea"
       name: "Nome"
     no_posts_message: 
@@ -129,6 +130,14 @@ it:
     other: "%{count} commenti"
     zero: "nessun commento"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Impossibile creare il contatto"
     destroy: 
@@ -139,9 +148,11 @@ it:
     one: "1 contatto"
     other: "%{count} contatti"
     share_with_pane: 
-      accepts: "Quando %{name} avrà accettato, inizierete a vedere reciprocamente i vostri post su Diaspora"
       add_new_aspect: "aggiungi ad un nuovo aspetto"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Inizia a condividere con %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "nessun contatto"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ it:
     new_request: "vuole condividere con te."
     post: "post."
     private_message: "ti ha inviato un messaggio."
-    request_accepted: "ha accettato la tua richiesta di condivisione."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "ha anche commentato sul post di %{post_author}:"
@@ -294,23 +305,18 @@ it:
       mentioned: "ti ha menzionato in un post:"
       sign_in: "Accedi per vederlo."
       subject: "%{name} ti ha menzionato su Diaspora*"
-    new_request: 
-      just_sent_you: "ti ha appena inviato una richiesta di contatto su Diaspora*"
-      sign_in: "Accedi qui"
-      subject: "nuova richiesta di contatto su Diaspora* da %{from}"
-      try_it_out: "Dovresti veramente provarlo."
     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*"
-    request_accepted: 
-      accepted: "ha accettato la tua richiesta di contatto!"
-      sign_in: "Registrati qui"
-      subject: "%{name} ha accettato la tua richiesta di contatto su Diaspora*"
     single_admin: 
       admin: "Il tuo amministratore Diaspora"
       subject: "Un messaggio sul tuo account Diaspora:"
+    started_sharing: 
+      sharing: "has started sharing with you!"
+      sign_in: "Sign in here"
+      subject: "%{name} has started sharing with you on Diaspora*"
     thanks: "Grazie,"
   ok: "OK"
   or: "o"
@@ -341,12 +347,10 @@ it:
     profile_sidebar: 
       bio: "bio"
       born: "data di nascita"
-      cannot_remove: "Impossibile rimuovere %{name} dall'ultimo aspetto."
       edit_my_profile: "Modifica il mio profilo"
       gender: "sesso"
       in_aspects: "negli aspetti"
       location: "dove ti trovi"
-      remove_contact: "rimuovi contatto"
       remove_from: "Rimuovere %{name} da %{aspect}?"
     show: 
       add_some: "aggiungine alcune"
@@ -507,7 +511,6 @@ it:
       your_diaspora_username_is: "Il tuo nome utente Diaspora è: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Tutti i contatti"
-      cannot_remove: "Impossibile rimuovere la persona dall'ultimo aspetto."
     footer: 
       logged_in_as: "accesso effettuato come %{name}"
       your_aspects: "i tuoi aspetti"
@@ -545,7 +548,7 @@ it:
     stream_element: 
       dislike: "Non mi piace"
       like: "Mi piace"
-      unlike: "Non come"
+      unlike: "Annulla"
   status_messages: 
     create: 
       success: "Menzionati con successo: %{names}"
@@ -589,8 +592,7 @@ it:
       new_password: "Nuova Password"
       private_message: "...hai ricevuto un messaggio privato?"
       receive_email_notifications: "Vuoi ricevere notifiche via email?"
-      request_acceptence: "...la tua richiesta di condivisione è stata accettata?"
-      request_received: "...la tua richiesta di condivisione è stata accettata?"
+      started_sharing: "...qualcuno vuole condividere con te?"
       your_email: "La tua email"
       your_handle: "Il tuo contatto Diaspora"
     getting_started: 
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index 3c7f2552a..f6c8bd592 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -83,6 +83,7 @@ ja:
     index: 
       handle_explanation: "これがあなたのハンドル名です。メールアドレスと同じようにほかの人に教えて、ダイアスポラで連絡を取り合うことができます。"
       no_contacts: "連絡先無し"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "投稿する"
     manage: 
       add_a_new_aspect: "新しいアスペクトを追加する"
@@ -96,9 +97,9 @@ ja:
       error: "連絡先の移動にエラーが発生しました： %{inspect}"
       failure: "連絡先を移動させるのに失敗しました：%{inspect}"
       success: "連絡先を新しいアスペクトに移動させました。"
-    new_aspect: 
-      create: "作成する"
-      name: "アスペクト名"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "投稿がまだありません。会話を始めましょう！"
     one: "アスペクト1集"
@@ -129,6 +130,14 @@ ja:
     other: "コメント%{count}件"
     zero: "コメントがありません"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "連絡先を作成するのに失敗しました。"
     destroy: 
@@ -139,9 +148,11 @@ ja:
     one: "連絡先1件"
     other: "連絡先%{count}件"
     share_with_pane: 
-      accepts: "%{name}さんが承諾したら、ダイアスポラ＊投稿がお互いに見れるようになります。"
       add_new_aspect: "新しいアスペクトに追加する"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "%{name}さんと共有を開始する"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "連絡先無し"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ ja:
     new_request: "さんは共有の許可を求めました。"
     post: "（投稿で）"
     private_message: "さんからメッセージが届いています。"
-    request_accepted: "さんは共有リクエストを承諾しました。"
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "も%{post_author}さんの投稿にコメントしました："
@@ -294,23 +305,18 @@ ja:
       mentioned: "さんは投稿であなたをメンションしました。"
       sign_in: "見るのにログインして下さい。"
       subject: "%{name}さんはダイアスポラ＊であなたをメンションしました。"
-    new_request: 
-      just_sent_you: "さんからダイアスポラ＊の追加リクエストが届いています。"
-      sign_in: "ここからログイン"
-      subject: "%{from}さんの新しいダイアスポラ＊追加リクエスト"
-      try_it_out: "是非お試しください。"
     private_message: 
       message_subject: "件名：%{subject}"
       private_message: "からメッセージが届いています。"
       sign_in: "見るにはログインしてください。"
       subject: "ダイアスポラ＊で%{name}さんからの非公開メッセージが届いています。"
-    request_accepted: 
-      accepted: "さんは追加リクエストを承諾してくれました。"
-      sign_in: "ここからログインしてください。"
-      subject: "%{name}さんはダイアスポラ＊の追加リクエストを承諾してくれました。"
     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*"
     thanks: "ありがとうございます。"
   ok: "了解"
   or: "または"
@@ -341,12 +347,10 @@ ja:
     profile_sidebar: 
       bio: "略歴"
       born: "誕生日"
-      cannot_remove: "連絡先を最後のアスペクから除外することができません。（断絶したい場合は連絡先を削除してください。）"
       edit_my_profile: "プロフィールを編集する"
       gender: "性別"
       in_aspects: "アスペクトで"
       location: "所在地"
-      remove_contact: "連絡先を削除する"
       remove_from: "%{name}さんを%{aspect}から除外しますか。"
     show: 
       add_some: "追加する"
@@ -507,7 +511,6 @@ ja:
       your_diaspora_username_is: "あなたのハンドル名は%{diaspora_handle}です。"
     contact_list: 
       all_contacts: "全ての連絡先"
-      cannot_remove: "連絡先を最後のアスペクトから除外することができません。（断絶したい場合は連絡先を削除してください。）"
     footer: 
       logged_in_as: "%{name}としてログイン済"
       your_aspects: "アスペクト"
@@ -589,8 +592,7 @@ ja:
       new_password: "新しいパスワード"
       private_message: "非公開メッセージが届いたとき"
       receive_email_notifications: "通知メールの送信設定"
-      request_acceptence: "共有リクエストが承諾されたとき"
-      request_received: "共有リクエストが届いたとき"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "メールアドレス"
       your_handle: "ダイアスポラのユーザ名"
     getting_started: 
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index 7f88cb3ec..d6f37652e 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -23,7 +23,7 @@ ko:
         request: 
           attributes: 
             from_id: 
-              taken: "이미 요청하였습니다."
+              taken: "이미 요청했습니다."
         user: 
           attributes: 
             email: 
@@ -83,6 +83,7 @@ ko:
     index: 
       handle_explanation: "이 디아스포라 핸들은 이메일 주소처럼 남에게 건넬 수 있습니다."
       no_contacts: "컨택 없음"
+      people_sharing_with_you: "나와 공유하는 사람들"
       post_a_message: "새 메시지 올리기 >>"
     manage: 
       add_a_new_aspect: "애스펙 추가"
@@ -93,10 +94,10 @@ ko:
       requests: "요청"
     many: "애스펙 %{count}개"
     move_contact: 
-      error: "%{inspect} 컨택을 옮기는데 에러가 발생하였습니다"
+      error: "%{inspect} 컨택을 옮기는데 에러가 발생했습니다."
       failure: "%{inspect} 님을 옮길 수 없습니다"
       success: "새 애스펙으로 옮겼습니다"
-    new_aspect: 
+    new: 
       create: "만들기"
       name: "이름"
     no_posts_message: 
@@ -129,6 +130,14 @@ ko:
     other: "댓글 %{count}개"
     zero: "댓글 없음"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "애스펙에 넣기"
+      toggle: 
+        few: "애스펙 %{count}개 안에 있습니다"
+        many: "애스펙 %{count}개 안에 있습니다"
+        one: "애스펙 한 개 안에 있습니다"
+        other: "애스펙 %{count}개 안에 있습니다"
+        zero: "애스펙에 넣기"
     create: 
       failure: "컨택을 만들 수 없습니다"
     destroy: 
@@ -139,9 +148,11 @@ ko:
     one: "컨택 한 명"
     other: "컨택 %{count}명"
     share_with_pane: 
-      accepts: "%{name} 님이 수락하면 디아스포라에서 서로를 볼 수 있습니다."
       add_new_aspect: "새 애스펙에 넣기"
-      share_with: "%{name} 님에게 공유 요청"
+      following: "%{name} 님을 애스펙에 넣으면, 팔로잉과 공유물 보내기를 시작합니다."
+      share_with: "%{name} 님과 공유 시작"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "컨택 없음"
   conversations: 
     create: 
@@ -268,20 +279,20 @@ ko:
       mark_all_as_read: "모두 읽음으로 표시"
       notifications: "알림"
     liked: "님이 내 공유물을 좋아합니다"
-    mentioned: " 님이 귀하를 멘션하였습니다."
-    new_request: " 님이 공유를 요청하였습니다."
+    mentioned: " 님이 나를 멘션했습니다:"
+    new_request: " 님이 나와 공유를 시작했습니다."
     post: "공유물"
     private_message: " 님이 쪽지를 보냈습니다."
-    request_accepted: " 님이 공유 요청을 수락하였습니다."
+    started_sharing: "님이 나와 공유를 시작했습니다."
   notifier: 
     also_commented: 
       commented: "님도 %{post_author} 님의 공유물에 댓글을 달았습니다:"
       sign_in: "로그인하기"
       subject: "%{name} 님도 %{post_author} 님의 공유물에 댓글을 달았습니다."
     comment_on_post: 
-      commented: "님이 귀하의 공유물에 댓글을 달았습니다:"
+      commented: "님이 내 공유물에 댓글을 달았습니다:"
       sign_in: "로그인하기"
-      subject: "%{name} 님이 귀하의 공유물에 댓글을 달았습니다."
+      subject: "%{name} 님이 내 공유물에 댓글을 달았습니다."
     diaspora: "디아스포라 자동 이메일"
     hello: "%{name} 님!"
     liked: 
@@ -291,26 +302,21 @@ ko:
     love: ""
     manage_your_email_settings: "이메일 설정 관리"
     mentioned: 
-      mentioned: "님이 디아스포라*의 글에서 귀하를 멘션했습니다:"
-      sign_in: "로그인하기"
-      subject: "%{name} 님이 디아스포라*에서 귀하를 멘션했습니다"
-    new_request: 
-      just_sent_you: "님이 방금 디아스포라*에서 새 요청을 보냈습니다"
+      mentioned: "님이 디아스포라*의 공유물에서 나를 멘션했습니다:"
       sign_in: "로그인하기"
-      subject: "%{from} 님이 새 디아스포라* 컨택 요청"
-      try_it_out: "꼭 확인해보세요!"
+      subject: "%{name} 님이 디아스포라*에서 나를 멘션했습니다"
     private_message: 
       message_subject: "제목: %{subject}"
       private_message: "님이 디아스포라*에서 쪽지를 보냈습니다:"
       sign_in: "로그인하기"
       subject: "%{name} 님이 디아스포라*에서 쪽지를 보냈습니다"
-    request_accepted: 
-      accepted: "님이 공유 요청을 수락했습니다!"
-      sign_in: "로그인하기"
-      subject: "%{name} 님이 디아스포라*에서 공유 요청을 수락했습니다"
     single_admin: 
       admin: "디아스포라 관리자"
-      subject: "귀하의 디아스포라 계정에 대한 메시지:"
+      subject: "내 디아스포라 계정에 대한 메시지:"
+    started_sharing: 
+      sharing: "님이 나와 공유를 시작했습니다!"
+      sign_in: "여기서 로그인하세요"
+      subject: "%{name} 님이 디아스포라*에서 나와 공유를 시작했습니다."
     thanks: "고맙습니다."
   ok: "확인"
   or: "또는"
@@ -336,23 +342,21 @@ ko:
     person: 
       add_contact: "컨택 추가"
       already_connected: "이미 연결되었습니다"
-      pending_request: "이미 요청하였습니다"
+      pending_request: "이미 요청했습니다"
       thats_you: "바로 나!"
     profile_sidebar: 
       bio: "자기소개"
       born: "생년월일"
-      cannot_remove: "모든 컨택은 적어도 한 애스펙에 속해야 합니다. 공유를 끊고 싶다면 컨택을 지워야 합니다."
       edit_my_profile: "프로필 고치기"
       gender: "성별"
       in_aspects: "속한 애스펙:"
       location: "위치"
-      remove_contact: "컨택 지우기"
       remove_from: "%{aspect}에서 %{name} 님을 지울까요?"
     show: 
       add_some: "태그 달기"
       does_not_exist: "없는 사람입니다!"
       edit: "고치기"
-      incoming_request: "%{name} 님이 공유를 요청했습니다"
+      incoming_request: "%{name} 님이 나와 공유하길 원합니다"
       mention: "멘션"
       message: "쪽지"
       no_posts: "보여줄 공유물이 없습니다!"
@@ -361,8 +365,8 @@ ko:
       recent_public_posts: "최근 공개 공유물"
       return_to_aspects: "애스펙 페이지로 돌아가"
       see_all: "모두 보기"
-      start_sharing: "공유 요청"
-      to_accept_or_ignore: "수락 또는 거절하기"
+      start_sharing: "공유 시작"
+      to_accept_or_ignore: "수락 또는 무시하기."
       you_have_no_tags: "달아둔 태그가 없습니다!"
     webfinger: 
       fail: "%{handle} 핸들을 찾을 수 없습니다."
@@ -428,7 +432,7 @@ ko:
       your_tags_placeholder: "예) #diaspora #ironing #kittens #music"
     update: 
       failed: "프로필 갱신 실패"
-      updated: "프로필을 갱신하였습니다"
+      updated: "프로필을 갱신했습니다"
   registrations: 
     closed: "우리 디아스포라 팓은 가입이 닫혀있습니다."
     create: 
@@ -450,10 +454,10 @@ ko:
   requests: 
     create: 
       sending: "공유를 요청하고 있습니다."
-      sent: "%{name} 님에게 공유를 요청하였습니다."
+      sent: "%{name} 님에게 공유를 요청했습니다. 상대방이 디아스포라에 로그인하면 볼겁니다."
     destroy: 
       error: "애스펙을 골라주세요!"
-      ignore: "공유 요청을 거절하였습니다."
+      ignore: "컨택 요청이 무시되었습니다."
       success: "공유하고 있습니다."
     helper: 
       new_requests: 
@@ -466,7 +470,7 @@ ko:
       existing: "Existing contacts"
       manage_within: "컨택 관리하기:"
     new_request_to_person: 
-      sent: "요청하였습니다!"
+      sent: "보냈습니다."
   search: "검색"
   services: 
     create: 
@@ -474,7 +478,7 @@ ko:
     destroy: 
       success: "인증을 성공적으로 지웠습니다."
     failure: 
-      error: "서비스 연결중 에러가 발생하였습니다"
+      error: "서비스 연결중 에러가 발생했습니다."
     finder: 
       friends: 
         few: "친구 %{count}명"
@@ -507,7 +511,6 @@ ko:
       your_diaspora_username_is: "내 디아스포라 핸들: %{diaspora_handle}"
     contact_list: 
       all_contacts: "모든 컨택"
-      cannot_remove: "모든 컨택은 적어도 하나의 애스펙에 속해야 합니다. 연결을 끊으려면 컨택을 지우세요."
     footer: 
       logged_in_as: "%{name}로 로그인중"
       your_aspects: "내 애스펙"
@@ -589,8 +592,7 @@ ko:
       new_password: "새 암호"
       private_message: "쪽지를 받았을 때"
       receive_email_notifications: "이럴 때 이메일 알림을 받겠습니다"
-      request_acceptence: "요청했던 공유가 수락되었을 때"
-      request_received: "새로운 공유 요청을 받았을 때"
+      started_sharing: "누군가가 나와 공유를 시작할 때"
       your_email: "이메일 주소"
       your_handle: "디아스포라 핸들"
     getting_started: 
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index b9e2ad6d0..e07b09139 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -83,6 +83,7 @@ lt:
     index: 
       handle_explanation: "Tai tavo vartotojo vardas Diasporoje. Kaip ir el. pašto adresas, jis leidžia sistemoje rasti pažįstamus."
       no_contacts: "No contacts"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
     manage: 
       add_a_new_aspect: "Pridėti naują aspektą"
@@ -96,9 +97,9 @@ lt:
       error: "Klaida perkeliant kontaktą: %{inspect}"
       failure: "nepavyko %{inspect}"
       success: "Kontaktas perkeltas į aspektą"
-    new_aspect: 
-      create: "Sukurti"
-      name: "Pavadinimas"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "Dar niekas nepasisakė. Pradėk pokalbį pats!"
     one: "1 aspect"
@@ -129,6 +130,14 @@ lt:
     other: "%{count} comments"
     zero: "no comments"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Failed to create contact"
     destroy: 
@@ -139,9 +148,11 @@ lt:
     one: "1 contact"
     other: "%{count} contacts"
     share_with_pane: 
-      accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
       add_new_aspect: "add to new aspect"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Start sharing with %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "no contacts"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ lt:
     new_request: "offered to share with you."
     post: "post"
     private_message: "sent you a message."
-    request_accepted: "accepted your share request."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "has also commented on %{post_author}'s post:"
@@ -294,23 +305,18 @@ lt:
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
       subject: "%{name} has mentioned you on Diaspora*"
-    new_request: 
-      just_sent_you: "tavęs ką tik paprašė priimti į draugus Diasporoje*"
-      sign_in: "prisijungimas čia"
-      subject: "naujas prašymas priimti į Diasporos* draugus iš %{from}"
-      try_it_out: "Pabandyk!"
     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*"
-    request_accepted: 
-      accepted: "priėmė tavo prašymą draugauti. Jie dabar yra tavo"
-      sign_in: "Sign in here"
-      subject: "%{name} priėmė tavo pasiūlymą draugauti Diasporoje*"
     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*"
     thanks: "Thanks,"
   ok: "gerai"
   or: "arba"
@@ -341,12 +347,10 @@ lt:
     profile_sidebar: 
       bio: "biografija"
       born: "gimimo data"
-      cannot_remove: "Iš paskutinio aspekto vartotojo \"%{name}\" pašalinti negalima."
       edit_my_profile: "Redaguoti mano profilį"
       gender: "lytis"
       in_aspects: "aspektuose"
       location: "location"
-      remove_contact: "pašalinti kontaktą"
       remove_from: "Ar pašalinti kontaktą \"%{name}\" iš aspekto \"%{aspect}\"?"
     show: 
       add_some: "add some"
@@ -507,7 +511,6 @@ lt:
       your_diaspora_username_is: "Tavo Diasporos vartotojo vardas yra: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Visi kontaktai"
-      cannot_remove: "Iš paskutinio aspekto asmens pašalinti negalima."
     footer: 
       logged_in_as: "logged in as %{name}"
       your_aspects: "your aspects"
@@ -589,8 +592,7 @@ lt:
       new_password: "Naujas slaptažodis"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Receive email notificaions?"
-      request_acceptence: "...your share request is accepted?"
-      request_received: "...you receive a new share request?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "Tavo el. pašto adresas"
       your_handle: "Tavo Diasporos vartotojo vardas"
     getting_started: 
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 3e41c0575..b91b7987d 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -83,6 +83,7 @@ mk:
     index: 
       handle_explanation: "Ова е вашето diaspora корисничко име. Исто како е-маил адреса, можете да го давате на луѓе за да се сврзат со вас."
       no_contacts: "No contacts"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
     manage: 
       add_a_new_aspect: "Додај нов аспект"
@@ -96,9 +97,9 @@ mk:
       error: "Грешка при преместувањето на контактот: %{inspect}"
       failure: "не проработи %{inspect}"
       success: "Личноста е преместена во нов аспект"
-    new_aspect: 
-      create: "Креирај"
-      name: "Име"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "Никој досега нема кажано ништо. Започни го разговорот!"
     one: "1 aspect"
@@ -129,6 +130,14 @@ mk:
     other: "%{count} comments"
     zero: "no comments"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Failed to create contact"
     destroy: 
@@ -139,9 +148,11 @@ mk:
     one: "1 contact"
     other: "%{count} contacts"
     share_with_pane: 
-      accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
       add_new_aspect: "add to new aspect"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Start sharing with %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "no contacts"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ mk:
     new_request: "offered to share with you."
     post: "post"
     private_message: "sent you a message."
-    request_accepted: "accepted your share request."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "has also commented on %{post_author}'s post:"
@@ -294,23 +305,18 @@ mk:
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
       subject: "%{name} has mentioned you on Diaspora*"
-    new_request: 
-      just_sent_you: "самошто ви испратив барање за контакт на Diaspora*"
-      sign_in: "најави се овде"
-      subject: "ново Diaspora* контакт барање од %{from}"
-      try_it_out: "Навистина треба да го проверите."
     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*"
-    request_accepted: 
-      accepted: "го прифати вашето контакт барање. Сега се во вашиот"
-      sign_in: "Sign in here"
-      subject: "%{name} го прифати вашето контакт барање на Diaspora*"
     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*"
     thanks: "Thanks,"
   ok: "ОК"
   or: "или"
@@ -341,12 +347,10 @@ mk:
     profile_sidebar: 
       bio: "биографија"
       born: "роденден"
-      cannot_remove: "Неможе да се одстрани %{name} од последниот аспект. (Ако сакате да се раздвоите од оваа личност мора да ја одстраните од листата на контакти.)"
       edit_my_profile: "Уреди го мојот профил"
       gender: "пол"
       in_aspects: "во аспекти"
       location: "location"
-      remove_contact: "одстрани контакт"
       remove_from: "Одстрани %{name} од %{aspect}?"
     show: 
       add_some: "add some"
@@ -507,7 +511,6 @@ mk:
       your_diaspora_username_is: "Вашето Diaspora корисничко име е: %{diaspora_handle}"
     contact_list: 
       all_contacts: "All contacts"
-      cannot_remove: "Неможе да се одстрани личноста од последниот аспект. (Ако сакате да се раздвоите од оваа личност мора да ја одстраните од листата на контакти.)"
     footer: 
       logged_in_as: "logged in as %{name}"
       your_aspects: "your aspects"
@@ -589,8 +592,7 @@ mk:
       new_password: "Нова лозинка"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Receive email notificaions?"
-      request_acceptence: "...your share request is accepted?"
-      request_received: "...you receive a new share request?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "Вашиот е-маил"
       your_handle: "Вашето diaspora корисничко име"
     getting_started: 
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index d58d8beae..d23916b3f 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -83,6 +83,7 @@ nb:
     index: 
       handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
       no_contacts: "Ingen kontakter"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
     manage: 
       add_a_new_aspect: "Legg til et nytt aspekt"
@@ -96,9 +97,9 @@ nb:
       error: "Feil ved flytting av kontakt: %{inspect}"
       failure: "fungerte ikke % {inspisere}"
       success: "Person flyttet til nytt aspekt"
-    new_aspect: 
-      create: "Opprett"
-      name: "Navn"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "Ingen har sagt noe enda. Få samtalen i gang!"
     one: "1 aspekt"
@@ -129,6 +130,14 @@ nb:
     other: "%{count} kommentarer"
     zero: "ingen kommentarer"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Kunne ikke opprette kontakt"
     destroy: 
@@ -139,9 +148,11 @@ nb:
     one: "1 kontakt"
     other: "%{count} kontakter"
     share_with_pane: 
-      accepts: "Straks %{name} aksepterer, vil dere se hverandres innlegg på Diaspora"
       add_new_aspect: "legg til i nytt aspekt"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Begynn å dele med %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "ingen kontakter"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ nb:
     new_request: "spør om å få dele med deg."
     post: "innlegg"
     private_message: "sendte deg en melding."
-    request_accepted: "aksepterte din forespørsel om å dele."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "har også kommentert på %{post_author} sitt innlegg:"
@@ -294,23 +305,18 @@ nb:
       mentioned: "nevnte deg i et innlegg:"
       sign_in: "Logg inn for å se det."
       subject: "%{name} har nevnt deg på Diaspora*"
-    new_request: 
-      just_sent_you: "just sent you a friend request on Diaspora*"
-      sign_in: "sign in here"
-      subject: "new Diaspora* friend request from %{from}"
-      try_it_out: "Du burde virkelig tenke på å sjekke det ut."
     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*"
-    request_accepted: 
-      accepted: "has accepted your friend request. They are now in your"
-      sign_in: "Logg inn her"
-      subject: "%{name} has accepted your friend request on Diaspora*"
     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*"
     thanks: "Takk,"
   ok: "OK"
   or: "eller"
@@ -341,12 +347,10 @@ nb:
     profile_sidebar: 
       bio: "bio"
       born: "født"
-      cannot_remove: "Kan ikke fjerne %{name} fra siste aspekt."
       edit_my_profile: "Endre profilen min"
       gender: "kjønn"
       in_aspects: "i aspekt"
       location: "sted"
-      remove_contact: "fjern kontakt"
       remove_from: "Fjern %{name} fra %{aspect}?"
     show: 
       add_some: "legg til noen"
@@ -507,7 +511,6 @@ nb:
       your_diaspora_username_is: "Ditt Diaspora brukernavn er: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Alle kontakter"
-      cannot_remove: "Cannot remove person from last aspect."
     footer: 
       logged_in_as: "innlogget som %{name}"
       your_aspects: "dine aspekter"
@@ -589,8 +592,7 @@ nb:
       new_password: "Nytt Passord"
       private_message: " du mottar en privat melding?"
       receive_email_notifications: "Motta varsler på epost når:"
-      request_acceptence: " din delingsforespørsel blir godkjent?"
-      request_received: " du mottar en ny forespørsel om å dele?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "Din epost"
       your_handle: "Ditt Diaspora brukernavn"
     getting_started: 
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 5f6599d61..8dedde97c 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -83,6 +83,7 @@ nl:
     index: 
       handle_explanation: "Dit is jouw Diaspora handle. Deze kun je aan mensen geven zodat ze je kunnen bereiken, net als een e-mailadres."
       no_contacts: "Geen contacten"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "plaats een bericht >>"
     manage: 
       add_a_new_aspect: "Voeg een nieuw aspect toe"
@@ -96,9 +97,9 @@ nl:
       error: "Probleem bij het verplaatsen van contact: %{inspect}"
       failure: "werkte niet %{inspect}"
       success: "Persoon naar nieuw aspect verplaatst"
-    new_aspect: 
-      create: "Aanmaken"
-      name: "Naam"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "Nog niemand heeft iets gezegd. Breng het gesprek op gang!"
     one: "1 aspect"
@@ -129,6 +130,14 @@ nl:
     other: "%{count} reacties"
     zero: "geen reacties"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Verbinding maken mislukt"
     destroy: 
@@ -139,9 +148,11 @@ nl:
     one: "1 contact"
     other: "%{count} contacten"
     share_with_pane: 
-      accepts: "Zodra %{name} accepteert, zul je elkaars posts gaan zien op Diaspora"
       add_new_aspect: "voeg toe aan nieuw aspect"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Start delen met %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "geen contacten"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ nl:
     new_request: "bood aan om met jou te delen."
     post: "post."
     private_message: "heeft je een bericht gestuurd."
-    request_accepted: "heeft je verzoek geaccepteerd."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "heeft ook op %{post_author}'s post gereageerd:"
@@ -294,23 +305,18 @@ nl:
       mentioned: "heeft jou genoemd in een post:"
       sign_in: "Log in om het te bekijken."
       subject: "%{name} heeft jou genoemd op Diaspora*"
-    new_request: 
-      just_sent_you: "heeft je zojuist een contactverzoek verzonden op Diaspora*"
-      sign_in: "Log hier in"
-      subject: "nieuw Diaspora* contactverzoek van %{from}"
-      try_it_out: "Overweeg eens een kijkje te nemen."
     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*"
-    request_accepted: 
-      accepted: "heeft je contactverzoek geaccepteerd!"
-      sign_in: "Log hier in"
-      subject: "%{name} heeft je contactverzoek geaccepteerd op Diaspora*"
     single_admin: 
       admin: "Je Diaspora administrator"
       subject: "Een bericht over je Diaspora account:"
+    started_sharing: 
+      sharing: "has started sharing with you!"
+      sign_in: "Sign in here"
+      subject: "%{name} has started sharing with you on Diaspora*"
     thanks: "Bedankt,"
   ok: "OK"
   or: "of"
@@ -341,12 +347,10 @@ nl:
     profile_sidebar: 
       bio: "bio"
       born: "geboortedatum"
-      cannot_remove: "Kan %{name} niet van laatste aspect verwijderen. (Als je met deze persoon wilt breken moet je dit contact verwijderen)"
       edit_my_profile: "Bewerk mijn profiel"
       gender: "geslacht"
       in_aspects: "in de aspecten"
       location: "locatie"
-      remove_contact: "verwijder contact"
       remove_from: "Verwijder %{name} uit %{aspect}?"
     show: 
       add_some: "Voeg toe"
@@ -507,7 +511,6 @@ nl:
       your_diaspora_username_is: "Jouw Diaspora gebruikersnaam is: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Alle contacten"
-      cannot_remove: "Kan persoon niet van laatste aspect verwijderen. (Als je met deze persoon wilt breken moet je dit contact verwijderen)"
     footer: 
       logged_in_as: "ingelogd als %{name}"
       your_aspects: "jou aspecten"
@@ -589,8 +592,7 @@ nl:
       new_password: "Nieuw wachtwoord"
       private_message: "...je een privébericht ontvangt?"
       receive_email_notifications: "Ontvang e-mail notificaties wanneer..."
-      request_acceptence: "...jou contactverzoek accepteert?"
-      request_received: "...je een nieuw contactverzoek ontvangt?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "Jouw e-mail"
       your_handle: "Jouw Diaspora handle"
     getting_started: 
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index 623f5839c..5475447b8 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -83,6 +83,7 @@ pa:
     index: 
       handle_explanation: "This is your diaspora handle. Like an email address, you can give this to people to reach you."
       no_contacts: "ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
     manage: 
       add_a_new_aspect: "Add a new aspect"
@@ -96,7 +97,7 @@ pa:
       error: "Error moving contact: %{inspect}"
       failure: "didn't work %{inspect}"
       success: "Person moved to new aspect"
-    new_aspect: 
+    new: 
       create: "Create"
       name: "Name"
     no_posts_message: 
@@ -129,6 +130,14 @@ pa:
     other: "%{count} comments"
     zero: "no comments"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Failed to create contact"
     destroy: 
@@ -139,9 +148,11 @@ pa:
     one: "1 ਸੰਪਰਕ"
     other: "%{count} ਸੰਪਰਕ"
     share_with_pane: 
-      accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
       add_new_aspect: "add to new aspect"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Start sharing with %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ pa:
     new_request: "offered to share with you."
     post: "ਪੋਸਟ"
     private_message: "sent you a message."
-    request_accepted: "accepted your share request."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "has also commented on %{post_author}'s post:"
@@ -294,23 +305,18 @@ pa:
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
       subject: "%{name} has mentioned you on Diaspora*"
-    new_request: 
-      just_sent_you: "just sent you a contact request on Diaspora*"
-      sign_in: "sign in here"
-      subject: "new Diaspora* contact request from %{from}"
-      try_it_out: "You should really think about checking it out."
     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*"
-    request_accepted: 
-      accepted: "has accepted your contact request!"
-      sign_in: "Sign in here"
-      subject: "%{name} has accepted your contact request on Diaspora*"
     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*"
     thanks: "Thanks,"
   ok: "ਠੀਕ ਹੈ"
   or: "ਜਾਂ"
@@ -341,12 +347,10 @@ pa:
     profile_sidebar: 
       bio: "bio"
       born: "birthday"
-      cannot_remove: "Cannot remove %{name} from last aspect. (If you want to disconnect from this person you must remove contact.)"
       edit_my_profile: "Edit my profile"
       gender: "gender"
       in_aspects: "in aspects"
       location: "location"
-      remove_contact: "remove contact"
       remove_from: "Remove %{name} from %{aspect}?"
     show: 
       add_some: "add some"
@@ -507,7 +511,6 @@ pa:
       your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
     contact_list: 
       all_contacts: "ਸਭ ਸੰਪਰਕ"
-      cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     footer: 
       logged_in_as: "logged in as %{name}"
       your_aspects: "your aspects"
@@ -589,8 +592,7 @@ pa:
       new_password: "New Password"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Receive email notificaions?"
-      request_acceptence: "...your share request is accepted?"
-      request_received: "...you receive a new share request?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "Your email"
       your_handle: "Your diaspora handle"
     getting_started: 
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index a6585a4e6..27e42c912 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -83,6 +83,7 @@ pl:
     index: 
       handle_explanation: "To jest Twój identyfikator w Diasporze. Podobnie jak adresu e-mailowy, możesz podawać go innym, aby mogli się z Tobą skontaktować."
       no_contacts: "Brak kontaktów"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "napisz wiadomość >>"
     manage: 
       add_a_new_aspect: "Dodaj nowy aspekt"
@@ -96,9 +97,9 @@ pl:
       error: "Błąd przy przenoszeniu kontaktu: %{inspect}"
       failure: "nie zadziałało %{inspect}"
       success: "Osoba przeniesiona do nowego aspektu"
-    new_aspect: 
-      create: "Utwórz"
-      name: "Nazwa"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "Nikt jeszcze nic nie powiedział. Rozkręć rozmowę!"
     one: "1 aspekt"
@@ -129,6 +130,14 @@ pl:
     other: "%{count} komentarzy"
     zero: "brak komentarzy"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Nie udało się utworzyć kontaktu"
     destroy: 
@@ -139,9 +148,11 @@ pl:
     one: "1 kontakt"
     other: "%{count} kontaktów"
     share_with_pane: 
-      accepts: "Kiedy %{name} zaakceptuje zaproszenie, zaczniecie widzieć nawzajem swoje wpisy w serwisie Diaspora"
       add_new_aspect: "dodaj do nowego aspektu"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Zacznij współdzielić z %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "brak kontaktów"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ pl:
     new_request: "chce zostać twoim znajomym."
     post: "wpis."
     private_message: "wysłał(a) ci wiadomość."
-    request_accepted: "zaakceptował Twoje zaproszenie."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "skomentował też wpis użytkownika %{post_author}:"
@@ -294,23 +305,18 @@ pl:
       mentioned: "wspomniał(a) o tobie we wpisie:"
       sign_in: "Zaloguj się, aby uzyskać dostęp."
       subject: "%{name} wspomniał o tobie w serwisie Diaspora*"
-    new_request: 
-      just_sent_you: "właśnie wysłał(-a) Ci zaproszenie do Diaspory*"
-      sign_in: "zaloguj się"
-      subject: "nowe zaproszenie do znajomych w Diasporze* od %{from}"
-      try_it_out: "Przemyśl to, naprawdę warto spróbować."
     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*"
-    request_accepted: 
-      accepted: "zaakceptował Twoje zaproszenie!"
-      sign_in: "Zaloguj się"
-      subject: "%{name} zaakceptował(-a) twoje zaproszenie do znajomych w Diasporze*"
     single_admin: 
       admin: "Twój panel zarządzania Diaspora"
       subject: "Wiadomość od twojego panelu zarządzania Diaspora:"
+    started_sharing: 
+      sharing: "has started sharing with you!"
+      sign_in: "Sign in here"
+      subject: "%{name} has started sharing with you on Diaspora*"
     thanks: "Dzięki,"
   ok: "OK"
   or: "lub"
@@ -341,12 +347,10 @@ pl:
     profile_sidebar: 
       bio: "notka biograficzna"
       born: "urodziny"
-      cannot_remove: "Nie można usunąć %{name} z jedynego pozostałego aspektu. (Jeśli chcesz się odłączyć od tej osoby musisz usunąć ją ze znajomych.)"
       edit_my_profile: "Edycja mojego profilu"
       gender: "płeć"
       in_aspects: "w aspektach"
       location: "położenie"
-      remove_contact: "usuwanie kontaktu"
       remove_from: "Usunąć %{name} z aspektu %{aspect}?"
     show: 
       add_some: "dodaj kogoś"
@@ -507,7 +511,6 @@ pl:
       your_diaspora_username_is: "Twój identyfikator w Diasporze: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Wszystkie kontakty"
-      cannot_remove: "Nie można usunąć osoby z jedynego pozostałego aspektu. (Jeśli chcesz się rozłączyć z tą osobą musisz ją usunąć ze znajomych.)"
     footer: 
       logged_in_as: "zalogowany jako %{name}"
       your_aspects: "twoje aspekty"
@@ -589,8 +592,7 @@ pl:
       new_password: "Nowe hasło"
       private_message: "...otrzymasz prywatną wiadomość?"
       receive_email_notifications: "Otrzymywanie powiadomień emailowych kiedy..."
-      request_acceptence: "...twoje zaproszenie do współdzielenia zostanie zaakceptowane?"
-      request_received: "...otrzymasz nowe zaproszenie do współdzielenia?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "Twój e-mail"
       your_handle: "Twój identyfikator w Diasporze"
     getting_started: 
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index c5264ad2f..7ff2e9c2b 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -83,6 +83,7 @@ pt-BR:
     index: 
       handle_explanation: "Este é o seu endereço na Diaspora*. Como um endereço de e-mail, pode ser usado por outras pessoas para contactar você."
       no_contacts: "Nenhum contato"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
     manage: 
       add_a_new_aspect: "Adicionar um novo aspecto"
@@ -96,9 +97,9 @@ pt-BR:
       error: "Erro ao mover contato: %{inspect}"
       failure: "Falhou %{inspect}"
       success: "Contato movido para seu novo aspecto"
-    new_aspect: 
-      create: "Criar"
-      name: "Nome do aspecto"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "Ninguém postou ainda. Comece você! Diga algo!"
     one: "1 aspect"
@@ -129,6 +130,14 @@ pt-BR:
     other: "%{count} comments"
     zero: "no comments"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Failed to create contact"
     destroy: 
@@ -139,9 +148,11 @@ pt-BR:
     one: "1 contato"
     other: "%{count} contatos"
     share_with_pane: 
-      accepts: "Uma vez que %{name} aceite, começarão a ver os posts de cada um no Diaspora"
       add_new_aspect: "add to new aspect"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Começar a partilhar com %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "sem contatos"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ pt-BR:
     new_request: "deseja partilhar com você."
     post: "post"
     private_message: "sent you a message."
-    request_accepted: "Aceitou a sua solicitação de partilha."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "também comentou sobre a postagem de %{post_author}:"
@@ -294,23 +305,18 @@ pt-BR:
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
       subject: "%{name} has mentioned you on Diaspora*"
-    new_request: 
-      just_sent_you: "acabou de lhe enviar um pedido de contato na Diaspora*"
-      sign_in: "Cadastre-se aqui"
-      subject: "Novo pedido de contato na Diaspora* de %{from}"
-      try_it_out: "Você deve dar uma olhada."
     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*"
-    request_accepted: 
-      accepted: "aceitou seu pedido de contato!"
-      sign_in: "Entre aqui"
-      subject: "%{name} aceitou seu pedido de contato na Diaspora*"
     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*"
     thanks: "Obrigado,"
   ok: "OK"
   or: "ou"
@@ -341,12 +347,10 @@ pt-BR:
     profile_sidebar: 
       bio: "biografia"
       born: "nascido"
-      cannot_remove: "Não foi possível remover %{name} do último aspecto. (Se você quer se desconectar desta pessoa você deve remover o contato)."
       edit_my_profile: "Editar meu perfil"
       gender: "sexo"
       in_aspects: "nos aspectos"
       location: "location"
-      remove_contact: "remover contato"
       remove_from: "Remover %{name} de %{aspect}?"
     show: 
       add_some: "add some"
@@ -507,7 +511,6 @@ pt-BR:
       your_diaspora_username_is: "Seu nome de usuário na Diaspora* é: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Todos os contatos"
-      cannot_remove: "Não é possível remover a pessoa do último aspecto."
     footer: 
       logged_in_as: "logged in as %{name}"
       your_aspects: "your aspects"
@@ -589,8 +592,7 @@ pt-BR:
       new_password: "Nova Senha"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Receber notificações por email?"
-      request_acceptence: "...your share request is accepted?"
-      request_received: "...you receive a new share request?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "Seu email"
       your_handle: "Seu endereço Diaspora*"
     getting_started: 
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index a940a37f5..4731d5513 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -83,6 +83,7 @@ pt-PT:
     index: 
       handle_explanation: "Esta é a sua chave do Diaspora. Tal como um endereço de email, pode dar esta chave a quem deseja que o contacte."
       no_contacts: "Nenhum contacto"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
     manage: 
       add_a_new_aspect: "Adicionar um novo aspecto"
@@ -96,9 +97,9 @@ pt-PT:
       error: "Erro ao mover o contacto: %{inspect}"
       failure: "não funcionou %{inspect}"
       success: "Pessoa movida para o novo aspecto"
-    new_aspect: 
-      create: "Criar"
-      name: "Nome"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "Ainda ninguém disse nada. Dê início à conversa!"
     one: "1 aspecto"
@@ -129,6 +130,14 @@ pt-PT:
     other: "%{count} comentários"
     zero: "nenhum comentário"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Erro ao criar contacto"
     destroy: 
@@ -139,9 +148,11 @@ pt-PT:
     one: "1 contacto"
     other: "%{count} contactos"
     share_with_pane: 
-      accepts: "Uma vez que %{name} aceite, começarão a ver os posts de cada um no Diaspora"
       add_new_aspect: "adicionar a novo aspecto"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Começar a partilhar com %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "nenhum contacto"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ pt-PT:
     new_request: "deseja partilhar consigo."
     post: "post"
     private_message: "sent you a message."
-    request_accepted: "Aceitou a sua solicitação de partilha."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "também comentou no post de %{post_author}:"
@@ -294,23 +305,18 @@ pt-PT:
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
       subject: "%{name} has mentioned you on Diaspora*"
-    new_request: 
-      just_sent_you: "acaba de lhe enviar um pedido de contacto no Diaspora*"
-      sign_in: "Inicie sessão aqui"
-      subject: "novo pedido de contacto do Diaspora* de %{from}"
-      try_it_out: "Devia mesmo pensar em dar-lhe uma vista de olhos."
     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*"
-    request_accepted: 
-      accepted: "aceitou o seu pedido de contacto!"
-      sign_in: "Sign in here"
-      subject: "%{name} aceitou o teu pedido de contacto no Diaspora*"
     single_admin: 
       admin: " O seu administrador do Diaspora"
       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*"
     thanks: "Obrigado,"
   ok: "OK"
   or: "ou"
@@ -341,12 +347,10 @@ pt-PT:
     profile_sidebar: 
       bio: "biografia"
       born: "data de nascimento"
-      cannot_remove: "Impossível remover %{name} do último aspecto.(Se se quiser desligar desta pessoa terá que remover o contacto)"
       edit_my_profile: "Editar o meu perfil"
       gender: "sexo"
       in_aspects: "nos aspectos"
       location: "location"
-      remove_contact: "remover contacto"
       remove_from: "Remover %{name} de %{aspect}?"
     show: 
       add_some: "add some"
@@ -507,7 +511,6 @@ pt-PT:
       your_diaspora_username_is: "O seu nome de utilizador do Diaspora é: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Todos os contactos"
-      cannot_remove: "Impossível remover esta pessoa do último Grupo. (Se quiseres desligar-te desta pessoa terás que remover o contacto.)"
     footer: 
       logged_in_as: "logged in as %{name}"
       your_aspects: "your aspects"
@@ -589,8 +592,7 @@ pt-PT:
       new_password: "Nova Palavra-passe"
       private_message: "...você recebe uma mensagem privada?"
       receive_email_notifications: "Receive email notificaions?"
-      request_acceptence: "...o seu pedido de partilha é aceite?"
-      request_received: "...você recebe um novo pedido de partilha?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "O teu email"
       your_handle: "O teu nome de utilizador no Diaspora"
     getting_started: 
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 604c5277e..6dbb8a8d3 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -51,9 +51,9 @@ ro:
       failure: "Nu s-a reuşit adăuga contactul la aspect."
       success: "Contactul a fost adăugat cu succes la aspect."
     aspect_contacts: 
-      done_editing: "done editing"
+      done_editing: "terminat de editat"
     aspect_stream: 
-      activity: "activity"
+      activity: "activitate"
       post_time: "post time"
       sort_by: "sort by:"
     contacts_not_visible: "Contacts in this aspect will not be able to see each other."
@@ -83,6 +83,7 @@ ro:
     index: 
       handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
       no_contacts: "No contacts"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
     manage: 
       add_a_new_aspect: "Adaugă un nou aspect"
@@ -95,10 +96,10 @@ ro:
     move_contact: 
       error: "Error moving contact: %{inspect}"
       failure: "didn't work %{inspect}"
-      success: "S-a mutat persoana la noul aspectul"
-    new_aspect: 
-      create: "Crează"
-      name: "Nume"
+      success: "S-a mutat persoana la noul aspect"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "Nimeni nu a spus nimic deocamdată. Începe tu o conversaţie!"
     one: "1 aspect"
@@ -129,6 +130,14 @@ ro:
     other: "%{count} comments"
     zero: "no comments"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Failed to create contact"
     destroy: 
@@ -139,9 +148,11 @@ ro:
     one: "1 contact"
     other: "%{count} contacte"
     share_with_pane: 
-      accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
       add_new_aspect: "add to new aspect"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Start sharing with %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "nici un contact"
   conversations: 
     create: 
@@ -208,10 +219,10 @@ ro:
     edit: 
       sign_up: "sign_up"
     new: 
-      already_invited: "Already invited"
+      already_invited: "Deja invitat "
       aspect: "Aspect"
       comma_seperated_plz: "You can enter multiple email addresses separated by commas."
-      if_they_accept_info: "în cazul în care acceptă, acestea vor fi adăugate la aspectul la care ai le-ai invitat."
+      if_they_accept_info: "în cazul în care acceptă, vor fi adăugate la aspectul la care le-ai invitat."
       invite_someone_to_join: "Invită pe cineva pe Diaspora!"
       personal_message: "Mesaj personal"
       resend: "Resend"
@@ -224,7 +235,7 @@ ro:
       powered_by: "POWERED BY DIASPORA*"
       public_feed: "Public Diaspora Feed for %{name}"
       toggle: "toggle mobile site"
-      whats_new: "what's new?"
+      whats_new: "ce mai e nou?"
       your_aspects: "aspectele tale"
     header: 
       blog: "blog"
@@ -272,7 +283,7 @@ ro:
     new_request: "offered to share with you."
     post: "post"
     private_message: "sent you a message."
-    request_accepted: "accepted your share request."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "has also commented on %{post_author}'s post:"
@@ -291,26 +302,21 @@ ro:
     love: "cu dragoste,"
     manage_your_email_settings: "manage your email settings"
     mentioned: 
-      mentioned: "mentioned you in a post:"
+      mentioned: "te-a menţionat întrun post:  "
       sign_in: "Sign in to view it."
-      subject: "%{name} has mentioned you on Diaspora*"
-    new_request: 
-      just_sent_you: "just sent you a friend request on Diaspora*"
-      sign_in: "sign in here"
-      subject: "new Diaspora* friend request from %{from}"
-      try_it_out: "You should really think about checking it out."
+      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*"
-    request_accepted: 
-      accepted: "a acceptat cererea dumneavoastră de contact!"
-      sign_in: "Sign in here"
-      subject: "%{name} a acceptat cererea de contact pe Diaspora*"
     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*"
     thanks: "Mulţumim,"
   ok: "OK"
   or: "sau"
@@ -324,10 +330,10 @@ ro:
     few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " people on pod are aware of"
-      results_for: " results for %{params}"
+      results_for: "rezultate pentru %{params}"
     index: 
       couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
-      no_one_found: "...and no one was found."
+      no_one_found: "...nimeni nu a fost găsit."
       no_results: "Hey! You need to search for something."
       results_for: "caută rezultate pentru"
     many: "%{count} people"
@@ -335,18 +341,16 @@ ro:
     other: "%{count} people"
     person: 
       add_contact: "adaugă contact"
-      already_connected: "Already connected"
+      already_connected: "Eşti deja conectat"
       pending_request: "cerere în aşteptare"
       thats_you: "eşti tu!"
     profile_sidebar: 
       bio: "biografie"
       born: "Zi de naştere"
-      cannot_remove: "Cannot remove %{name} from last aspect."
       edit_my_profile: "Editează profilul meu"
       gender: "gen"
       in_aspects: "în aspecte"
       location: "location"
-      remove_contact: "Elimină contactul"
       remove_from: "Elimini pe %{name} din %{aspect}?"
     show: 
       add_some: "add some"
@@ -392,7 +396,7 @@ ro:
     show: 
       collection_permalink: "collection permalink"
       delete_photo: "Șterge Fotografie"
-      edit: "edit"
+      edit: "editează "
       edit_delete_photo: "Edit photo description / delete photo"
       make_profile_photo: "Setează ca fotografie de profil"
       original_post: "Original Post"
@@ -412,23 +416,23 @@ ro:
   profiles: 
     edit: 
       allow_search: "Allow for people to search for you within Diaspora"
-      edit_profile: "Edit profile"
+      edit_profile: "Editează profil"
       first_name: "First name"
       last_name: "Last name"
       update_profile: "Update Profile"
       your_bio: "Your bio"
-      your_birthday: "Your birthday"
+      your_birthday: "Ziua ta de naştere"
       your_gender: "Your gender"
       your_location: "Your location"
-      your_name: "Your name"
-      your_photo: "Your photo"
+      your_name: "Numele tău "
+      your_photo: "Poza ta"
       your_private_profile: "Your private profile"
       your_public_profile: "Your public profile"
       your_tags: "You: in 5 #tags"
       your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Failed to update profile"
-      updated: "Profile updated"
+      updated: "Profil updatat"
   registrations: 
     closed: "Signups are closed on this Diaspora pod."
     create: 
@@ -454,7 +458,7 @@ ro:
     destroy: 
       error: "Vă rugăm să selectaţi un aspect!"
       ignore: "Ignorează cererea de contact."
-      success: "Sunteţi acum prieteni."
+      success: "Acum sunteţi prieteni."
     helper: 
       new_requests: 
         few: "%{count} new requests!"
@@ -489,8 +493,8 @@ ro:
       connect_to_twitter: "Conectează cu Twitter"
       disconnect: "desconectează"
       edit_services: "Edit services"
-      logged_in_as: "logged in as"
-      really_disconnect: "disconnect %{service}?"
+      logged_in_as: "conectat ca"
+      really_disconnect: "desconectează %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Click pe acest link pentru a accepta invitaţia"
       join_me_on_diaspora: "Join me on DIASPORA*"
@@ -507,7 +511,6 @@ ro:
       your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Toate contactele"
-      cannot_remove: "Cannot remove person from last aspect."
     footer: 
       logged_in_as: "logged in as %{name}"
       your_aspects: "your aspects"
@@ -518,7 +521,7 @@ ro:
       invitations_left: "(%{count} rămase)"
       invite_someone: "Invită pe cineva"
       invite_your_friends: "Invită-ţi prietenii"
-      invites: "Invites"
+      invites: "Invitaţii "
       invites_closed: "Invites are currently closed on this Diaspora seed"
     notification: 
       new: "New %{type} from %{from}"
@@ -550,7 +553,7 @@ ro:
     create: 
       success: "Successfully mentioned: %{names}"
     destroy: 
-      failure: "Failed to delete post"
+      failure: "Nu sa putut şterge postul"
     helper: 
       no_message_to_display: "Nici un mesaj nou."
     new: 
@@ -582,15 +585,14 @@ ro:
       current_password: "Parola curentă"
       download_photos: "descarcă fotografiile mele"
       download_xml: "descarcă datele mele (xml)"
-      edit_account: "Edit account"
+      edit_account: "Editează cont"
       export_data: "Exportare de date"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "Parolă nouă"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Receive email notificaions?"
-      request_acceptence: "...your share request is accepted?"
-      request_received: "...you receive a new share request?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "E-mailul tău"
       your_handle: "Identificatorul tau pe Diaspora"
     getting_started: 
@@ -598,25 +600,25 @@ ro:
       connect_services: "Connect your services"
       could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Editează-ţi profilul"
-      finished: "Finished!"
+      finished: "Terminat!"
       save_and_continue: "Salvează si continuă"
       signup_steps: "Complete your sign-up by doing these things:"
       skip: "sări peste tutorial"
       step_2: 
-        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
-        skip: "Skip"
+        find_your_friends_on_diaspora: "Ai vrea sa-ţi găseşti prietenii de pe Facebook pe Diaspora?"
+        skip: "Treci peste"
       step_3: 
-        finish: "Finish"
-        people_already_on_diaspora: "People already on Diaspora"
+        finish: "Termină"
+        people_already_on_diaspora: "Persoane deja pe Diaspora"
       welcome: "Bine ai venit pe Diaspora!"
     public: 
       does_not_exist: "Utilizatorul %{username} nu există!"
     update: 
       email_notifications_changed: "Language Change Failed"
       language_changed: "Limba schimbată"
-      language_not_changed: "Language Change Failed"
+      language_not_changed: "Nu sa putut modifica limba"
       password_changed: "S-a modificat parola"
-      password_not_changed: "Password Change Failed"
+      password_not_changed: "Nu sa putut schimba parola"
   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 246c59b31..390fb4cdb 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -83,6 +83,7 @@ ru:
     index: 
       handle_explanation: "Это идентификатор вашей Диаспоры. Так же как адрес электронной почты, который вы можете дать людям, для связи с вами."
       no_contacts: "Контакты отсутствуют"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "опубликовать сообщение>>"
     manage: 
       add_a_new_aspect: "Добавить новый аспект"
@@ -96,9 +97,9 @@ ru:
       error: "Ошибка при перемещении контакта: %{inspect}"
       failure: "не работает %{inspect}"
       success: "Персона перемещена в новый аспект"
-    new_aspect: 
-      create: "Создать"
-      name: "Имя"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "Здесь ещё никто ничего не сказал.  Начните разговор!"
     one: "1 аспект"
@@ -129,6 +130,14 @@ ru:
     other: "%{count} комментариев"
     zero: "нет комментариев"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Не удалось создать контакт"
     destroy: 
@@ -139,9 +148,11 @@ ru:
     one: "1 контакт"
     other: "%{count} контакт[-а, -ов]"
     share_with_pane: 
-      accepts: "После того как %{name} принял, вы сможите видеть сообщения друг друга в диаспоре"
       add_new_aspect: "добавить в новый аспект"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Начать обмен с %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "ни одного контакта"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ ru:
     new_request: "предлагает поделиться с вами."
     post: "сообщение."
     private_message: "послал Вам сообщение."
-    request_accepted: "ваше приглашение принял[-а]"
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "также прокомментировал %{post_author} сообщение:\n"
@@ -294,23 +305,18 @@ ru:
       mentioned: "упомянул вас в сообщении:"
       sign_in: "Войти в систему, чтобы посмотреть."
       subject: "% {name} упомянул вас в диаспоре*"
-    new_request: 
-      just_sent_you: "отправил вам запрос для Диаспоры*"
-      sign_in: "Войдите в систему здесь"
-      subject: "новый контакт-запрос в Диаспоре от %{from}"
-      try_it_out: "Вы должны подумать о его проверке.\n"
     private_message: 
       message_subject: "Тема: %{subject}"
       private_message: "отправил вам личное сообщение:"
       sign_in: "Войдите в систему, чтобы посмотреть."
       subject: "%{name} прислал вам личное сообщение в диаспоре*"
-    request_accepted: 
-      accepted: "принял Ваш запрос!"
-      sign_in: "Войти здесь"
-      subject: "%{name} принял(а) ваш запрос для присоединения к Диаспоре*"
     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*"
     thanks: "Спасибо,"
   ok: "Ок"
   or: "или"
@@ -341,12 +347,10 @@ ru:
     profile_sidebar: 
       bio: "О себе"
       born: "день рождения"
-      cannot_remove: "Не удалось удалить %{name} c последнего аспекта.(Если вы хотите отключиться от этого человека необходимо удалить контакт)"
       edit_my_profile: "Редиктировать профиль"
       gender: "пол"
       in_aspects: "в аспектах"
       location: "местоположение"
-      remove_contact: "удалить контакт"
       remove_from: "Удалить %{name} из %{aspect}?"
     show: 
       add_some: "добавить"
@@ -507,7 +511,6 @@ ru:
       your_diaspora_username_is: "Ваше имя пользователя Диаспоры: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Все контакты"
-      cannot_remove: "Нельзя удалить человека из последнего аспекта. (Если вы хотите отключить этого человека, необходимо удалить контакт)"
     footer: 
       logged_in_as: "вошли как %{name}"
       your_aspects: "ваши аспекты"
@@ -589,8 +592,7 @@ ru:
       new_password: "Новый пароль"
       private_message: "... Вы получаете личное сообщение?"
       receive_email_notifications: "Получать извещение электронной почтой (email), если..."
-      request_acceptence: "... Ваш обменный запрос принят?"
-      request_received: "... Вы получили новый обменный запрос?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "Ваш адрес электронной почты (email)"
       your_handle: "Ваше управление Диаспорой"
     getting_started: 
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index cfa687fa3..58ed2927c 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -83,6 +83,7 @@ sk:
     index: 
       handle_explanation: "Toto je Vaša adresa a slúži ako vizitka. Pomocou nej Vás môžu ostatní vyhľadať."
       no_contacts: "Žiadne kontakty"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
     manage: 
       add_a_new_aspect: "Pridať nový aspekt"
@@ -96,9 +97,9 @@ sk:
       error: "Chyba pri presúvaní kontaktu: %{inspect}"
       failure: "nepracuje %{inspect}"
       success: "Osoba presunutá do nového aspektu"
-    new_aspect: 
-      create: "Vytvoriť"
-      name: "Meno"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "Nikto nič nevraví. Začnite Vy!"
     one: "1 aspect"
@@ -129,6 +130,14 @@ sk:
     other: "%{count} comments"
     zero: "no comments"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Failed to create contact"
     destroy: 
@@ -139,9 +148,11 @@ sk:
     one: "1 kontakt"
     other: "kontakty (%{count})"
     share_with_pane: 
-      accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
       add_new_aspect: "pridať k novému aspektu"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Start sharing with %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "žiadne kontakty"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ sk:
     new_request: "offered to share with you."
     post: "príspevok"
     private_message: "sent you a message."
-    request_accepted: "Vaša požiadavka bola akceptovaná."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "tiež komentoval príspevok užívateľa %{post_author} :"
@@ -294,23 +305,18 @@ sk:
       mentioned: "ťa spomenul v príspevku:"
       sign_in: "K prezeraniu sa prihlás."
       subject: "%{name} ťa spomenul na Diaspore*"
-    new_request: 
-      just_sent_you: "Vám zaslal žiadosť v Diaspore*"
-      sign_in: "Prihláste sa"
-      subject: "Nová žiadosť o kontakt od %{from}"
-      try_it_out: "Mali by ste to skontrolovať."
     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*"
-    request_accepted: 
-      accepted: "prijal Vašu žiadosť. Teraz je vo Vašich"
-      sign_in: "Prihláste sa"
-      subject: "Užívateľ %{name} prijal Vašu žiadosť a pripojil sa k Diaspore*"
     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*"
     thanks: "Vďaka,"
   ok: "OK"
   or: "alebo"
@@ -341,12 +347,10 @@ sk:
     profile_sidebar: 
       bio: "Niečo o Vás"
       born: "dátum narodenia"
-      cannot_remove: "Užívateľa %{name} nie je možné z posledného aspektu odstrániť."
       edit_my_profile: "Upraviť profil"
       gender: "pohlavie"
       in_aspects: "v aspektoch"
       location: "location"
-      remove_contact: "odstrániť kontakt"
       remove_from: "Odstrániť užívateľa %{name} z aspektu %{aspect}?"
     show: 
       add_some: "add some"
@@ -507,7 +511,6 @@ sk:
       your_diaspora_username_is: "Vaše užívateľské meno je %{diaspora_handle}"
     contact_list: 
       all_contacts: "Všetky kontakty"
-      cannot_remove: "Nie je možné osobu odstrániť z posledného aspektu. (Ak s ňou chcete nadobro prerušiť kontakt, odstráňte ju prosím z Vášho zoznamu osôb.)"
     footer: 
       logged_in_as: "logged in as %{name}"
       your_aspects: "your aspects"
@@ -589,8 +592,7 @@ sk:
       new_password: "Nové heslo"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Zasielať e-mailové notifikácie?"
-      request_acceptence: "...your share request is accepted?"
-      request_received: "...you receive a new share request?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "Váš e-mail"
       your_handle: "Príručka k Diaspore"
     getting_started: 
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 462ab9a6d..d77e67a2f 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -83,6 +83,7 @@ sl:
     index: 
       handle_explanation: "To je vaš diaspora naslov. Tako kot vaš e-naslov, ga lahko uporabite kot naslov s pomočjo katerega drugi stopijo v stik z vami."
       no_contacts: "Ni kontaktov"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
     manage: 
       add_a_new_aspect: "Dodaj novo skupino"
@@ -96,9 +97,9 @@ sl:
       error: "Prestavljanje stika neuspešno: %{inspect}"
       failure: "ni uspelo %{inspect}"
       success: "Oseba je prestavljena v novo skupino"
-    new_aspect: 
-      create: "Ustvari"
-      name: "Ime"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "Trenutno še brez objav. Začnite s prvo objavo!"
     one: "1 aspect"
@@ -129,6 +130,14 @@ sl:
     other: "%{count} comments"
     zero: "no comments"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Failed to create contact"
     destroy: 
@@ -139,9 +148,11 @@ sl:
     one: "1 stik"
     other: "število stikov %{count}"
     share_with_pane: 
-      accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
       add_new_aspect: "add to new aspect"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Start sharing with %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "brez stikov"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ sl:
     new_request: "nekdo želi deliti z vami."
     post: "prispevek"
     private_message: "sent you a message."
-    request_accepted: "vaše prošnja je sprejeta."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "prav tako komentirano na objavo osebe %{post_author}:"
@@ -294,23 +305,18 @@ sl:
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
       subject: "%{name} has mentioned you on Diaspora*"
-    new_request: 
-      just_sent_you: "poslana vam je bila prošnja za stik v Diaspori*"
-      sign_in: "Prijavite se tukaj"
-      subject: "nova Diaspora* prošnja za stik od %{from}"
-      try_it_out: "Preverite in se prepričajte."
     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*"
-    request_accepted: 
-      accepted: "vaše povabilo je bilo sprejeto!"
-      sign_in: "Tukaj se registrirajte"
-      subject: "Oseba %{name} je sprejela vaše povabilo za stik v Diaspori*"
     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*"
     thanks: "Hvala,"
   ok: "OK"
   or: "ali"
@@ -341,12 +347,10 @@ sl:
     profile_sidebar: 
       bio: "življenjepis"
       born: "datum rojstva"
-      cannot_remove: "Osebe %{name} ni mogoče odstraniti iz skupine. (V kolikor želite prekiniti stik z osebo, jo je potrebno odstraniti iz vašega seznama stikov.)"
       edit_my_profile: "Uredi moj profil"
       gender: "spol"
       in_aspects: "v skupinah"
       location: "location"
-      remove_contact: "odstrani stik"
       remove_from: "Ali odstranim %{name} iz skupine %{aspect}?"
     show: 
       add_some: "add some"
@@ -507,7 +511,6 @@ sl:
       your_diaspora_username_is: "Vaše Diaspora uporabniško ime je: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Vsi stiki"
-      cannot_remove: "Osebe ni mogoče odstraniti iz skupine. (V kolikor želite prekiniti stik z osebo, jo je potrebno odstraniti iz vašega seznama stikov.)"
     footer: 
       logged_in_as: "logged in as %{name}"
       your_aspects: "your aspects"
@@ -589,8 +592,7 @@ sl:
       new_password: "Novo geslo"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Želite prejemati obvestila po e-pošti, ko..."
-      request_acceptence: "...your share request is accepted?"
-      request_received: "...you receive a new share request?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "Vaš e-naslov"
       your_handle: "Vaš diaspora naslov"
     getting_started: 
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index fb9e6f421..28a4f298f 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -83,6 +83,7 @@ sv:
     index: 
       handle_explanation: "Det här är ditt Diaspora-användarnamn. Det är den här du ska ge till dina vänner om du vill att de ska lägga till dig på Diaspora."
       no_contacts: "Inga kontakter"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "skriv ett inlägg >>"
     manage: 
       add_a_new_aspect: "Lägg till en ny aspekt"
@@ -96,9 +97,9 @@ sv:
       error: "Kunde inte flytta kontakt: %{inspect}"
       failure: "fungerade inte %{inspect}"
       success: "Personen flyttades till den nya aspekten"
-    new_aspect: 
-      create: "Skapa"
-      name: "Namn"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "Ingen har sagt något än. Bli först!"
     one: "1 aspekt"
@@ -129,6 +130,14 @@ sv:
     other: "%{count} kommentarer"
     zero: "inga kommentarer"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Misslyckades med att skapa kontakt"
     destroy: 
@@ -139,9 +148,11 @@ sv:
     one: "1 kontakt"
     other: "%{count} kontakter"
     share_with_pane: 
-      accepts: "När %{name} accepterar så kommer ni börja se varandras inlägg på Diaspora"
       add_new_aspect: "lägg till på ny aspekt"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Börja dela med %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "inga kontakter"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ sv:
     new_request: "erbjöd sig att dela med dig."
     post: "inlägg."
     private_message: "skickade dig ett meddelande."
-    request_accepted: "accepterade din förfrågan om att dela."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "har också kommenterat %{post_author}'s inlägg:"
@@ -294,23 +305,18 @@ sv:
       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*"
-    new_request: 
-      just_sent_you: "skickade nyss en kontaktförfrågan till dig på Diaspora"
-      sign_in: "Logga in här"
-      subject: "ny kontaktförfrågan från %{from}"
-      try_it_out: "Du borde verkligen överväga att kolla upp detta."
     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*"
-    request_accepted: 
-      accepted: "har accepterat din kontaktförfrågan!"
-      sign_in: "Logga in här"
-      subject: "%{name} har accepterat din kontaktförfrågan på Diaspora"
     single_admin: 
       admin: "Din Diaspora administratör"
       subject: "Ett meddelande gällande ditt Diaspora-konto:"
+    started_sharing: 
+      sharing: "has started sharing with you!"
+      sign_in: "Sign in here"
+      subject: "%{name} has started sharing with you on Diaspora*"
     thanks: "Tack,"
   ok: "OK"
   or: "eller"
@@ -341,12 +347,10 @@ sv:
     profile_sidebar: 
       bio: "bio"
       born: "födelsedag"
-      cannot_remove: "Kan inte ta bort %{name} från den sista sidan. Du måste ta bort personen om du inte längre vill vara ansluten till denne."
       edit_my_profile: "Ändra min profil"
       gender: "kön"
       in_aspects: "i aspekter"
       location: "plats"
-      remove_contact: "ta bort kontakt"
       remove_from: "Ta bort %{name} från %{aspect}?"
     show: 
       add_some: "lägg till några"
@@ -507,7 +511,6 @@ sv:
       your_diaspora_username_is: "Ditt Diaspora-användarnamn är: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Alla kontakter"
-      cannot_remove: "Kan inte ta bort personen från fler sidor, ta bort kontakten om du inte längre vill vara ansluten till denne."
     footer: 
       logged_in_as: "inloggad som %{name}"
       your_aspects: "dina aspekter"
@@ -589,8 +592,7 @@ sv:
       new_password: "Nytt lösenord"
       private_message: "...du mottar ett privat meddelande?"
       receive_email_notifications: "Skicka meddelanden via e-post när..."
-      request_acceptence: "...din delningsförfrågan är accepterad?"
-      request_received: "...du mottar en delningsförfrågan?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "Din epost"
       your_handle: "Ditt Diaspora-användarnamn"
     getting_started: 
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 80de1c4aa..3a0551862 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -83,6 +83,7 @@ tr:
     index: 
       handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
       no_contacts: "No contacts"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
     manage: 
       add_a_new_aspect: "Yeni bir yan ekle"
@@ -96,9 +97,9 @@ tr:
       error: "Kontak taşıma problemi: %{inspect}"
       failure: "didn't work %{inspect}"
       success: "Person moved to new aspect"
-    new_aspect: 
-      create: "Yarat"
-      name: "İsim"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "Kimse henüz birşey söylemedi. Sohbeti başlatın!"
     one: "1 aspect"
@@ -129,6 +130,14 @@ tr:
     other: "%{count} comments"
     zero: "no comments"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "Failed to create contact"
     destroy: 
@@ -139,9 +148,11 @@ tr:
     one: "1 kişi"
     other: "%{count} kişi"
     share_with_pane: 
-      accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
       add_new_aspect: "add to new aspect"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "Start sharing with %{name}"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "kişi yok"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ tr:
     new_request: "offered to share with you."
     post: "post"
     private_message: "sent you a message."
-    request_accepted: "accepted your share request."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "has also commented on %{post_author}'s post:"
@@ -294,23 +305,18 @@ tr:
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
       subject: "%{name} has mentioned you on Diaspora*"
-    new_request: 
-      just_sent_you: "just sent you a friend request on Diaspora*"
-      sign_in: "sign in here"
-      subject: "new Diaspora* friend request from %{from}"
-      try_it_out: "Bunu gerçekten kontrol etmeyi düşünmelisiniz."
     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*"
-    request_accepted: 
-      accepted: "has accepted your friend request. They are now in your"
-      sign_in: "Sign in here"
-      subject: "%{name} has accepted your friend request on Diaspora*"
     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*"
     thanks: "Thanks,"
   ok: "Tamam"
   or: "ya da"
@@ -341,12 +347,10 @@ tr:
     profile_sidebar: 
       bio: "hakkında"
       born: "born"
-      cannot_remove: "Cannot remove %{name} from last aspect."
       edit_my_profile: "Edit my profile"
       gender: "gender"
       in_aspects: "in aspects"
       location: "location"
-      remove_contact: "remove contact"
       remove_from: "Remove %{name} from %{aspect}?"
     show: 
       add_some: "add some"
@@ -507,7 +511,6 @@ tr:
       your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Bütün kişiler"
-      cannot_remove: "Cannot remove person from last aspect."
     footer: 
       logged_in_as: "logged in as %{name}"
       your_aspects: "your aspects"
@@ -589,8 +592,7 @@ tr:
       new_password: "Yeni Şifre"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Receive email notificaions?"
-      request_acceptence: "...your share request is accepted?"
-      request_received: "...you receive a new share request?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "E-postan"
       your_handle: "Your diaspora handle"
     getting_started: 
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index fb0873329..f023defb1 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -83,6 +83,7 @@ zh-CN:
     index: 
       handle_explanation: "这是您的 diaspora 帐号， 就像是邮箱一样，你可以把它提供给想好友您的人。"
       no_contacts: "没有任何好友"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "发布站内信>>"
     manage: 
       add_a_new_aspect: "添加分类"
@@ -96,9 +97,9 @@ zh-CN:
       error: "好友移动错误：%{inspect}"
       failure: "%{inspect}没有成功"
       success: "好友成功添加到新分类"
-    new_aspect: 
-      create: "添加"
-      name: "名称"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "还没人发布过内容。你发布第一条吧！"
     one: "1个分类"
@@ -129,6 +130,14 @@ zh-CN:
     other: "%{count}条回应"
     zero: "没有回复"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "添加好友失败"
     destroy: 
@@ -139,9 +148,11 @@ zh-CN:
     one: "1个好友"
     other: "%{count}个好友"
     share_with_pane: 
-      accepts: "当 %{name} 同意请求后，你们就开始看到彼此在Diaspora上发布的内容"
       add_new_aspect: "添加到新的分类"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "与 %{name} 分享"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "没有好友"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ zh-CN:
     new_request: "想要与您分享。"
     post: "日志。"
     private_message: "写了一则消息给您。"
-    request_accepted: "已同意和您分享。"
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "也对 %{post_author} 的贴文发布了意见:"
@@ -294,23 +305,18 @@ zh-CN:
       mentioned: "在 Diaspora* 发布的内容中提到了您："
       sign_in: "登录后可以查看。"
       subject: "%{name} 在 Diaspora* 上发布的内容中提到了您"
-    new_request: 
-      just_sent_you: "刚刚在 Diaspora* 上与向您发送了好友请求"
-      sign_in: "由此登录"
-      subject: "%{from} 想与您在 Diaspora* 上建立好友请求"
-      try_it_out: "您赶紧来查看一下吧。"
     private_message: 
       message_subject: "主题: %{subject}"
       private_message: "已发送了私人信息给您："
       sign_in: "登录进来看看。"
       subject: "%{name} 在 Diaspora* 给您发送了私人信息"
-    request_accepted: 
-      accepted: "已接受了您的好友请求！"
-      sign_in: "由此登录"
-      subject: "%{name} 已在 Diaspora* 接收了您的好友请求"
     single_admin: 
       admin: "为您服务的 Diaspora 管理员"
       subject: "关于您 Diaspora 帐号的信息:"
+    started_sharing: 
+      sharing: "has started sharing with you!"
+      sign_in: "Sign in here"
+      subject: "%{name} has started sharing with you on Diaspora*"
     thanks: "谢谢，"
   ok: "确定"
   or: "或"
@@ -341,12 +347,10 @@ zh-CN:
     profile_sidebar: 
       bio: "自我介绍"
       born: "生日"
-      cannot_remove: "无法将好友从他所在的最后一个分类中移除。(如果你想与这个人断绝连接，你可以解除与他的好友关系。)"
       edit_my_profile: "编辑我的个人档案"
       gender: "性别"
       in_aspects: "所属分类"
       location: "位置"
-      remove_contact: "解除好友关系"
       remove_from: "要从 %{aspect} 删除 %{name} 吗？"
     show: 
       add_some: "添加一些"
@@ -507,7 +511,6 @@ zh-CN:
       your_diaspora_username_is: "您的 Diaspora 帐号是: %{diaspora_handle}"
     contact_list: 
       all_contacts: "全部好友"
-      cannot_remove: "无法将好友从他所在的最后一个分类中移除。(如果你想与这个人断绝连结，你可以解除与他的好友关系。)"
     footer: 
       logged_in_as: "已用 %{name} 登录"
       your_aspects: "您的分类"
@@ -589,8 +592,7 @@ zh-CN:
       new_password: "新密码"
       private_message: "……当收到私人信息时？"
       receive_email_notifications: "是否要在以下情况收到电子邮件通知……"
-      request_acceptence: "……当请求跟人分享被接受时？"
-      request_received: "……当收到有人想与您分享的新请求时？"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "您的电子邮箱"
       your_handle: "您的 diaspora 帐号"
     getting_started: 
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index b782bacfc..5bc4697fd 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -83,6 +83,7 @@ zh-TW:
     index: 
       handle_explanation: "這是你的 diaspora 識別碼. 就像是電子信箱一樣, 你可以把它給想聯絡你的人."
       no_contacts: "沒有任何聯繫"
+      people_sharing_with_you: "People sharing with you"
       post_a_message: "發表訊息 >>"
     manage: 
       add_a_new_aspect: "新增面向"
@@ -96,9 +97,9 @@ zh-TW:
       error: "聯繫移動錯誤: %{inspect}"
       failure: "因%{inspect}沒有作用"
       success: "聯絡人已移至新的面向"
-    new_aspect: 
-      create: "創造"
-      name: "名稱"
+    new: 
+      create: "Create"
+      name: "Name"
     no_posts_message: 
       start_talking: "還沒人說話. 你來起個頭吧!"
     one: "1個面向"
@@ -129,6 +130,14 @@ zh-TW:
     other: "%{count}則回應"
     zero: "沒有回應"
   contacts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        zero: "Add to aspect"
     create: 
       failure: "建立聯繫失敗"
     destroy: 
@@ -139,9 +148,11 @@ zh-TW:
     one: "1個聯繫"
     other: "%{count}個聯繫"
     share_with_pane: 
-      accepts: "當 %{name} 接受後, 你們就開始可以看到彼此在 Diaspora 上發表的東西"
       add_new_aspect: "加入至新的面向"
+      following: "By placing %{name} in an aspect, you'll start following and sending posts to them."
       share_with: "開始跟 %{name} 分享"
+    sharing: 
+      people_sharing: "People sharing with you:"
     zero: "沒有任何聯繫"
   conversations: 
     create: 
@@ -272,7 +283,7 @@ zh-TW:
     new_request: "想要跟你分享."
     post: "貼文."
     private_message: "寫了一則訊息給你."
-    request_accepted: "已同意和你分享."
+    started_sharing: "started sharing with you."
   notifier: 
     also_commented: 
       commented: "也對 %{post_author} 的貼文發表意見:"
@@ -294,23 +305,18 @@ zh-TW:
       mentioned: "在貼文中提到你:"
       sign_in: "登入來看看."
       subject: "%{name} 在 Diaspora* 提到你"
-    new_request: 
-      just_sent_you: "剛剛向你要求在 Diaspora* 上建立聯繫"
-      sign_in: "由此登入"
-      subject: "%{from} 想跟你在 Diaspora* 上建立聯繫的新請求"
-      try_it_out: "你應該考慮來看一看."
     private_message: 
       message_subject: "主旨: %{subject}"
       private_message: "已傳送私人訊息給你:"
       sign_in: "登入來看看."
       subject: "%{name} 在 Diaspora* 傳送私人訊息給你"
-    request_accepted: 
-      accepted: "已接受了跟你聯繫的請求!"
-      sign_in: "由此登入"
-      subject: "%{name} 已接受了跟你在 Diaspora* 上聯繫的請求"
     single_admin: 
       admin: "為您服務的 Diaspora 管理員"
       subject: "關於你的 Diaspora 帳號的訊息:"
+    started_sharing: 
+      sharing: "has started sharing with you!"
+      sign_in: "Sign in here"
+      subject: "%{name} has started sharing with you on Diaspora*"
     thanks: "謝謝,"
   ok: "好了"
   or: "或是"
@@ -341,12 +347,10 @@ zh-TW:
     profile_sidebar: 
       bio: "自我介紹"
       born: "生日"
-      cannot_remove: "無法將聯絡人從他/她最後一個面向中移除. (如果你想跟這個人斷絕連結, 你必須刪除他/她的聯繫.)"
       edit_my_profile: "編輯我的個人檔案"
       gender: "性別"
       in_aspects: "所屬面向"
       location: "位置"
-      remove_contact: "刪除聯繫"
       remove_from: "要從 %{aspect} 刪除 %{name} 嗎?"
     show: 
       add_some: "新增一些"
@@ -507,7 +511,6 @@ zh-TW:
       your_diaspora_username_is: "你的 Diaspora 用戶名稱是: %{diaspora_handle}"
     contact_list: 
       all_contacts: "全部聯繫"
-      cannot_remove: "無法將聯絡人從他/她最後一個面向中移除. (如果你想跟這個人斷絕連結, 你必須刪除他/她的聯繫.)"
     footer: 
       logged_in_as: "已用 %{name} 登入"
       your_aspects: "你的面向"
@@ -589,8 +592,7 @@ zh-TW:
       new_password: "新的密碼"
       private_message: "...當收到私人訊息時?"
       receive_email_notifications: "是否要在以下時機透過電子郵件接收消息..."
-      request_acceptence: "...當請求跟人分享被接受時?"
-      request_received: "...當收到有人想跟你分享的新請求時?"
+      started_sharing: "...someone starts sharing with you?"
       your_email: "你的電子郵件"
       your_handle: "你的 diaspora 識別碼"
     getting_started: 
@@ -615,7 +617,7 @@ zh-TW:
       email_notifications_changed: "電郵通知已更改"
       language_changed: "語言已更改"
       language_not_changed: "語言更改失敗"
-      password_changed: "密碼已更改"
+      password_changed: "密碼已變更. 現在起你可以用新密碼登入了."
       password_not_changed: "密碼更改失敗"
   webfinger: 
     fetch_failed: "擷取 %{profile_url} 的 webfinger 個人檔案失敗"
diff --git a/config/locales/javascript/javascript.ar.yml b/config/locales/javascript/javascript.ar.yml
index 81eb708d5..817637ffa 100644
--- a/config/locales/javascript/javascript.ar.yml
+++ b/config/locales/javascript/javascript.ar.yml
@@ -5,15 +5,20 @@
 
 ar: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "هل أنت متأكد؟"
     infinite_scroll: 
       no_more: "لا توجد أية رسائل أخرى"
     publisher: 
       at_least_one_aspect: "عليك تحديد فئة واحدة على الأقل"
     search_for: "إبحث عن {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "استحالة إخراج العضو من الفئة المحددة. (تريد قطع الاتصال مع هذا العضو، يجب عليك حذفه تماما)"
     timeago: 
       day: "منذ يوم"
       days: "منذ %d أيام"
diff --git a/config/locales/javascript/javascript.bg.yml b/config/locales/javascript/javascript.bg.yml
index bab4489c3..fcd10ad93 100644
--- a/config/locales/javascript/javascript.bg.yml
+++ b/config/locales/javascript/javascript.bg.yml
@@ -5,15 +5,20 @@
 
 bg: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Добавяне в аспект"
+      toggle: 
+        few: "В {{count}} аспекта"
+        many: "В {{count}} аспекта"
+        one: "В {{count}} аспект"
+        other: "В {{count}} аспекта"
+        zero: "Добавяне в аспект"
     confirm_dialog: "Сигурни ли сте?"
     infinite_scroll: 
       no_more: "Няма повече публикации."
     publisher: 
       at_least_one_aspect: "Трябва да публикувате в поне един аспект"
     search_for: "Търсене за {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "Лицето не може да бъде премахнато от последния аспект. (Ако желаете да бъде прекратена връзката с лицето е необходимо да премахнете контакта.)"
     timeago: 
       day: "ден"
       days: "%d дни"
diff --git a/config/locales/javascript/javascript.br.yml b/config/locales/javascript/javascript.br.yml
index 5d3310d7e..8fa497d08 100644
--- a/config/locales/javascript/javascript.br.yml
+++ b/config/locales/javascript/javascript.br.yml
@@ -5,15 +5,20 @@
 
 br: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "Emaoc'h sur?"
     infinite_scroll: 
       no_more: "No more posts."
     publisher: 
       at_least_one_aspect: "Dav eo deoc'h embann un arvez da'n nebeutañ"
     search_for: "Klask war-lerc'h {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "Ne c'hell ket skarzhañ an den diwar an arvez diwezhañ. (Ma faot deoc'h digevreañ gant an den-se eo dav deoc'h skarzhañ an darempred.)"
     timeago: 
       day: "un devezh"
       days: "%d a zevezhioù"
diff --git a/config/locales/javascript/javascript.cs.yml b/config/locales/javascript/javascript.cs.yml
index 2add81b7a..aad3f9979 100644
--- a/config/locales/javascript/javascript.cs.yml
+++ b/config/locales/javascript/javascript.cs.yml
@@ -5,15 +5,20 @@
 
 cs: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Přidat do aspektu"
+      toggle: 
+        few: "Ve {{count}} aspektech"
+        many: "V {{count}} aspektech"
+        one: "V {{count}} aspektu"
+        other: "Ve {{count}} aspektech"
+        zero: "Přidat do aspektu"
     confirm_dialog: "Jste si jisti?"
     infinite_scroll: 
       no_more: "Žádné další příspěvky."
     publisher: 
       at_least_one_aspect: "Musíte publikovat alespoň do jednoho aspektu"
     search_for: "Hledat {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "Nelze odstranit osobu z posledního aspektu. (Pokud se chcete odpojit od této osoby je třeba odebrat kontakt.)"
     timeago: 
       day: "1 dnem"
       days: "%d dny"
diff --git a/config/locales/javascript/javascript.da.yml b/config/locales/javascript/javascript.da.yml
index 5b66554e9..32805d7de 100644
--- a/config/locales/javascript/javascript.da.yml
+++ b/config/locales/javascript/javascript.da.yml
@@ -5,15 +5,20 @@
 
 da: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "Er du sikker?"
     infinite_scroll: 
       no_more: "No more posts."
     publisher: 
       at_least_one_aspect: "Du skal dele med mindst et aspekt"
     search_for: "Søg efter {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "Kan ikke fjerne personen fra sidste aspekt. (Hvis du ikke ønsker at dele med denne person mere må du fjerne ham fra kontakter.)"
     timeago: 
       day: "en dag"
       days: "%d dage"
diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml
index 8f9e4726c..6d4c96807 100644
--- a/config/locales/javascript/javascript.de.yml
+++ b/config/locales/javascript/javascript.de.yml
@@ -5,15 +5,20 @@
 
 de: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Zu Aspekt hinzufügen"
+      toggle: 
+        few: "In {{count}} Aspekten"
+        many: "In {{count}} Aspekten"
+        one: "In {{count}} Aspekten"
+        other: "In {{count}} Aspekten"
+        zero: "Zu Aspekt hinzufügen"
     confirm_dialog: "Bist du dir sicher?"
     infinite_scroll: 
       no_more: "Keine weiteren Beiträge."
     publisher: 
       at_least_one_aspect: "Du musst zumindest zu einem Aspekt posten"
     search_for: "Nach {{name}} suchen"
-    shared: 
-      contact_list: 
-        cannot_remove: "Die Person kann vom letzten Aspekt nicht entfernt werden. (Wenn du dich von dieser Person trennen willst, musst du diesen Kontakt entfernen.)"
     timeago: 
       day: "einem Tag"
       days: "%d Tagen"
diff --git a/config/locales/javascript/javascript.el.yml b/config/locales/javascript/javascript.el.yml
index 476a74882..6a80284b3 100644
--- a/config/locales/javascript/javascript.el.yml
+++ b/config/locales/javascript/javascript.el.yml
@@ -5,15 +5,20 @@
 
 el: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "Είστε σίγουρος/η;"
     infinite_scroll: 
       no_more: "Δεν υπάρχουν άλλες δημοσιεύσεις."
     publisher: 
       at_least_one_aspect: "πρέπει να κάνετε δημοσίευση σε τουλάχιστον μια πτυχή"
     search_for: "Αναζήτηση για {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "Δεν είναι δυνατή η αφαίρεση του ατόμου από την τελευταία πτυχή. (Αν θέλετε να αποσυνδεθείτε από το άτομο αυτό πρέπει να αφαιρέσετε την επαφή.)"
     timeago: 
       day: "μία μέρα"
       days: "%d μέρες"
diff --git a/config/locales/javascript/javascript.en_shaw.yml b/config/locales/javascript/javascript.en_shaw.yml
index 9a36db766..fb83fb3e6 100644
--- a/config/locales/javascript/javascript.en_shaw.yml
+++ b/config/locales/javascript/javascript.en_shaw.yml
@@ -5,15 +5,20 @@
 
 en_shaw: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "𐑸 𐑿 𐑖𐑻?"
     infinite_scroll: 
       no_more: "𐑯𐑴 𐑥𐑹 𐑐𐑴𐑕𐑑𐑕."
     publisher: 
       at_least_one_aspect: "𐑿 𐑥𐑳𐑕𐑑 𐑐𐑳𐑚𐑤𐑦𐑖 𐑑 𐑨𐑑 𐑤𐑰𐑕𐑑 𐑢𐑳𐑯 𐑨𐑕𐑐𐑧𐑒𐑑"
     search_for: "𐑕𐑻𐑗 𐑓𐑹 {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "𐑒𐑨𐑯𐑪𐑑 𐑮𐑦𐑥𐑵𐑝 𐑐𐑻𐑕𐑩𐑯 𐑓𐑮𐑪𐑥 𐑤𐑨𐑕𐑑 𐑨𐑕𐑐𐑧𐑒𐑑. (𐑦𐑓 𐑿 𐑢𐑳𐑯𐑑 𐑑 𐑛𐑦𐑕𐑒𐑩𐑯𐑧𐑒𐑑 𐑓𐑮𐑪𐑥 𐑞𐑦𐑕 𐑐𐑻𐑕𐑩𐑯 𐑿 𐑥𐑳𐑕𐑑 𐑮𐑦𐑥𐑵𐑝 𐑒𐑪𐑯𐑑𐑨𐑒𐑑.)"
     timeago: 
       day: "𐑩 𐑛𐑱"
       days: "%d 𐑛𐑱𐑟"
diff --git a/config/locales/javascript/javascript.eo.yml b/config/locales/javascript/javascript.eo.yml
index e81098bb5..93d032446 100644
--- a/config/locales/javascript/javascript.eo.yml
+++ b/config/locales/javascript/javascript.eo.yml
@@ -5,15 +5,20 @@
 
 eo: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "Are you sure?"
     infinite_scroll: 
       no_more: "No more posts."
     publisher: 
       at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Search for {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     timeago: 
       day: "unu tago"
       days: "%d tagoj"
diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml
index a496ef7a6..faf41f91f 100644
--- a/config/locales/javascript/javascript.es.yml
+++ b/config/locales/javascript/javascript.es.yml
@@ -5,15 +5,20 @@
 
 es: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Añadir al aspecto"
+      toggle: 
+        few: "En {{count}} aspectos"
+        many: "En {{count}} aspectos"
+        one: "En {{count}} aspecto"
+        other: "En {{count}} aspectos"
+        zero: "Añadir al aspecto"
     confirm_dialog: "¿Estás seguro?"
     infinite_scroll: 
       no_more: "No hay más publicaciones."
     publisher: 
       at_least_one_aspect: "Debes publicarlo en al menos un aspecto"
     search_for: "Buscar a {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "Imposible eliminarlo del último Aspecto. (Si quieres dejar de compartir, tendras que eliminarlo.)"
     timeago: 
       day: "un día"
       days: "%d días"
diff --git a/config/locales/javascript/javascript.eu.yml b/config/locales/javascript/javascript.eu.yml
index 55c6debf8..1c003236c 100644
--- a/config/locales/javascript/javascript.eu.yml
+++ b/config/locales/javascript/javascript.eu.yml
@@ -5,15 +5,20 @@
 
 eu: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "Ziur al zaude?"
     infinite_scroll: 
       no_more: "Mezu gehiagorik ez dago."
     publisher: 
       at_least_one_aspect: "Gutxienez alderdi batean partekatu behar duzu"
     search_for: "Bilatu {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "Ezin izan da adiskidea azken alderditik ezabatu. (Pertsona honekin harremanak bukatu nahi badituzu, hura ezabatu behar duzu.)"
     timeago: 
       day: "egun bat"
       days: "%d egun"
diff --git a/config/locales/javascript/javascript.fi.yml b/config/locales/javascript/javascript.fi.yml
index 28813845c..0f7a1951a 100644
--- a/config/locales/javascript/javascript.fi.yml
+++ b/config/locales/javascript/javascript.fi.yml
@@ -5,15 +5,20 @@
 
 fi: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "Oletko varma?"
     infinite_scroll: 
       no_more: "Ei enempää viestejä."
     publisher: 
       at_least_one_aspect: "Sinun täytyy julkaista vähintään yhdelle näkymälle."
     search_for: "Etsi nimellä {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "Et voi poistaa henkilöä viimeisestä näkymästä. (Jos haluat katkaista yhteytesi tähän henkilöön, sinun täytyy poistaa kontakti.)"
     timeago: 
       day: "päivä"
       days: "%d päivää"
diff --git a/config/locales/javascript/javascript.fr.yml b/config/locales/javascript/javascript.fr.yml
index 730b4de1b..710116560 100644
--- a/config/locales/javascript/javascript.fr.yml
+++ b/config/locales/javascript/javascript.fr.yml
@@ -5,15 +5,20 @@
 
 fr: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "Êtes-vous sûr ?"
     infinite_scroll: 
       no_more: "Pas d'autre messages."
     publisher: 
       at_least_one_aspect: "Vous devez créer au moins un aspect"
     search_for: "Chercher {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "Impossible d'enlever la personne de l'aspect sélectionné. (Si vous voulez vous  déconnecter de cette personne vous devez supprimer ce contact.)"
     timeago: 
       day: "environ un jour"
       days: "environ %d jours"
@@ -34,4 +39,4 @@ fr:
       unknown: "Type de vidéo inconnu"
       watch: "Voir cette vidéo sur {{provider}}"
     web_sockets: 
-      disconnected: "The websocket is closed; posts will no longer be streamed live."
+      disconnected: "Le WebSocket est fermé, les messages ne seront plus diffusées en direct."
diff --git a/config/locales/javascript/javascript.he.yml b/config/locales/javascript/javascript.he.yml
index 7735e04d7..55b12c245 100644
--- a/config/locales/javascript/javascript.he.yml
+++ b/config/locales/javascript/javascript.he.yml
@@ -5,15 +5,20 @@
 
 he: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "בבטחה?"
     infinite_scroll: 
       no_more: "אין רשומות נוספות."
     publisher: 
       at_least_one_aspect: "עליך לפרסם היבט אחד לפחות"
     search_for: "חיפוש אחר {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "לא ניתן להסיר את איש הקשר מההיבט החארון. (אם ברצונך להינתק מאדם זה עליך להסיר את איש הקשר.)"
     timeago: 
       day: "יום"
       days: "%d ימים"
diff --git a/config/locales/javascript/javascript.hu.yml b/config/locales/javascript/javascript.hu.yml
index dae43a0cb..2b237de59 100644
--- a/config/locales/javascript/javascript.hu.yml
+++ b/config/locales/javascript/javascript.hu.yml
@@ -5,15 +5,20 @@
 
 hu: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "Biztos vagy benne?"
     infinite_scroll: 
       no_more: "Nincs több bejegyzés."
     publisher: 
       at_least_one_aspect: "Minimum 1 csoportnak meg kell osztanod!"
     search_for: "{{name}} keresése."
-    shared: 
-      contact_list: 
-        cannot_remove: "Nem tudod eltávolítani a személyt az utolsó csoportból. (előbb törölnöd kell a kapcsolatot)."
     timeago: 
       day: "egy nappal"
       days: "%d nappal"
diff --git a/config/locales/javascript/javascript.id.yml b/config/locales/javascript/javascript.id.yml
index 0a070d34e..43bf49825 100644
--- a/config/locales/javascript/javascript.id.yml
+++ b/config/locales/javascript/javascript.id.yml
@@ -5,15 +5,20 @@
 
 id: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "Are you sure?"
     infinite_scroll: 
       no_more: "No more posts."
     publisher: 
       at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Search for {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     timeago: 
       day: "sehari"
       days: "%d hari"
diff --git a/config/locales/javascript/javascript.is.yml b/config/locales/javascript/javascript.is.yml
index 79804922d..e2151551b 100644
--- a/config/locales/javascript/javascript.is.yml
+++ b/config/locales/javascript/javascript.is.yml
@@ -5,15 +5,20 @@
 
 is: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "Ertu viss?"
     infinite_scroll: 
       no_more: "No more posts."
     publisher: 
       at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Search for {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     timeago: 
       day: "á dag"
       days: "%d dagar"
diff --git a/config/locales/javascript/javascript.it.yml b/config/locales/javascript/javascript.it.yml
index 9f59aed2c..80a925f12 100644
--- a/config/locales/javascript/javascript.it.yml
+++ b/config/locales/javascript/javascript.it.yml
@@ -5,15 +5,20 @@
 
 it: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "Sei sicuro?"
     infinite_scroll: 
       no_more: "Non ci sono altri post."
     publisher: 
       at_least_one_aspect: "Devi condividere almeno con un aspetto"
     search_for: "Ricerca per {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "Impossibile rimuovere la persona dall'ultimo aspetto. (Se vuoi disconnetterti da questa persona devi rimuovere il contatto.)"
     timeago: 
       day: "un giorno"
       days: "%d giorni"
diff --git a/config/locales/javascript/javascript.ja.yml b/config/locales/javascript/javascript.ja.yml
index 80821fbc7..d8c2501fc 100644
--- a/config/locales/javascript/javascript.ja.yml
+++ b/config/locales/javascript/javascript.ja.yml
@@ -5,15 +5,20 @@
 
 ja: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "本当にいいですか。"
     infinite_scroll: 
       no_more: "投稿はこれ以上ありません。"
     publisher: 
       at_least_one_aspect: "アスペクトを選択してから投稿してください。"
     search_for: "{{name}}を検索する"
-    shared: 
-      contact_list: 
-        cannot_remove: "人を最後のアスペクトから除外することができません。（絶交したい場合は連絡先を削除してください。）"
     timeago: 
       day: "1日"
       days: "%d日"
diff --git a/config/locales/javascript/javascript.ko.yml b/config/locales/javascript/javascript.ko.yml
index 38415a586..e2679584a 100644
--- a/config/locales/javascript/javascript.ko.yml
+++ b/config/locales/javascript/javascript.ko.yml
@@ -5,15 +5,20 @@
 
 ko: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "애스펙에 넣기"
+      toggle: 
+        few: "애스펙 {{count}}개 안에 있습니다"
+        many: "애스펙 {{count}}개 안에 있습니다"
+        one: "애스펙 한 개 안에 있습니다"
+        other: "애스펙 {{count}}개 안에 있습니다"
+        zero: "애스펙에 넣기"
     confirm_dialog: "확실합니까?"
     infinite_scroll: 
       no_more: "공유물이 더 없습니다."
     publisher: 
       at_least_one_aspect: "공유하려면 적어도 한 애스펙을 골라야 합니다."
     search_for: "{{name}} 검색"
-    shared: 
-      contact_list: 
-        cannot_remove: "모든 컨택은 적어도 한 애스펙에 속해야 합니다. 공유를 끊고 싶다면 컨택을 지워야 합니다."
     timeago: 
       day: "하루"
       days: "%d일"
diff --git a/config/locales/javascript/javascript.nb.yml b/config/locales/javascript/javascript.nb.yml
index d334ff08f..c3bc25cb5 100644
--- a/config/locales/javascript/javascript.nb.yml
+++ b/config/locales/javascript/javascript.nb.yml
@@ -5,15 +5,20 @@
 
 nb: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "Er du sikker?"
     infinite_scroll: 
       no_more: "No more posts."
     publisher: 
       at_least_one_aspect: "Du må poste til minst ett aspekt"
     search_for: "Søk etter {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "Kan ikke fjerne person fra siste aspekt. (Hvis du vil koble fra denne personen må du fjerne kontakten.)"
     timeago: 
       day: "en dag"
       days: "%d dager"
diff --git a/config/locales/javascript/javascript.nl.yml b/config/locales/javascript/javascript.nl.yml
index 6fc64c4ed..8cc07ff87 100644
--- a/config/locales/javascript/javascript.nl.yml
+++ b/config/locales/javascript/javascript.nl.yml
@@ -5,15 +5,20 @@
 
 nl: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "Weet je het zeker?"
     infinite_scroll: 
       no_more: "Geen posts meer."
     publisher: 
       at_least_one_aspect: "Je moet op zijn minst één aspect publiceren"
     search_for: "Zoek naar {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "Kan persoon niet uit laatste aspect verwijderen. (Als je de verbinding met deze persoon wilt verbreken moet je het contact verwijderen.)"
     timeago: 
       day: "een dag"
       days: "%d dagen"
diff --git a/config/locales/javascript/javascript.pl.yml b/config/locales/javascript/javascript.pl.yml
index 0814fc995..e376e5f4d 100644
--- a/config/locales/javascript/javascript.pl.yml
+++ b/config/locales/javascript/javascript.pl.yml
@@ -5,15 +5,20 @@
 
 pl: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "Czy @{m,f:jesteś|n:na}{ pew}{m:ien|f:na|n:no}?"
     infinite_scroll: 
       no_more: "No more posts."
     publisher: 
       at_least_one_aspect: "Musisz udostępnić dla co najmniej jednego aspektu"
     search_for: "Szukaj: {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "Nie można usunąć osoby z ostatniego aspektu. (Jeśli chcesz się z nią rozłączyć, musisz usunąć kontakt.)"
     timeago: 
       day: "dzień"
       days: "%d dni"
diff --git a/config/locales/javascript/javascript.pt-BR.yml b/config/locales/javascript/javascript.pt-BR.yml
index 735483ae3..ca49de126 100644
--- a/config/locales/javascript/javascript.pt-BR.yml
+++ b/config/locales/javascript/javascript.pt-BR.yml
@@ -5,15 +5,20 @@
 
 pt-BR: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "Tem certeza?"
     infinite_scroll: 
       no_more: "No more posts."
     publisher: 
       at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Search for {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     timeago: 
       day: "um dia"
       days: "%d dias"
diff --git a/config/locales/javascript/javascript.pt-PT.yml b/config/locales/javascript/javascript.pt-PT.yml
index af2b8a767..b23820bd3 100644
--- a/config/locales/javascript/javascript.pt-PT.yml
+++ b/config/locales/javascript/javascript.pt-PT.yml
@@ -5,15 +5,20 @@
 
 pt-PT: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "Are you sure?"
     infinite_scroll: 
       no_more: "No more posts."
     publisher: 
       at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Search for {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     timeago: 
       day: "um dia"
       days: "%d dias"
diff --git a/config/locales/javascript/javascript.ro.yml b/config/locales/javascript/javascript.ro.yml
index 89040d3a8..d9747efa6 100644
--- a/config/locales/javascript/javascript.ro.yml
+++ b/config/locales/javascript/javascript.ro.yml
@@ -5,15 +5,20 @@
 
 ro: 
   javascripts: 
-    confirm_dialog: "Eşti sigur?"
+    aspect_dropdown: 
+      add_to_aspect: "Adaugă la aspect"
+      toggle: 
+        few: "În {{count}} aspecte"
+        many: "În {{count}} aspecte"
+        one: "În {{count}} aspect"
+        other: "În {{count}} aspecte"
+        zero: "Adaugă la aspect"
+    confirm_dialog: "Sunteţi sigur?"
     infinite_scroll: 
-      no_more: "No more posts."
+      no_more: "Nu mai sunt posturi."
     publisher: 
-      at_least_one_aspect: "You must publish to at least one aspect"
-    search_for: "Search for {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
+      at_least_one_aspect: "Trebuie sa publici pe cel puţin un aspect"
+    search_for: "Caută {{name}}"
     timeago: 
       day: "o zi"
       days: "%d zile"
@@ -34,4 +39,4 @@ ro:
       unknown: "Format de video necunoscut"
       watch: "Vizualizează acest video pe {{provider}}"
     web_sockets: 
-      disconnected: "The websocket is closed; posts will no longer be streamed live."
+      disconnected: "Websocket-ul e închis; posturile nu vor mai fi transmise în direct."
diff --git a/config/locales/javascript/javascript.ru.yml b/config/locales/javascript/javascript.ru.yml
index 134637755..63b99fea4 100644
--- a/config/locales/javascript/javascript.ru.yml
+++ b/config/locales/javascript/javascript.ru.yml
@@ -5,15 +5,20 @@
 
 ru: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "Вы уверенны? "
     infinite_scroll: 
       no_more: "Сообщений больше нет."
     publisher: 
       at_least_one_aspect: "Вам надо минимум один аспект создать"
     search_for: "Искать {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "Нельзя удалить персону из последнего аспекта. (Если вы хотите отключить этого человека, удалите контакт.)"
     timeago: 
       day: "день"
       days: "%d дней[-я]"
diff --git a/config/locales/javascript/javascript.sk.yml b/config/locales/javascript/javascript.sk.yml
index 35279b65f..fb95ada87 100644
--- a/config/locales/javascript/javascript.sk.yml
+++ b/config/locales/javascript/javascript.sk.yml
@@ -5,15 +5,20 @@
 
 sk: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "Ste si istý?"
     infinite_scroll: 
       no_more: "No more posts."
     publisher: 
       at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Hľadať {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     timeago: 
       day: "včera"
       days: "%d dni"
diff --git a/config/locales/javascript/javascript.sl.yml b/config/locales/javascript/javascript.sl.yml
index 76f966939..de7f318b6 100644
--- a/config/locales/javascript/javascript.sl.yml
+++ b/config/locales/javascript/javascript.sl.yml
@@ -5,15 +5,20 @@
 
 sl: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "Are you sure?"
     infinite_scroll: 
       no_more: "No more posts."
     publisher: 
       at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "Search for {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     timeago: 
       day: "a day"
       days: "%d days"
diff --git a/config/locales/javascript/javascript.sv.yml b/config/locales/javascript/javascript.sv.yml
index 03fbcb497..71a225331 100644
--- a/config/locales/javascript/javascript.sv.yml
+++ b/config/locales/javascript/javascript.sv.yml
@@ -5,15 +5,20 @@
 
 sv: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "Är du säker?"
     infinite_scroll: 
       no_more: "Inga fler inlägg."
     publisher: 
       at_least_one_aspect: "Du måste publicera till minst en aspekt."
     search_for: "Sök efter {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "Kan inte ta bort person från tidigare aspekt. (Om du vill koppla bort från denhär personen måste du ta bort kontakten.)"
     timeago: 
       day: "en dag"
       days: "%d dagar"
diff --git a/config/locales/javascript/javascript.tr.yml b/config/locales/javascript/javascript.tr.yml
index 07af2acb4..616ec817b 100644
--- a/config/locales/javascript/javascript.tr.yml
+++ b/config/locales/javascript/javascript.tr.yml
@@ -5,15 +5,20 @@
 
 tr: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "Emin misiniz?"
     infinite_scroll: 
       no_more: "No more posts."
     publisher: 
       at_least_one_aspect: "You must publish to at least one aspect"
     search_for: "{{name}}'i ara"
-    shared: 
-      contact_list: 
-        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     timeago: 
       day: "1 gün"
       days: "%d günler"
diff --git a/config/locales/javascript/javascript.zh-CN.yml b/config/locales/javascript/javascript.zh-CN.yml
index dd0df953f..1ac8feac6 100644
--- a/config/locales/javascript/javascript.zh-CN.yml
+++ b/config/locales/javascript/javascript.zh-CN.yml
@@ -5,15 +5,20 @@
 
 zh-CN: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "你确定吗？"
     infinite_scroll: 
       no_more: "No more posts."
     publisher: 
       at_least_one_aspect: "发布时请选择至少一个情景"
     search_for: "搜索 {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "无法将好友从他所在的最后一个情景中移除。(如果你想与这个人断绝连结，你可以解除与他的好友关系。)"
     timeago: 
       day: "1天"
       days: "%d天"
diff --git a/config/locales/javascript/javascript.zh-TW.yml b/config/locales/javascript/javascript.zh-TW.yml
index dd9eb1278..4e77267d0 100644
--- a/config/locales/javascript/javascript.zh-TW.yml
+++ b/config/locales/javascript/javascript.zh-TW.yml
@@ -5,15 +5,20 @@
 
 zh-TW: 
   javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
     confirm_dialog: "你確定嗎?"
     infinite_scroll: 
       no_more: "沒有貼文了."
     publisher: 
       at_least_one_aspect: "發表時請至少選擇一個面向"
     search_for: "搜尋 {{name}}"
-    shared: 
-      contact_list: 
-        cannot_remove: "無法將人從它最後一個面向移除. (如果你想和這個人切斷連結, 你必須刪除和它的聯繫.)"
     timeago: 
       day: "一天"
       days: "%d天"