diff --git a/config/locales/devise/devise.bg.yml b/config/locales/devise/devise.bg.yml
index 648db692a..e236d6fa3 100644
--- a/config/locales/devise/devise.bg.yml
+++ b/config/locales/devise/devise.bg.yml
@@ -84,7 +84,7 @@ bg:
         sign_up: "Регистриране"
         sign_up_closed: "За сега регистрациите не са възможни."
       mail_signup_form: 
-        sign_up_for_an_invite: "Запишете се за покана!"
+        sign_up_for_an_invite: "Резервирайте си покана!"
     unlocks: 
       new: 
         resend_unlock: "Повторно изпращане на инструкциите за отключване"
diff --git a/config/locales/devise/devise.en_shaw.yml b/config/locales/devise/devise.en_shaw.yml
index f1108fe63..9db2ed2c6 100644
--- a/config/locales/devise/devise.en_shaw.yml
+++ b/config/locales/devise/devise.en_shaw.yml
@@ -29,10 +29,10 @@ en_shaw:
         you_can_confirm: "𐑿 𐑒𐑨𐑯 𐑒𐑩𐑯𐑓𐑻𐑥 𐑿𐑼 𐑩𐑒𐑬𐑯𐑑 𐑔𐑮𐑵 𐑞 𐑤𐑦𐑙𐑒 𐑚𐑦𐑤𐑴:"
       hello: "𐑣𐑧𐑤𐑴 %{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: "𐑩𐑒𐑕𐑧𐑐𐑑 𐑦𐑯𐑝𐑦𐑑𐑱𐑖𐑩𐑯"
+        ignore: "𐑦𐑓 𐑿 𐑛𐑴𐑯𐑑 𐑢𐑳𐑯𐑑 𐑑 𐑩𐑒𐑕𐑧𐑐𐑑 𐑞 𐑦𐑯𐑝𐑦𐑑𐑱𐑖𐑩𐑯, 𐑐𐑤𐑰𐑟 𐑦𐑜𐑯𐑹 𐑞𐑦𐑕 𐑦-𐑥𐑱𐑤."
+        no_account_till: "𐑿𐑼 𐑩𐑒𐑬𐑯𐑑 𐑢𐑴𐑯𐑑 𐑚𐑰 𐑒𐑮𐑦𐑱𐑑𐑩𐑛 𐑩𐑯𐑑𐑦𐑤 𐑿 𐑨𐑒𐑕𐑧𐑕 𐑞 𐑤𐑦𐑙𐑒 𐑩𐑚𐑳𐑝 𐑯 𐑕𐑲𐑯 𐑳𐑐."
+        subject: "𐑿𐑝 𐑚𐑧𐑯 𐑦𐑯𐑝𐑲𐑑𐑩𐑛 𐑑 𐑡𐑶𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩!"
       inviters: 
         accept_at: ", 𐑨𐑑 %{url}, 𐑿 𐑒𐑨𐑯 𐑩𐑒𐑕𐑧𐑐𐑑 𐑦𐑑 𐑔𐑮𐑵 𐑔 𐑤𐑦𐑙𐑒 𐑚𐑦𐑤𐑴."
         has_invited_you: "%{name} 𐑣𐑨𐑟 𐑦𐑥𐑝𐑲𐑑𐑩𐑛 𐑿 𐑑 𐑡𐑶𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩"
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index ca0fe7fa3..f45ef6186 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -89,6 +89,10 @@ ar:
       aspect_not_empty: "الفئة ليست فارغة"
       remove: "حذف"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "هذا وسيط دياسبرا. مثل البريد الالكتروني, يمكنك منحه للأصدقاء حتى تستطيع التواصل معهم"
       no_contacts: "لا أعضاء"
       people_sharing_with_you: "أعضاء يتشاركون معك"
@@ -125,6 +129,7 @@ ar:
   bookmarklet: 
     explanation: "%{link} من أي مكان بحفظ هذا الرابط في المفضلة"
     explanation_link_text: "انشر على دياسبرا"
+    heading: "Diaspora Bookmarklet"
     post_something: "انشر شيئا على دياسبرا"
     post_success: "تم النشر, إغلاق"
   cancel: "إلغاء"
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index aa006805c..6e5e18356 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -89,6 +89,10 @@ bg:
       aspect_not_empty: "Аспектът не е празен"
       remove: "премахване"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es е първото приложение за Diaspora и все още се разработва."
+        heading: "Свързване с Cubbi.es"
+        learn_more: "Научете повече"
       handle_explanation: "Това е вашият адрес в Diaspora. Наподобява адрес на ел. поща - давате го на хора, за да се свържат с вас."
       no_contacts: "Няма контакти"
       people_sharing_with_you: "Хора споделящи с вас"
@@ -125,6 +129,7 @@ bg:
   bookmarklet: 
     explanation: "Публикувайте в Diaspora от където и да е, запаметявайки %{link} като отметка."
     explanation_link_text: "тази връзка"
+    heading: "Diaspora Bookmarklet"
     post_something: "Публикуване в Diaspora"
     post_success: "Публикувано!"
   cancel: "Отказ"
@@ -190,11 +195,11 @@ bg:
     show: 
       already_account: "вече имате акаунт?"
       choice: "Избор"
-      choice_explanation: "Diaspora предоставя възможност за сортиране на контактите в групи наречени аспекти. Те са уникална функция, която позволява споделянето на снимки, истории и шеги само с хората, за които са предвидени."
+      choice_explanation: "Diaspora предоставя възможност за сортиране на контактите в групи, наречени аспекти. Уникални за Diaspora, те позволяват споделянето на снимки, истории и шеги само с хората, за които са предвидени.\n"
       learn_about_host: "Научете как да стартирате Diaspora на собствен сървър."
       login_here: "впишете се от тук"
       ownership: "Собственост"
-      ownership_explanation: "Вие притежавате снимките си и не е необходимо да се отказвате от това си право само за да ги споделите. Вие запазвате собствеността си върху всичко споделено в Diaspora - това ви осигурява контрол над разпространението."
+      ownership_explanation: "Вие притежавате снимките си и не е необходимо да се отказвате от това си право само за да ги споделите. Запазвате собсвеност върху всичко, което споделяте в Diaspora и контролирате разпространението."
       share_what_you_want: "Споделяйте каквото желаете, с когото пожелаете."
       simplicity: "Леснота"
       simplicity_explanation: "Споделянето чрез Diaspora е просто и лесно. Характерно за Diaspora е, че запазва личния ви живот поверителен без нужда от настройване на различни страници с безброй опции."
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index 2ebba0312..665efcac9 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -89,6 +89,10 @@ br:
       aspect_not_empty: "Aspect not empty"
       remove: "skarzhañ"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       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"
@@ -125,6 +129,7 @@ br:
   bookmarklet: 
     explanation: "%{link} adalek pep lec'h dre lakaat al liamm-se e-barzh ho sinedoù."
     explanation_link_text: "Embann e-barzh Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Embann un dra bennak e-barzh Diaspora"
     post_success: "Embannet! O serriñ!"
   cancel: "Nullañ"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index d9e794678..9863746e1 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -89,6 +89,10 @@ cs:
       aspect_not_empty: "Aspekt není prázdný"
       remove: "odebrat"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       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í"
@@ -125,6 +129,7 @@ cs:
   bookmarklet: 
     explanation: "Přidat na Diaspora odkudkoliv do záložek %{link}."
     explanation_link_text: "tento odkaz"
+    heading: "Diaspora Bookmarklet"
     post_something: "Poslat něco na Diasporu"
     post_success: "Odesláno! Zavírám!"
   cancel: "Zrušit"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 06912feca..2164a8212 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -89,6 +89,10 @@ cy:
       aspect_not_empty: "Aspect not empty"
       remove: "remove"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       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"
@@ -125,6 +129,7 @@ cy:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "Cancel"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 14a10dca2..12111f368 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -89,6 +89,10 @@ da:
       aspect_not_empty: "Aspektet er ikke tomt"
       remove: "slet"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       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: "Personer der deler med dig"
@@ -125,6 +129,7 @@ da:
   bookmarklet: 
     explanation: "%{link} alle steder fra ved at bogmærke dette link."
     explanation_link_text: "Post på Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post noget til Diaspora"
     post_success: "Posted! Lukker!"
   cancel: "Annullér"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 6a1732b27..4564b8254 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -89,6 +89,10 @@ de:
       aspect_not_empty: "Aspekt ist nicht leer"
       remove: "entfernen"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es ist die erste Diaspora Anwendung."
+        heading: "Mit Cubbi.es verbinden"
+        learn_more: "Mehr erfahren"
       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"
