diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 15187cae30aec2daf028f37eb6a5993ba8e05412..354a12f2ffe8aa290566965e9fb9bc23720e4d51 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -42,6 +42,14 @@ ar:
         unknown: "عنوان فيديو غير محدد"
   are_you_sure: "هل أنت متأكد؟"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "فشل في حذف عضو من الفئة"
       no_membership: "لم يتم إيجاد العضو المحدد في هذه الفئة"
@@ -130,27 +138,12 @@ 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: 
-      failure: "فشل في فصل اتصالك مع %{name}"
-      success: "تم فصل اتصالك مع  %{name} بنجاح"
     few: "%{count} أعضاء"
     many: "%{count} أعضاء"
     one: "1 عضو"
     other: "%{count} أعضاء"
-    share_with_pane: 
-      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: "لا يوجد أعضاء"
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index 5d6aeeb561ad31af6dc207081839b8ff734c4203..f1cb270dc18287aad8a1983e0cb3e088267ff4ca 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -42,6 +42,14 @@ bg:
         unknown: "Unknown Video Title"
   are_you_sure: "Сигурни ли сте?"
   aspect_memberships: 
+    aspect_dropdown: 
+      add_to_aspect: "Добавяне в аспект"
+      toggle: 
+        few: "В %{count} аспекта"
+        many: "В %{count}аспекта"
+        one: "В %{count} аспект"
+        other: "В %{count} аспекта"
+        zero: "Добавяне в аспект"
     destroy: 
       failure: "Лицето не бе премахнато от аспекта"
       no_membership: "Избраното лице не може да бъде намерено в този аспект"
@@ -115,8 +123,8 @@ bg:
     zero: "няма аспекти"
   back: "Назад"
   bookmarklet: 
-    explanation: "%{link} от където и да е, запаметявайки връзката като отметка."
-    explanation_link_text: "Публикувайте в Diaspora"
+    explanation: "Публикувайте в Diaspora от където и да е, запаметявайки %{link} като отметка."
+    explanation_link_text: "тази връзка"
     post_something: "Публикуване в Diaspora"
     post_success: "Публикувано!"
   cancel: "Отказ"
@@ -130,27 +138,12 @@ bg:
     other: "%{count} коментара"
     zero: "няма коментари"
   contacts: 
-    aspect_dropdown: 
-      add_to_aspect: "Добавяне в аспект"
-      toggle: 
-        few: "В %{count} аспекта"
-        many: "В %{count} аспекта"
-        one: "В %{count} аспект"
-        other: "В %{count} аспекта"
-        zero: "Добавяне в аспект"
     create: 
       failure: "Контактът не бе създаден"
-    destroy: 
-      failure: "Връзката с %{name} не бе премахната"
-      success: "Връзката с %{name} е премахната"
     few: "%{count} контакта"
     many: "%{count} контакта"
     one: "1 контакт"
     other: "%{count} контакта"
-    share_with_pane: 
-      add_new_aspect: "добавяне на нов аспект"
-      following: "Поставяйки %{name} в аспект ще започнете да следвате и изпращате публикации до тях."
-      share_with: "Започнете да споделяте с %{name}"
     sharing: 
       people_sharing: "Хора споделящи с вас:"
     zero: "няма контакти"
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index 4a57acb6c189fbe6b5eb81405e948c03eb00c76a..46c4f33f29ad3f46b2a4ae5dbb33bb2d8fb0ff02 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -42,6 +42,14 @@ br:
         unknown: "Unknown Video Title"
   are_you_sure: "Sur emaoc'h?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Failed to remove person from aspect"
       no_membership: "Could not find the selected person in that aspect"
@@ -130,27 +138,12 @@ 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: 
-      failure: "Failed to disconnect from %{name}"
-      success: "Successfully disconnected from %{name}"
     few: "%{count} contacts"
     many: "%{count} a zarempredoù"
     one: "1 darempred"
     other: "%{count} a zarempredoù"
-    share_with_pane: 
-      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"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 857761855347fbe826b1d9aaf8000a30b43b8c18..9f9dfc0f942c93c32712fb19c5f1e25124052b5e 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -42,6 +42,14 @@ cs:
         unknown: "Neznámý název videa"
   are_you_sure: "Jste si jist?"
   aspect_memberships: 
+    aspect_dropdown: 
+      add_to_aspect: "přidat k aspektu"
+      toggle: 
+        few: "v %{count} aspektech"
+        many: "v %{count} aspektech"
+        one: "v %{count} aspektech"
+        other: "v %{count} aspektech"
+        zero: "přidat k aspektu"
     destroy: 
       failure: "Nepodařilo se odstranit osobu z aspektu"
       no_membership: "Nelze najít vybrané osoby v tomto aspektu"
@@ -115,8 +123,8 @@ cs:
     zero: "žádné aspekty"
   back: "Zpět"
   bookmarklet: 
-    explanation: "%{link} odkudkoliv pomocí tohoto odkazu."
-    explanation_link_text: "Příspěvek do Diaspory"
+    explanation: "Přidat na Diaspora odkudkoliv do záložek %{link}."
+    explanation_link_text: "tento odkaz"
     post_something: "Poslat něco na Diasporu"
     post_success: "Odesláno! Zavírám!"
   cancel: "Zrušit"
@@ -130,27 +138,12 @@ 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: 
-      failure: "Nepodařilo se odpojit od %{name}"
-      success: "Úspěšně odpojeno od %{name}"
     few: "%{count} kontaktů"
     many: "%{count} kontaktů"
     one: "1 kontakt"
     other: "%{count} kontaktů"
-    share_with_pane: 
-      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: "Lidé, kteří s vámi sdílí:"
     zero: "žádné kontakty"
@@ -238,7 +231,7 @@ cs:
       whats_new: "co je nového?"
       your_aspects: "vaše aspekty"
     header: 
-      admin: "admin"
+      admin: "správce"
       blog: "blog"
       code: "kód"
       login: "přihlásit"
@@ -352,7 +345,7 @@ cs:
       gender: "pohlaví"
       in_aspects: "v aspektech"
       location: "poloha"
-      remove_contact: "remove contact"
+      remove_contact: "odstranit kontakt"
       remove_from: "Odstranit %{name} z %{aspect}?"
     show: 
       add_some: "přidat nějaké"
@@ -517,10 +510,10 @@ cs:
       logged_in_as: "přihlášen jako %{name}"
       your_aspects: "vaše aspekty"
     invitations: 
-      by_email: "pomocí emailu"
+      by_email: "e-mailem"
       dont_have_now: "Již nemáte žádné, ale další brzy přibudou!"
       from_facebook: "z Facebooku"
-      invitations_left: "(%{count} zbývá)"
+      invitations_left: "%{count} zbývá"
       invite_someone: "Pozvěte někoho"
       invite_your_friends: "Pozvěte vaše přátele"
       invites: "Pozvánky"
