diff --git a/config/locales/devise/devise.ar.yml b/config/locales/devise/devise.ar.yml
index 3ed0a31a7..5877f16b3 100644
--- a/config/locales/devise/devise.ar.yml
+++ b/config/locales/devise/devise.ar.yml
@@ -66,7 +66,7 @@ ar:
       new: 
         alpha_software: "أنت على وشك استخدام برنامج تجريبي ألفا"
         bugs_and_feedback: "للتذكير، ستواجه خلال تجربتك بعض المشاكل التقنية.  نشجعك على استخدام زر التبليغ -الموجود بالجانب الأيمن من متصفحك- من أجل تنبيه المطورين لأي معضلة واجهتها, وسنعمل بأسرع ما يمكن لحل أي مشكلة تقنية تم الإبلاغ عنها."
-        bugs_and_feedback_mobile: "لا تندهش،سوف تواجهكم مشكلة. نحن نشجعكم على استخدام زر ردود الفعل على الجانب الأيمن من المتصفح الخاص بك إلى تسجيل أي مشكلة! سوف نعمل بأسرع ما يمكن لحل  المشاكل الواردةفي التقرير."
+        bugs_and_feedback_mobile: "للتذكير، ستواجه خلال تجربتك بعض المشاكل التقنية.  نشجعك على استخدام زر التبليغ من أجل تنبيه المطورين لأي معضلة واجهتها, وسنعمل بأسرع ما يمكن لحل أي مشكلة تقنية تم الإبلاغ عنها"
         login: "لُج"
         modern_browsers: "الدعم حصري للمتصفحات الحديثة، لا أنترنت أكسبلورر"
         password: "كلمة المرور"
diff --git a/config/locales/devise/devise.el.yml b/config/locales/devise/devise.el.yml
index 6446d3b59..91aba34dc 100644
--- a/config/locales/devise/devise.el.yml
+++ b/config/locales/devise/devise.el.yml
@@ -87,9 +87,9 @@ el:
         sign_up_for_an_invite: "Εγγραφείτε για μια πρόσκληση!"
     unlocks: 
       new: 
-        resend_unlock: "Ξαναστείλε τις οδηγίες ξεκλειδώματος"
+        resend_unlock: "Ξαναστείλτε τις οδηγίες ξεκλειδώματος"
       send_instructions: "Σε λίγα λεπτά θα λάβετε ένα email με οδηγίες για το πως να ξεκλειδώσετε το λογαριασμό σας."
-      unlocked: "Ο λογαριασμός σας ξεκλειδώθηκε με επιτυχία. Έχετε πλέον συνδεθεί"
+      unlocked: "Ο λογαριασμός σας ξεκλειδώθηκε με επιτυχία. Έχετε πλέον συνδεθεί."
   errors: 
     messages: 
       already_confirmed: "έχει ήδη επιβεβαιωθεί"
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 9e58c2c73..29ec52cbb 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -36,6 +36,7 @@ ar:
   all_aspects: "كل الفئات"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "شخص غير معروف"
       video_title: 
         unknown: "عنوان فيديو غير محدد"
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index ca353a089..2c9c1719e 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -36,6 +36,7 @@ bg:
   all_aspects: "Всички аспекти"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "непознато лице"
       video_title: 
         unknown: "Unknown Video Title"
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index d80de325c..e6eaa1357 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -36,6 +36,7 @@ br:
   all_aspects: "An Holl Arvezioù"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "den dianav"
       video_title: 
         unknown: "Unknown Video Title"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index b8336a00a..13e5a6bb8 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -36,6 +36,7 @@ cs:
   all_aspects: "Všechny aspekty"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "neznámá osoba"
       video_title: 
         unknown: "Neznámý název videa"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 074d2cc63..933867708 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -36,6 +36,7 @@ cy:
   all_aspects: "All aspects"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "unknown person"
       video_title: 
         unknown: "Unknown Video Title"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 869e56acb..f12cb97c6 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -36,6 +36,7 @@ da:
   all_aspects: "Alle aspekter"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "Ukendt person"
       video_title: 
         unknown: "Ukendt videotitel"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 0d57f8490..fb70fb821 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -36,6 +36,7 @@ de:
   all_aspects: "Alle Aspekte"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "unbekannte Person"
       video_title: 
         unknown: "Unbekannter Video-Titel"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index f57f9456e..f07345b5e 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -36,6 +36,7 @@ el:
   all_aspects: "Όλες οι πτυχές"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "άγνωστο άτομο"
       video_title: 
         unknown: "Άγνωστος τίτλος video"
@@ -251,7 +252,7 @@ el:
   no_results: "Δεν βρέθηκαν αποτελέσματα"
   notifications: 
     also_commented: "επίσης σχολίασε τη %{post_author}"
-    also_commented_deleted: "σχολιάστηκε σε διαγεγραμμένη δημοσίευση"
+    also_commented_deleted: "σχολιάστηκε σε διαγεγραμμένη δημοσίευση."
     comment_on_post: "σχολίασε τη"
     deleted: "διαγράφηκε"
     helper: 
@@ -266,9 +267,9 @@ el:
       and_others: "και %{number} άλλοι"
       mark_all_as_read: "Σήμανση όλων ως διαβασμένα"
       notifications: "Ειδοποιήσεις"
-    mentioned: "σας ανέφερε στο"
+    mentioned: "σας ανέφερε σε"
     new_request: "προσφέρθηκε να μοιραστεί μαζί σας."
-    post: "δημοσίευση"
+    post: "δημοσίευση."
     private_message: "σας έστειλε ένα μήνυμα"
     request_accepted: "δέχτηκε το αίτημα σας για διαμοιρασμό. "
   notifier: 
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index e1cc3d2b6..700c1c204 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -36,6 +36,7 @@ en_shaw:
   all_aspects: "𐑷𐑤 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "𐑩𐑯𐑯𐑴𐑯 𐑐𐑻𐑕𐑩𐑯"
       video_title: 
         unknown: "𐑩𐑯𐑯𐑴𐑯 𐑝𐑦𐑛𐑦𐑴 𐑑𐑲𐑑𐑩𐑤"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 25c00ea86..290288f68 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -36,6 +36,7 @@ eo:
   all_aspects: "All aspects"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "nekonata persono"
       video_title: 
         unknown: "Unknown Video Title"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 907d71d1e..40916f602 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -36,6 +36,7 @@ es-CL:
   all_aspects: "Todos los Aspectos"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "persona desconocida"
       video_title: 
         unknown: "Titulo de vídeo desconocido"