@@ -125,6 +129,7 @@ de:
   bookmarklet: 
     explanation: "Erstelle einen Beitrag in Diaspora von überall in dem du %{link} als Lesezeichen speicherst."
     explanation_link_text: "diesen Link"
+    heading: "Diaspora Bookmarklet"
     post_something: "Erstelle einen Beitrag in Diaspora"
     post_success: "Erstellt! Schließen…"
   cancel: "Abbrechen"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index c9be55e9c..8a6962263 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -89,6 +89,10 @@ el:
       aspect_not_empty: "Η πτυχή δεν είναι άδεια"
       remove: "αφαίρεση"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "Αυτό είναι το αναγνωριστικό σας στο Diaspora. Όπως και με μια διεύθυνση ηλεκτρονικού ταχυδρομείου, μπορείτε να το δώσετε σε άλλους για να μπορέσουν να σας βρουν."
       no_contacts: "Καμία επαφή"
       people_sharing_with_you: "Άτομα που μοιράζονται μαζί σας"
@@ -125,6 +129,7 @@ el:
   bookmarklet: 
     explanation: "Δημοσιεύστε στο Diaspora από οπουδήποτε προσθέτοντας αυτόν τον σύνδεσμο %{link}."
     explanation_link_text: "αυτός ο σύνδεσμος"
+    heading: "Diaspora Bookmarklet"
     post_something: "Δημοσιεύστε κάτι στο Diaspora"
     post_success: "Δημοσιεύτηκε! Κλείνει!"
   cancel: "Ακύρωση"
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index f5acd7463..bcfc737bb 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -36,20 +36,20 @@ en_shaw:
   all_aspects: "𐑷𐑤 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
   application: 
     helper: 
-      diaspora_alpha: "DIASPORA* ALPHA"
+      diaspora_alpha: "·𐑛𐑦𐑨𐑕𐑐𐑹𐑩* 𐑨𐑤𐑓𐑩"
       unknown_person: "𐑩𐑯𐑯𐑴𐑯 𐑐𐑻𐑕𐑩𐑯"
       video_title: 
         unknown: "𐑩𐑯𐑯𐑴𐑯 𐑝𐑦𐑛𐑦𐑴 𐑑𐑲𐑑𐑩𐑤"
   are_you_sure: "𐑸 𐑿 𐑖𐑻?"
   aspect_memberships: 
     aspect_dropdown: 
-      add_to_aspect: "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"
+        few: "𐑦𐑯 %{count} 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
+        many: "𐑦𐑯 %{count} 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
+        one: "𐑦𐑯 %{count} 𐑨𐑕𐑐𐑧𐑒𐑑"
+        other: "𐑦𐑯 %{count} 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
+        zero: "𐑨𐑛 𐑑 𐑨𐑕𐑐𐑧𐑒𐑑"
     destroy: 
       failure: "𐑓𐑱𐑤𐑛 𐑑 𐑮𐑦𐑥𐑵𐑝 𐑐𐑻𐑕𐑩𐑯 𐑓𐑮𐑪𐑥 𐑨𐑕𐑐𐑧𐑒𐑑"
       no_membership: "𐑒𐑫𐑛 𐑯𐑪𐑑 𐑓𐑲𐑯𐑛 𐑞 𐑕𐑦𐑤𐑧𐑒𐑑𐑩𐑛 𐑐𐑻𐑕𐑩𐑯 𐑦𐑯 𐑞𐑨𐑑 𐑨𐑕𐑐𐑧𐑒𐑑"
@@ -89,9 +89,13 @@ en_shaw:
       aspect_not_empty: "𐑨𐑕𐑐𐑧𐑒𐑑 𐑯𐑪𐑑 𐑧𐑥𐑐𐑑𐑦"
       remove: "𐑮𐑦𐑥𐑵𐑝"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "𐑞𐑦𐑕 𐑦𐑟 𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑣𐑨𐑯𐑛𐑩𐑤. 𐑤𐑲𐑒 𐑩𐑯 𐑦-𐑥𐑱𐑤 𐑩𐑛𐑮𐑧𐑕, 𐑿 𐑒 𐑜𐑦𐑝 𐑞𐑦𐑕 𐑑 𐑐𐑰𐑐𐑩𐑤 𐑑 𐑮𐑰𐑗 𐑿."
       no_contacts: "𐑯𐑴 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
-      people_sharing_with_you: "People sharing with you"
+      people_sharing_with_you: "𐑐𐑰𐑐𐑩𐑤 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿"
       post_a_message: "𐑐𐑴𐑕𐑑 𐑩 𐑥𐑧𐑕𐑩𐑡 >>"
     manage: 
       add_a_new_aspect: "𐑨𐑛 𐑯𐑿 𐑨𐑕𐑐𐑧𐑒𐑑"
@@ -106,8 +110,8 @@ en_shaw:
       failure: "𐑛𐑦𐑛𐑯𐑑 𐑢𐑻𐑒 %{inspect}"
       success: "𐑐𐑻𐑕𐑩𐑯 𐑥𐑵𐑝𐑛 𐑑 𐑯𐑿 𐑨𐑕𐑐𐑧𐑒𐑑"
     new: 
-      create: "Create"
-      name: "Name"
+      create: "𐑒𐑮𐑦𐑱𐑑"
+      name: "𐑯𐑱𐑥"
     no_posts_message: 
       start_talking: "𐑯𐑴𐑚𐑩𐑛𐑦 𐑣𐑨𐑟 𐑕𐑧𐑛 𐑨𐑯𐑦𐑔𐑦𐑙 𐑘𐑧𐑑.  𐑜𐑧𐑑 𐑞 𐑒𐑪𐑯𐑝𐑼𐑕𐑱𐑖𐑩𐑯 𐑕𐑑𐑸𐑑𐑩𐑛!"
     one: "1 𐑨𐑕𐑐𐑧𐑒𐑑"
@@ -125,6 +129,7 @@ en_shaw:
   bookmarklet: 
     explanation: "%{link} 𐑓𐑮𐑪𐑥 𐑨𐑯𐑦𐑢𐑺 𐑚𐑲 𐑚𐑫𐑒𐑥𐑸𐑒𐑦𐑙 𐑞𐑦𐑕 𐑤𐑦𐑙𐑒."
     explanation_link_text: "𐑐𐑴𐑕𐑑 𐑑 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩"
+    heading: "Diaspora Bookmarklet"
     post_something: "𐑐𐑴𐑕𐑑 𐑕𐑳𐑥𐑔𐑦𐑙 𐑑 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩"
     post_success: "𐑐𐑴𐑕𐑑𐑩𐑛! 𐑒𐑤𐑴𐑟𐑦𐑙!"
   cancel: "𐑒𐑨𐑯𐑕𐑩𐑤"
@@ -145,7 +150,7 @@ en_shaw:
     one: "1 𐑒𐑪𐑯𐑑𐑨𐑒𐑑"
     other: "%{count} 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
     sharing: 
-      people_sharing: "People sharing with you:"
+      people_sharing: "𐑐𐑰𐑐𐑩𐑤 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿:"
     zero: "𐑯𐑴 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
   conversations: 
     create: 
@@ -207,7 +212,7 @@ en_shaw:
       already_contacts: "𐑿 𐑣𐑨𐑝 𐑷𐑤𐑮𐑧𐑛𐑦 𐑒𐑩𐑯𐑧𐑒𐑑𐑩𐑛 𐑢𐑦𐑞 𐑞𐑦𐑕 𐑐𐑻𐑕𐑩𐑯"
       already_sent: "𐑿 𐑷𐑤𐑮𐑧𐑛𐑦 𐑦𐑯𐑝𐑲𐑑𐑩𐑛 𐑞𐑦𐑕 𐑐𐑻𐑕𐑩𐑯."
       no_more: "𐑿 𐑣𐑨𐑝 𐑯𐑴 𐑥𐑹 𐑦𐑯𐑝𐑦𐑑𐑱𐑖𐑩𐑯𐑟."
-      own_address: "You can't send an invitation to your own address."
+      own_address: "𐑿 𐑒𐑨𐑯𐑑 𐑕𐑧𐑯𐑛 𐑩𐑯 𐑦𐑯𐑝𐑦𐑑𐑱𐑖𐑩𐑯 𐑑 𐑿𐑼 𐑴𐑯 𐑩𐑛𐑮𐑧𐑕."
       rejected: "𐑞 𐑓𐑪𐑤𐑴𐑦𐑙 𐑦-𐑥𐑱𐑤 𐑩𐑛𐑮𐑧𐑕 𐑣𐑨𐑛 𐑐𐑮𐑪𐑚𐑤𐑩𐑥𐑟: "
       sent: "𐑦𐑯𐑝𐑦𐑑𐑱𐑖𐑩𐑯𐑟 𐑣𐑨𐑝 𐑚𐑧𐑯 𐑕𐑧𐑯𐑑 𐑑: "
     edit: 