@@ -551,7 +544,7 @@ cs:
       dislike: "to se mi nelíbí"
       like: "to se mi líbí"
       unlike: "to se mi už nelíbí"
-      via: "via %{link}"
+      via: "skrz %{link}"
   status_messages: 
     create: 
       success: "Úspěšně zmíněno: %{names}"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 8f661f6e8ef0e47a413e65849f290f78b4baccad..a43a9cf9fccfda5e577cf2a28483533e115ec2ed 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -42,6 +42,14 @@ cy:
         unknown: "Unknown Video Title"
   are_you_sure: "Are you sure?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Failed to remove person from aspect"
       no_membership: "Could not find the selected person in that aspect"
@@ -130,27 +138,12 @@ 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: 
-      failure: "Failed to disconnect from %{name}"
-      success: "Successfully disconnected from %{name}"
     few: "%{count} contacts"
     many: "%{count} contacts"
     one: "1 contact"
     other: "%{count} contacts"
-    share_with_pane: 
-      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"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index ca82d58e2b78d87a721154c5dd0d573044c4e24b..5588745de6dfdb86657370326c67b49a8f4980c7 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -42,6 +42,14 @@ da:
         unknown: "Ukendt videotitel"
   are_you_sure: "Er du sikker?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Kunne ikke fjerne person fra aspekt"
       no_membership: "Kunne ikke finde den valgte person i det aspekt"
@@ -130,27 +138,12 @@ 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: 
-      failure: "Det lykkedes ikke at afbryde forbindelse til %{name}"
-      success: "Forbindelse til %{name} er nu afbrudt "
     few: "%{count} kontaktpersoner"
     many: "%{count} kontakter"
     one: "Én kontaktperson"
     other: "%{count} kontaktpersoner"
-    share_with_pane: 
-      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"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index d88cfd59c4f4304ec6d8d8b6dc04ab84eeff23c3..843db66c21d6cf13a51e3c0f4e27d62a6c915c0e 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -42,6 +42,14 @@ de:
         unknown: "Unbekannter Video-Titel"
   are_you_sure: "Bist du sicher?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Die Person konnte nicht aus dem Aspekt entfernt werden"
       no_membership: "Konnte die ausgewählte Person in diesem Aspekt leider nicht finden"
@@ -115,8 +123,8 @@ de:
     zero: "keine Aspekte"
   back: "Zurück"
   bookmarklet: 
-    explanation: "%{link} von überall in dem du diesen Link als Lesezeichen speicherst."
-    explanation_link_text: "Erstelle einen Beitrag in Diaspora"
+    explanation: "Erstelle einen Beitrag in Diaspora von überall in dem du %{link} als Lesezeichen speicherst."
+    explanation_link_text: "diesen Link"
     post_something: "Erstelle einen Beitrag in Diaspora"
     post_success: "Erstellt! Schließen…"
   cancel: "Abbrechen"
@@ -130,27 +138,12 @@ 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: 
-      failure: "Konnte nicht von %{name} trennen"
-      success: "Erfolgreich von %{name} getrennt"
     few: "%{count} Kontakte"
     many: "%{count} Kontakte"
     one: "1 Kontakt"
     other: "%{count} Kontakte"
-    share_with_pane: 
-      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"
@@ -517,10 +510,10 @@ de:
       logged_in_as: "Angemeldet als %{name}"
       your_aspects: "Deine Aspekte"
     invitations: 
-      by_email: "per E-Mail"
+      by_email: "Per E-Mail"
       dont_have_now: "Du hast im Moment keine Einladungen zur Verfügung, aber es wird bald wieder neue geben!"
       from_facebook: "Von Facebook"
-      invitations_left: "(%{count} übrig)"
+      invitations_left: "%{count} übrig"
       invite_someone: "Jemanden einladen"
       invite_your_friends: "Lade deine Freunde ein"
       invites: "Einladungen"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 170d48fd6f3f495c82ad33f7d7c105cf9d42dca4..8e09b06179b1482a92befadcb4b0405384fc7dab 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -42,6 +42,14 @@ el:
         unknown: "Άγνωστος τίτλος video"
   are_you_sure: "Είστε σίγουρος/η;"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Αποτυχία στην αφαίρεση προσώπου από την πτυχή"
       no_membership: "Δεν βρέθηκε το επιλεγμένο άτομο σε αυτή την πτυχή"
@@ -130,27 +138,12 @@ el:
     other: "%{count} σχόλια"
     zero: "κανένα σχόλιο"
   contacts: 
-    aspect_dropdown: 
-      add_to_aspect: "Προσθήκη σε πτυχή "
-      toggle: 
-        few: "Σε %{count} πτυχές"
-        many: "Σε %{count} πτυχές"
-        one: "Σε %{count} πτυχές"
-        other: "Σε %{count} πτυχές"
-        zero: "Προσθήκη σε πτυχή "
     create: 
       failure: "Αποτυχία δημιουργίας επαφής"
-    destroy: 
-      failure: "Αποτυχία αποσύνδεσης από τον/την %{name}"
-      success: "Επιτυχία αποσύνδεσης από τον/την %{name}"
     few: "%{count} επαφές"
     many: "%{count} επαφές"
     one: "1 επαφή"
     other: "%{count} επαφές"
-    share_with_pane: 
-      add_new_aspect: "προσθήκη σε νεα πτυχή"
-      following: "Τοποθετώντας το χρήστη %{name} σε μια πτυχή, θα ξεκινήσετε να τον παρακολουθείτε και να του στέλνετε δημοσιεύσεις."
-      share_with: "Έναρξη διαμοιρασμού με τον/την %{name}"
     sharing: 
       people_sharing: "Άτομα που διαμοιράζονται μαζί σας: "
     zero: "καμία επαφή"
@@ -352,7 +345,7 @@ el:
       gender: "φύλο"
       in_aspects: "στις πτυχές"
       location: "τοποθεσία"
-      remove_contact: "remove contact"
+      remove_contact: "διαγραφή επαφής"
       remove_from: "Αφαίρεση του χρήστη %{name} από τη πτυχή %{aspect}?"
     show: 
       add_some: "προσθέστε κάποιες"
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 3be6d6c011e61dcb645bd1745d2713dd6e5f4e6e..52b89fad202d61c6e9fd1508d467ffec3b933498 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -42,6 +42,14 @@ en_shaw:
         unknown: "𐑩𐑯𐑯𐑴𐑯 𐑝𐑦𐑛𐑦𐑴 𐑑𐑲𐑑𐑩𐑤"
   are_you_sure: "𐑸 𐑿 𐑖𐑻?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "𐑓𐑱𐑤𐑛 𐑑 𐑮𐑦𐑥𐑵𐑝 𐑐𐑻𐑕𐑩𐑯 𐑓𐑮𐑪𐑥 𐑨𐑕𐑐𐑧𐑒𐑑"
       no_membership: "𐑒𐑫𐑛 𐑯𐑪𐑑 𐑓𐑲𐑯𐑛 𐑞 𐑕𐑦𐑤𐑧𐑒𐑑𐑩𐑛 𐑐𐑻𐑕𐑩𐑯 𐑦𐑯 𐑞𐑨𐑑 𐑨𐑕𐑐𐑧𐑒𐑑"
