diff --git a/config/locales/devise/devise.ar.yml b/config/locales/devise/devise.ar.yml
index da6c3bf25..53da33b2a 100644
--- a/config/locales/devise/devise.ar.yml
+++ b/config/locales/devise/devise.ar.yml
@@ -29,10 +29,10 @@ ar:
         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: ", at %{url}, يمكنك قبولها عبر الرابط التالي."
         has_invited_you: "%{name} يدعوك للإنضمام إلى دياسبرا"
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 1b684200f..ca0fe7fa3 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -43,13 +43,13 @@ ar:
   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: "لم يتم إيجاد العضو المحدد في هذه الفئة"
@@ -91,7 +91,7 @@ ar:
     index: 
       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 +106,8 @@ ar:
       failure: "لم يعمل %{inspect}"
       success: "تم تحريك عضو إلى الفئة الجديدة"
     new: 
-      create: "Create"
-      name: "Name"
+      create: "أنشئ"
+      name: "إسم"
     no_posts_message: 
       start_talking: "لم تنشر أي رسالة بعد، إبدأ المحادثة"
     one: "فئة"
@@ -145,7 +145,7 @@ ar:
     one: "1 عضو"
     other: "%{count} أعضاء"
     sharing: 
-      people_sharing: "People sharing with you:"
+      people_sharing: "أعضاء يتشاركون معك:"
     zero: "لا يوجد أعضاء"
   conversations: 
     create: 
@@ -207,7 +207,7 @@ ar:
       already_contacts: "لقد قمت بإنشاء اتصال مع هذا العضو مسبقا"
       already_sent: "لقد قمت بدعوة هذا الشخص مسبقا"
       no_more: "لم يتبقى لك أية دعوات"
-      own_address: "You can't send an invitation to your own address."
+      own_address: "لا تستطيع إرسال دعوة لعنوانك الخاص"
       rejected: "واجه هذا البريد الإلكتروني مشاكلا:  "
       sent: "تم إرسال دعوتك"
     edit: 
@@ -227,7 +227,7 @@ ar:
     application: 
       have_a_problem: "واجهت مشكلة؟ اعثر على حل هنا"
       powered_by: "بدعم DIASPORA*"
-      public_feed: "فيد دياسبرا العام لـ for %{name}"
+      public_feed: "فيد دياسبرا العام لـ %{name}"
       toggle: "التحول إلى الموقع الخاص بالهواتف المحمولة"
       whats_new: "ما الجديد؟"
       your_aspects: "فئاتك"
@@ -258,23 +258,23 @@ ar:
   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_link} %{post_author}."
+      many: "%{actors} علق أيضا على %{post_link} %{post_author}."
+      one: "%{actors} علق أيضا على %{post_link} %{post_author}."
+      other: "%{actors} علق أيضا على %{post_link} %{post_author}."
+      zero: "%{actors} علق أيضا على %{post_link} %{post_author}."
     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 +285,50 @@ ar:
     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}:"
@@ -359,9 +359,9 @@ ar:
       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: "أو"
@@ -482,7 +482,7 @@ ar:
   registrations: 
     closed: "التسجيلات مغلقة على هذه المنصة"
     create: 
-      success: "!Diaspora سجل في"
+      success: "سجل في دياسبرا"
     edit: 
       cancel_my_account: "إلغاء حسابي"
       edit: "تعديل %{name}"
@@ -552,9 +552,9 @@ ar:
     add_contact: 
       create_request: "ابحث باستخدام وسيط دياسبرا"
       diaspora_handle: "وسيط دياسبرا"
-      enter_a_diaspora_username: "أدخل معرف دياسبرا:"
+      enter_a_diaspora_username: "أدخل وسيط دياسبرا:"
       know_email: "تعرف بريد الإلكتروني؟ يجدر بك دعوتهم"
-      your_diaspora_username_is: "معرف دياسبورا خاصتك هو: %{diaspora_handle}"
+      your_diaspora_username_is: "وسيط دياسبورا خاصتك هو: %{diaspora_handle}"
     contact_list: 
       all_contacts: "جميع الأعضاء"
     footer: 
@@ -592,10 +592,10 @@ ar:
     reshare: 
       reshare: "إعادة مشاركة"
     stream_element: 
-      dislike: "لم يعجبني هذا"
-      like: "أعجبني هذا"
+      dislike: "لم يعجبني"
+      like: "أعجبني"
       unlike: "إلغاء إعجابي"
-      via: "via %{link}"
+      via: "بواسطة %{link}"
   status_messages: 
     create: 
       success: "ذكرت بنجاح: %{names}"
@@ -610,11 +610,11 @@ ar:
       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 +626,20 @@ ar:
   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"