@@ -251,7 +252,7 @@ es-CL:
   no_results: "No se encontraron resultados"
   notifications: 
     also_commented: "también comentó en el post de %{post_author}"
-    also_commented_deleted: "Comentó en un post eliminado"
+    also_commented_deleted: "Comentó en un post eliminado."
     comment_on_post: "comentó en tu"
     deleted: "Eliminado"
     helper: 
@@ -266,9 +267,9 @@ es-CL:
       and_others: "y otros %{number}"
       mark_all_as_read: "Marcar todo como leido"
       notifications: "Notificaciones"
-    mentioned: "te mencionó en un post"
+    mentioned: "te mencionó en un"
     new_request: "quiere compartir contigo."
-    post: "post"
+    post: "post."
     private_message: "te envió un mensaje."
     request_accepted: "aceptó tu solicitud de contacto."
   notifier: 
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 2eed19d3f..12a77f035 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -36,6 +36,7 @@ es:
   all_aspects: "Todos"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "persona desconocida"
       video_title: 
         unknown: "Título de vídeo desconocido"
@@ -268,7 +269,7 @@ es:
       notifications: "Notificaciones"
     mentioned: "te mencionó en una"
     new_request: "quisiera compartir contigo."
-    post: "publicación"
+    post: "publicación."
     private_message: "te envió un mensaje."
     request_accepted: "aceptó tu solicitud de contacto."
   notifier: 
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index bb602c40e..94f9160f5 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -36,6 +36,7 @@ eu:
   all_aspects: "Alderdi guztiak"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "pertsona ezezaguna"
       video_title: 
         unknown: "Bideo izen ezezaguna"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 6d05b2315..8cc39fcb4 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -36,6 +36,7 @@ fi:
   all_aspects: "Kaikki näkymät"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "tuntematon henkilö"
       video_title: 
         unknown: "Videon Otsikko Tuntematon"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index cdc7bb7d7..cf805386a 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -36,6 +36,7 @@ fr:
   all_aspects: "Tous les aspects"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "personne inconnue"
       video_title: 
         unknown: "Titre de vidéo inconnu"
@@ -251,7 +252,7 @@ fr:
   no_results: "Aucun résultat trouvé"
   notifications: 
     also_commented: "a/ont également commenté le message de %{post_author} :"
-    also_commented_deleted: "a commenté un message supprimé"
+    also_commented_deleted: "a commenté un message supprimé."
     comment_on_post: "a/ont commenté votre"
     deleted: "supprimé"
     helper: 
@@ -266,9 +267,9 @@ fr:
       and_others: "et %{number} autres"
       mark_all_as_read: "Tout marquer comme lu"
       notifications: "Notifications"
-    mentioned: "vous a mentionné(e) dans une publication"
+    mentioned: "vous a mentionné(e) dans un"
     new_request: "a proposé de partager avec vous."
-    post: "message"
+    post: "message."
     private_message: "vous a envoyé un message."
     request_accepted: "a accepté votre demande de partage."
   notifier: 
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index c1affa0ee..8aa68b4e0 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -36,6 +36,7 @@ ga:
   all_aspects: "All aspects"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "duine anaithnid"
       video_title: 
         unknown: "Teideal Físeán Anaithnid"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 49351ec28..4fd24a5b7 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -36,6 +36,7 @@ he:
   all_aspects: "כל ההיבטים"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "אדם לא ידוע"
       video_title: 
         unknown: "כותרת הווידאו אינה ידועה"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 375d89fcd..c3ccf6de8 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -36,6 +36,7 @@ hu:
   all_aspects: "Összes csoport"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "ismeretlen személy"
       video_title: 
         unknown: "Ismeretlen videó cím"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index cad531019..5484c5235 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -36,6 +36,7 @@ id:
   all_aspects: "All aspects"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "orang tak dikenal"
       video_title: 
         unknown: "Unknown Video Title"
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index f28d03786..739d70511 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -36,6 +36,7 @@ is:
   all_aspects: "All aspects"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "óþekkt manneskja"
       video_title: 
         unknown: "Óþekktur vídeótitill"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index e861fb5f7..2d444babf 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -36,6 +36,7 @@ it:
   all_aspects: "Tutti gli aspetti"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "persona sconosciuta"
       video_title: 
         unknown: "Video Senza Nome"
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index 0c2707cf2..140b74201 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -4,10 +4,10 @@
 
 
 ja: 
-  _comments: "Comments"
-  _home: "Home"
+  _comments: "コメント"
+  _home: "ホーム"
   _photos: "写真"
-  _services: "Services"
+  _services: "サービス"
   account: "アカウント"
   activerecord: 
     errors: 
@@ -32,19 +32,20 @@ ja:
               invalid: "無効です。"
             username: 
               taken: "既に使われています。"
-  ago: "%{time} ago"
+  ago: "%{time}前"
   all_aspects: "全てのアスペクト"
   application: 
     helper: 
+      diaspora_alpha: "ダイアスポラ＊アルファ"
       unknown_person: "不明な連絡先"
       video_title: 
         unknown: "不明な動画タイトル"
   are_you_sure: "本当にいいですか。"
   aspect_memberships: 
     destroy: 
-      failure: "連絡先をアスペクトから除外するのに失敗しました"
+      failure: "連絡先をアスペクトから除外するのに失敗しました。"
       no_membership: "選択した連絡先はそのアスペクト内に見つかりませんでした"
-      success: "連絡先をアスペクトから除外するのに成功しました"
+      success: "連絡先をアスペクトから除外するのに成功しました。"
   aspects: 
     add_to_aspect: 
       failure: "連絡先をアスペクトに追加するのに失敗しました。"
@@ -55,14 +56,14 @@ ja:
       activity: "更新時"
       post_time: "投稿時"
       sort_by: "並び順"