@@ -130,27 +138,12 @@ 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: 
-      failure: "𐑓𐑱𐑤𐑛 𐑑 𐑛𐑦𐑕𐑒𐑩𐑯𐑧𐑒𐑑 𐑓𐑮𐑪𐑥 %{name}"
-      success: "𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑛𐑦𐑕𐑒𐑩𐑯𐑧𐑒𐑑𐑩𐑛 𐑓𐑮𐑪𐑥 %{name}"
     few: "%{count} 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
     many: "%{count} 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
     one: "1 𐑒𐑪𐑯𐑑𐑨𐑒𐑑"
     other: "%{count} 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
-    share_with_pane: 
-      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: "𐑯𐑴 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index c1e89a2fd55042839035accb1d2ffde8dab5aac5..1294650ecfcce8e9d6ba4bb96aec2b5d6c7be29e 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -42,6 +42,14 @@ eo:
         unknown: "Unknown Video Title"
   are_you_sure: "Ĉu vi certas?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Malsukceso forigi el aspekto"
       no_membership: "Could not find the selected person in that aspect"
@@ -130,27 +138,12 @@ 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: 
-      failure: "Failed to disconnect from %{name}"
-      success: "Successfully disconnected from %{name}"
     few: "%{count} contacts"
     many: "%{count} contacts"
     one: "1 contact"
     other: "%{count} contacts"
-    share_with_pane: 
-      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"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index a1618f2f953dc4a0c3de35170533c99d657e1fc4..2d559669b136eefadead3eba10cd105b2a49d57f 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -42,6 +42,14 @@ es-CL:
         unknown: "Titulo de vídeo desconocido"
   are_you_sure: "¿Estás seguro?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "No se pudo eliminar a la persona del Aspecto"
       no_membership: "No se pudo encontrar la persona seleccionada en ese Aspecto"
@@ -130,27 +138,12 @@ es-CL:
     other: "%{count} comentarios"
     zero: "no hay comentarios"
   contacts: 
-    aspect_dropdown: 
-      add_to_aspect: "Agregar al aspecto"
-      toggle: 
-        few: "En %{count} aspectos"
-        many: "En %{count} aspectos"
-        one: "En %{count} aspecto"
-        other: "En %{count} aspectos"
-        zero: "Agregar al aspecto"
     create: 
       failure: "Error al crear contacto"
-    destroy: 
-      failure: "Error al desconectar de %{name}"
-      success: "Desconectado con éxito de %{name}"
     few: "%{count} contactos"
     many: "%{count} contactos"
     one: "1 contacto"
     other: "%{count} contactos"
-    share_with_pane: 
-      add_new_aspect: "Agregar a un nuevo Aspecto"
-      following: "Al colocar a %{name} en un Aspecto, comenzaras compartir posts con el."
-      share_with: "Empezar a compartir con %{name}"
     sharing: 
       people_sharing: "Personas compartiendo contigo:"
     zero: "no hay contactos"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 24cd9c1a728ba90dc842b6f9557ad47bec459b47..f31edebd93e1bc34c4b2e9122f8e06efb60153b7 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -42,6 +42,14 @@ es:
         unknown: "Título de vídeo desconocido"
   are_you_sure: "¿Estás seguro?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "No se pudo eliminar a la persona del aspecto"
       no_membership: "No se pudo encontrar a la persona seleccionada en ese aspecto"
@@ -130,27 +138,12 @@ 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: 
-      failure: "No se pudo desconectar de %{name}"
-      success: "Se desconectó con éxito de %{name}"
     few: "%{count} contactos"
     many: "%{count} contactos"
     one: "1 contacto"
     other: "%{count} contactos"
-    share_with_pane: 
-      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"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 56c848f55e77c28196ab5c09c045512d98cfc27b..f820909d395cae32746ea94cec3d27638a60b8bf 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -42,6 +42,14 @@ eu:
         unknown: "Bideo izen ezezaguna"
   are_you_sure: "Ziur al zaude?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Akatsa pertsona alderditik ezabatzean"
       no_membership: "Ezin izan da hautatutako pertsona aurkitu alderdian"
@@ -130,27 +138,12 @@ eu:
     other: "%{count} iruzkin"
     zero: "iruzkinik ez"
   contacts: 
-    aspect_dropdown: 
-      add_to_aspect: "Alderdira gehitu"
-      toggle: 
-        few: "%{count} alderdietan"
-        many: "%{count} alderdietan"
-        one: "Alderdi %{count}ean"
-        other: "%{count} alderdietan"
-        zero: "Alderdira gehitu"
     create: 
       failure: "Akatsa adiskide berria sortzean"
-    destroy: 
-      failure: "Akatsa %{name} ezabatzean"
-      success: "Arrakastaz ezabatu duzu %{name} adiskide zerrendatik"
     few: "%{count} adiskide"
     many: "%{count} adiskide"
     one: "adiskide 1"
     other: "%{count} adiskide"
-    share_with_pane: 
-      add_new_aspect: "alderdi berrira gehitu"
-      following: "%{name} alderdi batean sartuz, haiei jarraitzen eta mezuak bidaltzen hasiko zara."
-      share_with: "%{name}(r)ekin harremanetan hasi"
     sharing: 
       people_sharing: "Zurekin harremanetan dagoen jendea:"
     zero: "adiskiderik ez"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 1bcac66c1a863409cd2a5421852c983b84e61c3d..e27502315f35feab2958021c00eaf6e596650487 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -42,6 +42,14 @@ fi:
         unknown: "Videon Otsikko Tuntematon"
   are_you_sure: "Oletko varma?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Henkilön poisto näkymästä epäonnistui"
       no_membership: "Kyseistä henkilöä ei löytynyt valitusta näkymästä"
@@ -130,27 +138,12 @@ 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: 
-      failure: "Katkaiseminen kontaktiin %{name} epäonnistui"
-      success: "Yhteys henkilöön %{name} katkaistu onnistuneesti"
     few: "%{count} kontaktia"
     many: "%{count} kontaktia"
     one: "1 kontakti"
     other: "%{count} kontaktia"
-    share_with_pane: 
-      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: "Ihmiset jotka jakavat kanssasi:"
     zero: "ei kontakteja"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index e21374b5c86d44ba33dfe5efed877ef9d3a9bd56..fd8621c516ae9b137569fc171bd4ef009e5f2c24 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -42,6 +42,14 @@ fr:
         unknown: "Titre de vidéo inconnu"
   are_you_sure: "Êtes-vous certains?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Impossible de retirer la personne de l'aspect"
       no_membership: "Impossible de trouver la personne sélectionnée dans cet aspect"
