diff --git a/config/locales/devise/devise.he.yml b/config/locales/devise/devise.he.yml
index c95c52171..141f71297 100644
--- a/config/locales/devise/devise.he.yml
+++ b/config/locales/devise/devise.he.yml
@@ -54,7 +54,7 @@ he:
         change_password: "החלפת הססמה שלי"
       new: 
         forgot_password: "שכחת את ססמתך?"
-        no_account: "No account with this email exsists.  If you are waiting for an invite, we are rolling them out as soon as possible"
+        no_account: "לא נמצא חשבון עם כתובת דוא״ל זו.  אם הזמנתך נמצאת בהליכי אישור, אנו נשתדל להפיץ את ההזמנות במהירות האפשרית"
         send_password_instructions: "שליחת הנחיות איפוס הססמה אלי"
       send_instructions: "בעוד מספר דקות תתקבל לתיבת הדוא״ל שלך הודעה עם הנחיות כיצד לאפס את ססמתך."
       updated: "ססמתך הוחלפה בהצלחה. נכנסת כעת."
@@ -88,7 +88,7 @@ he:
     unlocks: 
       new: 
         resend_unlock: "שליחת הוראות שחרור מחדש"
-      send_instructions: "בעוד מספר דקות תתקבל לתיבת הודא״ל שלך הודעה עם הנחיות כיצד לשחרר את חשבונך."
+      send_instructions: "בעוד מספר דקות תתקבל לתיבת הדוא״ל שלך הודעה עם הנחיות כיצד לשחרר את חשבונך."
       unlocked: "חשבונך שוחרר בהצלחה. נכנסת כעת."
   errors: 
     messages: 
diff --git a/config/locales/devise/devise.tr.yml b/config/locales/devise/devise.tr.yml
index 6ba82655d..eace106be 100644
--- a/config/locales/devise/devise.tr.yml
+++ b/config/locales/devise/devise.tr.yml
@@ -6,22 +6,22 @@
 tr: 
   devise: 
     confirmations: 
-      confirmed: "Hesabınız dogrulanmıstır. Şu anda giriş yapmış oluyorsunuz."
+      confirmed: "Hesabınız başarıyla doğrulanmıştır. Şu anda giriş yapmış bulunuyorsunuz."
       new: 
-        resend_confirmation: "Resend confirmation instructions"
-      send_instructions: "Kısa bir süre içersinde hesabınızı nasıl dogruluycaginiza dair bir email alicaksiniz."
+        resend_confirmation: "Doğrulama talimatlarını tekrar gönder"
+      send_instructions: "Kısa bir süre içerisinde hesabınızı nasıl doğrulayacağınıza dair bir e-posta alacaksınız."
     failure: 
-      inactive: "Hesabınız aktive edilmemiştir daha."
-      invalid: "Yanlış email veya şifre."
+      inactive: "Hesabınız henüz aktive edilmemiştir."
+      invalid: "Yanlış email veya parola."
       invalid_token: "Yanlış doğrulama kodu."
       locked: "Hesabınız kilitlenmiştir."
-      timeout: "Zamanınız sona erdi, devam etmek için lütfen tekrar giriş yapın."
-      unauthenticated: "Devam etmeden once bir hesap açtırmalı veya hesabınızla giriş yapmalısınız."
-      unconfirmed: " Devam etmeden once hesabınızı doğrulamalısınız."
+      timeout: "Zaman aşımı oldu, devam etmek için lütfen tekrar giriş yapın."
+      unauthenticated: "Devam etmeden önce bir hesap açtırmalı veya hesabınızla giriş yapmalısınız."
+      unconfirmed: "Devam etmeden önce hesabınızı doğrulamalısınız."
     invitations: 
       invitation_token_invalid: "Davet kodu doğrulanamadı!"
       send_instructions: "Davetiniz gönderildi."
-      updated: "Şifreniz başarıyla oluşturuldu. Şu anda bağlısınız."
+      updated: "Şifreniz başarıyla ayarlandı. Şu anda giriş yapmış bulunuyorsunuz."
     mailer: 
       confirmation_instructions: 
         confirm: "Hesabımı doğrula"
@@ -30,68 +30,68 @@ tr:
       hello: "Merhaba %{email}!"
       invitation: 
         accept: "Daveti kabul et"
-        ignore: "Eğer daveti kabul etmek istemiyorsanız bu e-postayı dikkate almayın."
-        no_account_till: "Hesabınız yukarıdaki bağlantıya tıklayıp üye olmadan oluşturulmayacaktır."
+        ignore: "Eğer daveti kabul etmek istemiyorsanız, bu e-postayı yoksayın."
+        no_account_till: "Hesabınız siz yukarıdaki bağlantıya tıklayıp üye olmadan oluşturulmayacaktır."
         subject: "Bir arkadaşınız sizin Diaspora'ya katılmanızı istiyor!"
       inviters: 
-        accept_at: ",  %{url}, aşağıdaki linki tıklayarak bu daveti kabul edebilirsiniz."
+        accept_at: ",  %{url}, aşağıdaki linke tıklayarak bunu kabul edebilirsiniz."
         has_invited_you: "%{name} sizi Diaspora'ya katılmanız için davet etti"
-        have_invited_you: "%{names} have invited you to join Diaspora"
+        have_invited_you: "%{names} sizi Diaspora'ya katılmanız için davet etti"
       reset_password_instructions: 
         change: "Şifremi değiştir"
-        ignore: "Eğer talepte bulunmadıysanız, bu e-postayı dikkate almayın."
-        someone_requested: "Şifre değiştirme talebi aldık, şifrenizi değiştirmek için aşağıdaki bağlantıya tıklayın."
+        ignore: "Eğer bunu siz talep etmediyseniz, lütfen bu e-postayı yoksayın."
+        someone_requested: "Parola değiştirme talep edildi, parolanızı değiştirmek için aşağıdaki bağlantıya tıklayın."
         subject: "Şifre yenileme talimatları"
-        wont_change: "Şifreniz yukarıdaki bağlantıya tıklayıp yeni bir şifre oluşturana kadar değişmeyecektir."
+        wont_change: "Parolanız siz yukarıdaki bağlantıya tıklayıp yeni bir parola oluşturana kadar değişmeyecektir."
       unlock_instructions: 