@@ -232,7 +237,7 @@ en_shaw:
       whats_new: "𐑢𐑪𐑑𐑕 𐑯𐑿?"
       your_aspects: "𐑿𐑼 𐑨𐑕𐑒𐑐𐑧𐑒𐑑𐑕"
     header: 
-      admin: "admin"
+      admin: "𐑩𐑛𐑥𐑦𐑯"
       blog: "𐑚𐑤𐑪𐑜"
       code: "𐑒𐑴𐑛"
       login: "𐑤𐑪𐑜 𐑦𐑯"
@@ -258,23 +263,23 @@ en_shaw:
   no_results: "𐑯𐑴 𐑮𐑦𐑟𐑫𐑤𐑑𐑕 𐑓𐑬𐑯𐑛"
   notifications: 
     also_commented: 
-      few: "%{actors} also commented on %{post_author}'s %{post_link}."
-      many: "%{actors} also commented on %{post_author}'s %{post_link}."
-      one: "%{actors} also commented on %{post_author}'s %{post_link}."
-      other: "%{actors} also commented on %{post_author}'s %{post_link}."
-      zero: "%{actors} also commented on %{post_author}'s %{post_link}."
+      few: "%{actors} 𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 %{post_author}𐑟 %{post_link}."
+      many: "%{actors} 𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 %{post_author}𐑟 %{post_link}."
+      one: "%{actors} 𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 %{post_author}𐑟 %{post_link}."
+      other: "%{actors} 𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 %{post_author}𐑟 %{post_link}."
+      zero: "%{actors} 𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 %{post_author}𐑟 %{post_link}."
     also_commented_deleted: 
-      few: "%{actors} commented on a deleted post."
-      many: "%{actors} commented on a deleted post."
-      one: "%{actors} commented on a deleted post."
-      other: "%{actors} commented on a deleted post."
-      zero: "%{actors} commented on a deleted post."
+      few: "%{actors} 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑩 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
+      many: "%{actors} 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑩 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
+      one: "%{actors} 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑩 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
+      other: "%{actors} 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑩 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
+      zero: "%{actors} 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑩 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
     comment_on_post: 
-      few: "%{actors} commented on your %{post_link}."
-      many: "%{actors} commented on your %{post_link}."
-      one: "%{actors} commented on your %{post_link}."
-      other: "%{actors} commented on your %{post_link}."
-      zero: "%{actors} commented on your %{post_link}."
+      few: "%{actors} 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑿𐑼 %{post_link}."
+      many: "%{actors} 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑿𐑼 %{post_link}."
+      one: "%{actors} 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑿𐑼 %{post_link}."
+      other: "%{actors} 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑿𐑼 %{post_link}."
+      zero: "%{actors} 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑿𐑼 %{post_link}."
     helper: 
       new_notifications: 
         few: "%{count} 𐑯𐑿 𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟"
@@ -285,50 +290,50 @@ en_shaw:
     index: 
       and: "𐑯"
       and_others: 
-        few: "and %{count} others"
-        many: "and %{count} others"
-        one: "and one more"
-        other: "and %{count} others"
-        zero: "and nobody else"
+        few: "𐑯 %{count} 𐑳𐑞𐑼𐑟"
+        many: "𐑯 %{count} 𐑳𐑞𐑼𐑟"
+        one: "𐑯 𐑢𐑳𐑯 𐑥𐑹"
+        other: "𐑯 %{count} 𐑳𐑞𐑼𐑟"
+        zero: "𐑯 𐑯𐑴𐑚𐑩𐑛𐑦 𐑧𐑤𐑕"
       mark_all_as_read: "𐑥𐑸𐑒 𐑷𐑤 𐑨𐑟 𐑮𐑧𐑛"
       notifications: "𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟"
     liked: 
-      few: "%{actors} has just liked your %{post_link}."
-      many: "%{actors} has just liked your %{post_link}."
-      one: "%{actors} has just liked your %{post_link}."
-      other: "%{actors} has just liked your %{post_link}."
-      zero: "%{actors} has just liked your %{post_link}."
+      few: "%{actors} 𐑣𐑨𐑟 𐑡𐑩𐑕𐑑 𐑤𐑲𐑒𐑑 𐑿𐑼 %{post_link}."
+      many: "%{actors} 𐑣𐑨𐑟 𐑡𐑩𐑕𐑑 𐑤𐑲𐑒𐑑 𐑿𐑼 %{post_link}."
+      one: "%{actors} 𐑣𐑨𐑟 𐑡𐑩𐑕𐑑 𐑤𐑲𐑒𐑑 𐑿𐑼 %{post_link}."
+      other: "%{actors} 𐑣𐑨𐑟 𐑡𐑩𐑕𐑑 𐑤𐑲𐑒𐑑 𐑿𐑼 %{post_link}."
+      zero: "%{actors} 𐑣𐑨𐑟 𐑡𐑩𐑕𐑑 𐑤𐑲𐑒𐑑 𐑿𐑼 %{post_link}."
     liked_post_deleted: 
-      few: "%{actors} liked your deleted post."
-      many: "%{actors} liked your deleted post."
-      one: "%{actors} liked your deleted post."
-      other: "%{actors} liked your deleted post."
-      zero: "%{actors} liked your deleted post."
+      few: "%{actors} 𐑤𐑦𐑙𐑒𐑑 𐑑 𐑿𐑼 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
+      many: "%{actors} 𐑤𐑦𐑙𐑒𐑑 𐑿𐑼 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
+      one: "%{actors} 𐑤𐑦𐑙𐑒𐑑 𐑿𐑼 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
+      other: "%{actors} 𐑤𐑦𐑙𐑒𐑑 𐑑 𐑿𐑼 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
+      zero: "%{actors} 𐑤𐑦𐑙𐑒𐑑 𐑑 𐑿𐑼 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
     mentioned: 
-      few: "%{actors} has mentioned you in a %{post_link}."
-      many: "%{actors} has mentioned you in a %{post_link}."
-      one: "%{actors} has mentioned you in a %{post_link}."
-      other: "%{actors} has mentioned you in a %{post_link}."
-      zero: "%{actors} has mentioned you in a %{post_link}."
+      few: "%{actors} 𐑣𐑨𐑟 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩 %{post_link}."
+      many: "%{actors} 𐑣𐑨𐑟 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩 %{post_link}."
+      one: "%{actors} 𐑣𐑨𐑟 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩 %{post_link}."
+      other: "%{actors} 𐑣𐑨𐑟 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩 %{post_link}."
+      zero: "%{actors} 𐑣𐑨𐑟 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩 %{post_link}."
     mentioned_deleted: 
-      few: "%{actors} mentioned you in a deleted post."
-      many: "%{actors} mentioned you in a deleted post."
-      one: "%{actors} mentioned you in a deleted post."
-      other: "%{actors} mentioned you in a deleted post."
-      zero: "%{actors} mentioned you in a deleted post."
+      few: "%{actors} 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
+      many: "%{actors} 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
+      one: "%{actors} 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
+      other: "%{actors} 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
+      zero: "%{actors} 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
     post: "𐑐𐑴𐑕𐑑"
     private_message: 
-      few: "%{actors} sent you a message."
-      many: "%{actors} sent you a message."
-      one: "%{actors} sent you a message."
-      other: "%{actors} sent you a message."
-      zero: "%{actors} sent you a message."
+      few: "%{actors} 𐑕𐑧𐑯𐑑 𐑿 𐑩 𐑥𐑧𐑕𐑩𐑡."
+      many: "%{actors} 𐑕𐑧𐑯𐑑 𐑿 𐑩 𐑥𐑧𐑕𐑩𐑡."
+      one: "%{actors} 𐑕𐑧𐑯𐑑 𐑿 𐑩 𐑥𐑧𐑕𐑩𐑡."
+      other: "%{actors} 𐑕𐑧𐑯𐑑 𐑿 𐑩 𐑥𐑧𐑕𐑩𐑡."
+      zero: "%{actors} 𐑕𐑧𐑯𐑑 𐑿 𐑩 𐑥𐑧𐑕𐑩𐑡."
     started_sharing: 