-      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:"
+      connect_to_cubbies: "اتصل بـ Cubbi.es"
+      connecting_is_simple: "صِل حساب دياسبرا خاصتك عن طريق ملأ حقلين بـصفحة حساب Cubbi.es خاصتك."
+      daniels_account: "حساب دياسبرا الخاص بدانييل"
+      generate_a_token: "أنشئ إقليدا"
+      love_to_try: "نحبذ أن تجربه."
+      making_the_connection: "جارِ الإتصال"
+      screenshot_explanation: "%{link1}.  هذا الـ cubby خاص بـ %{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: 
@@ -661,7 +661,7 @@ ar:
       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/bg.yml b/config/locales/diaspora/bg.yml
index 625733dc7..aa006805c 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -213,7 +213,7 @@ bg:
     edit: 
       sign_up: "регистриране"
     new: 
-      already_invited: "Вече е поканен"
+      already_invited: "Вече поканени"
       aspect: "Аспект"
       comma_seperated_plz: "Можете да въведете повече от една ел. поща като ги разделяте със запетаи."
       if_they_accept_info: "ако приемат поканата ще бъдат добавени към аспекта в който сте ги поканили."
@@ -331,9 +331,9 @@ bg:
       zero: "%{actors} започна да споделя с вас."
   notifier: 
     also_commented: 
-      commented: "has also commented on %{post_author}'s post:"
+      commented: "също коментира публикацията на %{post_author}:"
       sign_in: "Впишете се, за да я прегледате."
-      subject: "%{name} has also commented on %{post_author}'s post."
+      subject: "%{name} коментира публикация на %{post_author}."
     comment_on_post: 
       commented: "добави коментар на ваша публикация:"
       sign_in: "Впишете се, за да го прегледате."
@@ -441,7 +441,7 @@ bg:
       view_all: "всички снимки на %{name}"
     show: 
       collection_permalink: "постоянен адрес на колекцията"
-      delete_photo: "Изтриване на изображение"
+      delete_photo: "Изтриване на изображението"
       edit: "редактиране"
       edit_delete_photo: "Редактиране на описанието / изтриване"
       make_profile_photo: "ползване като профилна снимка"
@@ -610,11 +610,11 @@ bg:
       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: "всички коментари"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index cc00f8262..d9e794678 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -258,23 +258,23 @@ cs:
   no_results: "Nebyly nalezeny žádné výsledky"
   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} také komentovali %{post_link} od %{post_author}."
+      many: "%{actors} také komentovali %{post_link} od %{post_author}."
+      one: "%{actors} také komentoval %{post_link} od %{post_author}."
+      other: "%{actors} také komentovali %{post_link} od %{post_author}."
+      zero: "%{actors} také komentovali %{post_link} od %{post_author}."
     also_commented_deleted: 
-      few: "%{actors} komentovali ve smazaném příspěvku."
-      many: "%{actors} commented on a deleted post."
-      one: "%{actors} komentoval ve smazaném příspěvku."
-      other: "%{actors} komentovali ve smazaném příspěvku."
-      zero: "%{actors} komentovalo ve smazaném příspěvku."
+      few: "%{actors} komentovali váš smazaný příspěvek."
+      many: "%{actors} komentovali váš smazaný příspěvek."
+      one: "%{actors} komentoval váš smazaný příspěvek."
+      other: "%{actors} komentovali váš smazaný příspěvek."
+      zero: "%{actors} komentovali váš smazaný příspěvek."
     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} komentovali váš %{post_link}."
+      many: "%{actors} komentovali váš %{post_link}."
+      one: "%{actors} komentoval váš %{post_link}."
+      other: "%{actors} komentovali váš %{post_link}."
+      zero: "%{actors} komentovali váš %{post_link}."
     helper: 
       new_notifications: 
         few: "%{count} nové oznámení"
@@ -285,25 +285,25 @@ cs:
     index: 
       and: "a"
       and_others: 
-        few: "and %{count} others"
-        many: "and %{count} others"
-        one: "and one more"
-        other: "and %{count} others"
-        zero: "and nobody else"
+        few: "a %{count} další"
+        many: "a %{count} dalších"
+        one: "a ještě jeden"
+        other: "a %{count} dalších"
+        zero: "a už nikdo"
       mark_all_as_read: "Označit vše jako přečtené"
       notifications: "Oznámení"
     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} si právě oblíbili váš %{post_link}."
+      many: "%{actors} si právě oblíbili váš %{post_link}."
+      one: "%{actors} si právě oblíbil váš %{post_link}."
+      other: "%{actors} si právě oblíbili váš %{post_link}."
+      zero: "%{actors} si právě oblíbili váš %{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} měli oblíben váš smazaný příspěvek."
+      many: "%{actors} měli oblíben váš smazaný příspěvek."
+      one: "%{actors} měl oblíben váš smazaný příspěvek."
+      other: "%{actors} měli oblíben váš smazaný příspěvek."
+      zero: "%{actors} měli oblíben váš smazaný příspěvek."
     mentioned: 
       few: "%{actors} vás zmínilo na %{post_link}."
       many: "%{actors} vás zmínili na %{post_link}."
