updated locales [ci skip]

67 files changed, 547 insertions, 897 deletions

diff --git a/config/locales/devise/devise.de.yml b/config/locales/devise/devise.de.yml
index 03503d445..127124c9a 100644
--- a/config/locales/devise/devise.de.yml
+++ b/config/locales/devise/devise.de.yml
@@ -88,7 +88,7 @@ de:
     sessions:
       new:
         alpha_software: "Diese Software befindet sich im Alpha-Stadium."
-        bugs_and_feedback: "Sei gewarnt, Fehler werden auftreten. Wir empfehlen dir, den Feedback-Knopf am rechten Browserrand zu nutzen, um alle Störungen zu berichten. Wir werden so schnell wir können arbeiten, um alle Probleme, die du meldest, zu lösen."
+        bugs_and_feedback: "Eine Warnung vorweg: Es gibt noch Bugs. Am besten du benutzt den Feedback Button auf der rechten Seite deines Browsers, um uns über die Probleme aufzuklären. Wir versuchen, diese so schnell wie möglich zu berichtigen."
         bugs_and_feedback_mobile: "Sei gewarnt, Fehler werden auftreten. Wir empfehlen dir, alle Störungen zu melden! Wir werden so schnell wir können arbeiten, um alle Probleme, die du meldest, zu lösen."
         login: "Anmelden"
         modern_browsers: "unterstützt nur moderne Browser."
diff --git a/config/locales/devise/devise.es-MX.yml b/config/locales/devise/devise.es-MX.yml
index a2eea2344..65e48a357 100644
--- a/config/locales/devise/devise.es-MX.yml
+++ b/config/locales/devise/devise.es-MX.yml
@@ -39,7 +39,7 @@ es-MX:
         email_address: "questions@joindiaspora.com"
         email_us: "Para consultas generales o soporte acerca de tu cuenta de Diaspora, por favor envíanos un correo electrónico a %{email}."
         finally: "Por fin – Está aquí"
-        friends_saying: "Lo que están diciendo tus amigos…"
+        friends_saying: "Lo que están diciendo tus contactos…"
         get_connected: "Conéctate"
         get_connected_paragraph: "Un movimiento internacional que comparte la visión de una red mejor, la principal característica de %{strong_diaspora} es su comunidad. Conoce gente nueva, conéctate con amigos, y únete a la diversión."
         have_fun: "Diviértete"
@@ -73,7 +73,7 @@ es-MX:
         click_to_unlock: "Haz click en siguiente enlace para desbloquear tu cuenta:"
         subject: "Instrucciones de desbloqueo"
         unlock: "Desbloquear mi cuenta"
-      welcome: "¡Bienvenido %{email}!"
+      welcome: "¡Bienvenido/a %{email}!"
     passwords:
       edit:
         change_password: "Cambiar mi contraseña"
diff --git a/config/locales/devise/devise.es.yml b/config/locales/devise/devise.es.yml
index 659da3a8b..ea92542df 100644
--- a/config/locales/devise/devise.es.yml
+++ b/config/locales/devise/devise.es.yml
@@ -43,7 +43,7 @@ es:
         get_connected: "Conéctate"
         get_connected_paragraph: "Un movimiento mundial que comparte la visión de conseguir una red mejor, la primera característica de %{strong_diaspora} es su comunidad. Conoce gente nueva, conecta con amigos y únete a la fiesta."
         have_fun: "Diviértete"
-        have_fun_paragraph: "%{strong_diaspora} trata de descubrir tanto nueva e interesante información como gente conectada. %{Link}, la primera aplicación de %{strong_diaspora} en el mundo es solo el principio. Colecciona y comparte la red en todo su esplendor."
+        have_fun_paragraph: "Con %{strong_diaspora} descubrirás información y gente nueva e interesante. %{link}, la primera aplicación de %{strong_diaspora} del mundo es sólo el principio. Colecciona y comparte la red en todo su esplendor."
         help_fund: "ayuda a financiar Diaspora*"
         here: "aquí"
         ignore: "Si no quieres aceptar la invitación, ignora este email."
@@ -85,7 +85,7 @@ es:
       updated: "Tu contraseña ha sido modificada. Ya has accedido a tu cuenta."
     registrations:
       destroyed: "¡Adiós! Tu cuenta ha sido cancelada. Esperamos volver a verte pronto."
-      signed_up: "Te has registrado con éxito. Un mensaje de confirmación ha sido enviado a tu email."
+      signed_up: "Te has registrado con éxito. En cuanto se valide el registro recibirás un mensaje de confirmación en tu dirección de correo electrónico."
       updated: "Has actualizado tu cuenta con éxito."
     sessions:
       new:
diff --git a/config/locales/devise/devise.fi.yml b/config/locales/devise/devise.fi.yml
index 338f43e75..ca79c6dd8 100644
--- a/config/locales/devise/devise.fi.yml
+++ b/config/locales/devise/devise.fi.yml
@@ -34,7 +34,9 @@ fi:
         arrived: "Odottamasi sosiaalinen verkosto on täällä. Uudistettu, entistä turvallisempi ja hauskempi %{strong_diaspora} auttaa sinua kokemaan ja jakamaan internetin kokonaan uudella tavalla."
         be_yourself: "Ole oma itsesi"
         be_yourself_paragraph: "Internet on luonut uusia, ainutlaatuisia tapoja ilmaista itseämme. %{strong_diaspora}ssa voit olla oma itsesi ja jakaa sisältöä kuten haluat, omalla nimelläsi tai ilman."
+        cubbies: "Cubbi.es"
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
         email_us: "Voit lähettää yleisluontoiset Diaspora-tiliisi liittyvät tiedustelut ja tukipyynnöt osoitteeseen %{email}."
         finally: "Vihdoinkin – se on täällä"
         friends_saying: "Mitä ystäväsi sanovat..."
diff --git a/config/locales/devise/devise.hu.yml b/config/locales/devise/devise.hu.yml
index 6063019fe..61f5d7a72 100644
--- a/config/locales/devise/devise.hu.yml
+++ b/config/locales/devise/devise.hu.yml
@@ -15,7 +15,7 @@ hu:
       inactive: "A fiókod nem aktiváltad még."
       invalid: "Érvénytelen felhasználónév vagy jelszó."
       invalid_token: "Érvénytelen hitelesítési token."
-      locked: "A fiókod le van zárva."
+      locked: "A fiókod zárolva van."
       timeout: "A munkamenet lejárt, kérjük jelentkezz be újra."
       unauthenticated: "Be kell jelentkezned, vagy regisztrálj."
       unconfirmed: "Előbb meg kell erősítened fiókodat."
diff --git a/config/locales/devise/devise.it.yml b/config/locales/devise/devise.it.yml
index a6def2c78..e58df2906 100644
--- a/config/locales/devise/devise.it.yml
+++ b/config/locales/devise/devise.it.yml
@@ -21,7 +21,7 @@ it:
       unconfirmed: "Devi confermare il tuo account prima di continuare."
     invitations:
       invitation_token_invalid: "Il codice d'invito che hai fornito non è valido!"
-      send_instructions: "Il tuo invito è stato inoltrato."
+      send_instructions: "Il tuo invito è stato spedito."
       updated: "La tua password è stata impostata correttamente. Hai effettuato l'accesso."
     mailer:
       confirmation_instructions:
@@ -31,7 +31,7 @@ it:
       hello: "Ciao %{email}!"
       invitation_instructions:
         accept: "Accetta l'invito"
-        arrived: "Il social network che stavi aspettando è arrivato. Rinnovato, più sicuro e più divertente, %{strong_diaspora} è pronto ad aiutarti nel condividere ed esplorare la rete in un modo tutto nuovo."
+        arrived: "Il social network che stavi aspettando è arrivato. Rinnovato, più sicuro e più divertente, %{strong_diaspora} è pronto ad aiutarti a condividere e a esplorare la rete in un modo tutto nuovo."
         be_yourself: "Sii te stesso"
         be_yourself_paragraph: "Internet ha creato nuovi modi per poterci esprimere. %{strong_diaspora} ti permette di essere te stesso e di condividere come vuoi tu, con o senza il tuo vero nome."
         cubbies: "Cubbi.es"
@@ -46,7 +46,7 @@ it:
         have_fun_paragraph: "%{strong_diaspora} è fatta per sorprenderti con nuovi contenuti e nuove persone online. %{link}, la prima applicazione al mondo per %{strong_diaspora}, è solo l'inizio. Colleziona e condividi quel che trovi in rete in tutto il suo splendore."
         help_fund: "aiuta a finanziare Diaspora"
         here: "qui"
-        ignore: "Se non vuoi accettare l'invito, per favore ignora questa email."
+        ignore: "Se non vuoi accettare l'invito, ignora pure questa email."
         join_team: "Entra nel nostro team"
         love: "Con affetto,"
         made_by_people: "%{strong_diaspora} è fatta di persone che amano internet tanto quanto te. %{jointeam}, o %{helpfund}!"
@@ -72,14 +72,14 @@ it:
         account_locked: "Il tuo account è stato bloccato per i troppi tentativi di accesso falliti."
         click_to_unlock: "Clicca il link sottostante per sbloccare il tuo account:"
         subject: "Istruzioni di sblocco"
-        unlock: "sblocca il mio account"
+        unlock: "Sblocca il mio account"
       welcome: "Benvenuto %{email}!"
     passwords:
       edit:
         change_password: "Cambia la mia password"
       new:
         forgot_password: "Hai dimenticato la password?"
-        no_account: "Non esiste un account per questo indirizzo email. Se sei in attesa di un invito, sappi che li stiamo spedendo il più velocemente possibile."
+        no_account: "Non esiste un account per questo indirizzo email. Se sei in attesa di un invito, considera che li stiamo spedendo il più velocemente possibile."
         send_password_instructions: "Inviami le istruzioni per reimpostare la password."
       send_instructions: "Tra pochi minuti riceverai una email con le istruzioni su come cambiare la tua password."
       updated: "La tua password è stata modificata. Hai appena effettuato l'accesso."
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 4a18511bd..c566cb0db 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -186,7 +186,6 @@ ar:
       success: "لنرى ماذا لديهم ليقولوه! # قل مرحباً"
   bookmarklet:
     explanation: "%{link} انشر في دياسبرا من أي مكان بحفظ الرابط في مفضلتك/علاماتك"
-    explanation_link_text: "هذا الرابط"
     heading: "زر المفضلة"
     post_something: "انشر شيئا على دياسبرا"
     post_success: "تم النشر, إغلاق!"
@@ -275,20 +274,6 @@ ar:
   fill_me_out: "إملأني"
   find_people: "ابحث عن الأصدقاء أو #الوسوم"
   hide: "آَخْفِ"
-  home:
-    show:
-      already_account: "لديك حساب؟"
-      choice: "خيار"
-      choice_explanation: "دياسبرا تسمح لك بتصنيف مراسليك إلى مجموعات تدعى الفئات. حصريا في دياسبرا، الفئات تضمن أن صورك، قصصك، طرائفك المنشورة لا تصل إلا إلى من تريد أنت أن تصلهم"
-      learn_about_host: "تعلم كيفية استضافة سيرفر دياسبرا الخاص بك"
-      login_here: "سجل دخولك هنا"
-      ownership: "ملكية"
-      ownership_explanation: "صورك هي ملكية خاصة لك، وليس عليك التخلي عن ملكيتها بمجرد مشاركتها. لك الملكية المطلقة لكل ما تشاركه في دياسبرا، نعطيك كل الصلاحيات في كيفية مشاركتها."
-      share_what_you_want: "شارك ما تريد، مع من تريد"
-      simplicity: "بساطة"
-      simplicity_explanation: "مع دياسبرا المشاركة والخصوصية هي ترادف للسهولة والشفافية. دياسبرا صنعت لاحترام الخصوصية، فليس وجوبا عليك الخوص في صفحات عديدة من الإعدادات والخيارات لتبقي حسابك آمنا وكما تريده."
-      tagline_first_half: "شارك ما تريد،"
-      tagline_second_half: "مع من تريد."
   invitations:
     a_facebook_user: "مستخدم فايسبوك"
     check_token:
@@ -473,10 +458,9 @@ ar:
           مرحباً!
           لقد تمت دعوتك لتنضم إلى دياسبرا*!
           إضغط على هذا الرابط لتبدأ
-          [%{invite_url}][1]
+          %{invite_url}
           مع الحب،
           البريد الالكترونى اﻵلى لدياسبرا*
-          [1]: %{invite_url}
     liked:
       liked: "%{name} أعجبته مشاركتك."
       view_post: "عرض المشاركة >"
@@ -962,4 +946,4 @@ ar:
   welcome: "مرحبا!"
   will_paginate:
     next_label: "التالى >>"
-    previous_label: "<< السابق"
+    previous_label: "<< السابق"
\ No newline at end of file
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index 736eb5160..e1d336403 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -172,7 +172,6 @@ bg:
       success: "Какво ли ще кажат! #sayhello"
   bookmarklet:
     explanation: "Публикувайте в Diaspora от където и да е, запаметявайки %{link} като отметка."
-    explanation_link_text: "тази връзка"
     post_something: "Публикуване в Diaspora"
     post_success: "Публикувано!"
   cancel: "Отказ"
@@ -260,20 +259,6 @@ bg:
   fill_me_out: "Попълнете ме"
   find_people: "Намерете хора или #марки"
   hide: "Скриване"
-  home:
-    show:
-      already_account: "вече имате акаунт?"
-      choice: "Избор"
-      choice_explanation: "Diaspora предоставя възможност за сортиране на контактите в групи, наречени аспекти. Уникални за Diaspora, те позволяват споделянето на снимки, истории и шеги само с хората, за които са предвидени.\n"
-      learn_about_host: "Научете как да стартирате Diaspora на собствен сървър."
-      login_here: "впишете се от тук"
-      ownership: "Собственост"
-      ownership_explanation: "Вие притежавате снимките си и не е необходимо да се отказвате от това си право само за да ги споделите. Запазвате собственост върху всичко, което споделяте в Diaspora и контролирате разпространението."
-      share_what_you_want: "Споделяйте каквото желаете, с когото пожелаете."
-      simplicity: "Леснота"
-      simplicity_explanation: "Споделянето чрез Diaspora е просто и лесно. Характерно за Diaspora е, че запазва личния ви живот поверителен без нужда от настройване на различни страници с безброй опции."
-      tagline_first_half: "Споделете каквото желаете,"
-      tagline_second_half: "с когото пожелаете."
   invitations:
     a_facebook_user: "Потребител на Facebook"
     check_token:
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index 99d553ba1..40290846f 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -71,7 +71,6 @@ br:
   back: "Distreiñ"
   bookmarklet:
     explanation: "%{link} adalek pep lec'h dre lakaat al liamm-se e-barzh ho sinedoù."
-    explanation_link_text: "Embann e-barzh Diaspora"
     heading: "Diaspora Bookmarklet"
     post_something: "Embann un dra bennak e-barzh Diaspora"
     post_success: "Embannet! O serriñ!"
@@ -118,9 +117,6 @@ br:
   email: "Postel"
   find_people: "Find people"
   hide: "Kuzhaat"
-  home:
-    show:
-      choice: "Dibab"
   invitations:
     check_token:
       not_found: "Ar bilhed-pediñ n'eo ket bet kaset"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index b689bc1b1..006155c3a 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -168,7 +168,6 @@ cs:
       success: "Tak ať tedy řekne, co má na srdci!  #pozdrav"
   bookmarklet:
     explanation: "Pište na Diasporu odkudkoliv pomocí %{link}."
-    explanation_link_text: "tohoto odkazu"
     post_something: "Poslat něco na Diasporu"
     post_success: "Odesláno! Zavírám!"
   cancel: "Zrušit"
@@ -244,20 +243,6 @@ cs:
   fill_me_out: "Vyplňte"
   find_people: "Najít lidi nebo #štítky"
   hide: "Skrýt"
-  home:
-    show:
-      already_account: "máte již účet?"
-      choice: "Volba"
-      choice_explanation: "Diaspora Vám umožňuje přiřadit si všechny Vaše kontakty do skupin, které se nazývají aspekty. Ty jsou unikátní právě tím, že dokáží zabezpečit, aby k vašim fotkám, zprávám a stavům měli přístup jen ti, u kterých to máte v úmyslu."
-      learn_about_host: "Dozvědět se o více o tom, jak zprovoznit svůj vlastní Diaspora server."
-      login_here: "přihlásit se zde"
-      ownership: "Vlastnictví"
-      ownership_explanation: "Vaše obrázky jsou Vaším vlastnictvím. Neměli byste se ho zříkat jen kvůli tomu, že je chcete sdílet. Zachovejte si vlastnická práva ke všemu, co zveřejňujete na Diaspoře. Jen tak Vám zůstane plná kontrola nad tím, jak se s nimi nakládá."
-      share_what_you_want: "Sdílejte, co chcete, s kým chcete."
-      simplicity: "Jednoduchost"
-      simplicity_explanation: "Sdílení je v Diaspoře velmi lehké a transparentní — a to je i záruka Vašeho soukromí. Diaspora neobsahuje žádné složité stránky s nastavením, nastavení soukromí nevyjímaje, kterými byste se museli prokouskávat, abyste uchovali svůj profil v bezpečí podle svých představ."
-      tagline_first_half: "Sdílejte, co chcete,"
-      tagline_second_half: "s kým chcete."
   invitations:
     a_facebook_user: "Uživatel Facebooku"
     check_token:
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 5c3c226d1..e3cd58473 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -78,7 +78,6 @@ cy:
       success: "Ôlreit, ni fyddwch yn gweld y defnyddiwr yn eich ffrwd yn y dyfodol. #silencio!"
   bookmarklet:
     explanation: "%{link} from anywhere by bookmarking this link."
-    explanation_link_text: "Post to Diaspora"
     heading: "Diaspora Bookmarklet"
   cancel: "Diddymu"
   comments:
@@ -119,12 +118,6 @@ cy:
   delete: "Dileu"
   email: "E-bost"
   find_people: "Dod o hyd i bobl neu # tagiau"
-  home:
-    show:
-      choice_explanation: "Diaspora allows you to sort your connections into groups called Aspects - (agweddau yng nghymraeg). 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"
-      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."
-      simplicity_explanation: "Diaspora makes sharing clean and easy – this goes doubly so for privacy. Innherently private, Diaspora doesn’t have pages of settings and options to wade through to keep your profile secure and to your liking."
   invitations:
     create:
       sent: "Your invitation has been sent."
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index e9c6469b3..7a89addbb 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -173,7 +173,6 @@ da:
       success: "Se hvad de har at sige! #sayhello"
   bookmarklet:
     explanation: "Skriv indlæg på Diaspora fra hvor som helst ved at bookmarke %{link}."
-    explanation_link_text: "dette link"
     post_something: "Post noget til Diaspora"
     post_success: "Posted! Lukker!"
   cancel: "Annullér"
@@ -259,20 +258,6 @@ da:
   fill_me_out: "Udfyld mig"
   find_people: "Find venner eller #tags"
   hide: "Skjul"
-  home:
-    show:
-      already_account: "har du allerede en konto?"
-      choice: "Vælg"
-      choice_explanation: "Diaspora lader dig sortere dine kontakter i grupper kaldet aspekter. Diaspora er unik idet aspekter sikrer at dine billeder, historier og vittigheder kun er delt med dem du vil. "
-      learn_about_host: "Se hvordan man hoster sin egen Diaspora server."
-      login_here: "log ind her"
-      ownership: "Ejerskab"
-      ownership_explanation: "Du ejer dine billeder, og burde ikke opgive rettighederne over dem bare for at dele dem. Du beholder ejerskab over alt du deler på Diaspora, hvilket giver dig fuld kontrol over hvordan det bliver distribueret."
-      share_what_you_want: "Del hvad du vil med hvem du vil."
-      simplicity: "Enkelhed"
-      simplicity_explanation: "Diaspora gør deling enkelt og ligetil - især for dit privatliv. Ved at være grundlæggende privat, undgår Diaspora at du skal bladre gennem sider med indstillinger og valgmuligheder for at holde din profil sikker og efter dit hovede."
-      tagline_first_half: "Del hvad du vil,"
-      tagline_second_half: "med hvem du vil."
   invitations:
     a_facebook_user: "En Facebook-bruger"
     check_token:
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 31a872f85..1946a2062 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -48,6 +48,13 @@ de:
       resque_overview: "Resque Übersicht"
       user_search: "Benutzer Suche"
       weekly_user_stats: "Wöchentliche Benutzerstatistik"
+    user_search:
+      add_invites: "Einladungen hinzufügen"
+      users:
+        one: "%{count} Benutzer gefunden"
+        other: "%{count} Benutzer gefunden"
+        zero: "%{count} Benutzer gefunden"
+      you_currently: "du hast noch %{user_invitation} Einladungen übrig %{link}"
   ago: "Vor %{time}"
   all_aspects: "Alle Aspekte"
   application:
@@ -190,7 +197,6 @@ de:
       success: "Mal sehen was sie zu sagen haben! #sayhello"
   bookmarklet:
     explanation: "Erstelle von überall einen Beitrag in Diaspora, indem du %{link} als Lesezeichen speicherst."
-    explanation_link_text: "diesen Link"
     post_something: "Erstelle einen Beitrag in Diaspora"
     post_success: "Erstellt! Schließen …"
   cancel: "Abbrechen"
@@ -280,20 +286,6 @@ de:
   fill_me_out: "Füll’ mich aus"
   find_people: "Leute oder #Tags finden"
   hide: "Ausblenden"
-  home:
-    show:
-      already_account: "bereits registriert?"
-      choice: "Deine Entscheidung"
-      choice_explanation: "Diaspora lässt dich deine Kontakte in Gruppen einordnen, sogenannte Aspekte. Deine Fotos, Geschichten und Witze werden durch diese Aspekte nur mit den Menschen geteilt, für die sie gedacht sind – einzigartig bei Diaspora."
-      learn_about_host: "Du willst deinen eigenen Diaspora-Server betreiben?"
-      login_here: "hier anmelden"
-      ownership: "Dein Eigentum"
-      ownership_explanation: "Deine Bilder gehören dir. Um sie zu teilen, musst du darauf nicht verzichten: Alles, was du auf Diaspora teilst, bleibt dein Eigentum – mit voller Kontrolle über die Verbreitung."
-      share_what_you_want: "Teile was du willst, mit wem du willst."
-      simplicity: "Ganz einfach"
-      simplicity_explanation: "Diaspora macht das Teilen von Inhalten klar und einfach – dasselbe gilt für den Schutz deiner Privatsphäre. Diaspora ist von sich aus privat, seitenweise Einstellungen für die Profilsicherheit sind nicht nötig."
-      tagline_first_half: "Teile was du willst,"
-      tagline_second_half: "mit wem du willst."
   invitation_codes:
     excited: "%{name} freut sich dich hier zu sehen."
   invitations:
@@ -491,14 +483,12 @@ de:
 
           Klick auf diesen Link um loszulegen
 
-          [%{invite_url}][1]
+          %{invite_url}
 
 
           Alles Liebe,
 
           der Diaspora* E-Mail Roboter!
-
-          [1]: %{invite_url}
     invited_you: "%{name} hat Dich zu Diaspora* eingeladen"
     liked:
       liked: "%{name} gefällt dein Beitrag"
@@ -678,10 +668,11 @@ de:
       password_to_confirm: "(wir brauchen dein aktuelles Kennwort, um deine Änderungen zu bestätigen)"
       unhappy: "Unglücklich?"
       update: "Aktualisieren"
+    invalid_invite: "Der von dir erstellte Einladungs-Link ist nicht mehr gültig!"
     new:
       create_my_account: "Konto erstellen!"
       enter_email: "Gib eine E-Mail-Adresse an"
-      enter_password: "Gib ein Kennwort ein"
+      enter_password: "Gib ein Kennwort ein (mindestens sechs Zeichen)"
       enter_password_again: "Gib das gleiche Kennwort wie zuvor ein"
       enter_username: "Wähle einen Nutzernamen (nur Buchstaben, Nummern und Unterstriche)"
       join_the_movement: "Tritt der Bewegung bei!"
diff --git a/config/locales/diaspora/de_formal.yml b/config/locales/diaspora/de_formal.yml
index f29e949bc..b8d879abe 100644
--- a/config/locales/diaspora/de_formal.yml
+++ b/config/locales/diaspora/de_formal.yml
@@ -175,7 +175,6 @@ de_formal:
       success: "Sehen Sie, was diese zu sagen haben! #sayhello"
   bookmarklet:
     explanation: "Erstellen Sie einen Beitrag in Diaspora von überall, in dem Sie %{link} als Lesezeichen speichern."
-    explanation_link_text: "diesen Link"
     post_something: "Erstellen Sie einen Beitrag in Diaspora"
     post_success: "Erstellt! Schließen …"
   cancel: "Abbrechen"
@@ -261,20 +260,6 @@ de_formal:
   fill_me_out: "Füllen Sie mich aus"
   find_people: "Leute oder #Tags finden"
   hide: "Ausblenden"
-  home:
-    show:
-      already_account: "bereits registriert?"
-      choice: "Ihre Entscheidung"
-      choice_explanation: "Diaspora lässt Sie Ihre Kontakte in Gruppen einordnen, sogenannte Aspekte. Ihre Fotos, Geschichten und Witze werden durch diese Aspekte nur mit den Menschen geteilt, für die sie gedacht sind – einzigartig bei Diaspora."
-      learn_about_host: "Wollen Sie Ihren eigenen Diaspora-Server betreiben?"
-      login_here: "hier anmelden"
-      ownership: "Ihr Eigentum"
-      ownership_explanation: "Ihre Bilder gehören Ihnen. Um sie zu teilen, müssen Sie darauf nicht verzichten: Alles, was Sie auf Diaspora teilen, bleibt Ihr Eigentum – mit voller Kontrolle über die Verbreitung."
-      share_what_you_want: "Teilen Sie was Sie wollen, mit wem Sie wollen."
-      simplicity: "Ganz einfach"
-      simplicity_explanation: "Diaspora macht das Teilen von Inhalten klar und einfach – dasselbe gilt für den Schutz Ihrer Privatsphäre. Diaspora ist von sich aus privat, seitenweise Einstellungen für die Profilsicherheit sind nicht nötig."
-      tagline_first_half: "Teilen Sie was Sie wollen,"
-      tagline_second_half: "mit wem Sie wollen."
   invitations:
     a_facebook_user: "Ein Facebook Nutzer"
     check_token:
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index cb975a97a..7c528bd69 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -183,7 +183,6 @@ el:
       success: "Για να δούμε τι έχουν να πουν! #sayhello"
   bookmarklet:
     explanation: "Δημοσιεύστε στο Diaspora από οπουδήποτε προσθέτοντας %{link}."
-    explanation_link_text: "αυτόν τον σύνδεσμο"
     heading: "Σελιδοδείκτης"
     post_something: "Αναρτήστε κάτι στο Diaspora"
     post_success: "Αναρτήθηκε! Κλείνει!"
@@ -274,20 +273,6 @@ el:
   fill_me_out: "Ενημέρωσε με"
   find_people: "Βρείτε άτομα ή #ετικέτες"
   hide: "Απόκρυψη"
-  home:
-    show:
-      already_account: "έχετε ήδη λογαριασμό;"
-      choice: "Επιλογή"
-      choice_explanation: "Το Diaspora σας επιτρέπει να ταξινομήσετε τις συνδέσεις σας σε ομάδες που καλούνται πτυχές. Μοναδικές στο Diaspora, οι πτυχές εξασφαλίζουν ότι οι φωτογραφίες, οι ιστορίες και τα αστεία σας μοιράζονται μόνο με τους ανθρώπους που εσείς θέλετε."
-      learn_about_host: "Μάθετε για το πώς να φιλοξενήσετε το δικό σας διακομιστή Diaspora."
-      login_here: "συνδεθείτε εδώ"
-      ownership: "Ιδιοκτησία"
-      ownership_explanation: "Οι φωτογραφίες σας είναι δική σας ιδιοκτησία και δεν πρέπει να κάνετε παραχωρήσεις, απλά και μόνο για  να τις μοιραστείτε. Στο Diaspora διατηρείτε την ιδιοκτησία για ό,τι μοιράζεστε, ενώ έχετε τον πλήρη έλεγχο για το πώς αυτό θα διανεμηθεί."
-      share_what_you_want: "Μοιραστείτε ό,τι θέλετε, με όποιον θέλετε."
-      simplicity: "Απλότητα"
-      simplicity_explanation: "Το Diaspora σας επιτρέπει να μοιράζεστε εύκολα και διάφανα – και αυτό ισχύει και για την ιδιωτικότητα σας. Από τη φύση του ιδιωτικό, το Diaspora δεν έχει σελίδες επί σελίδων με ρυθμίσεις και επιλογές ώστε να διατηρείτε το προφίλ σας ασφαλές."
-      tagline_first_half: "Μοιραστείτε ό,τι θέλετε,"
-      tagline_second_half: "με όποιον θέλετε."
   invitation_codes:
     excited: "Ο/Η %{name} χαίρεται που σε βλέπει εδώ."
   invitations:
@@ -483,14 +468,13 @@ el:
 
           Κάνε κλικ στο σύνδεσμο για να ξεκινήσεις
 
-          [%{invite_url}][1]
+          %{invite_url}
+          <%= invite_code_url(@invitation_code)%>
 
 
           Με Αγάπη,
 
           Το ρομπότ αυτόματης αποστολής e-mail του Diaspora*!
-
-          [1]: %{invite_url}
     invited_you: "O/H %{name} σε προσκάλεσε στο Diaspora*"
     liked:
       liked: "στο χρήστη %{name} αρέσει η δημοσίευση σας"
@@ -1003,4 +987,4 @@ el:
   welcome: "Καλωσήρθατε!"
   will_paginate:
     next_label: "επόμενο &raquo;"
-    previous_label: "&laquo; προηγούμενο"
+    previous_label: "&laquo; προηγούμενο"
\ No newline at end of file
diff --git a/config/locales/diaspora/en_1337.yml b/config/locales/diaspora/en_1337.yml
index f0b5aceae..0fcfb57bc 100644
--- a/config/locales/diaspora/en_1337.yml
+++ b/config/locales/diaspora/en_1337.yml
@@ -150,7 +150,6 @@ en_1337:
   back: "<-"
   bookmarklet:
     explanation: "5P4M FR0M 4NYWH3R3, 4NY71M3! %{link}."
-    explanation_link_text: "7H15 L1NK"
     heading: "B00KM4RKL37"
     post_something: "5P4M 50M37H1NG 2 D*"
     post_success: "5P4MM3D! CL051NG!"
@@ -230,20 +229,6 @@ en_1337:
   fill_me_out: "F1LL M3 0U7!"
   find_people: "F1ND N00B5 0R #74G5"
   hide: "PWN?"
-  home:
-    show:
-      already_account: "4LR34DY H4V3 4N 4CC0UN7?"
-      choice: "CH01C3"
-      choice_explanation: "D* L375 U 50R7 Y0UR N00B5 1N GR0UP5 C4LL3D 45P3C75! UN1QU3 70 D*, 45P3C75 3N5UR3 7H47 Y0UR 74RG375, J0K35 4ND PR0N 4R3 5H4R3D 0NLY W17H 7H3 N00B5 U W4N7 2!"
-      learn_about_host: "L34RN 4B0U7 H0W 2 H057 Y0UR 0WN D* 53RV3R!"
-      login_here: "L0G 1N H3R3!"
-      ownership: "0WN(3R5H1P)"
-      ownership_explanation: "U 0WN Y0UR PR0N, 4ND U 5H0ULDN7 H4V3 2 G1V3 7H47 UP JU57 2 5H4R3 17! U M41N741N 0WN3R5H1P 0N 3V3RY7H1NG U 5H4R3 0N D*, G1V1NG U FULL C0N7R0L 0V3R H0W 175 C0N7R1BU73D!"
-      share_what_you_want: "5P4M WH0 U W4N7, W17H WH47 U W4N7!"
-      simplicity: "51MPL1C17Y"
-      simplicity_explanation: "D* M4K35 5H4R1NG CL34N 4ND 345Y F0R N00B5 – 4ND 7H15 G035 F0R PR1V4CY 2! 1NH3R3N7LY PR1V473, D* D035N7 M4K3 U W4D3 7HR0UGH P5G35 0F 53771NG5 4ND 0P710N5 JU57 2 K33P Y0UR PR0F1L3 53CUR3!"
-      tagline_first_half: "5P4M WH0 U W4N7,"
-      tagline_second_half: "W17H WH47 U W4N7!"
   invitations:
     a_facebook_user: "4 F4C3B00K N00B!"
     check_token:
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index e5348d957..b5f906158 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -142,7 +142,6 @@ en_shaw:
   back: "𐑚𐑨𐑒"
   bookmarklet:
     explanation: "𐑐𐑴𐑕𐑑 𐑑 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑓𐑮𐑳𐑥 𐑨𐑯𐑦𐑢𐑺 𐑚𐑲 𐑚𐑫𐑒𐑥𐑸𐑒𐑦𐑙 %{link}."
-    explanation_link_text: "𐑞𐑦𐑕 𐑤𐑦𐑙𐑒"
     heading: "𐑚𐑫𐑒𐑥𐑸𐑒𐑤𐑧𐑑"
     post_something: "𐑐𐑴𐑕𐑑 𐑕𐑳𐑥𐑔𐑦𐑙 𐑑 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩"
     post_success: "𐑐𐑴𐑕𐑑𐑩𐑛! 𐑒𐑤𐑴𐑟𐑦𐑙!"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index baecc5805..9010ab906 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -178,7 +178,6 @@ eo:
       success: "Ni vidu kion ili emas diri! #sayhello"
   bookmarklet:
     explanation: "Vi povas afiŝi al DIASPORA* el ĉie per paĝosigno montranta al %{link}."
-    explanation_link_text: "ĉi tiu ligilo"
     heading: "Legosigneto"
     post_something: "Afiŝi ion al DIASPORA*"
     post_success: "Afiŝita! Fermanta!"
@@ -261,20 +260,6 @@ eo:
   fill_me_out: "Kompletu min"
   find_people: "Trovi homojn aŭ #etikedojn"
   hide: "Kaŝi"
-  home:
-    show:
-      already_account: "ĉu vi jam havas konton?"
-      choice: "Elekto"
-      choice_explanation: "DIASPORA* ebligas vin klasigi viajn kontaktojn en grupojn, kiuj nomiĝas „aspektoj“. Unike al DIASPORA*, aspektoj certigas, ke vi nur konigas viajn bildojn, rakontojn, kaj ŝercojn al homojal kiuj vi tion intencas."
-      learn_about_host: "Lernu pri kiel starigi propran Diaspora-servilon."
-      login_here: "ensalutu ĉi tie"
-      ownership: "Proprieto"
-      ownership_explanation: "Vi posedas viajn bildojn, kaj vi ne devus rezigni tiun, por konigi ilin. Vi ankoraŭ havas proprieton de ĉio, kiun vi konigas per Diaspora, donante al vi kompletan administradon pri kiel aĵoj disdoniĝas."
-      share_what_you_want: "Konigu kion vi volas, al kiu vi volas."
-      simplicity: "Simpleco"
-      simplicity_explanation: "DIASPORA* purigas kaj faciligas konigadon – kaj ankaŭ privatecon. DIASPORA* ne direktas tra multaj paĝoj de agordoj kaj opcioj por sekurigi vian profilon ĉar ĝi estas planita por privateco."
-      tagline_first_half: "Dividu kion vi volas,"
-      tagline_second_half: "kun kiu vi volas."
   invitations:
     a_facebook_user: "Facebook uzanto"
     check_token:
diff --git a/config/locales/diaspora/es-AR.yml b/config/locales/diaspora/es-AR.yml
index 325e0636e..f546bc040 100644
--- a/config/locales/diaspora/es-AR.yml
+++ b/config/locales/diaspora/es-AR.yml
@@ -50,6 +50,8 @@ es-AR:
       weekly_user_stats: "Estadísticas semanales de usuario"
     correlations:
       correlations_count: "Correlaciones con el conteo de inicio de sesión:"
+    stats:
+      go: "Ir"
     user_search:
       add_invites: "Añadir invitaciones"
       email_to: "Mandar invitación por correo electrónico a"
@@ -202,7 +204,6 @@ es-AR:
       success: "¡Veamos que tiene que decir! #dihola"
   bookmarklet:
     explanation: "Publicá algo en Diáspora* desde donde quieras agregando %{link} a tus marcadores."
-    explanation_link_text: "este enlace"
     heading: "Marcador"
     post_something: "Publicá algo en Diáspora*"
     post_success: "¡Publicado! Cerrando."
@@ -293,20 +294,6 @@ es-AR:
   fill_me_out: "Completame"
   find_people: "Encontrá gente o #tags"
   hide: "Ocultar"
-  home:
-    show:
-      already_account: "¿Ya tenés una cuenta?"
-      choice: "Elección"
-      choice_explanation: "Diáspora* te permite organizar conexiones en grupos llamados aspectos. Algo único de Diáspora*, los aspectos permiten que tus fotos, historias y bromas sean compartidas sólo con quien vos quieras."
-      learn_about_host: "Aprendé cómo hospedar tu propio servidor Diáspora*."
-      login_here: "conectate acá"
-      ownership: "Propiedad"
-      ownership_explanation: "Sos dueño de tus foto, y no deberías tener que cederlas sólo para compartirlas. Vos mantenés los derechos de cualquier cosa que compartas en Diáspora*, dándote control completo sobre cómo se distribuye."
-      share_what_you_want: "Compartí lo que quieras, con quien quieras."
-      simplicity: "Simplicidad"
-      simplicity_explanation: "Diáspora* hace que compartir sea fácil y transparente —y esto incluye la privacidad. Inherentemente privado, Diáspora* no te hace navegar en páginas de configuración y opciones sólo para mantener tu perfil seguro."
-      tagline_first_half: "Compartí lo que quieras,"
-      tagline_second_half: "con quien vos quieras."
   invitation_codes:
     excited: "%{name} está encantado de verte por aquí."
   invitations:
@@ -504,14 +491,12 @@ es-AR:
 
           Haz click en este enlace para comenzar
 
-          [%{invite_url}][1]
+          %{invite_url}
 
 
           Saludos,
 
           ¡El generador de correo automático de Diaspora*!
-
-          [1]: %{invite_url}
     invited_you: "¡%{name} te ha invitado a Diaspora*!"
     liked:
       liked: "A  %{name} le gustó tu publicación"
@@ -695,7 +680,7 @@ es-AR:
     new:
       create_my_account: "¡Crear mi cuenta!"
       enter_email: "Ingresá un correo electrónico"
-      enter_password: "Elegí una contraseña"
+      enter_password: "Ingresa una contraseña (seis caracteres mínimo)"
       enter_password_again: "Repetí la misma contraseña"
       enter_username: "Elegí un nombre de usuario (sólo letras, números y guión bajo)"
       join_the_movement: "Unite al movimiento!"
@@ -818,7 +803,7 @@ es-AR:
       visibility_dropdown: "Usa este menú para cambiar la visibilidad de tu publicación.  (Sugerimos hacer público el primero.)"
     publisher:
       all: "todo"
-      all_contacts: "agregar contactos"
+      all_contacts: "todos los contactos"
       discard_post: "Descartar publicación"
       make_public: "hacer público"
       new_user_prefill:
@@ -834,7 +819,7 @@ es-AR:
       upload_photos: "Subir fotos"
       whats_on_your_mind: "¿Qué tenés en mente?"
     reshare:
-      reshare: "Republicar"
+      reshare: "Compartir"
     stream_element:
       connect_to_comment: "Conecta con este usuario para comentar en su publicación"
       currently_unavailable: "Comentar no está actualmente disponible"
@@ -886,11 +871,11 @@ es-AR:
       title: "Posts Comentados"
     community_spotlight_stream: "Comunidad Creativa"
     followed_tag:
-      add_a_tag: "Añade un tag"
-      contacts_title: "Personas que usaron estos tags"
+      add_a_tag: "Añade una etiqueta"
+      contacts_title: "Personas que usaron estas etiquetas"
       follow: "Seguir"
-      title: "#Tags"
-    followed_tags_stream: "#Tags"
+      title: "#Etiquetas que sigues"
+    followed_tags_stream: "#Etiquetas que sigues"
     like_stream:
       contacts_title: "Personas de las que te gustan mensajes"
       title: "Tus preferidos"
@@ -905,7 +890,7 @@ es-AR:
       contacts_title: "Autores recientes"
       title: "Actividad Pública"
     tags:
-      contacts_title: "Gente que usó ese tag"
+      contacts_title: "Personas que usaron esta etiqueta"
       tag_prefill_text: "Sobre %{tag_name}... "
       title: "Mensajes tagueados: %{tags}"
   tag_followings:
@@ -1030,4 +1015,4 @@ es-AR:
   welcome: "¡Bienvenido!"
   will_paginate:
     next_label: "siguiente »"
-    previous_label: "« anterior"
+    previous_label: "« anterior"
\ No newline at end of file
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index bb290df47..0fde4ad60 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -177,7 +177,6 @@ es-CL:
       success: "Veamos que tienen para decir! #dihola"
   bookmarklet:
     explanation: "%{link} donde sea agregando a marcadores este link."
-    explanation_link_text: "Postea en Diaspora"
     heading: "Diaspora en tus marcadores"
     post_something: "Postea algo en Diaspora"
     post_success: "Posteado! Cerrando!"
@@ -260,20 +259,6 @@ es-CL:
   fill_me_out: "Complétame"
   find_people: "Buscar personas o #tags"
   hide: "Ocultar"
-  home:
-    show:
-      already_account: "¿Ya tienes una cuenta?"
-      choice: "Opción"
-      choice_explanation: "Diaspora te permite organizar conexiones en grupos llamados aspectos. En Diaspora, los aspectos aseguran que tus fotos, historias y bromas sean compartidas sólo con la gente que tu quieras."
-      learn_about_host: "Aprende como hostear tu propio servidor Diaspora."
-      login_here: "iniciar sesión aquí"
-      ownership: "Propiedad"
-      ownership_explanation: "Eres dueño de tus imágenes, y no deberías tener que cederlas sólo para compartirlas. Tú mantienes la propiedad sobre todo lo que compartas en Diaspora, dándote control total sobre lo que es distribuido."
-      share_what_you_want: "Comparte lo que quieras, con quien quieras."
-      simplicity: "Simpleza"
-      simplicity_explanation: "Diaspora hace que compartir sea transparente y fácil - y esto va por privacidad también. Inherentemente privado, Diaspora no te hace ir a través de configuraciones y opciones solo para mantener tu perfil seguro."
-      tagline_first_half: "Comparte lo que quieras,"
-      tagline_second_half: "con los que quiera."
   invitations:
     a_facebook_user: "Un usuario de Facebook"
     check_token:
diff --git a/config/locales/diaspora/es-MX.yml b/config/locales/diaspora/es-MX.yml
index f731fc072..70ec42ff9 100644
--- a/config/locales/diaspora/es-MX.yml
+++ b/config/locales/diaspora/es-MX.yml
@@ -5,7 +5,7 @@
 
 
 es-MX:
-  _applications: "Solicitudes"
+  _applications: "Aplicaciones"
   _comments: "Comentarios"
   _contacts: "Contactos"
   _home: "Inicio"
@@ -117,7 +117,7 @@ es-MX:
       cubbies:
         explanation: "Cubbi.es es la primera aplicación en desarrollo de Diaspora."
         heading: "Conectarse a Cubbi.es"
-        learn_more: "Aprende más"
+        learn_more: "Más información"
       diaspora_id:
         content_1: "Tu ID de Diaspora es:"
         content_2: "Dáselo a quien quieras y podrán encontrarte en Diaspora."
@@ -127,10 +127,10 @@ es-MX:
       help:
         do_you: "Tal vez:"
         email_feedback: "Si lo prefieres, envíanos tus opiniones a este %{link}."
-        feature_suggestion: "… sugieres una %{link}?"
-        find_a_bug: "… encontraste un %{link}?"
-        have_a_question: "… tienes una %{link}?"
-        here_to_help: "¡La comunidad de Diaspora está aquí!"
+        feature_suggestion: "- Sugieras una %{link}."
+        find_a_bug: "- Encuentres un %{link}."
+        have_a_question: "- Tengas una %{link}."
+        here_to_help: "¡La comunidad Diaspora está aquí!"
         need_help: "¿Necesitas ayuda?"
         tag_bug: "error"
         tag_feature: "idea"
@@ -140,9 +140,9 @@ es-MX:
       keep_diaspora_running: "¡Haz que el desarrollo de Diaspora siga yendo rápido con una donación mensual!"
       keep_pod_running: "¡Haz que %{pod} siga yendo rápido, y compra a nuestros servidores su dosis de café, con una donación mensual!"
       new_here:
-        follow: "¡Sigue %{link} y da la bienvenida a nuevos usuarios de Diaspora*!"
-        learn_more: "Aprende más"
-        title: "Da la bienvenida a nuevos usuarios"
+        follow: "¡Sigue %{link} y da la bienvenida a nuevos miembros de Diaspora*!"
+        learn_more: "Más información"
+        title: "Bienvenida"
       no_contacts: "No hay contactos"
       no_tags: "+ Encuentra una etiqueta para seguir"
       people_sharing_with_you: "Personas que comparten contigo"
@@ -151,7 +151,7 @@ es-MX:
         content: "Puedes conectar los siguientes servicios a Diaspora:"
         heading: "Conectar servicios"
       unfollow_tag: "Dejar de seguir #%{tag}"
-      welcome_to_diaspora: "¡Bienvenido a Diaspora, %{name}!"
+      welcome_to_diaspora: "¡Bienvenido/a a Diaspora, %{name}!"
     many: "%{count} aspectos"
     move_contact:
       error: "Error al mover el contacto: %{inspect}"
@@ -161,7 +161,7 @@ es-MX:
       create: "Crear"
       name: "Nombre (solo es visible para ti)"
     no_contacts_message:
-      community_spotlight: "lo más destacado de la comunidad"
+      community_spotlight: "Comunidad Creativa"
       or_spotlight: "O puedes compartir con %{link}"
       try_adding_some_more_contacts: "Puedes buscar o invitar a más contactos."
       you_should_add_some_more_contacts: "¡Deberías añadir algunos contactos!"
@@ -177,7 +177,7 @@ es-MX:
     selected_contacts:
       manage_your_aspects: "Gestiona tus aspectos."
       no_contacts: "Todavía no tienes ningún contacto aquí."
-      view_all_community_spotlight: "Ver lo más destacado de la comunidad"
+      view_all_community_spotlight: "Ver Comunidad Creativa"
       view_all_contacts: "Ver todos los contactos"
     show:
       edit_aspect: "editar aspecto"
@@ -203,10 +203,9 @@ es-MX:
       failure: "No pude dejar de ignorar a ese usuario. #evasion"
       success: "¡Veamos qué tienes que decir! #sayhello"
   bookmarklet:
-    explanation: "Publica en Diaspora desde donde quieras, agregando a tus marcadores %{link}."
-    explanation_link_text: "este enlace"
+    explanation: "Publica en Diaspora desde cualquier lugar, agregando a tus marcadores este enlace => %{link}."
     heading: "Marcador"
-    post_something: "Publica algo en Diaspora"
+    post_something: "Publica en Diaspora"
     post_success: "¡Publicado! ¡Cerrando!"
   cancel: "Cancelar"
   comments:
@@ -228,7 +227,7 @@ es-MX:
       add_to_aspect: "añade contactos a %{name}"
       add_to_aspect_link: "añade contactos a %{name}"
       all_contacts: "Todos los contactos"
-      community_spotlight: "Lo más destacado de la comunidad"
+      community_spotlight: "Comunidad Creativa"
       many_people_are_you_sure: "¿Estás seguro de que quieres iniciar una conversación privada con más de %{suggested_limit} contactos? Publicar en este aspecto puede ser una mejor manera de contactar con ellos."
       my_contacts: "Mis contactos"
       no_contacts: "¡Parece que necesitas añadir algunos contactos!"
@@ -245,7 +244,7 @@ es-MX:
     sharing:
       people_sharing: "Personas que comparten contigo:"
     spotlight:
-      community_spotlight: "Lo más destacado de la comunidad"
+      community_spotlight: "Comunidad Creativa"
     two: "%{count} contactos"
     zero: "contactos"
   conversations:
@@ -292,20 +291,6 @@ es-MX:
   fill_me_out: "Complétame"
   find_people: "Encuentra gente o #etiquetas"
   hide: "Ocultar"
-  home:
-    show:
-      already_account: "¿Ya tienes una cuenta?"
-      choice: "Elección"
-      choice_explanation: "Diaspora te permite organizar tus conexiones dentro de grupos llamados aspectos. Algo único en Diaspora, los aspectos aseguran que tus fotos, historias y bromas sean compartidas solamente con la gente que tú quieras."
-      learn_about_host: "Aprende cómo hospedar tu propio servidor de Diaspora."
-      login_here: "Inicia sesión aquí"
-      ownership: "Propiedad"
-      ownership_explanation: "Eres dueño de tus propias imágenes, y no tendrías porqué renunciar a eso solo para compartirlas. En Diaspora mantienes la propiedad de todo lo que compartes, dándote total control acerca de cómo se distribuye."
-      share_what_you_want: "Comparte lo que quieras, con quien tú quieras."
-      simplicity: "Simplicidad"
-      simplicity_explanation: "Diaspora hace que compartir sea fácil y transparente – y esto incluye la privacidad también. Siendo intrínsecamente privada, Diaspora no te hace navegar a lo largo de páginas de configuración y opciones solo para mantener tu perfil seguro."
-      tagline_first_half: "Comparte lo que quieras,"
-      tagline_second_half: "con quien tú quieras."
   invitation_codes:
     excited: "%{name} está entusiasmado por verte aquí."
   invitations:
@@ -334,7 +319,7 @@ es-MX:
       if_they_accept_info: "si aceptan, serán añadidos al aspecto al cual los invitaste."
       invite_someone_to_join: "¡Invita a alguien a unirse a Diaspora!"
       language: "Idioma"
-      paste_link: "Comparte este enlace con tus amigos para invitarlos a Diaspora*, o envíales directamente el enlace por correo electrónico"
+      paste_link: "Comparte este enlace con tus contactos para invitarles a Diaspora*, o envíales directamente el enlace por correo electrónico"
       personal_message: "Mensaje personal"
       resend: "Reenviar"
       send_an_invitation: "Enviar una invitación"
@@ -455,14 +440,12 @@ es-MX:
 
           Haz click en este enlace para comenzar
 
-          [%{invite_url}][1]
+          %{invite_url}
 
 
           Saludos,
 
           ¡El generador de correo automático de Diaspora*!
-
-          [1]: %{invite_url}
     invited_you: "%{name} te ha invitado a Diaspora*"
     liked:
       liked: "A %{name} le gustó tu publicación"
@@ -640,7 +623,7 @@ es-MX:
     new:
       create_my_account: "¡Crear mi cuenta!"
       enter_email: "Ingresa un correo electrónico"
-      enter_password: "Elige una contraseña"
+      enter_password: "Elige una contraseña (mínimo seis caracteres)"
       enter_password_again: "Ingresa de nuevo la misma contraseña"
       enter_username: "Elige un nombre de usuario (solo letras, números o guiones bajos)"
       join_the_movement: "¡Únete al movimiento!"
@@ -688,9 +671,9 @@ es-MX:
     failure:
       error: "hubo un error al conectarse a ese servicio"
     finder:
-      fetching_contacts: "Diaspora esta importando a tus amigos de %{service}, por favor vuelve en unos minutos."
-      no_friends: "No se encontraron amigos de Facebook."
-      service_friends: "Amigos de %{service}"
+      fetching_contacts: "Diaspora esta importando a tus contactos de %{service}, por favor vuelve en unos minutos."
+      no_friends: "No se encontraron contactos de Facebook."
+      service_friends: "Contactos de %{service}"
     index:
       connect_to_facebook: "Conectar a Facebook"
       connect_to_tumblr: "Conectar a Tumblr"
@@ -737,7 +720,7 @@ es-MX:
       from_facebook: "Desde Facebook"
       invitations_left: "%{count} restantes"
       invite_someone: "Invita a alguien"
-      invite_your_friends: "Invita a tus amigos"
+      invite_your_friends: "Invita a tus contactos"
       invites: "Invitaciones"
       invites_closed: "Las invitaciones en este servidor de Diaspora están actualmente cerradas."
     notification:
@@ -761,7 +744,7 @@ es-MX:
         hello: "Hola a todos, soy #%{new_user_tag}. "
         i_like: "Estoy interesado en %{tags}. "
         invited_by: "Gracias por la invitación, "
-        newhere: "NuevoAquí"
+        newhere: "Hola"
       post_a_message_to: "Publicar un mensaje en %{aspect}"
       posting: "Publicando…"
       publishing_to: "publicar en: "
@@ -814,7 +797,7 @@ es-MX:
     comment_stream:
       contacts_title: "Personas cuyas publicaciones comentaste"
       title: "Publicaciones comentadas"
-    community_spotlight_stream: "Lo más destacado de la comunidad"
+    community_spotlight_stream: "Comunidad Creativa"
     followed_tag:
       add_a_tag: "Añadir una etiqueta"
       contacts_title: "Personas que buscaron en estas etiquetas"
@@ -915,7 +898,7 @@ es-MX:
       private_message: "…recibes un mensaje privado?"
       receive_email_notifications: "¿Recibir notificaciones por correo electrónico cuando…"
       reshared: "…alguien comparte tu publicación?"
-      show_community_spotlight: "¿Mostrar «Lo más destacado de la comunidad» en tu Entrada?"
+      show_community_spotlight: "¿Mostrar «Comunidad Creativa» en tu Entrada?"
       show_getting_started: "Volver a activar la guía de primeros pasos"
       started_sharing: "…alguien comienza a compartir contigo?"
       stream_preferences: "Preferencias de Entrada"
@@ -923,7 +906,7 @@ es-MX:
       your_handle: "Tu ID de Diaspora"
     getting_started:
       awesome_take_me_to_diaspora: "¡Genial! Llévame a Diaspora*"
-      community_welcome: "¡La comunidad de Diaspora está feliz de tenerte a bordo!"
+      community_welcome: "¡La comunidad Diaspora está feliz de tenerte a bordo!"
       hashtag_explanation: "Las etiquetas te permiten hablar acerca de tus intereses, así como seguirlos. Son también una gran forma de encontrar gente en Diaspora."
       hashtag_suggestions: "Intenta seguir etiquetas como #arte, #películas, #español, etc."
       hooking_up_fb: "conectando con tu cuenta de Facebook"
@@ -957,7 +940,7 @@ es-MX:
     no_person_constructed: "No se pudo crear ninguna persona a partir de esta hcard."
     not_enabled: "parece que webfinger no está habilitado para el servidor de %{account}"
     xrd_fetch_failed: "hubo un error al obtener el xrd de la cuenta %{account}"
-  welcome: "¡Bienvenido!"
+  welcome: "¡Bienvenido/a!"
   will_paginate:
     next_label: "siguiente »"
-    previous_label: "« anterior"
+    previous_label: "« anterior"
\ No newline at end of file
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 4b0cdd044..51c7f3d3a 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -51,7 +51,7 @@ es:
     correlations:
       correlations_count: "Cuentas similares:"
     stats:
-      go: "aceptar"
+      go: "adelante"
     user_search:
       add_invites: "añadir invitaciones"
       email_to: "Dirección de correo electrónico a invitar"
@@ -59,7 +59,7 @@ es:
         one: "%{count} usuario encontrado"
         other: "%{count} usuarios encontrados"
         zero: "%{count} usuarios encontrados"
-      you_currently: "Actualmente tienes %{user_invitation} invitaciones para enviar %{link}"
+      you_currently: "Te quedan %{user_invitation} invitaciones %{link}"
   ago: "Hace %{time}"
   all_aspects: "Todos los aspectos"
   application:
@@ -203,10 +203,9 @@ es:
       failure: "No podría dejar de ignorar a esa persona.  #evasion"
       success: "¡Vamos a ver qué tiene que decir! #sayhello"
   bookmarklet:
-    explanation: "Publica en Diaspora* desde donde quieras agregando a tus marcadores %{link}."
-    explanation_link_text: "este enlace"
+    explanation: "Publica en Diaspora* desde donde quieras agregando a tus marcadores este enlace => %{link}."
     heading: "Marcador"
-    post_something: "Publica algo en Diaspora"
+    post_something: "Publicar en Diaspora*"
     post_success: "¡Publicado! ¡Cerrando!"
   cancel: "Cancelar"
   comments:
@@ -295,20 +294,6 @@ es:
   fill_me_out: "Complétame"
   find_people: "Encuentra gente o #etiquetas"
   hide: "Ocultar publicación"
-  home:
-    show:
-      already_account: "¿Ya tienes una cuenta?"
-      choice: "Elección"
-      choice_explanation: "Diaspora* te permite organizar conexiones en grupos llamados aspectos. En Diaspora*, los aspectos aseguran que tus fotos, historias y bromas sean compartidas sólo con la gente que tu quieras."
-      learn_about_host: "Aprende cómo hospedar tu propio servidor de Diaspora."
-      login_here: "accede aquí"
-      ownership: "Propiedad"
-      ownership_explanation: "Eres dueño de tus propias imágenes, y no tendrías porqué renunciar a eso solo para compartirlas. En Diaspora mantienes la propiedad de todo lo que compartes, dándote total control acerca de cómo se distribuye."
-      share_what_you_want: "Comparte lo que quieras, con quien quieras."
-      simplicity: "Simplicidad"
-      simplicity_explanation: "Diaspora* hace que compartir sea transparente y fácil — y esto también va por la privacidad. Inheréntemente privado, Diaspora* no te hace ir a través de configuraciones y opciones solo para mantener tu perfil seguro."
-      tagline_first_half: "Comparte lo que quieras,"
-      tagline_second_half: "con quien tú quieras."
   invitation_codes:
     excited: "%{name} está encantado de verte por aquí."
   invitations:
@@ -503,14 +488,12 @@ es:
 
           Sigue este enlace para empezar
 
-          [%{invite_url}][1]
+          %{invite_url}
 
 
           Saludos,
 
           ¡El correo automático de Diaspora*!
-
-          [1]: %{invite_url}
     invited_you: "¡%{name} te ha invitado a Diaspora*!"
     liked:
       liked: "A %{name} le gustó tu publicación"
@@ -694,7 +677,7 @@ es:
     new:
       create_my_account: "¡Crear mi cuenta!"
       enter_email: "Escribe un correo"
-      enter_password: "Escribe una contraseña"
+      enter_password: "Escribe una contraseña (seis caracteres como mínimo)"
       enter_password_again: "Escribe la misma contraseña como antes"
       enter_username: "Elige un nombre de usuario (letras, números o guiones bajos)"
       join_the_movement: "¡Únete al movimiento!"
@@ -792,7 +775,7 @@ es:
       logged_in_as: "accediste como %{name}"
       your_aspects: "tus aspectos"
     invitations:
-      by_email: "Por correo"
+      by_email: "Por correo electrónico"
       dont_have_now: "No tienes invitaciones ahora mismo pero, ¡pronto llegarán más!"
       from_facebook: "Por Facebook"
       invitations_left: "%{count} restantes"
@@ -991,7 +974,7 @@ es:
       awesome_take_me_to_diaspora: "¡Increíble! Llévame a Diaspora*"
       community_welcome: "¡La comunidad de Diaspora está feliz de tenerte a bordo!"
       hashtag_explanation: "Las etiquetas te permiten hablar sobre tus intereses así como seguirlos. Además es una forma genial de encontrar gente nueva en Diaspora. "
-      hashtag_suggestions: "Prueba a seguir etiquetas como #arte, #cine, #activismo, #geek, etc."
+      hashtag_suggestions: "Prueba a seguir etiquetas como #arte, #cine, #activismo, #libros, etc."
       hooking_up_fb: "conectando tu cuenta de Facebook"
       saved: "¡Guardado!"
       we_can_speed_things_up: "Podemos acelerar un poco las cosas"
@@ -1026,4 +1009,4 @@ es:
   welcome: "¡Bienvenid@!"
   will_paginate:
     next_label: "siguiente »"
-    previous_label: "« anterior"
+    previous_label: "« anterior"
\ No newline at end of file
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 2704eb416..107ef1b6c 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -40,6 +40,26 @@ eu:
             username:
               invalid: "baliogabea da. Hizkiak, zenbakiak eta barrabaxuak soilik onartzen ditugu."
               taken: "erabilpenean dago jada."
+  admins:
+    admin_bar:
+      correlations: "Korrelazioak"
+      pages: "Orrialdeak"
+      pod_stats: "Hornitzailearen Estatistikak"
+      resque_overview: "Resqueren Aurrebista"
+      user_search: "Erabiltzaile Bilaketa"
+      weekly_user_stats: "Asteko Erabiltzaile Estatistikak"
+    correlations:
+      correlations_count: "Korrelazioak Sarpen Zenbakiekin:"
+    stats:
+      go: "jarraitu"
+    user_search:
+      add_invites: "gonbidapenak gehitu"
+      email_to: "Gonbidatzeko Emaila"
+      users:
+        one: "erabiltzaile %{count} aurkitu da"
+        other: "%{count} erabiltzaile aurkitu dira"
+        zero: "erabiltzailerik ez da aurkitu"
+      you_currently: "oraindik %{user_invitation} gonbidapen dituzu %{link}"
   ago: "%{time}"
   all_aspects: "Alderdi guztiak"
   application:
@@ -112,11 +132,13 @@ eu:
         have_a_question: "... %{link} bat duzu?"
         here_to_help: "Diaspora komunitatea hemen dago!"
         need_help: "Laguntza Behar Duzu?"
-        tag_bug: "errorea"
+        tag_bug: "errore"
         tag_feature: "funtzioa"
         tag_question: "galdera"
         tutorials_wiki_and_forum: "%{tutorial}, %{wiki} eta %{forum}: Komunitateak egindako tutorialak, nola-eginak eta berriak"
       introduce_yourself: "Hau zure kronologia da.  Animatu eta zure burua aurkeztu."
+      keep_diaspora_running: "Diaspoaren garapena azkartu ezazu hilabeteroko donazio batekin!"
+      keep_pod_running: "Mantendu %{pod} azkar izaten hornitzaileari kafe-konponketa ordainduz hilero!"
       new_here:
         follow: "Jarraitu %{link} eta emaiezu ongietorria Diasporako erabiltzaile berriei!"
         learn_more: "Ikasi gehiago"
@@ -168,6 +190,10 @@ eu:
     index:
       no_applications: "Aplikaziorik ez duzu erregistratu oraindik."
       revoke_access: "Sarbidea Baliogabetu"
+    new:
+      authorize: "Baimendu"
+      cubbies_will: "Cubbies gai izango da zure erabiltzailean argazkiak jartzeko"
+      nope: "Ez"
   back: "Atzera"
   blocks:
     create:
@@ -178,7 +204,6 @@ eu:
       success: "Ikus dezagun zer duzun esateko! #esankaixo"
   bookmarklet:
     explanation: "Diasporan partekatu %{link} erabiliz."
-    explanation_link_text: "esteka hau"
     heading: "Bookmarkleta"
     post_something: "Partekatu zerbait Diasporan"
     post_success: "Bidalia! Irteten!"
@@ -269,20 +294,6 @@ eu:
   fill_me_out: "Bete nazazu"
   find_people: "Jendea edo #etiketak aurkitu"
   hide: "Ezkutatu"
-  home:
-    show:
-      already_account: "kontua duzu jada?"
-      choice: "Hautaketa"
-      choice_explanation: "Diasporan zure lagunak kudeatu ditzakezu arlo izeneko taldeetan. Zure argitalpen guztiak; bai argazkiak, egoera aldaketak, eta abar nahi duzun jendearekin soilik partekatzeko; honek egiten du Diaspora bereizgarri."
-      learn_about_host: "Ikasi nola eskaini Diaspora zure zerbitzarian."
-      login_here: "hemen sartu"
-      ownership: "Jabegoa"
-      ownership_explanation: "Zure argazkiak zureak dira, eta ez duzu hori ahaztu behar partekatzeagatik soilik. Diasporan partekatzen duzun guztiaren jabe zara, zuri eskainiz zer modutan banatzeko askatasuna."
-      share_what_you_want: "Partekatu nahi duzuna, nahi duzun pertsonarekin."
-      simplicity: "Sinplizitatea"
-      simplicity_explanation: "Diasporak partekatzea erraza egiten du - pribatutasuna kontuan hartuz. Izatez pribatutasunera zuzenduta, Diasporak egitura sinplea du zure profila babesturik mantentzearren."
-      tagline_first_half: "Partekatu nahi duzuna,"
-      tagline_second_half: "nahi duzunarekin."
   invitation_codes:
     excited: "%{name} pozik dago zu ikusteaz"
   invitations:
@@ -307,6 +318,7 @@ eu:
         one: "Gonbidapen bat geratzen zaizu kode honekin"
         other: "%{count} gonbidapen geratzen zaizkizu kode honekin"
         zero: "Ez zaizkizu geratzen gonbidapenak kode honekin"
+      comma_separated_plz: "Email desberdinak jarri ditzakezu, koma batez bereiztuak."
       if_they_accept_info: "eskaera onartzen badute, gonbidatutako arlora batuko dira"
       invite_someone_to_join: "Gonbida ezazu norbait Diasporan izen ematera!"
       language: "Hizkuntza"
@@ -401,6 +413,7 @@ eu:
         two: "eta beste %{count}"
         zero: "eta inork gehiago ez"
       mark_all_as_read: "Guztiak irakurrita"
+      mark_unread: "Irakurri gabe gisa markatu"
       notifications: "Jakinarazpenak"
     liked:
       few: "%{actors}(e)k gustuko dute zure %{post_link}."
@@ -470,6 +483,21 @@ eu:
       subject: "Mesedez, gaitu zure e-posta berria %{unconfirmed_email}"
     email_sent_by_diaspora: "Email hau Diasporak bidali dizu.  Horrelako emailik ez baduzu jaso nahi,"
     hello: "Kaixo, %{name}!"
+    invite:
+      message: |-
+          Kaixo!
+
+          Diasporara batzera gonbidatu zaituzte!
+
+          Esteka hau jarraitu hasteko
+
+          %{invite_url}
+
+
+          Adeitasunez,
+
+          Diasporaren email robota!
+    invited_you: "%{name}(e)k Diasporara gonbidatu zaitu"
     liked:
       liked: "%{name}(e)k zure mezua gustuko du"
       view_post: "Mezua ikusi >"
@@ -496,6 +524,8 @@ eu:
   password: "Pasahitza"
   password_confirmation: "Pasahitz baieztapena"
   people:
+    add_contact:
+      invited_by: "honek gonbidatu zaitu:"
     add_contact_small:
       add_contact_from_tag: "gehitu laguna etiketatik abiatuta"
     aspect_list:
@@ -511,6 +541,7 @@ eu:
       no_results: "Aizu! Zerbait bilatu behar duzu."
       results_for: "bilaketa emaitzak hontarako:"
       searching: "bilatzen, mesedez itxaron pixka bat..."
+    last_post: ""
     many: "%{count} pertsona"
     one: "pertsona 1"
     other: "%{count} pertsona"
@@ -586,6 +617,8 @@ eu:
       error: "Huts argazkia aldatzean."
       notice: "Argazkia arrakastaz eguneratua."
   posts:
+    presenter:
+      title: ""
     show:
       destroy: "Ezabatu"
       not_found: "Barkatu, baina ezin izan dugu mezu hori aurkitu."
@@ -800,6 +833,7 @@ eu:
       show: "erakutsi"
       unlike: "Ez dut gustuko"
       via: "%{link}(r)en bidez"
+      via_mobile: "mugikorraren bidez"
       viewable_to_anyone: "Mezu hau edonork ikusi dezake Interneten"
   status_messages:
     create:
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 367b35bb8..7588120f4 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -40,10 +40,27 @@ fi:
             username:
               invalid: "on virheellinen. Vain kirjaimet, numerot ja alaviivat ovat sallittuja."
               taken: "on jo varattu."
+  admins:
+    admin_bar:
+      correlations: "Vastaavuudet"
+      pages: "Sivut"
+      user_search: "Käyttäjähaku"
+      weekly_user_stats: "Viikottaiset käyttäjätiedot"
+    stats:
+      go: "mene"
+    user_search:
+      add_invites: "lisää kutsuja"
+      email_to: "Lähetä sähköpostia kutsuaksesi"
+      users:
+        one: "%{count} käyttäjä löytyi"
+        other: "%{count} käyttäjää löytyi"
+        zero: "Yhtään käyttäjää ei löytynyt"
+      you_currently: "Sinulla on tällä hetkellä %{user_invitation} kutsua jäljellä %{link}"
   ago: "%{time} sitten"
   all_aspects: "Kaikki näkymät"
   application:
     helper:
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "tuntematon henkilö"
       video_title:
         unknown: "Videon Otsikko Tuntematon"
@@ -111,8 +128,12 @@ fi:
         have_a_question: "... kysyä kysymyksen? %{link}"
         here_to_help: "Diaspora-yhteisö auttaa!"
         need_help: "Tarvitsetko apua?"
+        tag_bug: "virhe"
+        tag_feature: "ominaisuus"
+        tag_question: "kysymys"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Yhteisön laatimia oppaita, ohjeita ja uutisia"
       introduce_yourself: "Tämä on virtasi. Hyppää sekaan ja esittele itsesi."
+      keep_diaspora_running: "Pidä Diasporan kehitys nopeana kuukausittaisten lahjoitusten avulla!"
       new_here:
         follow: "Seuraa tagia %{link} ja toivota uudet käyttäjät tervetulleiksi Diasporaan!"
         learn_more: "Lue lisää"
@@ -164,6 +185,9 @@ fi:
     index:
       no_applications: "Et ole rekisteröinyt vielä yhtäkään sovellusta."
       revoke_access: "Estä pääsy"
+    new:
+      authorize: "Valtuuta"
+      nope: "Ei"
   back: "Takaisin"
   blocks:
     create:
@@ -174,7 +198,6 @@ fi:
       success: "Katsotaanpa, mitä sanottavaa hänellä on! #sayhello"
   bookmarklet:
     explanation: "Voit lähettää viestin Diasporaan mistä tahansa lisäämällä %{link} kirjanmerkkeihisi."
-    explanation_link_text: "tämän linkin"
     heading: "Sovelluskirjanmerkki"
     post_something: "Kirjoita jotain Diasporaan"
     post_success: "Lähetetty! Suljetaan!"
@@ -197,9 +220,12 @@ fi:
       add_a_new_aspect: "Lisää näkymä"
       add_to_aspect: "lisää kontakteja näkymään %{name}"
       all_contacts: "Kaikki kontaktit"
+      community_spotlight: "Yhteisön valokeila"
       many_people_are_you_sure: "Oletko varma, että haluat aloittaa yksityiskeskustelun useamman kuin %{suggested_limit} kontaktin kanssa? Viestin lähettäminen tähän näkymään voisi olla parempi tapa olla yhteydessä heihin."
       my_contacts: "Kontaktini"
       no_contacts: "Sinun pitäisi näköjään lisätä kontakteja!"
+      no_contacts_message: "Käy katsomassa %{community_spotlight}"
+      no_contacts_message_with_aspect: "Käy katsomassa %{community_spotlight} tai %{add_to_aspect_link}"
       only_sharing_with_me: "Jakaa vain kanssani"
       remove_person_from_aspect: "Poista %{person_name} näkymästä: \"%{aspect_name}\""
       start_a_conversation: "Aloita keskustelu"
@@ -261,20 +287,8 @@ fi:
   fill_me_out: "Täytä tiedot"
   find_people: "Etsi ihmisiä tai #tageja"
   hide: "Piilota"
-  home:
-    show:
-      already_account: "onko sinulla jo käyttäjätili?"
-      choice: "Valinta"
-      choice_explanation: "Diasporassa voit lajitella kontaktisi eri ryhmiin, joita kutsutaan näkymiksi. Toisin kuin muissa yhteisöpalveluissa, Diasporassa näkymät takaavat, että kuvasi, viestisi ja vitsisi jaetaan vain niille ihmisille, joille ne on tarkoitettu."
-      learn_about_host: "Lue miten voit perustaa oman Diaspora-palvelimen."
-      login_here: "kirjaudu sisään täältä"
-      ownership: "Omistajuus"
-      ownership_explanation: "Omistat kuvasi, eikä sinun pitäisi luopua oikeudestasi vain jakaaksesi ne. Säilytät omistajuutesi kaikkeen, mitä jaat Diasporassa - näin on myös täysin vallassasi, kuinka materiaaliasi jaetaan eteenpäin."
-      share_what_you_want: "Jaa mitä haluat, kenen kanssa haluat."
-      simplicity: "Yksinkertaisuus"
-      simplicity_explanation: "Diaspora tekee jakamisesta helppoa ja siistiä – sama koskee myös yksityisyyttäsi. Luonnostaan yksityisenä Diaspora ei pakota sinua samoamaan sivukaupalla asetusten ja valintojen läpi vain pitääksesi profiilisi turvassa."
-      tagline_first_half: "Jaa mitä haluat,"
-      tagline_second_half: "kenen kanssa haluat."
+  invitation_codes:
+    excited: "%{name} on innoissaan nähdessään sinut täällä."
   invitations:
     a_facebook_user: "Facebook-käyttäjä"
     check_token:
@@ -292,9 +306,16 @@ fi:
     new:
       already_invited: "Seuraavat ihmiset eivät ole hyväksyneet kutsuasi:"
       aspect: "Näkymä"
+      check_out_diaspora: "Tule tutustumaan Diasporaan!"
+      codes_left:
+        one: "Tällä koodilla on %{count} kutsu jäljellä."
+        other: "Tällä koodilla on %{count} kutsua jäljellä."
+        zero: "Tällä koodilla ei ole yhtään kutsua jäljellä."
+      comma_separated_plz: "Voit syöttää useita eri sähköpostiosoitteita pilkuilla erotettuna."
       if_they_accept_info: "jos he hyväksyvät kutsun, heidät lisätään siihen näkymään, johon heidät kutsuit."
       invite_someone_to_join: "Kutsu joku Diasporan käyttäjäksi!"
       language: "Kieli"
+      paste_link: "Jaa tämä linkki ystäviesi kanssa kutsuaksesi heidät Diaspora*:an, tai sähköpostita se heille suoraan."
       personal_message: "Henkilökohtainen viesti"
       resend: "Lähetä uudelleen"
       send_an_invitation: "Lähetä kutsu"
@@ -302,6 +323,7 @@ fi:
       to: "Vastaanottaja"
   layouts:
     application:
+      back_to_top: "Takaisin ylös"
       powered_by: "PALVELUN TARJOAA DIASPORA*"
       public_feed: "Käyttäjän %{name} julkinen Diaspora-uutisvirta"
       toggle: "mobiilisivusto päälle/pois"
@@ -383,6 +405,7 @@ fi:
         two: "ja %{count} muuta"
         zero: "eikä kukaan muu"
       mark_all_as_read: "Merkitse kaikki luetuiksi"
+      mark_unread: "Merkite lukemattomaksi"
       notifications: "Ilmoitukset"
     liked:
       few: "%{actors} tykkäsivät %{post_link}stäsi."
@@ -442,6 +465,8 @@ fi:
       two: "%{actors} started sharing with you."
       zero: "%{actors} on aloittanut jakamaan kanssasi."
   notifier:
+    a_post_you_shared: "viesti"
+    accept_invite: "Hyväksy sinun Diaspora* kutsusi!"
     click_here: "klikkaa tästä"
     comment_on_post:
       reply: "Vastaa tai katso käyttäjän %{name} viesti >"
@@ -450,6 +475,21 @@ fi:
       subject: "Aktivoi uusi sähköpostiosoitteesi %{unconfirmed_email}"
     email_sent_by_diaspora: "Diaspora lähetti tämän sähköpostin. Jos et halua saada tällaisia sähköposteja jatkossa,"
     hello: "Hei %{name}!"
+    invite:
+      message: |-
+          Hei!
+
+          Sinut on kutsuttu liittymään Diaspora*:an!
+
+          Klikkaa tätä linkkiä aloittaaksesi.
+
+          %{invite_url}
+
+
+          Rakkaudella,
+
+          Diaspora*:n sähköpostirobotti!
+    invited_you: "%{name} kutsui sinut Diaspora*:an"
     liked:
       liked: "%{name} tykkäsi kirjoituksestasi"
       view_post: "Katso viesti >"
@@ -470,10 +510,14 @@ fi:
       view_profile: "Näytä käyttäjän %{name} profiiili"
     thanks: "Kiitos,"
     to_change_your_notification_settings: "vaihtaaksesi ilmoitusasetuksia"
+  nsfw: "ei-työturvallinen materiaali"
+  ok: "OK"
   or: "tai"
   password: "Salasana"
   password_confirmation: "Salasanan varmistus"
   people:
+    add_contact:
+      invited_by: "sinut kutsui"
     add_contact_small:
       add_contact_from_tag: "lisää kontakti tagista"
     aspect_list:
@@ -488,6 +532,8 @@ fi:
       no_one_found: "...ketään ei löytynyt."
       no_results: "Hei! Sinun tulisi etsiä jotakin."
       results_for: "hakutulokset kohteelle"
+      searching: "etsitään, ole hyvä ja odota..."
+    last_post: "Viimeinen viesti"
     many: "%{count} ihmistä"
     one: "1 ihminen"
     other: "%{count} ihmistä"
@@ -529,6 +575,7 @@ fi:
       fail: "Valitettavasti tunnusta %{handle} ei löytynyt."
     zero: "0 ihmistä"
   photos:
+    comment_email_subject: "valokuva käyttäjältä %{name}"
     create:
       integrity_error: "Kuvan lataus epäonnistui. Oletko varma, että se oli kuva?"
       runtime_error: "Kuvan lataus epäonnistui. Onhan turvavyösi kiinni?"
@@ -562,6 +609,8 @@ fi:
       error: "Kuvan muokkaus epäonnistui."
       notice: "Kuva päivitettiin onnistuneesti."
   posts:
+    presenter:
+      title: "Viesti käyttäjältä %{name}"
     show:
       destroy: "Poista"
       not_found: "Valitettavasti viestiä ei löytynyt."
@@ -573,6 +622,7 @@ fi:
         other: "%{count} photos by %{author}"
         two: "Two photos by %{author}"
         zero: "No photos by %{author}"
+      reshare_by: "Uudelleenjaettu käyttäjältä %{author}"
   previous: "edellinen"
   privacy: "Yksityisyys"
   privacy_policy: "Yksityisyydensuoja"
@@ -584,6 +634,8 @@ fi:
       first_name: "Etunimi"
       last_name: "Sukunimi"
       update_profile: "Päivitä profiili"
+      you_are_nsfw: "Olet merkinnyt itsesi ei-työturvalliseksi. Sisältösi ei näy käyttäjille jotka ovat valinneet etteivät halua nähdä tällaisten henkilöiden virtoja."
+      you_are_safe_for_work: "Olet merkinnyt itsesi työturvalliseksi, näinollen hyväksyt, että kaikki lähettämäsi sisältö on yhteisön suositusten mukaista."
       your_bio: "Biografiasi"
       your_birthday: "Syntymäpäiväsi"
       your_gender: "Sukupuolesi"
@@ -616,10 +668,11 @@ fi:
       password_to_confirm: "(tarvitsemme nykyisen salasanasi muutosten varmistusta varten)"
       unhappy: "Tyytymätön?"
       update: "Päivitä"
+    invalid_invite: "Kutsulinkki ei ole enää voimassa!"
     new:
       create_my_account: "Luo käyttäjätili!"
       enter_email: "Syötä sähköpostiosoite"
-      enter_password: "Syötä salasana"
+      enter_password: "Syötä salasana (vähintään kuusi merkkiä)"
       enter_password_again: "Syötä sama salasana kuin edellä"
       enter_username: "Valitse käyttäjänimi (vain kirjaimet, numerot ja alaviivat sallittuja)"
       join_the_movement: "Liity joukkoon!"
@@ -646,6 +699,7 @@ fi:
     new_request_to_person:
       sent: "lähetetty!"
   reshares:
+    comment_email_subject: "Käyttäjän %{resharer} uudelleenjako käyttäjän %{author} viestistä."
     create:
       failure: "Viestin uudelleen jakamisessa tapahtui virhe."
     reshare:
@@ -663,6 +717,8 @@ fi:
   search: "Haku"
   services:
     create:
+      already_authorized: "Käyttäjä %{diaspora_id} on jo ottanut käyttöön %{service_name} nimisen käyttäjätilin."
+      failure: "Tunnistautuminen epäonnistui"
       success: "Tunnistus onnistui."
     destroy:
       success: "Tunnistuksen poisto onnistui."
@@ -696,6 +752,7 @@ fi:
     add_contact:
       add_new_contact: "Lisää uusi kontakti"
       create_request: "Etsi Diaspora-tunnuksella"
+      diaspora_handle: "diaspora@pod.org"
       enter_a_diaspora_username: "Anna Diaspora-käyttäjätunnus:"
       know_email: "Tiedätkö heidän sähköpostiosoitteitansa? Kutsu heidät!"
       your_diaspora_username_is: "Diaspora-käyttäjätunnuksesi on: %{diaspora_handle}"
@@ -741,6 +798,7 @@ fi:
       new_user_prefill:
         hello: "Hei kaikki, olen #%{new_user_tag}. "
         i_like: "Kiinnostukseni kohteita ovat %{tags}."
+        invited_by: "Kiitos kutsusta, "
         newhere: "UusiTäällä"
       post_a_message_to: "Lähetä viesti näkymään %{aspect}"
       posting: "Lähetetään..."
@@ -759,10 +817,12 @@ fi:
       ignore_user: "Sivuuta %{name}"
       ignore_user_description: "Sivuuta käyttäjä ja poista hänet kaikista näkymistä?"
       like: "Tykkää"
+      nsfw: "Tämän viestin lähettäjä on merkinnyt sen ei-työturvalliseksi. %{link}"
       shared_with: "Jaettu heidän kanssaan: %{aspect_names}"
       show: "näytä"
       unlike: "Peru tykkäys"
       via: "%{link} kautta"
+      via_mobile: "puhelimen välityksellä"
       viewable_to_anyone: "Kuka tahansa verkossa näkee tämän viestin"
   status_messages:
     create:
@@ -790,6 +850,8 @@ fi:
       two: "Näytä kaksi muuta kommenttia"
       zero: "Ei enempää kommentteja"
   streams:
+    activity:
+      title: "Oma toimintani"
     aspects:
       title: "Näkymäsi"
     aspects_stream: "Näkymät"
@@ -813,8 +875,11 @@ fi:
     multi:
       contacts_title: "Ihmiset sinun virrassasi"
       title: "Virta"
+    public:
+      title: "Julkinen toiminta"
     tags:
       contacts_title: "Näistä tageista pitävät ihmiset"
+      tag_prefill_text: "Puhuttaessa asiasta %{tag_name}, olen sitä mieltä että... "
   tag_followings:
     create:
       failure: "Tagin #%{name} seuraamisen aloittaminen epäonnistui. Seuraatko sitä jo?"
@@ -864,6 +929,7 @@ fi:
       change_email: "Vaihda sähköpostiosoite"
       change_language: "Vaihda kieli"
       change_password: "Vaihda salasana"
+      character_minimum_expl: "täytyy olla vähintään kuusi merkkiä"
       close_account:
         dont_go: "Hei, älä lähde!"
         if_you_want_this: "Jos todella haluat tätä, kirjoita salasanasi alle ja napsauta 'Sulje käyttäjätili'"
@@ -882,6 +948,7 @@ fi:
       email_awaiting_confirmation: "Olemme lähettäneet sinulle aktivointilinkin osoitteeseen %{unconfirmed_email}. Jatkamme alkuperäisen osoitteesi %{email} käyttämistä siihen saakka, kunnes aktivoit uuden osoitteesi kyseisen linkin kautta."
       export_data: "Vie tietoja"
       following: "Seuraamisasetukset"
+      getting_started: "Uudet käyttäjäasetukset"
       liked: "...tykkää kirjoituksistasi?"
       mentioned: "...sinut mainitaan viestissä?"
       new_password: "Uusi salasana"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index b0d5b6ffa..491d1adb9 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -204,9 +204,8 @@ fr:
       success: "Voyons ce qu'ils ont à dire ! #sayhello"
   bookmarklet:
     explanation: "Publiez sur Diaspora depuis n'importe où en ajoutant %{link} à vos marque-pages."
-    explanation_link_text: "ce lien"
     heading: "Bookmarklet"
-    post_something: "Publiez quelque chose sur Diaspora"
+    post_something: "Publiez sur Diaspora"
     post_success: "Publié ! Fermeture !"
   cancel: "Annuler"
   comments:
@@ -295,20 +294,6 @@ fr:
   fill_me_out: "Remplissez-moi"
   find_people: "Rechercher des personnes ou des #tags"
   hide: "Masquer"
-  home:
-    show:
-      already_account: "vous avez déjà un compte?"
-      choice: "Choix"
-      choice_explanation: "Diaspora vous laisse trier vos connexions dans des groupes appelés aspects. Spécifiques à Diaspora, les aspects garantissent que vos photos, histoires et blagues ne sont partagées qu'avec les personnes avec qui vous souhaitez les partager."
-      learn_about_host: "Apprenez comment héberger votre propre serveur Diaspora."
-      login_here: "connectez-vous ici"
-      ownership: "Propriété"
-      ownership_explanation: "Vous êtes le propriétaire de vos images, et vous ne devriez pas être obligé de renoncer à cela juste pour les partager. Vous conservez la propriété de tout ce que vous partagez sur Diaspora, ce qui vous donne le contrôle total de la manière dont cela est distribué."
-      share_what_you_want: "Partagez ce que vous voulez, avec qui vous voulez."
-      simplicity: "Simplicité"
-      simplicity_explanation: "Diaspora rend le partage propre et facile - et cela est également valable pour la vie privée. Intrinsèquement privé, Diaspora ne vous contraint pas à vous frayer un chemin à travers des pages de configuration et d'options uniquement pour maintenir votre profil sécurisé."
-      tagline_first_half: "Partagez ce que vous voulez,"
-      tagline_second_half: "avec qui vous voudrez."
   invitation_codes:
     excited: "%{name} est content de vous voir ici."
   invitations:
@@ -506,13 +491,11 @@ fr:
 
           Pour commencer, cliquez sur ce lien :
 
-          [%{invite_url}][1]
+          %{invite_url}
 
           Bien le bonjour chez vous,
 
           Le robot de courriel de Diaspora*
-
-          [1]: %{invite_url}
     invited_you: "%{name} vous a invité(e) sur Diaspora*"
     liked:
       liked: "%{name} a épinglé votre message"
@@ -696,7 +679,7 @@ fr:
     new:
       create_my_account: "Créer mon compte !"
       enter_email: "Saisissez une adresse de courrier électronique"
-      enter_password: "Saisissez un mot de passe"
+      enter_password: "Saisissez un mot de passe (d'au moins six caractères)"
       enter_password_again: "Saisissez à nouveau le même mot de passe"
       enter_username: "Choisissez un nom d'utilisateur (uniquement des lettres, chiffres et caractères de soulignement)"
       join_the_movement: "Rejoignez le mouvement !"
@@ -1031,4 +1014,4 @@ fr:
   welcome: "Bienvenue !"
   will_paginate:
     next_label: "suivant &raquo;"
-    previous_label: "&laquo; précédent"
+    previous_label: "&laquo; précédent"
\ No newline at end of file
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 2e83d2917..cc77056c0 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -182,7 +182,6 @@ he:
       success: " #sayhello !בוא נראה מה יש להם להגיד"
   bookmarklet:
     explanation: "פרסום ישירות לדיאספורה מכל מקום על ידי הוספת %{link} לסימניות."
-    explanation_link_text: "קישור זה"
     heading: "סימנייה"
     post_something: "פרסום משהו לתוך דיאספורה"
     post_success: "פורסם! נסגר!"
@@ -273,20 +272,6 @@ he:
   fill_me_out: "נא לרשום אותי"
   find_people: "חיפוש אנשים או #תגיות"
   hide: "הסתרה"
-  home:
-    show:
-      already_account: "כבר יש לך חשבון"
-      choice: "בחירה"
-      choice_explanation: "מערכת דיאספורה מאפשרת לך לסדר את אנשי הקשר שלך לקבוצות הנקראות היבטים. תכונה זו הנה ייחודית לדיאספורה, היבטים מסייעים לך לוודא שהתמונות, הסיפורים והבדיחות שלך ישותפו רק עם אלו להם ייעדת אותם"
-      learn_about_host: "הסברים בנוגע לאחסון שרת דיאספורה משלך"
-      login_here: "הכניסה מכאן"
-      ownership: "בעלות"
-      ownership_explanation: "התמונות שלך הן בבעלותך, ואין עליך לוותר עליהן רק כדי לשתף אותן. הבעלות הבלעדית על מה שמשותף בדיאספורה על ידיך היא שלך, כך ניתנת לך השליטה על האופן בו מופץ המידע שלך"
-      share_what_you_want: "שתף מה שבא לך, עם מי שבא לך"
-      simplicity: "פשטות"
-      simplicity_explanation: "דיאספורה מאפשרת לך לשתף בצורה נקייה ונוחה - ואמרה זו נוגעת גם לשמירה על פרטיותך. דיאספורה מאפשרת להוריש את הגדרות הפרטיות בין הפריטים השונים ובכך נחסך ממך השיטוט בנבכי עמודי ההגדרות והאפשרויות רק כדי לדאוג שהפרופיל שלך יהיה מאובטח"
-      tagline_first_half: "שיתוף מה שבא לך"
-      tagline_second_half: "עם מי שבא לך"
   invitation_codes:
     excited: "%{name} מתרגש לראות אותך כאן "
   invitations:
@@ -478,10 +463,9 @@ he:
       message: |-
           שלום!
           קיבלת הזמנה להצטרף ל Diaspora
-          לחץ כאן כדי להתחיל [%{invite_url}][1]
+          לחץ כאן כדי להתחיל %{invite_url}
           בברכה,
           צוות Diaspora
-          [1]: %{invite_url}
     invited_you: "%{name} הזמין אותך ל Diaspora"
     liked:
       liked: "התעניין ברשומה שלך %{name} "
@@ -1011,4 +995,4 @@ he:
   welcome: "!ברוך הבא"
   will_paginate:
     next_label: "»הבא "
-    previous_label: "«הקודם"
+    previous_label: "«הקודם"
\ No newline at end of file
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 11985417c..4d298f0d8 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -50,6 +50,8 @@ hu:
       weekly_user_stats: "Heti statisztika"
     correlations:
       correlations_count: "Belépések számával való korrelációk:"
+    stats:
+      go: "mehet"
     user_search:
       add_invites: "meghívók hozzáadása"
       email_to: "a meghívandó személy email címe"
@@ -201,8 +203,7 @@ hu:
       success: "Lássuk mit akarnak mondani! #sayhello"
   bookmarklet:
     explanation: "Küldj bejegyzést a Diaspora-ra bárhonnan, csak mentsd el könyvjelzőként %{link}."
-    explanation_link_text: "ezt a linket"
-    heading: "Könyvjelzők"
+    heading: "Könyvjelző"
     post_something: "Írj valamit a Diasporára"
     post_success: "Elküldve! Bezárás!"
   cancel: "Mégsem"
@@ -292,20 +293,6 @@ hu:
   fill_me_out: "Töltsd ki"
   find_people: "Emberek vagy #címkék keresése"
   hide: "Elrejt"
-  home:
-    show:
-      already_account: "már van fiókod?"
-      choice: "Szabadság"
-      choice_explanation: "A Diaspora* lehetővé teszi, hogy tetszőleges szempontok alapján Csoportokba rendezd a kapcsolataidat. Így mindig a megfelelő emberekkel oszthatod meg a történeteidet, vicceidet, képeidet."
-      learn_about_host: "Így indíthatsz el saját Diaspora* szervert."
-      login_here: "Jelentkezz be"
-      ownership: "Biztonság"
-      ownership_explanation: "A képeid a sajátjaid, és ezt nem kell feladnod, hogy megoszthasd őket másokkal. Minden megosztás felett teljes irányításod van a Diaspora* közösségi oldalon."
-      share_what_you_want: "Ossz meg bármit... akivel szeretnél!"
-      simplicity: "Egyszerűség"
-      simplicity_explanation: "A Diaspora megkönnyíti és átláthatóvá teszi a megosztást - és ez a személyes dolgaidra is vonatkozik. Nem kell hosszú beállító oldalakon átvergődnöd, hogy biztonságban tudd a profilodat."
-      tagline_first_half: "Ossz meg bármit..."
-      tagline_second_half: "akivel akarod!"
   invitation_codes:
     excited: "%{name} alig várja, hogy üdvözölhessen nálunk."
   invitations:
@@ -502,14 +489,12 @@ hu:
 
           Kattints erre a linkre a kezdéshez:
 
-          [%{invite_url}][1]
+          %{invite_url}
 
 
           üdv:
 
           a Diaspora* levélküldő automatája
-
-          [1]: %{invite_url}
     invited_you: "%{name} meghívott a Diaspora-ra"
     liked:
       liked: "%{name} kedveli a bejegyzésedet"
@@ -693,7 +678,7 @@ hu:
     new:
       create_my_account: "Fiók létrehozása!"
       enter_email: "Írd be az e-mail címed"
-      enter_password: "Írj be egy jelszót"
+      enter_password: "Adj meg egy jelszót (legalább hat karakterből álljon)"
       enter_password_again: "Ugyanazt a jelszót írd amit az előbb"
       enter_username: "Válassz egy felhasználónevet (csak angol betű, szám és aláhúzás engedett)"
       join_the_movement: "Csatlakozz!"
@@ -749,7 +734,7 @@ hu:
     finder:
       fetching_contacts: "A Diaspora keresi a %{service} ismerőseidet, nézz vissza néhány perc múlva."
       no_friends: "Nincs Facebook ismerősöd"
-      service_friends: "%{service} ismerős"
+      service_friends: "%{service} ismerősök"
     index:
       connect_to_facebook: "Csatlakozás a Facebook-hoz"
       connect_to_tumblr: "Csatlakozás a Tumblr-hez"
@@ -1030,4 +1015,4 @@ hu:
   welcome: "Üdv!"
   will_paginate:
     next_label: "következő &raquo;"
-    previous_label: "&laquo; előző"
+    previous_label: "&laquo; előző"
\ No newline at end of file
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 120d01899..f10d98007 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -62,7 +62,6 @@ id:
     zero: "no aspects"
   bookmarklet:
     explanation: "%{link} from anywhere by bookmarking this link."
-    explanation_link_text: "Post to Diaspora"
     heading: "Diaspora Bookmarklet"
   cancel: "Batal"
   comments:
@@ -91,13 +90,6 @@ id:
       correct_the_following_errors_and_try_again: "Perbaiki kesalahan berikut dan coba lagi."
       invalid_fields: "Field tidak valid"
   find_people: "Find people"
-  home:
-    show:
-      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"
-      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: "Bagikan apa yang anda ingin bagikan, pada orang yang anda kehendaki."
-      simplicity_explanation: "Diaspora makes sharing clean and easy – this goes doubly so for privacy. Innherently private, Diaspora doesn’t have pages of settings and options to wade through to keep your profile secure and to your liking."
   invitations:
     check_token:
       not_found: "Token undangan tidak ditemukan"
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index 861a7a037..6f70934d8 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -111,7 +111,6 @@ is:
   back: "Til baka"
   bookmarklet:
     explanation: "%{link} from anywhere by bookmarking this link."
-    explanation_link_text: "Post to Diaspora"
     heading: "Diaspora Bookmarklet"
   cancel: "Hætta við"
   comments:
@@ -151,20 +150,6 @@ is:
       correct_the_following_errors_and_try_again: "Það þarf að lagfæra eftirfarandi villur og reyna síðan aftur. "
   fill_me_out: "Fylla út"
   find_people: "Find people"
-  home:
-    show:
-      already_account: "nú þegar með notandastillingar?"
-      choice: "Valkostur"
-      choice_explanation: "Diaspora gerir þér kleift að raða tengingum í hópa sem kallast ásýndir. Einungis í Diaspora tryggja ásýndir að myndir þínar, sögur og brandarar séu einungis samnýtt með þeim sem þú ætlar. "
-      learn_about_host: "Lærðu hvernig á að hýsa sinn eigin Diaspora miðlara."
-      login_here: "innskráning hér"
-      ownership: "Eignarréttur"
-      ownership_explanation: "Þú átt þínar myndir og þú ættir ekki að þurfa að gefa þær frá þér þótt þú deilir þeim. Þú heldur eign þinni á öllu því sem þú deilir um Diaspora, sem gefur þér fulla stjórn á því hvernig því er dreift."
-      share_what_you_want: "Deildu því sem þú vilt, með þeim sem þú vilt."
-      simplicity: "Einfaldleiki"
-      simplicity_explanation: "Diaspora gerir samnýtingu hreina og auðvelda - og það gildir líka fyrir friðhelgi. Þar sem Diaspora er í eðli sínu persónulegt, þarftu ekki að vaða í gegnum síður með stillingum og möguleikum til að halda síðunni þinni öruggri."
-      tagline_first_half: "Deildu því sem þú vilt,"
-      tagline_second_half: "með þeim sem þú vilt."
   invitations:
     create:
       already_contacts: "Þú tengist þessari manneskju nú þegar"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index c166407be..0a4a35dd8 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -54,7 +54,7 @@ it:
       go: "vai"
     user_search:
       add_invites: "aggiungi inviti"
-      email_to: "Email per l'invito"
+      email_to: "Email da invitare"
       users:
         one: "trovato %{count} utente"
         other: "trovati %{count} utenti"
@@ -78,7 +78,7 @@ it:
   aspects:
     add_to_aspect:
       failure: "Errore nell'aggiungere il contatto all'aspetto."
-      success: "Contatto aggiunto con successo all'aspetto."
+      success: "Il contatto è stato aggiunto all'aspetto."
     aspect_contacts:
       done_editing: "modifica eseguita"
     aspect_listings:
@@ -88,7 +88,7 @@ it:
       select_all: "Seleziona tutti"
     aspect_stream:
       stay_updated: "Segui lo stream"
-      stay_updated_explanation: "Lo stream è popolato da tutti i tuoi contatti, dai tag che segui e dai post di alcuni membri della comunità particolarmente creativi."
+      stay_updated_explanation: "Lo stream è popolato da tutti i tuoi contatti, dai tag che segui e dai post dei membri più creativi della comunità."
     contacts_not_visible: "I contatti in questo aspetto non potranno vedersi tra loro."
     contacts_visible: "I contatti in questo aspetto potranno vedersi tra loro."
     create:
@@ -102,7 +102,7 @@ it:
       aspect_list_is_not_visible: "la lista dei contatti non è visibile a chi è nell'aspetto"
       aspect_list_is_visible: "la lista dei contatti è visibile a chi è nell'aspetto"
       confirm_remove_aspect: "Sei sicuro di voler eliminare questo aspetto?"
-      done: "Completato"
+      done: "Fatto"
       make_aspect_list_visible: "Vuoi che i contatti di questo aspetto vedano gli altri che ne fanno parte?"
       remove_aspect: "Elimina questo aspetto"
       rename: "rinomina"
@@ -126,7 +126,7 @@ it:
       handle_explanation: "Questo è il tuo ID su Diaspora. Lo puoi dare alle persone per farti trovare, come un indirizzo email."
       help:
         do_you: "Vuoi..."
-        email_feedback: "Se preferisci, manda un feedback via %{link}"
+        email_feedback: "Se preferisci, manda un feedback a %{link}"
         feature_suggestion: "...proporre un'%{link}?"
         find_a_bug: "...segnalare un %{link}?"
         have_a_question: "...fare una %{link}?"
@@ -161,12 +161,12 @@ it:
       create: "Crea"
       name: "Nome (visibile solo a te)"
     no_contacts_message:
-      community_spotlight: "le persone in evidenza nella comunità"
-      or_spotlight: "Oppure puoi condividere con %{link}"
+      community_spotlight: "in evidenza nella comunità"
+      or_spotlight: "Oppure puoi iniziare a condividere con %{link}"
       try_adding_some_more_contacts: "Puoi cercare o invitare altri contatti."
       you_should_add_some_more_contacts: "Dovresti aggiungere qualche altro contatto!"
     no_posts_message:
-      start_talking: "Ancora nessuno ha scritto nulla. Inizia la conversazione!"
+      start_talking: "Ancora nessuno ha scritto nulla!"
     one: "1 aspetto"
     other: "%{count} aspetti"
     seed:
@@ -175,10 +175,10 @@ it:
       friends: "Amici"
       work: "Lavoro"
     selected_contacts:
-      manage_your_aspects: "Amministra gli aspetti della tua vita"
+      manage_your_aspects: "Modifica gli aspetti."
       no_contacts: "Ancora non hai contatti."
-      view_all_community_spotlight: "Tutte le persone in evidenza"
-      view_all_contacts: "Visualizza tutti i contatti"
+      view_all_community_spotlight: "Tutti gli utenti in evidenza"
+      view_all_contacts: "Mostra tutti i contatti"
     show:
       edit_aspect: "modifica aspetto"
     two: "%{count} aspetti"
@@ -203,10 +203,9 @@ it:
       failure: "Non posso smettere di ignorare l'utente. #evasion"
       success: "Vediamo cosa hanno da dire! #sayhello"
   bookmarklet:
-    explanation: "Condividi su Diaspora in qualsiasi momento aggiungendo tra i preferiti %{link}."
-    explanation_link_text: "questo link"
+    explanation: "Condividi su Diaspora quando vuoi aggiungendo %{link} tra i preferiti."
     heading: "Bookmarklet"
-    post_something: "Pubblica qualcosa su Diaspora"
+    post_something: "Pubblica su Diaspora"
     post_success: "Inviato! Chiusura in corso!"
   cancel: "Annulla"
   comments:
@@ -228,12 +227,12 @@ it:
       add_to_aspect: "aggiungi i contatti a %{name}"
       add_to_aspect_link: "aggiungi contatti a %{name}"
       all_contacts: "Tutti i contatti"
-      community_spotlight: "in evidenza"
+      community_spotlight: "In evidenza nella comunità"
       many_people_are_you_sure: "Stai inviando un messaggio privato a più di %{suggested_limit} contatti. Vuoi farlo davvero? Forse potrebbe essere più opportuno pubblicarlo su un aspetto!"
       my_contacts: "I miei contatti"
       no_contacts: "Probabilmente devi aggiungere qualche contatto!"
-      no_contacts_message: "Guarda gli utenti %{community_spotlight}"
-      no_contacts_message_with_aspect: "Guarda gli utenti %{community_spotlight} oppure %{add_to_aspect_link}"
+      no_contacts_message: "Scopri gli utenti %{community_spotlight}"
+      no_contacts_message_with_aspect: "Scopri gli utenti %{community_spotlight} oppure %{add_to_aspect_link}"
       only_sharing_with_me: "Condividono con me"
       remove_person_from_aspect: "Rimuovi %{person_name} da \"%{aspect_name}\""
       start_a_conversation: "Inizia una conversazione"
@@ -245,7 +244,7 @@ it:
     sharing:
       people_sharing: "Persone che condividono con te:"
     spotlight:
-      community_spotlight: "In evidenza dalla comunità"
+      community_spotlight: "In evidenza nella comunità"
     two: "%{count} contatti"
     zero: "contatti"
   conversations:
@@ -292,20 +291,6 @@ it:
   fill_me_out: "Scrivi qui"
   find_people: "Cerca persone o #tag"
   hide: "Nascondi"
-  home:
-    show:
-      already_account: "hai già un account?"
-      choice: "Scelta"
-      choice_explanation: "Diaspora ti permette di suddividere i tuoi contatti in gruppi chiamati aspetti. Solo su Diaspora, gli aspetti fanno sì che le foto, i racconti e gli scherzi siano condivisi solamente con le persone che desideri."
-      learn_about_host: "Impara come creare il tuo server Diaspora."
-      login_here: "accedi qui"
-      ownership: "Proprietà"
-      ownership_explanation: "Su Diaspora possiedi le tue foto, se le vuoi condividere non hai l'obbligo di cedere i diritti d'uso a nessun altro. Tutto ciò che pubblichi rimane tuo ed hai il controllo sulla sua diffusione."
-      share_what_you_want: "Condividi ciò che vuoi, con chi vuoi."
-      simplicity: "Semplicità"
-      simplicity_explanation: "Diaspora permette una condivisione facile e veloce - e lo stesso accade per la gestione della privacy. Essendo riservata per natura, Diaspora non ti fa smarrire tra paginate di impostazioni e opzioni se vuoi tenere il tuo profilo sicuro."
-      tagline_first_half: "Condividi ciò che desideri,"
-      tagline_second_half: "con chi vuoi."
   invitation_codes:
     excited: "%{name} è entusiasta di vederti qui."
   invitations:
@@ -318,7 +303,7 @@ it:
       no_more: "Non hai più inviti a disposizione"
       own_address: "Non puoi inviare un invito al tuo indirizzo."
       rejected: "Questi indirizzi email hanno dei problemi:"
-      sent: "Il tuoi inviti sono stati inviati a:"
+      sent: "Gli inviti sono stati inviati a: "
     edit:
       accept_your_invitation: "Accetta il tuo invito"
       your_account_awaits: "Il tuo account ti aspetta!"
@@ -337,8 +322,8 @@ it:
       paste_link: "Condividi questo link con i tuoi amici per invitarli su Diaspora*, puoi anche inviarlo per email."
       personal_message: "Messaggio privato"
       resend: "Invia di nuovo"
-      send_an_invitation: "Invia un invito"
-      send_invitation: "Invito inviato"
+      send_an_invitation: "Spedisci un invito"
+      send_invitation: "Invito spedito"
       to: "A"
   layouts:
     application:
@@ -451,11 +436,8 @@ it:
       zero: "%{actors} ti ha menzionato in un post che è stato eliminato."
     post: "post"
     private_message:
-      few: "%{actors} ti hanno inviato un messaggio."
-      many: "%{actors} ti hanno inviato un messaggio."
       one: "%{actors} ti ha inviato un messaggio."
-      other: "%{actors} ti ha inviato un messaggio."
-      two: "%{actors} ti hanno inviato un messaggio."
+      other: "%{actors} ti hanno inviato un messaggio."
       zero: "%{actors} ti ha inviato un messaggio."
     reshared:
       one: "%{actors} ha condiviso il tuo %{post_link}."
@@ -494,14 +476,12 @@ it:
 
           Clicca questo link per cominciare
 
-          [%{invite_url}][1]
+          %{invite_url}
 
 
           Con affetto,
 
           Il robot di Diaspora*
-
-          [1]: %{invite_url}
     invited_you: "%{name} ti ha invitato su Diaspora*"
     liked:
       liked: "A %{name} piace il tuo post"
@@ -513,10 +493,10 @@ it:
       reply_to_or_view: "Rispondi o leggi questa conversazione >"
     reshared:
       reshared: "%{name} ha condiviso il tuo post"
-      view_post: "Vedi il post >"
+      view_post: "Leggi il post >"
     single_admin:
-      admin: "Il tuo amministratore Diaspora"
-      subject: "Un messaggio sul tuo account Diaspora:"
+      admin: "L'amministratore di Diaspora"
+      subject: "Novità sul tuo account Diaspora:"
     started_sharing:
       sharing: "ha iniziato a condividere con te!"
       subject: "%{name} ha iniziato a condividere con te su Diaspora*"
@@ -545,7 +525,7 @@ it:
       no_one_found: "...e nessuno è stato trovato."
       no_results: "Ehi! Devi inserire qualcosa da cercare."
       results_for: "risultati della ricerca di"
-      searching: "ricerca in corso..."
+      searching: "ricerca in corso, devi avere pazienza..."
     last_post: "Ultimo post"
     many: "%{count} persone"
     one: "una persona"
@@ -567,12 +547,12 @@ it:
     show:
       closed_account: "Questo account è stato chiuso."
       does_not_exist: "La persona non esiste!"
-      has_not_shared_with_you_yet: "%{name} non ha ancora condiviso nessun post con te!"
+      has_not_shared_with_you_yet: "%{name} non ha ancora condiviso dei post con te!"
       ignoring: "Stai ignorando tutti i post di %{name}."
       incoming_request: "%{name} vuole condividere con te"
       mention: "Menziona"
       message: "Messaggio"
-      not_connected: "Non sei in contatto con %{name}"
+      not_connected: "Non stai condividendo i post con questa persona"
       recent_posts: "Post recenti"
       recent_public_posts: "Post pubblici recenti"
       return_to_aspects: "Torna alla pagina dei tuoi aspetti"
@@ -591,8 +571,8 @@ it:
     comment_email_subject: "La foto di %{name}"
     create:
       integrity_error: "Il caricamento della foto non è riuscito. Sei sicuro che fosse un'immagine?"
-      runtime_error: "La fotografia non si è caricata. Hai dimenticato forse di allacciare la cintura?"
-      type_error: "Errore nel caricare la foto.  Sei sicuro di aver aggiunto un'immagine?"
+      runtime_error: "Il caricamento della foto non è riuscito. Hai dimenticato di allacciare la cintura?"
+      type_error: "Il caricamento della foto non è riuscito. Sei sicuro che fosse un'immagine?"
     destroy:
       notice: "Foto eliminata."
     edit:
@@ -607,7 +587,7 @@ it:
       size_error: "{file} è troppo grande, la dimensione massima è {sizeLimit}."
     new_profile_photo:
       or_select_one_existing: "oppure seleziona una delle %{photos} che hai caricato"
-      upload: "Carica una nuova foto profilo!"
+      upload: "Carica una nuova foto nel profilo!"
     photo:
       view_all: "guarda tutte le foto di %{name}"
     show:
@@ -619,14 +599,14 @@ it:
       show_original_post: "Mostra il post originale"
       update_photo: "Aggiorna foto"
     update:
-      error: "Modifica della foto fallita."
+      error: "La modifica della foto non è riuscita."
       notice: "Foto aggiornata con successo."
   posts:
     presenter:
       title: "Un post di %{name}"
     show:
       destroy: "Elimina"
-      not_found: "Ci scusiamo, non possiamo trovare il post."
+      not_found: "Scusa, non riusciamo a trovare il post."
       permalink: "permalink"
       photos_by:
         few: "%{count} foto di %{author}"
@@ -647,7 +627,7 @@ it:
       first_name: "Nome"
       last_name: "Cognome"
       update_profile: "Aggiorna il profilo"
-      you_are_nsfw: "Hai impostato tutti i tuoi messaggi come non adatti ad un luogo di lavoro (NSFW), i tuoi contenuti non compariranno alle persone che non vogliono ricevere materiale sconveniente."
+      you_are_nsfw: "Hai impostato tutti i tuoi post come \"NSFW\" (cioè non adatti ad un luogo di lavoro). I tuoi contenuti non compariranno alle persone che non vogliono ricevere materiale sconveniente."
       you_are_safe_for_work: "Hai impostato il tuo utente come \"sicuro\", cioè i contenuti che invierai rispetteranno le linee guida della comunità."
       your_bio: "La tua biografia"
       your_birthday: "Il tuo compleanno"
@@ -658,7 +638,7 @@ it:
       your_private_profile: "Il tuo profilo privato"
       your_public_profile: "Il tuo profilo pubblico"
       your_tags: "Descriviti con 5 #tag"
-      your_tags_placeholder: "per esempio #cinema #viaggi #gattini #musica #perugia"
+      your_tags_placeholder: "per esempio #cinema #viaggi #gattini #musica #cagliari"
     update:
       failed: "Aggiornamento del profilo non riuscito"
       updated: "Profilo aggiornato"
@@ -671,11 +651,11 @@ it:
     two: "%{count} risposte"
     zero: "0 risposte"
   registrations:
-    closed: "Le iscrizioni sono chiuse su questo pod Diaspora."
+    closed: "Su questo pod Diaspora le iscrizioni sono chiuse."
     create:
       success: "Ora fai parte di Diaspora!"
     edit:
-      cancel_my_account: "Cancella il mio account"
+      cancel_my_account: "Elimina il mio account"
       edit: "Modifica %{name}"
       leave_blank: "(lascia vuoto se non vuoi modificare)"
       password_to_confirm: "(abbiamo bisogno della tua password attuale per confermare le modifiche)"
@@ -685,9 +665,9 @@ it:
     new:
       create_my_account: "Crea il mio account!"
       enter_email: "Inserisci un indirizzo email"
-      enter_password: "Inserisci una password"
-      enter_password_again: "Inserisci la stessa password di prima"
-      enter_username: "Scegli un nome utente (inserisci solo lettere, numeri e trattino basso)"
+      enter_password: "Scegli una password (minimo 6 caratteri)"
+      enter_password_again: "Scrivi di nuovo la password per verifica"
+      enter_username: "Scegli un nome utente (usa solo lettere, numeri e trattino basso)"
       join_the_movement: "Partecipa al movimento!"
       sign_up_message: "Il Social Network con un ♥ così"
   requests:
@@ -697,7 +677,7 @@ it:
     destroy:
       error: "Seleziona un aspetto!"
       ignore: "Richiesta di contatto ignorata."
-      success: "Hai attivato la condivisione"
+      success: "Hai iniziato a condividere."
     helper:
       new_requests:
         few: "%{count} nuove richieste!"
@@ -728,15 +708,15 @@ it:
   search: "Cerca"
   services:
     create:
-      already_authorized: "L'account %{service_name} specificato è già stato autorizzato dall'utente con ID %{diaspora_id}."
+      already_authorized: "L'account %{service_name} specificato è già stato autorizzato dall'utente diaspora con ID %{diaspora_id}."
       failure: "Autenticazione fallita."
       success: "Autenticazione avvenuta con successo."
     destroy:
-      success: "Autenticazione cancellata con successo."
+      success: "Autenticazione rimossa con successo."
     failure:
       error: "si è verificato un errore durante la connessione a quel servizio"
     finder:
-      fetching_contacts: "Diaspora sta importando i tuoi amici di %{service}, il risultato sarà visibile tra alcuni minuti."
+      fetching_contacts: "Diaspora sta importando i tuoi amici su %{service}, il risultato sarà visibile tra alcuni minuti."
       no_friends: "Non ho trovato amici su Facebook."
       service_friends: "Amici su %{service}"
     index:
@@ -750,11 +730,11 @@ it:
       really_disconnect: "disconnettere %{service}?"
     inviter:
       click_link_to_accept_invitation: "Vai a questo indirizzo per accettare l'invito"
-      join_me_on_diaspora: "Vieni anche tu su DIASPORA*"
+      join_me_on_diaspora: "Vieni con me su DIASPORA*"
     remote_friend:
       invite: "invita"
       not_on_diaspora: "Non ancora su Diaspora"
-      resend: "reinvia"
+      resend: "invia di nuovo"
   settings: "Impostazioni"
   share_visibilites:
     update:
@@ -784,21 +764,21 @@ it:
       your_aspects: "i tuoi aspetti"
     invitations:
       by_email: "Via email"
-      dont_have_now: "Non ne hai alcuno per il momento, ma altri arriveranno presto!"
+      dont_have_now: "Per il momento non ne hai, ma altri arriveranno presto!"
       from_facebook: "Da Facebook"
       invitations_left: "%{count} rimanenti"
       invite_someone: "Invita qualcuno"
       invite_your_friends: "Invita i tuoi amici"
       invites: "Inviti"
-      invites_closed: "Al momento gli inviti sono chiusi su questo pod Diaspora."
+      invites_closed: "Al momento non è permesso spedire inviti per questo pod Diaspora."
     notification:
       new: "Nuovo %{type} da %{from}"
     public_explain:
       atom_feed: "Atom feed"
       control_your_audience: "Controlla il tuo pubblico"
-      logged_in: "accesso effettuato a %{service}"
+      logged_in: "accesso effettuato su %{service}"
       manage: "gestisci i servizi collegati"
-      new_user_welcome_message: "Usa i #tag per classificare i post e trovare chi ha i tuoi stessi interessi. Richiama l'attenzione delle persone più in gamba con le @Menzioni"
+      new_user_welcome_message: "Usa i #tag per classificare i post e trovare chi ha i tuoi stessi interessi. Richiama l'attenzione di chi vuoi usando le @Menzioni"
       outside: "I messaggi pubblici saranno visibili a persone al di fuori di Diaspora."
       share: "Condividi"
       title: "Configura i servizi collegati"
@@ -823,14 +803,14 @@ it:
     reshare:
       reshare: "Condividi"
     stream_element:
-      connect_to_comment: "Connettiti con questo utente per commentare il post"
+      connect_to_comment: "Segui questo utente per commentare il post"
       currently_unavailable: "al momento non è possibile commentare"
       dislike: "Non mi piace"
       hide_and_mute: "Nascondi il post e disattiva le notifiche"
       ignore_user: "Ignora %{name}"
       ignore_user_description: "Vuoi ignorare questo utente e rimuoverlo da tutti gli aspetti?"
       like: "Mi piace"
-      nsfw: "Questo post è stato dichiarato dal suo autore non adatto a un luogo di lavoro (NSFW). %{link}"
+      nsfw: "Questo post è stato segnato dall'autore come NSFW (non adatto a un luogo di lavoro). %{link}"
       shared_with: "Condiviso con: %{aspect_names}"
       show: "mostra"
       unlike: "Non mi piace più"
@@ -841,7 +821,7 @@ it:
     create:
       success: "Menzionati con successo: %{names}"
     destroy:
-      failure: "Eliminazione post non riuscita"
+      failure: "L'eliminazione del post non è riuscita"
     helper:
       no_message_to_display: "Nessun messaggio da visualizzare."
     new:
@@ -871,7 +851,7 @@ it:
     comment_stream:
       contacts_title: "Persone a cui hai commentato i post"
       title: "Post commentati"
-    community_spotlight_stream: "In evidenza dalla comunità"
+    community_spotlight_stream: "In evidenza nella comunità"
     followed_tag:
       add_a_tag: "Aggiungi un tag"
       contacts_title: "Persone con questi tag"
@@ -901,7 +881,7 @@ it:
       none: "Non puoi seguire un tag vuoto!"
       success: "Fantastico! Hai iniziato a seguire #%{name}."
     destroy:
-      failure: "Non è stato possibile smettere di seguire #%{name}. Avevi già smesso di seguirlo?"
+      failure: "Non è stato possibile smettere di seguire #%{name}. Lo stavi ancora seguendo?"
       success: "Peccato! Hai appena smesso di seguire #%{name}."
   tags:
     show:
@@ -921,11 +901,11 @@ it:
       daniels_account: "account Diaspora di Daniel"
       love_to_try: "Ci farebbe piacere che tu lo provassi."
       making_the_connection: "Effettua la connessione"
-      screenshot_explanation: "%{link1}.  Questa pagina di cubby è collegata all' %{link2}."
+      screenshot_explanation: "%{link1}. Questa pagina di cubby è collegata a %{link2}."
       sign_up_today: "Registrati oggi!"
-      typical_userpage: "Una tipica pagina utente di cubbi.es"
+      typical_userpage: "Una tipica pagina personale su cubbi.es"
       via: "(via %{link})"
-      what_is_cubbies: "Cubbi.es è la prima applicazione Diaspora nel mondo.  E' anche il miglior modo di raccogliere le foto online."
+      what_is_cubbies: "Cubbi.es è la prima applicazione Diaspora al mondo. È anche il miglior modo di raccogliere le foto online."
   undo: "Annullare?"
   username: "Nome Utente"
   users:
@@ -935,11 +915,11 @@ it:
     destroy:
       no_password: "Per favore inserisci la password per chiudere l'account."
       success: "Il tuo account è stato bloccato. Il processo di chiusura dovrebbe essere completato in circa 20 minuti. Grazie per aver provato Diaspora."
-      wrong_password: "Hai inserito una password che non corrisponde a quella attuale."
+      wrong_password: "La password inserita non corrisponde."
     edit:
       also_commented: "...qualcuno commenta un post dopo di te?"
-      auto_follow_aspect: "Aspetto per gli utenti seguiti in automatico:"
-      auto_follow_back: "Segui automaticamente tutti coloro che iniziano a seguirti"
+      auto_follow_aspect: "Scegli un aspetto per gli utenti seguiti in automatico:"
+      auto_follow_back: "Segui automaticamente chi inizia a seguirti"
       change: "Cambia"
       change_email: "Cambia email"
       change_language: "Cambia lingua"
@@ -950,7 +930,7 @@ it:
         if_you_want_this: "Se vuoi davvero farlo, scrivi la tua password e clicca sul bottone 'Chiudi l'account'"
         lock_username: "Questa operazione bloccherà il tuo nome utente, nel caso che tu volessi iscriverti nuovamente non potrai usarlo."
         locked_out: "Sarai disconnesso e non potrai più accedere al tuo account."
-        make_diaspora_better: "Vorremmo che tu ci aiutassi a migliorare Diaspora, considera che puoi darci una mano invece di lasciare il servizio. Se sei davvero convinto, vogliamo che tu sappia come funzionerà la rimozione del tuo account."
+        make_diaspora_better: "Vorremmo che tu ci aiutassi a migliorare Diaspora, considera che puoi darci una mano invece di andare via. Se sei davvero convinto, vogliamo che tu sappia come funzionerà la rimozione del tuo account."
         mr_wiggles: "Il Fantasma Formaggino ti perseguiterà perché te ne vai!"
         no_turning_back: "Al momento, non è possibile tornare indietro."
         what_we_delete: "Cancelleremo tutti i tuoi post e i dati del profilo nel tempo più breve possibile. I commenti che hai lasciato rimarranno abbinati al tuo ID Diaspora."
@@ -961,7 +941,7 @@ it:
       download_photos: "scarica le mie foto"
       download_xml: "scarica il mio xml"
       edit_account: "Modifica account"
-      email_awaiting_confirmation: "È stato spedito su %{unconfirmed_email} un link di attivazione. Continueremo ad usare la tua email originale %{email} finché non cliccherai sul link e attiverai il nuovo indirizzo."
+      email_awaiting_confirmation: "Il link di attivazione è stato spedito a %{unconfirmed_email}. Continueremo ad usare la tua email originale %{email} finché non cliccherai sul link e attiverai il nuovo indirizzo."
       export_data: "Esporta Dati"
       following: "Impostazioni dei contatti"
       getting_started: "Preferenze nuovo utente"
@@ -972,7 +952,7 @@ it:
       private_message: "...hai ricevuto un messaggio privato?"
       receive_email_notifications: "Ricevi notifiche via email quando..."
       reshared: "...qualcuno condivide un tuo post?"
-      show_community_spotlight: "Vuoi vedere gli utenti in evidenza nel tuo Stream?"
+      show_community_spotlight: "Vuoi vedere nel tuo Stream anche gli utenti in evidenza?"
       show_getting_started: "Riattiva la Guida iniziale"
       started_sharing: "...qualcuno vuole condividere con te?"
       stream_preferences: "Preferenze dello Stream"
@@ -1011,10 +991,10 @@ it:
   webfinger:
     fetch_failed: "impossibile recuperare il profilo webfinger da %{profile_url}"
     hcard_fetch_failed: "impossibile recuperare l'hcard di %{account}"
-    no_person_constructed: "Non si può risalire a neanche una persona da questa hcard."
+    no_person_constructed: "Non si può risalire a una persona da questa hcard."
     not_enabled: "webfinger non attivo sull'host di %{account}"
     xrd_fetch_failed: "impossibile recuperare il xrd dall'account %{account}"
   welcome: "Benvenuto!"
   will_paginate:
     next_label: "successivo &raquo;"
-    previous_label: "&laquo; precedente"
+    previous_label: "&laquo; precedente"
\ No newline at end of file
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index 0e5e168be..abab2b06f 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -118,7 +118,6 @@ ja:
   back: "前へ"
   bookmarklet:
     explanation: "このリンクをお気に入りに登録すると、どこからでも%{link}できます。"
-    explanation_link_text: "ダイアスポラに投稿"
     heading: "Diaspora Bookmarklet"
     post_something: "ダイアスポラに投稿"
     post_success: "投稿完了！ウィンドウを閉じます。"
@@ -186,20 +185,6 @@ ja:
   fill_me_out: "記入して"
   find_people: "Find people"
   hide: "隠す"
-  home:
-    show:
-      already_account: "アカウントは既にお持ちですか。"
-      choice: "自由"
-      choice_explanation: "ダイアスポラ＊で連絡先をアスペクトと呼ばれる集団に分けることができます。アスペクトはダイアスポラ＊独特の機能で、これによってあなたの写真、話、冗談などが目的の知り合いだけに共有されることが保証されます。"
-      learn_about_host: "ダイアスポラ＊サーバーの立ち上げ方をお教えします。"
-      login_here: "ここからログイン"
-      ownership: "所有"
-      ownership_explanation: "写真は自分の持ち物で、シェアしたいからと言って権利を譲る必要はありません。ダイアスポラでシェアしたものでも所有権は保全されますので、自由に配給などを制御することができます。"
-      share_what_you_want: "好きなものだけを、好きな人だけに。"
-      simplicity: "平易"
-      simplicity_explanation: "ダイアスポラ＊は簡潔に共有を可能にしながら、プライバシーも簡潔にします。ダイアスポラ＊は根本的なプライバシー主義で、プロフィールを保護するために何ページもの複雑な設定を使いこなす必要はありません。"
-      tagline_first_half: "好きなことだけ共有する"
-      tagline_second_half: "好きな人に。"
   invitations:
     check_token:
       not_found: "招待トークンが見つかりません。"
diff --git a/config/locales/diaspora/ka.yml b/config/locales/diaspora/ka.yml
index 64e0d609c..15aba6d7d 100644
--- a/config/locales/diaspora/ka.yml
+++ b/config/locales/diaspora/ka.yml
@@ -154,19 +154,6 @@ ka:
   fill_me_out: "შევსება"
   find_people: "იპოვეთ ადამიანები ან #ტეგები"
   hide: "დამალვა"
-  home:
-    show:
-      already_account: "უკვე გაქვთ ანგარიში?"
-      choice: "არჩევანი"
-      choice_explanation: "დიასპორა საშუალებას გაძლევთ თქვენი კავშირები დააჯგუფოთ ეგრედ წოდებულ ასპექტებში. ეს არის დიასპორის უნიკალური ფუნქცია, რაც უზრუნველყოფს რომ თქვენი ფოტოები, ამბები და ხუმრობები გაზიარდება მხოლოდ იმ ხალხთან რომელთანაც თქვენ გსურთ."
-      learn_about_host: "გაიგეთ თუ როგორ ხდება დიასპორის საკუთარი სერვერის დაჰოსტვა."
-      login_here: "შემოდით აქ"
-      ownership: "მფლობელობა"
-      ownership_explanation: "თქვენ ფლობთ თქვენს სურათებს, და ამ უფლებებს არც მათი გაზიარების შემდეგ კარგავთ. თქვენ ინარჩუნებთ იმ ყველაფრის საავტორო უფლებებს რასაც დიასპორაში გააზიარებთ."
-      share_what_you_want: "გააზიარეთ ის რაც გსურთ, ვისთანაც გსურთ."
-      simplicity: "უბრალოება"
-      simplicity_explanation: "დიასპორა გაზიარებას ხდის სუფთას და მარტივს – ეს ეხება კონფიდენციალურობასაც. დიასპორაში თქვენ არ დაგჭირდებათ პარამეტრების გვერდებში ძრომიალი რათა თქვენი პროფილი უსაფრთხო გახდეს."
-      tagline_first_half: "გააზიარეთ ის რაც გსურთ,"
   invitations:
     edit:
       your_account_awaits: "თქვენი მოსაწვევი გელოდებათ!"
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index b9cea2d8c..3f0d1774a 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -196,7 +196,6 @@ ko:
       failure: "해당 사용자를 무시하기를 멈출 수 없었습니다.  #evasion"
   bookmarklet:
     explanation: "%{link}를 북마크로 추가하면 어디서든 디아스포라에 게시할 수 있습니다."
-    explanation_link_text: "이 링크"
     heading: "북마클릿"
     post_something: "디아스포라에 게시하기"
     post_success: "올렸습니다! 닫힙니다!"
@@ -287,20 +286,6 @@ ko:
   fill_me_out: "채워주세요"
   find_people: "사람이나 #태그 를 찾아보세요"
   hide: "숨기기"
-  home:
-    show:
-      already_account: "이미 계정을 가지고 있습니까?"
-      choice: "선택"
-      choice_explanation: "디아스포라에서는 애스펙이라는 그룹으로 관계를 관리합니다. 디아스포라만의 독특함인 애스펙은 나의 사진, 이야기, 농담이 내가 의도한 사람들과만 공유되도록 보장합니다."
-      learn_about_host: "디아스포라 서버를 직접 운영하는 방법"
-      login_here: "여기서 로그인하세요"
-      ownership: "소유권"
-      ownership_explanation: "내 사진을 내가 소유합니다. 공유하기 위해 소유권을 포기하지 않아도 됩니다. 어떻게 배포될지를 온전히 제어함으로서 디아스포라에서 공유한 모든 것들의 소유권을 유지합니다."
-      share_what_you_want: "원하는 사람들과 원하는 걸 공유하자"
-      simplicity: "간편함"
-      simplicity_explanation: "디아스포라에서는 깨끗하고 쉽게 공유합니다. 개인정보도 마친가지입니다. 본래 개인적인 디아스포라에서는 프로필 보안을 유지하기 위해 여러 페이지에 걸친 설정과 옵션을 힘겹게 거치지 않아도 됩니다."
-      tagline_first_half: "원하는 사람들과"
-      tagline_second_half: "원하는 걸 공유하자."
   invitation_codes:
     excited: "%{name}님이 나를 기다리고 있습니다."
   invitations:
@@ -497,12 +482,11 @@ ko:
 
           이 링크를 클릭해서 시작하세요.
 
-          [%{invite_url}][1]
+          %{invite_url}
+          <%=invite_code_url(@invitation_code)%>
 
 
           디아스포라* 이메일 로봇 보냄!
-
-          [1]: %{invite_url}
     invited_you: "%{name}님이 나를 디아스포라*로 초대했습니다."
     liked:
       liked: "%{name}님이 내 게시물을 좋아합니다:"
@@ -1021,4 +1005,4 @@ ko:
   welcome: "환영합니다!"
   will_paginate:
     next_label: "다음 &raquo;"
-    previous_label: "&laquo; 이전"
+    previous_label: "&laquo; 이전"
\ No newline at end of file
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 4293fdadb..ae944c3a7 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -75,7 +75,6 @@ lt:
   back: "Atgal"
   bookmarklet:
     explanation: "%{link} from anywhere by bookmarking this link."
-    explanation_link_text: "Post to Diaspora"
     heading: "Diaspora Bookmarklet"
   cancel: "Atšaukti"
   comments:
@@ -106,18 +105,6 @@ lt:
       invalid_fields: "Neteisingi laukai"
   fill_me_out: "Užpildyk"
   find_people: "Find people"
-  home:
-    show:
-      already_account: "jau turi paskyrą?"
-      choice: "Pasirinkimas"
-      choice_explanation: "Diaspora tau leidžia tvarkyti susijungimus naudojant vadinamuosius aspektus. Unikaliai Diasporai, aspektai garantuoja, kad tavo nuotraukos, istorijos ir pokštai yra prieinamos tik žmonėms, kuriuos tu pasirinkai."
-      learn_about_host: "Sužinok, kaip paleisti savo paties Diasporos serverį"
-      login_here: "prisijunk čia"
-      ownership: "Nuosavybė"
-      ownership_explanation: "Tau priklauso tavo nuotraukos, ir tu neturėtum atsisakyti nuosavybės vien dėl to, kad jomis pasidalinai. Tau priklauso viskas, kuo daliniesi Diasporoje. Tai duoda tau visišką platinimo kontrolę."
-      share_what_you_want: "Dalykis, kuo tik nori, su kuo tik nori."
-      simplicity: "Paprastumas"
-      simplicity_explanation: "Diaspora supaprastina ir palengvina dalijimąsi - tas pats dar dvigubai labiau privatumui. Iš prigimties privati, Diaspora neturi nustatymų ir pasirinkimų puslapių, kuriuos tau tektų perbristi, norint profilį turėti saugų ir pagal tavo skonį."
   invitations:
     check_token:
       not_found: "Pakvietimo raktas nerastas"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 4035168f7..a91f5b085 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -74,7 +74,6 @@ mk:
   back: "Назад"
   bookmarklet:
     explanation: "%{link} from anywhere by bookmarking this link."
-    explanation_link_text: "Post to Diaspora"
     heading: "Diaspora Bookmarklet"
   cancel: "Откажи"
   comments:
@@ -105,18 +104,6 @@ mk:
       invalid_fields: "Невалидни полиња"
   fill_me_out: "Пополни ме"
   find_people: "Find people"
-  home:
-    show:
-      already_account: "веќе имате корисничка сметка?"
-      choice: "Избор"
-      choice_explanation: "Diaspora ви овозможува сортирање на вашите врски во групи наречени аспекти. Особеност на Diaspora, аспектите осигураат дека вашите слики, стории и шеги се споделени само со луѓето кои вие ќе ги назначите."
-      learn_about_host: "Научете како вие можете да хостирате Diaspora сервер."
-      login_here: "најави се овде"
-      ownership: "Сопственост"
-      ownership_explanation: "Вие ги поседувате вашите слики, и не треба да се откажете од нивната сопственост само за да ги споделите. Во Diaspora секоја содржина која ја споделувате останува во ваша сопственост, давајќи ви целосна контрола врз начинот на нејзиното ширење."
-      share_what_you_want: "Споделувајте се што сакате, со оние кои вие ги изберете."
-      simplicity: "Едноставност"
-      simplicity_explanation: "Diaspora овозможува споделување кое е чисто и едноставно - ова се однесува и за приватноста. Благодарение на вградената приватност, Diaspora не ве тера да пребарувате низ страници со подесувања и опции само за да си го заштитите профилот."
   invitations:
     check_token:
       not_found: "Токенот за поканата не е пронајден"
diff --git a/config/locales/diaspora/ml.yml b/config/locales/diaspora/ml.yml
index 4ab5d0dc1..b0028f06a 100644
--- a/config/locales/diaspora/ml.yml
+++ b/config/locales/diaspora/ml.yml
@@ -178,7 +178,6 @@ ml:
       success: "Let's see what they have to say! #sayhello"
   bookmarklet:
     explanation: "Post to Diaspora from anywhere by bookmarking %{link}."
-    explanation_link_text: "this link"
     heading: "Bookmarklet"
     post_something: "ഡയസ്പോറയിലേക്ക് എന്തെങ്കിലും കുറിക്കുക"
     post_success: "കുറിച്ചു! അടയ്ക്കുന്നു!"
@@ -269,20 +268,6 @@ ml:
   fill_me_out: "എന്നെ പൂരിപ്പിക്കു"
   find_people: "Find people or #tags"
   hide: "മറയ്ക്കു"
-  home:
-    show:
-      already_account: "നിലവില്‍ ഒരു അക്കൌണ്ടുണ്ടോ?"
-      choice: "തിരഞ്ഞെടുക്കുക"
-      choice_explanation: "ഡയസ്പോറയില്‍ താങ്കള്‍ക്ക് സമ്പര്‍ക്കങ്ങളെ പരിചയങ്ങള്‍ എന്ന കൂട്ടങ്ങളായി തിരിക്കാന്‍ അനുവദിക്കുന്നു. ഫോട്ടോകള്‍, കഥകള്‍, തമാശകള്‍ തുടങ്ങിയവ ഉദ്ദേശിക്കുന്ന ആളുകള്‍ക്കു മാത്രം കിട്ടാന്‍ പരിചയങ്ങള്‍ സഹായിക്കുന്നു. ഇത് ഡയസ്പോറയില്‍ മാത്രമുള്ളതാണ്."
-      learn_about_host: "താങ്കളുടെ ഡയസ്പോറ സെര്‍വര്‍ എങ്ങിനെ സജ്ജീകരിക്കാമെന്നു നോക്കാം."
-      login_here: "ഇവിടെ ലോഗിന്‍ ചെയ്യുന്നുണ്ടോ?"
-      ownership: "ഉടമസ്ഥത"
-      ownership_explanation: "നിങ്ങള്‍ തന്നെയാണു് നിങ്ങളുടെ ചിത്രങ്ങളുടെ ഉടമസ്ഥര്‍, പങ്കിടാനാഗ്രഹിയ്ക്കുന്നതു് കൊണ്ടു് മാത്രം മറ്റൊരാളെ ഉടമയാക്കണമെന്നില്ല. നിങ്ങള്‍ ഡയാസ്പുറയില്‍ പങ്കിടുന്നതെല്ലാം നിങ്ങളുടെ ഉടമസ്ഥതയിലായതിനാല്‍ അതെങ്ങനെയാണു് വിതരണം ചെയ്യേണ്ടതെന്നു് പൂര്‍ണ്ണമായും നിങ്ങള്‍ക്കു് തന്നെ നിയന്ത്രിയ്ക്കാം."
-      share_what_you_want: "നിങ്ങള്‍ ആഗ്രഹിക്കുന്ന ആളുമായി, നിങ്ങള്‍ ആഗ്രഹിക്കുന്നത് പങ്കുവെയ്ക്കു."
-      simplicity: "ലളിതം"
-      simplicity_explanation: "ഡയസ്പോറ പങ്കിടല്‍ എളുപ്പമാക്കുന്നു - സ്വകാര്യതയിലും. ഡയസ്പോറ പ്രൊഫൈല്‍ സുരക്ഷിതമാക്കാന്‍ പേജുകള്‍ ക​ണക്കിന് ക്രമികരണങ്ങള്‍ മാറ്റേണ്ട."
-      tagline_first_half: "നിങ്ങള്‍ ആഗ്രഹിക്കുന്നത് പങ്കുവെയ്ക്കു,"
-      tagline_second_half: "നിങ്ങള്‍ ആഗ്രഹിക്കുന്ന ആളുമായി."
   invitations:
     a_facebook_user: "A Facebook user"
     check_token:
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 1a6654f1b..ec93bdfd2 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -152,7 +152,6 @@ nb:
   back: "Tilbake"
   bookmarklet:
     explanation: "%{link} fra hvor som helst ved å bokmerke denne linken."
-    explanation_link_text: "Post på Diaspora"
     heading: "Diaspora Bookmarklet"
     post_something: "Post noe på Diaspora"
     post_success: "Postet! Lukker!"
@@ -229,20 +228,6 @@ nb:
   fill_me_out: "Fortell meg"
   find_people: "Find people"
   hide: "Skjul"
-  home:
-    show:
-      already_account: "har du allerede en konto?"
-      choice: "Valg"
-      choice_explanation: "Diaspora lar deg sortere dine kontakter i grupper kalt aspekter. Unikt for Diaspora, sørger aspekter for at dine bilder, historier og vitser kun deles med de du vil."
-      learn_about_host: "Lær hvordan du kan sette opp din egen Diaspora server."
-      login_here: "logg inn her"
-      ownership: "Eierskap"
-      ownership_explanation: "Du eier dine bilder, og skal ikke behøve å gi slipp på dem for å dele dem med andre. Du opprettholder eierskap av alt du deler på Diaspora. Det gir deg full kontroll over hvordan det er fordelt."
-      share_what_you_want: "Del hva du vil, med hvem du vil."
-      simplicity: "Enkelhet"
-      simplicity_explanation: "Diaspora gjør deling rent og enkelt - det gjelder personvern også. Diaspora er iboende privat, og du trenger ikke bla deg gjennom sider av innstillinger og valg bare for å holde profilen sikker."
-      tagline_first_half: "Del hva du vil,"
-      tagline_second_half: "med hvem du vil."
   invitations:
     create:
       already_contacts: "Du er allerede tilknyttet denne personen"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 8e785a5a5..59fd9421b 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -178,7 +178,6 @@ nl:
       success: "Eens zien wat ze te zeggen hebben! #zeghallo"
   bookmarklet:
     explanation: "Post vanaf overal naar Diaspora door %{link} op te slaan."
-    explanation_link_text: "deze link"
     heading: "Bookmarktlet"
     post_something: "Plaats iets op Diaspora"
     post_success: "Gepost!"
@@ -266,20 +265,6 @@ nl:
   fill_me_out: "Vul me in!"
   find_people: "Vind mensen of #tags"
   hide: "Verbergen"
-  home:
-    show:
-      already_account: "heb je al een account?"
-      choice: "Keuze"
-      choice_explanation: "Diaspora laat jou je contacten verdelen over verschillende groepen, genaamd 'Aspecten', welke uniek zijn voor Diaspora. Deze zorgen er voor dat je jouw foto's, verhalen en grappen alleen deelt met degenen waarmee je ze wilt delen."
-      learn_about_host: "Leer hoe je zelf een Diaspora server kunt opzetten."
-      login_here: "log hier in"
-      ownership: "Eigendom"
-      ownership_explanation: "Je bent zelf de eigenaar van je eigen foto's. Dus waarom zou je dat opgeven om ze met iemand te delen? Op Diaspora behoud je het eigendom over alles wat jij met anderen deelt, waardoor je volledige controle hebt over de distributie ervan."
-      share_what_you_want: "Deel wat je wilt delen, met degenen met wie je het wilt delen."
-      simplicity: "Eenvoud"
-      simplicity_explanation: "Diaspora maakt delen helder en simpel – vooral als het om privacy gaat. Je hoeft namelijk niet eindeloos door pagina's met instellingen en opties te klikken om je profiel veilig en afgeschermd te houden."
-      tagline_first_half: "Deel wat je wilt delen,"
-      tagline_second_half: "met degenen met wie je het wilt delen."
   invitations:
     a_facebook_user: "Een Facebook gebruiker"
     check_token:
diff --git a/config/locales/diaspora/nn.yml b/config/locales/diaspora/nn.yml
index 30d54daaf..b73983e80 100644
--- a/config/locales/diaspora/nn.yml
+++ b/config/locales/diaspora/nn.yml
@@ -10,6 +10,7 @@ nn:
   _contacts: "Kontaktar"
   _home: "Heim"
   _photos: "foto"
+  _services: "Tenester"
   account: "Konto"
   activerecord:
     errors:
@@ -39,6 +40,17 @@ nn:
             username:
               invalid: "er ugyldig. Du kan berre bruka bokstavar, tal og understrekingsteikn."
               taken: "er allereie i bruk."
+  admins:
+    admin_bar:
+      pages: "Sidar"
+      user_search: "Brukarsøk"
+    stats:
+      go: "gå"
+    user_search:
+      users:
+        one: "ein brukar funne"
+        other: "%{count} brukarar funne"
+        zero: "ingen brukarar funne"
   ago: "for %{time} sida"
   all_aspects: "Alle aspekta"
   application:
@@ -67,6 +79,7 @@ nn:
       select_all: "Vel alle"
     aspect_stream:
       stay_updated: "Hald deg oppdatert"
+      stay_updated_explanation: "Hovudstraumen din er sett saman av kontaktane dine, tags du følgjer og innlegg frå nokre kreative medlemmar på D*"
     contacts_not_visible: "Kontaktar i dette aspektet vil ikkje kunna sjå kvarandre."
     contacts_visible: "Kontaktar i dette aspektet vil kunna sjå kvarandre."
     create:
@@ -104,6 +117,7 @@ nn:
       handle_explanation: "Dette er Diaspora-ID-en din. Nett som ei e-postadresse kan du gje han til folk slik at dei kan nå deg."
       help:
         do_you: "Har du:"
+        email_feedback: "%{link} attendemeldingane dine, om du vil"
         feature_suggestion: "eit %{link}forslag?"
         find_a_bug: "funne ein %{link}?"
         have_a_question: "eit %{link}?"
@@ -112,7 +126,10 @@ nn:
         tag_bug: "#bug"
         tag_feature: "#feature"
         tag_question: "#question"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Tutorials laga i fellesskap, guidar og nyhende"
       introduce_yourself: "Dette er straumen din.   Hiv deg med og introduser deg sjølv."
+      keep_diaspora_running: "Held utviklinga av Diaspora* rask med ei månadleg donasjon!"
+      keep_pod_running: "Held %{pod} på beina og spander kaffi på serverane med ein månadleg donasjon!"
       new_here:
         follow: "Følg %{link} og sei velkomen til nye brukarar på Diaspora*!"
         learn_more: "Lær meir"
@@ -163,10 +180,16 @@ nn:
       no_applications: "Du har enno ikkje registrert nokon applikasjonar."
       revoke_access: "Trekk attende tilgangen"
   back: "Attende"
+  blocks:
+    create:
+      failure: "Brukaren kunne diverre ikkje blokkerast. #evasion"
+      success: "Så greitt, no ser du ikkje den brukaren igjen. #silencio!"
+    destroy:
+      failure: "Denne brukaren er dømd til å ignorerast til evig tid. #evasion"
+      success: "Det vert spanande å sjå kva h*n har å sei!"
   bookmarklet:
-    explanation: "Send til Diaspora frå kor som helst ved å lagra %{link} som bokmerke."
-    explanation_link_text: "denne lenkja"
-    post_something: "Send noko til Diaspora"
+    explanation: "Legg ut på Diaspora frå kor som helst ved å lagra %{link} som bokmerke."
+    post_something: "Legg ut på Diaspora*"
     post_success: "Sendt. Lukkar."
   cancel: "Avbryt"
   comments:
@@ -228,6 +251,7 @@ nn:
       no_messages: "ingen meldingar"
     new:
       abandon_changes: "Sjå vekk frå endringane?"
+      send: ""
       sending: "Sender …"
       subject: "emne"
       to: "til"
@@ -237,6 +261,11 @@ nn:
       delete: "slett og blokker samtalen"
       reply: "svar"
       replying: "Svarer …"
+  date:
+    formats:
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Slett"
   email: "E-post"
   error_messages:
@@ -246,19 +275,8 @@ nn:
   fill_me_out: "Fyll meg ut"
   find_people: "Finn personar eller #grindmerke"
   hide: "Gøym"
-  home:
-    show:
-      already_account: "Har du allereie ein konto?"
-      choice: "Val"
-      choice_explanation: "Diaspora let deg sortera kontaktane dine i grupper me kallar aspekt. Aspekta sørgar for at bileta, historiene og vitsane dine berre vert delt med dei du vil at dei skal delast med. Dette er unikt for Diaspora."
-      learn_about_host: "Lær om korleis du kan vere vert for din eigen Diaspora-server."
-      login_here: "Logg på her"
-      ownership: "Eigarskap"
-      ownership_explanation: "Du eig bileta dine. Det burde du gjera òg etter å ha delt dei. Du har framleis eigarskapen til alt du deler i Diaspora. På det viset har du full kontroll med korleis tinga blir delte."
-      share_what_you_want: "Del kva du vil med kven du vil."
-      simplicity: "Enkelheit"
-      tagline_first_half: "Del kva du vil"
-      tagline_second_half: "med kven du vil."
+  invitation_codes:
+    excited: "%{name} er glad for å sjå deg her!"
   invitations:
     a_facebook_user: "Ein Facebook-brukar"
     create:
@@ -275,9 +293,14 @@ nn:
       already_invited: "Desse personane har ikkje godteke invitasjonen din:"
       aspect: "Aspekt"
       check_out_diaspora: "Ta ein kikk på Diaspora!"
+      codes_left:
+        one: "%{count} invitasjon igjen på denne koden"
+        other: "%{count} invitasjonar igjen på denne koden"
+        zero: "Ingen invitasjonar igjen på denne koden"
       if_they_accept_info: "om dei godtek, vil dei verta lagde til aspektet du inviterte dei til."
       invite_someone_to_join: "Inviter nokon til å bli med Diaspora!"
       language: "Språk"
+      paste_link: "Del denne lenkja med venene dine for å invitere dei til Diaspora* eller send dei lenkja direkte på epost."
       personal_message: "Personleg melding"
       resend: "Send på nytt"
       send_an_invitation: "Send ein invitasjon"
@@ -330,11 +353,8 @@ nn:
   no_results: "Fann ingen resultat"
   notifications:
     also_commented:
-      few: "%{actors} kommenterte òg %{post_author} si %{post_link}."
-      many: "%{actors} kommenterte òg %{post_author} si %{post_link}."
       one: "%{actors} kommenterte òg %{post_author} sitt %{post_link}."
       other: "%{actors} kommenterte òg %{post_author} sitt %{post_link}."
-      two: "%{actors} kommenterte òg %{post_author} si %{post_link}."
       zero: "%{actors} also commented on %{post_author}'s %{post_link}."
     also_commented_deleted:
       few: "%{actors} kommenterte eit sletta innlegg."
@@ -344,12 +364,9 @@ nn:
       two: "%{actors} kommenterte eit sletta innlegg."
       zero: "%{actors} kommenterte eit sletta innlegg."
     comment_on_post:
-      few: "%{actors} kommenterte %{post_link} ditt."
-      many: "%{actors} kommenterte %{post_link} ditt."
-      one: "%{actors} kommenterte %{post_link} ditt."
-      other: "%{actors} kommenterte %{post_link} ditt."
-      two: "%{actors} kommenterte %{post_link} ditt."
-      zero: "%{actors} kommenterte %{post_link} ditt."
+      one: "%{actors} kommenterte %{post_link}et ditt."
+      other: "%{actors} kommenterte %{post_link}et ditt."
+      zero: "%{actors} kommenterte %{post_link}et ditt."
     helper:
       new_notifications:
         few: "%{count} nye varsel"
@@ -368,14 +385,12 @@ nn:
         two: "og %{count} andre"
         zero: "og ingen andre"
       mark_all_as_read: "Merk alle som lesne"
+      mark_unread: "Merk som ulest"
       notifications: "Varsel"
     liked:
-      few: "%{actors} har likt %{post_link} ditt."
-      many: "%{actors} har likt %{post_link} ditt."
-      one: "%{actors} har likt %{post_link} ditt."
-      other: "%{actors} har likt %{post_link} ditt."
-      two: "%{actors} har likt %{post_link} ditt."
-      zero: "%{actors} har likt %{post_link} ditt."
+      one: "%{actors} har likt %{post_link}et ditt."
+      other: "%{actors} har likt %{post_link}et ditt."
+      zero: "%{actors} har likt %{post_link}et ditt."
     liked_post_deleted:
       few: "%{actors} likte det sletta innlegget ditt."
       many: "%{actors} likte det sletta innlegget ditt."
@@ -406,12 +421,9 @@ nn:
       two: "%{actors} sende deg ei melding."
       zero: "%{actors} sende deg ei melding."
     reshared:
-      few: "%{actors} har delt %{post_link} ditt."
-      many: "%{actors} har delt %{post_link} ditt."
-      one: "%{actors} har delt %{post_link} ditt."
-      other: "%{actors} har delt %{post_link} ditt."
-      two: "%{actors} har delt %{post_link} ditt."
-      zero: "%{actors} har delt %{post_link} ditt."
+      one: "%{actors} har delt %{post_link}et ditt."
+      other: "%{actors} har delt %{post_link}et ditt."
+      zero: "%{actors} har delt %{post_link}et ditt."
     reshared_post_deleted:
       one: "%{actors} delte den sletta posten din på nytt."
       other: "%{actors} delte den sletta posten din på nytt."
@@ -425,6 +437,7 @@ nn:
       zero: "%{actors} byrja å dela med deg."
   notifier:
     a_post_you_shared: "eit innlegg."
+    accept_invite: "Godta Diaspora*-invitasjonen din!"
     click_here: "klikk her"
     comment_on_post:
       reply: "Svar på eller syn  %{name} sitt innlegg >"
@@ -433,6 +446,23 @@ nn:
       subject: "Ta i bruk den nye e-postadressa di %{unconfirmed_email}"
     email_sent_by_diaspora: "Diaspora sende denne e-postmeldinga.  Om du ikkje lenger ønskjer å få slike meldingar,"
     hello: "Hei %{name}!"
+    invite:
+      message: |-
+          Hei!
+
+          Du er invitert til å bli med på Diaspora*!
+
+          Klikk på denne lenkja for å sette i gang
+
+          [%{invite_url}][1]
+
+
+          Kjærleik frå
+
+          Diaspora* sin epost-robot :)
+
+          [1]: %{invite_url}
+    invited_you: "%{name} inviterte deg til Diaspora*"
     liked:
       liked: "%{name} likte innlegget ditt"
       view_post: "Syn innlegget >"
@@ -453,10 +483,14 @@ nn:
       view_profile: "Syn %{name} sin profil"
     thanks: "Takk,"
     to_change_your_notification_settings: "for å endra varslingsinnstillingane dine"
+  nsfw: "NSFW"
+  ok: "OK"
   or: "eller"
   password: "Passord"
   password_confirmation: "Passordstadfesting"
   people:
+    add_contact:
+      invited_by: "du vart invitert av"
     add_contact_small:
       add_contact_from_tag: "legg til kontakt frå etiketten"
     aspect_list:
@@ -471,6 +505,7 @@ nn:
       no_one_found: "… og ingen vart funnen."
       no_results: "Du må søkja etter noko."
       results_for: "søkjeresultat for"
+      searching: "me leiter, ver ven og vent litt..."
     last_post: "Siste innlegg"
     many: "%{count} personar"
     one: "1 person"
@@ -531,6 +566,7 @@ nn:
       invalid_ext: "{file} har ein ugyldig filtype. Berre {extensions} er tillatne."
       size_error: "{file} er for stor, kan ikkje vera større enn {sizeLimit}."
     new_profile_photo:
+      or_select_one_existing: ""
       upload: "Last opp eit nytt profilbilete."
     photo:
       view_all: "syn alle bileta til %{name} "
@@ -539,13 +575,15 @@ nn:
       delete_photo: "Slett biletet"
       edit: "endra"
       edit_delete_photo: "Endra biletskildringa / slett biletet"
-      make_profile_photo: "lag profilbilete"
+      make_profile_photo: "gjer til profilbilete"
       show_original_post: "Syn den opphavlege meldinga"
       update_photo: "Oppdater biletet"
     update:
       error: "Klarte ikkje å endra biletet."
       notice: "Biletet vart oppdatert."
   posts:
+    presenter:
+      title: "Eit innlegg av %{name}"
     show:
       destroy: "Sletta"
       not_found: "Vi klarte dessverre ikkje å finna innlegget."
@@ -557,6 +595,7 @@ nn:
         other: "%{count} photos by %{author}"
         two: "Two photos by %{author}"
         zero: "No photos by %{author}"
+      reshare_by: "Deling av %{author}"
   previous: "førre"
   profile: "Profil"
   profiles:
@@ -566,7 +605,9 @@ nn:
       first_name: "Fornamn"
       last_name: "Etternamn"
       update_profile: "Oppdater profilen"
-      your_bio: "Livshistoria din"
+      you_are_nsfw: "Du har merka deg sjølv som \"ikkje trygg for arbeidsplassen\" og det du legg ut vil ikkje dukke opp i straumen til folk som har valt å ikkje få opp støytande innhald i straumen sin."
+      you_are_safe_for_work: "Du er merka som \"trygg for arbeidsplassen\", det vil seie at du går meiner at det du legg ut stemmer overeins med fellesskapen sine retningslinjer."
+      your_bio: "Livshistoria di"
       your_birthday: "Fødselsdagen din"
       your_gender: "Kjønnet ditt"
       your_location: "Staden du er"
@@ -601,7 +642,7 @@ nn:
     new:
       create_my_account: "Lag kontoen min."
       enter_email: "Skriv ei e-postadresse"
-      enter_password: "Skriv passordet"
+      enter_password: "Skriv eit passord (minst seks teikn)"
       enter_password_again: "Skriv passordet éin gong til"
       enter_username: "Vel eit brukarnamn (berre bokstavar, tal og understrekingsteikn)"
       join_the_movement: "Vert med i rørsla!"
@@ -628,6 +669,7 @@ nn:
     new_request_to_person:
       sent: "sendt"
   reshares:
+    comment_email_subject: "%{resharer} si deling av %{author} sitt innlegg"
     create:
       failure: "Klarte ikkje å dela dette innlegget på nytt."
     reshare:
@@ -639,18 +681,21 @@ nn:
         other: "%{count} reshares"
         two: "%{count} reshares"
         zero: "Del vidare"
+      reshare_confirmation: "Vil du dele %{author} sitt innlegg?"
       reshare_original: "Del originalen vidare"
       reshared_via: "delt via"
       show_original: "Syn original"
   search: "Søk"
   services:
     create:
+      already_authorized: "En brukar med Diaspora* ID %{diaspora_id} har allereie teke i bruk den %{service_name}kontoen."
       success: "Vellukka autentisering."
     destroy:
       success: "Sletta autentiseringa."
     failure:
       error: "klarte ikkje å kopla til tenesta"
     finder:
+      fetching_contacts: "Diaspora* hentar %{service}venene dine, kom attende om eit par minutt."
       no_friends: "Fann ingen Facebook-vener."
       service_friends: "%{service}-vener"
     index:
@@ -670,6 +715,10 @@ nn:
       not_on_diaspora: "Enno ikkje på Diaspora"
       resend: "send på nytt"
   settings: "Innstillingar"
+  share_visibilites:
+    update:
+      post_hidden_and_muted: "%{name} sine innlegg er gøymd og varsel er skrudd av."
+      see_it_on_their_profile: "Om du vil sjå oppdateringar på dette innlegget, gå til %{name} sin profil."
   shared:
     add_contact:
       add_new_contact: "Legg til ein ny kontakt"
@@ -704,10 +753,15 @@ nn:
     notification:
       new: "Ny %{type} frå %{from}"
     public_explain:
+      atom_feed: "Atom feed"
+      control_your_audience: "Bestem publikumet ditt sjølve"
       logged_in: "logga på %{service}"
       manage: "handsama tilkopla tenester"
+      new_user_welcome_message: "Nytt #tags for å klassifisere innlegga dine og for å finne folk med same interesser som deg.  Hev fram kule folk med @Nemningar"
       outside: "Andre utanfor Diaspora vil kunna sjå dei offentlege meldingane."
+      share: "Del"
       title: "Setja opp tilkopla tenester"
+      visibility_dropdown: "Nytt denne rullegardinmenyen for å endra synlegheita til innlegga dine.  (Me foreslår at du gjer det første innlegget offentleg.)"
     publisher:
       all: "alle"
       all_contacts: "alle kontaktane"
@@ -728,11 +782,19 @@ nn:
     reshare:
       reshare: "Del på nytt"
     stream_element:
+      connect_to_comment: "For å kommentera denne brukaren sitt innlegg må du byrja å dela med vedkommande."
+      currently_unavailable: "for tida går det ikkje an å kommentera"
       dislike: "Mislik"
       hide_and_mute: "Gøym og demp"
+      ignore_user: "Oversjå %{name}"
+      ignore_user_description: "Vil du oversjå og fjerne brukaren frå alle aspekta dine?"
       like: "Lik"
+      nsfw: "Dette innlegget er merka som NSFW av den som har lagt det ut. %{link}"
       shared_with: "Delt med: %{aspect_names}"
+      show: "syn"
       unlike: "Lik ikkje lenger"
+      via: "via %{link}"
+      via_mobile: "via mobiltelefon"
       viewable_to_anyone: "Alle kan sjå dette innlegget"
   status_messages:
     create:
@@ -760,16 +822,29 @@ nn:
       two: "Show two more comments"
       zero: "No more comments"
   streams:
+    activity:
+      title: "Min aktivitet"
     aspects:
       title: "Your Aspects"
+    aspects_stream: "Aspektar"
+    followed_tags_stream: "Følgde tags"
     mentioned_stream: "@Nemningar"
     mentions:
+      contacts_title: "Folk som har nemnd deg"
       title: "@Nemningar"
+    multi:
+      contacts_title: "Folk i straumen din"
+      title: "Straum"
+    public:
+      title: "Offentleg aktivitet"
     tags:
       contacts_title: "Personar som elskar denne etiketten"
+      tag_prefill_text: "Greia med %{tag_name} er... "
+      title: "Innlegg merka med: %{tags}"
   tag_followings:
     create:
       failure: "Klarte ikkje å følgja: #%{name}. Følgjer du allereie?"
+      none: "Du kan ikkje følgje ein tom tag!"
       success: "Bra! No følgjer du: #%{name}."
     destroy:
       failure: "Failed to stop following: #%{name}"
@@ -782,6 +857,7 @@ nn:
       people_tagged_with: "Personar som er merka med %{tag}"
       posts_tagged_with: "Meldingar som er merka med #%{tag}"
       stop_following: "Følg ikkje #%{tag} lenger"
+  terms_and_conditions: "Vilkår og retningslinjer"
   tokens:
     show:
       connect_to_cubbies: "Kopla deg til Cubbi.es"
@@ -792,6 +868,7 @@ nn:
       screenshot_explanation: "%{link1}. Denne cubbyen er lenka til %{link2}."
       sign_up_today: "Registrer deg i dag."
       typical_userpage: "Ei typisk brukarside på cubbie.es"
+      via: "(via %{link})"
       what_is_cubbies: "Cubbi.es er det første Diaspora-programmet i verda og er òg den beste måten å samla bilete på nettet."
   undo: "Gjera om?"
   username: "Brukarnamn"
@@ -799,17 +876,32 @@ nn:
     confirm_email:
       email_confirmed: "E-post %{email} teken i bruk"
       email_not_confirmed: "Klarte ikkje å slå på bruk av e-post. Feil lenkje?"
+    destroy:
+      no_password: "Skriv inn den noverande passordet ditt for å lukke kontoen din."
+      success: "Kontoen din er stengd. Det kan ta 20 minutt før me er ferdig med å stenge kontoen heilt. Takk for at du prøvde ut Diaspora*"
+      wrong_password: "Passordet du skreiv inn stemde ikkje med det noverande passordet ditt."
     edit:
       also_commented: "… nokon òg kommenterer kontakten din sitt innlegg?"
+      auto_follow_aspect: "Automatisk følgde brukarar vert lagt til i dette aspektet:"
       auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Endra"
       change_email: "Endra e-posten"
       change_language: "Endra språket"
       change_password: "Skift passord"
+      character_minimum_expl: "må vere minst seks teikn"
       close_account:
+        dont_go: "Ikkje forlat oss!"
+        if_you_want_this: "Om du verkeleg vil dette, skriv inn passordet ditt og klikk på 'Lukk konto'"
+        lock_username: "Dette vil fryse brukarnamnet ditt om du vel å registrera deg igjen."
+        locked_out: "Du vert logga ut og stengd ute frå kontoen din."
+        make_diaspora_better: "Me treng deg for å gjera Diaspora* betre, så om du kan hjelpe oss i staden for å forlate oss vert me veldig takksame. Om du faktisk vil forlate oss, så skal du vite kva som skjer."
+        mr_wiggles: "Denne pusekatten vert særs vonbråten om du gjer dette"
+        no_turning_back: "Det er for tida inga veg attende."
         what_we_delete: "We delete all of your posts, profile data, as soon as humanly possible. Your comments will hang around, but be associated with your Diaspora Handle."
+      close_account_text: "Lukk konto"
       comment_on_post: "… nokon kommenterer innlegget ditt?"
       current_password: "Gjeldande passord"
+      current_password_expl: "det du loggar på med..."
       download_photos: "last ned bileta mine"
       download_xml: "last ned xml-en min"
       edit_account: "Endra kontoen"
@@ -818,6 +910,7 @@ nn:
       liked: "… nokon liker innlegget ditt?"
       mentioned: "… du er nemnt i eit innlegg?"
       new_password: "Nytt passord"
+      photo_export_unavailable: "For tida er det ikkje mogleg å eksportera bilete"
       private_message: "… du mottek ei privat melding?"
       receive_email_notifications: "Få e-postvarsel når …"
       reshared: "… nokon deler innlegget ditt vidare?"
@@ -825,8 +918,20 @@ nn:
       your_email: "E-posten din"
       your_handle: "Diaspora-ID-en din"
     getting_started:
+      awesome_take_me_to_diaspora: "Kult! Ta meg med til Diaspora*"
+      community_welcome: "Diaspora* sin fellesskap er glade for å ha deg ombord!"
       hashtag_explanation: "Grindmerke (#) gjer at du kan tala om og følgja interessene dine. Dei er òg ein fin måte å finna nye Diaspora-brukarar på."
+      hashtag_suggestions: "Prøv å følgje tags som #kunst, #filmar, #åtgaum, etc."
+      hooking_up_fb: "kopla til Facebook-kontoen din"
+      saved: "Lagra!"
+      we_can_speed_things_up: "Ting kan kome litt raskare i gang ved å"
+      well_hello_there: "Neimen, hei der!"
+      what_are_you_in_to: "Kva likar du?"
       what_facebook_does: "til Diaspora. Dette vil henta namnet og biletet ditt og slå på kryssposting."
+      who_are_you: "Kven er du?"
+    privacy_settings:
+      ignored_users: "Oversedde brukarar"
+      stop_ignoring: "Ikkje oversjå lengre"
     public:
       does_not_exist: "Brukaren %{username} finst ikkje."
     update:
@@ -835,8 +940,12 @@ nn:
       language_not_changed: "Klarte ikkje å endra språket"
       password_changed: "Passordet er endra. Du kan no logga på med det nye passordet ditt."
       password_not_changed: "Klarte ikkje å endra passordet"
+      settings_not_updated: "Det gjekk ikkje å oppdatere innstillingane"
+      settings_updated: "Innstillingar oppdaterte"
       unconfirmed_email_changed: "E-postadresse er endra. Treng å verta teken i bruk."
       unconfirmed_email_not_changed: "Klarte ikkje å endra e-postkontoen"
   webfinger:
     no_person_constructed: "Klarte ikkje å laga nokon person frå hcard-fila."
-  welcome: "Velkomen!"
\ No newline at end of file
+  welcome: "Velkomen!"
+  will_paginate:
+    next_label: "neste »"
\ No newline at end of file
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index 97ae8dba4..d45258395 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -58,7 +58,6 @@ pa:
   back: "ਪਿੱਛੇ"
   bookmarklet:
     explanation: "%{link} from anywhere by bookmarking this link."
-    explanation_link_text: "Post to Diaspora"
     heading: "Diaspora Bookmarklet"
   cancel: "ਰੱਦ ਕਰੋ"
   comments:
@@ -84,10 +83,6 @@ pa:
   delete: "ਹਟਾਓ"
   email: "ਈਮੇਲ"
   find_people: "Find people"
-  home:
-    show:
-      already_account: "ਪਹਿਲਾਂ ਹੀ ਅਕਾਊਂਟ ਹੈ?"
-      login_here: "ਇੱਥੇ ਲਾਗਇਨ ਕਰੋ"
   invitations:
     new:
       already_invited: "Already invited"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 865ec33c6..6c2ca2211 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -50,6 +50,8 @@ pl:
       weekly_user_stats: "Tygodniowe statystyki użytkownika"
     correlations:
       correlations_count: "Współzależności z licznikiem logowań:"
+    stats:
+      go: "idź"
     user_search:
       add_invites: "dodaj zaproszenia"
       email_to: "Zaproś przez e-mail"
@@ -202,10 +204,9 @@ pl:
       failure: "Nie mogę przestać ignorować tego użytkownika.  #evasion"
       success: "Zobaczmy co mają do powiedzenia! #sayhello"
   bookmarklet:
-    explanation: "Publikuj w Disporze z każdego miejsca dodając do zakładek %{link}."
-    explanation_link_text: "te łącze"
+    explanation: "Publikuj w Diasporze z dowolnego miejsca, dodając ten link do zakładek => %{link}"
     heading: "Bookmarklet"
-    post_something: "Opublikuj coś w Diasporze"
+    post_something: "Opublikuj w Diasporze"
     post_success: "Wpis został opublikowany! Okno zostanie zamknięte!"
   cancel: "Anuluj"
   comments:
@@ -294,20 +295,6 @@ pl:
   fill_me_out: "Wypełnij mnie"
   find_people: "Znajdź osoby lub #znaczniki"
   hide: "Ukryj"
-  home:
-    show:
-      already_account: "masz już konto?"
-      choice: "Wybór"
-      choice_explanation: "Diaspora pozwala Ci przypisać znajomych do grup zwanych Aspektami. Aspekty, dostępne wyłącznie w Diasporze, gwarantują, że zdjęcia, wpisy i wiadomości są widoczne wyłącznie dla osób które wybierzesz."
-      learn_about_host: "Dowiedz się, jak założyć własny serwer Diaspory."
-      login_here: "zaloguj się tutaj"
-      ownership: "Własność"
-      ownership_explanation: "Twoje zdjęcia są należą tylko do Ciebie i nie musisz zrzekać się tego prawa, aby się nimi dzielić. Zarządzasz prawem własności w stosunku do wszystkich materiałów umieszczanych w Diasporze, dzięki czemu masz kontrolę nad sposobem ich rozpowszechniania."
-      share_what_you_want: "Udostępniaj co chcesz i komu chcesz."
-      simplicity: "Prostota"
-      simplicity_explanation: "Diaspora sprawia, że dzielenie się ze znajomymi jest miłe, łatwe i przyjemne, zwłaszcza w odniesieniu do ochrony prywatności. Dbając o prywatność Dispora nie każe Ci korzystać z mnóstwa stron ustawień czy opcji, przez które trzeba się przedzierać, aby zabezpieczyć profil."
-      tagline_first_half: "Dziel się czym chcesz,"
-      tagline_second_half: "i z kim chcesz."
   invitation_codes:
     excited: "%{name} cieszy się, że Cię tutaj widzi."
   invitations:
@@ -428,6 +415,7 @@ pl:
         two: "i %{count} innych"
         zero: "i nikt więcej"
       mark_all_as_read: "Oznacz wszystkie jako przeczytane"
+      mark_unread: ""
       notifications: "Powiadomienia"
     liked:
       few: "%{actors} polubiło Twój %{post_link}."
@@ -505,14 +493,12 @@ pl:
 
           Kliknij to łącze, aby rozpocząć
 
-          [%{invite_url}][1]
+          %{invite_url}
 
 
           Z poważaniem,
 
           Robot e-mail projektu Diaspora*!
-
-          [1]: %{invite_url}
     invited_you: "%{name} zaprasza Cię do Diaspory*"
     liked:
       liked: "%{name} polubi@{m:ł|f:ła|n:ł/ła} Twój wpis"
@@ -696,7 +682,7 @@ pl:
     new:
       create_my_account: "Utwórz konto!"
       enter_email: "Wpisz adres e-mail"
-      enter_password: "Wprowadź hasło"
+      enter_password: "Podaj hasło (maks. 6 znaków)"
       enter_password_again: "Wprowadź ponownie to samo hasło"
       enter_username: "Wybierz nazwę użytkownika (możliwe litery, cyfry i podkreślniki)"
       join_the_movement: "Dołącz do ruchu!"
@@ -1031,4 +1017,4 @@ pl:
   welcome: "Witamy!"
   will_paginate:
     next_label: "dalej &raquo;"
-    previous_label: "&laquo; wstecz"
+    previous_label: "&laquo; wstecz"
\ No newline at end of file
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 22de394c8..863ef1399 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -202,7 +202,6 @@ pt-BR:
       success: "Vamos ver o que eles têm a dizer! #sayhello"
   bookmarklet:
     explanation: "Postar para Diaspora de qualquer lugar através dos favoritos %{link}."
-    explanation_link_text: "nesse link"
     heading: "Favoritos"
     post_something: "Postar algo em Diaspora"
     post_success: "Postado! Fechado!"
@@ -293,20 +292,6 @@ pt-BR:
   fill_me_out: "Preencha"
   find_people: "Procurar pessoas"
   hide: "Ocultar"
-  home:
-    show:
-      already_account: "Já tem uma conta?"
-      choice: "Escolha"
-      choice_explanation: "Diaspora* permite que você organize seus contatos em grupos chamados aspectos. Exclusivos à Diaspora, aspectos garantem que suas fotos, histórias e piadas sejam compartilhadas apenas com quem você desejar."
-      learn_about_host: "Aprenda como hospedar seu próprio servidor Diaspora."
-      login_here: "Entre aqui"
-      ownership: "Sua propriedade"
-      ownership_explanation: "Você é dono das suas imagens, e não devia deixar de sê-lo para compartilhá-las. Na Diaspora você controla como suas coisas são distribuídas, portanto você não perde a propriedade do que compartilha."
-      share_what_you_want: "Compartilhe o que você quer, com quem você desejar."
-      simplicity: "Simplicidade"
-      simplicity_explanation: "Diaspora* torna o ato de compartilhar com privacidade simples e fácil. Inerentemente privada, Diaspora* não possui páginas de configurações e opções para percorrer a fim de manter seu perfil seguro e do jeito que você gostaria."
-      tagline_first_half: "Compartilhe o que você quer,"
-      tagline_second_half: "com quem você quer."
   invitation_codes:
     excited: "%{name} está contente em te ver aqui."
   invitations:
@@ -504,14 +489,13 @@ pt-BR:
 
           Clique neste link para começar
 
-          [%{invite_url}][1]
+          %{invite_url}
+          <%= invite_code_url(@invitation_code)%>
 
 
           Com amor,
 
           O robô de emails do Diaspora*!
-
-          [1]: %{invite_url}
     invited_you: "%{name} te convidou para Diaspora*"
     liked:
       liked: "%{name} curtiu sua postagem."
@@ -1027,4 +1011,4 @@ pt-BR:
   welcome: "Bem vindo!"
   will_paginate:
     next_label: "Próximo &raquo;"
-    previous_label: "&laquo; Anterior"
+    previous_label: "&laquo; Anterior"
\ No newline at end of file
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 3b41a556a..ce07a4750 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -188,7 +188,6 @@ pt-PT:
       success: "Vejamos o que eles têm para dizer! #dizolá"
   bookmarklet:
     explanation: "Publique no Diaspora em qualquer sítio adicionando %{link} aos Favoritos."
-    explanation_link_text: "esta hiperligação"
     heading: "Bookmarklet"
     post_something: "Publique qualquer coisa no Diaspora"
     post_success: "Publicado! A fechar!"
@@ -279,20 +278,6 @@ pt-PT:
   fill_me_out: "Informe-me"
   find_people: "Encontrar pessoas ou #etiquetas"
   hide: "Esconder"
-  home:
-    show:
-      already_account: "já tem uma conta?"
-      choice: "Escolha"
-      choice_explanation: "O Diaspora permite-lhe organizar as suas ligações em grupos. Estes grupos, exclusivos ao Diaspora, garantem que as suas fotografias, histórias e piadas são partilhadas apenas com as pessoas com quem deseja que sejam partilhadas."
-      learn_about_host: "Aprenda sobre como alojar o seu próprio servidor do Diaspora."
-      login_here: "inicie a sessão aqui"
-      ownership: "Propriedade"
-      ownership_explanation: "É dono das suas fotografias, e não deve ter de abdicar desse direito para as poder partilhar. Mantém a posse de tudo o que partilha no Diaspora, sendo-lhe dado controlo total sobre como é distribuído."
-      share_what_you_want: "Partilhe o que quiser, com quem quiser."
-      simplicity: "Simplicidade"
-      simplicity_explanation: "O Diaspora torna a partilha clara e fácil – e o mesmo se aplica à privacidade. Privado por definição, o Diaspora não o obriga a percorrer inúmeras páginas de definições e opções de forma a manter o seu perfil seguro."
-      tagline_first_half: "Partilhe o que desejar,"
-      tagline_second_half: "com quem desejar."
   invitation_codes:
     excited: "%{name} está contente por ver-te aqui."
   invitations:
@@ -471,14 +456,12 @@ pt-PT:
 
           Clique nesta ligação para começar
 
-          [%{invite_url}][1]
+          %{invite_url}
 
 
           Cordialmente,
 
           O robot de email do Diaspora*!
-
-          [1]: %{invite_url}
     invited_you: "%{name} convidou-o para o Diaspora*"
     liked:
       liked: "%{name} gostou da sua publicação"
@@ -989,4 +972,4 @@ pt-PT:
   welcome: "Bem-vindo(a)!"
   will_paginate:
     next_label: "seguinte &raquo;"
-    previous_label: "&laquo; anterior"
+    previous_label: "&laquo; anterior"
\ No newline at end of file
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 75a9ed2da..c66009e9b 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -125,7 +125,6 @@ ro:
   back: "Înapoi"
   bookmarklet:
     explanation: "%{link} from anywhere by bookmarking this link."
-    explanation_link_text: "Post to Diaspora"
     heading: "Diaspora Bookmarklet"
     post_something: "Publicati ceva catre Diaspora"
     post_success: "Publicat! Inchidere!"
@@ -194,18 +193,6 @@ ro:
   fill_me_out: "Umple-mă"
   find_people: "Find people"
   hide: "Ascunde"
-  home:
-    show:
-      already_account: "ai deja cont?"
-      choice: "Alegere"
-      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: "intrarea e aici"
-      ownership: "Proprietate"
-      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: "Impartaseste ce doresti, cu cine doresti."
-      simplicity: "Simplitate"
-      simplicity_explanation: "Diaspora makes sharing clean and easy – this goes doubly so for privacy. Innherently private, Diaspora doesn’t have pages of settings and options to wade through to keep your profile secure and to your liking."
   invitations:
     a_facebook_user: "Un utilizator Facebook"
     check_token:
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 45a5e1807..332f2abb2 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -50,6 +50,18 @@ ru:
       weekly_user_stats: "Еженедельная пользовательская статистика"
     correlations:
       correlations_count: "Связь с числом входов:"
+    stats:
+      go: "перейти"
+    user_search:
+      add_invites: "добавить приглашения"
+      email_to: "Адрес для пришлашения"
+      users:
+        few: "%{count} пользователя найдено"
+        many: "%{count} пользователей найдено"
+        one: "%{count} пользователь найден"
+        other: "%{count} пользователей найдено"
+        zero: "%{count} пользователей найдено"
+      you_currently: "у вас осталось %{user_invitation} приглашений %{link}"
   ago: "%{time} назад"
   all_aspects: "Все аспекты"
   application:
@@ -193,10 +205,9 @@ ru:
       failure: "Не могу прекратить блокировать этого пользователя.  #evasion"
       success: "Посмотрим, что они скажут! #sayhello"
   bookmarklet:
-    explanation: "Пишите в Диаспору с любой страницы с помощью %{link}."
-    explanation_link_text: "этой закладки"
+    explanation: "Пишите в Диаспору с любой страницы с помощью этой закладки: %{link}."
     heading: "Букмарклет Диаспоры"
-    post_something: "Сообщите что-нибудь Диаспоре"
+    post_something: "Отправить в Диаспору"
     post_success: "Опубликовано! Закрытие!"
   cancel: "Отменить"
   comments:
@@ -285,20 +296,6 @@ ru:
   fill_me_out: "Заполнить"
   find_people: "Поиск людей или #меток"
   hide: "Скрыть"
-  home:
-    show:
-      already_account: "уже есть аккаунт?"
-      choice: "Выбор"
-      choice_explanation: "Диаспора позволяет сортировать группы контактов, называемые аспектами. Аспекты - уникальная особенность диаспоры. Они позволяют обеспечить приватность ваших фотографий, историй и т.д. Последние будут доступны только для тех людей, которые принадлежат соответствующему аспекту."
-      learn_about_host: "Узнайте о том, как организовать свой собственный сервер Диаспоры."
-      login_here: "Войти здесь"
-      ownership: "Собственность"
-      ownership_explanation: "Вы сохраняете право собственности на все, что вы предоставляете Диаспоре, это дает вам полный контроль над тем, как это распространяется."
-      share_what_you_want: "Делитесь чем хотите, с кем хотите."
-      simplicity: "Простота"
-      simplicity_explanation: "Диаспора делает обмен прозрачным и простым - это распространяется и на частную жизнь. По существу, диаспора не заставляет вас пробираться через страницы настроек и опций для того, чтобы держать ваш профиль в безопасности."
-      tagline_first_half: "Поделитесь чем хотите,"
-      tagline_second_half: "с кем вы хотите."
   invitation_codes:
     excited: "%{name} рад видеть вас здесь."
   invitations:
@@ -498,14 +495,12 @@ ru:
 
           Для начала, перейдите по этой ссылке
 
-          [%{invite_url}][1]
+          %{invite_url}
 
 
           С любовью,
 
           почтовый робот Диаспоры*!
-          
-          [1]: %{invite_url}
     invited_you: "%{name} пригласил(а) вас в Диаспору*"
     liked:
       liked: "%{name} понравилась ваша запись"
@@ -689,7 +684,7 @@ ru:
     new:
       create_my_account: "Создать мой аккаунт!"
       enter_email: "Введите email"
-      enter_password: "Введите пароль"
+      enter_password: "Введите пароль (не меньше шести символов)"
       enter_password_again: "Повторите пароль"
       enter_username: "Выберите имя пользователя (разрешены только латинские буквы, цифры и подчеркивание)"
       join_the_movement: "Присоединяйтесь к движению!"
@@ -1024,4 +1019,4 @@ ru:
   welcome: "Добро пожаловать!"
   will_paginate:
     next_label: "вперед &raquo;"
-    previous_label: "&laquo; назад"
+    previous_label: "&laquo; назад"
\ No newline at end of file
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 5d5908d8c..589e9e59b 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -203,7 +203,6 @@ sk:
       success: "Pozrime sa, čo hovoria! #sayhello"
   bookmarklet:
     explanation: "Píšte na Diasporu z hocikiaľ tak, že si pridáte do záložiek %{link}."
-    explanation_link_text: "tento odkaz"
     heading: "Bookmarklet"
     post_something: "Pošlite niečo na Diasporu"
     post_success: "Odoslané! Zatvára sa!"
@@ -294,20 +293,6 @@ sk:
   fill_me_out: "Vyplňte, prosím, formulár"
   find_people: "Nájsť ľudí alebo #značky"
   hide: "Schovať"
-  home:
-    show:
-      already_account: "Máte už účet?"
-      choice: "Možnosť výberu"
-      choice_explanation: "Diaspora vám umožňuje roztriediť si všetky vaše kontakty do skupín, ktoré sa  v anglickej verzii nazývajú Aspekty. Je unikátna práve tým, že dokáže zabezpečiť, aby  k fotkám, správam  a statusom mali prístup len tí ľudia, ktorých určíte vy."
-      learn_about_host: "Dozvedieť sa viac  o tom, ako prevádzkovať vlastný server  s Diasporou."
-      login_here: "sa prihláste tu"
-      ownership: "Vlastníctvo"
-      ownership_explanation: "Vlastníte svoje fotky  a nemali by ste sa ich vzdávať len kvôli tomu, že sa  o ne chcete  s niekym podeliť. Vaše vlastnícke práva na všetko,  o čo sa na Diaspore podelíte, zostávajú nedotknuté,  a tak môžete úplne kontrolovať to, ako sa  s tým zaobchádza."
-      share_what_you_want: "Podeľte sa o čo chcete s kým chcete."
-      simplicity: "Jednoduchosť"
-      simplicity_explanation: "Zdieľanie na Diaspore je veľmi ľahké  a transparentné –  a to isté platí  aj o ochrane osobných údajov. Keďže Diaspora je súkromná sama  o sebe, nenúti vás prejsť  cez žiadne zložité stránky  s nastaveniami  a možnosťami iba kvôli tomu, aby ste zabezpečili svoj profil."
-      tagline_first_half: "Podeľte sa, o čo chcete,"
-      tagline_second_half: "s kým chcete."
   invitation_codes:
     excited: "%{name} Vás tu rád/rada vidí"
   invitations:
@@ -482,13 +467,12 @@ sk:
 
           Ak chcete začať, kliknite na tento odkaz
 
-          [%{invite_url}][1]
+          %{invite_url}
+          <%= invite_code_url(@invitation_code)%>
 
           S pozdravom,
 
           e-mailový robot Diaspory*!
-
-          [1]: %{invite_url}
     invited_you: "%{name} Vás pozval(a) na Diasporu*"
     liked:
       liked: "%{name} označil(a), že sa mu (jej) páči váš príspevok"
@@ -1003,4 +987,4 @@ sk:
   welcome: "Vitajte!"
   will_paginate:
     next_label: "Ďalšia &raquo;"
-    previous_label: "&laquo; Predchádzajúca"
+    previous_label: "&laquo; Predchádzajúca"
\ No newline at end of file
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 7f7340268..275411a0d 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -173,7 +173,6 @@ sl:
       success: "Pa poglejmo, kaj imajo povedati! #sayhello"
   bookmarklet:
     explanation: "Objavite na Diasporo s kjerkoli, da shraniš %{link}."
-    explanation_link_text: "to povezavo"
     heading: "Zaznamek"
     post_something: "Objavite nekaj na Diasporo"
     post_success: "Objavljeno! Zapiram!"
@@ -255,20 +254,6 @@ sl:
   fill_me_out: "Izpolni me"
   find_people: "Poišči ljudi ali #zaznamke"
   hide: "Skrij"
-  home:
-    show:
-      already_account: "Že imate uporabniški račun?"
-      choice: "Izbira"
-      choice_explanation: "V omrežju Diaspora lahko vaše stike razvrščate s pomočjo pogledov. Pogledi kot takšni so unikatni in vam omogočajo, da so vaše slike, zgodbe in šale dostopne le osebam katerim ste jih namenili."
-      learn_about_host: "Preberite več o tem, kako gostiti lasten Diaspora  strežnik."
-      login_here: "prijavite se tukaj"
-      ownership: "Lastništvo"
-      ownership_explanation: "Vaše slike so vaša last in zato je prav, da jih lahko delite, ne da bi jih s tem komerkoli posredovali. Vsebina, ki jo delite v  omrežju Diaspora, se ohrani v vaši lasti, kot tudi kontrola nad distribucijo le-te."
-      share_what_you_want: "Delite kar želite, s komerkoli želite."
-      simplicity: "Preprostost"
-      simplicity_explanation: "Diaspora omogoča preprosto izmenjavo z upoštevanjem vaše zasebnosti. Za ohranjanje zasebnosti v Diaspori ni potrebno skozi neskončen seznam različnih nastavitev in možnosti."
-      tagline_first_half: "Delite kar želite,"
-      tagline_second_half: "s komerkoli želite."
   invitations:
     a_facebook_user: "Facebook uporabnik"
     check_token:
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index e656c7215..1e67fa5bf 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -203,10 +203,9 @@ sv:
       failure: "Jag kunde inte sluta ignorera den användaren.  #undvik"
       success: "Låt oss se vad de har att säga! #säghej"
   bookmarklet:
-    explanation: "Bokmärk %{link} för att skicka inlägg på Diaspora varifrån som helst."
-    explanation_link_text: "denna länk"
+    explanation: "Bokmärk %{link} för att kunna göra inlägg på Diaspora varifrån som helst."
     heading: "Bookmarklet"
-    post_something: "Posta något till Diaspora"
+    post_something: "Skicka till Diaspora"
     post_success: "Skickat! Stänger!"
   cancel: "Avbryt"
   comments:
@@ -295,20 +294,6 @@ sv:
   fill_me_out: "Fyll i mig"
   find_people: "Hitta personer eller #taggar"
   hide: "Göm"
-  home:
-    show:
-      already_account: "har du redan ett konto?"
-      choice: "Val"
-      choice_explanation: "Diaspora låter dig dela in dina kontakter i grupper som kallas aspekter. Aspekter, som är unika för Diaspora, förhindrar att dina foton, meddelanden och skämt kan ses av någon annan än de personer som du valt."
-      learn_about_host: "Läs om hur du sätter upp en egen Diasporaserver."
-      login_here: "logga in här"
-      ownership: "Ägandeskap"
-      ownership_explanation: "Du äger dina bilder, och du ska inte behöva frångå det när du vill dela med dig av dem. Du behåller äganderätten till allt du delar med dig av på Diaspora, vilket ger dig full kontroll över hur det distribueras."
-      share_what_you_want: "Dela vad du vill, med vem du vill."
-      simplicity: "Enkelhet"
-      simplicity_explanation: "Med  Diaspora är det enkelt dela med sig av information och bilder till rätt personer. Det är lika lätt att behålla den personliga integriteten. Med Diaspora tvingas du inte vada igenom sidor av inställningar och alternativ bara för att hålla din profil säker."
-      tagline_first_half: "Dela vad du vill,"
-      tagline_second_half: "med vem du vill."
   invitation_codes:
     excited: "%{name} är glad för att du är här."
   invitations:
@@ -464,14 +449,12 @@ sv:
 
           Klicka på länken nedan för att börja.
 
-          [%{invite_url}][1]
+          %{invite_url}
 
 
           Med vänlig hälsning,
 
           Diasporas e-postrobot.
-
-          [1]: %{invite_url}
     invited_you: "%{name} har bjudt in dig till Diaspora*."
     liked:
       liked: "%{name} gillar ditt inlägg "
@@ -652,7 +635,7 @@ sv:
     new:
       create_my_account: "Skapa mitt konto!"
       enter_email: "Ange en e-postadress"
-      enter_password: "Skriv in ett lösenord"
+      enter_password: "Skriv in ett lösenord, åtminstone sex tecken långt"
       enter_password_again: "Skriv in samma lösenord som tidigare"
       enter_username: "Välj ett användarnamn (endast bokstäver, nummer och understreck)"
       join_the_movement: "Gå med i rörelsen!"
@@ -978,4 +961,4 @@ sv:
   welcome: "Välkommen!"
   will_paginate:
     next_label: "nästa »"
-    previous_label: "« föregående"
+    previous_label: "« föregående"
\ No newline at end of file
diff --git a/config/locales/diaspora/te.yml b/config/locales/diaspora/te.yml
index 8fc896e0c..9f12bce29 100644
--- a/config/locales/diaspora/te.yml
+++ b/config/locales/diaspora/te.yml
@@ -44,8 +44,6 @@ te:
       work: "సహోద్యోగులు"
     two: "%{count} aspects"
     zero: "no aspects"
-  bookmarklet:
-    explanation_link_text: "ఈ లంకె"
   cancel: "రద్దుచేయి"
   contacts:
     few: "%{count} పరిచయాలు"
@@ -65,9 +63,6 @@ te:
   delete: "తొలగించు"
   fill_me_out: "పూరించండి"
   hide: "దాచు"
-  home:
-    show:
-      already_account: "ఇప్పటికే ఖాతా ఉందా?"
   invitations:
     create:
       already_sent: "ఈ వ్యక్తిని మీరు ఇప్పటికే ఆహ్వానించారు."
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 5746fd39d..6b3e97106 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -178,7 +178,6 @@ tr:
       success: "Bakalım ne diyecekler! #sayhello"
   bookmarklet:
     explanation: "Diaspora'ya istediğin her yerden gönderi yapmak için %{link} yer imleri çubuğuna sürükle."
-    explanation_link_text: "bu bağlantıyı"
     heading: "Diaspora yer işareti"
     post_something: "Diaspora için birşey gönder"
     post_success: "Gönderildi! Kapatılıyor!"
@@ -264,20 +263,6 @@ tr:
   fill_me_out: "Beni doldur"
   find_people: "Kişi ve #tag bul"
   hide: "Gizle"
-  home:
-    show:
-      already_account: "Zaten bir hesabın var mı?"
-      choice: "Seçim"
-      choice_explanation: "Diaspora bağlantılarınızı yön adı verilen gruplar halinde sıralamanızı sağlar. Diaspora'ya özgü olarak, yönleri, fotoğrafları, hikayeleri ve şakaları sadece istediğiniz insanlarla paylaşırsınız."
-      learn_about_host: "Sunucunuzda Diaspora'yı sunmak için bilgi edin."
-      login_here: "buradan oturum açın"
-      ownership: "Sahiplik"
-      ownership_explanation: "Kendi resimlerinin sahibi sensin, paylaşabilmek için bu hakkından olmaman lâzım. Diaspora'da paylaştığın her şeyin sahibi sen olmaya devam edersin ve yayılmasında tüm kontrol sendedir."
-      share_what_you_want: "İstediğinle, istediğini paylaş."
-      simplicity: "Sadelik"
-      simplicity_explanation: "Diaspora, sadeliğe,kolay paylaşıma ve gizliliklere önem verir. Doğal olarak özeldir, Diaspora Java ayarları sayfalarıyla saklama yapmaz. Bu yüzden güvenlidir."
-      tagline_first_half: "İstediğiniz ne ise paylaşın,"
-      tagline_second_half: "istediğiniz."
   invitations:
     a_facebook_user: "Bir Facebook kullanıcısı"
     check_token:
diff --git a/config/locales/diaspora/uk.yml b/config/locales/diaspora/uk.yml
index 7350ec9c0..d464e44ab 100644
--- a/config/locales/diaspora/uk.yml
+++ b/config/locales/diaspora/uk.yml
@@ -174,7 +174,6 @@ uk:
       success: "Подивимося, що вони скажуть! #sayhello"
   bookmarklet:
     explanation: "Пишіть в Діаспору з будь-якої сторінки з допомогою %{link}."
-    explanation_link_text: "цієї закладки"
     heading: "Букмарклет Діаспори"
     post_something: "Повідомте що-небудь Діаспорі"
     post_success: "Опубліковано! Закриття!"
@@ -255,20 +254,6 @@ uk:
   fill_me_out: "Заповнити"
   find_people: "Пошук людей або міток"
   hide: "Приховати"
-  home:
-    show:
-      already_account: "вже є обліковий запис?"
-      choice: "Вибір"
-      choice_explanation: "Діаспора дозволяє сортувати групи контактів, що називаються аспектами. Аспекти - унікальна особливість діаспори. Вони дозволяють забезпечити приватность ваших фотографій, історій і так далі. Останні будуть доступні тільки для тих людей, які належать відповідному аспекту."
-      learn_about_host: "Дізнайтеся про те, як організувати свій власний сервер Діаспори."
-      login_here: "Увійти тут"
-      ownership: "Власність"
-      ownership_explanation: "Ви зберігаєте право власності на усе, що ви надаєте Діаспорі, це дає вам повний контроль над тим, як це поширюється."
-      share_what_you_want: "Діліться чим хочете, з ким хочете."
-      simplicity: "Простота"
-      simplicity_explanation: "Діаспора робить обмін прозорим і простим - це поширюється і на приватне життя. По суті, діаспора не примушує вас пробиратися через сторінки налаштувань і опцій для того, щоб тримати ваш профіль у безпеці."
-      tagline_first_half: "Поділіться чим хочете,"
-      tagline_second_half: "з ким ви хочете."
   invitations:
     a_facebook_user: "Користувач Facebook"
     check_token:
diff --git a/config/locales/diaspora/vi.yml b/config/locales/diaspora/vi.yml
index 379e86007..498d8c481 100644
--- a/config/locales/diaspora/vi.yml
+++ b/config/locales/diaspora/vi.yml
@@ -196,7 +196,6 @@ vi:
       success: "Hãy xem họ đã nói gì! #sayhello"
   bookmarklet:
     explanation: "Đăng tin lên Diaspora từ bất kì đâu bằng cách đánh dấu %{link}."
-    explanation_link_text: "liên kết này"
     heading: "Đánh dấu"
     post_something: "Đăng tin lên Diaspora"
     post_success: "Đã đăng! Đang đóng!"
@@ -287,19 +286,6 @@ vi:
   fill_me_out: "Điền đầy đủ"
   find_people: "Tìm người hoặc #tags"
   hide: "Ẩn"
-  home:
-    show:
-      already_account: "đã có tài khoản?"
-      choice: "Lựa chọn"
-      choice_explanation: "Diaspora cho phép bạn sắp xếp các kết nối vào những nhóm gọi là mối quan hệ. Điều này bảo đảm rằng những gì bạn chia sẻ được những người bạn chỉ định thấy được."
-      learn_about_host: "Tìm hiểu cách cài Diaspora trên máy chủ của bạn."
-      login_here: "đăng nhập tại đây"
-      ownership: "Chủ sở hữu"
-      ownership_explanation: "Bạn không thể không chia sẻ ảnh của mình. Bạn có quyền sở hữu tất cả những gì bạn chia sẻ trên Diaspora, và quyền quyết định cách phân phối chúng."
-      share_what_you_want: "Chia sẻ những gì, với ai mà bạn muốn."
-      simplicity: "Đơn giản hoá"
-      tagline_first_half: "Chia sẻ những gì bạn muốn,"
-      tagline_second_half: "với người mà bạn muốn."
   invitation_codes:
     excited: "%{name} muốn nhìn thấy bạn ở đây."
   invitations:
@@ -476,13 +462,11 @@ vi:
 
           Nhấn vào liên kết sau để bắt đầu
 
-          [%{invite_url}][1]
+          %{invite_url}
 
           Thân,
 
           Máy phát thư Diaspora*!
-
-          [1]: %{invite_url}
     invited_you: "%{name} đã mời bạn tham gia Diaspora*"
     liked:
       liked: "%{name} vừa thích bài đăng của bạn"
@@ -970,4 +954,4 @@ vi:
   welcome: "Chào mừng!"
   will_paginate:
     next_label: "sau &raquo;"
-    previous_label: "&laquo; trước"
+    previous_label: "&laquo; trước"
\ No newline at end of file
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index 7e33c07ed..915a421db 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -123,7 +123,6 @@ zh-CN:
   back: "后退"
   bookmarklet:
     explanation: "%{link} 收藏这个链接，即可随时发布新内容"
-    explanation_link_text: "这个链接"
     heading: "Diaspora Bookmarklet"
     post_something: "发布些新内容到Diaspora"
     post_success: "发布完成！关闭中！"
@@ -193,20 +192,6 @@ zh-CN:
   fill_me_out: "填写我"
   find_people: "Find people"
   hide: "隐藏"
-  home:
-    show:
-      already_account: "已经有帐号了吗？"
-      choice: "选择"
-      choice_explanation: "Diaspora 让你将您的关系分成多个视图，每个视图是您生活的不同部分。这是Diaspora首创，用来确保您的照片、经历和笑话，只与您所希望分享的人分享。"
-      learn_about_host: "学习如何架设您自己的Diaspora服务器。"
-      login_here: "从这里登录"
-      ownership: "所有权"
-      ownership_explanation: "你拥有您的图片，且不因为分享而失去该权利。在Diaspora，所有你分享的内容，你都持有所有权，你可以控制它们的发布。"
-      share_what_you_want: "分享您想分享的内容，给您想分享给的人。"
-      simplicity: "简单"
-      simplicity_explanation: "Diaspora让分享变得干净而简单，对隐私设置也是这样。以隐私为出发点，Diaspora 让你不必千辛万苦的调整设置，就能保护您的个人信息安全。"
-      tagline_first_half: "分享您想分享的内容，"
-      tagline_second_half: "给您想分享给的人。"
   invitations:
     check_token:
       not_found: "找不到该邀请码"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 62379b7c7..6df66e284 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -178,7 +178,6 @@ zh-TW:
       success: "看看他們要說什麼吧! #打招呼"
   bookmarklet:
     explanation: "%{link}加入書籤後可對任何網站使用."
-    explanation_link_text: "這個連結"
     heading: "書籤小程式"
     post_something: "貼些東西到 Diaspora"
     post_success: "貼好了! 關掉中!"
@@ -263,20 +262,6 @@ zh-TW:
   fill_me_out: "填寫我"
   find_people: "找人或 #標籤"
   hide: "隱藏"
-  home:
-    show:
-      already_account: "已經有帳號了嗎?"
-      choice: "選擇"
-      choice_explanation: "Diaspora 讓你將你的關係以\"面向\"來分類. 面向是 Diaspora 的獨創, 用來確保你的相片,遭遇和笑話, 只和你所希望的人分享."
-      learn_about_host: "學習如何架設你自己的 Diaspora 伺服器."
-      login_here: "從這裡登入"
-      ownership: "所有權"
-      ownership_explanation: "你擁有你的圖片, 且不該因為分享出去就失去它. 在 Diaspora, 所有你分享出去的東西, 你都仍有所有權, 你可以控制它們如何散布."
-      share_what_you_want: "分享你想分享的東西, 給你想分享的人."
-      simplicity: "簡單"
-      simplicity_explanation: "Diaspora 讓分享變得單純且簡單, 而隱私也是一樣. 以隱私為出發點, Diaspora 讓你不必千辛萬苦的調整設定, 才能保護你的個人檔案安全."
-      tagline_first_half: "分享你想分享的東西,"
-      tagline_second_half: "給你想分享的人."
   invitations:
     a_facebook_user: "Facebook 使用者"
     check_token:
diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml
index 114d90433..0e615da4d 100644
--- a/config/locales/javascript/javascript.de.yml
+++ b/config/locales/javascript/javascript.de.yml
@@ -38,6 +38,7 @@ de:
       preparing_your_stream: "Dein persönlicher Stream wird zusammengestellt …"
     header:
       admin: "Admin"
+      close: "schließen"
       contacts: "Kontakte"
       home: "Startseite"
       log_out: "Abmelden"
@@ -63,6 +64,8 @@ de:
       public: "Öffentlich - dein Beitrag ist für alle sichtbar und kann von Suchmaschinen gefunden werden"
     reshares:
       duplicate: "Du hast diesen Beitrag bereits weitergesagt!"
+      post: "<%= name %>s Beitrag teilen?"
+      successful: "Der Beitrag wurde erfolgreich geteilt!"
     search_for: "Nach <%= name %> suchen"
     show_more: "Mehr zeigen"
     stream:
@@ -121,6 +124,7 @@ de:
     viewer:
       comment: "Kommentieren"
       follow_post: "Diesen Beitrag verfolgen"
+      home: "START"
       like: "Gefällt mir"
       reshare: "Weitersagen"
       reshared: "Weitergesagt"
diff --git a/config/locales/javascript/javascript.es-AR.yml b/config/locales/javascript/javascript.es-AR.yml
index 901606117..b29caba7f 100644
--- a/config/locales/javascript/javascript.es-AR.yml
+++ b/config/locales/javascript/javascript.es-AR.yml
@@ -9,15 +9,15 @@ es-AR:
     aspect_dropdown:
       add_to_aspect: "Agregar contacto"
       all_aspects: "Todos los aspectos"
-      error: "No se pudo empezar a compartir con {{name}}.  ¿Será que lo/a estás ignorando?"
+      error: "No se pudo empezar a compartir con <%= name %>. ¿Será que la/lo estás ignorando?"
       select_aspects: "Selecciona aspectos"
-      started_sharing_with: "Empezaste a compartir con {{name}}!"
-      stopped_sharing_with: "Dejaste de compartir con {{name}}."
+      started_sharing_with: "¡Has empezado a compartir con <%= name%>!"
+      stopped_sharing_with: "Has dejado de compartir con <%= name =%>"
       toggle:
         few: "En {{count}} aspectos"
         many: "En {{count}} aspectos"
-        one: "En {{count}} aspecto"
-        other: "En {{count}} aspectos"
+        one: "En <%= count %> aspecto"
+        other: "En <%= count %> aspectos"
         two: "En {{count}} aspectos"
         zero: "Seleccionar aspectos"
     aspect_navigation:
@@ -33,11 +33,12 @@ es-AR:
     failed_to_post_message: "¡No pudo publicarse el mensaje!"
     getting_started:
       alright_ill_wait: "Todo bien, voy a esperar."
-      hey: "Che, {{name}}!"
+      hey: "¡Hola, <%= name %>!"
       no_tags: "¡Che, no estás siguiendo ningún tag! ¿Continuar de todos modos?"
       preparing_your_stream: "Preparando tu stream personalizado..."
     header:
       admin: "Administrador"
+      close: "Cerrar"
       contacts: "Contactos"
       home: "Inicio"
       log_out: "Salir"
@@ -104,7 +105,7 @@ es-AR:
       unfollow: "Dejar de seguir"
       unlike: "No me gusta"
     tags:
-      wasnt_that_interesting: "OK, supongamos que #{{tagName}} no era tan interesante..."
+      wasnt_that_interesting: "Bueno, supongo que #<%= tagName %> no era tan interesante..."
     timeago:
       day: "un día"
       days: "%d días"
@@ -114,8 +115,8 @@ es-AR:
       minutes: "%d minutos"
       month: "cerca de un mes"
       months: "%d meses"
-      prefixAgo: "hace"
-      prefixFromNow: "dentro de"
+      prefixAgo: ""
+      prefixFromNow: ""
       seconds: "menos de un minuto"
       suffixAgo: "hace"
       suffixFromNow: "desde ahora"
@@ -127,6 +128,7 @@ es-AR:
     viewer:
       comment: "Comentar"
       follow_post: "Seguir esta publicación"
+      home: "INICIO"
       like: "Me gusta"
       reshare: "Compartir"
       reshared: "Compartido"
diff --git a/config/locales/javascript/javascript.es-MX.yml b/config/locales/javascript/javascript.es-MX.yml
index c8353c031..b6e02b7f1 100644
--- a/config/locales/javascript/javascript.es-MX.yml
+++ b/config/locales/javascript/javascript.es-MX.yml
@@ -35,6 +35,7 @@ es-MX:
       preparing_your_stream: "Preparando tu entrada personalizada…"
     header:
       admin: "Administrador"
+      close: "cerrar"
       contacts: "Contactos"
       home: "Inicio"
       log_out: "Salir"
@@ -106,7 +107,7 @@ es-MX:
       prefixFromNow: "dentro de"
       seconds: "menos de un minuto"
       suffixAgo: ""
-      suffixFromNow: ""
+      suffixFromNow: "desde ahora"
       year: "un año aproximadamente"
       years: "%d años"
     videos:
diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml
index 6c5613eeb..e31211f77 100644
--- a/config/locales/javascript/javascript.es.yml
+++ b/config/locales/javascript/javascript.es.yml
@@ -38,6 +38,7 @@ es:
       preparing_your_stream: "Preparando tus novedades personalizadas..."
     header:
       admin: "Administrar"
+      close: "cerrar"
       contacts: "Contactos"
       home: "Inicio"
       log_out: "Salir"
@@ -65,7 +66,7 @@ es:
     reshares:
       duplicate: "Que bien, ¿eh? ¡Has compartido esa publicación!"
       post: "¿Compartir la publicación de <%= name %>?"
-      successful: "¡La publicación se compartió correctamente!"
+      successful: "¡Publicación compartida con éxito!"
     search_for: "Buscar a <%= name %>"
     show_more: "mostrar más"
     stream:
diff --git a/config/locales/javascript/javascript.eu.yml b/config/locales/javascript/javascript.eu.yml
index 1058c3f84..1eb458151 100644
--- a/config/locales/javascript/javascript.eu.yml
+++ b/config/locales/javascript/javascript.eu.yml
@@ -38,6 +38,7 @@ eu:
       preparing_your_stream: "Zure kronologia pertsonalizatua prestatzen..."
     header:
       admin: "Kudeatu"
+      close: "itxi"
       contacts: "Lagunak"
       home: "Hasiera"
       log_out: "Atera"
@@ -64,6 +65,8 @@ eu:
       public: "Publikoa - zure mezua edonork ikusi ahalko du, bai eta bilaketa zerbitzuetan agertu ere"
     reshares:
       duplicate: "Oso ona, e? Dagoeneko birpartekatu duzu mezu hori!"
+      post: "Birpartekatu nahi al duzu <%= name %>(r)en mezua?"
+      successful: "Mezua arrakastaz birpartekatu da!"
     search_for: "Bilatu <%= name %>"
     show_more: "erakutsi gehiago"
     stream:
@@ -121,4 +124,6 @@ eu:
       years: "%d urte"
     videos:
       unknown: "Bideo mota ezezaguna"
-      watch: "Ikusi bideo hau <%= provider %>(e)n"
\ No newline at end of file
+      watch: "Ikusi bideo hau <%= provider %>(e)n"
+    viewer:
+      home: "HASIERA"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.fi.yml b/config/locales/javascript/javascript.fi.yml
index d5f6bac1f..65ac4c50a 100644
--- a/config/locales/javascript/javascript.fi.yml
+++ b/config/locales/javascript/javascript.fi.yml
@@ -38,6 +38,7 @@ fi:
       preparing_your_stream: "Yksilöllistä virtaasi valmistellaan..."
     header:
       admin: "Ylläpitäjä"
+      close: "sulje"
       contacts: "Kontaktit"
       home: "Koti"
       log_out: "Kirjaudu ulos"
@@ -52,6 +53,10 @@ fi:
     ignore: "Sivuuta"
     infinite_scroll:
       no_more: "Ei enempää viestejä."
+    my_activity: "Oma toimintani"
+    my_stream: "Virta"
+    people:
+      not_found: "...ketään ei löytynyt."
     photo_uploader:
       looking_good: "OMG, näytät upealta!"
     publisher:
@@ -60,11 +65,15 @@ fi:
       public: "Julkinen - viestisi näkyvät kaikille mukaan lukien hakukoneet ja niiden tulokset"
     reshares:
       duplicate: "Olet jo uudelleenjakanut viesti!"
+      post: "Jaa käyttäjän <%= name %> viesti?"
+      successful: "Viesti jaettiin onnistuneesti!"
     search_for: "Etsi nimellä <%= name %>"
     show_more: "näytä lisää"
     stream:
       comment: "Kommentoi"
+      follow: "Seuraa"
       hide: "Piilota"
+      hide_nsfw_posts: "Piilota #nsfw viestit"
       like: "Tykkää"
       likes:
         few: "<%= count %> tykkäystä"
@@ -91,6 +100,10 @@ fi:
         other: "<%= count %> uudelleenjakoa"
         two: "<%= count %> uudelleenjakoa"
         zero: "<%= count %> uudelleenjakoa"
+      show_nsfw_post: "Näytä viesti"
+      show_nsfw_posts: "Näytä kaikki"
+      unfollow: "Lopeta seuraaminen"
+      unlike: "Älä tykkää"
     tags:
       wasnt_that_interesting: "OK, #<%= tagName %> ei tainnut ollakaan kovin kiinnostava aihe..."
     timeago:
@@ -111,4 +124,12 @@ fi:
       years: "%d vuotta"
     videos:
       unknown: "Tuntematon videomuoto"
-      watch: "Katso video palvelussa <%= provider %>"
\ No newline at end of file
+      watch: "Katso video palvelussa <%= provider %>"
+    viewer:
+      comment: "Kommentoi"
+      follow_post: "Seuraa viestiä"
+      like: "Tykkää"
+      reshare: "Jaa uudelleen"
+      reshared: "Jaettu uudelleen"
+      stop_following_post: "Lopeta viestin seuraaminen"
+      unlike: "Älä tykkää"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.fr.yml b/config/locales/javascript/javascript.fr.yml
index 0321002b1..d9ae3ea0e 100644
--- a/config/locales/javascript/javascript.fr.yml
+++ b/config/locales/javascript/javascript.fr.yml
@@ -38,6 +38,7 @@ fr:
       preparing_your_stream: "Préparation de votre flux personnalisé..."
     header:
       admin: "Administration"
+      close: "fermer"
       contacts: "Contacts"
       home: "Accueil"
       log_out: "Se déconnecter"
diff --git a/config/locales/javascript/javascript.hu.yml b/config/locales/javascript/javascript.hu.yml
index bbbda8bc5..cf35a6300 100644
--- a/config/locales/javascript/javascript.hu.yml
+++ b/config/locales/javascript/javascript.hu.yml
@@ -38,6 +38,7 @@ hu:
       preparing_your_stream: "Személyre szabott hírfolyamod előkészítése..."
     header:
       admin: "Adminisztráció"
+      close: "bezárás"
       contacts: "Ismerősök"
       home: "Kezdőlap"
       log_out: "Kijelentkezés"
diff --git a/config/locales/javascript/javascript.it.yml b/config/locales/javascript/javascript.it.yml
index b4d1a7a22..5c2f07cdf 100644
--- a/config/locales/javascript/javascript.it.yml
+++ b/config/locales/javascript/javascript.it.yml
@@ -38,6 +38,7 @@ it:
       preparing_your_stream: "Sto preparando il tuo stream personalizzato..."
     header:
       admin: "Amministrazione"
+      close: "chiudi"
       contacts: "Contatti"
       home: "Home"
       log_out: "Esci"
@@ -66,7 +67,7 @@ it:
       duplicate: "Bello eh? Ma hai già condiviso quel post!"
       post: "Vuoi condividere il post di <%= name %>?"
       successful: "Il post è stato condiviso!"
-    search_for: "Ricerca su <%= name %>"
+    search_for: "Cerca su <%= name %>"
     show_more: "continua..."
     stream:
       comment: "Commenta"
diff --git a/config/locales/javascript/javascript.nn.yml b/config/locales/javascript/javascript.nn.yml
index 7f30addc4..9a54ff70c 100644
--- a/config/locales/javascript/javascript.nn.yml
+++ b/config/locales/javascript/javascript.nn.yml
@@ -38,6 +38,7 @@ nn:
       preparing_your_stream: "Lagar den tilpassa straumen din …"
     header:
       admin: "Admin"
+      close: "lukk"
       contacts: "Kontaktar"
       home: "Heim"
       log_out: "Logg ut"
@@ -54,6 +55,8 @@ nn:
       no_more: "Ingen fleire meldingar."
     my_activity: "Min aktivitet"
     my_stream: "Straum"
+    people:
+      not_found: "orsak, me kunne ikkje finne nokon."
     photo_uploader:
       looking_good: "Du verda, du ser flott ut!"
     publisher:
@@ -62,6 +65,8 @@ nn:
       public: "Offentleg - alle kan sjå meldinga di og ho kan bli funnen av søkjemotorar"
     reshares:
       duplicate: "Så bra, altså? Men du har allereie delt meldinga :-)"
+      post: "Vil du dele <%= name %> sin post?"
+      successful: "Hurra, posten vart delt!"
     search_for: "Leit etter {{name}}"
     show_more: "syn meir"
     stream:
@@ -123,6 +128,7 @@ nn:
     viewer:
       comment: "Kommenter"
       follow_post: "Følg innlegg"
+      home: "HEIM"
       like: "Lik"
       reshare: "Del"
       reshared: "Delt"
diff --git a/config/locales/javascript/javascript.pl.yml b/config/locales/javascript/javascript.pl.yml
index 62691bcf6..a30d030f3 100644
--- a/config/locales/javascript/javascript.pl.yml
+++ b/config/locales/javascript/javascript.pl.yml
@@ -38,6 +38,7 @@ pl:
       preparing_your_stream: "Przygotowanie spersonalizowanego strumienia..."
     header:
       admin: "Administrator"
+      close: "zamknij"
       contacts: "Kontakty"
       home: "Strona główna"
       log_out: "Wyloguj"
@@ -127,6 +128,7 @@ pl:
     viewer:
       comment: "Skomentuj"
       follow_post: "Obserwuj wpis"
+      home: "GŁÓWNA"
       like: "Lubię to!"
       reshare: "Przekaż dalej"
       reshared: "Przekazano dalej"
diff --git a/config/locales/javascript/javascript.ru.yml b/config/locales/javascript/javascript.ru.yml
index 504c7ed2c..d136f7c3d 100644
--- a/config/locales/javascript/javascript.ru.yml
+++ b/config/locales/javascript/javascript.ru.yml
@@ -38,6 +38,7 @@ ru:
       preparing_your_stream: "Подготовка вашего личного потока..."
     header:
       admin: "Администратор"
+      close: "закрыть"
       contacts: "Контакты"
       home: "Главная"
       log_out: "Выйти"
@@ -64,6 +65,8 @@ ru:
       public: "Публичная - ваша запись будет видна всем, включая поисковые системы"
     reshares:
       duplicate: "Настолько круто, да? Вы уже поделились этой записью!"
+      post: "Поделиться записью пользователя <%= name %>?"
+      successful: "Вы успешно поделились записью!"
     search_for: "Искать <%= name %>"
     show_more: "показать больше"
     stream:
@@ -125,6 +128,7 @@ ru:
     viewer:
       comment: "Комментировать"
       follow_post: "Следить за записью"
+      home: "ДОМОЙ"
       like: "Мне нравится"
       reshare: "Поделиться"
       reshared: "Поделились"
diff --git a/config/locales/javascript/javascript.sv.yml b/config/locales/javascript/javascript.sv.yml
index 294acb655..071c8a70b 100644
--- a/config/locales/javascript/javascript.sv.yml
+++ b/config/locales/javascript/javascript.sv.yml
@@ -38,6 +38,7 @@ sv:
       preparing_your_stream: "Förbereder din personliga ström..."
     header:
       admin: "Administratör"
+      close: "stäng"
       contacts: "Kontakter"
       home: "Hem"
       log_out: "Logga ut"