@@ -130,27 +138,12 @@ fr:
     other: "%{count} commentaires"
     zero: "aucun commentaire"
   contacts: 
-    aspect_dropdown: 
-      add_to_aspect: "Ajouter à l'aspect"
-      toggle: 
-        few: "Dans %{count} aspects"
-        many: "Dans %{count} aspects"
-        one: "Dans %{count} aspect"
-        other: "Dans %{count} aspects"
-        zero: "Ajouter à l'aspect"
     create: 
       failure: "Impossible de créer le contact"
-    destroy: 
-      failure: "Impossible de se déconnecter de %{name}"
-      success: "Vous êtes déconnecté(e) de %{name}"
     few: "%{count} contacts"
     many: "%{count} contacts"
     one: "1 contact"
     other: "%{count} contacts"
-    share_with_pane: 
-      add_new_aspect: "ajouter à un nouvel aspect"
-      following: "En plaçant %{name} dans un aspect, vous pourrez commencer à leur envoyer des messages."
-      share_with: "Commencer à partager avec %{name}"
     sharing: 
       people_sharing: "Personnes partageant avec vous :"
     zero: "aucun contact"
@@ -410,7 +403,7 @@ fr:
       notice: "La photo a été mise à jour."
   post_visibilites: 
     update: 
-      post_hidden: "Le message de % {name} à été masqué."
+      post_hidden: "Le message de %{name} à été masqué."
   posts: 
     doesnt_exist: "cette publication n'existe pas !"
   previous: "précédent"
@@ -551,7 +544,7 @@ fr:
       dislike: "Je n'aime pas"
       like: "J'aime"
       unlike: "Je n'aime pas"
-      via: "via {link}%"
+      via: "via %{link}"
   status_messages: 
     create: 
       success: "Mention de : %{names}"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index 7adcab52472de5dde56d80cfe29380a274a0d0c0..9b67b83f19e049bb7f2ad62579414885fbe20bf4 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -42,6 +42,14 @@ ga:
         unknown: "Teideal Físeán Anaithnid"
   are_you_sure: "An bhfuil tú cinnte?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Failed to remove person from aspect"
       no_membership: "Could not find the selected person in that aspect"
@@ -130,27 +138,12 @@ 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: 
-      failure: "Failed to disconnect from %{name}"
-      success: "Successfully disconnected from %{name}"
     few: "%{count} teagmháil"
     many: "%{count} contacts"
     one: "teagmháil amháin"
     other: "%{count} teagmháil"
-    share_with_pane: 
-      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"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 4aad9494521fe50a5a8dcd4d6965521aff1fb07b..0d17c05af84a35149b77e165cab510949c6badfd 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -42,6 +42,14 @@ he:
         unknown: "כותרת הווידאו אינה ידועה"
   are_you_sure: "בבטחה?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "אירע כשל בהסרת המשתמש מההיבט"
       no_membership: "לא ניתן למצוא את איש הקשר הנבחר בהיבט זה"
@@ -130,27 +138,12 @@ 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: 
-      failure: "אירע כשל בניתוק מאיש הקשר %{name}"
-      success: "הניתוק מאיש הקשר %{name} הצליח"
     few: "%{count} אנשי קשר"
     many: "%{count} אנשי קשר"
     one: "איש קשר אחד"
     other: "%{count} אנשי קשר"
-    share_with_pane: 
-      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: "אין אנשי קשר"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 2848cc35ff05a385c15d5fb8d4170aaa8da9ca76..7405fdb944e9d0ce4da890253c89d8e5451d11f6 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -42,6 +42,14 @@ hu:
         unknown: "Ismeretlen videó cím"
   are_you_sure: "Biztos vagy benne?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Személy törlése a csoportból sikertelen"
       no_membership: "Nem található a személy ebben a csoportban"
@@ -130,27 +138,12 @@ 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: 
-      failure: "Sikertelen a kapcsolat megszakítása vele: %{name}"
-      success: "Kapcsolat megszakítva vele: %{name}"
     few: "%{count} ismerős"
     many: "%{count} ismerős"
     one: "1 ismerős"
     other: "%{count} ismerős"
-    share_with_pane: 
-      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"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 9178b684d50db5a9366c3e4818f06387bd069523..a78a7c90338d2d83c45c7456849d5ba75dbdb296 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -42,6 +42,14 @@ id:
         unknown: "Unknown Video Title"
   are_you_sure: "Are you sure?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Failed to remove person from aspect"
       no_membership: "Could not find the selected person in that aspect"
@@ -130,27 +138,12 @@ 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: 
-      failure: "Failed to disconnect from %{name}"
-      success: "Successfully disconnected from %{name}"
     few: "%{count} contacts"
     many: "%{count} contacts"
     one: "1 contact"
     other: "%{count} contacts"
-    share_with_pane: 
-      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"
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index 60cfd32bf17cc6153115fd809a02f2b0e3391645..b5caa166dc6fe0edfde1fcd923a725e9d3b53146 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -42,6 +42,14 @@ is:
         unknown: "Óþekktur vídeótitill"
   are_you_sure: "Ertu viss?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Ekki tókst að fjarlægja persónu af ásýnd"
       no_membership: "Valda manneskjan fannst ekki í þeirri ásýnd"
@@ -130,27 +138,12 @@ 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: 
-      failure: "Ekki tókst að aftengjast %{name}"
-      success: "Tókst að aftengjast %{name}"
     few: "%{count} tengsl"
     many: "%{count} contacts"
     one: "Ein tengsl"
     other: "%{count} tengsl"
-    share_with_pane: 
-      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"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index acad018f0101487846a98427853b99fc0fd7240e..298bd435c4ab81c11c4ac6406ba908c6ffa29bb2 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -42,6 +42,14 @@ it:
         unknown: "Video Senza Nome"
   are_you_sure: "Sei sicuro?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Impossibile rimuovere la persona dall'aspetto"
       no_membership: "Impossibile trovare la persona selezionata in questo aspetto"
@@ -130,27 +138,12 @@ it:
     other: "%{count} commenti"
     zero: "nessun commento"
   contacts: 
-    aspect_dropdown: 
-      add_to_aspect: "Aggiungi ad un aspetto"
-      toggle: 
-        few: "In %{count} aspetti"
-        many: "In %{count} aspetti"
-        one: "In %{count} aspetto"
-        other: "In %{count} aspetti"
-        zero: "Aggiungi ad un aspetto"
     create: 
       failure: "Impossibile creare il contatto"
-    destroy: 
-      failure: "Impossibile disconnettersi da %{name}"
-      success: "Disconnessione effettuata con successo da %{name}"
     few: "%{count} contatti"
     many: "%{count} contatti"
     one: "1 contatto"
     other: "%{count} contatti"