@@ -324,11 +324,11 @@ cs:
       other: "%{actors} vám poslali zprávu."
       zero: "%{actors} vám poslal zprávu."
     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} s vámi začali sdílet."
+      many: "%{actors} s vámi začali sdílet."
+      one: "%{actors} s vámi začal sdílet."
+      other: "%{actors} s vámi začali sdílet."
+      zero: "%{actors} s vámi začali sdílet."
   notifier: 
     also_commented: 
       commented: "také komentoval příspěvek od %{post_author}:"
@@ -630,14 +630,14 @@ cs:
       connecting_is_simple: "Připojení účtu na Diaspoře je tak jednoduché, jak vyplňovat dvě pole na vaší stránce účtu Cubbi.es."
       daniels_account: "Daniel's Diaspora account"
       generate_a_token: "Vytvořit token"
-      love_to_try: "We'd love for you to try it out."
+      love_to_try: "Rádi bychom, aby jste to vyzkoušeli."
       making_the_connection: "Vytváří se spojení"
-      screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
+      screenshot_explanation: "%{link1}. Tato konkrétní cubby je připojena na %{link2}."
       sign_up_today: "Registrujte se ještě dnes!"
       typical_userpage: "Typická uživatelská stránka na cubbi.es"
       via: "(přes %{link})"
       were_working_hard: "Usilovně pracujeme na dosažení snadného spojení mezi pody Diaspory a aplikacemi. Do té doby, spojení vašeho účtu na Diaspoře s Cubbi.es znamená kopírování a vkládání dvou polí."
-      what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
+      what_is_cubbies: "Cubbi.es je celosvětově první aplikace Diaspory. Je to také nejlepší způsob, jak shromáždit fotografie online."
       your_diaspora_handle: "Vaše indentifikace na Diaspoře:"
       your_diaspora_token: "Váš token na Diaspoře:"
   undo: "Vrátit?"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index da2456b9e..6a1732b27 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -617,7 +617,7 @@ de:
       zero: "Bitte kürze deinen Beitrag auf weniger als %{count} Zeichen."
   stream_helper: 
     hide_comments: "Kommentare verbergen"
-    show_comments: "alle Kommentare zeigen"
+    show_comments: "Alle Kommentare zeigen"
   tags: 
     show: 
       nobody_talking: "Niemand hat bereits etwas über %{tag} gesagt."
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index bcd6fed90..c9be55e9c 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -316,7 +316,7 @@ el:
       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: "δημοσίευση."
+    post: "δημοσίευση"
     private_message: 
       few: "%{actors} sent you a message."
       many: "%{actors} sent you a message."
@@ -627,18 +627,18 @@ el:
   tokens: 
     show: 
       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"
+      connecting_is_simple: "Η σύνδεση του Diaspora λογαριασμού σας γίνεται απλά με τη συμπλήρωση των δύο πεδίων στην σελίδα σύνδεσης του Cubbi.es."
+      daniels_account: "Ο Diaspora λογαριασμός του Daniel"
       generate_a_token: "Generate a token"
-      love_to_try: "We'd love for you to try it out."
-      making_the_connection: "Making the Connection"
+      love_to_try: "Θα χαιρόμασταν αν το δοκιμάζατε."
+      making_the_connection: "Γίνεται η σύνδεση"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
-      sign_up_today: "Sign up today!"
+      sign_up_today: "Συνδεθείτε σήμερα!"
       typical_userpage: "Μία τυπική cubbi.es σελίδα χρήστη"
       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 είναι παγκοσμίως η πρώτη εφαρμογή για το Diaspora. Είναι επίσης ο καλύτερος τρόπος συλλογής φωτογραφιών στο διαδίκτυο."
-      your_diaspora_handle: "Your Diaspora Handle:"
+      your_diaspora_handle: "Το Diaspora αναγνωριστικό σας:"
       your_diaspora_token: "Your Diaspora Token:"
   undo: "Αναίρεση;"
   username: "Όνομα Χρήστη"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 7713b2d4e..fcac46c19 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -89,7 +89,7 @@ eu:
       aspect_not_empty: "Alderdi ez hutsa"
       remove: "ezabatu"
     index: 
-      handle_explanation: "Hau da zure Diaspora erabiltzailea. Zure adiskideei emaiezu zu aurkitzearren."
+      handle_explanation: "Hau da zure Diaspora helbidea. Zure adiskideei emaiezu zu aurkitzearren."
       no_contacts: "Adiskiderik ez"
       people_sharing_with_you: "Zurekin harremanetan dagoen jendea"
       post_a_message: "mezu bat bidali >>"