-      few: "%{actors} started sharing with you."
-      many: "%{actors} started sharing with you."
-      one: "%{actors} started sharing with you."
-      other: "%{actors} started sharing with you."
-      zero: "%{actors} started sharing with you."
+      few: "%{actors} 𐑕𐑑𐑸𐑑𐑩𐑛 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿."
+      many: "%{actors} 𐑕𐑑𐑸𐑑𐑩𐑛 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿."
+      one: "%{actors} 𐑕𐑑𐑸𐑑𐑩𐑛 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿."
+      other: "%{actors} 𐑕𐑑𐑸𐑑𐑩𐑛 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿."
+      zero: "%{actors} 𐑕𐑑𐑸𐑑𐑩𐑛 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿."
   notifier: 
     also_commented: 
       commented: "𐑣𐑨𐑟 𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 %{post_author}𐑟 𐑐𐑴𐑕𐑑:"
@@ -341,9 +346,9 @@ en_shaw:
     diaspora: "𐑞 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑦-𐑥𐑱𐑤 𐑮𐑴𐑚𐑪𐑑"
     hello: "𐑣𐑧𐑤𐑴 %{name}!"
     liked: 
-      liked: "%{name} has just liked your post: "
+      liked: "%{name} 𐑣𐑨𐑟 𐑡𐑳𐑕𐑑 𐑤𐑲𐑒𐑑 𐑿𐑼 𐑐𐑴𐑕𐑑: "
       sign_in: "Sign to view it"
-      subject: "%{name} has just liked your post"
+      subject: "%{name} 𐑣𐑨𐑟 𐑡𐑳𐑕𐑑 𐑤𐑲𐑒𐑑 𐑿𐑼 𐑐𐑴𐑕𐑑"
     love: "𐑤𐑳𐑝,"
     manage_your_email_settings: "𐑥𐑨𐑯𐑩𐑡 𐑿𐑼 𐑦-𐑥𐑱𐑤 𐑕𐑧𐑑𐑦𐑙𐑟"
     mentioned: 
@@ -359,9 +364,9 @@ en_shaw:
       admin: "𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑨𐑛𐑥𐑦𐑯𐑦𐑕𐑑𐑮𐑱𐑑𐑼"
       subject: "𐑩 𐑥𐑧𐑕𐑩𐑡 𐑑 𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑩𐑒𐑬𐑯𐑑:"
     started_sharing: 
-      sharing: "has started sharing with you!"
-      sign_in: "Sign in here"
-      subject: "%{name} has started sharing with you on Diaspora*"
+      sharing: "𐑣𐑨𐑟 𐑕𐑑𐑸𐑑𐑩𐑛 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿!"
+      sign_in: "𐑕𐑲𐑯 𐑦𐑯 𐑣𐑽"
+      subject: "%{name} 𐑣𐑨𐑟 𐑕𐑑𐑸𐑑𐑩𐑛 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑪𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩*"
     thanks: "𐑔𐑱𐑙𐑒𐑕,"
   ok: "𐑴𐑒𐑱"
   or: "𐑹"
@@ -594,8 +599,8 @@ en_shaw:
     stream_element: 
       dislike: "𐑲 𐑛𐑦𐑕𐑤𐑲𐑒 𐑞𐑦𐑕"
       like: "𐑲 𐑤𐑲𐑒 𐑞𐑦𐑕"
-      unlike: "Unlike"
-      via: "via %{link}"
+      unlike: "𐑩𐑯𐑤𐑲𐑒"
+      via: "𐑝𐑾 %{link}"
   status_messages: 
     create: 
       success: "𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑥𐑧𐑯𐑖𐑩𐑯𐑛: %{names}"
@@ -610,11 +615,11 @@ en_shaw:
       not_found: "𐑕𐑪𐑮𐑦, 𐑢𐑰 𐑒𐑫𐑛𐑩𐑯𐑑 𐑓𐑲𐑯𐑛 𐑞𐑨𐑑 𐑐𐑴𐑕𐑑."
       permalink: "𐑐𐑻𐑥𐑩𐑤𐑦𐑙𐑒"
     too_long: 
-      few: "please make your status messages less than %{count} characters"
-      many: "please make your status messages less than %{count} characters"
-      one: "please make your status messages less than %{count} character"
-      other: "please make your status messages less than %{count} characters"
-      zero: "please make your status messages less than %{count} characters"
+      few: "𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼𐑟"
+      many: "𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼𐑟"
+      one: "𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼"
+      other: "𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼𐑟"
+      zero: "𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼𐑟"
   stream_helper: 
     hide_comments: "𐑣𐑲𐑛 𐑒𐑪𐑥𐑩𐑯𐑑𐑕"
     show_comments: "𐑖𐑴 𐑷𐑤 𐑒𐑪𐑥𐑩𐑯𐑑𐑕"
@@ -626,20 +631,20 @@ en_shaw:
   the_world: "𐑞 𐑢𐑻𐑤𐑛"
   tokens: 
     show: 
-      connect_to_cubbies: "Connect to Cubbi.es"
+      connect_to_cubbies: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑑 Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
-      daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Generate a token"
+      daniels_account: "·𐑛𐑨𐑯𐑘𐑩𐑤𐑟 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑩𐑒𐑬𐑯𐑑"
+      generate_a_token: "𐑡𐑧𐑯𐑼𐑱𐑑 𐑩 𐑑𐑴𐑒𐑩𐑯"
       love_to_try: "We'd love for you to try it out."
-      making_the_connection: "Making the Connection"
-      screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
-      sign_up_today: "Sign up today!"
-      typical_userpage: "A typical cubbi.es userpage"
-      via: "(via %{link})"
-      were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
-      what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
+      making_the_connection: "𐑥𐑱𐑒𐑦𐑙 𐑞 𐑒𐑩𐑯𐑧𐑒𐑖𐑩𐑯"
+      screenshot_explanation: "%{link1}.  𐑞𐑦𐑕 𐑐𐑼𐑑𐑦𐑒𐑿𐑤𐑼 𐑒𐑩𐑚𐑦 𐑦𐑟 𐑤𐑦𐑙𐑒𐑑 𐑑 %{link2}."
+      sign_up_today: "𐑕𐑲𐑯 𐑳𐑐 𐑑𐑩𐑛𐑱!"
+      typical_userpage: "𐑩 𐑑𐑦𐑐𐑦𐑒𐑩𐑤 cubbi.es 𐑿𐑟𐑼𐑐𐑱𐑡"
+      via: "(𐑝𐑾 %{link})"
+      were_working_hard: "𐑢𐑺 𐑢𐑻𐑒𐑦𐑙 𐑣𐑸𐑛 𐑪𐑯 𐑛𐑦𐑤𐑦𐑝𐑼𐑦𐑙 𐑰𐑟𐑦 𐑒𐑩𐑯𐑧𐑒𐑑𐑦𐑝𐑦𐑑𐑦 𐑚𐑦𐑑𐑢𐑰𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑐𐑪𐑛𐑟 𐑯 𐑨𐑐𐑤𐑦𐑒𐑱𐑖𐑩𐑯𐑟.  𐑦𐑯 𐑞 𐑥𐑰𐑯𐑑𐑲𐑥, 𐑒𐑩𐑯𐑧𐑒𐑑𐑦𐑙 𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑩𐑒𐑬𐑯𐑑 𐑢𐑦𐑞 Cubbi.es 𐑥𐑰𐑯𐑟 𐑒𐑪𐑐𐑦𐑦𐑙 𐑯 𐑐𐑱𐑕𐑑𐑦𐑙 𐑑𐑵 𐑓𐑰𐑤𐑛𐑟."
+      what_is_cubbies: "Cubbi.es 𐑦𐑟 𐑞 𐑢𐑻𐑤𐑛𐑟 𐑓𐑻𐑕𐑑 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑨𐑐𐑤𐑦𐑒𐑱𐑖𐑩𐑯.  𐑦𐑑𐑕 𐑷𐑤𐑕𐑴 𐑞 𐑚𐑧𐑕𐑑 𐑢𐑱 𐑑 𐑒𐑩𐑤𐑧𐑒𐑑 𐑓𐑴𐑑𐑴𐑟 𐑪𐑯𐑤𐑲𐑯."
+      your_diaspora_handle: "𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑣𐑨𐑯𐑛𐑩𐑤:"
+      your_diaspora_token: "𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑑𐑴𐑒𐑩𐑯:"
   undo: "𐑩𐑯𐑛𐑵?"
   username: "𐑿𐑟𐑼𐑯𐑱𐑥"
   users: 
@@ -656,12 +661,12 @@ en_shaw:
       download_xml: "𐑛𐑬𐑯𐑤𐑴𐑛 𐑥𐑲 𐑧.𐑥.𐑤."
       edit_account: "𐑧𐑛𐑦𐑑 𐑩𐑒𐑬𐑯𐑑"
       export_data: "𐑧𐑒𐑕𐑐𐑹𐑑 𐑛𐑱𐑑𐑩"
-      liked: "...someone likes your post?"
+      liked: "...𐑕𐑳𐑥𐑢𐑩𐑯 𐑤𐑲𐑒𐑕 𐑿𐑼 𐑐𐑴𐑕𐑑?"
       mentioned: "...𐑿 𐑸 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑦𐑯 𐑩 𐑐𐑴𐑕𐑑?"
       new_password: "𐑯𐑿 𐑐𐑨𐑕𐑢𐑼𐑛"
       private_message: "...𐑿 𐑮𐑦𐑕𐑰𐑝 𐑩 𐑐𐑮𐑲𐑝𐑩𐑑 𐑥𐑧𐑕𐑩𐑡?"
       receive_email_notifications: "𐑮𐑦𐑕𐑰𐑝 𐑦-𐑥𐑱𐑤 𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟 𐑢𐑧𐑯..."
-      started_sharing: "...someone starts sharing with you?"
+      started_sharing: "...𐑕𐑳𐑥𐑢𐑩𐑯 𐑕𐑑𐑸𐑑𐑕 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿?"
       your_email: "𐑿𐑼 𐑦-𐑥𐑱𐑤"
       your_handle: "𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑣𐑨𐑯𐑛𐑩𐑤"
     getting_started: 
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index d9d905d39..f9109ad8b 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -89,6 +89,10 @@ eo:
       aspect_not_empty: "Aspekto ne malplenas"
       remove: "forigi"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       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"
@@ -125,6 +129,7 @@ eo:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "Cancel"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index aeabcba06..ced00ee14 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -89,6 +89,10 @@ es-CL:
       aspect_not_empty: "El aspecto no está vacío"
       remove: "eliminar"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es es la primera aplicación de Diaspora en desarrollo."
+        heading: "Conectate a Cubbi.es"
+        learn_more: "Aprende mas"
       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: "Personas compartiendo contigo"
@@ -125,6 +129,7 @@ es-CL:
   bookmarklet: 
     explanation: "%{link} donde sea agregando a marcadores este link."
     explanation_link_text: "Postea en Diaspora"
+    heading: "Diaspora en tus marcadores"
     post_something: "Postea algo en Diaspora"
     post_success: "Posteado! Cerrando!"
   cancel: "Cancelar"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index fa3efd084..fd5c94d49 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -89,6 +89,10 @@ es:
       aspect_not_empty: "El aspecto no está vacío"
       remove: "eliminar"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es es la primera aplicación de Diaspora en desarrollo."
+        heading: "Conectate a Cubbi.es"
+        learn_more: "Aprende mas"
       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: "Comparten contigo"
@@ -125,6 +129,7 @@ es:
   bookmarklet: 
     explanation: "%{link} desde donde quieras agregando a tus marcadores este enlace."
     explanation_link_text: "Publica en Diaspora"
+    heading: "Diaspora en tus marcadores"
     post_something: "Publica algo en Diaspora"
     post_success: "Publicado! Cerrando!"
   cancel: "Cancelar"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index fcac46c19..8f37e015f 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -89,6 +89,10 @@ eu:
       aspect_not_empty: "Alderdi ez hutsa"
       remove: "ezabatu"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es garapenean dagoen lehenengo Diaspora aplikazioa da."
+        heading: "Cubbi.esera lotu"
+        learn_more: "Gehiago ikasi"
       handle_explanation: "Hau da zure Diaspora helbidea. Zure adiskideei emaiezu zu aurkitzearren."
       no_contacts: "Adiskiderik ez"
       people_sharing_with_you: "Zurekin harremanetan dagoen jendea"
@@ -125,6 +129,7 @@ eu:
   bookmarklet: 
     explanation: "Diasporan partekatu %{link} erabiliz."
     explanation_link_text: "esteka hau"
+    heading: "Diaspora Bookmarkleta"
     post_something: "Partekatu zerbait Diasporan"
     post_success: "Bidalia! Irteten!"
   cancel: "Ezeztatu"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index ee8eed053..e8e0adcee 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -89,6 +89,10 @@ fi:
       aspect_not_empty: "Näkymä ei ole tyhjä"
       remove: "poista"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       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: "Ihmiset jotka jakavat kanssasi"
@@ -125,6 +129,7 @@ fi:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "Peruuta"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index f6a0e787d..bdc8415cb 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -89,6 +89,10 @@ fr:
       aspect_not_empty: "L’aspect n’est pas vide"
       remove: "supprimer"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es est la première application Diaspora en cours de développement."
+        heading: "Connectez-vous à Cubbi.es"
+        learn_more: "En savoir plus"
       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: "Personnes partageant avec vous"
@@ -125,6 +129,7 @@ fr:
   bookmarklet: 
     explanation: "Publier sur Diaspora depuis n'importe où en ajoutant %{link} à vos marque-pages."
     explanation_link_text: "ce lien"
+    heading: "Marque-page Diaspora"
     post_something: "Publier quelque chose sur Diaspora"
     post_success: "Publié ! Fermeture !"
   cancel: "Annuler"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index d2318e70c..601b377c6 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -89,6 +89,10 @@ ga:
       aspect_not_empty: "Níl an gné folamh"
       remove: "bhain"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       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"
@@ -125,6 +129,7 @@ ga:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "Cealaigh"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 813fe2fb2..346e2e6dc 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -89,6 +89,10 @@ he:
       aspect_not_empty: "ההיבט אינו ריק"
       remove: "הסרה"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "זהו שם המשתמש שלך בדיאספורה. כמו כתובת דואר אלקטרוני, ניתן לחלוק אותו עם אנשים כדי שיגיעו אליך."
       no_contacts: "אין אנשי קשר"
       people_sharing_with_you: "People sharing with you"
@@ -125,6 +129,7 @@ he:
   bookmarklet: 
     explanation: "%{link} מכל מקום על ידי הוספת קישור זה לסימניות."
     explanation_link_text: "פרסום לדיאספורה"
+    heading: "Diaspora Bookmarklet"
     post_something: "פרסום משהו לתוך דיאספורה"
     post_success: "פורסם! נסגר!"
   cancel: "ביטול"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 22704ee2b..9ba6b6c64 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -89,6 +89,10 @@ hu:
       aspect_not_empty: "A csoport nem üres"
       remove: "eltávolítás"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       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"
@@ -125,6 +129,7 @@ hu:
   bookmarklet: 
     explanation: "Hivatkozz rá: %{link} bárhonnan, azzal, hogy hozzáadod a könyvjelzőkhöz!"
     explanation_link_text: "Posztolás a Diasporára"
+    heading: "Diaspora Bookmarklet"
     post_something: "Írj valamit a Diasporára"
     post_success: "Elküldve! Bezárás!"
   cancel: "Mégsem"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 4a7166b96..3be75816a 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -89,6 +89,10 @@ id:
       aspect_not_empty: "Aspek tidak kosong"
       remove: "hapus"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       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"
@@ -125,6 +129,7 @@ id:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "Cancel"
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index 8e55f9097..af3e5ee81 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -89,6 +89,10 @@ is:
       aspect_not_empty: "Ásýnd er ekki tóm"
       remove: "fjarlægja"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       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"
@@ -125,6 +129,7 @@ is:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "Hætta við"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 3bdb28f12..7883779c6 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -89,6 +89,10 @@ it:
       aspect_not_empty: "Aspetto non vuoto"
       remove: "rimuovi"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       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: "Persone in condivisione con te"
@@ -125,6 +129,7 @@ it:
   bookmarklet: 
     explanation: "Condividi su Diaspora da ovunque aggiungendo come segnalibro %{link}."
     explanation_link_text: "questo link"
+    heading: "Diaspora Bookmarklet"
     post_something: "Pubblica qualcosa su Diaspora"
     post_success: "Inviato! Sta per chiudersi!"
   cancel: "Annulla"
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index 71b255dc7..ef509d899 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -89,6 +89,10 @@ ja:
       aspect_not_empty: "アスペクトは空ではありません。"
       remove: "削除"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "これがあなたのハンドル名です。メールアドレスと同じようにほかの人に教えて、ダイアスポラで連絡を取り合うことができます。"
       no_contacts: "連絡先無し"
       people_sharing_with_you: "People sharing with you"
@@ -125,6 +129,7 @@ ja:
   bookmarklet: 
     explanation: "このリンクをお気に入りに登録すると、どこからでも%{link}できます。"
     explanation_link_text: "ダイアスポラに投稿"