-    share_with_pane: 
-      add_new_aspect: "aggiungi ad un nuovo aspetto"
-      following: "Mettendo %{name} in un aspetto, inizierai a mandare e ricevere messaggi con quella persona."
-      share_with: "Inizia a condividere con %{name}"
     sharing: 
       people_sharing: "Persone in condivisione con te:"
     zero: "nessun contatto"
@@ -202,7 +195,7 @@ it:
       login_here: "accedi qui"
       ownership: "Possesso"
       ownership_explanation: "Tu possiedi le tue foto, e non dovresti perderne il possesso solo per condividerle. Tu mantieni il possesso di qualsiasi cosa condividi su Diaspora e ti viene dato pieno controllo su come viene distribuita."
-      share_what_you_want: "Condividi ciò che vuoi, con chi vuoi"
+      share_what_you_want: "Condividi ciò che vuoi, con chi vuoi."
       simplicity: "Semplicità"
       simplicity_explanation: "Diaspora permette una condivisione facile e veloce - e lo stesso accade per la gestione della privacy. Essendo riservata per natura, Diaspora non ti fa smarrire tra paginate di impostazioni e opzioni solo per tenere il tuo profilo sicuro."
       tagline_first_half: "Condividi ciò che desideri,"
@@ -211,11 +204,11 @@ it:
     check_token: 
       not_found: "Token di invito non trovato"
     create: 
-      already_contacts: "Sei già connessa con questa persona"
-      already_sent: "Hai già invitato questa persona."
+      already_contacts: "Sei già connessa con questa persona"
+      already_sent: "Hai già invitato questa persona."
       no_more: "Non hai più inviti a disposizione"
-      rejected: "Questo indirizzo email ha dei problemi: "
-      sent: "Il tuo invito è stato inviato."
+      rejected: "Questi indirizzi email hanno dei problemi:"
+      sent: "Il tuoi inviti sono stati inviati a:"
     edit: 
       sign_up: "iscriviti"
     new: 
@@ -255,7 +248,7 @@ it:
         zero: "0 Non mi piace"
       people_like_this: 
         few: "%{count} Mi piace"
-        many: "Piace a %{count}"
+        many: "%{count} Mi piace"
         one: "%{count} Mi piace"
         other: "%{count} Mi piace"
         zero: "0 Mi piace"
@@ -273,7 +266,7 @@ it:
         many: "%{count} nuove notifiche"
         one: "una nuova notifica"
         other: "%{count} nuove notifiche"
-        zero: "nessuna notifica"
+        zero: "nessuna nuova notifica"
     index: 
       and: "e"
       and_others: "e altri %{number}"
@@ -294,13 +287,13 @@ it:
       commented: "ha commentato il tuo post:"
       sign_in: "Accedi per vederlo."
       subject: "%{name} ha commentato il tuo post."
-    diaspora: "l'email robot di diaspora"
+    diaspora: "il robot che manda email per diaspora"
     hello: "Ciao %{name}!"
     liked: 
       liked: "%{name} ha appena apprezzato il tuo post: "
       sign_in: "Accedi per vedere l'elemento"
       subject: "%{name} ha appena apprezzato il tuo post"
-    love: "amore,"
+    love: "pace e bene,"
     manage_your_email_settings: "gestisci le tue impostazioni email"
     mentioned: 
       mentioned: "ti ha menzionato in un post:"
@@ -352,7 +345,7 @@ it:
       gender: "sesso"
       in_aspects: "negli aspetti"
       location: "dove ti trovi"
-      remove_contact: "remove contact"
+      remove_contact: "rimuovi contatto"
       remove_from: "Rimuovere %{name} da %{aspect}?"
     show: 
       add_some: "aggiungine alcune"
@@ -364,7 +357,7 @@ it:
       no_posts: "nessun post da mostrare!"
       not_connected: "Non sei in contatto con %{name}"
       recent_posts: "Post Recenti"
-      recent_public_posts: "Post pubblici recenti"
+      recent_public_posts: "Post Pubblici Recenti"
       return_to_aspects: "Torna alla pagina dei tuoi aspetti"
       see_all: "Visualizza tutti"
       start_sharing: "inizia a condividere"
@@ -377,7 +370,7 @@ it:
     create: 
       integrity_error: "Il caricamento della foto non è riuscito. Sei sicuro che fosse un'immagine?"
       runtime_error: "La fotografia non si è caricata. Hai dimenticato forse di allacciare la cintura?"
-      type_error: "La foto non si è caricata.  Sei sicuro di aver aggiunto un'immagine?"
+      type_error: "Errore nel caricare la foto.  Sei sicuro di aver aggiunto un'immagine?"
     destroy: 
       notice: "Foto eliminata."
     edit: 
@@ -443,7 +436,7 @@ it:
       cancel_my_account: "Cancella il mio account"
       edit: "Modifica %{name}"
       leave_blank: "(lascialo bianco se non vuoi modificarlo)"
-      password_to_confirm: "(abbiamo bisogno della tua password per confermare le tue modifiche)"
+      password_to_confirm: "(abbiamo bisogno della tua password attuale per confermare le tue modifiche)"
       unhappy: "Triste?"
       update: "Aggiorna"
     new: 
@@ -536,7 +529,7 @@ it:
       add_photos: "aggiungi foto"
       all: "tutti"
       all_contacts: "tutti i contatti"
-      click_to_share_with: "Clicca per condividere con: "
+      click_to_share_with: "Clicca per condividere con:"
       make_public: "rendi pubblico"
       post_a_message_to: "Invia un messaggio a %{aspect}"
       posting: "Invio in corso..."
@@ -560,17 +553,17 @@ it:
     helper: 
       no_message_to_display: "Nessun messaggio da visualizzare."
     new: 
-      mentioning: "stai menzionando: %{person}"
+      mentioning: "Stai menzionando: %{person}"
     show: 
       destroy: "Elimina"
       not_found: "Ci scusiamo, non possiamo trovare il post."
       permalink: "permalink"
     too_long: 
-      few: "per favore scrivi i tuoi messaggi di stato in meno di %{count} caratteri"
-      many: "per favore scrivi i tuoi messaggi di stato in meno di %{count} caratteri"
-      one: "per favore scrivi i tuoi messaggi di stato in meno di %{count} carattere"
-      other: "per favore scrivi i tuoi messaggi di stato in meno di %{count} caratteri"
-      zero: "per favore scrivi i tuoi messaggi di stato in meno di %{count} caratteri"
+      few: "per favore scrivi i tuoi messaggi di stato con meno di %{count} caratteri"
+      many: "per favore scrivi i tuoi messaggi di stato con meno di %{count} caratteri"
+      one: "per favore scrivi i tuoi messaggi di stato con meno di %{count} carattere"
+      other: "per favore scrivi i tuoi messaggi di stato con meno di %{count} caratteri"
+      zero: "per favore scrivi i tuoi messaggi di stato con meno di %{count} caratteri"
   stream_helper: 
     hide_comments: "nascondi i commenti"
     show_comments: "mostra tutti i commenti"