-    contacts_not_visible: "Contacts in this aspect will not be able to see each other."
-    contacts_visible: "Contacts in this aspect will be able to see each other."
+    contacts_not_visible: "このアスペクトの連絡先はお互いの存在が確認できません。"
+    contacts_visible: "このアスペクトの連絡先はお互いの存在が確認できます。"
     create: 
-      failure: "Aspect creation failed."
-      success: "新しいアスペクト「%{name}」を作成しました"
+      failure: "アスペクトを作成するのに失敗しました。"
+      success: "新しいアスペクト「%{name}」を作成しました。"
     destroy: 
       failure: "%{name}に連絡先が残っているので削除できません。"
-      success: "%{name}の削除に成功しました"
+      success: "%{name}さんを除外するのに成功しました。"
     edit: 
       add_existing: "既存の連絡先を追加する"
       aspect_list_is_not_visible: "このアスペクトのメンバー一覧はメンバーへ公開されていません"
@@ -74,49 +75,49 @@ ja:
       rename: "名前の変更"
       update: "更新"
       updating: "更新中"
-    few: "%{count}つのアスペクト"
+    few: "アスペクト%{count}集"
     helper: 
-      are_you_sure: "Are you sure you want to delete this aspect?"
-      aspect_not_empty: "Aspect not empty"
-      remove: "remove"
+      are_you_sure: "本当にこのアスペクトを削除しますか。"
+      aspect_not_empty: "アスペクトは空ではありません。"
+      remove: "削除"
     index: 
       handle_explanation: "これがあなたのハンドル名です。メールアドレスと同じようにほかの人に教えて、ダイアスポラで連絡を取り合うことができます。"
       no_contacts: "連絡先無し"
-      post_a_message: "post a message >>"
+      post_a_message: "投稿する"
     manage: 
       add_a_new_aspect: "新しいアスペクトを追加する"
       add_a_new_contact: "新しい連絡先を追加する"
       drag_to_add: "追加したい連絡先をドラッグしてください"
-      manage_aspects: "Manage aspects"
-      no_requests: "No new requests"
+      manage_aspects: "アスペクトの管理"
+      no_requests: "新リクエスト無し"
       requests: "リクエスト"
-    many: "%{count}アスペクト"
+    many: "アスペクト%{count}集"
     move_contact: 
       error: "連絡先の移動にエラーが発生しました： %{inspect}"
-      failure: "連絡先の移動に失敗しました：%{inspect}"
-      success: "連絡先を新しいアスペクトに移しました"
+      failure: "連絡先を移動させるのに失敗しました：%{inspect}"
+      success: "連絡先を新しいアスペクトに移動させました。"
     new_aspect: 
       create: "作成する"
       name: "アスペクト名"
     no_posts_message: 
       start_talking: "投稿がまだありません。会話を始めましょう！"
-    one: "1つのアスペクト"
-    other: "%{count}アスペクト"
+    one: "アスペクト1集"
+    other: "アスペクト%{count}集"
     seed: 
       family: "家族"
       work: "仕事"
     show: 
       edit_aspect: "アスペクトを編集する"
     update: 
-      failure: "Your aspect, %{name}, had too long name to be saved."
-      success: "アスペクト「%{name}」の編集に成功しました。"
+      failure: "アスペクト名「%{name}」は長すぎて保存できませんでした。"
+      success: "アスペクト「%{name}」の編集するのに成功しました。"
     zero: "アスペクト無し"
   back: "前へ"
   bookmarklet: 
-    explanation: "%{link} from anywhere by bookmarking this link."
-    explanation_link_text: "Post to Diaspora"
-    post_something: "Post something to Diaspora"
-    post_success: "Posted! Closing!"
+    explanation: "このリンクをお気に入りに登録すると、どこからでも%{link}できます。"
+    explanation_link_text: "ダイアスポラに投稿"
+    post_something: "ダイアスポラに投稿"
+    post_success: "投稿完了！ウィンドウを閉じます。"
   cancel: "取り消す"
   comments: 
     few: "コメント%{count}件"
@@ -129,31 +130,31 @@ ja:
     zero: "コメントがありません"
   contacts: 
     create: 
-      failure: "Failed to create contact"
+      failure: "連絡先を作成するのに失敗しました。"
     destroy: 
-      failure: "Failed to disconnect from %{name}"
-      success: "Successfully disconnected from %{name}"
-    few: "%{count} contacts"
-    many: "%{count} contacts"
-    one: "1 contact"
-    other: "%{count} contacts"
+      failure: "%{name}さんの連絡先を削除するのに失敗しました。"
+      success: "%{name}さんの連絡先を削除するのに成功しました。"
+    few: "連絡先%{count}件"
+    many: "連絡先%{count}件"
+    one: "連絡先1件"
+    other: "連絡先%{count}件"
     share_with_pane: 
-      accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
+      accepts: "%{name}さんが承諾したら、ダイアスポラ＊投稿がお互いに見れるようになります。"
       add_new_aspect: "新しいアスペクトに追加する"
-      share_with: "Start sharing with %{name}"
-    zero: "no contacts"
+      share_with: "%{name}さんと共有を開始する"
+    zero: "連絡先無し"
   conversations: 
     create: 
       sent: "メッセージを送信しました"
     destroy: 
-      success: "Conversation successfully removed"
+      success: "会話を削除するのに成功しました。"
     helper: 
       new_messages: 
-        few: "%{count} new messages"
-        many: "%{count} new messages"
-        one: "1 new messages"
-        other: "新着メッセージ %{count}件"
-        zero: "新着メッセージはありません"
+        few: "新着メッセージ%{count}通"
+        many: "新着メッセージ%{count}通"
+        one: "新着メッセージ1通"
+        other: "新着メッセージ%{count}通"
+        zero: "新着メッセージ無し"
     index: 
       create_a_new_message: "新しいメッセージを作成する"
       inbox: "受信トレイ"
@@ -162,9 +163,9 @@ ja:
       no_conversation_selected: "選択中の会話がありません"
       no_messages: "メッセージがありません"
     new: 
-      send: "Send"
-      subject: "subject"
-      to: "to"
+      send: "送信する"
+      subject: "件名"
+      to: "宛先"
     show: 
       delete: "会話を削除して、ブロックする"
       reply: "返信"