+    heading: "Diaspora Bookmarklet"
     post_something: "ダイアスポラに投稿"
     post_success: "投稿完了！ウィンドウを閉じます。"
   cancel: "取り消す"
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index 7abfec2ef..a929bbf3d 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -89,6 +89,10 @@ ko:
       aspect_not_empty: "애스펙이 비어있지 않습니다"
       remove: "지우기"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es는 개발중인 최초의 디아스포라 어플입니다."
+        heading: "Cubbi.es에 연결하기"
+        learn_more: "자세히 알아보기"
       handle_explanation: "이 디아스포라 핸들은 이메일 주소처럼 남에게 건넬 수 있습니다."
       no_contacts: "컨택 없음"
       people_sharing_with_you: "나와 공유하는 사람들"
@@ -125,6 +129,7 @@ ko:
   bookmarklet: 
     explanation: "%{link} 링크를 북마크로 추가하세요."
     explanation_link_text: "디아스포라에 올리기"
+    heading: "디아스포라 북마크"
     post_something: "디아스포라에 올리기"
     post_success: "올렸습니다! 닫힙니다!"
   cancel: "취소"
@@ -258,11 +263,11 @@ ko:
   no_results: "결과 없음"
   notifications: 
     also_commented: 
-      few: "%{actors}님 등도 %{post_author}님의 %{post_link} 공유물에 댓글을 달았습니다."
-      many: "%{actors}님 등도 %{post_author}님의 %{post_link} 공유물에 댓글을 달았습니다."
-      one: "%{actors}님도 %{post_author}님의 %{post_link} 공유물에 댓글을 달았습니다."
-      other: "%{actors}님 등도 %{post_author}님의 %{post_link} 공유물에 댓글을 달았습니다."
-      zero: "%{actors}님도 %{post_author}님의 %{post_link} 공유물에 댓글을 달았습니다."
+      few: "%{actors}님 등도 %{post_author}님의 %{post_link}에 댓글을 달았습니다."
+      many: "%{actors}님 등도 %{post_author}님의 %{post_link}에 댓글을 달았습니다."
+      one: "%{actors}님도 %{post_author}님의 %{post_link}에 댓글을 달았습니다."
+      other: "%{actors}님 등도 %{post_author}님의 %{post_link}에 댓글을 달았습니다."
+      zero: "%{actors}님도 %{post_author}님의 %{post_link}에 댓글을 달았습니다."
     also_commented_deleted: 
       few: "%{actors}님이 지운 공유물에 댓글을 달았습니다."
       many: "%{actors}님이 내가 지운 공유물을 좋아합니다."
@@ -270,11 +275,11 @@ ko:
       other: "%{actors}님이 지운 공유물에 댓글을 달았습니다."
       zero: "%{actors}님이 지운 공유물에 댓글을 달았습니다."
     comment_on_post: 
-      few: "%{actors}님 등이 내 %{post_link} 공유물에 댓글을 달았습니다."
-      many: "%{actors}님 등이 내 %{post_link} 공유물에 댓글을 달았습니다."
-      one: "%{actors}님 등이 내 %{post_link} 공유물에 댓글을 달았습니다."
-      other: "%{actors}님 등이 내 %{post_link} 공유물에 댓글을 달았습니다."
-      zero: "%{actors}님이 내 %{post_link} 공유물에 댓글을 달았습니다."
+      few: "%{actors}님 등이 내 %{post_link}에 댓글을 달았습니다."
+      many: "%{actors}님 등이 내 %{post_link}에 댓글을 달았습니다."
+      one: "%{actors}님 등이 내 %{post_link}에 댓글을 달았습니다."
+      other: "%{actors}님 등이 내 %{post_link}에 댓글을 달았습니다."
+      zero: "%{actors}님이 내 %{post_link}에 댓글을 달았습니다."
     helper: 
       new_notifications: 
         few: "새 알림 %{count}개"
@@ -305,11 +310,11 @@ ko:
       other: "%{actors}님 등이 내가 지운 공유물을 좋아합니다."
       zero: "%{actors}님이 내가 지운 공유물을 좋아합니다."
     mentioned: 
-      few: "%{actors}님이 %{post_link} 공유물에서 나를 멘션했습니다!"
-      many: "%{actors}님이 %{post_link} 공유물에서 나를 멘션했습니다."
-      one: "%{actors}님이 %{post_link} 공유물에서 나를 멘션했습니다!"
-      other: "%{actors}님이 %{post_link} 공유물에서 나를 멘션했습니다!"
-      zero: "%{actors}님이 %{post_link} 공유물에서 나를 멘션했습니다!"
+      few: "%{actors}님이 %{post_link}에서 나를 멘션했습니다!"
+      many: "%{actors}님이 %{post_link}에서 나를 멘션했습니다."
+      one: "%{actors}님이 %{post_link}에서 나를 멘션했습니다!"
+      other: "%{actors}님이 %{post_link}에서 나를 멘션했습니다!"
+      zero: "%{actors}님이 %{post_link}에서 나를 멘션했습니다!"
     mentioned_deleted: 
       few: "%{actors}님 등이 지워진 공유물에서 나를 멘션했습니다."
       many: "%{actors}님 등이 지워진 공유물에서 나를 멘션했습니다."
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index a2af2ccab..aa9f1cf2f 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -89,6 +89,10 @@ lt:
       aspect_not_empty: "Aspektas netuščias"
       remove: "šalinti"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       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"
@@ -125,6 +129,7 @@ lt:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "Atšaukti"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 74d6552fa..a8f1478ce 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -89,6 +89,10 @@ mk:
       aspect_not_empty: "Аспектот не е празен"
       remove: "одстрани"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "Ова е вашето diaspora корисничко име. Исто како е-маил адреса, можете да го давате на луѓе за да се сврзат со вас."
       no_contacts: "No contacts"
       people_sharing_with_you: "People sharing with you"
@@ -125,6 +129,7 @@ mk:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "Откажи"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 7f666b18c..fae775ed5 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -89,6 +89,10 @@ nb:
       aspect_not_empty: "Aspektet er ikke tomt"
       remove: "fjern"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       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"
@@ -125,6 +129,7 @@ nb:
   bookmarklet: 
     explanation: "%{link} fra hvor som helst ved å bokmerke denne linken."
     explanation_link_text: "Post på Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post noe på Diaspora"
     post_success: "Postet! Lukker!"
   cancel: "Avbryt"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 574cb1472..b3ae3ffa8 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -89,6 +89,10 @@ nl:
       aspect_not_empty: "Aspect niet leeg"
       remove: "verwijderen"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       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: "Mensen die met jou delen"
@@ -125,6 +129,7 @@ nl:
   bookmarklet: 
     explanation: "%{link} vanaf elke locatie door deze link te bookmarken."
     explanation_link_text: "Post naar Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post iets naar Diaspora"
     post_success: "Gepost!"
   cancel: "Annuleren"
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index 19204d78b..356f6eea2 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -89,6 +89,10 @@ pa:
       aspect_not_empty: "Aspect not empty"
       remove: "ਹਟਾਓ"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       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"
@@ -125,6 +129,7 @@ pa:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "ਰੱਦ ਕਰੋ"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index bc76658c0..1cecb31ee 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -89,6 +89,10 @@ pl:
       aspect_not_empty: "Aspekt nie jest pusty"
       remove: "usuń"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       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: "Osoby dzielące się z tobą"
@@ -125,6 +129,7 @@ pl:
   bookmarklet: 
     explanation: "%{link} z każdego miejsca dodając ten link do zakładek."
     explanation_link_text: "Publikuj w serwisie Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Napisz coś na Diasporze"
     post_success: "Post opublikowany! Zamykam okno!"
   cancel: "Anuluj"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index f5f254852..780df4f88 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -89,6 +89,10 @@ pt-BR:
       aspect_not_empty: "Aspecto não está vazio"
       remove: "remover"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       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"
@@ -125,6 +129,7 @@ pt-BR:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "Cancelar"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 4e7f9c221..af225c754 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -89,6 +89,10 @@ pt-PT:
       aspect_not_empty: "Aspecto não vazio"
       remove: "remover"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "Este é o seu endereço do Diaspora. Tal como um endereço de email, pode dá-lo a quem deseja que o contacte."
       no_contacts: "Não há contactos"
       people_sharing_with_you: "Pessoas a partilhar consigo"
@@ -125,6 +129,7 @@ pt-PT:
   bookmarklet: 
     explanation: "Publique no Diaspora de qualquer lado ao adicionar %{link} como marcador."
     explanation_link_text: "esta hiperligação"