@@ -285,10 +285,10 @@ eu:
     index: 
       and: "eta"
       and_others: 
-        few: "eta beste %{count}"
-        many: "eta beste %{count}"
-        one: "eta beste bat"
-        other: "eta beste %{count}"
+        few: "eta beste %{count}(e)k"
+        many: "eta beste %{count}(e)k"
+        one: "eta beste batek"
+        other: "eta beste %{count}(e)k"
         zero: "eta inork gehiago ez"
       mark_all_as_read: "Guztiak irakurrita"
       notifications: "Jakinarazpenak"
@@ -554,7 +554,7 @@ eu:
       diaspora_handle: "diaspora@helbidea.org"
       enter_a_diaspora_username: "Diaspora erabiltzaile izena idatzi:"
       know_email: "Badakizu beraien e-posta? Gonbida itzazu!"
-      your_diaspora_username_is: "Zure Diaspora erabiltzailea honakoa da: %{diaspora_handle}"
+      your_diaspora_username_is: "Zure Diaspora helbidea honakoa da: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Adiskide Guztiak"
     footer: 
@@ -634,11 +634,11 @@ eu:
       making_the_connection: "Lotura Ezartzen"
       screenshot_explanation: "%{link1}. Cubby hau %{link2}(r)ekin lotuta dago."
       sign_up_today: "Izena eman oraintxe!"
-      typical_userpage: "Cubbi.es erabiltzaile orri tipiko bat"
+      typical_userpage: "Cubbi.es erabiltzaile orrialde tipiko bat"
       via: "(%{link}(r)en bidez)"
       were_working_hard: "Gogor ari gara lanean Diaspora zerbitzarien eta aplikazioen arteko harremanak eskaintzeko. Momentuan, Diaspora eta Cubbi.es kontuak lotzeak bi eremu kopiatzean eta itsastean datza."
       what_is_cubbies: "Cubbi.es munduko lehen Diaspora aplikazioa da. Argazkiak metatzeko biderik onena ere da."
-      your_diaspora_handle: "Zure Diaspora Kodea:"
+      your_diaspora_handle: "Zure Diaspora Helbidea:"
       your_diaspora_token: "Zure Diaspora Kodea:"
   undo: "Desegin?"
   username: "Erabiltzailea"
@@ -651,7 +651,7 @@ eu:
       change_password: "Pasahitza aldatu"
       close_account: "Kontua Ezabatu"
       comment_on_post: "...norbaitek zure mezu bat iruzkintzen duenean?"
-      current_password: "Oraingo pasahitza"
+      current_password: "Pasahitz zaharra"
       download_photos: "nire argazkiak jaitsi"
       download_xml: "nire xml jaitsi"
       edit_account: "Kontua aldatu"
@@ -663,7 +663,7 @@ eu:
       receive_email_notifications: "E-posta jakinarazpenak jaso nahi dituzu..."
       started_sharing: "...norbaitek zurekin harreman berria hasten duenean?"
       your_email: "Zure e-posta"
-      your_handle: "Zure Diaspora erabiltzailea"
+      your_handle: "Zure Diaspora helbidea"
     getting_started: 
       connect_on_diaspora: "Konektatu Diasporan"
       connect_services: "Beste zerbitzu batzuekin lotu"
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index 041cf3dde..7abfec2ef 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -293,11 +293,11 @@ ko:
       mark_all_as_read: "모두 읽음으로 표시"
       notifications: "알림"
     liked: 
-      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}을 좋아합니다."
     liked_post_deleted: 
       few: "%{actors}님 등이 내가 지운 공유물을 좋아합니다."
       many: "%{actors}님 등이 내가 지운 공유물을 좋아합니다."
diff --git a/config/locales/javascript/javascript.ar.yml b/config/locales/javascript/javascript.ar.yml
index d9621b4c3..473d4a607 100644
--- a/config/locales/javascript/javascript.ar.yml
+++ b/config/locales/javascript/javascript.ar.yml
@@ -6,25 +6,25 @@
 ar: 
   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 أيام"
diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml
index 72a9eaa2d..2a68410d0 100644
--- a/config/locales/javascript/javascript.de.yml
+++ b/config/locales/javascript/javascript.de.yml
@@ -10,7 +10,7 @@ de:
       toggle: 
         few: "In {{count}} Aspekten"
         many: "In {{count}} Aspekten"
-        one: "In {{count}} Aspekten"
+        one: "In einem Aspekt"
         other: "In {{count}} Aspekten"
         zero: "Zu Aspekt hinzufügen"
     comments: