diff --git a/config/locales/devise/devise.de.yml b/config/locales/devise/devise.de.yml
index 122ef07c4879132aa598345272fc1408160fdf12..1ef594135846c248ed98b177a85f6380f1cdd465 100644
--- a/config/locales/devise/devise.de.yml
+++ b/config/locales/devise/devise.de.yml
@@ -30,13 +30,13 @@ de:
       hello: "Hallo %{email}!"
       invitation_instructions: 
         accept: "Einladung annehmen"
-        ignore: "Wenn du die Einladung nicht annehmen möchtest ignoriere diese E-Mail einfach."
+        ignore: "Wenn du die Einladung nicht annehmen möchtest, ignoriere diese E-Mail einfach."
         no_account_till: "Dein Konto wird nicht erstellt solange du dich nicht über den oberen Link registrierst."
         subject: "Du wurdest zu Diaspora eingeladen!"
       inviter: 
-        accept_at: "at %{url}, you can accept it through the link below."
+        accept_at: "unter %{url}, kannst du sie über den untenstehenden Link akzeptieren."
         has_invited_you: "%{name}"
-        have_invited_you: "%{names} have invited you to join Diaspora"
+        have_invited_you: "%{names} hat Dich eingeladen Diaspora beizutreten"
       reset_password_instructions: 
         change: "Mein Kennwort ändern"
         ignore: "Wenn du dies nicht angefordert hast, ignoriere bitte diese E-Mail."
diff --git a/config/locales/devise/devise.el.yml b/config/locales/devise/devise.el.yml
index 5fabb70f6c5d4f5d0aeb09b01d14d22287e8f012..3c987790e7173402535ec2a2abee4565c5a84507 100644
--- a/config/locales/devise/devise.el.yml
+++ b/config/locales/devise/devise.el.yml
@@ -61,14 +61,14 @@ el:
     registrations: 
       destroyed: "Αντίο! Η ακύρωση του λογαριασμού σας ολοκληρώθηκε με επιτυχία. Ελπίζουμε να σας ξαναδούμε σύντομα."
       signed_up: "Έχετε εγγραφεί επιτυχώς. Εάν η εγγραφή σας είναι ενεργοποιημένη, θα λάβετε μία επιβεβαίωση στο e-mail σας."
-      updated: "Ενημερώσατε το λογαριασμό σας με επιτυχία."
+      updated: "Έχετε ενημερώσει το λογαριασμό σας με επιτυχία."
     sessions: 
       new: 
-        alpha_software: "Είστε έτοιμος να χρησιμοποιήσετε λογισμικό σε δοκιμαστική (alpha) φάση."
+        alpha_software: "Επρόκειτο να χρησιμοποιήσετε λογισμικό σε δοκιμαστική (alpha) φάση."
         bugs_and_feedback: "Να γνωρίζετε ότι θα αντιμετωπίσετε σφάλματα. Σας ενθαρρύνουμε να χρησιμοποιήσετε το κουμπί \"Feedback\" στη δεξιά πλευρά του browser σας για να αναφέρετε οποιοδήποτε σφάλμα! Θα εργαστούμε όσο πιο γρήγορα μπορούμε για να την επίλυση οποιουδήποτε ζητήματος μας πείτε."
         bugs_and_feedback_mobile: "Σας συμβουλεύουμε, θα συναντήσετε σφάλματα. Σας ενθαρρύνουμε να αναφέρετε οποιοδήποτε πρόβλημα! Θα δουλέψουμε όσο πιο γρήγορα γίνεται για να λύσουμε όποιο θέμα αναφέρετε."
         login: "Είσοδος"
-        modern_browsers: "υποστηρίζει μόνο σύγχρονα προγράμματα περιήγησης."
+        modern_browsers: "Υποστηρίζει μόνο σύγχρονα προγράμματα περιήγησης ιστού."
         password: "Κωδικός"
         remember_me: "Να με θυμάσαι!"
         sign_in: "Συνδεθείτε"
diff --git a/config/locales/devise/devise.fi.yml b/config/locales/devise/devise.fi.yml
index a246016407e6f237a41366e506b25a0f7c93e198..f2414c5014b0b566be2f367f98b59cafbde6d7bc 100644
--- a/config/locales/devise/devise.fi.yml
+++ b/config/locales/devise/devise.fi.yml
@@ -34,9 +34,9 @@ fi:
         no_account_till: "Käyttäjätilisi luodaan vasta, kun rekisteröidyt yllä olevan linkin kautta. "
         subject: "Sinut on kutsuttu käyttämään Diasporaa!"
       inviter: 
-        accept_at: "at %{url}, you can accept it through the link below."
-        has_invited_you: "%{name}"
-        have_invited_you: "%{names} have invited you to join Diaspora"
+        accept_at: "osoitteessa %{url}, hyväksyminen alla olevasta linkistä."
+        has_invited_you: "%{names}"
+        have_invited_you: "%{names} on kutsunut sinut Diasporan käyttäjäksi"
       reset_password_instructions: 
         change: "Vaihda salasanani"
         ignore: "Jos et pyytänyt tätä, voit jättää viestin huomiotta."
diff --git a/config/locales/devise/devise.pt-BR.yml b/config/locales/devise/devise.pt-BR.yml
index a1b45ec99d934d519914b9189841e93c59f8c104..1a6533cbf75337f9636431228c4cfc95e59e8414 100644
--- a/config/locales/devise/devise.pt-BR.yml
+++ b/config/locales/devise/devise.pt-BR.yml
@@ -6,22 +6,22 @@
 pt-BR: 
   devise: 
     confirmations: 
-      confirmed: "Sua conta foi confirmada com sucesso. Seja Bem vindo(a)!"
+      confirmed: "Sua conta foi confirmada com sucesso. Seja bem-vindo(a)!"
       new: 
         resend_confirmation: "Reenviar as instruções de confirmação."
-      send_instructions: "Você receberá um email em poucos minutos com as instruções sobre como confirmar a sua conta."
+      send_instructions: "Em poucos minutos, você receberá um email com as instruções sobre como confirmar a sua conta."
     failure: 
       inactive: "Sua conta ainda não foi ativada."
-      invalid: "Email ou senha inválidos."
+      invalid: "Nome de usuário ou senha inválidos."
       invalid_token: "Token de autenticação inválido."
       locked: "Sua conta está bloqueada."
-      timeout: "Sua sessão expirou, por favor, entre novamente para continuar."
+      timeout: "Sua sessão expirou; por favor, entre novamente para continuar."
       unauthenticated: "Você precisa entrar ou se cadastrar antes de continuar."
       unconfirmed: "Você deve confirmar a sua conta antes de continuar."
     invitations: 
       invitation_token_invalid: "Seu convite é inválido!"
       send_instructions: "Seu convite foi enviado."
-      updated: "Sua senha foi definida com sucesso. Seja Bem vindo(a)!"
+      updated: "Sua senha foi definida com sucesso. Seja bem-vindo(a)!"
     mailer: 
       confirmation_instructions: 
         confirm: "Confirmar minha conta"
@@ -31,7 +31,7 @@ pt-BR:
       invitation_instructions: 
         accept: "Aceitar convite"
         ignore: "Se você não quer aceitar o convite, por favor ignore este e-mail."
-        no_account_till: "Sua conta não pode ser criada até que você acesse o link para a sua inscrição."
+        no_account_till: "Sua conta não pode ser criada até que você acesse o link acima e se cadastre."
         subject: "Você foi convidado(a) para participar em Diaspora!"
       inviter: 
         accept_at: "em %{url}, você pode aceitar através do link abaixo."
@@ -54,7 +54,7 @@ pt-BR:
         change_password: "Mudar minha senha"
       new: 
         forgot_password: "Esqueceu sua senha?"
-        no_account: "Não há conta com este email. Se você aguarda por um convite, seja paciente: estamos trabalhando para enviá-lo o quanto antes."
+        no_account: "Não há nenhuma conta com este email. Se você aguarda por um convite, seja paciente: estamos trabalhando para enviá-lo o quanto antes."
         send_password_instructions: "Me envie instruções para redefinir minha senha."
       send_instructions: "Você receberá em breve um email com instruções sobre como redefinir sua senha."
       updated: "Sua senha foi alterada com sucesso."
diff --git a/config/locales/devise/devise.sv.yml b/config/locales/devise/devise.sv.yml
index fdc2bb7b38775ae6377fe43c01d954f19028a1da..71ffd55b838a7600a14c6b3ba58a10fe1fe8b738 100644
--- a/config/locales/devise/devise.sv.yml
+++ b/config/locales/devise/devise.sv.yml
@@ -9,7 +9,7 @@ sv:
       confirmed: "Ditt konto har verifierats och du är inloggad."
       new: 
         resend_confirmation: "Skicka instruktioner för att bekräfta kontot igen"
-      send_instructions: "Du kommer att få ett ebrev med instruktioner för att verifiera ditt konto inom några minuter."
+      send_instructions: "Du kommer att få ett mail med instruktioner för att verifiera ditt konto inom några minuter."
     failure: 
       inactive: "Ditt konto är inte aktiverat."
       invalid: "Felaktigt användarnamn eller lösenord."
@@ -30,17 +30,17 @@ sv:
       hello: "Hej %{email}!"
       invitation_instructions: 
         accept: "Acceptera inbjudan"
-        ignore: "Om du inte vill acceptera inbjudan, var snäll och ignorera detta email."
-        no_account_till: "Ditt konto kommer inte att skapas förren du besöker länken ovan och registrerar dig."
-        subject: "Du har blivit inbjuden till att gå med i Diaspora!"
+        ignore: "Om du inte vill acceptera inbjudan, var snäll och ignorera detta mail."
+        no_account_till: "Ditt konto kommer inte att skapas förrän du besöker länken ovan och registrerar dig."
+        subject: "Du har blivit inbjuden att gå med i Diaspora!"
       inviter: 
-        accept_at: "at %{url}, you can accept it through the link below."
+        accept_at: "via %{url}. Du accepterar genom att klicka på länken nedan."
         has_invited_you: "%{name}"
-        have_invited_you: "%{names} have invited you to join Diaspora"
+        have_invited_you: "%{names} har bjudit in dig att gå med i Diaspora"
       reset_password_instructions: 
         change: "Återställ mitt lösenord"
         ignore: "Om det inte är du som vill byta lösenord så kan du ignorera det här mailet."
-        someone_requested: "Du har efterfrågat en länk för att återställa ditt lösenord. För att fullfölja det, klicka på länken neda."
+        someone_requested: "Någon har efterfrågat en länk för att återställa ditt lösenord. För att återställa lösenordet, klicka på länken nedan."
         subject: "Instruktioner för att återställa lösenordet"
         wont_change: "Dit lösenord kommer inte ändras förrän du klickat på länken och ändrat det."
       unlock_instructions: 
@@ -56,15 +56,15 @@ sv:
         forgot_password: "Glömt ditt lösenord?"
         no_account: "Det finns inget konto med den här mailadressen. Väntar du på en inbjudan så skickar vi ut dem så snart som möjligt."
         send_password_instructions: "Skicka information om hur jag återställer lösenordet"
-      send_instructions: "Du kommer att få ett ebrev med instruktioner för att återställa lösenordet inom några minuter."
+      send_instructions: "Du kommer att få ett mail med instruktioner för att återställa lösenordet inom några minuter."
       updated: "Ditt lösenord har ändrats och du är inloggad."
     registrations: 
       destroyed: "Ditt konto är avslutat. Välkommen åter!"
-      signed_up: "Du har skapat ett konto. Beroende på inställningar kan ett ebrev ha skickats till dig."
+      signed_up: "Du har skapat ett konto. Beroende på dina inställningar kan ett mail ha skickats till dig."
       updated: "Ditt konto har uppdateras."
     sessions: 
       new: 
-        alpha_software: "Du är påväg att använda mjukvara i alpha-stadie."
+        alpha_software: "Du är på väg att använda mjukvara i alpha-stadium."
         bugs_and_feedback: "Var beredd på att stöta på buggar och problem. Använd gärna feedback-knappen till vänster för att rapportera dessa, vi kommer att försöka ordna problemen så snart som möjligt."
         bugs_and_feedback_mobile: "Tänk på att du kommer att uppleva buggar.Vi uppmanar dig att rapportera alla fel! Vi kommer att arbeta så fort som möjligt med att lösa dom problem som du rapporterar."
         login: "Logga in"
diff --git a/config/locales/devise/devise.tr.yml b/config/locales/devise/devise.tr.yml
index 5981c9e582a19e937903b00519e251bc686196a9..b643529a1402fe93db1e58ebef20c9564cd1b501 100644
--- a/config/locales/devise/devise.tr.yml
+++ b/config/locales/devise/devise.tr.yml
@@ -8,11 +8,11 @@ tr:
     confirmations: 
       confirmed: "Hesabınız başarıyla doğrulanmıştır. Şu anda giriş yapmış bulunuyorsunuz."
       new: 
-        resend_confirmation: "Doğrulama talimatlarını tekrar gönder"
+        resend_confirmation: "Doğrulama yönergelerini 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 henüz aktive edilmemiştir."
-      invalid: "Yanlış email veya parola."
+      invalid: "Yanlış e-posta ya da parola."
       invalid_token: "Yanlış doğrulama kodu."
       locked: "Hesabınız kilitlenmiştir."
       timeout: "Zaman aşımı oldu, devam etmek için lütfen tekrar giriş yapın."
@@ -29,59 +29,59 @@ tr:
         you_can_confirm: "Hesabınızı aşağıdaki bağlantı ile doğrulayabilirsiniz:"
       hello: "Merhaba %{email}!"
       invitation_instructions: 
-        accept: "Accept invitation"
-        ignore: "If you don't want to accept the invitation, please ignore this email."
-        no_account_till: "Your account won't be created until you access the link above and sign up."
-        subject: "You've been invited to join Diaspora!"
+        accept: "Daveti kabul et"
+        ignore: "Daveti kabul etmek istemiyorsanız, lütfen bu e-postayı gözardı edin."
+        no_account_till: "Hesabınız yukarıdaki bağlantıya tıklayıp üye olmadan oluşturulmayacaktır."
+        subject: "Diaspora'ya katılmak için davet edildiniz!"
       inviter: 
-        accept_at: "at %{url}, you can accept it through the link below."
+        accept_at: "%{url}, aşağıdaki bağlantıya tıklayarak bunu kabul edebilirsiniz."
         has_invited_you: "%{name}"
-        have_invited_you: "%{names} have invited you to join Diaspora"
+        have_invited_you: "%{names} Diaspora'ya katılmanız için davet edildiniz"
       reset_password_instructions: 
         change: "Åžifremi deÄŸiÅŸtir"
         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ı"
+        subject: "Şifre yenileme yönergeleri"
         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ş 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ın Kilidini Aç"
+        click_to_unlock: "Hesabınızın kilidini açmak için aşağıdaki bağlantıya tıklayın:"
+        subject: "Kilit Açma Yönergeleri"
+        unlock: "Hesabımın kilidini aç"
       welcome: "Merhaba %{email}!"
     passwords: 
       edit: 
         change_password: "Åžifre deÄŸiÅŸtirme"
       new: 
         forgot_password: "Åžifrenizi mi unuttunuz?"
-        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."
+        no_account: "Bu e-posta adresiyle alınmış hesap 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ı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."
+      destroyed: "Hoşçakalın! Hesabınız iptal edildi. Umarız sizi yakında tekrar görürüz."
+      signed_up: "Başarıyla kayıt yaptınız. Doğrulama, e-postanıza gönderilmiştir."
+      updated: "Hesabınızı başarılı bir şekilde yenilediniz."
     sessions: 
       new: 
-        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."
+        alpha_software: "Alfa programını kullanmak üzeresiniz."
+        bugs_and_feedback: "Sitede bazı hatalarla karşılaşabilirsiniz. Karşılaştığınız herhangi hata için sağ üstteki Geri Bildirim düğmesini 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 desteklenir"
-        password: "Åžifre"
-        remember_me: "Beni Hatırla"
-        sign_in: "GiriÅŸ"
+        password: "Parola"
+        remember_me: "Beni hatırla"
+        sign_in: "GiriÅŸ yap"
         username: "Kullanıcı Adı"
       signed_in: "Başarıyla giriş yaptınız."
       signed_out: "Başarıyla çıkış yaptınız."
     shared: 
       links: 
         forgot_your_password: "Åžifrenizi mi unuttunuz?"
-        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"
+        receive_confirmation: "Hesap doğrulama yönergelerini almadınız mı?"
+        receive_unlock: "Kilit açma yönergelerini almadınız mı?"
+        sign_in: "GiriÅŸ yap"
+        sign_up: "Kayıt ol"
         sign_up_closed: "Şu an için yeni kayıt alınamıyor."
       mail_signup_form: 
         sign_up_for_an_invite: "Bir davetiye için kaydolun!"
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 336a95a36acc486219e4d8539e6726beeecd5b7f..d6fa708e51207ac93e953865c80003ab4c03e8f4 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -37,7 +37,7 @@ ar:
             person: 
               invalid: "غير صالح."
             username: 
-              invalid: "غير صالح، يُسمح بالحروف، الأرقام وخطوط التأكيد (-_) فقط"
+              invalid: "غير صالح، يـسمح بالحروف، الأرقام وخطوط التأكيد (-_) فقط"
               taken: "حُجِزَ بالفعل."
   ago: "منذ %{time}"
   all_aspects: "كل الفئات"
@@ -101,7 +101,16 @@ ar:
         heading: "وسيط ديسبورا"
       donate: "تبرّع"
       handle_explanation: "هذا وسيط دياسبرا. مثل البريد الالكتروني، يمكنك منحه للأصدقاء حتى تستطيع التواصل معهم."
-      keep_us_running: "أبقِ %{pod} سريعا عبر تأمين قيمة صيانته الشهرية"
+      help: 
+        did_you: "هل:"
+        feature_suggestion: "... تملك %{link} اقتراحا؟"
+        find_a_bug: "... وجدت %{link}?"
+        have_a_question: "... تملك %{link}?"
+        here_to_help: "مجتمع دياسبرا متأهب للمساعدة"
+        more_support: "لمزيد من الاستعلامات، يرجى مراجعة %{link}."
+        need_help: "تحتاج للمساعدة؟"
+        tutorials: "لمزيد من الشروحات، راجع %{link}."
+      keep_us_running: "حافظ على %{pod} سريعا عبر تبرع شهري لصيانة السيرفرات "
       no_contacts: "لا أعضاء"
       no_tags: "+ جِـد وسما لمتابعته"
       people_sharing_with_you: "أعضاء يتشاركون معك"
@@ -359,7 +368,7 @@ ar:
         many: "و %{count} آخرون"
         one: "و آخر"
         other: "و %{count} آخرون"
-        two: "و %{count} آخرين"
+        two: "و %{count} آخران"
         zero: "و لا أحد"
       mark_all_as_read: "وضع الجميع كمقروء"
       notifications: "تنبيهات"
@@ -426,7 +435,7 @@ ar:
     comment_on_post: 
       reply: "رُد أو اعرض مشاركة %{name} >"
     confirm_email: 
-      click_link: "لتفعيل عنوان بريدك الإلكتروني الجديد %{unconfirmed_email}, من فضلك اضغط على هذا الرابط:"
+      click_link: "لتفعيل عنوان بريدك الإلكتروني الجديد %{unconfirmed_email}, من فضلك إتبع هذا الرابط:"
       subject: "من فضلك، فَعِّل عنوان بريدك الإلكتروني الجديد %{unconfirmed_email}"
     email_sent_by_diaspora: "أُرسِلَت هذه الرسالة بواسطة ديسبورا.  إذا أردت إيقاف مثل هذه الرسالة، "
     hello: "مرحبا %{name}!"
@@ -649,7 +658,7 @@ ar:
       no_services: "لم تَصِل أي خدمة بحسابك بعد."
       really_disconnect: "فصل إتصال %{service}?"
     inviter: 
-      click_link_to_accept_invitation: "إضغط على هذا الرابط لقبول دعوتك"
+      click_link_to_accept_invitation: "إتبع هذا الرابط لقبول دعوتك"
       join_me_on_diaspora: "انضم إلي في DIASPORA*"
     remote_friend: 
       invite: "دعوة"
@@ -711,7 +720,7 @@ ar:
       reshare: "أَعِد النشر"
     stream_element: 
       dislike: "لم يعجبني"
-      hide_and_mute: "أخْـفِ وأسْكِـتْ"
+      hide_and_mute: "أخـفِ وأسكـتْ"
       like: "أعجبني"
       shared_with: "مُشَارك مع: %{aspect_names}"
       unlike: "إلغاء إعجابي"
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index c553ed81219de5c687c149f6cb0a06449812e464..d203e3fab0d59561beaf577f4b91fbec77b3756e 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -37,7 +37,7 @@ bg:
             person: 
               invalid: "is invalid."
             username: 
-              invalid: "не е валидно. Разрешени са само букви, цифри и долна черта"
+              invalid: "не е валидно. Разрешени са само букви, цифри и долна черта."
               taken: "е вече заето."
   ago: "преди %{time}"
   all_aspects: "Всички аспекти"
@@ -101,7 +101,16 @@ bg:
         heading: "Адрес в Diaspora"
       donate: "Дарете"
       handle_explanation: "Това е вашият адрес в Diaspora. Наподобява адрес на ел. поща - давате го на хора, за да се свържат с вас."
-      keep_us_running: "Помогнете за бързата и надеждна работа на %{pod} като осигурите на сървърите месечната им доза \"кафе\"!"
+      help: 
+        did_you: "Вие:"
+        feature_suggestion: "... имате предложение за нова %{link}?"
+        find_a_bug: "... сте открили %{link} (грешка)?"
+        have_a_question: "... имате %{link}?"
+        here_to_help: "Общността Diaspora е готова да помогне!"
+        more_support: "За допълнителна помощ посетете %{link}."
+        need_help: "Нуждаетесе от помощ?"
+        tutorials: "За ръководства посетете %{link}."
+      keep_us_running: "Осигурете бързата работа на %{pod} като дарите пари за месечната издръжка на сървърите!"
       no_contacts: "Няма контакти"
       no_tags: "+ Намиране на тагове"
       people_sharing_with_you: "Хора споделящи с вас"
@@ -355,11 +364,11 @@ bg:
     index: 
       and: "и"
       and_others: 
-        few: "и %{count} други"
-        many: "и %{count} други"
+        few: "и други %{count}-ма"
+        many: "и други %{count}-ма"
         one: "и още някой"
-        other: "и %{count} други"
-        two: "и %{count} други"
+        other: "и други %{count}-ма"
+        two: "и други %{count}-ма"
         zero: "и никой друг"
       mark_all_as_read: "Маркиране на всички като прочетени"
       notifications: "Известия"
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index 7eef30e06a76ecb9843a6b6d5b60429b9806795b..121a98e18da318c7087cc4377c98083fbc6e3fa2 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -101,6 +101,15 @@ br:
         heading: "Diaspora ID"
       donate: "Donate"
       handle_explanation: "Ar postel-mañ zo ho skor diaspora. E-giz ur chomlec'h-postel e c'hellit skignat anezhañ a-benn bezañ kavet gant an dud."
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "Darempred ebet"
       no_tags: "No tags"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 20e135e85cd582b3d440ed39692bc7b0886ffcb7..51460de43bc5561718ecef46b237070627b37780 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -101,6 +101,15 @@ cs:
         heading: "Diaspora ID"
       donate: "Přispějte"
       handle_explanation: "Toto je vaše Diaspora ID. Podobně jako e-mailovou adresu ho můžete dál lidem a budete na něm dostupní."
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Pomozte %{pod} udržet rychlý, kupte našim serverům dávku kávy."
       no_contacts: "Žádné kontakty"
       no_tags: "+ Najít nějaký štítek ke sledování"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index b67e4535fcaead9a7e637d6e608bf88710f73a2a..5844a665d4e4cf1035e71821a1c93bb67d64a4d7 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -101,6 +101,15 @@ cy:
         heading: "Diaspora ID"
       donate: "Donate"
       handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "No contacts"
       no_tags: "No tags"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 32afbf974840875f35699b8852526acc66171972..b56e0ea368de141a153dea4709bc951080af454b 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -101,6 +101,15 @@ da:
         heading: "Diaspora ID"
       donate: "Donate"
       handle_explanation: "Dette er dit diaspora handle. Som med en e-mail-adresse, kan du give denne til folk, så de kan kontakte dig."
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "Ingen kontakter"
       no_tags: "No tags"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 27c629a416a2076055106ca2325a58bb022e858f..866095c3654e725db342cc4ffc185d74fe4b5813 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -101,6 +101,15 @@ de:
         heading: "Diaspora ID"
       donate: "Spenden"
       handle_explanation: "Das ist deine Diaspora ID. Du kannst sie wie eine E-Mail-Adresse weitergeben, damit andere Nutzer mit dir Kontakt aufnehmen können."
+      help: 
+        did_you: "Hast du:"
+        feature_suggestion: "... einen %{link} Vorschlag?"
+        find_a_bug: "... einen %{link} gefunden?"
+        have_a_question: "... eine %{link}?"
+        here_to_help: "Die Diaspora-Gemeinde ist hier um Dir zu helfen!"
+        more_support: "Für mehr Support, schau auch auf %{link}."
+        need_help: "Benötigst du Hilfe?"
+        tutorials: "Für Tutorials, probiere %{link}."
       keep_us_running: "Hilf %{pod} schnell zu laufen und kaufe unseren Servern ihren monatlichen Schuss Kaffee!"
       no_contacts: "Keine Kontakte"
       no_tags: "+ Finde einen Tag zum folgen"
@@ -121,7 +130,7 @@ de:
       create: "Erstellen"
       name: "Name"
     no_contacts_message: 
-      featured_users: "featured users"
+      featured_users: "Vorgestellte Nutzer"
       or_featured: "Oder fang an mit %{link} zu teilen."
       try_adding_some_more_contacts: "Du kannst nach Kontakten suchen (oben) oder welche einladen (rechts)."
       you_should_add_some_more_contacts: "Du solltest ein paar mehr Kontakte hinzufügen!"
@@ -543,7 +552,7 @@ de:
   post_visibilites: 
     update: 
       post_hidden_and_muted: "%{name}'s Beitrag wurde ausgeblendet und Benachrichtigungen abgeschaltet."
-      see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page."
+      see_it_on_their_profile: "Wenn Du Neuigkeiten zu diesem Beitrag sehen willst, besuche %{name}'s Profilseite."
   posts: 
     show: 
       destroy: "Löschen"
@@ -821,7 +830,7 @@ de:
         tags: "Tags"
       search_for_hashtags: "Suche nach #hashtags"
       search_for_people: "Suche nach Leuten"
-      see_all_featured_users: "See all featured users"
+      see_all_featured_users: "Sehe alle vorgestellten Nutzer"
       welcome: "Herzlich willkommen!"
       welcome_with_name: "Herzlich willkommen, %{name}!"
     public: 
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 2973a7a5438613cbca6b25817dc7c6984bebec17..8c880df0f9b1c251fa20294541cfa9539f65ace8 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -72,7 +72,7 @@ el:
       failure: "Η δημιουργία της πτυχής απέτυχε."
       success: "Η νέα σας πτυχή %{name} δημιουργήθηκε"
     destroy: 
-      failure: "Το όνομα %{name} δεν είναι άδειο και δεν μπορεί να αφαιρεθεί."
+      failure: "Το %{name} δεν είναι άδειο και δεν μπορεί να αφαιρεθεί."
       success: "Ο χρήστης %{name} αφαιρέθηκε επιτυχώς."
     edit: 
       add_existing: "Προσθέστε μια υπάρχουσα επαφή"
@@ -101,7 +101,16 @@ el:
         heading: "Αναγνωριστικό Diaspora (ID)"
       donate: "Κάντε Δωρεά"
       handle_explanation: "Αυτό είναι το αναγνωριστικό σας στο Diaspora (ID). Όπως και με μια διεύθυνση ηλεκτρονικού ταχυδρομείου, μπορείτε να το δώσετε σε άλλους για να σας βρουν."
-      keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
+      help: 
+        did_you: "Έχεις:"
+        feature_suggestion: "... έχεις μια %{link} πρόταση?"
+        find_a_bug: "... βρες %{link}?"
+        have_a_question: "... έχεις ένα %{link}?"
+        here_to_help: "Η κοινότητα του Diaspora είναι εδώ για να σε βοηθήσει!"
+        more_support: "Για περισσότερη βοήθεια, θα πρέπει να ελέγξετε %{link}."
+        need_help: "Χρειάζεστε βοήθεια;"
+        tutorials: "Για οδηγούς, ελέγξτε %{link}."
+      keep_us_running: "Διατηρείστε τη καλή λειτουργία του %{pod}, παρέχοντας στους servers μας τη καφείνη τους!"
       no_contacts: "Καμία επαφή"
       no_tags: "+ Βρείτε μια ετικέτα να ακολουθείτε"
       people_sharing_with_you: "Άτομα που μοιράζονται μαζί σας"
@@ -177,7 +186,7 @@ el:
       add_a_new_aspect: "Προσθέστε μια νέα πτυχή"
       all_contacts: "Όλες οι Επαφές"
       edit_aspect: "Επεξεργασία %{name}"
-      many_people_are_you_sure: "Είστε σίγουρος/η ότι θέλετε να ξεκινήσετε μια ιδιωτική συνομιλία με περισσότερες από %{suggested_limit} επαφές? Η δημοσίευση σε αυτή την πτυχή ίσως είναι ο καλύτερος τρόπος για να επικοινωνήσετε μαζί τους."
+      many_people_are_you_sure: "Είστε σίγουρος/η ότι θέλετε να ξεκινήσετε μια ιδιωτική συνομιλία με περισσότερες από %{suggested_limit} επαφές? Η δημοσίευση σε αυτή την πτυχή ίσως είναι ένας καλύτερος τρόπος για να επικοινωνήσετε μαζί τους."
       my_contacts: "Οι Επαφές μου"
       no_contacts: "Καμία Επαφή"
       only_sharing_with_me: "Μοιράζονται μόνο με εμένα"
@@ -224,7 +233,7 @@ el:
     show: 
       delete: "διαγραφή και φραγή συζήτησης"
       reply: "απάντηση"
-      replying: "Replying..."
+      replying: "Απάντηση..."
   date: 
     formats: 
       birthday: "%B %d"
@@ -247,7 +256,7 @@ el:
       learn_about_host: "Μάθετε για το πώς να φιλοξενήσετε το δικό σας διακομιστή Diaspora."
       login_here: "συνδεθείτε εδώ"
       ownership: "Ιδιοκτησία"
-      ownership_explanation: "Οι φωτογραφίες σας είναι δική σας ιδιοκτησία και δεν πρέπει να κάνετε παραχωρήσεις, απλά και μόνο για  να τις μοιραστείτε. Στο Diaspora διατηρείτε την κυριότητα για ό,τι μοιράζεστε, ενώ έχετε τον πλήρη έλεγχο για το πώς αυτό θα διανεμηθεί."
+      ownership_explanation: "Οι φωτογραφίες σας είναι δική σας ιδιοκτησία και δεν πρέπει να κάνετε παραχωρήσεις, απλά και μόνο για  να τις μοιραστείτε. Στο Diaspora διατηρείτε την ιδιοκτησία για ό,τι μοιράζεστε, ενώ έχετε τον πλήρη έλεγχο για το πώς αυτό θα διανεμηθεί."
       share_what_you_want: "Μοιραστείτε ό,τι θέλετε, με όποιον θέλετε."
       simplicity: "Απλότητα"
       simplicity_explanation: "Το Diaspora σας επιτρέπει να μοιράζεστε εύκολα και διάφανα – και αυτό ισχύει και για την ιδιωτικότητα σας. Από τη φύση του ιδιωτικό, το Diaspora δεν έχει σελίδες επί σελίδων με ρυθμίσεις και επιλογές ώστε να διατηρείτε το προφίλ σας ασφαλές."
@@ -442,7 +451,7 @@ el:
       reshared: "ο χρήστης %{name} μόλις κοινοποίησε τη δημοσίευση σας"
       view_post: "Δείτε τη δημοσίευση >"
     single_admin: 
-      admin: "Ο διαχειριστής Diaspora σας"
+      admin: "Ο διαχειριστής του Diaspora σας"
       subject: "Μήνυμα για τον Diaspora λογαριασμό σας:"
     started_sharing: 
       sharing: "ξεκίνησε το διαμοιρασμό μαζί σας!"
@@ -478,7 +487,7 @@ el:
       thats_you: "Εσύ είσαι αυτός!"
     profile_sidebar: 
       bio: "βιογραφικό"
-      born: "γεννήθηκε"
+      born: "γενέθλια"
       edit_my_profile: "Επεξεργασία του προφίλ μου"
       gender: "φύλο"
       in_aspects: "στις πτυχές"
@@ -522,7 +531,7 @@ el:
       post_it: "δημοσίευσε το!"
     new_photo: 
       empty: "{file} είναι κενό, επιλέξτε και πάλι τα αρχεία χωρίς αυτό."
-      invalid_ext: "{φιλε} δεν έχει έγκυρη επέκταση. Μόνο επεκτάσεις {extensions} επιτρέπονται."
+      invalid_ext: "{file} δεν έχει έγκυρη τύπο αρχείου. Μόνο τύποι αρχείου {extensions} επιτρέπονται."
       size_error: "{file} είναι πολύ μεγάλο, το μέγιστο μέγεθος αρχείου είναι {sizeLimit}."
     new_profile_photo: 
       or_select_one: "ή επιλέξτε κάποια από τις υπάρχουσες"
@@ -542,7 +551,7 @@ el:
       notice: "Η φωτογραφία ενημερώθηκε επιτυχώς."
   post_visibilites: 
     update: 
-      post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted."
+      post_hidden_and_muted: "Οι αναρτήσεις από τον/την %{name} έχουν γίνει κρυφές, και οι ειδοποιήσεις έχουν απενεργοποιηθεί."
       see_it_on_their_profile: "Εάν θέλετε να δείτε τις ενημερώσεις αυτής της δημοσίευσης, επισκεφθείτε το προφίλ του χρήστη %{name}. "
   posts: 
     show: 
@@ -594,7 +603,7 @@ el:
   requests: 
     create: 
       sending: "Αποστολή"
-      sent: "Σας ζητήθηκε να μοιράζεστε με τον χρήστη %{name}. Θα είναι ορατό την επόμενη φορά που θα συνδεθεί στο Diaspora."
+      sent: "Σας ζητήθηκε να μοιράζεστε με τον/την χρήστη %{name}. Θα είναι ορατό την επόμενη φορά που θα συνδεθεί στο Diaspora."
     destroy: 
       error: "Παρακαλώ επιλέξτε μια πτυχή!"
       ignore: "Αγνοήθηκε αίτηση επαφής."
@@ -617,7 +626,7 @@ el:
     create: 
       failure: "Υπήρξε κάποιο σφάλμα κατά την κοινοποίηση αυτής της δημοσίευσης."
     reshare: 
-      deleted: "Η αρχική δημοσίευση δαγράφτηκε από τον δημιουργό της."
+      deleted: "Η αρχική δημοσίευση διαγράφτηκε από τον δημιουργό της."
       reshare: 
         few: "%{count} κοινοποιήσεις"
         many: "%{count} κοινοποιήσεις"
@@ -645,7 +654,7 @@ el:
       connect_to_twitter: "Σύνδεση με Twitter"
       disconnect: "αποσύνδεση"
       edit_services: "Επεξεργασία υπηρεσιών"
-      logged_in_as: "συνδεδεμένο ως"
+      logged_in_as: "συνδεδεμένος ως"
       no_services: "Δεν έχετε συνδέσει κάποια υπηρεσία ακόμα."
       really_disconnect: "αποσύνδεση %{service};"
     inviter: 
@@ -680,7 +689,7 @@ el:
       your_aspects: "οι πτυχές σας"
     invitations: 
       by_email: "Μέσω ηλεκτρονικού ταχυδρομείου"
-      dont_have_now: "Δεν έχετε κάποιο δικαίωμα τώρα, αλλά περισσότερες προσκλήσεις έρχονται σύντομα!"
+      dont_have_now: "Δεν έχετε κάποια τώρα, αλλά περισσότερες προσκλήσεις έρχονται σύντομα!"
       from_facebook: "Από το Facebook"
       invitations_left: "απομένουν %{count}"
       invite_someone: "Προσκαλέστε κάποιον/α"
@@ -697,7 +706,7 @@ el:
     publisher: 
       all: "όλα"
       all_contacts: "όλες οι επαφές"
-      click_to_share_with: "Πατήστε για να διαμοιραστείτε με: "
+      click_to_share_with: "Πατήστε για να μοιραστείτε με:"
       discard_post: "Απομάκρυνση δημοσίευσης"
       make_public: "Δημοσιοποίησε το"
       post_a_message_to: "Αναρτήστε ένα μήνυμα στην πτυχή %{aspect}"
@@ -713,7 +722,7 @@ el:
       dislike: "Δεν μ' αρέσει"
       hide_and_mute: "Απόκρυψη και Σίγαση "
       like: "Μου αρέσει"
-      shared_with: "Shared with: %{aspect_names}"
+      shared_with: "Διαμοιρασμένο με: %{aspect_names}"
       unlike: "Δεν μου αρέσει"
       via: "μέσω %{link}"
       viewable_to_anyone: "Αυτή η δημοσίευση είναι εμφανής σε όλους στο διαδίκτυο"
@@ -728,7 +737,7 @@ el:
       mentioning: "Αναφορά σε: %{person}"
     too_long: 
       few: "παρακαλώ μετατρέψτε τα μηνύματα κατάστασης σας σε λιγότερους από %{count} χαρακτήρες"
-      many: "παρακαλώ ελαττώστε την κατάσταση σας σε λιγότερο από %{count} χαρακτήρες"
+      many: "παρακαλώ ελαττώστε το μύνημα κατάστασης σας σε λιγότερο από %{count} χαρακτήρες"
       one: "παρακαλώ μετατρέψτε τα μηνύματα κατάστασης σας σε λιγότερο από %{count} χαρακτήρα"
       other: "παρακαλώ μετατρέψτε τα μηνύματα κατάστασης σας σε λιγότερους από %{count} χαρακτήρες"
       two: "παρακαλούμε ορίστε το μήνυμα κατάστασής σας σε λιγότερους από %{count} χαρακτήρες"
@@ -800,7 +809,7 @@ el:
       connect_to_your_other_social_networks: "Συνδεθείτε με άλλα κοινωνικά δίκτυα"
       connect_with_people: "Συνδεθείτε με ενδιαφέροντα άτομα"
       connect_with_people_explanation_pt1: "Συνδεθείτε με άτομα τοποθετώντας τα σε μία ή περισσότερες από τις %{bold}"
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
+      connect_with_people_explanation_pt2: "Οι Πτυχές είναι ενας τρόπος οργάνωσης, των προσωπικών σου, καινούργιων και γνωστών σου προσώπων, επιτρέποντας σου να διαχωρίσεις η να μοιραστέις με υποκατηγοριές των επαφών σου πιο εύκολα."
       edit_profile: "Επεξεργασία Προφίλ"
       featured_tags: "Αξιόλογες ετικέτες"
       featured_users: "Αξιόλογοι χρήστες"
@@ -827,7 +836,7 @@ el:
     public: 
       does_not_exist: "Ο χρήστης %{username} δεν υπάρχει!"
     update: 
-      email_notifications_changed: "Αποτυχία αλλαγής γλώσσας"
+      email_notifications_changed: "Αλλαγή ειδοποιήσεων ηλεκτρονικού ταχυδρομείου,επιτυχής"
       language_changed: "Αλλαγή Γλώσσας επιτυχής"
       language_not_changed: "Η αλλαγή γλώσσας απέτυχε"
       password_changed: "Ο κωδικός σας άλλαξε. Μπορείτε τώρα να συνδεθείτε με τον νέο κωδικό. "
@@ -835,8 +844,8 @@ el:
       unconfirmed_email_changed: "Η διεύθυνση ηλεκτρονικού ταχυδρομείου άλλαξε. Χρειάζεται ενεργοποίηση."
       unconfirmed_email_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: "αποτυχία παροχής του προφίλ webfinger για %{profile_url}"
+    hcard_fetch_failed: "υπήρξε ενά πρόβλημα παροχής του hcard για #{@account}"
+    no_person_constructed: "Κανένα άτομο δεν μπορούσε να κατασκευαστεί απο αυτό το hcard."
+    not_enabled: "το webfinger φαίνεται να μην είναι ενεργοποιημέο για τον host του %{account}"
+    xrd_fetch_failed: "υπήρξε ένα πρόβλημα στη λήψη του xrd απο το λογαριασμό %{account}"
diff --git a/config/locales/diaspora/en_pirate.yml b/config/locales/diaspora/en_pirate.yml
index d8cd6c5c48b48fb8dc0189ed61e2b0dbac95fffc..0940330c81db25bd84f3444b661a6a59b73dfc58 100644
--- a/config/locales/diaspora/en_pirate.yml
+++ b/config/locales/diaspora/en_pirate.yml
@@ -101,6 +101,15 @@ en_pirate:
         heading: "Diaspora ID"
       donate: "Donate"
       handle_explanation: "This is your diaspora id. Like an email address, you can give this to people to reach you."
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "No mateys"
       no_tags: "+ Find a tag to follow"
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 2b9dfccef8ec67817625908c1947998da4429445..5a711848b0867e4764c33094cfd50fe2009eeb47 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -101,6 +101,15 @@ en_shaw:
         heading: "·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑲𐑛𐑧𐑯𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯"
       donate: "𐑛𐑴𐑯𐑱𐑑"
       handle_explanation: "𐑞𐑦𐑕 𐑦𐑟 𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑲𐑛𐑧𐑯𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯. 𐑤𐑲𐑒 𐑩𐑯 𐑦-𐑥𐑱𐑤 𐑨𐑛𐑮𐑧𐑕, 𐑿 𐑒𐑨𐑯 𐑜𐑦𐑝 𐑞𐑦𐑕 𐑑 𐑐𐑰𐑐𐑩𐑤 𐑑 𐑮𐑰𐑗 𐑿."
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "𐑒𐑰𐑐 %{pod} 𐑮𐑳𐑯𐑦𐑙 𐑓𐑨𐑕𐑑, 𐑚𐑲 𐑬𐑮 𐑕𐑻𐑝𐑼𐑟 𐑞𐑺 𐑥𐑳𐑯𐑔𐑤𐑦 𐑒𐑪𐑓𐑦 𐑓𐑦𐑒𐑕!"
       no_contacts: "𐑯𐑴 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
       no_tags: "𐑯𐑴 𐑑𐑨𐑜𐑟"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 25f92d2734098ce3b087cdd1753585dfffe2156e..1f580227eefa3d6b216b74ca32861639303826a5 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -101,6 +101,15 @@ eo:
         heading: "DIASPORA* uzantnomo"
       donate: "Donaci"
       handle_explanation: "Tiu ĉi estas via DIASPORA* uzantnomo.  Kiel retpoŝtadreso, vi povas doni tiun ĉi al homoj, por ke ili vin kontaktu."
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Helpu %{pod} bone funkcii; aĉetu por niaj servkomputiloj ilian ĉiumonatan kaforiparon!"
       no_contacts: "Nul kontaktoj"
       no_tags: "+ Trovi etikedon aboni"
diff --git a/config/locales/diaspora/es-AR.yml b/config/locales/diaspora/es-AR.yml
index ba222b0db0fd6d3d633d151e0e5937744d0b6f31..0832d8b3a78440efb1eb02728e0add43826cfb91 100644
--- a/config/locales/diaspora/es-AR.yml
+++ b/config/locales/diaspora/es-AR.yml
@@ -101,6 +101,15 @@ es-AR:
         heading: "Diaspora ID"
       donate: "Donate"
       handle_explanation: "Ésta es tu dirección de Diáspora*. Es como una dirección de correo electrónico, podés dársela a la gente para que te encuentren."
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "No hay contactos"
       no_tags: "No tags"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index d92ec4d07a0c0575ce45da3de3b9bbf9b6ab6e10..4a572f95e0c4f281aff282a2e80c79dcb198199b 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -101,6 +101,15 @@ es-CL:
         heading: "ID de Diaspora "
       donate: "Donar"
       handle_explanation: "Este es tu ID de Diaspora. Como una dirección de correo, puedes dársela a la gente para que te encuentren."
+      help: 
+        did_you: "Acaso tú:"
+        feature_suggestion: "... tienes una %{link} sugerencia?"
+        find_a_bug: "... encontraste un %{link}?"
+        have_a_question: "... tienes una %{link}?"
+        here_to_help: "La comunidad de Diaspora esta aquí para ayudar!"
+        more_support: "Para más ayuda, deberías ver aquí%{link}."
+        need_help: "Necesitas ayuda?"
+        tutorials: "Por tutoriales, ver %{link}."
       keep_us_running: "Mantén %{pod} rápido, !compra a nuestros servidores su dosis mensual de café!"
       no_contacts: "No hay contactos"
       no_tags: "+ Busca un tag para seguir"
@@ -140,14 +149,14 @@ es-CL:
       view_all_contacts: "Ver todos los contactos"
     show: 
       edit_aspect: "editar aspecto"
-    two: "%{count} aspects"
+    two: "%{count} aspectos"
     update: 
       failure: "Tu aspecto, %{name}, tenía el nombre muy largo para ser guardado."
       success: "Tu aspecto, %{name}, ha sido correctamente editado."
     zero: "ningún aspecto"
   authorizations: 
     index: 
-      no_applications: "You haven't registered any applications yet."
+      no_applications: "Todavía no has registrado ninguna aplicación."
       revoke_access: "Revocar el Acceso"
   back: "Atrás"
   bookmarklet: 
@@ -165,7 +174,7 @@ es-CL:
       commenting: "Comentando..."
     one: "1 comentario"
     other: "%{count} comentarios"
-    two: "%{count} comments"
+    two: "%{count} comentarios"
     zero: "no hay comentarios"
   contacts: 
     create: 
@@ -190,11 +199,11 @@ es-CL:
     other: "%{count} contactos"
     sharing: 
       people_sharing: "Personas compartiendo contigo:"
-    two: "%{count} contacts"
+    two: "%{count} contactos"
     zero: "no hay contactos"
   conversations: 
     create: 
-      fail: "Invalid message"
+      fail: "Mensaje invalido"
       sent: "Mensaje enviado"
     destroy: 
       success: "Conversación eliminada exitosamente"
@@ -204,7 +213,7 @@ es-CL:
         many: "%{count} nuevos mensajes"
         one: "1 nuevo mensaje"
         other: "%{count} nuevos mensajes"
-        two: "%{count} new messages"
+        two: "%{count} nuevos mensajes"
         zero: "sin nuevos mensajes"
     index: 
       create_a_new_message: "crear un nuevo mensaje"
@@ -220,11 +229,11 @@ es-CL:
       subject: "asunto"
       to: "para"
     new_message: 
-      fail: "Invalid message"
+      fail: "Mensaje invalido"
     show: 
       delete: "Eliminar y bloquear conversación"
       reply: "responder"
-      replying: "Replying..."
+      replying: "Respondiendo..."
   date: 
     formats: 
       birthday: "%B %d"
@@ -302,7 +311,7 @@ es-CL:
         many: "%{count} personas no les gusta esto"
         one: "1 persona no le gusta esto"
         other: "%{count} personas no les gusta esto"
-        two: "%{count} dislikes"
+        two: "%{count} no me gusta"
         zero: "a ninguna persona le disgusta esto"
       people_like_this: 
         few: "%{count} personas les gusta esto"
@@ -316,7 +325,7 @@ es-CL:
         many: "a %{count} les gusta esto"
         one: "a %{count} le gusta esto"
         other: "a %{count} les gusta esto"
-        two: "%{count} likes"
+        two: "%{count} me gusta"
         zero: "a nadie le gusta esto aun"
   limited: "Restringido"
   more: "Más"
@@ -328,21 +337,21 @@ es-CL:
       many: "%{actors} también comentaron en el %{post_link} de %{post_author}."
       one: "%{actors} también comentó en el %{post_link} de %{post_author}."
       other: "%{actors} también comentaron en el %{post_link} de %{post_author}."
-      two: "%{actors} also commented on %{post_author}'s %{post_link}."
+      two: "%{actors} también comentaron en el %{post_link} de  %{post_author}."
       zero: "%{actors} también comentó en el %{post_link} de %{post_author}."
     also_commented_deleted: 
       few: "%{actors} comentaron en un post eliminado."
       many: "%{actors} comentaron en una post eliminado."
       one: "%{actors} comentó en un post eliminado."
       other: "%{actors} comentaron en un post eliminado."
-      two: "%{actors} commented on a deleted post."
+      two: "%{actors} comentaron en un post eliminado."
       zero: "%{actors} comentó en un post eliminado."
     comment_on_post: 
       few: "%{actors} comentaron en tu %{post_link}."
       many: "%{actors} comentaron en tu %{post_link}."
       one: "%{actors} comentó en tu %{post_link}."
       other: "%{actors} comentaron en tu %{post_link}."
-      two: "%{actors} commented on your %{post_link}."
+      two: "%{actors} comentaron en tu %{post_link}."
       zero: "%{actors} comentó en tu %{post_link}."
     helper: 
       new_notifications: 
@@ -350,7 +359,7 @@ es-CL:
         many: "%{count} nuevas notificaciones"
         one: "1 nueva notificación"
         other: "%{count} nuevas notificaciones"
-        two: "%{count} new notifications"
+        two: "%{count} nuevas notificaciones"
         zero: "sin nuevas notificaciones"
     index: 
       and: "y"
@@ -359,7 +368,7 @@ es-CL:
         many: "y otros %{count}"
         one: "y uno más"
         other: "y otros %{count}"
-        two: "and %{count} others"
+        two: "y %{count} más"
         zero: "y nadie más"
       mark_all_as_read: "Marcar todo como leido"
       notifications: "Notificaciones"
@@ -368,28 +377,28 @@ es-CL:
       many: "%{actors} les gustó tu %{post_link}."
       one: "%{actors} le gustó tu %{post_link}."
       other: "%{actors} le gustó tu %{post_link}."
-      two: "%{actors} has just liked your %{post_link}."
+      two: "%{actors} les gusto tu %{post_link}."
       zero: "%{actors} le gustó tu %{post_link}."
     liked_post_deleted: 
       few: "%{actors} les gustó tu post eliminado."
       many: "%{actors} les gustó tu post eliminado."
       one: "%{actors} le gustó tu post eliminado."
       other: "%{actors} les gustó tu post eliminado."
-      two: "%{actors} liked your deleted post."
+      two: "%{actors} les gusto tu post eliminado."
       zero: "%{actors} le gustó tu post eliminado."
     mentioned: 
       few: "%{actors} te menciono en %{post_link}."
       many: "%{actors} te menciono en %{post_link}."
       one: "%{actors} te menciono en %{post_link}."
       other: "%{actors} te menciono en %{post_link}."
-      two: "%{actors} has mentioned you in a %{post_link}."
+      two: "%{actors} te han mencionado en %{post_link}."
       zero: "%{actors} te menciono en %{post_link}."
     mentioned_deleted: 
       few: "%{actors} te mencionó en un post eliminado."
       many: "%{actors} te mencionó en un post eliminado."
       one: "%{actors} te mencionó en un post eliminado."
       other: "%{actors} te mencionó en un post eliminado."
-      two: "%{actors} mentioned you in a deleted post."
+      two: "%{actors} te mencionaron en un post eliminado."
       zero: "%{actors} te mencionó en un post eliminado."
     post: "post"
     private_message: 
@@ -397,28 +406,28 @@ es-CL:
       many: "%{actors} te envió un mensaje."
       one: "%{actors} te envió un mensaje."
       other: "%{actors} te envió un mensaje."
-      two: "%{actors} sent you a message."
+      two: "%{actors} te enviaron un mensaje."
       zero: "%{actors} te envió un mensaje."
     reshared: 
-      few: "%{actors} has reshared your %{post_link}."
-      many: "%{actors} has reshared your %{post_link}."
-      one: "%{actors} has reshared your %{post_link}."
-      other: "%{actors} has reshared your %{post_link}."
-      two: "%{actors} has reshared your %{post_link}."
-      zero: "%{actors} has reshared your %{post_link}."
+      few: "%{actors} compartieron tu %{post_link}."
+      many: "%{actors} compartieron tu %{post_link}."
+      one: "%{actors} compartió tu %{post_link}."
+      other: "%{actors} compartieron tu %{post_link}."
+      two: "%{actors} compartieron tu %{post_link}."
+      zero: "%{actors} compartieron tu %{post_link}."
     reshared_post_deleted: 
-      few: "%{actors} reshared your deleted post."
-      many: "%{actors} reshared your deleted post."
-      one: "%{actors} reshared your deleted post."
-      other: "%{actors} reshared your deleted post."
-      two: "%{actors} reshared your deleted post."
-      zero: "%{actors} reshared your deleted post."
+      few: "%{actors} compartieron tu post eliminado."
+      many: "%{actors} compartieron tu post eliminado."
+      one: "%{actors} compartió tu post eliminado."
+      other: "%{actors} compartieron tu post eliminado."
+      two: "%{actors} compartieron tu post eliminado."
+      zero: "%{actors} compartió tu post eliminado."
     started_sharing: 
       few: "%{actors} comenzaron a compartir contigo."
       many: "%{actors} comenzaron a compartir contigo."
       one: "%{actors} comenzó a compartir contigo."
       other: "%{actors} comenzaron a compartir contigo."
-      two: "%{actors} started sharing with you."
+      two: "%{actors} comenzaron a compartir contigo."
       zero: "%{actors} comenzó a compartir contigo."
   notifier: 
     a_post_you_shared: "un post."
@@ -439,8 +448,8 @@ es-CL:
     private_message: 
       reply_to_or_view: "Responder o ver esta conversación >"
     reshared: 
-      reshared: "%{name} just reshared your post"
-      view_post: "View post >"
+      reshared: "%{name} compartió tu post"
+      view_post: "Ver el post >"
     single_admin: 
       admin: "Tu administrador de Diaspora"
       subject: "Un mensaje sobre tu cuenta de Diaspora:"
@@ -499,10 +508,10 @@ es-CL:
       start_sharing: "Empezar a compartir"
       to_accept_or_ignore: "aceptar o ignorar."
     sub_header: 
-      add_some: "add some"
-      edit: "edit"
-      you_have_no_tags: "you have no tags!"
-    two: "%{count} people"
+      add_some: "Agrega algunos"
+      edit: "editar"
+      you_have_no_tags: "No tienes ningún tag!"
+    two: "%{count} personas"
     webfinger: 
       fail: "Lo siento, no pudimos encontrar %{handle}."
     zero: "ninguna persona"
@@ -542,8 +551,8 @@ es-CL:
       notice: "Foto actualizada correctamente."
   post_visibilites: 
     update: 
-      post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted."
-      see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page."
+      post_hidden_and_muted: "El post de %{name} se ha ocultado, y las notificaciones se han silenciado."
+      see_it_on_their_profile: "Si quieres ver las actualizaciones de este post, visita el perfil de %{name}."
   posts: 
     show: 
       destroy: "ELiminar"
@@ -605,7 +614,7 @@ es-CL:
         many: "%{count} nuevas solicitudes!"
         one: "nueva solicitud!"
         other: "%{count} nuevas solicitudes!"
-        two: "%{count} new requests!"
+        two: "%{count} nuevas solicitudes!"
         zero: "sin nuevas solicitudes"
     manage_aspect_contacts: 
       existing: "Los contactos existen"
@@ -623,7 +632,7 @@ es-CL:
         many: "Se ha compartido %{count} veces"
         one: "Se ha compartido 1 vez"
         other: "Se ha compartido %{count} veces"
-        two: "%{count} reshares"
+        two: "se ha compartido %{count} veces"
         zero: "Compartir"
       reshare_confirmation: "Compartir el post de %{author}? "
       reshare_original: "Compartir el original"
@@ -665,14 +674,14 @@ es-CL:
       know_email: "¿Conoces sus direcciones de correo? Deberías invitarlos"
       your_diaspora_username_is: "Tu nombre de usuario Diaspora es: %{diaspora_handle}"
     aspect_dropdown: 
-      add_to_aspect: "Add to aspect"
+      add_to_aspect: "Agregar al aspecto"
       toggle: 
-        few: "In %{count} aspects"
-        many: "In %{count} aspects"
-        one: "In %{count} aspect"
-        other: "In %{count} aspects"
-        two: "In %{count} aspects"
-        zero: "Add to aspect"
+        few: "En %{count} aspectos"
+        many: "En %{count} aspectos"
+        one: "En %{count} aspecto"
+        other: "En %{count} aspectos"
+        two: "En %{count} aspectos"
+        zero: "Agregar al aspecto"
     contact_list: 
       all_contacts: "Todos los contactos"
     footer: 
@@ -711,7 +720,7 @@ es-CL:
       reshare: "Compartir de nuevo"
     stream_element: 
       dislike: "No me gusta esto"
-      hide_and_mute: "Hide and Mute"
+      hide_and_mute: "Ocultar y silenciar"
       like: "Me gusta esto"
       shared_with: "Compartir con: %{aspect_names}"
       unlike: "No me gusta"
@@ -731,7 +740,7 @@ es-CL:
       many: "Tu mensaje de estado debe tener menos de %{count} caracteres"
       one: "Tu mensaje de estado debe tener menos de %{count} caracter"
       other: "Tu mensaje de estado debe tener menos de %{count} caracteres"
-      two: "please make your status messages less than %{count} characters"
+      two: "tu mensaje de estado tiene que tener menos de %{count} caracteres"
       zero: "Tu mensaje de estado debe tener menos de %{count} caracteres"
   stream_helper: 
     hide_comments: "ocultar todos los comentarios"
@@ -790,18 +799,18 @@ es-CL:
       new_password: "Nueva Contraseña"
       private_message: "...recibes un mensaje privado?"
       receive_email_notifications: "Recibir notificaciones por correo electrónico cuando..."
-      reshared: "...someone reshares your post?"
+      reshared: "...alguien comparte tu post?"
       started_sharing: "...alguien comienza a compartir contigo?"
       your_email: "Tu correo electrónico"
       your_handle: "Tu id de diaspora"
     getting_started: 
-      bold: "aspects"
+      bold: "aspectos"
       connect_to: "Conectar a"
       connect_to_your_other_social_networks: "Conectate con tus otras redes sociales"
       connect_with_people: "Conectate con gente cool"
-      connect_with_people_explanation_pt1: "Conectate con las personas ubicándolas en uno o mas de tus"
+      connect_with_people_explanation_pt1: "Conéctate con las personas ubicándolas en uno o más de tus %{bold}"
       connect_with_people_explanation_pt2: "Los Aspectos son la forma intuitiva de agrupar caras nuevas y familiares, de manera privada, te permiten filtrar o compartir con un subconjunto de tus contactos de manera sencilla."
-      edit_profile: "Edit Profile"
+      edit_profile: "Editar perfil"
       featured_tags: "Etiquetas destacadas"
       featured_users: "Usuarios destacados"
       fill_out_your_profile: "Rellena tu perfil"
@@ -819,8 +828,8 @@ es-CL:
         name: "Nombre"
         photo: "Foto"
         tags: "Tags"
-      search_for_hashtags: "Search for #hashtags"
-      search_for_people: "Search for people"
+      search_for_hashtags: "Buscar por #hashtags"
+      search_for_people: "Buscar por persona"
       see_all_featured_users: "Ver todos los usuarios destacados"
       welcome: "¡Bienvenido!"
       welcome_with_name: "Bienvenido, %{name}!"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 3bf25eb50471188824106c3825cd1aebe5c5af78..1a0f655b5e93ee59ac6227134be8ab91d5443e7c 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -101,6 +101,15 @@ es:
         heading: "Identidad Diaspora*"
       donate: "Donar"
       handle_explanation: "Ésta es tu dirección Diaspora*. Como una dirección de correo, puedes dársela a la gente para que te encuentre."
+      help: 
+        did_you: "Quizás..."
+        feature_suggestion: "tengas alguna sugerencia. %{link}"
+        find_a_bug: "encontraste algún error. %{link}"
+        have_a_question: "tengas alguna pregunta. %{link}"
+        here_to_help: "¡La comunidad Diaspora está aquí para ayudar!"
+        more_support: "Para más ayuda deberías visitar %{link}."
+        need_help: "¿Necesitas ayuda?"
+        tutorials: "Para ver los tutoriales visita %{link}."
       keep_us_running: "Haz que %{pod} vaya más rápido, ¡compra a nuestros servidores su dosis de café mensual!"
       no_contacts: "No hay contactos"
       no_tags: "+ Encuentra una etiqueta a seguir"
@@ -300,23 +309,23 @@ es:
       people_dislike_this: 
         few: "A %{count} no les gusta"
         many: "A %{count} no les gusta"
-        one: "A 1 no le gusta"
+        one: "A 1 persona no le gusta"
         other: "A %{count} no les gusta"
-        two: "A %{count} no les gusta"
+        two: "A %{count} personas no les gusta"
         zero: "A nadie le disgusta"
       people_like_this: 
         few: "A %{count} les gusta"
         many: "A %{count} les gusta"
-        one: "A 1 le gusta"
+        one: "A 1 persona le gusta"
         other: "A %{count} les gusta"
-        two: "A %{count} les gusta"
+        two: "A %{count} personas les gusta"
         zero: "A nadie le gusta"
       people_like_this_comment: 
         few: "A %{count} les gusta"
         many: "A %{count} les gusta"
-        one: "A %{count} le gusta"
+        one: "A %{count} persona le gusta"
         other: "A %{count} les gusta"
-        two: "A %{count} les gusta"
+        two: "A %{count} personas les gusta"
         zero: "sin votos"
   limited: "Restringido"
   more: "Más"
@@ -375,7 +384,7 @@ es:
       many: "%{actors} les gustó una publicación eliminada."
       one: "%{actors} le gustó una publicación eliminada."
       other: "%{actors} les gustó una publicación eliminada."
-      two: "%{actors} le gustaron tu publicación eliminada."
+      two: "%{actors} les gustaron tu publicación eliminada."
       zero: "%{actors} le gustó una publicación eliminada."
     mentioned: 
       few: "%{actors} te mencionaron en un %{post_link}."
@@ -649,7 +658,7 @@ es:
       no_services: "Aún no has enlazado ningún servicio."
       really_disconnect: "¿Desconectar %{service}?"
     inviter: 
-      click_link_to_accept_invitation: "Haz click en este enlace para aceptar tu invitación"
+      click_link_to_accept_invitation: "Sigue este enlace para aceptar la invitación"
       join_me_on_diaspora: "Comparte conmigo en DIASPORA*."
     remote_friend: 
       invite: "invitar"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 1a629fe7b2e2b734ba3b62a12ac1977bc3656ed0..93ab03f3e675fcb95f4d5c825a685b0fd04ea538 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -101,6 +101,15 @@ eu:
         heading: "Diaspora IDa"
       donate: "Donate"
       handle_explanation: "Hau da zure Diaspora IDa. E-posta helbidea bezalakoa da, zure adiskideei emaiezu zu aurkitzearren."
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "Adiskiderik ez"
       no_tags: "No tags"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index fb37bba703a6dae521dfd1bec9894b28dab92e92..888bdb3aff4ed7c8913a87404616d63173f2f9b4 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -65,7 +65,7 @@ fi:
       commented_on: "kommentoitu"
       posted: "lähetetty"
       recently: "äskettäin:"
-      stream: "Stream"
+      stream: "Virta"
     contacts_not_visible: "Kontaktit tässä näkymässä eivät voi nähdä toisiaan."
     contacts_visible: "Kontaktit tässä näkymässä voivat nähdä toisensa."
     create: 
@@ -84,7 +84,7 @@ fi:
       remove_aspect: "Poista näkymä"
       rename: "nimeä uudelleen"
       update: "päivitä"
-      updating: "updating"
+      updating: "päivittää"
     few: "%{count} näkymää"
     helper: 
       are_you_sure: "Haluatko varmasti poistaa tämän näkymän?"
@@ -92,20 +92,29 @@ fi:
       remove: "poista"
     index: 
       cubbies: 
-        explanation: "Cubbi.es is the first Diaspora application under development."
+        explanation: "Cubbi.es on ensimmäinen kehitettävä Diaspora -sovellus."
         heading: "Yhdistä Cubbi.es:iin"
-        learn_more: "Learn more"
+        learn_more: "Lue lisää"
       diaspora_id: 
         content_1: "Diaspora ID:si on:"
         content_2: "Give it to anyone and they'll be able to find you on Diaspora."
         heading: "Diaspora ID"
       donate: "Donate"
       handle_explanation: "Tämä on Diaspora-osoitteesi. Voit käyttää sitä kuten sähköpostiosoitettasi. Sen avulla sinut tavoitetaan Diasporasta."
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "Ei kontakteja"
       no_tags: "No tags"
       people_sharing_with_you: "Ihmiset jotka jakavat kanssasi"
-      post_a_message: "post a message >>"
+      post_a_message: "lähetä viesti >>"
       services: 
         content: "You can connect the following services to Diaspora:"
         heading: "Connect Services"
@@ -136,7 +145,7 @@ fi:
       work: "Työ"
     selected_contacts: 
       manage_your_aspects: "Hallitse näkymiä."
-      no_contacts: "You don't have any contacts here yet."
+      no_contacts: "Sinulla ei vielä ole kontakteja."
       view_all_contacts: "Näytä kaikki kontaktit"
     show: 
       edit_aspect: "muokkaa näkymää"
@@ -148,14 +157,14 @@ fi:
   authorizations: 
     index: 
       no_applications: "You haven't registered any applications yet."
-      revoke_access: "Revoke Access"
+      revoke_access: "Estä pääsy"
   back: "Takaisin"
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
     heading: "Diaspora Bookmarklet"
-    post_something: "Post something to Diaspora"
-    post_success: "Posted! Closing!"
+    post_something: "Kirjoita jotain Diasporaan"
+    post_success: "Lähetetty! Suljetaan!"
   cancel: "Peruuta"
   comments: 
     few: "%{count} kommentia"
@@ -174,14 +183,14 @@ fi:
       featured_users: "Featured Users"
     few: "%{count} kontaktia"
     index: 
-      add_a_new_aspect: "Add a new aspect"
-      all_contacts: "All Contacts"
+      add_a_new_aspect: "Lisää näkymä"
+      all_contacts: "Kaikki kontaktit"
       edit_aspect: "Muokkaa %{name}"
       many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
-      my_contacts: "My Contacts"
-      no_contacts: "No contacts."
-      only_sharing_with_me: "Only sharing with me"
-      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      my_contacts: "Kontaktini"
+      no_contacts: "Ei kontakteja."
+      only_sharing_with_me: "Jakaa vain kanssani"
+      remove_person_from_aspect: "Poista %{person_name} näkymästä: \"%{aspect_name}\""
       start_a_conversation: "Start a conversation"
       title: "Kontaktit"
       your_contacts: "Kontaktisi"
@@ -195,9 +204,9 @@ fi:
   conversations: 
     create: 
       fail: "Invalid message"
-      sent: "Message sent"
+      sent: "Viesti lähetetty"
     destroy: 
-      success: "Conversation successfully removed"
+      success: "Keskustelu poistettu onnistuneesti"
     helper: 
       new_messages: 
         few: "%{count} uutta viestiä"
@@ -208,7 +217,7 @@ fi:
         zero: "ei uusia viestejä"
     index: 
       create_a_new_message: "tee uusi viesti"
-      inbox: "Inbox"
+      inbox: "Uudet viestit"
       message_inbox: "Postilaatikko"
       new_message: "Uusi viesti"
       no_conversation_selected: "ei valittua keskustelua"
@@ -281,7 +290,7 @@ fi:
   layouts: 
     application: 
       powered_by: "PALVELUN TARJOAA DIASPORA*"
-      public_feed: "Public Diaspora Feed for %{name}"
+      public_feed: "Käyttäjän %{name} julkinen Diaspora uutisvirta"
       toggle: "vaihda mobiili sivustoon"
       whats_new: "Uutta"
       your_aspects: "näkymäsi"
@@ -324,26 +333,26 @@ fi:
   no_results: "Tuloksia ei löytynyt"
   notifications: 
     also_commented: 
-      few: "%{actors} also commented on %{post_author}'s %{post_link}."
+      few: "%{actors} kommentoi myös %{post_author}:n viestiä: %{post_link}."
       many: "%{actors} also commented on %{post_author}'s %{post_link}."
-      one: "%{actors} also commented on %{post_author}'s %{post_link}."
-      other: "%{actors} also commented on %{post_author}'s %{post_link}."
+      one: "%{actors} kommentoi myös %{post_author}:n viestiä: %{post_link}."
+      other: "%{actors} kommentoi myös %{post_author}:n viestiä: %{post_link}."
       two: "%{actors} also commented on %{post_author}'s %{post_link}."
-      zero: "%{actors} also commented on %{post_author}'s %{post_link}."
+      zero: "%{actors} kommentoi myös %{post_author}:n viestiä: %{post_link}."
     also_commented_deleted: 
-      few: "%{actors} commented on a deleted post."
-      many: "%{actors} commented on a deleted post."
-      one: "%{actors} commented on a deleted post."
+      few: "%{actors} kommentoi poistettua viestiä."
+      many: "%{actors} kommentoi poistettua viestiä."
+      one: "%{actors} kommentoi poistettua viestiä."
       other: "%{actors} commented on a deleted post."
       two: "%{actors} commented on a deleted post."
       zero: "%{actors} commented on a deleted post."
     comment_on_post: 
-      few: "%{actors} commented on your %{post_link}."
-      many: "%{actors} commented on your %{post_link}."
-      one: "%{actors} commented on your %{post_link}."
-      other: "%{actors} commented on your %{post_link}."
+      few: "%{actors} kommentoi viestiäsi: %{post_link}."
+      many: "%{actors} kommentoi viestiäsi: %{post_link}."
+      one: "%{actors} kommentoi viestiäsi: %{post_link}."
+      other: "%{actors} kommentoi viestiäsi: %{post_link}."
       two: "%{actors} commented on your %{post_link}."
-      zero: "%{actors} commented on your %{post_link}."
+      zero: "%{actors} kommentoi viestiäsi: %{post_link}."
     helper: 
       new_notifications: 
         few: "%{count} uutta ilmoitusta"
@@ -371,19 +380,19 @@ fi:
       two: "%{actors} has just liked your %{post_link}."
       zero: "%{actors} has just liked your %{post_link}."
     liked_post_deleted: 
-      few: "%{actors} liked your deleted post."
-      many: "%{actors} liked your deleted post."
-      one: "%{actors} liked your deleted post."
-      other: "%{actors} liked your deleted post."
+      few: "%{actors} piti poistamastasi viestistä."
+      many: "%{actors} piti poistamastasi viestistä."
+      one: "%{actors} piti poistamastasi viestistä."
+      other: "%{actors} piti poistamastasi viestistä."
       two: "%{actors} liked your deleted post."
-      zero: "%{actors} liked your deleted post."
+      zero: "%{actors} piti poistamastasi viestistä."
     mentioned: 
       few: "%{actors} has mentioned you in a %{post_link}."
       many: "%{actors} has mentioned you in a %{post_link}."
       one: "%{actors} has mentioned you in a %{post_link}."
-      other: "%{actors} has mentioned you in a %{post_link}."
+      other: "%{actors} on maininnut sinut viestissä: %{post_link}."
       two: "%{actors} has mentioned you in a %{post_link}."
-      zero: "%{actors} has mentioned you in a %{post_link}."
+      zero: "%{actors} on maininnut sinut viestissä %{post_link}."
     mentioned_deleted: 
       few: "%{actors} mentioned you in a deleted post."
       many: "%{actors} mentioned you in a deleted post."
@@ -414,12 +423,12 @@ fi:
       two: "%{actors} reshared your deleted post."
       zero: "%{actors} reshared your deleted post."
     started_sharing: 
-      few: "%{actors} started sharing with you."
-      many: "%{actors} started sharing with you."
-      one: "%{actors} started sharing with you."
-      other: "%{actors} started sharing with you."
+      few: "%{actors} on aloittanut jakamaan kanssasi."
+      many: "%{actors} on aloittanut jakamaan kanssasi."
+      one: "%{actors} on aloittanut jakamaan kanssasi."
+      other: "%{actors} on aloittanut jakamaan kanssasi."
       two: "%{actors} started sharing with you."
-      zero: "%{actors} started sharing with you."
+      zero: "%{actors} on aloittanut jakamaan kanssasi."
   notifier: 
     a_post_you_shared: "a post."
     click_here: "click here"
@@ -456,10 +465,10 @@ fi:
   password_confirmation: "Salasanan varmistus"
   people: 
     add_contact_small: 
-      add_contact_from_tag: "add contact from tag"
+      add_contact_from_tag: "lisää kontakti tagista"
     aspect_list: 
       edit_membership: "muokkaa näkymän jäsenyyttä."
-    few: "%{count} people"
+    few: "%{count} ihmistä"
     helper: 
       people_on_pod_are_aware_of: " ihmiset podissa tietävät, että"
       results_for: " tulokset kyselylle %{params}"
@@ -468,9 +477,9 @@ fi:
       no_one_found: "...ketään ei löytynyt."
       no_results: "Hei! Sinun tulisi etsiä jotakin."
       results_for: "hakutulokset kohteelle"
-    many: "%{count} people"
-    one: "1 person"
-    other: "%{count} people"
+    many: "%{count} ihmistä"
+    one: "1 ihminen"
+    other: "%{count} ihmistä"
     person: 
       add_contact: "lisää kontakti"
       already_connected: "Yhteys jo olemassa"
@@ -482,7 +491,7 @@ fi:
       edit_my_profile: "Muokkaa profiilia"
       gender: "Sukupuoli"
       in_aspects: "näkymissä"
-      location: "location"
+      location: "sijainti"
       remove_contact: "poista kontakti"
       remove_from: "Poista %{name} näkymästä %{aspect}?"
     show: 
@@ -495,7 +504,7 @@ fi:
       recent_posts: "Viimeisimmät tapahtumat"
       recent_public_posts: "Viimeisimmät julkiset tapahtumat"
       return_to_aspects: "Palaa näkymiin"
-      see_all: "See all"
+      see_all: "Näytä kaikki"
       start_sharing: "aloita jakamaan"
       to_accept_or_ignore: "hyväksyäksesi, tai hylätäksesi sen."
     sub_header: 
@@ -505,7 +514,7 @@ fi:
     two: "%{count} people"
     webfinger: 
       fail: "Valitettavasti tunnusta %{handle} ei löytynyt."
-    zero: "no people"
+    zero: "Ei ihmisiä"
   photos: 
     comment_email_subject: "%{name}'s photo"
     create: 
@@ -698,14 +707,14 @@ fi:
       all: "kaikki"
       all_contacts: "kaikki kontaktit"
       click_to_share_with: "Jakomenetelmät:"
-      discard_post: "Discard post"
+      discard_post: "Hylkää viesti"
       make_public: "tee julkiseksi"
       post_a_message_to: "Lähetä viesti näkymään %{aspect}"
       posting: "Lähetetään..."
       publishing_to: "Julkaistaan: "
       share: "Jaa"
       share_with: "Jaa"
-      upload_photos: "Upload photos"
+      upload_photos: "Lisää kuv(i)a"
       whats_on_your_mind: "Mitä mielessä?"
     reshare: 
       reshare: "Jaa uudelleen"
@@ -719,7 +728,7 @@ fi:
       viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
-      success: "Successfully mentioned: %{names}"
+      success: "Onnistuneesti mainittu: %{names}"
     destroy: 
       failure: "Viestin poisto epäonnistui"
     helper: 
@@ -735,7 +744,7 @@ fi:
       zero: "please make your status messages less than %{count} characters"
   stream_helper: 
     hide_comments: "piilota kommentit"
-    show_more_comments: "Show %{number} more comments"
+    show_more_comments: "Näytä seuraavat (%{number} kommenttia"
   tag_followings: 
     create: 
       failure: "Failed to follow: #%{name}"
@@ -747,9 +756,9 @@ fi:
     show: 
       follow: "Follow #%{tag}"
       following: "Following #%{tag}"
-      nobody_talking: "Nobody is talking about %{tag} yet."
-      people_tagged_with: "People tagged with %{tag}"
-      posts_tagged_with: "Posts tagged with #%{tag}"
+      nobody_talking: "Kukaan ei keskustele %{tag} tagista vielä."
+      people_tagged_with: "Ihmiset merkitty %{tag} tagilla"
+      posts_tagged_with: "Viestit merkitty #%{tag} tagilla"
       stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 41900b9b8c00c905e2975c043a278a8549274dde..091a2eafaf21ec40a659fbfa8c7b2c7177480e51 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -37,7 +37,7 @@ fr:
             person: 
               invalid: "est invalide."
             username: 
-              invalid: "n'est pas valide. Nous n'autorisons que les lettres, chiffres et _"
+              invalid: "n'est pas valide. Nous n'autorisons que les lettres, chiffres et caractère de soulignement."
               taken: "est déjà pris."
   ago: "Il y a %{time}"
   all_aspects: "Tous les aspects"
@@ -47,7 +47,7 @@ fr:
       unknown_person: "personne inconnue"
       video_title: 
         unknown: "Titre de vidéo inconnu"
-  are_you_sure: "Êtes-vous certains?"
+  are_you_sure: "Êtes-vous certain ?"
   aspect_memberships: 
     destroy: 
       failure: "Impossible de retirer la personne de l'aspect"
@@ -101,7 +101,16 @@ fr:
         heading: "Identifiant Diaspora"
       donate: "Faire un don"
       handle_explanation: "Ceci est votre identifiant diaspora. Comme une adresse de courrier électronique, vous pouvez le communiquer à d'autres personnes pour leur permettre de vous joindre."
-      keep_us_running: "Permettez à %{pod} de fonctionner rapidement, achetez une dose de café mensuelle à nos serveurs !"
+      help: 
+        did_you: "Avez-vous:"
+        feature_suggestion: "... une suggestion (%{link}) ?"
+        find_a_bug: "... trouvé un %{link} ?"
+        have_a_question: "... une %{link} ?"
+        here_to_help: "La communauté de Diaspora est là pour vous aider !"
+        more_support: "Pour plus d'aide, vous pouvez visiter %{link}."
+        need_help: "Besoin d'aide ?"
+        tutorials: "Pour les tutoriaux, visitez %{link}."
+      keep_us_running: "Permettez à %{pod} de fonctionner rapidement et achetez une dose de café par mois à nos serveurs !"
       no_contacts: "Aucun contact"
       no_tags: "+ Trouver un tag à suivre"
       people_sharing_with_you: "Personnes partageant avec vous"
@@ -147,7 +156,7 @@ fr:
     zero: "aucun aspect"
   authorizations: 
     index: 
-      no_applications: "You haven't registered any applications yet."
+      no_applications: "Vous n'avez pas encore enregistré d'application."
       revoke_access: "Révoquer l'accès"
   back: "Retour"
   bookmarklet: 
@@ -165,7 +174,7 @@ fr:
       commenting: "Commentaire en cours d'envoi..."
     one: "1 commentaire"
     other: "%{count} commentaires"
-    two: "%{count} comments"
+    two: "%{count} commentaires"
     zero: "aucun commentaire"
   contacts: 
     create: 
@@ -204,7 +213,7 @@ fr:
         many: "%{count} nouveaux messages"
         one: "1 nouveau message"
         other: "%{count} nouveaux messages"
-        two: "%{count} new messages"
+        two: "%{count} nouveaux messages"
         zero: "Aucun nouveau message"
     index: 
       create_a_new_message: "créer un nouveau message"
@@ -302,21 +311,21 @@ fr:
         many: "%{count} personnes n'aiment pas"
         one: "%{count} personne n'aime pas"
         other: "%{count} personnes n'aiment pas"
-        two: "%{count} dislikes"
+        two: "%{count} n'aiment pas"
         zero: "Personne n'aime pas ça"
       people_like_this: 
         few: "%{count} personnes aiment"
         many: "%{count} personnes aiment"
         one: "%{count} personne aime"
         other: "%{count} personnes aiment"
-        two: "%{count} likes"
+        two: "%{count} aiment"
         zero: "Personne n'aime ça"
       people_like_this_comment: 
         few: "%{count} aiment"
         many: "%{count} aiment"
         one: "%{count} aime"
         other: "%{count} aiment"
-        two: "%{count} likes"
+        two: "%{count} aiment"
         zero: "personne n'aime"
   limited: "Limité"
   more: "Plus"
@@ -328,21 +337,21 @@ fr:
       many: "%{actors} a/ont également commenté le %{post_link} de %{post_author}."
       one: "%{actors} a/ont également commenté le %{post_link} de %{post_author}."
       other: "%{actors} a/ont également commenté le %{post_link} de %{post_author}."
-      two: "%{actors} also commented on %{post_author}'s %{post_link}."
+      two: "%{actors} ont aussi commenté %{post_link} de %{post_author}."
       zero: "%{actors} a/ont également commenté le %{post_link} de %{post_author}."
     also_commented_deleted: 
       few: "%{actors} a commenté votre message supprimé."
       many: "%{actors} a commenté votre message supprimé."
       one: "%{actors} a commenté votre message supprimé."
       other: "%{actors} a commenté votre message supprimé."
-      two: "%{actors} commented on a deleted post."
+      two: "%{actors} ont commenté sur un message supprimé."
       zero: "%{actors} a commenté votre message supprimé."
     comment_on_post: 
       few: "%{actors} a/ont commenté %{post_link}."
       many: "%{actors} a/ont commenté %{post_link}."
       one: "%{actors} a/ont commenté %{post_link}."
       other: "%{actors} a/ont commenté votre %{post_link}."
-      two: "%{actors} commented on your %{post_link}."
+      two: "%{actors} ont commenté votre %{post_link}."
       zero: "%{actors} a/ont commenté votre %{post_link}."
     helper: 
       new_notifications: 
@@ -350,7 +359,7 @@ fr:
         many: "%{count} nouvelles notifications"
         one: "1 nouvelle notification"
         other: "%{count} nouvelles notifications"
-        two: "%{count} new notifications"
+        two: "%{count} nouvelles notifications"
         zero: "Aucune nouvelle notification"
     index: 
       and: "et"
@@ -359,7 +368,7 @@ fr:
         many: "et %{count} autres"
         one: "et un autre"
         other: "et %{count} autres"
-        two: "and %{count} others"
+        two: "et %{count} autres"
         zero: "et personne d'autre"
       mark_all_as_read: "Tout marquer comme lu"
       notifications: "Notifications"
@@ -368,28 +377,28 @@ fr:
       many: "%{actors} a/ont aimé votre %{post_link}."
       one: "%{actors} a/ont aimé votre %{post_link}."
       other: "%{actors} a/ont aimé votre %{post_link}."
-      two: "%{actors} has just liked your %{post_link}."
+      two: "%{actors} viennent d'aimer votre %{post_link}."
       zero: "%{actors} a/ont aimé votre %{post_link}."
     liked_post_deleted: 
       few: "%{actors} a aimé votre message supprimé."
       many: "%{actors} a aimé votre message supprimé."
       one: "%{actors} a aimé votre message supprimé."
       other: "%{actors} a aimé votre message supprimé."
-      two: "%{actors} liked your deleted post."
+      two: "%{actors} aiment le message que vous avez supprimé."
       zero: "%{actors} a aimé votre message supprimé."
     mentioned: 
       few: "%{actors} vous a mentionné(e) dans un %{post_link}."
       many: "%{actors} vous a mentionné(e) dans un %{post_link}."
       one: "%{actors} vous a mentionné(e) dans un %{post_link}."
       other: "%{actors} vous a mentionné(e) dans un %{post_link}."
-      two: "%{actors} has mentioned you in a %{post_link}."
+      two: "%{actors} a parlé de vous dans %{post_link}."
       zero: "%{actors} vous a mentionné(e) dans un %{post_link}."
     mentioned_deleted: 
       few: "%{actors} vous a mentionné dans un message supprimé."
       many: "%{actors} vous a mentionné dans un message supprimé."
       one: "%{actors} vous a mentionné dans un message supprimé."
       other: "%{actors} vous a/ont mentionné(e) dans un message supprimé."
-      two: "%{actors} mentioned you in a deleted post."
+      two: "%{actors} ont parlé de vous dans un message supprimé."
       zero: "%{actors} vous a/ont mentionné(e) dans un message supprimé."
     post: "message"
     private_message: 
@@ -397,28 +406,28 @@ fr:
       many: "%{actors} vous a envoyé un message."
       one: "%{actors} vous a envoyé un message."
       other: "%{actors} vous a envoyé un message."
-      two: "%{actors} sent you a message."
+      two: "%{actors} vous ont envoyé un message."
       zero: "%{actors} vous a envoyé un message."
     reshared: 
       few: "%{actors} a repartagé votre %{post_link}."
       many: "%{actors} a repartagé votre %{post_link}."
       one: "%{actors} a repartagé votre %{post_link}."
       other: "%{actors} a repartagé votre %{post_link}."
-      two: "%{actors} has reshared your %{post_link}."
+      two: "%{actors} ont partagé votre %{post_link}."
       zero: "%{actors} a repartagé votre %{post_link}."
     reshared_post_deleted: 
-      few: "%{actors} reshared your deleted post."
-      many: "%{actors} reshared your deleted post."
-      one: "%{actors} reshared your deleted post."
-      other: "%{actors} reshared your deleted post."
-      two: "%{actors} reshared your deleted post."
-      zero: "%{actors} reshared your deleted post."
+      few: "%{actors} a partagé le message que vous avez supprimé."
+      many: "%{actors} ont partagé le message que vous avez supprimé."
+      one: "%{actors} a partagé le message que vous avez supprimé."
+      other: "%{actors} a partagé le message que vous avez supprimé."
+      two: "%{actors} ont partagé le message que vous avez supprimé."
+      zero: "%{actors} a partagé votre message supprimé."
     started_sharing: 
       few: "%{actors} a/ont commencé à partager avec vous."
       many: "%{actors} a/ont commencé à partager avec vous."
       one: "%{actors} a/ont commencé à partager avec vous."
       other: "%{actors} a/ont commencé à partager avec vous."
-      two: "%{actors} started sharing with you."
+      two: "%{actors} ont commencé à échanger avec vous."
       zero: "%{actors} a/ont commencé à partager avec vous."
   notifier: 
     a_post_you_shared: "un post."
@@ -426,7 +435,7 @@ fr:
     comment_on_post: 
       reply: "Répondre ou voir le post de %{name} >"
     confirm_email: 
-      click_link: "Pour activer votre nouvelle adresse email %{unconfirmed_email}, merci de cliquer sur ce lien :"
+      click_link: "Pour activer votre nouvelle adresse email %{unconfirmed_email}, merci de suivre ce lien :"
       subject: "Merci d'activer votre nouvelle adresse email %{unconfirmed_email}"
     email_sent_by_diaspora: "Ce courriel a été envoyé par Diaspora. Si vous souhaitez cesser de recevoir des courriels de ce genre,"
     hello: "Bonjour %{name} !"
@@ -439,8 +448,8 @@ fr:
     private_message: 
       reply_to_or_view: "Répondre ou voir cette conversation >"
     reshared: 
-      reshared: "%{name} just reshared your post"
-      view_post: "View post >"
+      reshared: "%{name} a juste partagé votre message"
+      view_post: "Voir le message >"
     single_admin: 
       admin: "Votre administrateur Diaspora"
       subject: "Un message concernant votre compte Diaspora :"
@@ -502,7 +511,7 @@ fr:
       add_some: "ajouter quelques"
       edit: "modifier"
       you_have_no_tags: "vous n'avez pas de tags !"
-    two: "%{count} people"
+    two: "%{count} personnes"
     webfinger: 
       fail: "Impossible de trouver %{handle}."
     zero: "personne"
@@ -519,7 +528,7 @@ fr:
     new: 
       back_to_list: "Retourner à la liste"
       new_photo: "Nouvelle photo"
-      post_it: "la publier !"
+      post_it: "publiez-le !"
     new_photo: 
       empty: "{file} est vide, merci de sélectionner de nouveau des fichiers sans celui-ci."
       invalid_ext: "{file} a une extension invalide. Seules {extensions} sont autorisées."
@@ -542,8 +551,8 @@ fr:
       notice: "La photo a été mise à jour."
   post_visibilites: 
     update: 
-      post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted."
-      see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page."
+      post_hidden_and_muted: "Le message de %{name} a été masqué, et les notifications mises en sourdine."
+      see_it_on_their_profile: "Si vous voulez voir les mises à jour de ce message, visitez la page de profil de %{name}."
   posts: 
     show: 
       destroy: "Supprimer"
@@ -605,7 +614,7 @@ fr:
         many: "%{count} nouvelles requêtes !"
         one: "nouvelle requête !"
         other: "%{count} nouvelles requêtes !"
-        two: "%{count} new requests!"
+        two: "%{count} nouvelles demandes !"
         zero: "aucune nouvelle requête"
     manage_aspect_contacts: 
       existing: "Contacts existants"
@@ -623,7 +632,7 @@ fr:
         many: "%{count} partages"
         one: "1 partage"
         other: "%{count} partages"
-        two: "%{count} reshares"
+        two: "%{count} partages"
         zero: "Repartager"
       reshare_confirmation: "Partager le post d'%{author} ?"
       reshare_original: "Partager l'original"
@@ -649,7 +658,7 @@ fr:
       no_services: "Vous n'êtes connectés à aucun service pour le moment."
       really_disconnect: "déconnecter %{service} ?"
     inviter: 
-      click_link_to_accept_invitation: "Cliquer sur ce lien pour accepter l'invitation"
+      click_link_to_accept_invitation: "Suivez ce lien pour accepter l'invitation"
       join_me_on_diaspora: "Rejoignez-moi sur DIASPORA*"
     remote_friend: 
       invite: "inviter"
@@ -671,7 +680,7 @@ fr:
         many: "Dans %{count} aspects"
         one: "Dans %{count} aspect"
         other: "Dans %{count} aspects"
-        two: "In %{count} aspects"
+        two: "Dans %{count} aspects"
         zero: "Ajouter à l'aspect"
     contact_list: 
       all_contacts: "Tous les contacts"
@@ -711,7 +720,7 @@ fr:
       reshare: "Repartager"
     stream_element: 
       dislike: "Je n'aime pas"
-      hide_and_mute: "Hide and Mute"
+      hide_and_mute: "Masquer et mettre en sourdine"
       like: "J'aime"
       shared_with: "Partagé avec : %{aspect_names}"
       unlike: "Je n'aime pas"
@@ -731,7 +740,7 @@ fr:
       many: "s'il vous plaît, veuillez écrire des messages de moins de %{count} caractères"
       one: "s'il vous plaît, veuillez écrire des messages de moins de %{count} caractère"
       other: "s'il vous plaît, veuillez écrire des messages de moins de %{count} caractères"
-      two: "please make your status messages less than %{count} characters"
+      two: "votre statut doit faire moins de %{count} caractères"
       zero: "s'il vous plaît, veuillez écrire des messages de moins de %{count} caractères"
   stream_helper: 
     hide_comments: "Masquer tous les commentaires"
@@ -790,7 +799,7 @@ fr:
       new_password: "Nouveau mot de passe"
       private_message: "…vous recevez un message privé ?"
       receive_email_notifications: "Recevoir des notifications par courrier électronique lorsque…"
-      reshared: "...someone reshares your post?"
+      reshared: "...quelqu'un a partagé votre message ?"
       started_sharing: "...quelqu'un commence à partager avec vous ?"
       your_email: "Votre adresse électronique"
       your_handle: "Votre identifiant diaspora"
@@ -801,7 +810,7 @@ fr:
       connect_with_people: "Connectez-vous avec des gens cool"
       connect_with_people_explanation_pt1: "Connectez-vous avec des gens en les plaçant dans un ou plusieurs de vos %{gras}."
       connect_with_people_explanation_pt2: "Les aspects sont un moyen intuitif de grouper les visages familiers et nouveaux, privés, vous permettant de filtrer ou partager avec des sous-ensembles de vos contacts facilement."
-      edit_profile: "Edit Profile"
+      edit_profile: "Editer le profil"
       featured_tags: "Tags recommandés"
       featured_users: "Utilisateurs recommandés"
       fill_out_your_profile: "Remplissez votre profil"
@@ -820,7 +829,7 @@ fr:
         photo: "Photo"
         tags: "Tags"
       search_for_hashtags: "Chercher #tag"
-      search_for_people: "Search for people"
+      search_for_people: "Rechercher des personnes"
       see_all_featured_users: "Voir tous les utilisateurs recommandés"
       welcome: "Bienvenue !"
       welcome_with_name: "Bienvenue, %{name} !"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index baafafeb17e8c418ce2325e9952bbe49eeb33906..863075e0d5db8ff600471eee1d84dd7dbeaeafb4 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -101,6 +101,15 @@ ga:
         heading: "Diaspora ID"
       donate: "Donate"
       handle_explanation: "This is your diaspora handle. Like an email address, you can give this to people to reach you."
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "No contacts"
       no_tags: "No tags"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index b06f03fc298013a93cc04d2e1ccd5c3d0d6a33ec..7d827fc019164ab4d57aa5e5bd8e328c7a29325c 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -101,6 +101,15 @@ he:
         heading: "מזהה בדיאספורה"
       donate: "Donate"
       handle_explanation: "זהו שם המשתמש שלך בדיאספורה. בדיוק כמו כתובת דואר אלקטרוני, ניתן לחלוק אותו עם אנשים כדי שיגיעו אליך."
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "אין אנשי קשר"
       no_tags: "+ חיפוש תגית למעקב"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 9eaf93a0aa633f0383545e22cb9b5b5444467d86..64f855eb518d11c987dd7fde0e54176471eae51d 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -101,6 +101,15 @@ hu:
         heading: "Diaspora azonosító"
       donate: "Adományoz"
       handle_explanation: "Ez a Te Diaspora azonosítód. Megadhatod elérhetőségként, mint egy email címet."
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Hogy gyors maradjon ez a pod (%{pod}) kérlek adományozz pénzt."
       no_contacts: "Nincs ismerős"
       no_tags: "+ #címke keresése"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 51b9cd689e213c27a4d52a11edd48da058adfc23..80523ddda400b97e9b739629a908b0cd6bfbe75e 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -101,6 +101,15 @@ id:
         heading: "Diaspora ID"
       donate: "Donate"
       handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "No contacts"
       no_tags: "No tags"
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index 582d457dba5ac9a74d53becde82e330d596f5444..90a3b46171452af1527b37958e75ac0cd12440f6 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -101,6 +101,15 @@ is:
         heading: "Diaspora ID"
       donate: "Donate"
       handle_explanation: "Þetta er netfangið þitt hjá Díaspora. Eins og með venjulegt netfang, geturðu gefið fólki það svo þau geti haft samband við þig. "
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "Engir tengiliðir"
       no_tags: "No tags"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index d4b683e919c4871cd2ff9cd88a007492d8a25a9c..d6e5cc6d7af4827f09ad28cd77b4d23c131f5eee 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -37,7 +37,7 @@ it:
             person: 
               invalid: "non è valido."
             username: 
-              invalid: "non è valido. Sono permessi solamente lettere, numeri e underscore"
+              invalid: "non è valido. Sono permessi solamente lettere, numeri e underscore."
               taken: "è già stato preso."
   ago: "%{time} fa"
   all_aspects: "Tutti gli aspetti"
@@ -101,13 +101,22 @@ it:
         heading: "ID Diaspora"
       donate: "Fai una donazione"
       handle_explanation: "Questo è il tuo ID su Diaspora. Lo puoi dare alle persone per farti trovare, come un indirizzo email."
-      keep_us_running: "Fai andare %{pod} veloce come un razzo, finanzia la razione mensile di caffè per i nostri server!"
+      help: 
+        did_you: "Vuoi..."
+        feature_suggestion: "...proporre un'idea? %{link}"
+        find_a_bug: "...segnalare un problema? %{link}"
+        have_a_question: "...fare una domanda? %{link}"
+        here_to_help: "La comunità di Diaspora è qui!"
+        more_support: "Per assistenza, puoi anche consultare %{link}."
+        need_help: "Hai bisogno di aiuto?"
+        tutorials: "Se cerchi una guida, guarda su %{link}."
+      keep_us_running: "Mantieni %{pod} veloce e scattante, la tua donazione mensile sarà il caffè per i nostri server!"
       no_contacts: "Nessun contatto"
       no_tags: "+ Cerca tag da seguire"
       people_sharing_with_you: "Persone in condivisione con te"
       post_a_message: "invia un messaggio >>"
       services: 
-        content: "Puoi abbinare a Diaspora i seguenti servizi:"
+        content: "Puoi collegare i seguenti servizi a Diaspora:"
         heading: "Servizi connessi"
       tags_following: "Tag che segui"
       unfollow_tag: "Smetti di seguire #%{tag}"
@@ -426,7 +435,7 @@ it:
     comment_on_post: 
       reply: "Rispondi o leggi il post di %{name} >"
     confirm_email: 
-      click_link: "Per attivare il nuo nuovo indirizzo email %{unconfirmed_email}, per favore clicca su questo link:"
+      click_link: "Per attivare la nuova email %{unconfirmed_email} vai a questo indirizzo:"
       subject: "Per favore attiva il tuo nuovo indirizzo email %{unconfirmed_email}"
     email_sent_by_diaspora: "Questo messaggio è stato spedito da Diaspora.  Se preferisci smettere di ricevere questo tipo di email,"
     hello: "Ciao %{name}!"
@@ -646,10 +655,10 @@ it:
       disconnect: "disconnetti"
       edit_services: "Modifica servizi"
       logged_in_as: "accesso effettuato come"
-      no_services: "Ancora non hai abbinato alcun servizio."
+      no_services: "Ancora non hai collegato alcun servizio."
       really_disconnect: "disconnettere %{service}?"
     inviter: 
-      click_link_to_accept_invitation: "Fai click su questo link per accettare l'invito"
+      click_link_to_accept_invitation: "Vai a questo indirizzo per accettare l'invito"
       join_me_on_diaspora: "Vieni anche tu su DIASPORA*"
     remote_friend: 
       invite: "invita"
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index b4ce5dd96fbceb97a2187b9b98d53c1ab4fff306..8553b84ed49b6c44a20b40974a718ad9563ba67e 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -101,6 +101,15 @@ ja:
         heading: "Diaspora ID"
       donate: "Donate"
       handle_explanation: "これがあなたのハンドル名です。メールアドレスと同じようにほかの人に教えて、ダイアスポラで連絡を取り合うことができます。"
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "連絡先無し"
       no_tags: "No tags"
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index a5c30571a516643b7958ea5f932683dbee8ac0f9..f5c6c44d70cbaded7e2da1d7811e0130f82fd07c 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -101,6 +101,15 @@ ko:
         heading: "디아스포라 ID"
       donate: "기부하기"
       handle_explanation: "이 디아스포라 핸들은 이메일 주소처럼 남에게 건넬 수 있습니다."
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "컨택 없음"
       no_tags: "태그 없음"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 4d624729f6f3cb36fe748f5ab76a58dc24d11442..18d8d912d5a13eae353e95184c6632c9b8f6c86c 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -101,6 +101,15 @@ lt:
         heading: "Diaspora ID"
       donate: "Donate"
       handle_explanation: "Tai tavo vartotojo vardas Diasporoje. Kaip ir el. pašto adresas, jis leidžia sistemoje rasti pažįstamus."
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "No contacts"
       no_tags: "No tags"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 281622daf7a418dd0c4f4a1571dd635740259946..39fe1fcb894b151522b669ec497b398a360dd03c 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -101,6 +101,15 @@ mk:
         heading: "Diaspora ID"
       donate: "Donate"
       handle_explanation: "Ова е вашето diaspora корисничко име. Исто како е-маил адреса, можете да го давате на луѓе за да се сврзат со вас."
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "No contacts"
       no_tags: "No tags"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 5fdb9526b2e9e00b89c67f43902834e9c44a835a..e4a165f8a1c41b3ba8e0e8870bcf87c36b8f6635 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -6,7 +6,7 @@
 nb: 
   _applications: "Applications"
   _comments: "Kommentarer"
-  _contacts: "Contacts"
+  _contacts: "Kontakter"
   _home: "Hjem"
   _photos: "bilder"
   _services: "Tjenester"
@@ -99,8 +99,17 @@ nb:
         content_1: "Your Diaspora ID is:"
         content_2: "Give it to anyone and they'll be able to find you on Diaspora."
         heading: "Diaspora ID"
-      donate: "Donate"
+      donate: "Doner"
       handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Trenger du hjelp?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "Ingen kontakter"
       no_tags: "No tags"
@@ -132,12 +141,12 @@ nb:
     seed: 
       acquaintances: "Acquaintances"
       family: "Familie"
-      friends: "Friends"
+      friends: "Venner"
       work: "Jobb"
     selected_contacts: 
       manage_your_aspects: "Manage your aspects."
-      no_contacts: "You don't have any contacts here yet."
-      view_all_contacts: "View all contacts"
+      no_contacts: "Du har ingen kontakter her enda."
+      view_all_contacts: "Vis alle kontakter"
     show: 
       edit_aspect: "endre aspekt"
     two: "%{count} aspects"
@@ -175,22 +184,22 @@ nb:
     few: "%{count} kontakter"
     index: 
       add_a_new_aspect: "Add a new aspect"
-      all_contacts: "All Contacts"
+      all_contacts: "Alle kontakter"
       edit_aspect: "Edit %{name}"
       many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
-      my_contacts: "My Contacts"
-      no_contacts: "No contacts."
+      my_contacts: "Mine kontakter"
+      no_contacts: "Ingen kontakter."
       only_sharing_with_me: "Only sharing with me"
-      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
-      start_a_conversation: "Start a conversation"
-      title: "Contacts"
-      your_contacts: "Your Contacts"
+      remove_person_from_aspect: "Fjern %{person_name} fra \"%{aspect_name}\""
+      start_a_conversation: "Start en samtale"
+      title: "Kontakter"
+      your_contacts: "Dine kontakter"
     many: "%{count} kontakter"
     one: "1 kontakt"
     other: "%{count} kontakter"
     sharing: 
       people_sharing: "Folk som deler med deg:"
-    two: "%{count} contacts"
+    two: "%{count} kontakter"
     zero: "ingen kontakter"
   conversations: 
     create: 
@@ -224,7 +233,7 @@ nb:
     show: 
       delete: "slett og blokkér samtalen"
       reply: "svar"
-      replying: "Replying..."
+      replying: "Svarer..."
   date: 
     formats: 
       birthday: "%B %d"
@@ -265,7 +274,7 @@ nb:
       rejected: "Følgende e-postadresser hadde problemer:"
       sent: "Invitasjoner har blitt sendt til:"
     edit: 
-      accept_your_invitation: "Accept your invitation"
+      accept_your_invitation: "Godta invitasjonen din"
       your_account_awaits: "Your account awaits!"
     new: 
       already_invited: "Allerede innvitert"
@@ -324,9 +333,9 @@ nb:
   no_results: "Ingen resultater ble funnet"
   notifications: 
     also_commented: 
-      few: "%{actors} also commented on %{post_author}'s %{post_link}."
-      many: "%{actors} also commented on %{post_author}'s %{post_link}."
-      one: "%{actors} also commented on %{post_author}'s %{post_link}."
+      few: "%{actors} kommenterte også på %{post_author}s %{post_link}."
+      many: "%{actors} kommenterte også på %{post_author}s %{post_link}."
+      one: "%{actors} kommenterte også på %{post_author}s %{post_link}."
       other: "%{actors} also commented on %{post_author}'s %{post_link}."
       two: "%{actors} also commented on %{post_author}'s %{post_link}."
       zero: "%{actors} also commented on %{post_author}'s %{post_link}."
@@ -355,12 +364,12 @@ nb:
     index: 
       and: "og"
       and_others: 
-        few: "and %{count} others"
-        many: "and %{count} others"
-        one: "and one more"
-        other: "and %{count} others"
-        two: "and %{count} others"
-        zero: "and nobody else"
+        few: "og %{count} andre"
+        many: "og %{count} andre"
+        one: "og en annen"
+        other: "og %{count} andre"
+        two: "og %{count} andre"
+        zero: "og ingen andre"
       mark_all_as_read: "Merk alle som leste"
       notifications: "Varsler"
     liked: 
@@ -393,12 +402,12 @@ nb:
       zero: "%{actors} mentioned you in a deleted post."
     post: "innlegg"
     private_message: 
-      few: "%{actors} sent you a message."
-      many: "%{actors} sent you a message."
-      one: "%{actors} sent you a message."
-      other: "%{actors} sent you a message."
-      two: "%{actors} sent you a message."
-      zero: "%{actors} sent you a message."
+      few: "%{actors} sendte deg en melding."
+      many: "%{actors} sendte deg en melding."
+      one: "%{actors} sendte deg en melding."
+      other: "%{actors} sendte deg en melding."
+      two: "%{actors} sendte deg en melding."
+      zero: "%{actors} sendte deg en melding."
     reshared: 
       few: "%{actors} has reshared your %{post_link}."
       many: "%{actors} has reshared your %{post_link}."
@@ -500,7 +509,7 @@ nb:
       to_accept_or_ignore: "for å akseptere eller ignorere."
     sub_header: 
       add_some: "add some"
-      edit: "edit"
+      edit: "endre"
       you_have_no_tags: "you have no tags!"
     two: "%{count} people"
     webfinger: 
@@ -641,7 +650,7 @@ nb:
       service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Koble til facebook"
-      connect_to_tumblr: "Connect to Tumblr"
+      connect_to_tumblr: "Koble til Tumblr"
       connect_to_twitter: "Koble til twitter"
       disconnect: "koble fra"
       edit_services: "Rediger tjenester"
@@ -658,7 +667,7 @@ nb:
   settings: "Innstillinger"
   shared: 
     add_contact: 
-      add_new_contact: "Add a new contact"
+      add_new_contact: "Legg til en ny kontakt"
       create_request: "Finn etter Diaspora brukernavn"
       diaspora_handle: "Diaspora handle"
       enter_a_diaspora_username: "Skriv inn et Diaspora brukernavn:"
@@ -705,7 +714,7 @@ nb:
       publishing_to: "publiserer til:"
       share: "Del"
       share_with: "del med"
-      upload_photos: "Upload photos"
+      upload_photos: "Last opp bilder"
       whats_on_your_mind: "Hva tenker du på?"
     reshare: 
       reshare: "Del på nytt"
@@ -805,25 +814,25 @@ nb:
       featured_tags: "Featured tags"
       featured_users: "Featured users"
       fill_out_your_profile: "Fill out your profile"
-      find_friends: "Find friends"
-      find_friends_from_facebook: "find friends from Facebook"
+      find_friends: "Finn venner"
+      find_friends_from_facebook: "finn venner fra Facebook"
       finished: "Ferdig!"
       follow_your_interests: "Follow your interests"
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
       profile_description: "Make it easier for people to find you by filling out your profile information."
       profile_fields: 
         bio: "Bio"
-        birthday: "Birthday"
+        birthday: "Bursdag"
         gender: "Gender"
         location: "Location"
-        name: "Name"
+        name: "Navn"
         photo: "Photo"
         tags: "Tags"
       search_for_hashtags: "Search for #hashtags"
       search_for_people: "Search for people"
       see_all_featured_users: "See all featured users"
       welcome: "Velkommen til Diaspora!"
-      welcome_with_name: "Welcome, %{name}!"
+      welcome_with_name: "Velkommen %{name}!"
     public: 
       does_not_exist: "Bruker %{username} finnes ikke!"
     update: 
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 76f78a1fd47ae2bf1aff7beff8c14096423cb692..e16c887edf45564d9468ef4e63fd3c6e3e5eb564 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -101,6 +101,15 @@ nl:
         heading: "Diaspora ID"
       donate: "Doneer"
       handle_explanation: "Dit is jouw Diaspora id. Deze kun je aan mensen geven zodat ze je kunnen bereiken, net als een e-mailadres."
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Houd %{pod} snel door bij te dragen aan de maandelijkse koffie kosten!"
       no_contacts: "Geen contacten"
       no_tags: "+ Vind een tag"
diff --git a/config/locales/diaspora/nn.yml b/config/locales/diaspora/nn.yml
index bf2805d7516d4414efc91ff22ef576b103f80a86..909e033c9635cf0383f9f2d1addbe70eefe42093 100644
--- a/config/locales/diaspora/nn.yml
+++ b/config/locales/diaspora/nn.yml
@@ -101,6 +101,15 @@ nn:
         heading: "Diaspora ID"
       donate: "Donate"
       handle_explanation: "This is your diaspora id. Like an email address, you can give this to people to reach you."
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "No contacts"
       no_tags: "+ Find a tag to follow"
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index b43ee20f71c130653c42a1f2684ce2739d17adb5..a7997619733301d915be39ca39f5baeb83ebf6c8 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -101,6 +101,15 @@ pa:
         heading: "Diaspora ID"
       donate: "Donate"
       handle_explanation: "This is your diaspora handle. Like an email address, you can give this to people to reach you."
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ"
       no_tags: "No tags"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 5e2e210c06765a13b17e9558742ba4f46eaec117..cdd7019a4db14428e94a4e5493a9021a88e0372c 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -101,6 +101,15 @@ pl:
         heading: "Diaspora ID"
       donate: "Wspomóż"
       handle_explanation: "To jest Twój identyfikator w Diasporze. Podobnie jak adresu e-mailowy, możesz podawać go innym, aby mogli się z Tobą skontaktować."
+      help: 
+        did_you: "Czy:"
+        feature_suggestion: "... masz %{link} sugestie?"
+        find_a_bug: "... znalazłeś błąd %{link}?"
+        have_a_question: "... czy masz pytanie %{link}?"
+        here_to_help: "Społeczność Diaspory jest tu by pomóc!"
+        more_support: "Gdy potrzebujesz więcej informacji, sprawdź również %{link}."
+        need_help: "Potrzebujesz pomocy?"
+        tutorials: "Jeśli potrzebujesz pomocy, naciśnij ten link %{link}."
       keep_us_running: "Aby %{pod} działała szybko, wspomóż nasze serwery dawką kofeiny!"
       no_contacts: "Brak kontaktów"
       no_tags: "No tags"
@@ -147,7 +156,7 @@ pl:
     zero: "brak aspektów"
   authorizations: 
     index: 
-      no_applications: "You haven't registered any applications yet."
+      no_applications: "Nie zarejstrowałeś jeszcze żadnej aplikacji!"
       revoke_access: "Odwołaj dostęp"
   back: "Wróć"
   bookmarklet: 
@@ -204,7 +213,7 @@ pl:
         many: "%{count} nowych wiadomości"
         one: "1 nowa wiadomość"
         other: "%{count} nowych wiadomości"
-        two: "%{count} new messages"
+        two: "%{count} nowe wiadomości"
         zero: "brak nowych wiadomości"
     index: 
       create_a_new_message: "stwórz nową wiadomość"
@@ -237,7 +246,7 @@ pl:
       correct_the_following_errors_and_try_again: "Popraw poniższe błędy i spróbuj ponownie."
       invalid_fields: "Pola z błędami"
   fill_me_out: "Wpisz tutaj"
-  find_people: "Find people"
+  find_people: "Szukaj ludzi"
   hide: "Ukryj"
   home: 
     show: 
@@ -303,20 +312,20 @@ pl:
         one: "1 osoba tego nie lubi"
         other: "%{count} osób nie lubi tego"
         two: "%{count} dislikes"
-        zero: "no people disliked this"
+        zero: "osób nie lubi tego"
       people_like_this: 
         few: "%{count} osoby polubiły to"
         many: "%{count} osób polubiło to"
         one: "1 osoba to polubiła"
         other: "%{count} osób polubiło to"
-        two: "%{count} likes"
+        two: "%{count} polubiły"
         zero: "nikt tego nie polubił"
       people_like_this_comment: 
         few: "%{count} poleciło"
-        many: "%{count} pochwaliło"
+        many: "%{count} poleciło"
         one: "%{count} polecił"
         other: "%{count} poleciło"
-        two: "%{count} likes"
+        two: "%{count} poleciło"
         zero: "brak pochwaleń"
   limited: "Ograniczone"
   more: "Więcej"
@@ -328,21 +337,21 @@ pl:
       many: "%{actors} także skomentowały %{post_link} użytkownika %{post_author} ."
       one: "%{actors} także skomentowali %{post_link} użytkownika %{post_author} ."
       other: "%{actors} także skomentowali %{post_link} użytkownika %{post_author} ."
-      two: "%{actors} also commented on %{post_author}'s %{post_link}."
+      two: "%{actors} także skomentowało %{post_author} użytkownika %{post_link}."
       zero: "%{actors} także skomentowali %{post_link} użytkownika %{post_author} ."
     also_commented_deleted: 
       few: "%{actors} skomentowali już usunięty wpis."
       many: "%{actors} skomentował twój usunięty wpis."
       one: "%{actors} skomentował już usunięty wpis."
       other: "%{actors} skomentował już usunięty wpis."
-      two: "%{actors} commented on a deleted post."
+      two: "%{actors} skomentowało już usunięty wpis."
       zero: "%{actors} skomentował już usunięty wpis."
     comment_on_post: 
       few: "%{actors} skomentowali twój %{post_link}."
       many: "%{actors} skomentowali twój %{post_link}."
       one: "%{actors} skomentował(a) twój %{post_link}."
       other: "%{actors} skomentowali twój %{post_link}."
-      two: "%{actors} commented on your %{post_link}."
+      two: "%{actors} skomenotowało twój %{post_link}."
       zero: "%{actors} skomentował twój %{post_link}."
     helper: 
       new_notifications: 
@@ -350,7 +359,7 @@ pl:
         many: "%{count} nowych powiadomień"
         one: "1 nowe powiadomienie"
         other: "%{count} nowych powiadomień"
-        two: "%{count} new notifications"
+        two: "%{count} nowe powiadomienia"
         zero: "brak nowych powiadomień"
     index: 
       and: "i"
@@ -359,7 +368,7 @@ pl:
         many: "i %{count} innych"
         one: "i ktoÅ› jeszcze"
         other: "i %{count} innych"
-        two: "and %{count} others"
+        two: "i %{count} innych"
         zero: "i nikt więcej"
       mark_all_as_read: "Oznacz wszystkie jako przeczytane"
       notifications: "Powiadomienia"
@@ -368,28 +377,28 @@ pl:
       many: "%{actors} polecili twój %{post_link}."
       one: "%{actors} polecił(a) twój %{post_link}."
       other: "%{actors} polecił(a) twój %{post_link}."
-      two: "%{actors} has just liked your %{post_link}."
+      two: "%{actors} poleciło twój %{post_link}."
       zero: "%{actors} polecił twój %{post_link}."
     liked_post_deleted: 
       few: "%{actors} polubiły twój usunięty wpis."
       many: "%{actors} lubią twój już usunięty wpis."
       one: "%{actors} polubił(a) twój usunięty wpis."
       other: "%{actors} polubił twój usunięty wpis."
-      two: "%{actors} liked your deleted post."
+      two: "%{actors} polubiło twój usunięty wpis."
       zero: "%{actors} polubił twój usunięty wpis."
     mentioned: 
       few: "%{actors} wspomnieli o tobie w %{post_link}."
       many: "%{actors} wspomnieli o tobie w %{post_link}."
       one: "%{actors} wspomniał o tobie w %{post_link}."
       other: "%{actors} wspomnieli o tobie w %{post_link}."
-      two: "%{actors} has mentioned you in a %{post_link}."
+      two: "%{actors}  wspomniało o tobie w %{post_link}."
       zero: "%{actors} wspomniał o tobie w %{post_link}."
     mentioned_deleted: 
       few: "%{actors} wspomnieli o tobie w już usuniętym wpisie."
       many: "%{actors} wspomnieli o tobie w już usuniętym wpisie."
       one: "%{actors} wspomniał(a) o tobie w już usuniętym wpisie."
       other: "%{actors} wspomniał o tobie w usuniętym już wpisie."
-      two: "%{actors} mentioned you in a deleted post."
+      two: "%{actors}  wspomniało o tobie w usuniętym już wpisie."
       zero: "%{actors} wspomniał o tobie w usuniętym wpisie."
     post: "wpis."
     private_message: 
@@ -397,28 +406,28 @@ pl:
       many: "%{actors} wysłali ci wiadomość."
       one: "%{actors} wysłał ci wiadomość."
       other: "%{actors} wysłali ci wiadomość."
-      two: "%{actors} sent you a message."
+      two: "%{actors} wysłało ci wiadomość."
       zero: "%{actors} wysłał ci wiadomość."
     reshared: 
       few: "%{actors} podzielili siÄ™ twoim wpisem %{post_link}."
       many: "%{actors} podzieliły się twoim wpisem %{post_link}."
       one: "%{actors} podzielił się twoim wpisem %{post_link}."
       other: "%{actors} podzielili siÄ™ twoim %{post_link}."
-      two: "%{actors} has reshared your %{post_link}."
-      zero: "%{actors} podzieliło się twoim %{post_link}."
+      two: "%{actors} podzieliło się twoim wpisem %{post_link}."
+      zero: "%{actors} podzieliło się twoim wpisem %{post_link}."
     reshared_post_deleted: 
       few: "%{actors} podzieliło się twoim już nieistniejącym wpisem."
       many: "%{actors} podzielili się twoim już nieistniejącym wpisem."
       one: "%{actors} podzielił się twoim już usuniętym wpisem."
       other: "%{actors} podzielili się twoim już usuniętym wpisem."
-      two: "%{actors} reshared your deleted post."
+      two: "%{actors} podzeliło się twoim wpisem."
       zero: "%{actors} podzieliło się twoim usuniętym wpisem."
     started_sharing: 
       few: "%{actors} zaczęli się z tobą dzielić."
       many: "%{actors} zaczął się z tobą dzielić."
       one: "%{actors} zaczęli się z tobą dzielić."
       other: "%{actors} zaczęli się z tobą dzielić."
-      two: "%{actors} started sharing with you."
+      two: "%{actors}  zaczęło się z toba dzielić."
       zero: "%{actors} zaczęli się z tobą dzielić."
   notifier: 
     a_post_you_shared: "wpis."
@@ -426,8 +435,8 @@ pl:
     comment_on_post: 
       reply: "Odpowiedz lub podejrzyj wpis %{name} >"
     confirm_email: 
-      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
-      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+      click_link: "Aby zaaktywować Twój nowy adres mailowy %{unconfirmed_email},naciśnij tutaj:"
+      subject: "Aktywuj nowy adres mailowy %{unconfirmed_email}"
     email_sent_by_diaspora: "Ten email został wysłany przez projekt Diaspora. Jeśli nie chcesz otrzymywać takich wiadomości"
     hello: "Cześć %{name}!"
     liked: 
@@ -619,15 +628,15 @@ pl:
     reshare: 
       deleted: "Oryginał został usunięty przez autora."
       reshare: 
-        few: "%{count} Reshares"
-        many: "%{count} Reshares"
-        one: "1 Reshare"
-        other: "%{count} Reshares"
-        two: "%{count} reshares"
-        zero: "Przekaż innym"
-      reshare_confirmation: "Reshare %{author} - %{text}?"
-      reshare_original: "Reshare orignial"
-      show_original: "Show Original"
+        few: "%{count} udostępnień"
+        many: " %{count} udostępnień"
+        one: "jedno udostępnienie"
+        other: "%{count} udostępeninia"
+        two: " %{count} udostępnienia"
+        zero: "Przekaż dalej"
+      reshare_confirmation: "Prze%{author} - %{text}?"
+      reshare_original: "Przekaż dalej"
+      show_original: "Pokaż oryginał"
   search: "Szukaj"
   services: 
     create: 
@@ -711,7 +720,7 @@ pl:
       reshare: "Podziel siÄ™ ponownie"
     stream_element: 
       dislike: "Nie lubiÄ™ tego"
-      hide_and_mute: "Hide and Mute"
+      hide_and_mute: "Ukryj element"
       like: "LubiÄ™ to"
       shared_with: "Publikuj w: %{aspect_names}"
       unlike: "Odwołaj \"Lubię to\""
@@ -768,13 +777,13 @@ pl:
   username: "Nazwa użytkownika"
   users: 
     confirm_email: 
-      email_confirmed: "E-Mail %{email} activated"
-      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
+      email_confirmed: "E-mail %{email} aktywowany"
+      email_not_confirmed: "Adres mailowy nie może być potwierdzony. Spróbuj ponownie"
     destroy: "Konto zostało pomyślnie zamknięte."
     edit: 
       also_commented: "...ktoś także skomentuje wpis jednego z twoich kontaktów?"
       change: "Zmień"
-      change_email: "Change E-Mail"
+      change_email: "Zmień adres mailowy"
       change_language: "Zmień język"
       change_password: "Zmiana hasła"
       close_account: "Zamknij konto"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 693cabdb735ee57c0ffafc2551f6d3c35ecef81f..b2e2cc144a912443d502ea92c025c028a4f96d6c 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -101,6 +101,15 @@ pt-BR:
         heading: "Diaspora ID"
       donate: "Faça uma Doação"
       handle_explanation: "Essa é sua Diaspora ID. Como um endereço de e-mail, pode ser usado por outras pessoas para contactar você."
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Mantenha %{pod} rodando mais rápido, comprando nossos servidores e garantindo o nosso café mensal!"
       no_contacts: "Sem contatos"
       no_tags: "+ Procurar tag para seguir"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 9898d7237b1053e5b18789330cb81d161e5c6836..92ba4a691e563846a21910f908075062f499feed 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -37,7 +37,7 @@ pt-PT:
             person: 
               invalid: "não é válido."
             username: 
-              invalid: "é inválido. Apenas é permitido usar letras, números, e underscores"
+              invalid: "é inválido. Apenas é permitido usar letras, números, e underscores."
               taken: "já foi escolhido."
   ago: "Há %{time} atrás"
   all_aspects: "Todos os Aspectos"
@@ -101,7 +101,16 @@ pt-PT:
         heading: "Identificação do Diaspora"
       donate: "Doar"
       handle_explanation: "Esta é a sua identificação do Diaspora. Tal como um endereço de email, pode dá-la a quem deseja que o contacte."
-      keep_us_running: "Mantenha %{pod} a funcionar rapidamente, compre aos nossos servidores a sua dose habitual de café!"
+      help: 
+        did_you: "Tem:"
+        feature_suggestion: "... uma sugestão de %{link}?"
+        find_a_bug: "... um %{link} para relatar?"
+        have_a_question: "... uma %{link}?"
+        here_to_help: "A comunidade do Diaspora está aqui para ajudar!"
+        more_support: "Para mais apoio, dever ver %{link}."
+        need_help: "Precisa de ajuda?"
+        tutorials: "Para tutoriais, veja %{link}."
+      keep_us_running: "Mantenha o %{pod} a funcionar rapidamente e compre aos servidores a sua dose de café com uma doação mensal!"
       no_contacts: "Não há contactos"
       no_tags: "+ Encontre uma tag para seguir"
       people_sharing_with_you: "Pessoas a partilhar consigo"
@@ -140,14 +149,14 @@ pt-PT:
       view_all_contacts: "Ver todos os contactos"
     show: 
       edit_aspect: "editar aspecto"
-    two: "%{count} aspects"
+    two: "%{count} aspecto"
     update: 
       failure: "O seu aspecto, %{name}, tinha um nome grande demais para ser guardado."
       success: "O seu aspecto, %{name}, foi editado com sucesso."
     zero: "não há aspectos"
   authorizations: 
     index: 
-      no_applications: "You haven't registered any applications yet."
+      no_applications: "Ainda não registou nenhuma aplicação."
       revoke_access: "Revogar o Acesso"
   back: "Voltar"
   bookmarklet: 
@@ -165,7 +174,7 @@ pt-PT:
       commenting: "A comentar..."
     one: "1 comentário"
     other: "%{count} comentários"
-    two: "%{count} comments"
+    two: "%{count} comentários"
     zero: "não há comentários"
   contacts: 
     create: 
@@ -190,7 +199,7 @@ pt-PT:
     other: "%{count} contactos"
     sharing: 
       people_sharing: "Pessoas a partilhar consigo:"
-    two: "%{count} contacts"
+    two: "%{count} contactos"
     zero: "sem contactos"
   conversations: 
     create: 
@@ -204,7 +213,7 @@ pt-PT:
         many: "%{count} novas mensagens"
         one: "1 nova mensagem"
         other: "%{count} novas mensagens"
-        two: "%{count} new messages"
+        two: "%{count} novas mensagens"
         zero: "Não há novas mensagens"
     index: 
       create_a_new_message: "criar uma nova mensagem"
@@ -302,21 +311,21 @@ pt-PT:
         many: "%{count} pessoas não gostam"
         one: "%{count} pessoa não gosta"
         other: "%{count} pessoa não gosta"
-        two: "%{count} dislikes"
+        two: "%{count} não gostam"
         zero: "nenhuma pessoa não gosta disto"
       people_like_this: 
         few: "%{count} pessoas gostam"
         many: "%{count} pessoas não gostam"
         one: "%{count} pessoa gosta"
         other: "%{count} pessoas gostam"
-        two: "%{count} likes"
+        two: "%{count} gostos"
         zero: "ninguém gosta"
       people_like_this_comment: 
         few: "%{count} gostos"
         many: "%{count} gostos"
         one: "%{count} gosto"
         other: "%{count} gostos"
-        two: "%{count} likes"
+        two: "%{count} gostos"
         zero: "não há gostos"
   limited: "Limitado"
   more: "Mais"
@@ -328,21 +337,21 @@ pt-PT:
       many: "%{actors} também comentaram %{post_link} de %{post_author}."
       one: "%{actors} também comentou %{post_link} de %{post_author}."
       other: "%{actors} também comentaram %{post_link} de %{post_author}."
-      two: "%{actors} also commented on %{post_author}'s %{post_link}."
+      two: "%{actors} também comentaram na %{post_link} de %{post_author}."
       zero: "%{actors} também comentaram %{post_link} de %{post_author}."
     also_commented_deleted: 
       few: "%{actors} comentaram na sua publicação apagada."
       many: "%{actors} comentaram na sua publicação apagada."
       one: "%{actors} comentou uma publicação apagada."
       other: "%{actors} comentaram uma publicação apagada."
-      two: "%{actors} commented on a deleted post."
+      two: "%{actors} comentaram numa publicação apagada."
       zero: "%{actors} comentou uma publicação apagada."
     comment_on_post: 
       few: "%{actors} comentaram na sua %{post_link}."
       many: "%{actors} comentaram na sua %{post_link}."
       one: "%{actors} comentou na sua %{post_link}."
       other: "%{actors} comentaram na sua %{post_link}."
-      two: "%{actors} commented on your %{post_link}."
+      two: "%{actors} comentaram na sua %{post_link}."
       zero: "%{actors} comentou na sua %{post_link}."
     helper: 
       new_notifications: 
@@ -350,7 +359,7 @@ pt-PT:
         many: "%{count} novas notificações"
         one: "1 nova notificação"
         other: "%{count} novas notificações"
-        two: "%{count} new notifications"
+        two: "%{count} novas notificações"
         zero: "Não há novas notificações"
     index: 
       and: "e"
@@ -359,7 +368,7 @@ pt-PT:
         many: "e %{count} outros"
         one: "e mais uma pessoa"
         other: "e {count} outros"
-        two: "and %{count} others"
+        two: "e %{count} outros"
         zero: "e mais ninguém"
       mark_all_as_read: "Marcar Tudo como Lido"
       notifications: "Notificações"
@@ -368,28 +377,28 @@ pt-PT:
       many: "%{actors} gostam da sua %{post_link}."
       one: "%{actors} gosta da sua %{post_link}."
       other: "%{actors} gostam da sua %{post_link}."
-      two: "%{actors} has just liked your %{post_link}."
+      two: "%{actors} gostaram da sua %{post_link}."
       zero: "%{actors} gostaram da sua %{post_link}."
     liked_post_deleted: 
       few: "%{actors} gostam da sua publicação apagada."
       many: "%{actors} gostam da sua publicação apagada."
       one: "%{actors} gosta da sua publicação apagada."
       other: "%{actors} gostam da sua publicação apagada."
-      two: "%{actors} liked your deleted post."
+      two: "%{actors} gostou da sua publicação apagada."
       zero: "%{actors} gostam da sua publicação apagada."
     mentioned: 
       few: "%{actors} mencionou-o numa %{post_link}."
       many: "%{actors} mencionou-o numa %{post_link}."
       one: "%{actors} mencionou-o numa %{post_link}."
       other: "%{actors} mencionou-o numa %{post_link}."
-      two: "%{actors} has mentioned you in a %{post_link}."
+      two: "%{actors} mencionaram-na numa %{post_link}."
       zero: "%{actors} mencionou-o numa %{post_link}."
     mentioned_deleted: 
       few: "%{actors} mencionaram-no numa publicação apagada."
       many: "%{actors} mencionaram-no numa publicação apagada."
       one: "%{actors} mencionou-no numa publicação apagada."
       other: "%{actors} mencionaram-no numa publicação apagada."
-      two: "%{actors} mentioned you in a deleted post."
+      two: "%{actors} mencionaram-no numa publicação apagada."
       zero: "%{actors} mencionaram-no numa publicação apagada."
     post: "publicação"
     private_message: 
@@ -397,28 +406,28 @@ pt-PT:
       many: "%{actors} enviaram-lhe uma mensagem."
       one: "%{actors} enviou-lhe uma mensagem."
       other: "%{actors} enviaram-lhe uma mensagem."
-      two: "%{actors} sent you a message."
+      two: "%{actors} enviaram-lhe uma mensagem."
       zero: "%{actors} enviou-lhe uma mensagem."
     reshared: 
       few: "%{actors} partilharam a sua %{post_link}."
       many: "%{actors} partilharam a sua %{post_link}."
       one: "%{actors} partilhou a sua %{post_link}."
       other: "%{actors} partilhou a sua %{post_link}."
-      two: "%{actors} has reshared your %{post_link}."
+      two: "%{actors} repartilharam a sua publicação %{post_link}."
       zero: "%{actors} repartilhou a sua %{post_link}."
     reshared_post_deleted: 
       few: "%{actors} repartilharam a sua publicação apagada."
       many: "%{actors} repartilharam a sua publicação apagada."
       one: "%{actors} repartilhou a sua publicação apagada."
       other: "%{actors} repartilhou a sua publicação apagada."
-      two: "%{actors} reshared your deleted post."
+      two: "%{actors} repartilharam a sua publicação."
       zero: "%{actors} repartilhou a sua publicação apagada."
     started_sharing: 
       few: "%{actors} começaram a partilhar consigo."
       many: "%{actors} começaram a partilhar consigo."
       one: "%{actors} começou a partilhar consigo."
       other: "%{actors} começaram a partilhar consigo."
-      two: "%{actors} started sharing with you."
+      two: "%{actors} começaram a partilhar consigo."
       zero: "%{actors} começou a partilhar consigo."
   notifier: 
     a_post_you_shared: "uma publicação."
@@ -426,7 +435,7 @@ pt-PT:
     comment_on_post: 
       reply: "Responder ou ver a publicação de %{name} >"
     confirm_email: 
-      click_link: "Para activar o seu novo endereço de email %{unconfirmed_email}, por favor clique nesta hiperligação:"
+      click_link: "Para activar o seu novo endereço de email %{unconfirmed_email}, por favor siga esta hiperligação:"
       subject: "Por favor active o seu novo endereço de email %{unconfirmed_email}"
     email_sent_by_diaspora: "Este email foi enviado pelo Diaspora.  Se deseja deixar de receber emails deste tipo,"
     hello: "Olá %{name}!"
@@ -502,7 +511,7 @@ pt-PT:
       add_some: "adicionar alguns"
       edit: "editar"
       you_have_no_tags: "não tem tags!"
-    two: "%{count} people"
+    two: "%{count} pessoas"
     webfinger: 
       fail: "Lamentamos muito, não conseguimos encontrar %{handle}."
     zero: "não há pessoas"
@@ -542,8 +551,8 @@ pt-PT:
       notice: "Fotografia actualizada com sucesso."
   post_visibilites: 
     update: 
-      post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted."
-      see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page."
+      post_hidden_and_muted: "A publicação de %{name} foi escondida, e as notificações foram silenciadas."
+      see_it_on_their_profile: "Se deseja ver as actualizações desta publicação, visite a página de perfil de %{name}."
   posts: 
     show: 
       destroy: "Apagar"
@@ -605,7 +614,7 @@ pt-PT:
         many: "%{count} novos pedidos!"
         one: "novo pedido!"
         other: "%{count} novos pedidos!"
-        two: "%{count} new requests!"
+        two: "%{count} novos pedidos!"
         zero: "não há novos pedidos"
     manage_aspect_contacts: 
       existing: "Contactos existentes"
@@ -623,7 +632,7 @@ pt-PT:
         many: "%{count} repartilhas"
         one: "1 repartilha"
         other: "%{count} repartilhas"
-        two: "%{count} reshares"
+        two: "%{count} repartilhas"
         zero: "Repartilhar"
       reshare_confirmation: "Repartilhar a publicação de %{author}?"
       reshare_original: "Repartilha original"
@@ -649,7 +658,7 @@ pt-PT:
       no_services: "Ainda não conectou quaisquer serviços."
       really_disconnect: "desligar do %{service}?"
     inviter: 
-      click_link_to_accept_invitation: "Clique nesta ligação para aceitar o seu convite"
+      click_link_to_accept_invitation: "Siga esta ligação para aceitar o seu convite"
       join_me_on_diaspora: "Junte-se a mim no DIASPORA*"
     remote_friend: 
       invite: "convite"
@@ -671,7 +680,7 @@ pt-PT:
         many: "Em %{count} aspectos"
         one: "Em %{count} aspecto"
         other: "Em %{count} aspectos"
-        two: "In %{count} aspects"
+        two: "Em %{count} aspectos"
         zero: "Adicionar ao aspecto"
     contact_list: 
       all_contacts: "Todos os contactos"
@@ -711,7 +720,7 @@ pt-PT:
       reshare: "Voltar a partilhar"
     stream_element: 
       dislike: "Não gosto"
-      hide_and_mute: "Hide and Mute"
+      hide_and_mute: "Esconder e Silenciar"
       like: "Gosto"
       shared_with: "Partilhado com: %{aspect_names}"
       unlike: "Não Gosto"
@@ -731,7 +740,7 @@ pt-PT:
       many: "por favor não utilize mais de %{count} caracteres ao escrever as suas mensagens de estado"
       one: "por favor não utilize mais de %{count} caracter ao escrever as suas mensagens de estado"
       other: "por favor não utilize mais de %{count} caracteres ao escrever as suas mensagens de estado"
-      two: "please make your status messages less than %{count} characters"
+      two: "por favor não ultrapasse %{count} caracteres nas suas mensagens de estado"
       zero: "por favor não utilize mais de %{count} caracteres ao escrever as suas mensagens de estado"
   stream_helper: 
     hide_comments: "Ocultar todos comentários"
@@ -801,7 +810,7 @@ pt-PT:
       connect_with_people: "Ligue-se a pessoas interessantes"
       connect_with_people_explanation_pt1: "Ligue-se a pessoas ao colocá-las em um ou mais dos seus %{bold}."
       connect_with_people_explanation_pt2: "Aspectos são uma forma intuitiva de agrupar rostos novos e familiares, de forma privada, permitindo-lhe filtrar ou partilhar com subconjuntos dos seus contactos facilmente."
-      edit_profile: "Edit Profile"
+      edit_profile: "Editar o Perfil"
       featured_tags: "Tags destacadas"
       featured_users: "Utilizadores destacados"
       fill_out_your_profile: "Preencha o seu perfil"
@@ -819,8 +828,8 @@ pt-PT:
         name: "Nome"
         photo: "Fotografia"
         tags: "Tags"
-      search_for_hashtags: "Search for #hashtags"
-      search_for_people: "Search for people"
+      search_for_hashtags: "Procurar #hashtags"
+      search_for_people: "Procurar pessoas"
       see_all_featured_users: "Ver todos os utilizadores destacados"
       welcome: "Bem-vindo(a)!"
       welcome_with_name: "Bem-vindo(a), %{name}!"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index edc4353e348b00e242a55aaeb832033d5511a881..400c82312425f1908c0ec902d5eae5ced6310fe0 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -101,6 +101,15 @@ ro:
         heading: "Diaspora ID"
       donate: "Donate"
       handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "No contacts"
       no_tags: "No tags"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 0b19045b62a9ec592fee2838f42fd4d1b6b57b49..b87e94430de61bf8a1ae53b01db56dada29e34b6 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -37,7 +37,7 @@ ru:
             person: 
               invalid: "недействительно."
             username: 
-              invalid: "не подходит. Можно использовать только буквы, цифры и знак подчеркивания"
+              invalid: "не подходит. Можно использовать только буквы, цифры и знак подчеркивания."
               taken: "уже занято."
   ago: "%{time} назад"
   all_aspects: "Все аспекты"
@@ -101,11 +101,20 @@ ru:
         heading: "Идентификатор в Диаспоре"
       donate: "Пожертвовать"
       handle_explanation: "Это ваш идентификатор в Диаспоре. Как и адрес электронной почты, вы можете дать его людям для связи с вами."
-      keep_us_running: "Помогите %{pod} работать быстро, подарите нашим серверам ежемесячную дозу кофе!"
+      help: 
+        did_you: "Ð’Ñ‹:"
+        feature_suggestion: "... хотите предложить что-то новое (%{link})?"
+        find_a_bug: "... нашли ошибку (%{link})?"
+        have_a_question: "... хотите задать вопрос (%{link})?"
+        here_to_help: "Сообщество Диаспоры готово помочь!"
+        more_support: "За дополнительной поддержкой обращайтесь в %{link}."
+        need_help: "Нужна помощь?"
+        tutorials: "Справочные пособия (на английском): %{link}."
+      keep_us_running: "Помогите %{pod} работать быстро — купите нашим серверам дозу кофе, сделав ежемесячное пожертвование!"
       no_contacts: "Контакты отсутствуют"
       no_tags: "+ Найти метку"
       people_sharing_with_you: "Люди делятся с вами"
-      post_a_message: "опубликовать сообщение >>"
+      post_a_message: "новая запись >>"
       services: 
         content: "Вы можете подключить к Диаспоре следующие службы:"
         heading: "Подключенные службы"
@@ -319,7 +328,7 @@ ru:
         two: "%{count} понравилось"
         zero: "не понравилось никому"
   limited: "Ограниченная"
-  more: "Подробнее"
+  more: "Еще"
   next: "далее"
   no_results: "Результатов не найдено"
   notifications: 
@@ -435,7 +444,7 @@ ru:
       view_post: "Посмотреть запись >"
     mentioned: 
       mentioned: "упомянул вас в сообщении:"
-      subject: "% {name} упомянул вас в диаспоре*"
+      subject: "%{name} упомянул вас в диаспоре*"
     private_message: 
       reply_to_or_view: "Ответить или посмотреть эту беседу >"
     reshared: 
@@ -466,8 +475,8 @@ ru:
     index: 
       couldnt_find_them_send_invite: "Не можете их найти? Отправьте им приглашение!"
       no_one_found: "...не удалось никого найти."
-      no_results: "Ой! Чтобы что-то найти, надо что-то искать."
-      results_for: "результат поиска для"
+      no_results: "Введите текст для поиска."
+      results_for: "результаты поиска для"
     many: "%{count} человек[-a]"
     one: "1 человек"
     other: "%{count} человек[-a]"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 377027652a3ed79291fa8bb4b1c03777d5b67435..94dcfbba106d75832627a1caec3f66c132ed1f0a 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -101,6 +101,15 @@ sk:
         heading: "Diaspora ID"
       donate: "Donate"
       handle_explanation: "Toto je Vaša adresa a slúži ako vizitka. Pomocou nej Vás môžu ostatní vyhľadať."
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "Žiadne kontakty"
       no_tags: "No tags"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index afcbcc1539cba53096f8f9e90003fa23a54de594..c0665cc0e3f3ce463c7627490c17a96c72a7137a 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -101,6 +101,15 @@ sl:
         heading: "Diaspora ID"
       donate: "Donate"
       handle_explanation: "To je vaš diaspora naslov. Tako kot vaš e-naslov, ga lahko uporabite kot naslov s pomočjo katerega drugi stopijo v stik z vami."
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "Ni kontaktov"
       no_tags: "No tags"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index a5aaa0344c15158013e0e46e5ed5e46ff8791b25..8b3a15cef8d171b0dd60dd2671435908262e8f26 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -4,9 +4,9 @@
 
 
 sv: 
-  _applications: "Applications"
+  _applications: "Applikationer"
   _comments: "Kommentarer"
-  _contacts: "Contacts"
+  _contacts: "Kontakter"
   _home: "Hem"
   _photos: "foton"
   _services: "Tjänster"
@@ -96,11 +96,20 @@ sv:
         heading: "Connect to Cubbi.es"
         learn_more: "Learn more"
       diaspora_id: 
-        content_1: "Your Diaspora ID is:"
-        content_2: "Give it to anyone and they'll be able to find you on Diaspora."
-        heading: "Diaspora ID"
-      donate: "Donate"
+        content_1: "Ditt Diaspora-ID är:"
+        content_2: "Med hjälp av det kan alla hitta dig på Diaspora."
+        heading: "Diaspora-ID"
+      donate: "Donera"
       handle_explanation: "Det här är ditt Diaspora-användarnamn. Det är den här du ska ge till dina vänner om du vill att de ska lägga till dig på Diaspora."
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Behöver du hjälp?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "Inga kontakter"
       no_tags: "No tags"
@@ -111,7 +120,7 @@ sv:
         heading: "Connect Services"
       tags_following: "Followed Tags"
       unfollow_tag: "Stop following #%{tag}"
-      your_aspects: "Your Aspects"
+      your_aspects: "Dina aspekter"
     many: "%{count} aspekter"
     move_contact: 
       error: "Kunde inte flytta kontakt: %{inspect}"
@@ -130,25 +139,25 @@ sv:
     one: "1 aspekt"
     other: "%{count} aspekter"
     seed: 
-      acquaintances: "Acquaintances"
+      acquaintances: "Bekanta"
       family: "Familj"
-      friends: "Friends"
+      friends: "Vänner"
       work: "Arbete"
     selected_contacts: 
       manage_your_aspects: "Manage your aspects."
       no_contacts: "You don't have any contacts here yet."
-      view_all_contacts: "View all contacts"
+      view_all_contacts: "Se alla kontakter"
     show: 
       edit_aspect: "ändra aspekt"
-    two: "%{count} aspects"
+    two: "%{count} aspekter"
     update: 
       failure: "Din aspekt, %{name}, hade ett för långt namn för att kunna sparas."
       success: "Din aspekt %{name} är nu ändrad."
     zero: "inga aspekter"
   authorizations: 
     index: 
-      no_applications: "You haven't registered any applications yet."
-      revoke_access: "Revoke Access"
+      no_applications: "Du har inte registrerat några applikationer än."
+      revoke_access: "Neka tillträde"
   back: "Tillbaka"
   bookmarklet: 
     explanation: "%{link} från var som helst genom att lägga till den här länken som bokmärke."
@@ -174,23 +183,23 @@ sv:
       featured_users: "Featured Users"
     few: "%{count} kontakter"
     index: 
-      add_a_new_aspect: "Add a new aspect"
-      all_contacts: "All Contacts"
-      edit_aspect: "Edit %{name}"
+      add_a_new_aspect: "Lägg till en ny aspekt"
+      all_contacts: "Alla kontakter"
+      edit_aspect: "Redigera %{name}"
       many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
-      my_contacts: "My Contacts"
-      no_contacts: "No contacts."
+      my_contacts: "Mina kontakter"
+      no_contacts: "Inga kontakter."
       only_sharing_with_me: "Only sharing with me"
-      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
-      start_a_conversation: "Start a conversation"
-      title: "Contacts"
-      your_contacts: "Your Contacts"
+      remove_person_from_aspect: "Ta bort %{person_name} från \"%{aspect_name}\""
+      start_a_conversation: "Påbörja en konversation"
+      title: "Kontakter"
+      your_contacts: "Dina kontakter"
     many: "%{count} kontakter"
     one: "1 kontakt"
     other: "%{count} kontakter"
     sharing: 
       people_sharing: "Personer delar med dig:"
-    two: "%{count} contacts"
+    two: "%{count} kontakter"
     zero: "inga kontakter"
   conversations: 
     create: 
@@ -204,7 +213,7 @@ sv:
         many: "%{count} nya meddelanden"
         one: "1 nytt meddelande"
         other: "%{count} nya meddelanden"
-        two: "%{count} new messages"
+        two: "%{count} nya meddelanden"
         zero: "inga nya meddelanden"
     index: 
       create_a_new_message: "skapa ett nytt meddelande"
@@ -216,7 +225,7 @@ sv:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Skicka"
-      sending: "Sending..."
+      sending: "Skickar..."
       subject: "ämne"
       to: "till"
     new_message: 
@@ -224,7 +233,7 @@ sv:
     show: 
       delete: "ta bort och blockera konversation"
       reply: "svara"
-      replying: "Replying..."
+      replying: "Svarar..."
   date: 
     formats: 
       birthday: "%B %d"
@@ -261,7 +270,7 @@ sv:
       already_contacts: "Du är redan ansluten med denna personen"
       already_sent: "Du har redan bjudit in denna personen."
       no_more: "Du har inga fler inbjudningar."
-      own_address: "You can't send an invitation to your own address."
+      own_address: "Du kan inte skicka en inbjudan till din egen adress."
       rejected: "Det var problem med följande e-postadresser: "
       sent: "Inbjudningar har skickats till:"
     edit: 
@@ -294,7 +303,7 @@ sv:
       profile: "profil"
       recent_notifications: "Recent notifications"
       settings: "Inställningar"
-      view_all: "View all"
+      view_all: "Se alla"
   likes: 
     likes: 
       people_dislike_this: 
@@ -355,12 +364,12 @@ sv:
     index: 
       and: "och"
       and_others: 
-        few: "and %{count} others"
-        many: "and %{count} others"
-        one: "and one more"
-        other: "and %{count} others"
-        two: "and %{count} others"
-        zero: "and nobody else"
+        few: "och %{count} andra"
+        many: "och %{count} andra"
+        one: "och en till"
+        other: "och %{count} andra"
+        two: "och %{count} andra"
+        zero: "och ingen mer"
       mark_all_as_read: "Markera alla som läst"
       notifications: "Notifieringar"
     liked: 
@@ -422,7 +431,7 @@ sv:
       zero: "%{actors} started sharing with you."
   notifier: 
     a_post_you_shared: "a post."
-    click_here: "click here"
+    click_here: "klicka här"
     comment_on_post: 
       reply: "Reply or view %{name}'s post >"
     confirm_email: 
@@ -447,7 +456,7 @@ sv:
     started_sharing: 
       sharing: "har börjat dela med dig!"
       subject: "%{name} har börjat dela med dig på Diaspora*"
-      view_profile: "View %{name}'s profile"
+      view_profile: "Se %{name}s profil"
     thanks: "Tack,"
     to_change_your_notification_settings: "to change your notification settings"
   ok: "OK"
@@ -483,7 +492,7 @@ sv:
       gender: "kön"
       in_aspects: "i aspekter"
       location: "plats"
-      remove_contact: "remove contact"
+      remove_contact: "ta bort kontakt"
       remove_from: "Ta bort %{name} från %{aspect}?"
     show: 
       does_not_exist: "Den här personen finns inte!"
@@ -500,9 +509,9 @@ sv:
       to_accept_or_ignore: "for att acceptera eller ignorera."
     sub_header: 
       add_some: "add some"
-      edit: "edit"
-      you_have_no_tags: "you have no tags!"
-    two: "%{count} people"
+      edit: "redigera"
+      you_have_no_tags: "du har inga taggar!"
+    two: "%{count} människor"
     webfinger: 
       fail: "Förlåt, vi kunde inte hitta %{handle}."
     zero: "inga personer"
@@ -584,7 +593,7 @@ sv:
       unhappy: "Missnöjd?"
       update: "Uppdatera"
     new: 
-      create_my_account: "Create my account"
+      create_my_account: "Skapa mitt konto"
       enter_email: "Skriv in en e-post"
       enter_password: "Skriv in ett lösenord"
       enter_password_again: "Skriv in samma lösenord som tidigare"
@@ -624,7 +633,7 @@ sv:
         one: "1 Reshare"
         other: "%{count} Reshares"
         two: "%{count} reshares"
-        zero: "Reshare"
+        zero: "Dela igen"
       reshare_confirmation: "Reshare %{author} - %{text}?"
       reshare_original: "Reshare orignial"
       show_original: "Show Original"
@@ -638,7 +647,7 @@ sv:
       error: "Det blev ett fel vid anslutning till tjänsten"
     finder: 
       no_friends: "No Facebook friends found."
-      service_friends: "%{service} Friends"
+      service_friends: "%{service}-vänner"
     index: 
       connect_to_facebook: "Anslut till facebook"
       connect_to_tumblr: "Connect to Tumblr"
@@ -662,17 +671,17 @@ sv:
       create_request: "Sök på Diaspora-användarnamn"
       diaspora_handle: "Diaspora-användarnamn"
       enter_a_diaspora_username: "Ange ett Diaspora-användarnamn:"
-      know_email: "Vet du deras e-post adress? Du borde bjuda in dom"
+      know_email: "Vet du deras e-post adress? Du borde bjuda in dem"
       your_diaspora_username_is: "Ditt Diaspora-användarnamn är: %{diaspora_handle}"
     aspect_dropdown: 
-      add_to_aspect: "Add to aspect"
+      add_to_aspect: "Lägg till i aspekt"
       toggle: 
-        few: "In %{count} aspects"
-        many: "In %{count} aspects"
-        one: "In %{count} aspect"
-        other: "In %{count} aspects"
-        two: "In %{count} aspects"
-        zero: "Add to aspect"
+        few: "I %{count} aspekter"
+        many: "I %{count} aspekter"
+        one: "I %{count} aspekt"
+        other: "I %{count} aspekter"
+        two: "I %{count} aspekter"
+        zero: "Lägg till i aspekt"
     contact_list: 
       all_contacts: "Alla kontakter"
     footer: 
@@ -705,7 +714,7 @@ sv:
       publishing_to: "publicerar till: "
       share: "Dela"
       share_with: "dela med"
-      upload_photos: "Upload photos"
+      upload_photos: "Ladda upp foton"
       whats_on_your_mind: "Vad har du på hjärtat?"
     reshare: 
       reshare: "Ã…terdela"
@@ -735,7 +744,7 @@ sv:
       zero: "ditt statusmeddelande får inte vara längre än %{count} bokstäver"
   stream_helper: 
     hide_comments: "dölj kommentarer"
-    show_more_comments: "Show %{number} more comments"
+    show_more_comments: "Visa %{number} kommentarer till"
   tag_followings: 
     create: 
       failure: "Failed to follow: #%{name}"
@@ -745,17 +754,17 @@ sv:
       success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
-      follow: "Follow #%{tag}"
-      following: "Following #%{tag}"
+      follow: "Följ #%{tag}"
+      following: "Följer #%{tag}"
       nobody_talking: "Ingen talar om %{tag} än."
       people_tagged_with: "Personer taggade med %{tag}"
       posts_tagged_with: "Poster taggade med #%{tag}"
-      stop_following: "Stop Following #%{tag}"
+      stop_following: "Sluta följa #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
-      daniels_account: "Daniel's Diaspora account"
+      daniels_account: "Daniels Diasporakonto"
       log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
@@ -795,7 +804,7 @@ sv:
       your_email: "Din epost"
       your_handle: "Ditt Diaspora-användarnamn"
     getting_started: 
-      bold: "aspects"
+      bold: "aspekter"
       connect_to: "Connect to"
       connect_to_your_other_social_networks: "Connect to your other social networks"
       connect_with_people: "Connect with cool people"
@@ -805,25 +814,25 @@ sv:
       featured_tags: "Featured tags"
       featured_users: "Featured users"
       fill_out_your_profile: "Fill out your profile"
-      find_friends: "Find friends"
+      find_friends: "Hitta vänner"
       find_friends_from_facebook: "find friends from Facebook"
       finished: "Slutfört!"
       follow_your_interests: "Follow your interests"
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
       profile_description: "Make it easier for people to find you by filling out your profile information."
       profile_fields: 
-        bio: "Bio"
-        birthday: "Birthday"
-        gender: "Gender"
-        location: "Location"
-        name: "Name"
-        photo: "Photo"
-        tags: "Tags"
+        bio: "Biografi"
+        birthday: "Födelsedag"
+        gender: "Kön"
+        location: "Plats"
+        name: "Namn"
+        photo: "Foto"
+        tags: "Taggar"
       search_for_hashtags: "Search for #hashtags"
-      search_for_people: "Search for people"
+      search_for_people: "Leta efter människor"
       see_all_featured_users: "See all featured users"
       welcome: "Välkommen till diaspora!"
-      welcome_with_name: "Welcome, %{name}!"
+      welcome_with_name: "Välkommen, %{name}!"
     public: 
       does_not_exist: "Användaren %{username} finns inte!"
     update: 
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index ecb4c375f5b5cb9b604606235dc5dce1e21f003e..5d5829b8b8104ed6db5f167a369f4cc0186c3c97 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -21,7 +21,7 @@ tr:
         person: 
           attributes: 
             diaspora_handle: 
-              taken: "is already taken."
+              taken: "önceden alınmış."
         request: 
           attributes: 
             from_id: 
@@ -35,60 +35,60 @@ tr:
             email: 
               taken: "is already taken."
             person: 
-              invalid: "is invalid."
+              invalid: "geçersiz."
             username: 
               invalid: "is invalid. We only allow letters, numbers, and underscores"
               taken: "is already taken."
   ago: "%{time} önce"
-  all_aspects: "All aspects"
+  all_aspects: "Tüm Yönler"
   application: 
     helper: 
-      diaspora_alpha: "DIASPORA* ALPHA"
+      diaspora_alpha: "DIASPORA* ALFA"
       unknown_person: "bilinmiyen kiÅŸiler"
       video_title: 
-        unknown: "Unknown Video Title"
-  are_you_sure: "Are you sure?"
+        unknown: "Geçersiz Video Başlığı"
+  are_you_sure: "Emin misin?"
   aspect_memberships: 
     destroy: 
-      failure: "Failed to remove person from aspect"
+      failure: "Listeden kişi kaldırılamadı"
       no_membership: "Could not find the selected person in that aspect"
-      success: "Successfully removed person from aspect"
+      success: "Kişi listeden başarıyla kaldırıldı"
   aspects: 
     add_to_aspect: 
-      failure: "Failed to add friend to aspect."
-      success: "Successfully added friend to aspect."
+      failure: "Yöne kişi ekleme başarısız."
+      success: "Kişi başarıyla yöne eklendi."
     aspect_contacts: 
-      done_editing: "done editing"
+      done_editing: "düzenleme başarılı"
     aspect_listings: 
-      add_an_aspect: "+ Add an aspect"
+      add_an_aspect: "+ Yeni yön ekle"
     aspect_stream: 
       commented_on: "commented on"
       posted: "posted"
       recently: "recently:"
-      stream: "Stream"
+      stream: "Akış"
     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."
     create: 
-      failure: "Yan yaratimi basarılı değildi."
-      success: "Sol taraftaki arti ya tıklıyarak Diasporaya sizin yeni yanınızı kimlerin görebileceğini belirtin."
+      failure: "Yön oluşturulamadı."
+      success: "Sol taraftaki artı ya tıklıyarak Diaspora'ya sizin yeni yönünüzü kimlerin görebileceğini belirtin."
     destroy: 
       failure: "%{name} is not empty and could not be removed."
       success: "%{name} başarıyla yaratıldı."
     edit: 
-      add_existing: "Add an existing contact"
+      add_existing: "Mevcut rehbere bir kiÅŸi ekle"
       aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
       aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Are you sure you want to delete this aspect?"
-      done: "Done"
-      make_aspect_list_visible: "make aspect list visible?"
-      remove_aspect: "Delete this aspect"
-      rename: "rename"
-      update: "update"
-      updating: "updating"
-    few: "%{count} aspects"
+      done: "Bitti"
+      make_aspect_list_visible: "Yön listesi hale getirilsin mi?"
+      remove_aspect: "Yönü sil"
+      rename: "adlandır"
+      update: "güncelle"
+      updating: "güncelleniyor"
+    few: "%{count} yön"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
-      aspect_not_empty: "Yan boÅŸ deÄŸil"
+      aspect_not_empty: "Yön boş değil"
       remove: "çıkar"
     index: 
       cubbies: 
@@ -96,58 +96,67 @@ tr:
         heading: "Connect to Cubbi.es"
         learn_more: "Learn more"
       diaspora_id: 
-        content_1: "Your Diaspora ID is:"
+        content_1: "Diaspora ID'niz:"
         content_2: "Give it to anyone and they'll be able to find you on Diaspora."
         heading: "Diaspora ID"
-      donate: "Donate"
-      handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
+      donate: "Bağış yap"
+      handle_explanation: "Bu Diaspora kimliği. Bir e-posta adresi gibi, bunu insanlara size ulaşması için verebilirsiniz."
+      help: 
+        did_you: "Sen misin:"
+        feature_suggestion: "... bir %{link} önerin var mı?"
+        find_a_bug: "... bulabilir misin %{link}?"
+        have_a_question: "... bir %{link} var mı?"
+        here_to_help: "Diaspora topluluğu olarak yardım etmek için buradayız!"
+        more_support: "Daha fazla destek için, bağlantıyı kontrol etmelisin %{link}."
+        need_help: "Yardıma mı ihtiyacın var?"
+        tutorials: "Öğreticileri için,%{link} kontrol edin."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
-      no_contacts: "No contacts"
-      no_tags: "No tags"
+      no_contacts: "KiÅŸi yok"
+      no_tags: "+ Takip etmek bir etiket bul"
       people_sharing_with_you: "People sharing with you"
-      post_a_message: "post a message >>"
+      post_a_message: "mesaj gönder >>"
       services: 
         content: "You can connect the following services to Diaspora:"
-        heading: "Connect Services"
-      tags_following: "Followed Tags"
-      unfollow_tag: "Stop following #%{tag}"
-      your_aspects: "Your Aspects"
-    many: "%{count} aspects"
+        heading: "Bağlanılan Servisler"
+      tags_following: "Takip Edilen Etiketler"
+      unfollow_tag: "Takibi durdur #%{tag}"
+      your_aspects: "Yönleriniz"
+    many: "%{count} yön"
     move_contact: 
       error: "Kontak taşıma problemi: %{inspect}"
       failure: "didn't work %{inspect}"
-      success: "Person moved to new aspect"
+      success: "Kişi yeni yöne taşındı"
     new: 
-      create: "Create"
-      name: "Name"
+      create: "OluÅŸtur"
+      name: "Ad"
     no_contacts_message: 
-      featured_users: "featured users"
-      or_featured: "Or you can share with %{link}"
+      featured_users: "önerilen kullanıcılar"
+      or_featured: "Ya da bağlantı paylaşın %{link}"
       try_adding_some_more_contacts: "You can search (top) or invite (right) more contacts."
-      you_should_add_some_more_contacts: "You should add some more contacts!"
+      you_should_add_some_more_contacts: "Biraz daha fazla kiÅŸi eklemek gerekiyor!"
     no_posts_message: 
       start_talking: "Kimse henüz birşey söylemedi. Sohbeti başlatın!"
-    one: "1 aspect"
-    other: "%{count} aspects"
+    one: "1 yön"
+    other: "%{count} yön"
     seed: 
-      acquaintances: "Acquaintances"
+      acquaintances: "Tanıdıklar"
       family: "Aile"
-      friends: "Friends"
+      friends: "ArkadaÅŸlar"
       work: "Ä°ÅŸ"
     selected_contacts: 
-      manage_your_aspects: "Manage your aspects."
+      manage_your_aspects: "Yönleri yönetir."
       no_contacts: "You don't have any contacts here yet."
-      view_all_contacts: "View all contacts"
+      view_all_contacts: "Tüm kişileri görüntüle"
     show: 
-      edit_aspect: "edit aspect"
-    two: "%{count} aspects"
+      edit_aspect: "yön düzenle"
+    two: "%{count} yön"
     update: 
       failure: "Your aspect, %{name}, had too long name to be saved."
-      success: "Sizin yanınız, %{name}, başariyla düzeltildi."
-    zero: "no aspects"
+      success: "Yönünüz, %{name}, başarıyla düzeltildi."
+    zero: "yön yok"
   authorizations: 
     index: 
-      no_applications: "You haven't registered any applications yet."
+      no_applications: "Henüz bir uygulama kayıtlı değildir."
       revoke_access: "Revoke Access"
   back: "Geri"
   bookmarklet: 
@@ -158,18 +167,18 @@ tr:
     post_success: "Posted! Closing!"
   cancel: "Ä°ptal Et"
   comments: 
-    few: "%{count} comments"
-    many: "%{count} comments"
+    few: "%{count} yorum"
+    many: "%{count} yorum"
     new_comment: 
       comment: "Yorum"
       commenting: "Yorumlama..."
-    one: "1 comment"
-    other: "%{count} comments"
+    one: "1 yorum"
+    other: "%{count} yorum"
     two: "%{count} comments"
-    zero: "no comments"
+    zero: "yorum yok"
   contacts: 
     create: 
-      failure: "Failed to create contact"
+      failure: "Kişi oluşturma başarısız"
     featured: 
       featured_users: "Featured Users"
     few: "%{count} kiÅŸi"
@@ -185,7 +194,7 @@ tr:
       start_a_conversation: "Start a conversation"
       title: "Contacts"
       your_contacts: "Your Contacts"
-    many: "%{count} contacts"
+    many: "%{count} kiÅŸi"
     one: "1 kiÅŸi"
     other: "%{count} kiÅŸi"
     sharing: 
@@ -200,30 +209,30 @@ tr:
       success: "Conversation successfully removed"
     helper: 
       new_messages: 
-        few: "%{count} new messages"
-        many: "%{count} new messages"
-        one: "1 new messages"
-        other: "%{count} new messages"
+        few: "%{count} yeni mesaj"
+        many: "%{count} yeni mesaj"
+        one: "1 yeni mesaj"
+        other: "%{count} yeni mesaj"
         two: "%{count} new messages"
         zero: "no new messages"
     index: 
-      create_a_new_message: "create a new message"
+      create_a_new_message: "yeni mesaj oluÅŸtur"
       inbox: "Inbox"
-      message_inbox: "Message Inbox"
-      new_message: "New Message"
+      message_inbox: "Mesaj Kutusu"
+      new_message: "Yeni Mesaj"
       no_conversation_selected: "no conversation selected"
-      no_messages: "no messages"
+      no_messages: "mesaj yok"
     new: 
       abandon_changes: "Abandon changes?"
-      send: "Send"
+      send: "Gönder"
       sending: "Sending..."
       subject: "subject"
       to: "to"
     new_message: 
       fail: "Invalid message"
     show: 
-      delete: "delete and block conversation"
-      reply: "reply"
+      delete: "iletiÅŸimi sil ya da engelle"
+      reply: "yanıtla"
       replying: "Replying..."
   date: 
     formats: 
@@ -241,11 +250,11 @@ tr:
   hide: "Hide"
   home: 
     show: 
-      already_account: "already have an account?"
+      already_account: "Zaten bir hesabınız var mı?"
       choice: "Seçim"
       choice_explanation: "Diaspora allows you to sort your connections into groups called Aspects. Unique to Diaspora, Aspects ensure your photos, stories and jokes are shared with only the people you want them to be."
       learn_about_host: "Learn about how to host your own Diaspora server"
-      login_here: "log in here"
+      login_here: "buradan oturum açın"
       ownership: "Sahiplik"
       ownership_explanation: "You own your pictures, and you shouldn’t have to give that up just in order to share them. You maintain ownership of everything you share on Diaspora, giving you full control over how it is distributed."
       share_what_you_want: "Share what you want, with whom you want."
@@ -256,10 +265,10 @@ tr:
   invitations: 
     a_facebook_user: "A Facebook user"
     check_token: 
-      not_found: "Invitation token not found"
+      not_found: "Davetiye bulunamadı."
     create: 
       already_contacts: "You are already connected with this person"
-      already_sent: "You already invited this person."
+      already_sent: "Zaten bu kiÅŸi davet edilmiÅŸ."
       no_more: "Başka davetiyeniz bulunmamaktadır."
       own_address: "You can't send an invitation to your own address."
       rejected: "The following email addresses had problems: "
@@ -269,31 +278,31 @@ tr:
       your_account_awaits: "Your account awaits!"
     new: 
       already_invited: "Already invited"
-      aspect: "Aspect"
+      aspect: "Görünüm"
       comma_seperated_plz: "Virgülle ayırarak birden fazla e-posta adresi girebilirsin."
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
       invite_someone_to_join: "Diaspora'ya birilerini davet et!"
-      personal_message: "Personal message"
-      resend: "Resend"
+      personal_message: "KiÅŸisel mesaj"
+      resend: "Tekrar gönder"
       send_an_invitation: "Bir davet yolla"
       send_invitation: "Davetiye yolla"
-      to: "To"
+      to: "Kime"
   layouts: 
     application: 
-      powered_by: "POWERED BY DIASPORA*"
+      powered_by: "GELÄ°ÅžTÄ°RÄ°CÄ° DIASPORA*"
       public_feed: "Public Diaspora Feed for %{name}"
-      toggle: "toggle mobile site"
-      whats_new: "what's new?"
-      your_aspects: "your aspects"
+      toggle: "mobil site'ye git"
+      whats_new: "Neler yeni?"
+      your_aspects: "sizin yönleriniz"
     header: 
-      admin: "admin"
+      admin: "yönetici"
       blog: "blog"
-      code: "code"
+      code: "kod"
       login: "login"
       logout: "Çıkış"
-      profile: "profile"
+      profile: "profil"
       recent_notifications: "Recent notifications"
-      settings: "settings"
+      settings: "ayarlar"
       view_all: "View all"
   likes: 
     likes: 
@@ -319,8 +328,8 @@ tr:
         two: "%{count} likes"
         zero: "no likes"
   limited: "Limited"
-  more: "More"
-  next: "next"
+  more: "Daha fazla"
+  next: "sonraki"
   no_results: "No Results Found"
   notifications: 
     also_commented: 
@@ -346,23 +355,23 @@ tr:
       zero: "%{actors} commented on your %{post_link}."
     helper: 
       new_notifications: 
-        few: "%{count} new notifications"
-        many: "%{count} new notifications"
-        one: "1 new notifications"
-        other: "%{count} new notifications"
-        two: "%{count} new notifications"
+        few: "%{count} yeni bildirim"
+        many: "%{count} yeni bildirim"
+        one: "1 yeni bildirim"
+        other: "%{count} yeni bildirim"
+        two: "%{count} yeni bildirim"
         zero: "no new notifications"
     index: 
-      and: "and"
+      and: "ve"
       and_others: 
         few: "and %{count} others"
         many: "and %{count} others"
         one: "and one more"
         other: "and %{count} others"
-        two: "and %{count} others"
+        two: "ve %{count} diÄŸer kiÅŸi"
         zero: "and nobody else"
-      mark_all_as_read: "Mark All as Read"
-      notifications: "Notifications"
+      mark_all_as_read: "Tümünü Okundu Olarak İşaretle"
+      notifications: "Bildirimler"
     liked: 
       few: "%{actors} has just liked your %{post_link}."
       many: "%{actors} has just liked your %{post_link}."
@@ -375,21 +384,21 @@ tr:
       many: "%{actors} liked your deleted post."
       one: "%{actors} liked your deleted post."
       other: "%{actors} liked your deleted post."
-      two: "%{actors} liked your deleted post."
+      two: "%{actors} silinen gönderiyi beğendi."
       zero: "%{actors} liked your deleted post."
     mentioned: 
       few: "%{actors} has mentioned you in a %{post_link}."
       many: "%{actors} has mentioned you in a %{post_link}."
       one: "%{actors} has mentioned you in a %{post_link}."
       other: "%{actors} has mentioned you in a %{post_link}."
-      two: "%{actors} has mentioned you in a %{post_link}."
+      two: "%{actors} senden bahsetti %{post_link}."
       zero: "%{actors} has mentioned you in a %{post_link}."
     mentioned_deleted: 
       few: "%{actors} mentioned you in a deleted post."
       many: "%{actors} mentioned you in a deleted post."
       one: "%{actors} mentioned you in a deleted post."
       other: "%{actors} mentioned you in a deleted post."
-      two: "%{actors} mentioned you in a deleted post."
+      two: "%{actors} silinmiş bir gönderiden bahsetti."
       zero: "%{actors} mentioned you in a deleted post."
     post: "post"
     private_message: 
@@ -397,28 +406,28 @@ tr:
       many: "%{actors} sent you a message."
       one: "%{actors} sent you a message."
       other: "%{actors} sent you a message."
-      two: "%{actors} sent you a message."
+      two: "%{actors} size bir mesaj gönderdi."
       zero: "%{actors} sent you a message."
     reshared: 
       few: "%{actors} has reshared your %{post_link}."
       many: "%{actors} has reshared your %{post_link}."
       one: "%{actors} has reshared your %{post_link}."
       other: "%{actors} has reshared your %{post_link}."
-      two: "%{actors} has reshared your %{post_link}."
+      two: "%{actors} yeniden paylaştı %{post_link}."
       zero: "%{actors} has reshared your %{post_link}."
     reshared_post_deleted: 
       few: "%{actors} reshared your deleted post."
       many: "%{actors} reshared your deleted post."
       one: "%{actors} reshared your deleted post."
       other: "%{actors} reshared your deleted post."
-      two: "%{actors} reshared your deleted post."
+      two: "%{actors} silinmiş gönderi yeniden paylaşılamaz."
       zero: "%{actors} reshared your deleted post."
     started_sharing: 
       few: "%{actors} started sharing with you."
       many: "%{actors} started sharing with you."
       one: "%{actors} started sharing with you."
       other: "%{actors} started sharing with you."
-      two: "%{actors} started sharing with you."
+      two: "%{actors} sizinle paylaşıma başladı."
       zero: "%{actors} started sharing with you."
   notifier: 
     a_post_you_shared: "a post."
@@ -434,21 +443,21 @@ tr:
       liked: "%{name} has just liked your post: "
       view_post: "View post >"
     mentioned: 
-      mentioned: "mentioned you in a post:"
-      subject: "%{name} has mentioned you on Diaspora*"
+      mentioned: "gönderide senden bahsetti:"
+      subject: "%{name} sana Diaspora*'da özel mesaj gönderdi "
     private_message: 
       reply_to_or_view: "Reply to or view this conversation >"
     reshared: 
       reshared: "%{name} just reshared your post"
       view_post: "View post >"
     single_admin: 
-      admin: "Your Diaspora administrator"
+      admin: "Diaspora yönetici"
       subject: "A message from your Diaspora administrator:"
     started_sharing: 
       sharing: "has started sharing with you!"
       subject: "%{name} has started sharing with you on Diaspora*"
       view_profile: "View %{name}'s profile"
-    thanks: "Thanks,"
+    thanks: "Teşekkürler,"
     to_change_your_notification_settings: "to change your notification settings"
   ok: "Tamam"
   or: "ya da"
@@ -459,18 +468,18 @@ tr:
       add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "edit aspect membership"
-    few: "%{count} people"
+    few: "%{count} kiÅŸi"
     helper: 
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " results for %{params}"
     index: 
       couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
-      no_one_found: "...and no one was found."
+      no_one_found: "...ve hiç kimse bulunamadı."
       no_results: "Hey! You need to search for something."
-      results_for: "search results for"
-    many: "%{count} people"
-    one: "1 person"
-    other: "%{count} people"
+      results_for: "için arama sonuçları"
+    many: "%{count} kiÅŸi"
+    one: "1 kiÅŸi"
+    other: "%{count} kiÅŸi"
     person: 
       add_contact: "kiÅŸi ekle"
       already_connected: "Zaten bağlı"
@@ -479,37 +488,37 @@ tr:
     profile_sidebar: 
       bio: "hakkında"
       born: "born"
-      edit_my_profile: "Edit my profile"
-      gender: "gender"
-      in_aspects: "in aspects"
+      edit_my_profile: "Profil düzenle"
+      gender: "cinsiyet"
+      in_aspects: "yönleriyle"
       location: "location"
       remove_contact: "remove contact"
       remove_from: "Remove %{name} from %{aspect}?"
     show: 
-      does_not_exist: "Person does not exist!"
+      does_not_exist: "KiÅŸi yok!"
       has_not_shared_with_you_yet: "%{name} has not shared any posts with you yet!"
       incoming_request: "You have an incoming request from this person."
-      mention: "Mention"
-      message: "Message"
+      mention: "Bahset"
+      message: "Mesaj"
       not_connected: "You are not connected with this person"
-      recent_posts: "Recent Posts"
-      recent_public_posts: "Recent Public Posts"
-      return_to_aspects: "Return to your aspects page"
-      see_all: "See all"
-      start_sharing: "start sharing"
+      recent_posts: "Son Gönderiler"
+      recent_public_posts: "Son Genel Gönderiler"
+      return_to_aspects: "Yönler sayfasına geri dön"
+      see_all: "Hepsini gör"
+      start_sharing: "paylaşıma başla"
       to_accept_or_ignore: "kabul et veya yoksay."
     sub_header: 
       add_some: "add some"
       edit: "edit"
       you_have_no_tags: "you have no tags!"
-    two: "%{count} people"
+    two: "%{count} kiÅŸi"
     webfinger: 
       fail: "Sorry, we couldn't find %{handle}."
-    zero: "no people"
+    zero: "kiÅŸi yok"
   photos: 
     comment_email_subject: "%{name}'s photo"
     create: 
-      integrity_error: "Photo upload failed.  Are you sure that was an image?"
+      integrity_error: "Fotoğraf yükleme başarısız oldu. Gerçek bir fotoğraf yüklediğine emin misin?"
       runtime_error: "Photo upload failed.  Are you sure that your seatbelt is fastened?"
       type_error: "Fotoğraf yüklemesi başarısız oldu.  Bir görüntünün eklendiğinden eminmisiniz?"
     destroy: 
@@ -523,16 +532,16 @@ tr:
     new_photo: 
       empty: "{file} is empty, please select files again without it."
       invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
-      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+      size_error: "{file} çok büyük, en büyük dosya boyutu {sizeLimit}."
     new_profile_photo: 
       or_select_one: "or select one from your already existing"
-      upload: "Upload a new profile photo!"
+      upload: "Yeni bir profil fotoğrafı yükle!"
     photo: 
       view_all: "%{name}'in bütün fotoğraflarını göster"
     show: 
       collection_permalink: "collection permalink"
       delete_photo: "Sil Fotoyu"
-      edit: "edit"
+      edit: "düzenle"
       edit_delete_photo: "Fotoğrafın tanımını düzenle/ fotoğrafı sil"
       make_profile_photo: "profil fotoğrafı yap"
       show_original_post: "Show original post"
@@ -549,28 +558,28 @@ tr:
       destroy: "Delete"
       not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
-  previous: "previous"
+  previous: "önceki"
   profile: "Profil"
   profiles: 
     edit: 
       allow_search: "Allow for people to search for you within Diaspora"
-      edit_profile: "Edit profile"
-      first_name: "First name"
-      last_name: "Last name"
-      update_profile: "Update Profile"
-      your_bio: "Your bio"
-      your_birthday: "Your birthday"
-      your_gender: "Your gender"
+      edit_profile: "Profil düzenle"
+      first_name: "Ad"
+      last_name: "Soyadı"
+      update_profile: "Profili Güncelle"
+      your_bio: "Hakkında"
+      your_birthday: "Doğum günü"
+      your_gender: "Cinsiyet"
       your_location: "Your location"
-      your_name: "Your name"
-      your_photo: "Your photo"
-      your_private_profile: "Your private profile"
-      your_public_profile: "Your public profile"
+      your_name: "Ad"
+      your_photo: "FotoÄŸraf"
+      your_private_profile: "Özel profilin"
+      your_public_profile: "Genel profilin"
       your_tags: "You: in 5 #tags"
       your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
-      failed: "Failed to update profile"
-      updated: "Profile updated"
+      failed: "Profil güncelleme başarısız"
+      updated: "Profil güncellendi"
   public: "Public"
   registrations: 
     closed: "Üyelik bu Diaspora'da kapandı."
@@ -596,20 +605,20 @@ tr:
       sending: "Sending..."
       sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
     destroy: 
-      error: "Lutfen bir yan seçiniz!"
+      error: "Lütfen bir yön seçiniz!"
       ignore: "ArkadaÅŸ isteÄŸini reddettiniz."
       success: "Siz şimdi arkadaşsınız."
     helper: 
       new_requests: 
-        few: "%{count} new requests!"
-        many: "%{count} new requests!"
-        one: "new request!"
-        other: "%{count} new requests!"
-        two: "%{count} new requests!"
-        zero: "no new requests"
+        few: "%{count} yeni istek!"
+        many: "%{count} yeni istek!"
+        one: "yeni istek!"
+        other: "%{count} yeni istek!"
+        two: "%{count} yeni istek!"
+        zero: "yeni istek yok"
     manage_aspect_contacts: 
-      existing: "Existing contacts"
-      manage_within: "Manage contacts within"
+      existing: "Mevcut rehber"
+      manage_within: "Kişileri yönetin"
     new_request_to_person: 
       sent: "yollandı!"
   reshares: 
@@ -623,7 +632,7 @@ tr:
         many: "%{count} Reshares"
         one: "1 Reshare"
         other: "%{count} Reshares"
-        two: "%{count} reshares"
+        two: "%{count} yeniden paylaşım"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
       reshare_original: "Reshare orignial"
@@ -644,7 +653,7 @@ tr:
       connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "twitter baÄŸlan"
       disconnect: "çık"
-      edit_services: "Edit services"
+      edit_services: "Servisleri düzenle"
       logged_in_as: "olarak bağlandınız"
       no_services: "You have not connected any services yet."
       really_disconnect: "disconnect %{service}?"
@@ -652,40 +661,40 @@ tr:
       click_link_to_accept_invitation: "Click this link to accept your invitation"
       join_me_on_diaspora: "Join me on DIASPORA*"
     remote_friend: 
-      invite: "invite"
+      invite: "davet et"
       not_on_diaspora: "Not yet on Diaspora"
-      resend: "resend"
+      resend: "tekrar gönder"
   settings: "Ayarlar"
   shared: 
     add_contact: 
       add_new_contact: "Add a new contact"
       create_request: "Find by Diaspora handle"
       diaspora_handle: "Diaspora handle"
-      enter_a_diaspora_username: "Enter a Diaspora username:"
-      know_email: "Know their email address? You should invite them"
-      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+      enter_a_diaspora_username: "Diaspora kullanıcı adınızı giriniz:"
+      know_email: "E-posta adresini biliyor musunuz? O zaman onu davet et"
+      your_diaspora_username_is: "Diaspora kullanıcı adınız: %{diaspora_handle}"
     aspect_dropdown: 
       add_to_aspect: "Add to aspect"
       toggle: 
-        few: "In %{count} aspects"
-        many: "In %{count} aspects"
+        few: "%{count} yön"
+        many: "%{count} yön"
         one: "In %{count} aspect"
-        other: "In %{count} aspects"
-        two: "In %{count} aspects"
+        other: "%{count} yön"
+        two: "%{count} yön"
         zero: "Add to aspect"
     contact_list: 
       all_contacts: "Bütün kişiler"
     footer: 
-      logged_in_as: "logged in as %{name}"
+      logged_in_as: "giriş yaptı %{name}"
       your_aspects: "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"
+      from_facebook: "Facebook"
       invitations_left: "(%{count} davet kaldı)"
       invite_someone: "Birisini davet edin"
       invite_your_friends: "Invite your friends"
-      invites: "Invites"
+      invites: "Davetler"
       invites_closed: "Invites are currently closed on this Diaspora seed"
     notification: 
       new: "%{from}'den yeni %{type}"
@@ -701,7 +710,7 @@ tr:
       discard_post: "Discard post"
       make_public: "herkese görünür yap"
       post_a_message_to: "mesaj gönder %{aspect}"
-      posting: "Posting..."
+      posting: "Gönderiliyor..."
       publishing_to: "publishing to: "
       share: "PaylaÅŸ"
       share_with: "Share with %{aspect}"
@@ -711,17 +720,17 @@ tr:
       reshare: "Yeniden PaylaÅŸ"
     stream_element: 
       dislike: "I dislike this"
-      hide_and_mute: "Hide and Mute"
+      hide_and_mute: "Gizle ve Sessiz"
       like: "I like this"
       shared_with: "Shared with: %{aspect_names}"
-      unlike: "Unlike"
-      via: "via %{link}"
+      unlike: "BeÄŸenme"
+      via: "tarafından %{link}"
       viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
-      success: "Successfully mentioned: %{names}"
+      success: "Başarıyla bahsedildi: %{names}"
     destroy: 
-      failure: "Failed to delete post"
+      failure: "Mesaj silme başarısız"
     helper: 
       no_message_to_display: "Gosterilcek bir mesaj yok."
     new: 
@@ -731,7 +740,7 @@ tr:
       many: "please make your status messages less than %{count} characters"
       one: "please make your status messages less than %{count} character"
       other: "please make your status messages less than %{count} characters"
-      two: "please make your status messages less than %{count} characters"
+      two: "lütfen durum güncellerken %{count} karakterden az kullanın"
       zero: "please make your status messages less than %{count} characters"
   stream_helper: 
     hide_comments: "yorumları gizle"
@@ -753,7 +762,7 @@ tr:
       stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
-      connect_to_cubbies: "Connect to Cubbi.es"
+      connect_to_cubbies: "Cubbi.es BaÄŸlan"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
       log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
@@ -773,16 +782,16 @@ tr:
     destroy: "Hesap başarıyla kapatıldı"
     edit: 
       also_commented: "...someone also comments on your contact's post?"
-      change: "Change"
+      change: "DeÄŸiÅŸtir"
       change_email: "Change E-Mail"
       change_language: "Dili DeÄŸiÅŸtir"
       change_password: "Åžifremi DeÄŸiÅŸtir"
       close_account: "Hesabımı kapat"
       comment_on_post: "...someone comments on your post?"
-      current_password: "Current password"
+      current_password: "Mevcut parola"
       download_photos: "fotoğraflarımı kaydet"
       download_xml: "xml dosyamı kaydet"
-      edit_account: "Edit account"
+      edit_account: "Hesap düzenle"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Bilgilerimi Dışarı taşı"
       liked: "...someone likes your post?"
@@ -795,7 +804,7 @@ tr:
       your_email: "E-postan"
       your_handle: "Your diaspora handle"
     getting_started: 
-      bold: "aspects"
+      bold: "yönler"
       connect_to: "Connect to"
       connect_to_your_other_social_networks: "Connect to your other social networks"
       connect_with_people: "Connect with cool people"
@@ -819,8 +828,8 @@ tr:
         name: "Name"
         photo: "Photo"
         tags: "Tags"
-      search_for_hashtags: "Search for #hashtags"
-      search_for_people: "Search for people"
+      search_for_hashtags: "#hashtags Ara"
+      search_for_people: "KiÅŸi ara"
       see_all_featured_users: "See all featured users"
       welcome: "Diaspora'ya hoÅŸgeldin!"
       welcome_with_name: "Welcome, %{name}!"
diff --git a/config/locales/diaspora/ur-PK.yml b/config/locales/diaspora/ur-PK.yml
index bbb37204008363a25c1684b3fe9c2b5075967b11..53e276137e2d74be6b0601be7c76690c5fdebd51 100644
--- a/config/locales/diaspora/ur-PK.yml
+++ b/config/locales/diaspora/ur-PK.yml
@@ -101,6 +101,15 @@ ur-PK:
         heading: "ڈایسپورا شناخت"
       donate: "عطیہ دیجیے"
       handle_explanation: "یہ آپ کی ڈایسپورا شناخت ہے۔ ایک ای میل ایڈریس کی طرح، آپ اسے لوگوں کو خود تک پہنچنے کے لئے دے سکتے ہیں۔"
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "کوئ رابطہ نہیں"
       no_tags: "پیروی کرنے کے لئے ایک اصطلاح تلاش کریں +"
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index e7305bdf04eec5661742745abead340d98f8fa04..0c5693d06f63e6b365dd57bc943b8bba3d3ca6a2 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -101,6 +101,15 @@ zh-CN:
         heading: "Diaspora ID"
       donate: "Donate"
       handle_explanation: "这是您的 diaspora 帐号， 就像是邮箱一样，你可以把它提供给想好友您的人。"
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "没有任何好友"
       no_tags: "No tags"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index e20312eebe5cd834b520a4527d10cf1472f9476f..957079eedbb04f3c1b5e4dc399e01d2862461e56 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -37,7 +37,7 @@ zh-TW:
             person: 
               invalid: "不合格."
             username: 
-              invalid: "不被接受. 只能夠使用字母, 數字, 以及底線符號"
+              invalid: "不被接受. 只能夠使用字母, 數字, 以及底線符號."
               taken: "已被使用."
   ago: "%{time}前"
   all_aspects: "所有面向"
@@ -101,7 +101,16 @@ zh-TW:
         heading: "Diaspora 識別碼"
       donate: "捐獻"
       handle_explanation: "這是你的 diaspora 識別碼. 就像電子信箱一樣, 你可以把它給想聯絡你的人."
-      keep_us_running: "為了讓 %{pod} 高速奔馳, 提供些咖啡存量給我們的伺服器吧!"
+      help: 
+        did_you: "Did you:"
+        feature_suggestion: "... have a %{link} suggestion?"
+        find_a_bug: "... find a %{link}?"
+        have_a_question: "... have a %{link}?"
+        here_to_help: "Diaspora community is here to help!"
+        more_support: "For more support, you should also check out %{link}."
+        need_help: "Need Help?"
+        tutorials: "For tutorials, check out %{link}."
+      keep_us_running: "為了讓 %{pod} 高速奔馳, 用每月捐款來提供些咖啡存量給我們的伺服器吧!"
       no_contacts: "沒有任何聯絡人"
       no_tags: "+ 找個標籤來追蹤"
       people_sharing_with_you: "跟你分享的人"
@@ -110,7 +119,7 @@ zh-TW:
         content: "你可以連結以下服務至 Diaspora:"
         heading: "連結服務"
       tags_following: "追蹤的標籤"
-      unfollow_tag: "停止追隨#%{tag}"
+      unfollow_tag: "停止追蹤#%{tag}"
       your_aspects: "你的面向"
     many: "%{count}個面向"
     move_contact: 
@@ -426,7 +435,7 @@ zh-TW:
     comment_on_post: 
       reply: "回或看 %{name} 的貼文 >"
     confirm_email: 
-      click_link: "請按一下以下連結, 來啟用你新的電子郵件信箱 %{unconfirmed_email}:"
+      click_link: "請使用以下連結, 來啟用你新的電子郵件信箱 %{unconfirmed_email}:"
       subject: "請啟用你新的電子信箱 %{unconfirmed_email}"
     email_sent_by_diaspora: "這封電子郵件是從 Diaspora 寄出. 如果你不想再收到這類的信件,"
     hello: "%{name}你好!"
@@ -649,7 +658,7 @@ zh-TW:
       no_services: "你還沒有任何已連結的服務."
       really_disconnect: "切斷與 %{service} 的連結?"
     inviter: 
-      click_link_to_accept_invitation: "按一下這個連結來接受邀請"
+      click_link_to_accept_invitation: "使用這個連結來接受邀請"
       join_me_on_diaspora: "跟我一起加入 DIASPORA*"
     remote_friend: 
       invite: "邀請"
diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml
index 8f2f46179933f98a63d0be8178efa83e3e0edabf..bdf2504d93f77248b88d55481e9893cda8752a90 100644
--- a/config/locales/javascript/javascript.de.yml
+++ b/config/locales/javascript/javascript.de.yml
@@ -7,13 +7,13 @@ de:
   javascripts: 
     aspect_dropdown: 
       add_to_aspect: "Zu Aspekt hinzufügen"
-      all_aspects: "All aspects"
+      all_aspects: "Alle Aspekte"
       toggle: 
         few: "In {{count}} Aspekten"
         many: "In {{count}} Aspekten"
         one: "In einem Aspekt"
         other: "In {{count}} Aspekten"
-        two: "In {{count}} aspects"
+        two: "In {{count}} Aspekten"
         zero: "Zu Aspekt hinzufügen"
     comments: 
       hide: "Kommentare verbergen"
diff --git a/config/locales/javascript/javascript.nb.yml b/config/locales/javascript/javascript.nb.yml
index f2bb9d7177d5154b077113c112ede56ff0ba5e11..a3b3248dee45d09beb30e42772e44333ca36f6af 100644
--- a/config/locales/javascript/javascript.nb.yml
+++ b/config/locales/javascript/javascript.nb.yml
@@ -16,13 +16,13 @@ nb:
         two: "In {{count}} aspects"
         zero: "Add to aspect"
     comments: 
-      hide: "hide comments"
-      show: "show all comments"
+      hide: "skjul kommentarer"
+      show: "vis alle kommentarer"
     confirm_dialog: "Er du sikker?"
     failed_to_like: "Failed to like!"
     failed_to_post_message: "Failed to post message!"
     infinite_scroll: 
-      no_more: "No more posts."
+      no_more: "Ingen flere innlegg."
     publisher: 
       at_least_one_aspect: "Du må poste til minst ett aspekt"
       limited: "Limited - your post will only be seen by people you are sharing with"
@@ -30,7 +30,7 @@ nb:
     reshares: 
       duplicate: "You've already reshared that post!"
     search_for: "Søk etter {{name}}"
-    show_more: "show more"
+    show_more: "vis mer"
     timeago: 
       day: "en dag"
       days: "%d dager"
diff --git a/config/locales/javascript/javascript.sv.yml b/config/locales/javascript/javascript.sv.yml
index 3e34b1aedeb09a1cd5d9aa704b859e5895145af5..fd7ace44674def4cc75356670886d4509c9fcc2e 100644
--- a/config/locales/javascript/javascript.sv.yml
+++ b/config/locales/javascript/javascript.sv.yml
@@ -6,18 +6,18 @@
 sv: 
   javascripts: 
     aspect_dropdown: 
-      add_to_aspect: "Add to aspect"
-      all_aspects: "All aspects"
+      add_to_aspect: "Lägg till i aspekt"
+      all_aspects: "Alla aspekter"
       toggle: 
-        few: "In {{count}} aspects"
-        many: "In {{count}} aspects"
-        one: "In {{count}} aspect"
-        other: "In {{count}} aspects"
-        two: "In {{count}} aspects"
-        zero: "Add to aspect"
+        few: "I {{count}} aspekter"
+        many: "I {{count}} aspekter"
+        one: "I {{count}} aspekt"
+        other: "I {{count}} aspekter"
+        two: "I {{count}} aspekter"
+        zero: "Lägg till i aspekt"
     comments: 
-      hide: "hide comments"
-      show: "show all comments"
+      hide: "dölj kommentarer"
+      show: "visa alla kommentarer"
     confirm_dialog: "Är du säker?"
     failed_to_like: "Failed to like!"
     failed_to_post_message: "Failed to post message!"
@@ -49,6 +49,6 @@ sv:
       years: "%d år"
     videos: 
       unknown: "Okänd videotyp"
-      watch: "Se denhär videon på {{provider}}"
+      watch: "Se den här videon på {{provider}}"
     web_sockets: 
       disconnected: "Webbsockeln är stängd; inlägg kommer inte längre att bli direktstreamade."
diff --git a/config/locales/javascript/javascript.tr.yml b/config/locales/javascript/javascript.tr.yml
index a507bbe6edc25e0869edec65ac0b802ce962bbea..51a2483228e93ecc52e72690630ece7ebfec3019 100644
--- a/config/locales/javascript/javascript.tr.yml
+++ b/config/locales/javascript/javascript.tr.yml
@@ -6,31 +6,31 @@
 tr: 
   javascripts: 
     aspect_dropdown: 
-      add_to_aspect: "Add to aspect"
-      all_aspects: "All aspects"
+      add_to_aspect: "Yönüne ekle"
+      all_aspects: "Tüm yönler"
       toggle: 
-        few: "In {{count}} aspects"
-        many: "In {{count}} aspects"
-        one: "In {{count}} aspect"
-        other: "In {{count}} aspects"
-        two: "In {{count}} aspects"
-        zero: "Add to aspect"
+        few: "{{count}} yön"
+        many: "{{count}} yön"
+        one: "{{count}} yön"
+        other: "{{count}} yön"
+        two: "{{count}} yön"
+        zero: "Yönüne ekle"
     comments: 
-      hide: "hide comments"
-      show: "show all comments"
+      hide: "yorumları gizle"
+      show: "tüm yorumları görüntüle"
     confirm_dialog: "Emin misiniz?"
-    failed_to_like: "Failed to like!"
-    failed_to_post_message: "Failed to post message!"
+    failed_to_like: "Beğenme başarısız oldu!"
+    failed_to_post_message: "Gönderi başarısız oldu!"
     infinite_scroll: 
-      no_more: "No more posts."
+      no_more: "Daha fazla gönderi yok."
     publisher: 
-      at_least_one_aspect: "You must publish to at least one aspect"
-      limited: "Limited - your post will only be seen by people you are sharing with"
-      public: "Public - your post will be visible to everyone and found by search engines"
+      at_least_one_aspect: "En az bir yönün yayınlanmak zorundadır"
+      limited: "Sınırlı - gönderi sadece paylaşılan kişiler tarafından görünür"
+      public: "Genel - gönderi herkes tarafından görünür ve arama motorları tarafından bulunur olacak"
     reshares: 
-      duplicate: "You've already reshared that post!"
+      duplicate: "Zaten bu gönderiyi tekrar paylaştın!"
     search_for: "{{name}}'i ara"
-    show_more: "show more"
+    show_more: "daha fazlasını göster"
     timeago: 
       day: "1 gün"
       days: "%d günler"
@@ -51,4 +51,4 @@ tr:
       unknown: "Bilinmeyen video tipi"
       watch: "Bu videoyu {{provider}}'da izle"
     web_sockets: 
-      disconnected: "The websocket is closed; posts will no longer be streamed live."
+      disconnected: "Websocket kapalı; gönderiler bundan sonra canlı akış olacak."