+    heading: "Diaspora Bookmarklet"
     post_something: "Publique qualquer coisa no Diaspora"
     post_success: "Publicado! A fechar!"
   cancel: "Cancelar"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 6c3f36eb2..8fda96d5b 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -89,6 +89,10 @@ ro:
       aspect_not_empty: "Aspectul nu este gol"
       remove: "şterge"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       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"
@@ -125,6 +129,7 @@ ro:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "Anulează"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 4928fbde0..7011678cd 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -43,13 +43,13 @@ ru:
   are_you_sure: "Вы уверены?"
   aspect_memberships: 
     aspect_dropdown: 
-      add_to_aspect: "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"
+        few: "В %{count} аспектах"
+        many: "В %{count} аспектах"
+        one: "В %{count} аспектах"
+        other: "В %{count} аспектах"
+        zero: "Добавить к аспектам"
     destroy: 
       failure: "Не удалось удалить человека из аспектов"
       no_membership: "Не удалось найти этого человека в этом аспекте"
@@ -89,6 +89,10 @@ ru:
       aspect_not_empty: "Аспект не пуст"
       remove: "удалить"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es это первая программа по развитию диаспоры."
+        heading: "Подключение к Cubbi.es"
+        learn_more: "Узнать больше"
       handle_explanation: "Это идентификатор вашей Диаспоры. Так же как адрес электронной почты, который вы можете дать людям, для связи с вами."
       no_contacts: "Контакты отсутствуют"
       people_sharing_with_you: "Люди делятса с вами"
@@ -123,8 +127,9 @@ ru:
     zero: "нет аспектов"
   back: "Назад"
   bookmarklet: 
-    explanation: "%{link} из любого места на закладок ссылку."
-    explanation_link_text: "Написать диаспоре"
+    explanation: "Сообщение для диаспоры из любого места %{link}."
+    explanation_link_text: "эта ссылка"
+    heading: "Diaspora Bookmarklet"
     post_something: "Сообщите что-нибудь диаспоре"
     post_success: "Опубликовано! Закрытие!"
   cancel: "Отмена"
@@ -145,7 +150,7 @@ ru:
     one: "1 контакт"
     other: "%{count} контакт[-а, -ов]"
     sharing: 
-      people_sharing: "People sharing with you:"
+      people_sharing: "делятся с вами:"
     zero: "ни одного контакта"
   conversations: 
     create: 
@@ -207,7 +212,7 @@ ru:
       already_contacts: "Вы уже связаны с этим человеком"
       already_sent: "Вы уже пригласили этого человека."
       no_more: "У вас закончились приглашения."
-      own_address: "You can't send an invitation to your own address."
+      own_address: "Вы не можете отправить приглашение на ваш собственный адрес."
       rejected: "Следующие адреса электронной почты имеют проблемы:"
       sent: "Ваши приглашения отправлены:"
     edit: 
@@ -232,7 +237,7 @@ ru:
       whats_new: "Что нового?"
       your_aspects: "Ваши аспекты"
     header: 
-      admin: "admin"
+      admin: "админ"
       blog: "блог"
       code: "код"
       login: "логин"
@@ -258,23 +263,23 @@ ru:
   no_results: "Результатов не найдено"
   notifications: 
     also_commented: 
-      few: "%{actors} also commented on %{post_author}'s %{post_link}."
-      many: "%{actors} also commented on %{post_author}'s %{post_link}."
-      one: "%{actors} also commented on %{post_author}'s %{post_link}."
-      other: "%{actors} also commented on %{post_author}'s %{post_link}."
-      zero: "%{actors} also commented on %{post_author}'s %{post_link}."
+      few: "%{actors} прокомментировали %{post_author}'s %{post_link}."
+      many: "%{actors} прокомментировали %{post_author}'s %{post_link}."
+      one: "%{actors} прокомментировали %{post_author}'s %{post_link}."
+      other: "%{actors} также прокомментировал %{post_author}'s %{post_link}."
+      zero: "%{actors} также прокомментировал %{post_author}'s %{post_link}."
     also_commented_deleted: 
-      few: "%{actors} commented on a deleted post."
-      many: "%{actors} commented on a deleted post."
-      one: "%{actors} commented on a deleted post."
-      other: "%{actors} commented on a deleted post."
-      zero: "%{actors} commented on a deleted post."
+      few: "%{actors} комментировали ваше удаленое сообщение."
+      many: "%{actors} комментировали ваше удаленое сообщение."
+      one: "%{actors} комментировали ваше удаленое сообщение."
+      other: "%{actors} комментировали ваше удаленое сообщение."
+      zero: "%{actors} комментировали ваше удаленое сообщение."
     comment_on_post: 
-      few: "%{actors} commented on your %{post_link}."
-      many: "%{actors} commented on your %{post_link}."
-      one: "%{actors} commented on your %{post_link}."
-      other: "%{actors} commented on your %{post_link}."
-      zero: "%{actors} commented on your %{post_link}."
+      few: "%{actors} комментариев на вас %{post_link}."
+      many: "%{actors} комментариев на вас %{post_link}."
+      one: "%{actors} комментариев на вас %{post_link}."
+      other: "%{actors} комментариев на вас %{post_link}."
+      zero: "%{actors} комментариев на вас %{post_link}."
     helper: 
       new_notifications: 
         few: "%{count} новое[-ых] извещение[-ий]"
@@ -285,50 +290,50 @@ ru:
     index: 
       and: "и"
       and_others: 
-        few: "and %{count} others"
-        many: "and %{count} others"
-        one: "and one more"
-        other: "and %{count} others"
-        zero: "and nobody else"
+        few: "и %{count} другим"
+        many: "и %{count} другим"
+        one: "и еще один"
+        other: "и %{count} другим"
+        zero: "и больше кикому"
       mark_all_as_read: "Отметить все как прочитанные"
       notifications: "Уведомления"
     liked: 
-      few: "%{actors} has just liked your %{post_link}."
-      many: "%{actors} has just liked your %{post_link}."
-      one: "%{actors} has just liked your %{post_link}."
-      other: "%{actors} has just liked your %{post_link}."
-      zero: "%{actors} has just liked your %{post_link}."
+      few: "%{actors} понравилось ваш %{post_link}."
+      many: "%{actors} понравилось ваш %{post_link}."
+      one: "%{actors} понравилось ваш %{post_link}."
+      other: "%{actors} понравилось ваш %{post_link}."
+      zero: "%{actors} понравилось ваш %{post_link}."
     liked_post_deleted: 
-      few: "%{actors} liked your deleted post."
-      many: "%{actors} liked your deleted post."
-      one: "%{actors} liked your deleted post."
-      other: "%{actors} liked your deleted post."
-      zero: "%{actors} liked your deleted post."
+      few: "%{actors} нравилось ваше удаленое сообщение."
+      many: "%{actors} нравилось ваше удаленое сообщение."
+      one: "%{actors} нравилось ваше удаленое сообщение."
+      other: "%{actors} нравилось ваше удаленое сообщение.ost."
+      zero: "%{actors} нравилось ваше удаленое сообщение."
     mentioned: 
-      few: "%{actors} has mentioned you in a %{post_link}."
-      many: "%{actors} has mentioned you in a %{post_link}."
-      one: "%{actors} has mentioned you in a %{post_link}."
-      other: "%{actors} has mentioned you in a %{post_link}."
-      zero: "%{actors} has mentioned you in a %{post_link}."
+      few: "%{actors} упомянули вас в %{post_link}."
+      many: "%{actors} упомянули вас в %{post_link}."
+      one: "%{actors} упомянули вас в %{post_link}."
+      other: "%{actors} упомянули вас в %{post_link}."
+      zero: "%{actors} упомянули вас в %{post_link}."
     mentioned_deleted: 
-      few: "%{actors} mentioned you in a deleted post."
-      many: "%{actors} mentioned you in a deleted post."
-      one: "%{actors} mentioned you in a deleted post."
-      other: "%{actors} mentioned you in a deleted post."
-      zero: "%{actors} mentioned you in a deleted post."
-    post: "сообщение."
+      few: "%{actors} упомянули вас в удаленом сообщение."
+      many: "%{actors} упомянули вас в удаленом сообщение."
+      one: "%{actors} упомянули вас в удаленом сообщение."
+      other: "%{actors} упомянули вас в удаленом сообщение."
+      zero: "%{actors} упомянули вас в удаленом сообщение."
+    post: "сообщение"
     private_message: 
-      few: "%{actors} sent you a message."
-      many: "%{actors} sent you a message."
-      one: "%{actors} sent you a message."
-      other: "%{actors} sent you a message."
-      zero: "%{actors} sent you a message."
+      few: "%{actors} послали вам сообщение."
+      many: "%{actors} послали вам сообщение."
+      one: "%{actors} послали вам сообщение."
+      other: "%{actors} послали Вам сообщение."
+      zero: "%{actors} послали Вам сообщение."
     started_sharing: 