-        account_locked: "Hesabınız çok fazla yanlış giriş olduğu için kilitlendi."
-        click_to_unlock: "Hesabınızı açmak için aşağıdaki linke tıklayın:"
+        account_locked: "Hesabınız çok fazla yanlış giriş yaptığınız için kilitlendi."
+        click_to_unlock: "Hesabınızın kilidini açmak için aşağıdaki linke tıklayın:"
         subject: "Talimatları Aç"
-        unlock: "Hesabımı Aç"
+        unlock: "Hesabımın Kilidini Aç"
       welcome: "Merhaba %{email}!"
     passwords: 
       edit: 
-        change_password: "Şifre Değiştirme"
+        change_password: "Şifre değiştirme"
       new: 
         forgot_password: "Şifrenizi mi unuttunuz?"
-        no_account: "No account with this email exsists.  If you are waiting for an invite, we are rolling them out as soon as possible"
-        send_password_instructions: "Şifre yenileme talimatları gönder"
-      send_instructions: "Kisa bir süre içersinde şifrenizi nasıl yeniliyceğinizi açıklıyan bir email alıcaksınız."
-      updated: "Şifreniz değistirilmiştir. Şu anda giriş yapmış oluyorsunuz."
+        no_account: "Bu posta adresiyle alınmış hesab bulunmamaktadır.  Eğer bir davetiye için bekliyorsanız, en kısa zamanda size ulaştıracağız."
+        send_password_instructions: "Bana parola yenileme talimatları gönder"
+      send_instructions: "Bir kaç dakika içerisinde parolanızı nasıl sıfırlayacağınızı açıklıyan bir email alıcaksınız."
+      updated: "Şifreniz değiştirilmiştir. Şu anda giriş yapmış bulunuyorsunuz."
     registrations: 
-      destroyed: "Hoşçakal! Hesabiniz yok edildi. Umuyoruz sizi tekrar gorüceğiz yakınlarda."
-      signed_up: "Basarıyla kayıt yaptınız. Dogrulama emaili size gonderilmistir."
+      destroyed: "Hoşçakalın! Hesabiniz iptal edildi. Umarız sizi yakında tekrar gorürüz."
+      signed_up: "Basarıyla kayıt yaptınız. Dogrulama, e-postanıza gonderilmistir."
       updated: "Hesabinizi başarili bir şekilde yenilediniz."
     sessions: 
       new: 
-        alpha_software: "Alphae programını kullanmak üzeresiniz."
-        bugs_and_feedback: "Sitede bazı buglarla karşılaşabilirsiniz.karşılaştığınız herhangi bug için sağüstteki feedback butonunu kullanmanızı tavsiye ederiz. Raporlarınız bize ulaşır ulaşmaz,sorunu düzeltmek için çalışacağız."
-        bugs_and_feedback_mobile: "Be advised, you will experience bugs.  We encourage you to report any hiccups!  We will work as fast as we can to resolve any issues you report."
+        alpha_software: "Alpha programını kullanmak üzeresiniz."
+        bugs_and_feedback: "Sitede bazı hatalarla karşılaşabilirsiniz. Karşılaştığınız herhangi hata için sağ üstteki Geribildirim butonunu kullanmanızı tavsiye ederiz. Raporlarınız bize ulaşır ulaşmaz, sorunu düzeltmek için çalışacağız."
+        bugs_and_feedback_mobile: "Aklınızda bulunsun, hatalarla karşılacaksınız. Karşılaştığınız hataları bildirmenizi istiyoruz.  Bildiriminizi alır almaz konu hakkında çalışmaya başlayacağız."
         login: "Giriş"
-        modern_browsers: "sadece güncel tarayıcıları destekler."
+        modern_browsers: "sadece güncel tarayıcılar desteklenir"
         password: "Şifre"
         remember_me: "Beni Hatırla"
         sign_in: "Giriş"
         username: "Kullanıcı Adı"
       signed_in: "Başarıyla giriş yaptınız."
-      signed_out: "Başarıyla çıkıs yaptınız."
+      signed_out: "Başarıyla çıkış yaptınız."
     shared: 
       links: 
         forgot_your_password: "Şifrenizi mi unuttunuz?"
-        receive_confirmation: "Didn't receive confirmation instructions?"
-        receive_unlock: "Didn't receive unlock instructions?"
+        receive_confirmation: "Hesap doğrulama talimatlarını almadınız mı?"
+        receive_unlock: "Kilit açma talimatlarını almadınız mı?"
         sign_in: "Giriş Yap"
         sign_up: "Üye Ol"
-        sign_up_closed: "Open signups are closed at this time."
+        sign_up_closed: "Şu an için yeni kayıt alınamıyor."
       mail_signup_form: 
-        sign_up_for_an_invite: "Sign up for an invite!"
+        sign_up_for_an_invite: "Bir davetiye için kaydolun!"
     unlocks: 
       new: 
         resend_unlock: "Tekrar gönder"
-      send_instructions: "Kisa bir süre içersinde hesabınızı nasıl kilit altinda çikarabiliceginize dair bir email alıcaksınız."
-      unlocked: "Heabiniz kilit altindan çıkartılmıstır. Şu anda giriş yapmıs oluyorsunuz"
+      send_instructions: "Bir kaç dakika içerisinde hesabınızın kilidini nasıl açabileceğinize dair bir email alıcaksınız."
+      unlocked: "Hesabınızın kilidi açılmıştır. Şu anda giriş yapmış bulunuyorsunuz."
   errors: 
     messages: 
       already_confirmed: "zaten doğrulandı"
-      not_found: "bulunmadi"
+      not_found: "bulunamadı"
       not_locked: "kilitlenmedi"
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index e1922f120..d1c42aee5 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -422,6 +422,7 @@ ar:
       all: "all"
       all_contacts: "all contacts"
       make_public: "make public"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
       share: "مشاركة"
diff --git a/config/locales/diaspora/ca.yml b/config/locales/diaspora/ca.yml
index a8d8876de..a777b2149 100644
--- a/config/locales/diaspora/ca.yml
+++ b/config/locales/diaspora/ca.yml
@@ -422,6 +422,7 @@ ca:
       all: "todo"
       all_contacts: "todos los contactos"
       make_public: "hacer público"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Publicar un mensaje a %{aspect}"
       posting: "Posteando..."
       share: "Compartir"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index d90630782..ad8bee556 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -197,7 +197,7 @@ cs:
     index: 
       mark_all_as_read: "Označit vše jako přečtené"
       notifications: "Oznámení"