@@ -174,49 +175,49 @@ ja:
       birthday_with_year: "%Y年%m月%d日"
       fullmonth_day: "%m月%d日"
   delete: "削除"
-  email: "Email"
+  email: "メール"
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "次の問題を解決してからやり直してください。"
-      invalid_fields: "Invalid Fields"
+      invalid_fields: "不正なフィールド名"
   fill_me_out: "記入して"
   hide: "隠す"
   home: 
     show: 
-      already_account: "already have an account?"
-      choice: "Choice"
-      choice_explanation: "Diaspora lets you sort your connections into groups called aspects. Unique to Diaspora, aspects ensure that your photos, stories and jokes are shared only with the people you intend."
+      already_account: "アカウントは既にお持ちですか。"
+      choice: "自由"
+      choice_explanation: "ダイアスポラ＊で連絡先をアスペクトと呼ばれる集団に分けることができます。アスペクトはダイアスポラ＊独特の機能で、これによってあなたの写真、話、冗談などが目的の知り合いだけに共有されることが保証されます。"
       learn_about_host: "Learn about how to host your own Diaspora server."
-      login_here: "log in here"
-      ownership: "Ownership"
+      login_here: "ここからログイン"
+      ownership: "所有"
       ownership_explanation: "You own your pictures, and you shouldn’t have to give that up just to share them. You maintain ownership of everything you share on Diaspora, giving you full control over how it's distributed."
       share_what_you_want: "Share what you want, with whom you want."
-      simplicity: "Simplicity"
-      simplicity_explanation: "Diaspora makes sharing clean and easy – and this goes for privacy too. Inherently private, Diaspora doesn’t make you wade through pages of settings and options just to keep your profile secure."
-      tagline_first_half: "Share what you want,"
-      tagline_second_half: "with whom you want."
+      simplicity: "平易"
+      simplicity_explanation: "ダイアスポラ＊は簡潔に共有を可能にしながら、プライバシーも簡潔にします。ダイアスポラ＊は根本的なプライバシー主義で、プロフィールを保護するために何ページもの複雑な設定を使いこなす必要はありません。"
+      tagline_first_half: "好きなことだけ共有する"
+      tagline_second_half: "好きな人に。"
   invitations: 
     check_token: 
-      not_found: "Invitation token not found"
+      not_found: "招待トークンが見つかりません。"
     create: 
-      already_contacts: "You are already connected with this person"
-      already_sent: "You already invited this person."
-      no_more: "You have no more invitations."
-      rejected: "The following email addresses had problems: "
-      sent: "Invitations have been sent to: "
+      already_contacts: "既に連絡先として登録しています。"
+      already_sent: "既に招待しました。"
+      no_more: "招待権がもう残っていません。"
+      rejected: "次のメールアドレスに問題が発生しました："
+      sent: "次の人々に招待を送信しました："
     edit: 
-      sign_up: "sign_up"
+      sign_up: "新規登録"
     new: 
-      already_invited: "Already invited"
+      already_invited: "招待済み"
       aspect: "アスペクト"
-      comma_seperated_plz: "You can enter multiple email addresses separated by commas."
-      if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
-      invite_someone_to_join: "Invite someone to join Diaspora!"
-      personal_message: "Personal message"
-      resend: "Resend"
-      send_an_invitation: "Send an invitation"
-      send_invitation: "Send invitation"
-      to: "To"
+      comma_seperated_plz: "複数のメールアドレスはコンマ区切りで入力可能です。"
+      if_they_accept_info: "招待を承諾してくれた場合、招待時のアスペクトに追加されます。"
+      invite_someone_to_join: "知り合いをダイアスポラ＊に招待しましょう！"
+      personal_message: "個人メッセージ"
+      resend: "再送する"
+      send_an_invitation: "招待を送信する"
+      send_invitation: "招待を送信する"
+      to: "宛先："
   layouts: 
     application: 
       have_a_problem: "質問がありましたら、ここからアンサーを"
@@ -235,42 +236,42 @@ ja:
   likes: 
     likes: 
       people_dislike_this: 
-        few: "%{count} people disliked this"
-        many: "%{count} people disliked this"
-        one: "1 person disliked this"
-        other: "%{count} people disliked this"
-        zero: "no people disliked this"
+        few: "これが嫌いな人：%{count}人"
+        many: "これが嫌いな人：%{count}人"
+        one: "これが嫌いな人：1人"
+        other: "これが嫌いな人：%{count}人"
+        zero: "これが嫌いな人：0人"
       people_like_this: 
-        few: "%{count} people liked this"
-        many: "%{count} people liked this"
-        one: "1 person liked this"
-        other: "%{count} people liked this"
-        zero: "no people liked this"
-  more: "More"
-  next: "next"
+        few: "これが好きな人：%{count}人"
+        many: "これが好きな人：%{count}人"
+        one: "これが好きな人：1人"
+        other: "これが好きな人：%{count}人"
+        zero: "これが好きな人：0人"
+  more: "続き"
+  next: "次へ"
   no_results: "詮索結果はありません"
   notifications: 
     also_commented: "さんも%{post_author}さんの投稿にコメントしました："
     also_commented_deleted: "さんは削除された投稿にコメントしました。"
     comment_on_post: "さんは次の投稿にコメントしました："
-    deleted: "deleted"
+    deleted: "削除しました。"
     helper: 
       new_notifications: 
-        few: "%{count} new notifications"
-        many: "%{count} new notifications"
-        one: "1 new notifications"
-        other: "%{count} new notifications"
-        zero: "no new notifications"
+        few: "新着通知%{count}件"
+        many: "新着通知%{count}件"
+        one: "新着通知1件"
+        other: "新着通知%{count}件"
+        zero: "新着通知無し"
     index: 
-      and: "and"
-      and_others: "and %{number} others"
-      mark_all_as_read: "Mark All as Read"
-      notifications: "お知らせ"
-    mentioned: "has mentioned you in a "
+      and: "又は"
+      and_others: "他%{number}件"
+      mark_all_as_read: "全件を既読にする"
+      notifications: "通知"
+    mentioned: "さんはあなたをメンションしました。"
     new_request: "さんは共有の許可を求めました。"