@@ -600,14 +593,14 @@ it:
       mentioned: "...sei menzionato in un post?"
       new_password: "Nuova Password"
       private_message: "...hai ricevuto un messaggio privato?"
-      receive_email_notifications: "Vuoi ricevere notifiche via email?"
+      receive_email_notifications: "Ricevi notifiche via email quando..."
       started_sharing: "...qualcuno vuole condividere con te?"
       your_email: "La tua email"
       your_handle: "Il tuo contatto Diaspora"
     getting_started: 
       connect_on_diaspora: "Connetti su Diaspora"
-      connect_services: "Collega i tuoi servizi"
-      could_not_find_anyone: "Non è possibile trovare neanche un tuo amico su Diaspora*. Usa barra di ricerca amici per trovarli."
+      connect_services: "Collega altri tuoi servizi"
+      could_not_find_anyone: "Non è possibile trovare neanche un tuo amico su Diaspora*. Usa la barra di ricerca amici per trovarli."
       edit_profile: "Modifica il tuo profilo"
       finished: "Finito!"
       save_and_continue: "Salva e continua"
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index e70998424e99db0f018f85195c31764beb255634..8a2fa31dfe3ed877c3c0d884b281b7f6939b0f67 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -42,6 +42,14 @@ ja:
         unknown: "不明な動画タイトル"
   are_you_sure: "本当にいいですか。"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "連絡先をアスペクトから除外するのに失敗しました。"
       no_membership: "選択した連絡先はそのアスペクト内に見つかりませんでした"
@@ -130,27 +138,12 @@ 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: 
-      failure: "%{name}さんの連絡先を削除するのに失敗しました。"
-      success: "%{name}さんの連絡先を削除するのに成功しました。"
     few: "連絡先%{count}件"
     many: "連絡先%{count}件"
     one: "連絡先1件"
     other: "連絡先%{count}件"
-    share_with_pane: 
-      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: "連絡先無し"
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index 37c306ac359d5b1f4a3d665cbb808a90cba069f2..9e799a3008135684a5f6883b67b9e9d68cef4f5e 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -42,6 +42,14 @@ ko:
         unknown: "알 수 없는 비디오 제목"
   are_you_sure: "확실합니까?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "애스펙에서 지우지 못했습니다"
       no_membership: "애스펙에서 찾을 수 없는 사람입니다"
@@ -130,27 +138,12 @@ ko:
     other: "댓글 %{count}개"
     zero: "댓글 없음"
   contacts: 
-    aspect_dropdown: 
-      add_to_aspect: "애스펙에 넣기"
-      toggle: 
-        few: "애스펙 %{count}개 안에 있습니다"
-        many: "애스펙 %{count}개 안에 있습니다"
-        one: "애스펙 한 개 안에 있습니다"
-        other: "애스펙 %{count}개 안에 있습니다"
-        zero: "애스펙에 넣기"
     create: 
       failure: "컨택을 만들 수 없습니다"
-    destroy: 
-      failure: "%{name} 컨택을 끊을 수 없습니다"
-      success: "%{name} 컨택을 성공적으로 끊었습니다"
     few: "컨택 %{count}명"
     many: "컨택 %{count}명"
     one: "컨택 한 명"
     other: "컨택 %{count}명"
-    share_with_pane: 
-      add_new_aspect: "새 애스펙에 넣기"
-      following: "%{name} 님을 애스펙에 넣으면, 팔로잉과 공유물 보내기를 시작합니다."
-      share_with: "%{name} 님과 공유 시작"
     sharing: 
       people_sharing: "나와 공유하는 사람들:"
     zero: "컨택 없음"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index bc1327589afe5030826946557910ec2e2b47d2d5..c6dab98996f6e8be4b0ba454f88b691be6d33741 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -42,6 +42,14 @@ lt:
         unknown: "Unknown Video Title"
   are_you_sure: "Are you sure?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Failed to remove person from aspect"
       no_membership: "Could not find the selected person in that aspect"
@@ -130,27 +138,12 @@ 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: 
-      failure: "Failed to disconnect from %{name}"
-      success: "Successfully disconnected from %{name}"
     few: "%{count} contacts"
     many: "%{count} contacts"
     one: "1 contact"
     other: "%{count} contacts"
-    share_with_pane: 
-      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"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 60e80fc69791c70ecb69fdf0658bd687536735c0..398bcf70f9f9dfe446d7ff8a370214c9a9bd16ed 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -42,6 +42,14 @@ mk:
         unknown: "Unknown Video Title"
   are_you_sure: "Are you sure?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Failed to remove person from aspect"
       no_membership: "Could not find the selected person in that aspect"
@@ -130,27 +138,12 @@ 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: 
-      failure: "Failed to disconnect from %{name}"
-      success: "Successfully disconnected from %{name}"
     few: "%{count} contacts"
     many: "%{count} contacts"
     one: "1 contact"
     other: "%{count} contacts"
-    share_with_pane: 
-      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"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 787974e14e0612332cbb208ad8547c7a91a6ae8d..25cd2082ea0780528a7631cc1b2f11df98496749 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -42,6 +42,14 @@ nb:
         unknown: "Ukjent Videotittel"
   are_you_sure: "Er du sikker?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Kunne ikke fjerne person fra aspekt"
       no_membership: "Kunne ikke finne personen i det aspektet"
@@ -130,27 +138,12 @@ 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: 
-      failure: "Kunne ikke koble fra %{name}"
-      success: "Vellykket koblet fra %{name}"
     few: "%{count} kontakter"
     many: "%{count} kontakter"
     one: "1 kontakt"
     other: "%{count} kontakter"
-    share_with_pane: 
-      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"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index d5feca103df46dd6edb74f7b377232f318f9aca0..f2bd43b2e38b3d6f8389362416064728d804f401 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -42,6 +42,14 @@ nl:
         unknown: "Onbekende Videotitel"
   are_you_sure: "Weet je het zeker?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Persoon verwijderen van aspect mislukt"
       no_membership: "Kon de geselecteerde persoon niet vinden in dat aspect"
@@ -130,27 +138,12 @@ nl:
     other: "%{count} reacties"
     zero: "geen reacties"
   contacts: 
-    aspect_dropdown: 
-      add_to_aspect: "Voeg toe aan aspect"
-      toggle: 
-        few: "In %{count} aspecten"
-        many: "In %{count} aspecten"
-        one: "In %{count} aspect"
-        other: "In %{count} aspecten"
-        zero: "Voeg toe aan aspect"
     create: 
       failure: "Verbinding maken mislukt"
-    destroy: 
-      failure: "Verbinding met %{name} verbreken mislukt"
-      success: "Verbinding met %{name} succesvol verbroken"
     few: "%{count} contacten"
     many: "%{count} contacten"
     one: "1 contact"
     other: "%{count} contacten"
-    share_with_pane: 
-      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: "Mensen die met jou delen:"
     zero: "geen contacten"
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index 2473e2602e015f8c53dfdae760e0b37f48de611b..03e016b95cfaacfa5afc6b936161963023df9eeb 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -42,6 +42,14 @@ pa:
         unknown: "Unknown Video Title"
   are_you_sure: "ਕੀ ਤੁਸੀਂ ਚਾਹੁੰਦੇ ਹੋ?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Failed to remove person from aspect"
       no_membership: "Could not find the selected person in that aspect"
@@ -130,27 +138,12 @@ 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: 
-      failure: "Failed to disconnect from %{name}"
-      success: "Successfully disconnected from %{name}"
     few: "%{count} contacts"
     many: "%{count} contacts"
     one: "1 ਸੰਪਰਕ"
     other: "%{count} ਸੰਪਰਕ"
-    share_with_pane: 
-      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: "ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index b87ba73745f593c705159204e1b3e21008639dba..4e33c2765368ad3c64c6cc27a3c787cee1969658 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -42,6 +42,14 @@ pl:
         unknown: "Wideo bez nazwy"
   are_you_sure: "Na pewno?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Nie udało się usunąć osoby z aspektu"
       no_membership: "Nie udało się odnaleźć wskazanej osoby w tym aspekcie"
@@ -98,8 +106,8 @@ pl:
       failure: "nie zadziałało %{inspect}"
       success: "Osoba przeniesiona do nowego aspektu"
     new: 
-      create: "Create"
-      name: "Name"
+      create: "Stwórz"
+      name: "Nazwa"
     no_posts_message: 
       start_talking: "Nikt jeszcze nic nie powiedział. Rozkręć rozmowę!"
     one: "1 aspekt"
@@ -118,7 +126,7 @@ pl:
     explanation: "%{link} z każdego miejsca dodając ten link do zakładek."
     explanation_link_text: "Publikuj w serwisie Diaspora"
     post_something: "Napisz coÅ› na Diasporze"
-    post_success: "Posted! Closing!"
+    post_success: "Post opublikowany! Zamykam okno!"
   cancel: "Anuluj"
   comments: 
     few: "%{count} komentarze"
@@ -130,27 +138,12 @@ 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: 
-      failure: "Nie udało się odłączyć od %{name}"
-      success: "Pomyślnie odłączono od %{name}"
     few: "%{count} kontakty"
     many: "%{count} kontaktów"
     one: "1 kontakt"
     other: "%{count} kontaktów"
-    share_with_pane: 
-      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"
@@ -316,7 +309,7 @@ pl:
       subject: "Wiadomość od twojego panelu zarządzania Diaspora:"
     started_sharing: 
       sharing: "has started sharing with you!"
-      sign_in: "Sign in here"
+      sign_in: "Zaloguj siÄ™"
       subject: "%{name} has started sharing with you on Diaspora*"
     thanks: "Dzięki,"
   ok: "OK"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 4bdcfbe8b4b55adcbef90b94e910433e1bc5856e..f0890048d0810348d3aa784ae9ff8d22f07f5a6f 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -42,6 +42,14 @@ pt-BR:
         unknown: "Vídeo sem título"
   are_you_sure: "Tem certeza?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Failed to remove person from aspect"
       no_membership: "Could not find the selected person in that aspect"
@@ -130,27 +138,12 @@ 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: 
-      failure: "Failed to disconnect from %{name}"
-      success: "Successfully disconnected from %{name}"
     few: "%{count} contatos"
     many: "%{count} contacts"
     one: "1 contato"
     other: "%{count} contatos"
-    share_with_pane: 
-      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"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index f2e93afd89208d63807e4165518131b6b70019a9..0befc584f63750a3ea5e1f70a7d4a3e088832473 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -42,6 +42,14 @@ pt-PT:
         unknown: "Vídeo com Título Desconhecido"
   are_you_sure: "Tem a certeza?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Erro ao remover a pessoa do aspecto"
       no_membership: "A pessoa seleccionada não foi encontrada neste aspecto"
@@ -130,27 +138,12 @@ pt-PT:
     other: "%{count} comentários"
     zero: "não há comentários"
   contacts: 
-    aspect_dropdown: 
-      add_to_aspect: "Adicionar ao aspecto"
-      toggle: 
-        few: "Em %{count} aspectos"
-        many: "Em %{count} aspectos"
-        one: "Em %{count} aspecto"
-        other: "Em %{count} aspectos"
-        zero: "Adicionar ao aspecto"
     create: 
       failure: "Erro ao criar contacto"
-    destroy: 
-      failure: "Erro ao desligar de %{name}"
-      success: "Desligar de %{name} com sucesso"
     few: "%{count} contactos"
     many: "%{count} contactos"
     one: "1 contacto"
     other: "%{count} contactos"
-    share_with_pane: 
-      add_new_aspect: "adicionar a novo aspecto"
-      following: "Ao colocar %{name} num aspecto, vai começar a enviar e receber publicações deles."
-      share_with: "Começar a partilhar com %{name}"
     sharing: 
       people_sharing: "Pessoas a partilhar consigo:"
     zero: "sem contactos"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 9d48a754e4748a5efea4313f0d95fd2ac4bdd15c..1d6a1ccb3a0e780f06d08b567d8e26be200e832b 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -42,6 +42,14 @@ ro:
         unknown: "Unknown Video Title"
   are_you_sure: "EÅŸti sigur?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Failed to remove person from aspect"
       no_membership: "Could not find the selected person in that aspect"
@@ -130,27 +138,12 @@ 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: 
-      failure: "Failed to disconnect from %{name}"
-      success: "Successfully disconnected from %{name}"
     few: "%{count} contacts"
     many: "%{count} contacts"
     one: "1 contact"
     other: "%{count} contacte"
-    share_with_pane: 
-      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"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 56d93c1d43593ddf06dd4154dd2933da3bcb2b1d..9b91a48441413614aeb4736d83a118be6651bfd2 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -42,6 +42,14 @@ ru:
         unknown: "Неизвестное название видеозаписи"
   are_you_sure: "Вы уверены?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Не удалось удалить человека из аспектов"
       no_membership: "Не удалось найти этого человека в этом аспекте"
@@ -130,27 +138,12 @@ 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: 
-      failure: "Не удалось отсоединить от %{name}"
-      success: "Успешно отключены от %{name}"
     few: "%{count} контакт[-а, -ов]"
     many: "%{count} контакт[-а, -ов]"
     one: "1 контакт"
     other: "%{count} контакт[-а, -ов]"
-    share_with_pane: 
-      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: "ни одного контакта"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 3def6db4abb7d11c43a81c2766821e1e6440e065..cb55fde973b057b64a3ca81b79b37643e15448ea 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -42,6 +42,14 @@ sk:
         unknown: "Neznámy názov videa"
   are_you_sure: "Ste si istý?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Nepodarilo sa odstrániť osobu z hľadiska"
       no_membership: "Could not find the selected person in that aspect"
@@ -130,27 +138,12 @@ 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: 
-      failure: "Failed to disconnect from %{name}"
-      success: "Successfully disconnected from %{name}"
     few: "kontakty (%{count})"
     many: "%{count} contacts"
     one: "1 kontakt"
     other: "kontakty (%{count})"
-    share_with_pane: 
-      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"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index cf6bd54eefce8eca74f775334fbe62920a020cd4..ce2a77d95924c222ca920628db4f7cbcb0641190 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -42,6 +42,14 @@ sl:
         unknown: "Neznani video naslov"
   are_you_sure: "Ste prepričani?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Failed to remove person from aspect"
       no_membership: "Could not find the selected person in that aspect"
@@ -130,27 +138,12 @@ 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: 
-      failure: "Failed to disconnect from %{name}"
-      success: "Successfully disconnected from %{name}"
     few: "Å¡tevilo stikov %{count}"
     many: "%{count} contacts"
     one: "1 stik"
     other: "Å¡tevilo stikov %{count}"
-    share_with_pane: 
-      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"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index cfd8ebbdb98a3d98234554fed2ba6396a776e7b1..9252fb768c2c71a8c47c81b7c8ff6a4be24cefaa 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -42,6 +42,14 @@ sv:
         unknown: "Okänd videotitel"
   are_you_sure: "Är du säker?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Misslyckades med att ta bort personen från aspekten"
       no_membership: "Kunde inte hitta den valda personen i aspekten"
@@ -130,27 +138,12 @@ sv:
     other: "%{count} kommentarer"
     zero: "inga kommentarer"
   contacts: 
-    aspect_dropdown: 
-      add_to_aspect: "Lägg till i aspekt"
-      toggle: 
-        few: "I %{count} aspekter"
-        many: "I %{count} aspekter"
-        one: "I %{count} aspekter"
-        other: "I %{count} aspekter"
-        zero: "Lägg till i aspekter"
     create: 
       failure: "Misslyckades med att skapa kontakt"
-    destroy: 
-      failure: "Misslyckades med att koppla från %{name}"
-      success: "Lyckades koppla från %{name}"
     few: "%{count} kontakter"
     many: "%{count} kontakter"
     one: "1 kontakt"
     other: "%{count} kontakter"
-    share_with_pane: 
-      add_new_aspect: "lägg till på ny aspekt"
-      following: "Genom att placera %{name} i en aspekt, kommer du börja följa och skicka inlägg till dem."
-      share_with: "Börja dela med %{name}"
     sharing: 
       people_sharing: "Personer delar med dig:"
     zero: "inga kontakter"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 7f798ed580e0480b675c4df510cb0024c2af9e66..73cdeb3ee211e3e3b09cec7927134a18651301ed 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -42,6 +42,14 @@ tr:
         unknown: "Unknown Video Title"
   are_you_sure: "Are you sure?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "Failed to remove person from aspect"
       no_membership: "Could not find the selected person in that aspect"
@@ -130,27 +138,12 @@ 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: 
-      failure: "Failed to disconnect from %{name}"
-      success: "Successfully disconnected from %{name}"
     few: "%{count} kiÅŸi"
     many: "%{count} contacts"
     one: "1 kiÅŸi"
     other: "%{count} kiÅŸi"
-    share_with_pane: 
-      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"
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index 5b3c1122f6591eb839fcfaeedfbcbd7e1fc4af8c..5d51831f88bc2d97bc4ef349054fd426dc1cb032 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -42,6 +42,14 @@ zh-CN:
         unknown: "未知影片标题"
   are_you_sure: "你确定吗？"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "从分类中移除好友失败"
       no_membership: "在分类中找不到选择的好友"
@@ -130,27 +138,12 @@ 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: 
-      failure: "与 %{name} 取消好友关系失败"
-      success: "与 %{name} 取消好友关系成功"
     few: "%{count}个好友"
     many: "%{count}个好友"
     one: "1个好友"
     other: "%{count}个好友"
-    share_with_pane: 
-      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: "没有好友"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index a18db332dfd5014ba68ea9d65a37eb5c81a18bd8..1bbde05f17da2490b0a18eb33676ccaa95ea403e 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -42,6 +42,14 @@ zh-TW:
         unknown: "影片標題不明"
   are_you_sure: "你確定嗎?"
   aspect_memberships: 
+    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"
     destroy: 
       failure: "從面向中移除聯絡人失敗"
       no_membership: "在面向中找不到選擇的聯絡人"
@@ -130,27 +138,12 @@ 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: 
-      failure: "跟 %{name} 切斷聯繫失敗"
-      success: "成功切斷與 %{name} 的聯繫"
     few: "%{count}個聯繫"
     many: "%{count}個聯繫"
     one: "1個聯繫"
     other: "%{count}個聯繫"
-    share_with_pane: 
-      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: "沒有任何聯繫"
diff --git a/config/locales/javascript/javascript.cs.yml b/config/locales/javascript/javascript.cs.yml
index 043cabcebac7078c68f750b097ddb3bd42857e04..7aa0ad97cdd58eac53dffac80321aaf2a4de791a 100644
--- a/config/locales/javascript/javascript.cs.yml
+++ b/config/locales/javascript/javascript.cs.yml
@@ -14,8 +14,8 @@ cs:
         other: "Ve {{count}} aspektech"
         zero: "Přidat do aspektu"
     comments: 
-      hide: "hide comments"
-      show: "show all comments"
+      hide: "skrýt komentáře"
+      show: "zobrazit všechny komentáře"
     confirm_dialog: "Jste si jisti?"
     failed_to_like: "Oblíbení se nezdařilo!"
     failed_to_post_message: "Odeslání příspěvku se nezdařilo!"
diff --git a/config/locales/javascript/javascript.it.yml b/config/locales/javascript/javascript.it.yml
index 51cc70e0b8083a8798ff3bfb40ef8206fb8ece5c..0a9bf78ba577011f816f67d2da8f5517074d400d 100644
--- a/config/locales/javascript/javascript.it.yml
+++ b/config/locales/javascript/javascript.it.yml
@@ -14,8 +14,8 @@ it:
         other: "In {{count}} aspetti"
         zero: "Aggiungi ad un aspetto"
     comments: 
-      hide: "hide comments"
-      show: "show all comments"
+      hide: "nascondi i commenti"
+      show: "mostra tutti i commenti"
     confirm_dialog: "Sei sicuro?"
     failed_to_like: "Valutazione fallita!"
     failed_to_post_message: "Invio messaggio fallito!"