-    mentioned: "has mentioned you in their"
+    mentioned: "vás zmínil v jejich"
     new_request: "nabídnul vám sdílení."
     post: "zpráva"
     request_accepted: "akceptoval vaši žádost o sdílení."
@@ -205,7 +205,7 @@ cs:
     also_commented: 
       commented: "také komentoval příspěvek od %{post_author}:"
       sign_in: "Přihlašte se pro zobrazení."
-      subject: "%{name} také komentoval."
+      subject: "%{name} se také vyjádřil k vašemu příspěvku."
     comment_on_post: 
       commented: "komentoval váš příspěvek:"
       sign_in: "Přihlašte se pro zobrazení."
@@ -214,9 +214,9 @@ cs:
     hello: "Vítej %{name}!"
     love: "s láskou,"
     mentioned: 
-      mentioned: "mentioned you in a post:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has mentioned you on Diaspora*"
+      mentioned: "zmínil jste v příspěvku:"
+      sign_in: "Přihlaste se pro zobrazení."
+      subject: "%{name} vás zmínil na Diaspoře*"
     new_request: 
       just_sent_you: "just sent you a contact request on Diaspora*"
       sign_in: "Přihlaste se zde"
@@ -422,6 +422,7 @@ cs:
       all: "všechny"
       all_contacts: "všechny kontakty"
       make_public: "vytvořit veřejnou"
+      mention_helper_text: "pokud chcete někoho zmínit, stiskněte tlačítko '@' a začněte psát jeho jméno"
       post_a_message_to: "Poslat zprávu do %{aspect}"
       posting: "Posílání..."
       share: "Sdělit"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 8efca0065..193b908a1 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -422,6 +422,7 @@ cy:
       all: "all"
       all_contacts: "all contacts"
       make_public: "make public"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
       share: "Share"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 6eacb453d..2a04b0cfc 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -422,6 +422,7 @@ da:
       all: "alle"
       all_contacts: "alle kontaktpersoner"
       make_public: "offentliggør"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Send en besked til %{aspect}"
       posting: "Sender..."
       share: "Del"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 6abf0f26a..d39a3ae18 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -10,7 +10,7 @@ de:
   _comments: "Kommentare"
   _contact: "Kontakt"
   _contacts: "Kontakte"
-  _home: "Start"
+  _home: "Startseite"
   _more: "Mehr"
   _photos: "Fotos"
   _services: "Dienste"
@@ -72,7 +72,7 @@ de:
       aspect_not_empty: "Aspekt ist nicht leer"
       remove: "entfernen"
     index: 
-      handle_explanation: "Das ist deine Diaspora-Adresse. Du kannst sie wie eine E-Mail-Adresse weitergeben, damit andere Nutzer mit dir Kontakt aufnehmen können."
+      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"
     manage: 
       add_a_new_aspect: "Neuen Aspekt hinzufügen"
@@ -91,7 +91,7 @@ de:
     no_contacts_message: 
       add_contact: "Kontakt hinzufügen"
       add_contact_to: "Jemanden zum Aspekt %{aspect_name} hinzufügen"
-      invite: "Lade jemanden zu Diaspora ein!"
+      invite: "Lade jemanden zu Diaspora* ein!"
       nobody: "Bring die dir wichtigen Leute zu Diaspora!"
       nobody_in_aspect: "‚%{aspect_name}‘ ist leer."
     no_posts_message: 
@@ -117,7 +117,7 @@ de:
     few: "%{count} Kontakte"
     one: "1 Kontakt"
     other: "%{count} Kontakte"
-    zero: "keine Kontakte"
+    zero: "Keine Kontakte"
   date: 
     formats: 
       birthday: "%d. %B"
@@ -135,13 +135,13 @@ de:
       already_account: "bereits registriert?"
       choice: "Deine Entscheidung"
       choice_explanation: "Diaspora lässt dich deine Kontakte in Gruppen einordnen. Deine Fotos, Geschichten und Witze werden durch diese Aspekte nur mit den Menschen geteilt, für die sie gedacht sind – einzigartig bei Diaspora."
-      learn_about_host: "Du willst deinen eigenen Diaspora-Server betreiben?"
+      learn_about_host: "Du willst deinen eigenen Diaspora*-Server betreiben?"
       login_here: "hier anmelden"
       ownership: "Dein Eigentum"
       ownership_explanation: "Deine Bilder gehören dir. Um sie zu teilen, musst du darauf nicht verzichten: Alles, was du auf Diaspora teilst, bleibt dein Eigentum – mit voller Kontrolle über die Verbreitung."
       share_what_you_want: "Teile was du willst, mit wem du willst."
-      simplicity: "ganz einfach"
-      simplicity_explanation: "Diaspora macht Teilen klar und einfach – dasselbe gilt für den Schutz deiner Privatsphäre. Diaspora ist von sich aus privat, seitenweise Einstellungen für die Profilsicherheit sind nicht nötig."
+      simplicity: "Ganz einfach"
+      simplicity_explanation: "Diaspora* macht das Teilen von Inhalten klar und einfach – dasselbe gilt für den Schutz deiner Privatsphäre. Diaspora* ist von sich aus privat, seitenweise Einstellungen für die Profilsicherheit sind nicht nötig."
       tagline_first_half: "Teile was du willst,"
       tagline_second_half: "mit wem du willst."
   invitations: 
@@ -160,7 +160,7 @@ de:
       aspect: "Aspekt"
       comma_seperated_plz: "Du kannst mehrere E-Mail-Adressen eintragen. Trenne sie mit Kommata."
       if_they_accept_info: "wenn sie akzeptieren, werden sie zu dem Aspekt hinzugefügt, in den Du sie eingeladen hast."
-      invite_someone_to_join: "Lade jemanden zu Diaspora ein!"
+      invite_someone_to_join: "Lade jemanden zu Diaspora* ein!"
       personal_message: "Persönliche Nachricht"
       send_an_invitation: "Eine Einladung senden"
       send_invitation: "Einladung senden"
@@ -197,38 +197,38 @@ de:
     index: 
       mark_all_as_read: "Markiere alle als gelesen"
       notifications: "Benachrichtigungen"
-    mentioned: "has mentioned you in their"
-    new_request: "hat angeboten, mit Dir zu teilen."
+    mentioned: "hat dich erwähnt in "
+    new_request: "hat angeboten, mit dir zu teilen."
     post: "Beitrag"
     request_accepted: "hat deine Teilen-Anfrage angenommen."
   notifier: 
     also_commented: 
       commented: "hat den Beitrag von %{post_author} ebenfalls kommentiert:"