-    post: "post."
-    private_message: "sent you a message."
-    request_accepted: "accepted your share request."
+    post: "（投稿で）"
+    private_message: "さんからメッセージが届いています。"
+    request_accepted: "さんは共有リクエストを承諾しました。"
   notifier: 
     also_commented: 
       commented: "も%{post_author}さんの投稿にコメントしました："
@@ -278,37 +279,37 @@ ja:
       subject: "%{name}も%{post_author}さんの投稿にコメントしました。"
     comment_on_post: 
       commented: "は次の投稿にコメントしました："
-      sign_in: "Sign in to view it."
+      sign_in: "見るにはログインしてください。"
       subject: "%{name}は投稿にコメントしました。"
-    diaspora: "the diaspora email robot"
-    hello: "Hello %{name}!"
-    love: "love,"
-    manage_your_email_settings: "manage your email settings"
+    diaspora: "ダイアスポラ＊メールロボット"
+    hello: "%{name}さん、こんにちは！"
+    love: "それでは、"
+    manage_your_email_settings: "メール設定を管理する"
     mentioned: 
-      mentioned: "mentioned you in a post:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has mentioned you on Diaspora*"
+      mentioned: "さんは投稿であなたをメンションしました。"
+      sign_in: "見るのにログインして下さい。"
+      subject: "%{name}さんはダイアスポラ＊であなたをメンションしました。"
     new_request: 
-      just_sent_you: "just sent you a contact request on Diaspora*"
-      sign_in: "Sign in here"
-      subject: "new Diaspora* contact request from %{from}"
-      try_it_out: "You should really think about checking it out."
+      just_sent_you: "さんからダイアスポラ＊の追加リクエストが届いています。"
+      sign_in: "ここからログイン"
+      subject: "%{from}さんの新しいダイアスポラ＊追加リクエスト"
+      try_it_out: "是非お試しください。"
     private_message: 
-      message_subject: "Subject: %{subject}"
-      private_message: "has sent you a private message:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has sent you a private message on Diaspora*"
+      message_subject: "件名：%{subject}"
+      private_message: "からメッセージが届いています。"
+      sign_in: "見るにはログインしてください。"
+      subject: "ダイアスポラ＊で%{name}さんからの非公開メッセージが届いています。"
     request_accepted: 
       accepted: "has accepted your contact request!"
-      sign_in: "Sign in here"
+      sign_in: "ここからログインしてください。"
       subject: "%{name} has accepted your contact request on Diaspora*"
     single_admin: 
-      admin: "Your Diaspora administrator"
-      subject: "A message about your Diaspora account:"
-    thanks: "Thanks,"
-  ok: "OK"
-  or: "或いは"
-  password: "Password"
+      admin: "ダイアスポラ＊管理者"
+      subject: "ダイアスポラ＊アカウントの重要なお知らせ："
+    thanks: "ありがとうございます。"
+  ok: "了解"
+  or: "または"
+  password: "パスワード"
   password_confirmation: "パスワード確認"
   people: 
     add_contact_small: 
@@ -347,7 +348,7 @@ ja:
       does_not_exist: "存在しない連絡先です！"
       edit: "編集"
       incoming_request: "%{name}さんは共有の許可を求めています"
-      mention: "参照"
+      mention: "メンション"
       message: "メッセージ"
       no_posts: "表示する投稿はありません！"
       not_connected: "この連絡先と共有していません"
@@ -400,7 +401,7 @@ ja:
     update: 
       post_hidden: "%{name}さんの投稿を非表示にしました。"
   posts: 
-    doesnt_exist: "that post does not exist!"
+    doesnt_exist: "投稿が存在しません。"
   previous: "前へ"
   profile: "プロフィール"
   profiles: 
@@ -424,38 +425,38 @@ ja:
       failed: "プロフィール更新に失敗しました"
       updated: "プロフィールを更新しました"
   registrations: 
-    closed: "Signups are closed on this Diaspora pod."
+    closed: "このダイアスポラ＊ポッドでは新規登録を受け付けていません。"
     create: 
-      success: "You've joined Diaspora!"
+      success: "ダイアスポラの新規登録が完了しました！"
     edit: 
-      cancel_my_account: "Cancel my account"
-      edit: "Edit %{name}"
-      leave_blank: "(leave blank if you don't want to change it)"
-      password_to_confirm: "(we need your current password to confirm your changes)"
-      unhappy: "Unhappy?"
+      cancel_my_account: "アカウント登録を取り消す"
+      edit: "%{name}を編集する"
+      leave_blank: "（変更したくない場合は空白のままにしてください）"
+      password_to_confirm: "（確認のため、現パスワードも必要です）"
+      unhappy: "何かご不満ですか。"
       update: "更新"
     new: 
-      enter_email: "Enter an e-mail"
-      enter_password: "Enter a password"
-      enter_password_again: "Enter the same password as before"
-      enter_username: "Pick a username (only letters, numbers, and underscores)"
-      sign_up: "Sign up"
-      sign_up_for_diaspora: "Sign up for Diaspora"
+      enter_email: "メールアドレスを入力してください。"
+      enter_password: "パスワードを入力してください。"
+      enter_password_again: "もう一度同じパスワードを入力してください。"
+      enter_username: "ユーザ名を選択してください。（半角英数字とアンダーバーのみ）"
+      sign_up: "新規登録"
+      sign_up_for_diaspora: "ダイアスポラに新規登録する"
   requests: 
     create: 
-      sending: "Sending"
-      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      sending: "送信中"
+      sent: "共有リクエストを送信しました。%{name}さんは次回のログイン時に見るでしょう。"
     destroy: 
-      error: "Please select an aspect!"
-      ignore: "Ignored contact request."
-      success: "You are now sharing."
+      error: "アスペクトを選択して下さい。"
+      ignore: "共有リクエストを無視しました。"
+      success: "現在共有しています。"
     helper: 
       new_requests: 
-        few: "%{count} new requests!"
-        many: "%{count} new requests!"
-        one: "new request!"
-        other: "%{count} new requests!"
-        zero: "no new requests"
+        few: "新リクエスト%{count}件！"
+        many: "新リクエスト%{count}件！"
+        one: "新リクエスト！"
+        other: "新リクエスト%{count}件！"
+        zero: "新リクエスト無し"
     manage_aspect_contacts: 
       existing: "現在の連絡先"
       manage_within: "次のアスペクトの連絡先を管理："