-      few: "%{actors} started sharing with you."
-      many: "%{actors} started sharing with you."
-      one: "%{actors} started sharing with you."
-      other: "%{actors} started sharing with you."
-      zero: "%{actors} started sharing with you."
+      few: "%{actors} начали делиться с вами."
+      many: "%{actors} начали делиться с вами."
+      one: "%{actors} начали делиться с вами."
+      other: "%{actors} начали делиться с вами."
+      zero: "%{actors} начали делиться с вами."
   notifier: 
     also_commented: 
       commented: "также прокомментировал %{post_author} сообщение:\n"
@@ -359,9 +364,9 @@ ru:
       admin: "Ваш администратор Диаспоры"
       subject: "Сообщение о вашем аккаунте Диаспоры:"
     started_sharing: 
-      sharing: "has started sharing with you!"
-      sign_in: "Sign in here"
-      subject: "%{name} has started sharing with you on Diaspora*"
+      sharing: "начал делиться с вами!"
+      sign_in: "Войти сюда"
+      subject: "%{name} начал делиться с вами в диаспоре*"
     thanks: "Спасибо,"
   ok: "Ок"
   or: "или"
@@ -564,7 +569,7 @@ ru:
       by_email: "по электронной почте"
       dont_have_now: "У вас больше нет приглашений, но новые будут уже скоро!"
       from_facebook: "из Facebook"
-      invitations_left: "(осталось %{count})"
+      invitations_left: "%{count} слева"
       invite_someone: "Пригласить кого-нибудь"
       invite_your_friends: "Пригласить своих друзей"
       invites: "Приглашения"
@@ -595,7 +600,7 @@ ru:
       dislike: "Не нравится"
       like: "Нравится"
       unlike: "В отличие от"
-      via: "via %{link}"
+      via: "через %{link}"
   status_messages: 
     create: 
       success: "Успешно упомянут: %{names}"
@@ -610,11 +615,11 @@ ru:
       not_found: "К сожалению мы не смогли найти это сообщение."
       permalink: "постоянная ссылка"
     too_long: 
-      few: "please make your status messages less than %{count} characters"
-      many: "please make your status messages less than %{count} characters"
-      one: "please make your status messages less than %{count} character"
-      other: "please make your status messages less than %{count} characters"
-      zero: "please make your status messages less than %{count} characters"
+      few: "сократите пожалуйста ваше сообщение до %{count} символов"
+      many: "сократите пожалуйста ваше сообщение до %{count} символов"
+      one: "сократите пожалуйста ваше сообщение до %{count} символов"
+      other: "сократите пожалуйста ваше сообщение до %{count} символов"
+      zero: "сократите пожалуйста ваше сообщение до %{count} символов"
   stream_helper: 
     hide_comments: "скрыть комментарии"
     show_comments: "комментарии"
@@ -626,20 +631,20 @@ ru:
   the_world: "мир"
   tokens: 
     show: 
-      connect_to_cubbies: "Connect to Cubbi.es"
-      connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
-      daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Generate a token"
-      love_to_try: "We'd love for you to try it out."
-      making_the_connection: "Making the Connection"
-      screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
-      sign_up_today: "Sign up today!"
-      typical_userpage: "A typical cubbi.es userpage"
+      connect_to_cubbies: "Подключение к Cubbi.es"
+      connecting_is_simple: "Подключение диаспоры так же просто, как заполнить два поля на вашей странице Cubbi.es."
+      daniels_account: "Диаспора-аккаунт Даниила"
+      generate_a_token: "Создание маркера"
+      love_to_try: "Мы будем рады, если вы попробуете это."
+      making_the_connection: "Создание подключения"
+      screenshot_explanation: "%{link1}.  Это особенно связано с %{link2}."
+      sign_up_today: "Зарегистрируйтесь прямо сейчас!"
+      typical_userpage: "Типичная cubbi.es страница"
       via: "(via %{link})"
       were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
-      what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
+      what_is_cubbies: "Cubbi.es первая программа диаспоры. Это также лучший способ коллекции фотографий в Интернете."
+      your_diaspora_handle: "Ваша диаспора Ручка:"
+      your_diaspora_token: "Ваш диаспора Token:"
   undo: "Отменить?"
   username: "Имя пользователя"
   users: 
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 12e1b6210..2ca9db0e8 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -89,6 +89,10 @@ sk:
       aspect_not_empty: "Aspekt nie je prázdny"
       remove: "odstrániť"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       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"
@@ -125,6 +129,7 @@ sk:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "Zrušiť"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 27360f504..c3ee6bd4b 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -89,6 +89,10 @@ sl:
       aspect_not_empty: "Skupina vsebuje stike"
       remove: "odstrani"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       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"
@@ -125,6 +129,7 @@ sl:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "Prekliči"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 961689c82..35350a0cd 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -89,6 +89,10 @@ sv:
       aspect_not_empty: "Aspekten är inte tom"
       remove: "ta bort"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       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: "Personer som delar med dig"
@@ -125,6 +129,7 @@ sv:
   bookmarklet: 
     explanation: "%{link} från var som helst genom att lägga till den här länken som bokmärke."
     explanation_link_text: "Posta på Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Posta något till Diaspora"
     post_success: "Postat! Stänger!"
   cancel: "Avbryt"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index ac4fb5b40..bed8eb9b1 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -89,6 +89,10 @@ tr:
       aspect_not_empty: "Yan boş değil"
       remove: "çıkar"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       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"
@@ -125,6 +129,7 @@ tr:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "İptal Et"
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index 2fc285ef8..65c7bc882 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -89,6 +89,10 @@ zh-CN:
       aspect_not_empty: "此视图不是空的"
       remove: "删除"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "这是您的 diaspora 帐号， 就像是邮箱一样，你可以把它提供给想好友您的人。"
       no_contacts: "没有任何好友"
       people_sharing_with_you: "与您分享的人"
@@ -125,6 +129,7 @@ zh-CN:
   bookmarklet: 
     explanation: "%{link} 收藏这个链接，即可随时发布新内容"
     explanation_link_text: "这个链接"
+    heading: "Diaspora Bookmarklet"
     post_something: "发布些新内容到Diaspora"
     post_success: "发布完成！关闭中！"
   cancel: "取消"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 1f5f31c8d..1db5492cb 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -89,6 +89,10 @@ zh-TW:
       aspect_not_empty: "面向不是空的"
       remove: "刪除"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es 是 Diaspora 的第一個應用程式, 目前正在開發中."
+        heading: "與 Cubbi.es 連結"
+        learn_more: "進一步了解"
       handle_explanation: "這是你的 diaspora 識別碼. 就像是電子信箱一樣, 你可以把它給想聯絡你的人."
       no_contacts: "沒有任何聯繫"
       people_sharing_with_you: "跟你分享的人"
@@ -125,6 +129,7 @@ zh-TW:
   bookmarklet: 
     explanation: "%{link}加入書籤後可對任何網站使用."
     explanation_link_text: "這個連結"
+    heading: "Diaspora 書籤小程式"
     post_something: "貼些東西到 Diaspora"
     post_success: "貼好了! 關掉中!"
   cancel: "取消"
diff --git a/config/locales/javascript/javascript.ru.yml b/config/locales/javascript/javascript.ru.yml
index d37f774df..c33a6bd5b 100644
--- a/config/locales/javascript/javascript.ru.yml
+++ b/config/locales/javascript/javascript.ru.yml
@@ -6,25 +6,25 @@
 ru: 
   javascripts: 
     aspect_dropdown: 
-      add_to_aspect: "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"
+        few: "В {{count}} аспектах"
+        many: "В {{count}} аспектах"
+        one: "В {{count}} аспектах"
+        other: "В {{count}} аспектах"
+        zero: "Добавить к аспектам"
     comments: 
-      hide: "hide comments"
-      show: "show all comments"
+      hide: "скрыть комментарии"
+      show: "Показать все комментарии"
     confirm_dialog: "Вы уверенны? "
-    failed_to_like: "Failed to like!"
-    failed_to_post_message: "Failed to post message!"
+    failed_to_like: "Не удалось!"
+    failed_to_post_message: "Не удалось отправить сообщение!"
     infinite_scroll: 
       no_more: "Сообщений больше нет."
     publisher: 
       at_least_one_aspect: "Вам надо минимум один аспект создать"
     search_for: "Искать {{name}}"
-    show_more: "show more"
+    show_more: "показать больше"
     timeago: 
       day: "день"
       days: "%d дней[-я]"