-      sign_in: "Melde Dich an, um ihn anzuzeigen."
-      subject: "%{name} hat einen Kommentar hinterlassen."
+      sign_in: "Melde dich an, um ihn anzuzeigen."
+      subject: "%{name} hat auch einen Kommentar hinterlassen."
     comment_on_post: 
-      commented: "hat Deinen Eintrag kommentiert:"
-      sign_in: "Melde Dich an, um ihn anzuzeigen."
-      subject: "%{name} hat Deinen Eintrag kommentiert."
+      commented: "hat deinen Beitrag kommentiert:"
+      sign_in: "Melde dich an, um ihn anzuzeigen."
+      subject: "%{name} hat deinen Beitrag kommentiert."
     diaspora: "der Diaspora E-Mail-Roboter"
     hello: "Hallo %{name}!"
     love: "Gruß,"
     mentioned: 
-      mentioned: "mentioned you in a post:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has mentioned you on Diaspora*"
+      mentioned: "hat dich in einem Beitrag erwähnt:"
+      sign_in: "Melde dich an um sie zu sehen."
+      subject: "%{name} hat dich auf Diaspora* erwähnt"
     new_request: 
-      just_sent_you: "hat Dir gerade eine Kontakt-Anfrage auf Diaspora* geschickt"
+      just_sent_you: "hat dir gerade eine Kontakt-Anfrage auf Diaspora* geschickt"
       sign_in: "Melde dich hier an"
       subject: "Neue Diaspora* Kontakt-Anfrage von %{from}"
       try_it_out: "Probier’s aus!"
     request_accepted: 
-      accepted: "hat Deine Kontakt-Anfrage akzeptiert!"
+      accepted: "hat deine Kontakt-Anfrage akzeptiert!"
       sign_in: "Hier anmelden"
       subject: "%{name} hat deine Kontakt-Anfrage auf Diaspora* akzeptiert"
     single_admin: 
       admin: "Dein Diaspora-Administrator"
-      subject: "Eine Nachricht Dein Diaspora-Konto betreffend:"
+      subject: "Eine Nachricht dein Diaspora*-Konto betreffend:"
     thanks: "Danke,"
   ok: "OK"
   or: "oder"
@@ -241,10 +241,10 @@ de:
     aspect_list: 
       edit_membership: "bearbeite die Aspekt-Zugehörigkeit"
     edit: 
-      allow_search: "Erlaube anderen Diaspora-Nutzern, nach Dir zu suchen"
+      allow_search: "Erlaube anderen Diaspora-Nutzern, nach dir zu suchen"
       edit_profile: "Profil bearbeiten"
       first_name: "Vorname"
-      info_available_to: "Diese Infos werden für alle verfügbar sein, mit denen du bei Diaspora verbunden bist."
+      info_available_to: "Diese Infos werden für alle verfügbar sein, mit denen du bei Diaspora* verbunden bist."
       last_name: "Nachname"
       update_profile: "Profil aktualisieren"
       your_bio: "Deine Beschreibung"
@@ -257,7 +257,7 @@ de:
       people_on_pod_are_aware_of: "Leute auf dem Pod wissen von"
       results_for: "Ergebnisse für %{params}"
     index: 
-      couldnt_find_them_send_invite: "Konntest Du die gesuchte Person nicht finden? Schicke eine Einladung!"
+      couldnt_find_them_send_invite: "Konntest du die gesuchte Person nicht finden? Schicke eine Einladung!"
       no_one_found: "… und niemand wurde gefunden."
       no_results: "Hey! Du musst nach etwas suchen."
       results_for: "Suchergebnisse für"
@@ -306,7 +306,7 @@ de:
     new: 
       back_to_list: "Zurück zur Liste"
       new_photo: "Neues Foto"
-      post_it: "Teile es!"
+      post_it: "Teilen!"
     new_photo: 
       empty: "{file} ist leer, bitte wähle erneut Dateien aus."
       invalid_ext: "{file} hat keine gültige Erweiterung. Nur {extensions} sind erlaubt."
@@ -346,8 +346,8 @@ de:
       enter_password: "Gib ein Passwort ein"
       enter_password_again: "Gib das gleiche Passwort wie eben ein"
       enter_username: "Wähle einen Benutzernamen (nur Buchstaben, Nummern und Unterstriche)"
-      sign_up: "Registrieren"
-      sign_up_for_diaspora: "Ein Diaspora-Konto anlegen"
+      sign_up: "Anmelden"
+      sign_up_for_diaspora: "Bei Diaspora* anmelden"
   requests: 
     create: 
       sending: "Senden …"
@@ -374,8 +374,8 @@ de:
         few: "%{count} Freunde"
         one: "Ein Freund"
         other: "%{count} Freunde"
-        zero: "keine Freunde"
-      invite_your_friends_from: "Lade Deine Freunde von %{service} ein"
+        zero: "Keine Freunde"
+      invite_your_friends_from: "Lade deine Freunde von %{service} ein"
       not_connected: "nicht verbunden"
     index: 
       connect_to_facebook: "Mit Facebook verbinden"
@@ -397,7 +397,7 @@ de:
       diaspora_handle: "diaspora@beispiel.org"
       enter_a_diaspora_username: "Gib einen Diaspora-Benutzernamen ein:"
       know_email: "Du kennst die E-Mail-Adresse? Sende eine Einladung!"
-      your_diaspora_username_is: "Deine Diaspora-Adresse ist: %{diaspora_handle}"
+      your_diaspora_username_is: "Dein Diaspora* Nutzername ist: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Alle Kontakte"
       cannot_remove: "Kontakt kann nicht aus dem letzten Aspekt entfernt werden. Wenn du nicht länger verbunden sein willst, lösche den Kontakt."
@@ -407,9 +407,9 @@ de:
       from_facebook: "von Facebook"
       invitations_left: "(%{count} übrig)"
       invite_someone: "Jemanden einladen"
-      invite_your_friends: "Lade Deine Freunde ein"
+      invite_your_friends: "Lade deine Freunde ein"
       invites: "Einladungen"
-      invites_closed: "Einladungen sind auf diesem Diaspora-Pod derzeit nicht verfügbar."
+      invites_closed: "Einladungen sind auf diesem Diaspora* Pod derzeit nicht verfügbar."
     notification: 
       new: "Neue %{type} von %{from}"
     public_explain: 
@@ -422,11 +422,12 @@ de:
       all: "alle"
       all_contacts: "Alle Kontakte"
       make_public: "öffentlich machen"
+      mention_helper_text: "um jemanden zu erwähnen, drücke '@' und beginne den Namen zu schreiben"
       post_a_message_to: "Sende eine Nachricht an %{aspect}"
       posting: "Senden …"
       share: "Teilen"
       share_with: "Teile mit"
-      whats_on_your_mind: "Woran denkst Du gerade?"
+      whats_on_your_mind: "Woran denkst du gerade?"
     reshare: 
       reshare: "Erneut senden an"
   status_messages: 
@@ -454,28 +455,28 @@ de:
       close_account: "Konto schließen"
       current_password: "Derzeitiges Passwort"
       download_photos: "Meine Fotos herunterladen"
-      download_xml: "Mein XML herunterladen"
+      download_xml: "Meine Daten herunterladen (XML)"
       edit_account: "Konto bearbeiten"
       email_notifications: "E-Mail-Benachrichtigungen"
       export_data: "Daten exportieren"
       new_password: "Neues Passwort"
       receive_email_notifications: "E-Mail-Benachrichtigungen empfangen?"
       your_email: "Deine E-Mail-Adresse"
-      your_handle: "Deine Diaspora-Adresse"
+      your_handle: "Deine Diaspora* Adresse"
     getting_started: 
-      connect_on_diaspora: "Mit Diaspora verbinden"
-      connect_services: "Mit Deinen anderen Diensten verbinden"
+      connect_on_diaspora: "Mit Diaspora* verbinden"
+      connect_services: "Mit deinen anderen Diensten verbinden"
       edit_profile: "Bearbeite dein Profil"
       finished: "Fertig!"
       save_and_continue: "Speichern und weiter"
       signup_steps: "Erledige folgende drei Schritte, um deine Registrierung zu vervollständigen:"
       skip: "Erste Schritte überspringen"
       step_2: 
-        find_your_friends_on_diaspora: "Möchtest Du Deine Facebook-Freunde in Diaspora finden?"
+        find_your_friends_on_diaspora: "Möchtest du deine Facebook-Freunde in Diaspora* finden?"
         skip: "Überspringen"
       step_3: 
         finish: "Beenden"
-        people_already_on_diaspora: "Leute, die schon bei Diaspora sind"
+        people_already_on_diaspora: "Leute, die schon bei Diaspora* sind"
       welcome: "Willkommen bei Diaspora!"
     public: 
       does_not_exist: "Benutzer %{username} existiert nicht!"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index a2824c860..009f6970a 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -422,6 +422,7 @@ el:
       all: "όλα"
       all_contacts: "όλες οι επαφές"
       make_public: "Δημοσιοποίησε το"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Αναρτήστε ένα μήνυμα στο %{aspect}"
       posting: "Ανάρτηση..."
       share: "Μοιράσου"
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 512f55112..04535950f 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -422,6 +422,7 @@ en_shaw:
       all: "𐑷𐑤"
       all_contacts: "𐑷𐑤 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
       make_public: "𐑥𐑱𐑒 𐑐𐑳𐑚𐑤𐑦𐑒"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "𐑐𐑴𐑕𐑑 𐑩 𐑥𐑧𐑕𐑩𐑡 𐑑 %{aspect}"
       posting: "𐑐𐑴𐑕𐑑𐑦𐑙..."
       share: "𐑖𐑺"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index e0da784c0..f8b855a2d 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -422,6 +422,7 @@ eo:
       all: "all"
       all_contacts: "all contacts"
       make_public: "make public"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
       share: "Share"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 4cc6204e0..c340054df 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -422,6 +422,7 @@ es-CL:
       all: "todo"
       all_contacts: "todos los contactos"
       make_public: "hacer público"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Postear un mensaje a %{aspect}"
       posting: "Posteando..."
       share: "Compartir"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 79968f380..be2810f2b 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -422,6 +422,7 @@ es:
       all: "todo"
       all_contacts: "Todos los contactos"
       make_public: "Publicar"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Enviar un mensaje a %{aspect}"
       posting: "Publicando..."
       share: "Compartir"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 5cc53d684..bab20216f 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -422,6 +422,7 @@ fi:
       all: "kaikki"
       all_contacts: "kaikki kontaktit"
       make_public: "tee julkiseksi"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Lähetä viesti näkymään %{aspect}"
       posting: "Lähetetään..."
       share: "Jaa"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 47344c594..752cc5ee6 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -422,6 +422,7 @@ fr:
       all: "tous"
       all_contacts: "tous les contacts"
       make_public: "rendre public"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Publier un message dans %{aspect}"
       posting: "Publication…"
       share: "Partager"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index 78b351ba2..279207a40 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -422,6 +422,7 @@ ga:
       all: "gach rud"
       all_contacts: "gach teagmháil"
       make_public: "dean phoiblí"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Chuir teachtaireach chuig %{aspect}"
       posting: "Póstáil..."
       share: "Roinn"
diff --git a/config/locales/diaspora/gl-ES.yml b/config/locales/diaspora/gl-ES.yml
index aac20f661..ffe8e172f 100644
--- a/config/locales/diaspora/gl-ES.yml
+++ b/config/locales/diaspora/gl-ES.yml
@@ -422,6 +422,7 @@ gl-ES:
       all: "todos"
       all_contacts: "todos os contactos"
       make_public: "facer público"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Deixar un mensaxe en %{aspect}"
       posting: "Publicando..."
       share: "Compartir"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index ab7179fe2..84374173e 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -6,12 +6,12 @@
 he: 
   _aspect: "היבט"
   _aspects: "היבטים"
-  _comment: "Comment"
+  _comment: "תגובה"
   _comments: "תגובות"
   _contact: "איש קשר"
   _contacts: "אנשי קשר"
   _home: "בית"
-  _more: "More"
+  _more: "המשך"
   _photos: "תמונות"
   _services: "שירותים"
   account: "חשבון"
@@ -53,8 +53,8 @@ he:
       success: "איש הקשר נוסף בהצלחה להיבט."
     aspect_contacts: 
       done_editing: "סיום העריכה"
-    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: "יצירת ההיבט נכשלה."
       success: "ההיבט החדש שלך %{name} נוצר"
@@ -63,10 +63,10 @@ he:
     edit: 
       add_existing: "הוספת איש קשר קיים"
       confirm_remove_aspect: "האם אכן ברצונך למחוק את ההיבט?"
-      make_aspect_list_visible: "make aspect list visible to others in aspect"
+      make_aspect_list_visible: "הפיכת רשימת ההיבטים לגלויה לאחרים בהיבט"
       remove_aspect: "מחיקת היבט זה"
       rename: "שינוי שם"
-      save: "Save"
+      save: "שמירה"
     helper: 
       are_you_sure: "האם אכן ברצונך למחוק היבט זה?"
       aspect_not_empty: "ההיבט אינו ריק"
@@ -120,9 +120,9 @@ he:
     zero: "אין אנשי קשר"
   date: 
     formats: 
-      birthday: "%B %d"
-      birthday_with_year: "%B %d %Y"
-      fullmonth_day: "%B %d"
+      birthday: "ה־%d ב%B"
+      birthday_with_year: "ה־%d ב%B %Y"
+      fullmonth_day: "ה־%d ב%B"
   delete: "מחיקה"
   email: "דוא״ל"
   error_messages: 
@@ -167,12 +167,12 @@ he:
       to: "אל"
   layouts: 
     application: 
-      have_a_problem: "Have a problem? Find an answer here"
-      logged_in_as: "logged in as %{name}"
+      have_a_problem: "נתקלת בבעיות? ניתן למצוא את התשובה להלן"
+      logged_in_as: "נכנסת בשם %{name}"
       powered_by: "מופעל על גבי דיאספורה*"
-      toggle: "toggle mobile site"
+      toggle: "הפעלה/נטרול האתר לניידים"
       whats_new: "מה חדש?"
-      your_aspects: "your aspects"
+      your_aspects: "ההיבטים שלך"
     header: 
       account_settings: "הגדרות החשבון"
       blog: "בלוג"
@@ -181,7 +181,7 @@ he:
       login: "כניסה"
       logout: "יציאה"
       view_profile: "צפייה בפרופיל"
-  more: "More"
+  more: "המשך"
   new_notifications: "%{count} התרעות חדשות"
   new_requests: 
     few: "%{count} בקשות חדשות!"
@@ -195,9 +195,9 @@ he:
     comment_on_post: "הגיב/ה על ה"
     deleted: "נמחקה"
     index: 
-      mark_all_as_read: "Mark All as Read"
+      mark_all_as_read: "סימון הכול כלאחר קריאה"
       notifications: "התרעות"
-    mentioned: "has mentioned you in their"
+    mentioned: "הזכיר/ה אותך ב־"
     new_request: "הציע/ה לשתף אתך."
     post: "רשומה"
     request_accepted: "קיבל/ה את בקשת השיתוף שלך."
@@ -205,18 +205,18 @@ he:
     also_commented: 
       commented: "גם כן הגיב/ה על הרשומה של %{post_author}:"
       sign_in: "יש להיכנס כדי לצפות בזה."
-      subject: "%{name} גם כן הגיב/ה."
+      subject: "%{name} גם כן הגיב/ה על הרשומה של איש הקשר שלך."
     comment_on_post: 
-      commented: "הגיב/ה על הרשומה שלך!"
+      commented: "הגיב/ה על הרשומה שלך:"
       sign_in: "יש להיכנס כדי לצפות בזה."
       subject: "%{name} הגיב/ה על הרשומה שלך."
     diaspora: "רובוט הדוא״ל של דיאספורה"
     hello: "שלום %{name}!"
     love: "באהבה,"
     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} ב־Diaspora*"
     new_request: 
       just_sent_you: "שלח/ה לך בקשת חברות בדיאספורה*"
       sign_in: "כניסה מכאן"
@@ -224,7 +224,7 @@ he:
       try_it_out: "מאוד כדאי לבדוק זאת."
     request_accepted: 
       accepted: "קיבל/ה את בקשת ההתקשרות שלך!"
-      sign_in: "Sign in here"
+      sign_in: "כניסה מכאן"
       subject: "בקשת ההתקשרות שלך התקבלה על ידי %{name} בדיאספורה*"
     single_admin: 
       admin: "מנהל הדיאספורה שלך"
@@ -280,14 +280,14 @@ he:
       share_with: "התחלת השיתוף עם %{name}"
     show: 
       does_not_exist: "אדם זה אינו קיים!"
-      incoming_request: "קיבלת בקשה נכנסת מאדם זה."
+      incoming_request: "ברצונו/ה של %{name} לשתף אתך"
       no_posts: "אין רשומות להצגה!"
       not_connected: "אין לך שיתוף עם %{name}"
       recent_posts: "רשומות אחרונות"
       recent_public_posts: "הרשומות הציבוריות האחרונות"
       return_to_aspects: "באפשרותך לחזור לעמוד ההיבטים שלך"
       similar_contacts: "אנשי קשר דומים"
-      start_sharing: "start sharing"
+      start_sharing: "התחלת השיתוף"
       to_accept_or_ignore: "כדי לקבל או לדחות אותה."
     update: 
       failed: "אירע כשל בעדכון הפרופיל"
@@ -317,7 +317,7 @@ he:
     photo: 
       view_all: "צפייה בכל התמונות של %{name}"
     show: 
-      collection_permalink: "collection permalink"
+      collection_permalink: "קישור קבוע לאוסף"
       delete_photo: "מחיקת תמונה"
       edit: "עריכה"
       edit_delete_photo: "עריכת תיאור תמונה / מחיקת תמונה"
@@ -371,12 +371,12 @@ he:
       error: "אירעה שגיאה בעת ההתחברות לשירות זה"
     finder: 
       friends: 
-        few: "%{count} friends"
-        one: "1 friend"
-        other: "%{count} friends"
-        zero: "no friends"
-      invite_your_friends_from: "Invite your friends from %{service}"
-      not_connected: "not connected"
+        few: "%{count} חברים"
+        one: "חבר אחד"
+        other: "%{count} חברים"
+        zero: "אין חברים"
+      invite_your_friends_from: "הזמנת החברים שלך מ־%{service}"
+      not_connected: "לא מחובר"
     index: 
       connect_to_facebook: "התחברות לפייסבוק"
       connect_to_twitter: "התחברות לטוויטר"
@@ -385,11 +385,11 @@ he:
       logged_in_as: "נכנסת בשם"
       really_disconnect: "האם לנתק את %{service}?"
     inviter: 
-      click_link_to_accept_invitation: "Click this link to accept your invitation"
-      join_me_on_diaspora: "Join me on DIASPORA*"
+      click_link_to_accept_invitation: "יש ללחוץ על קישור זה כדי לקבל את ההזמנה שלך"
+      join_me_on_diaspora: "למה שלא להצטרף אלי ב־DIASPORA*"
     remote_friend: 
-      invite: "invite"
-      resend: "resend"
+      invite: "הזמנה"
+      resend: "שליחה שוב"
   settings: "הגדרות"
   shared: 
     add_contact: 
@@ -402,12 +402,12 @@ he:
       all_contacts: "כל אנשי הקשר"
       cannot_remove: "לא ניתן להסיר את איש הקשר מההיבט האחרון. (אם ברצונך להתנתק מאיש הקשר עליך להסירו מרשימת אנשי הקשר)."
     invitations: 
-      by_email: "by Email"
+      by_email: "בדוא״ל"
       dont_have_now: "אין לך כרגע, אך יתווספו לך הזמנות בקרוב!"
-      from_facebook: "From Facebook"
+      from_facebook: "מ־Facebook"
       invitations_left: "(%{count} נותרו)"
       invite_someone: "שליחת הזמנה"
-      invite_your_friends: "Invite your friends"
+      invite_your_friends: "הזמנת החברים שלך"
       invites: "הזמנות"
       invites_closed: "נכון לעכשיו ההזמנות לפוד זה של דיאספורה סגורות"
     notification: 
@@ -422,16 +422,17 @@ he:
       all: "הכול"
       all_contacts: "כל אנשי הקשר"
       make_public: "הפיכה לציבורי"
+      mention_helper_text: "כדי להזכיר שם של מישהו, יש ללחוץ על '@' ולהתחיל לכתוב את שמו"
       post_a_message_to: "פרסום הודעה אל %{aspect}"
       posting: "פרסום..."
       share: "שיתוף"
-      share_with: "שיתוף עם %{aspect}"
-      whats_on_your_mind: "what's on your mind?"
+      share_with: "שיתוף עם"
+      whats_on_your_mind: "מה עובר לך בראש?"
     reshare: 
       reshare: "שיתוף מחדש"
   status_messages: 
     destroy: 
-      failure: "Failed to delete post"
+      failure: "אירע כשל במחיקת הרשומה"
     helper: 
       no_message_to_display: "אין הודעה להצגה."
     new_status_message: 
@@ -452,7 +453,7 @@ he:
       change_language: "החלפת השפה"
       change_password: "החלפת הססמה"
       close_account: "סגירת החשבון"
-      current_password: "Current password"
+      current_password: "הססמה הנוכחית"
       download_photos: "הורדת התמונות שלי"
       download_xml: "הורדת ה־xml שלי"
       edit_account: "עריכת החשבון"
@@ -463,7 +464,7 @@ he:
       your_email: "כתובת הדוא״ל שלך"
       your_handle: "שם המשתמש שלך בדיאספורה"
     getting_started: 
-      connect_on_diaspora: "Connect on Diaspora"
+      connect_on_diaspora: "יצירת קשר דרך Diaspora"
       connect_services: "התחברות לשירותים הנוספים שלך"
       edit_profile: "עריכת הפרופיל שלך"
       finished: "סיימת!"
@@ -471,11 +472,11 @@ he:
       signup_steps: "עליך להשלים את הליך ההרשמה על ידי ביצוע שלוש הפעולות הבאות:"
       skip: "דילוג על הסברי הפתיחה"
       step_2: 
-        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
-        skip: "Skip"
+        find_your_friends_on_diaspora: "האם ברצונך למחוק את החברים שלך מ־Facebook ב־Diaspora?"
+        skip: "דילוג"
       step_3: 
-        finish: "Finish"
-        people_already_on_diaspora: "People already on Diaspora"
+        finish: "סיום"
+        people_already_on_diaspora: "אנשים שהם כבר ב־Diaspora"
       welcome: "ברוך בואך לדיאספורה!"
     public: 
       does_not_exist: "המשתמש %{username} אינו קיים!"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index a69c20cf4..00acbf107 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -422,6 +422,7 @@ hu:
       all: "összes"
       all_contacts: "összes kapcsolat"
       make_public: "nyilvánossá tesz"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Bejegyzés küldése ennek a csoportnak: %{aspect}"
       posting: "Küldés..."
       share: "Megosztás"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 306a5754c..e5c7cd5fb 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -422,6 +422,7 @@ id:
       all: "all"
       all_contacts: "all contacts"
       make_public: "make public"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
       share: "Bagikan"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 7c485087a..4789db182 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -422,6 +422,7 @@ it:
       all: "tutti"
       all_contacts: "tutti i contatti"
       make_public: "pubblica"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Invia un messaggio a %{aspect}"
       posting: "Invio in corso..."
       share: "Condividi"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 7fa622520..61154695c 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -422,6 +422,7 @@ lt:
       all: "viskas"
       all_contacts: "visi kontaktai"
       make_public: "paviešinti"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Parašyti žinutę į aspektą \"%{aspect}\""
       posting: "Rašoma..."
       share: "Skelbti"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 3d979527a..8dafa2adb 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -422,6 +422,7 @@ mk:
       all: "сите"
       all_contacts: "сите контакти"
       make_public: "направи јавен"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Додај порака во %{aspect}"
       posting: "Објавување..."
       share: "Сподели"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index d42e10bec..27e758fc8 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -422,6 +422,7 @@ nb:
       all: "all"
       all_contacts: "all contacts"
       make_public: "make public"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
       share: "Del"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 571897f95..9ecae7b21 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -422,6 +422,7 @@ nl:
       all: "al"
       all_contacts: "alle contacten"
       make_public: "maak openbaar"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Plaats een bericht aan %{aspect}"
       posting: "Plaatsen..."
       share: "Delen"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 9005d1bca..ddee5ac0a 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -422,6 +422,7 @@ pl:
       all: "wszyscy"
       all_contacts: "wszyscy znajomi"
       make_public: "upublicznij"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Wyślij wiadomość do %{aspect}"
       posting: "Wysyłanie…"
       share: "Podziel się"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 836ec7a15..6e56ef3a6 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -422,6 +422,7 @@ pt-BR:
       all: "todos"
       all_contacts: "Todos os contatos"
       make_public: "Tornar público"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Enviar uma mensagem para %{aspect}"
       posting: "Postando..."
       share: "Compartilhar"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index e2e2a7bdb..c36c24e92 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -422,6 +422,7 @@ pt-PT:
       all: "tudo"
       all_contacts: "todos os contactos"
       make_public: "tornar público"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Publicar uma mensagem em %{aspect}"
       posting: "A publicar..."
       share: "Partilhar"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index ffde49960..8d66736b9 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -422,6 +422,7 @@ ro:
       all: "toate"
       all_contacts: "toate contactele"
       make_public: "make public"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
       share: "Distribuie"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 1fdeacfbb..17e1bdef2 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -422,6 +422,7 @@ ru:
       all: "все"
       all_contacts: "все контакты"
       make_public: "сделать публичным"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Опубликовать сообщение для %{aspect}"
       posting: "Отправка ..."
       share: "Поделиться"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 63cd69987..f42cac0d8 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -422,6 +422,7 @@ sk:
       all: "všetko"
       all_contacts: "Všetky kontakty"
       make_public: "Zverejniť"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Poslať správu na aspekt %{aspect}"
       posting: "Posielam..."
       share: "Zdieľať"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index a5a575bf3..9cf1820da 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -422,6 +422,7 @@ sl:
       all: "vsi"
       all_contacts: "vsi stiki"
       make_public: "objavi kot javno"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Objavi sporočilo v %{aspect}"
       posting: "Objavljam..."
       share: "Deli"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 5f9e891d9..ffb99bcf1 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -422,6 +422,7 @@ sv:
       all: "alla"
       all_contacts: "alla kontakter"
       make_public: "gör publik"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Skicka ett meddelande till %{aspect}"
       posting: "Skickar..."
       share: "Dela"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index ee73ea68a..a61937ac4 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -422,6 +422,7 @@ tr:
       all: "hepsi"
       all_contacts: "all contacts"
       make_public: "herkese görünür yap"
+      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "mesaj gönder %{aspect}"
       posting: "Posting..."
       share: "Paylaş"
diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml
index 8d4371151..8fd8536b9 100644
--- a/config/locales/javascript/javascript.de.yml
+++ b/config/locales/javascript/javascript.de.yml
@@ -9,7 +9,7 @@ de:
     search_for: "Suche nach {{name}}"
     shared: 
       contact_list: 
-        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
+        cannot_remove: "Konnte die Person nicht vom letzten Aspekt entfernen. (Wenn du dich von dieser Person trennen willst, musst du diesen Kontakt entfernen.)"
     timeago: 
       day: "etwa einem Tag"
       days: "%d Tagen"
diff --git a/config/locales/javascript/javascript.gl-ES.yml b/config/locales/javascript/javascript.gl-ES.yml
new file mode 100644
index 000000000..e624741cf
--- /dev/null
+++ b/config/locales/javascript/javascript.gl-ES.yml
@@ -0,0 +1,31 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+gl-ES: 
+  javascripts: 
+    confirm_dialog: "Seguro?"
+    search_for: "Procurar a {{name}}"
+    shared: 
+      contact_list: 
+        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
+    timeago: 
+      day: "un día"
+      days: "%d días"
+      hour: "sobre unha hora"
+      hours: "sobre %d horas"
+      minute: "sobre un minuto"
+      minutes: "%d minutos"
+      month: "sobre un mes"
+      months: "%d meses"
+      prefixAgo: "hai"
+      prefixFromNow: ""
+      seconds: "menos dun minuto"
+      suffixAgo: "atrás"
+      suffixFromNow: "dende agora"
+      year: "sobre un ano"
+      years: "%d anos"
+    videos: 
+      unknown: "Tipo de video descoñecido"
+      watch: "Ver video en {{provider}}"
diff --git a/config/locales/javascript/javascript.he.yml b/config/locales/javascript/javascript.he.yml
index 2640c43ce..6ac6d3646 100644
--- a/config/locales/javascript/javascript.he.yml
+++ b/config/locales/javascript/javascript.he.yml
@@ -5,27 +5,27 @@
 
 he: 
   javascripts: 
-    confirm_dialog: "Are you sure?"
-    search_for: "Search for {{name}}"
+    confirm_dialog: "בבטחה?"
+    search_for: "חיפוש אחר {{name}}"
     shared: 
       contact_list: 
-        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
+        cannot_remove: "לא ניתן להסיר את איש הקשר מההיבט החארון. (אם ברצונך להינתק מאדם זה עליך להסיר את איש הקשר.)"
     timeago: 
       day: "יום"
       days: "%d ימים"
-      hour: "שעה"
-      hours: "%d שעות"
-      minute: "דקה"
+      hour: "בערך שעה"
+      hours: "בערך %d שעות"
+      minute: "בערך דקה"
       minutes: "%d דקות"
-      month: "חודש"
+      month: "בערך חודש"
       months: "%d חודשים"
       prefixAgo: "לפני"
       prefixFromNow: "מעכשיו"
       seconds: "פחות מדקה"
-      suffixAgo: ""
-      suffixFromNow: ""
-      year: "שנה"
+      suffixAgo: "לפני"
+      suffixFromNow: "מעכשיו"
+      year: "בערך שנה"
       years: "%d שנים"
     videos: 
-      unknown: "Unknown video type"
-      watch: "Watch this video on {{provider}}"
+      unknown: "סוג הווידאו אינו ידוע"
+      watch: "צפייה בסרטון וידאו זה באתר {{provider}}"
diff --git a/config/locales/javascript/javascript.tr.yml b/config/locales/javascript/javascript.tr.yml
new file mode 100644
index 000000000..5add43d70
--- /dev/null
+++ b/config/locales/javascript/javascript.tr.yml
@@ -0,0 +1,31 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+tr: 
+  javascripts: 
+    confirm_dialog: "Are you sure?"
+    search_for: "Search for {{name}}"
+    shared: 
+      contact_list: 
+        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
+    timeago: 
+      day: "a day"
+      days: "%d days"
+      hour: "about an hour"
+      hours: "about %d hours"
+      minute: "about a minute"
+      minutes: "%d minutes"
+      month: "about a month"
+      months: "%d months"
+      prefixAgo: ""
+      prefixFromNow: ""
+      seconds: "less than a minute"
+      suffixAgo: "ago"
+      suffixFromNow: "from now"
+      year: "about a year"
+      years: "%d years"
+    videos: 
+      unknown: "Unknown video type"
+      watch: "Watch this video on {{provider}}"