@@ -464,11 +465,11 @@ ja:
   search: "検索"
   services: 
     create: 
-      success: "Authentication successful."
+      success: "認証に成功しました。"
     destroy: 
-      success: "Successfully deleted authentication."
+      success: "認証を削除するのに成功しました。"
     failure: 
-      error: "there was an error connecting that service"
+      error: "サービスへ接続中にエラーが発生しました。"
     finder: 
       friends: 
         few: "%{count}人の連絡先"
@@ -479,79 +480,79 @@ ja:
       invite_your_friends_from: "%{service}の連絡先を招待する"
       not_connected: "未接続"
     index: 
-      connect_to_facebook: "Connect to facebook"
-      connect_to_twitter: "Connect to twitter"
-      disconnect: "disconnect"
-      edit_services: "Edit services"
-      logged_in_as: "logged in as"
-      really_disconnect: "disconnect %{service}?"
+      connect_to_facebook: "Facebookに接続する"
+      connect_to_twitter: "ツイッターに接続する"
+      disconnect: "切断"
+      edit_services: "サービスを編集する"
+      logged_in_as: "ログイン済みユーザ名："
+      really_disconnect: "%{service}から切断しますか。"
     inviter: 
-      click_link_to_accept_invitation: "Click this link to accept your invitation"
-      join_me_on_diaspora: "Join me on DIASPORA*"
+      click_link_to_accept_invitation: "招待を承諾するにはこのリンクにクリックしてください。"
+      join_me_on_diaspora: "ダイアスポラ＊に参加しませんか。"
     remote_friend: 
-      invite: "invite"
-      resend: "resend"
-  settings: "Settings"
+      invite: "招待"
+      resend: "再送"
+  settings: "設定"
   shared: 
     add_contact: 
       create_request: "ダイアスポラのハンドル名で検索"
       diaspora_handle: "diaspora@handle.org"
-      enter_a_diaspora_username: "Enter a Diaspora username:"
-      know_email: "Know their email address? You should invite them"
+      enter_a_diaspora_username: "ダイアスポラのユーザ名を入力してください。"
+      know_email: "メールアドレスをご存じなら招待しましょう！"
       your_diaspora_username_is: "あなたのハンドル名は%{diaspora_handle}です。"
     contact_list: 
       all_contacts: "全ての連絡先"
       cannot_remove: "連絡先を最後のアスペクトから除外することができません。（断絶したい場合は連絡先を削除してください。）"
     footer: 
-      logged_in_as: "logged in as %{name}"
+      logged_in_as: "%{name}としてログイン済"
       your_aspects: "アスペクト"
     invitations: 
-      by_email: "by Email"
-      dont_have_now: "You don't have any right now, but more invites are coming soon!"
-      from_facebook: "From Facebook"
-      invitations_left: "(%{count} left)"
-      invite_someone: "Invite someone"
-      invite_your_friends: "Find your friends"
-      invites: "Invites"
-      invites_closed: "Invites are currently closed on this Diaspora pod"
+      by_email: "メールで"
+      dont_have_now: "現在、招待権が残っていません。少々お待ち下さい。"
+      from_facebook: "Facebookから"
+      invitations_left: "（残り%{count}回）"
+      invite_someone: "誰かを招待する"
+      invite_your_friends: "知り合いを検索する"
+      invites: "招待"
+      invites_closed: "現在このダイアスポラポッドへの招待を締め切らせて頂いています"
     notification: 
-      new: "New %{type} from %{from}"
+      new: "%{from}さんから新しい%{type}"
     public_explain: 
-      logged_in: "logged in to %{service}"
-      manage: "manage connected services"
-      outside: "Public messages will be available for others outside of Diaspora to see."
-      title: "Set up connected services"
+      logged_in: "%{service}へログインしました。"
+      manage: "提携サービスを管理する"
+      outside: "公開投稿はダイアスポラ外の人にも表示されます。"
+      title: "提携サービスを設定する"
     publisher: 
-      add_photos: "add photos"
-      all: "all"
+      add_photos: "写真を追加する"
+      all: "すべて"
       all_contacts: "全ての連絡先"
-      click_to_share_with: "Click to share with: "
-      make_public: "make public"
-      post_a_message_to: "Post a message to %{aspect}"
-      posting: "Posting..."
-      public: "Public"
-      publishing_to: "publishing to: "
-      share: "Share"
-      share_with: "share with"
-      whats_on_your_mind: "what's on your mind?"
+      click_to_share_with: "クリックして次のアスペクトに共有："
+      make_public: "公開にする"
+      post_a_message_to: "%{aspect}に投稿する"
+      posting: "投稿中"
+      public: "公開"
+      publishing_to: "公開先："
+      share: "共有"
+      share_with: "共有先："
+      whats_on_your_mind: "いま何を考えている？"
     reshare: 
-      reshare: "Reshare"
+      reshare: "再共有"
     stream_element: 
-      dislike: "I dislike this"
-      like: "I like this"
+      dislike: "これ嫌い！"
+      like: "これ好き！"
   status_messages: 
     create: 
-      success: "Successfully mentioned: %{names}"
+      success: "%{names}を参照するのに成功しました。"
     destroy: 
-      failure: "Failed to delete post"
+      failure: "投稿を削除するのに失敗しました。"
     helper: 
-      no_message_to_display: "No message to display."
+      no_message_to_display: "表示するメッセージがありません。"
     new: 
-      mentioning: "Mentioning: %{person}"
+      mentioning: "%{person}さんのメンション"
     show: 
-      destroy: "Delete"
-      not_found: "Sorry, we couldn't find that post."
-      permalink: "permalink"
+      destroy: "削除"
+      not_found: "投稿が見つかりませんでした。"
+      permalink: "パーマリンク"
   stream_helper: 
     hide_comments: "コメントを非表示にする"
     show_comments: "すべてのコメントを表示する"
@@ -560,58 +561,58 @@ ja:
       nobody_talking: "%{tag}についての投稿はまだありません。"
       people_tagged_with: "%{tag}とタグ付けられている人々"
       posts_tagged_with: "#%{tag}とタグ付けられている投稿"
-  the_world: "the world"
+  the_world: "全世界"
   undo: "元に戻す"
   username: "ユーザ名"
   users: 
-    destroy: "Account successfully closed."
+    destroy: "アカウント閉鎖に成功しました。"
     edit: 
-      also_commented: "...someone also comments on your contact's post?"
-      change: "Change"
-      change_language: "Change Language"
-      change_password: "Change Password"
-      close_account: "Close Account"
-      comment_on_post: "...someone comments on your post?"
-      current_password: "Current password"
-      download_photos: "download my photos"
-      download_xml: "download my xml"
-      edit_account: "Edit account"
-      export_data: "Export Data"
-      mentioned: "...you are mentioned in a post?"
-      new_password: "New Password"
-      private_message: "...you receive a private message?"
-      receive_email_notifications: "Receive email notifications when..."
-      request_acceptence: "...your share request is accepted?"
-      request_received: "...you receive a new share request?"
-      your_email: "Your email"
-      your_handle: "ハンドル名"
+      also_commented: "他の人も連絡先の投稿にコメントしたとき"
+      change: "変更"
+      change_language: "言語変更"
+      change_password: "パスワード変更"
+      close_account: "アカウント閉鎖"
+      comment_on_post: "自分の投稿にコメントがあったとき"
+      current_password: "現在のパスワード"
+      download_photos: "写真をダウンロードする"
+      download_xml: "XMLをダウンロードする"
+      edit_account: "アカウント編集"
+      export_data: "データ出力"
+      mentioned: "投稿に自分がメンションされたとき"
+      new_password: "新しいパスワード"
+      private_message: "非公開メッセージが届いたとき"
+      receive_email_notifications: "通知メールの送信設定"
+      request_acceptence: "共有リクエストが承諾されたとき"
+      request_received: "共有リクエストが届いたとき"
+      your_email: "メールアドレス"
+      your_handle: "ダイアスポラのユーザ名"
     getting_started: 
       connect_on_diaspora: "ダイアスポラでつながる"
       connect_services: "他のサービスへ接続する"
-      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
+      could_not_find_anyone: "既にダイアスポラ＊を使っている知り合いが見つかりません。招待してみませんか。"
       edit_profile: "プロフィールを編集する"
       finished: "完了！"
       save_and_continue: "保存して次へ"
       signup_steps: "次の3ステップで登録を完成しましょう"
       skip: "初期設定をスキップする"
       step_2: 
-        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        find_your_friends_on_diaspora: "ダイアスポラ＊を使っているFacebook友達を検索してみませんか。"
         skip: "スキップ"
       step_3: 
         finish: "終了"
         people_already_on_diaspora: "ダイアスポラを既に使っている連絡先"
       welcome: "ダイアスポラへようこそ！"
     public: 
-      does_not_exist: "User %{username} does not exist!"
+      does_not_exist: "ユーザ名「%{username}」は存在しません。"
     update: 
-      email_notifications_changed: "メール配信の設定を変更しました"
+      email_notifications_changed: "メール通知の設定を変更しました。"
       language_changed: "言語の設定を変更しました"
       language_not_changed: "言語の選択に失敗しました"
       password_changed: "パスワードを変更しました"
       password_not_changed: "パスワードの変更に失敗しました"
   webfinger: 
-    fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
-    hcard_fetch_failed: "there was a problem fetching the hcard for %{account}"
-    no_person_constructed: "No person could be constructed from this hcard."
-    not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
-    xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
+    fetch_failed: "%{profile_url} のwebfingerプロフィールの取得に失敗しました。"
+    hcard_fetch_failed: "%{account}のhcard取得に問題が発生しました。"
+    no_person_constructed: "このhcardから連絡先人を生成することができませんでした。"
+    not_enabled: "%{account}のポッドではwebfingerが無効になっているようです。"
+    xrd_fetch_failed: "%{account}のxrd取得にエラーが発生しました。"
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index cabd0d784..8b47d9941 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -36,6 +36,7 @@ ko:
   all_aspects: "모든 애스펙"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "알 수 없는 사람"
       video_title: 
         unknown: "알 수 없는 비디오 제목"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 5f82d097d..e4e4e3e57 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -36,6 +36,7 @@ lt:
   all_aspects: "All aspects"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "nežinomas asmuo"
       video_title: 
         unknown: "Unknown Video Title"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 78529c29a..88ac70896 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -36,6 +36,7 @@ mk:
   all_aspects: "All aspects"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "непозната личност"
       video_title: 
         unknown: "Unknown Video Title"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 7ef93986e..bf4be313e 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -36,6 +36,7 @@ nb:
   all_aspects: "Alle aspekter"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "ukjent person"
       video_title: 
         unknown: "Ukjent Videotittel"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index efd75e466..b123007e2 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -36,6 +36,7 @@ nl:
   all_aspects: "Alle Aspecten"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "onbekend persoon"
       video_title: 
         unknown: "Onbekende Videotitel"
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index 0495143c6..1c2cf8fb5 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -36,6 +36,7 @@ pa:
   all_aspects: "All aspects"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "unknown person"
       video_title: 
         unknown: "Unknown Video Title"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 4d954ea8f..d138878d0 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -36,6 +36,7 @@ pl:
   all_aspects: "Wszystkie aspekty"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "nieznana osoba"
       video_title: 
         unknown: "Wideo bez nazwy"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 51e3fc255..9511ebff4 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -36,6 +36,7 @@ pt-BR:
   all_aspects: "All aspects"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "pessoa desconhecida"
       video_title: 
         unknown: "Vídeo sem título"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index b696ca945..641419bbb 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -36,6 +36,7 @@ pt-PT:
   all_aspects: "All aspects"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "utilizador(a) desconhecido(a)"
       video_title: 
         unknown: "Video sem título	"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index fdd285ca4..9e46661f8 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -36,6 +36,7 @@ ro:
   all_aspects: "All aspects"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "persoană necunoscută"
       video_title: 
         unknown: "Unknown Video Title"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index a25f28e10..1e108b2be 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -36,6 +36,7 @@ ru:
   all_aspects: "Все аспекты"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "неизвестная персона"
       video_title: 
         unknown: "Неизвестное название видеозаписи"
@@ -251,7 +252,7 @@ ru:
   no_results: "Результатов не найдено"
   notifications: 
     also_commented: "прокомментировал %{post_author}"
-    also_commented_deleted: "прокомментировать удаленое сообщение"
+    also_commented_deleted: "прокомментировал удаленое сообщение."
     comment_on_post: "комментариев на "
     deleted: "удален"
     helper: 
@@ -266,9 +267,9 @@ ru:
       and_others: "и %{number} других"
       mark_all_as_read: "Отметить все как прочитанные"
       notifications: "Уведомления"
-    mentioned: "упомянул вас в своих сообщениях"
+    mentioned: "упомянул вас в"
     new_request: "предлагает поделиться с вами."
-    post: "сообщение"
+    post: "сообщение."
     private_message: "послал Вам сообщение."
     request_accepted: "ваше приглашение принял[-а]"
   notifier: 
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index d27246bb6..0254aca0b 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -36,6 +36,7 @@ sk:
   all_aspects: "All aspects"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "neznáma osoba"
       video_title: 
         unknown: "Neznámy názov videa"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 7cc62da08..1cb1d22d3 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -36,6 +36,7 @@ sl:
   all_aspects: "Vse skupine"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "neznana oseba"
       video_title: 
         unknown: "Neznani video naslov"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index f650ef3cd..5aba71c97 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -36,6 +36,7 @@ sv:
   all_aspects: "Alla Aspekter"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "okänd person"
       video_title: 
         unknown: "Okänd videotitel"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index effa57213..c2d58bce1 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -36,6 +36,7 @@ tr:
   all_aspects: "All aspects"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "bilinmiyen kişiler"
       video_title: 
         unknown: "Unknown Video Title"
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index d8d8fff53..33013f111 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -36,6 +36,7 @@ zh-CN:
   all_aspects: "所有情景"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "未知用户"
       video_title: 
         unknown: "未知影片标题"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index f04bb23ca..c70cfc523 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -36,6 +36,7 @@ zh-TW:
   all_aspects: "所有面向"
   application: 
     helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "不明聯絡人"
       video_title: 
         unknown: "影片標題不明"
diff --git a/config/locales/javascript/javascript.ar.yml b/config/locales/javascript/javascript.ar.yml
new file mode 100644
index 000000000..5495b261e
--- /dev/null
+++ b/config/locales/javascript/javascript.ar.yml
@@ -0,0 +1,37 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+ar: 
+  javascripts: 
+    confirm_dialog: "هل أنت متأكد؟"
+    infinite_scroll: 
+      no_more: "لا توجد أية رسائل أخرى"
+    publisher: 
+      at_least_one_aspect: "عليك تحديد فئة واحدة على الأقل"
+    search_for: "إبحث عن {{name}}"
+    shared: 
+      contact_list: 
+        cannot_remove: "استحالة إخراج العضو من الفئة المحددة. (تريد قطع الاتصال مع هذا العضو، يجب عليك حذفه تماما)"
+    timeago: 
+      day: "منذ يوم"
+      days: "منذ %d أيام"
+      hour: "منذ ساعة"
+      hours: "منذ %d ساعات"
+      minute: "منذ دقيقة"
+      minutes: "منذ %d دقائق"
+      month: "منذ شهر"
+      months: "منذ %d شهور"
+      prefixAgo: "منذ"
+      prefixFromNow: "منذ الآن"
+      seconds: "منذ أقل من دقيقة"
+      suffixAgo: ""
+      suffixFromNow: ""
+      year: "منذ عام"
+      years: "منذ %d أعوام"
+    videos: 
+      unknown: "نوع فيديو غير معروف"
+      watch: "مشاهدة هذا الفيديو عبر {{provider}}"
+    web_sockets: 
+      disconnected: "The websocket is closed; posts will no longer be streamed live."
diff --git a/config/locales/javascript/javascript.el.yml b/config/locales/javascript/javascript.el.yml
index f6e0d2f45..1d387f405 100644
--- a/config/locales/javascript/javascript.el.yml
+++ b/config/locales/javascript/javascript.el.yml
@@ -7,7 +7,7 @@ el:
   javascripts: 
     confirm_dialog: "Είστε σίγουρος/η;"
     infinite_scroll: 
-      no_more: "No more posts."
+      no_more: "Δεν υπάρχουν άλλες δημοσιεύσεις."
     publisher: 
       at_least_one_aspect: "πρέπει να κάνετε δημοσίευση σε τουλάχιστον μια πτυχή"
     search_for: "Αναζήτηση για {{name}}"
diff --git a/config/locales/javascript/javascript.ja.yml b/config/locales/javascript/javascript.ja.yml
index 55785cdf6..5625b4988 100644
--- a/config/locales/javascript/javascript.ja.yml
+++ b/config/locales/javascript/javascript.ja.yml
@@ -7,13 +7,13 @@ ja:
   javascripts: 
     confirm_dialog: "本当にいいですか。"
     infinite_scroll: 
-      no_more: "投稿は以上です。"
+      no_more: "投稿はこれ以上ありません。"
     publisher: 
-      at_least_one_aspect: "少なくても一つのアスペクトへ投稿しなければなりません"
+      at_least_one_aspect: "アスペクトを選択してから投稿してください。"
     search_for: "{{name}}を検索する"
     shared: 
       contact_list: 
-        cannot_remove: "人を最後のアスペクトから除外することができません。（つながりを断絶したい場合は連絡先を削除してください。）"
+        cannot_remove: "人を最後のアスペクトから除外することができません。（絶交したい場合は連絡先を削除してください。）"
     timeago: 
       day: "1日"
       days: "%d日"
diff --git a/config/locales/javascript/javascript.ru.yml b/config/locales/javascript/javascript.ru.yml
index 1f9e99644..60aa6aede 100644
--- a/config/locales/javascript/javascript.ru.yml
+++ b/config/locales/javascript/javascript.ru.yml
@@ -34,4 +34,4 @@ ru:
       unknown: "Неизвестный видеоформат"
       watch: "Смотреть это видео на {{provider}}"
     web_sockets: 
-      disconnected: "The websocket is closed; posts will no longer be streamed live."
+      disconnected: "WebSocket закрыт; сообщения больше не будут транслироваться в прямом эфире."