diff --git a/config/locales/devise/devise.cs.yml b/config/locales/devise/devise.cs.yml
index b5d77d03c..fee7623be 100644
--- a/config/locales/devise/devise.cs.yml
+++ b/config/locales/devise/devise.cs.yml
@@ -31,7 +31,7 @@ cs:
       invitation_instructions:
         accept: "Přijmout pozvání"
         arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
-        be_yourself: "Be Yourself"
+        be_yourself: "Buďte sami sebou"
         be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
         cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
@@ -51,7 +51,7 @@ cs:
         made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
         more_people: "Even more people are excited to see you!"
         no_account_till: "Váš účet nebude vytvořen dokud nepřistoupíte na uvedený odkaz a zaregistrujete se."
-        or: "or"
+        or: "nebo"
         sign_up_now: "Sign up now →"
         subject: "Byli jste pozváni na Diasporu!"
         team_diaspora: "Team Diaspora"
diff --git a/config/locales/devise/devise.es-AR.yml b/config/locales/devise/devise.es-AR.yml
index 7d5071415..ed415cc67 100644
--- a/config/locales/devise/devise.es-AR.yml
+++ b/config/locales/devise/devise.es-AR.yml
@@ -35,20 +35,20 @@ es-AR:
         be_yourself_paragraph: "Internet creó nuevas formas únicas para que nos expresemos. %{strong_diaspora} te permite ser uno mismo y compartir lo que te parezca, con o sin tu nombre real."
         cubbies: Cubbi.es
         displaying_correctly: "¿El email no se ve correctamente? %{link}"
-        email_address: preguntas@joindiaspora.com
+        email_address: questions@joindiaspora.com
         email_us: "Para consultas generales o pedido de ayuda con su cuenta de Diaspora, por favor envianos un email a %{email}."
-        finally: "Finalmente - Ya llegó"
+        finally: "Por fin - Ya llegó"
         friends_saying: "Lo que tus amigos están diciendo..."
         get_connected: "Conectate"
-        get_connected_paragraph: "Un movimiento internacional con una visión compartida para una mejor web, la principal característica de %{strong_diaspora} es su comunidad. Conocé gente nueva, conectáte con amigos y unite a la diversión."
+        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. Conocé gente nueva, conectáte con amigos y unite a la diversión."
         have_fun: "Divertite"
         have_fun_paragraph: "%{strong_diaspora} es descubrir contenido nuevo y sorprendente de personas que están online. %{link}, la primera aplicación del mundo para %{strong_diaspora} es sólo el comienzo. Recopilar y compartir en la web en toda su gloria."
-        help_fund: "Ayudá a financiar Diaspora"
+        help_fund: "ayudá a financiar Diaspora"
         here: "aquí"
         ignore: "Si no querés aceptar la invitación, por favor ignorá este correo."
         join_team: "Unite a nuestro Equipo"
         love: "Con amor,"
-        made_by_people: "%{strong_diaspora} está hecha por personas que aman Internet tanto como vos. %{jointeam}, o %{helpfund}!"
+        made_by_people: "%{strong_diaspora} está hecha por personas que aman Internet tanto como vos. ¡%{jointeam} o %{helpfund}!"
         more_people: "¡Incluso más personas están emocionadas por verte!"
         no_account_till: "Tu cuenta no será creada hasta que accedas al anterior enlace y te registres."
         or: "o"
diff --git a/config/locales/devise/devise.es.yml b/config/locales/devise/devise.es.yml
index 99ba571e7..8e546da46 100644
--- a/config/locales/devise/devise.es.yml
+++ b/config/locales/devise/devise.es.yml
@@ -30,32 +30,32 @@ es:
       hello: "Hola %{email}!"
       invitation_instructions:
         accept: "Aceptar invitación"
-        arrived: "La red social que has estado esperando ha llegado. Renovada, más segura y más divertida, %{strong_diaspora} está lista para ayudarte a compartir y explorar la web de una forma totalmente nueva."
-        be_yourself: "Se tú mismo"
-        be_yourself_paragraph: "Internet ha creado nuevas formas únicas para que nos expresemos. %{strong_diaspora} te permite ser tú mismo y compartir lo que le apetezca, usando tu nombre real o no."
+        arrived: "La red social que has estado esperando ha llegado. Renovada, más segura y divertida, %{strong_diaspora} está lista para ayudarte a compartir y explorar la red de una forma totalmente nueva."
+        be_yourself: "Sé tú mism@"
+        be_yourself_paragraph: "Internet ha creado nuevas y únicas formas para expresarnos. %{strong_diaspora} deja que seas tú mismo y compartas como quieras, con o sin tu nombre real."
         cubbies: Cubbi.es
         displaying_correctly: "¿No se muestra correctamente el email? %{Link}"
         email_address: questions@joindiaspora.com
-        email_us: "Para consultas generales o soporte sobre tu cuenta de Diaspora*, por favor envíanos un correo a %{email}."
-        finally: "Finalmente - ya está aquí"
+        email_us: "Para consultas generales o soporte sobre tu cuenta Diaspora*, por favor escríbenos a %{email}."
+        finally: "Por fin - está aquí"
         friends_saying: "Lo que tus amigos están diciendo..."
         get_connected: "Conéctate"
-        get_connected_paragraph: "Un movimiento internacional con una visión compartida para una red mejor, la primera característica de %{strong_diaspora} es su comunidad. Conocer gente nueva, conectarse con amigos y unirse a la diversión."
-        have_fun: "Que te diviertas"
-        have_fun_paragraph: "%{strong_diaspora} se trata de descubrir contenido nuevo y sorprendente de personas conectadas.%{Link}, la primera aplicación mundial de %{strong_diaspora} es sólo el principio. Recopila y comparte en la red en todo su explendor."
+        get_connected_paragraph: "Un movimiento internacional 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}, es sólo el principio, es la primera aplicación de %{strong_diaspora} en el mundo. Colecciona y comparte la red en todo su explendor."
         help_fund: "ayuda a financiar Diaspora*"
         here: "aquí"
         ignore: "Si no quieres aceptar la invitación, ignora este email."
         join_team: "Únete a nuestro equipo"
         love: "Saludos,"
-        made_by_people: "%{strong_diaspora} está hecha por personas que aman Internet tanto como tú. %{jointeam} o %{helpfund}!"
+        made_by_people: "%{strong_diaspora} está hecha por personas que aman Internet tanto como tú. ¡%{jointeam} o %{helpfund}!"
         more_people: "¡Incluso hay más personas que están esperando verte!"
         no_account_till: "Tu cuenta no será creada hasta que no accedas al enlace superior para registrarte."
         or: "o"
         sign_up_now: "Regístrate ahora →"
         subject: "¡Has sido invitado a unirte a Diaspora*!"
-        team_diaspora: "Equipo de Diaspora*"
-        unsubscribe: "Para anular tu suscripción por favor haz clic en %{link}."
+        team_diaspora: "Equipo Diaspora*"
+        unsubscribe: "Para anular tu suscripción haz clic en %{link}."
         view_in: "Ver en el navegador."
       inviter:
         accept_at: "en %{url}, puedes aceptar en el enlace inferior."
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 382a46852..67e135c7f 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -846,7 +846,6 @@ ar:
       connect_to_cubbies: "صِل حسابك بـ Cubbi.es"
       connecting_is_simple: "اتصال حسابك في ديسبورا بسيط! فقط أدخل وسيط ديسبورا الخاص بك (<b>%{diaspora_id}</b>) من <a href='%{href_link}'>صفحة إعداداتك</a> في Cubbies ثم اضغط \"اتصِل\"."
       daniels_account: "حساب دياسبرا الخاص بدانييل"
-      log_in_with_diaspora_is_comming: "قريبًا جدًا .. ستتمكن من الاتصال بتطبيق جديد دون إنشاء حساب منفصل عن حسابك في ديسبورا."
       love_to_try: "نحبذ أن تجربه."
       making_the_connection: "ابدأ الإتصال"
       screenshot_explanation: "%{link1}.  هذا الـ cubby خاص بـ %{link2}."
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index a6400bbf5..b374b8542 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -846,7 +846,6 @@ bg:
       connect_to_cubbies: "Свързване с Cubbi.es"
       connecting_is_simple: "За свързване на акаунта ви в Diaspora е необходимо да въведете вашият адрес в Diaspora (<b>%{diaspora_id}</b>) в <a href='%{href_link}'>страницата с настройки</a> на Cubbi.es и да натиснете \"Connect\"."
       daniels_account: "акаунта на Daniel в Diaspora"
-      log_in_with_diaspora_is_comming: "В най-скоро време ще можете да свързвате ново приложение без необходимост от създаване на отделен, от този, който ползвате, акаунт в Diaspora."
       love_to_try: "Бихме се радвали ако го пробвате!"
       making_the_connection: "Създаване на връзката"
       screenshot_explanation: "%{link1}.  Тази cubby страница е свързана с %{link2}."
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index 713f53dc2..af96621fd 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -846,7 +846,6 @@ br:
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 1b8195776..9ed2b3564 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -119,7 +119,7 @@ cs:
       keep_us_running: "Pomozte %{pod} udržet rychlý, kupte našim serverům dávku kávy."
       new_here:
         follow: "Follow %{link} and welcome new users to Diaspora*!"
-        learn_more: "Learn more"
+        learn_more: "Zjistit více"
         title: "Welcome New Users"
       no_contacts: "Žádné kontakty"
       no_tags: "+ Najít nějaký štítek ke sledování"
@@ -494,7 +494,7 @@ cs:
       results_for: " výsledky pro %{params}"
     index:
       couldnt_find_them_send_invite: "Nemůžete je najít? Pošlete pozvánku!"
-      looking_for: "Looking for posts tagged %{tag_link}?"
+      looking_for: "Hledáte příspěvky označené %{tag_link}?"
       no_one_found: "... a nikdo nebyl nalezen."
       no_results: "Hej! Musíte něco hledat."
       results_for: "výsledky hledání"
@@ -518,7 +518,7 @@ cs:
     show:
       does_not_exist: "Osoba neexistuje!"
       has_not_shared_with_you_yet: "%{name} s vámi zatím žádnou zprávu nesdílí!"
-      ignoring: "You are ignoring all posts from %{name}."
+      ignoring: "Ignorujete všechny příspěvky od %{name}."
       incoming_request: "%{name} s vámi chce sdílet"
       mention: "Zmínka"
       message: "Zpráva"
@@ -577,7 +577,7 @@ cs:
       not_found: "Tento příspěvek nelze bohužel najít."
       permalink: "trvalý odkaz"
   previous: "předchozí"
-  privacy: "Privacy"
+  privacy: "Soukromí"
   profile: "Profil"
   profiles:
     edit:
@@ -738,7 +738,7 @@ cs:
       manage: "upravit připojené služby"
       new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Veřejné příspěvky budou dostupné pro ostatní mimo Diasporu."
-      share: "Share"
+      share: "Sdílet"
       title: "Nastavit související služby"
       visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher:
@@ -747,7 +747,7 @@ cs:
       discard_post: "Zahodit příspěvek"
       make_public: "vytvořit veřejnou"
       new_user_prefill:
-        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        hello: "Ahoj všichni, jsem #%{new_user_tag}."
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
         newhere: "NewHere"
@@ -765,7 +765,7 @@ cs:
       currently_unavailable: "commenting currently unavailable"
       dislike: "to se mi nelíbí"
       hide_and_mute: "Hide and Mute"
-      ignore_user: "Ignore %{name}"
+      ignore_user: "Ignorovat %{name}"
       ignore_user_description: "Ignore and remove user from all aspects?"
       like: "to se mi líbí"
       shared_with: "Sdíleno s: %{aspect_names}"
@@ -791,12 +791,12 @@ cs:
   stream_helper:
     hide_comments: "Skrýt všechny komentáře"
     show_comments:
-      few: "Show %{count} more comments"
-      many: "Show %{count} more comments"
-      one: "Show one more comment"
-      other: "Show %{count} more comments"
-      two: "Show two more comments"
-      zero: "No more comments"
+      few: "Zobrazit %{count} dalších komentářů"
+      many: "Zobrazit %{count} dalších komentářů"
+      one: "Zobrazit 1 další komentář"
+      other: "Zobrazit %{count} dalších komentářů"
+      two: "Zobrazit 2 další komentáře"
+      zero: "Žádné další komentáře"
   streams:
     aspects:
       title: "Vaše aspekty"
@@ -846,7 +846,6 @@ cs:
       connect_to_cubbies: "Připojit na Cubbi.es"
       connecting_is_simple: "Připojení účtu na Diaspoře je tak jednoduché! Zadejte vaše Diaspora ID (<b>%{diaspora_id}</b>) z nastavení cubbies a připojte se."
       daniels_account: "Daniel's Diaspora account"
-      log_in_with_diaspora_is_comming: "Velice brzy se budete moci připojit na novou aplikaci bez nutnosti zakládat účet odděleně od účtu na Diaspoře."
       love_to_try: "Rádi bychom, aby jste to vyzkoušeli."
       making_the_connection: "Vytvoření spojení"
       screenshot_explanation: "%{link1}. Tato konkrétní cubby je připojena na %{link2}."
@@ -898,7 +897,7 @@ cs:
       hashtag_explanation: "Štítky vám dovolují sledovat, o co se zajímáte, a diskutovat. Je to také skvělý způsob, jak najít nové lidi na Diaspoře."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: Saved!
+      saved: Uloženo!
       we_can_speed_things_up: "We can speed things up a bit by"
       well_hello_there: "Well, hello there!"
       what_are_you_in_to: "What are you into?"
@@ -913,7 +912,7 @@ cs:
     privacy_settings:
       ignored_users: "Ignored Users"
       stop_ignoring: "Stop ignoring"
-      title: "Privacy Settings"
+      title: "Nastavení soukromí"
     public:
       does_not_exist: "Uživatel %{username} neexistuje!"
     update:
@@ -932,4 +931,4 @@ cs:
     no_person_constructed: "Z této hcard nemůže být vytvořena žádná osoba."
     not_enabled: "Vypadá to, že webfinger nemůže být povolen pro hosta účtu %{account}"
     xrd_fetch_failed: "vyskytl se problém při získání xrd z účtu %{account}"
-  welcome: Welcome!
+  welcome: Vítejte!
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 4c7516219..89824ef4d 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -846,7 +846,6 @@ cy:
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index b826f0adf..45571290d 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -846,7 +846,6 @@ da:
       connect_to_cubbies: "Forbind til Cubbi.es"
       connecting_is_simple: "Tilslutning af din Diaspora konto er simpelt! Du skal bare indtaste dit Diaspora ID (<b>%{diaspora_id}</b>) fra dine Cubbi.es <a href='%{href_link}'>indstillinger</a> og tryk forbind."
       daniels_account: "Daniels Diaspora konto"
-      log_in_with_diaspora_is_comming: "Meget snart vil du kunne forbinde til en ny applikation uden at skulle oprette en seperat konto."
       love_to_try: "Vi ville ønske at du prøvede det."
       making_the_connection: "Opretter forbindelsen"
       screenshot_explanation: "%{link1}.  Denne cubby er forbundet til %{link2}."
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 9c313742e..460b128c1 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -846,7 +846,6 @@ de:
       connect_to_cubbies: "Mit Cubbi.es verbinden"
       connecting_is_simple: "Dein Diaspora-Konto mit Cubbi.es zu verbinden ist ganz leicht! Trage einfach deine Diaspora-ID (<b>%{diaspora_id}</b>) in der Cubbi.es-<a href='%{href_link}'>Einstellungsseite</a> ein und klicke auf »Bestätigen«!"
       daniels_account: "Daniels Diaspora-Konto"
-      log_in_with_diaspora_is_comming: "Schon bald wirst du in der Lage sein, eine Verbindung zu einer neuen Anwendung herzustellen, ohne ein seperates Konto neben deinem Konto auf Diaspora anzulegen."
       love_to_try: "Es wäre toll, wenn du es ausprobieren würdest."
       making_the_connection: "Die Verbindung herstellen"
       screenshot_explanation: "%{link1}. Dieses »Cubby« ist mit %{link2} verknüpft."
diff --git a/config/locales/diaspora/de_formal.yml b/config/locales/diaspora/de_formal.yml
index b8c6a3d63..d76b7a41c 100644
--- a/config/locales/diaspora/de_formal.yml
+++ b/config/locales/diaspora/de_formal.yml
@@ -846,7 +846,6 @@ de_formal:
       connect_to_cubbies: "Mit Cubbi.es verbinden"
       connecting_is_simple: "Ihr Diaspora Konto mit Cubbi.es zu verbinden ist einfach! Tragen Sie einfach Ihre Diaspora ID in der Cubbi.es <a href='%{href_link}'>Einstellungsseite</a> ein und verbinden Sie die Konten!"
       daniels_account: "Daniels Diaspora Konto"
-      log_in_with_diaspora_is_comming: "Schon bald werden Sie in der Lage sein, eine Verbindung zu einer neuen Anwendung herzustellen, ohne ein seperates Konto neben Ihrem Konto auf Diaspora anzulegen."
       love_to_try: "Es wäre toll, wenn Sie es ausprobieren würden."
       making_the_connection: "Die Verbindung herstellen"
       screenshot_explanation: "%{link1}. Dieses \"Cubby\" ist verlinkt auf %{link2}."
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 4e0cc5045..d29e707b9 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -765,8 +765,8 @@ el:
       currently_unavailable: "commenting currently unavailable"
       dislike: "Δεν μ' αρέσει"
       hide_and_mute: "Απόκρυψη και Σίγαση "
-      ignore_user: "Ignore %{name}"
-      ignore_user_description: "Ignore and remove user from all aspects?"
+      ignore_user: "Αγνόηση %{name}"
+      ignore_user_description: "Αγνόηση και αφαίρεση χρήστη από όλες τις πτυχές;"
       like: "Μου αρέσει"
       shared_with: "Διαμοιρασμένο με: %{aspect_names}"
       unlike: "Δεν μου αρέσει"
@@ -846,7 +846,6 @@ el:
       connect_to_cubbies: "Σύνδεση με Cubbi.es"
       connecting_is_simple: "Η σύνδεση του Diaspora λογαριασμού σας είναι απλούστατη! Απλά εισάγετε το Diaspora Αναγνωριστικό σας (ID) (<b>%{diaspora_id}</b>) από το cubbies <a href='%{href_link}'>settings page</a> και πατήστε Σύνδεση. "
       daniels_account: "Diaspora λογαριασμό του Daniel"
-      log_in_with_diaspora_is_comming: "Σύντομα θα μπορείτε να συνδέεστε σε μια νέα εφαρμογή χωρίς να δημιουργείτε διαφορετικό λογαριασμό απ' αυτόν στο Diaspora."
       love_to_try: "Θα χαιρόμασταν αν το δοκιμάζατε."
       making_the_connection: "Σύνδεση"
       screenshot_explanation: "%{link1}.  Αυτό το συγκεκριμένο cubby συνδέεται στον %{link2}."
@@ -911,7 +910,7 @@ el:
       simply_visit: "Απλά επισκεφθείτε "
       works_on_modern: "Δουλεύει σε όλα τα μοντέρνα smartphones"
     privacy_settings:
-      ignored_users: "Ignored Users"
+      ignored_users: "Αγνοημένοι Χρήστες"
       stop_ignoring: "Stop ignoring"
       title: "Privacy Settings"
     public:
diff --git a/config/locales/diaspora/en_1337.yml b/config/locales/diaspora/en_1337.yml
index aff0a3f1a..d8266e193 100644
--- a/config/locales/diaspora/en_1337.yml
+++ b/config/locales/diaspora/en_1337.yml
@@ -846,7 +846,6 @@ en_1337:
       connect_to_cubbies: "C0NN3C7 2 CUBB1.35!"
       connecting_is_simple: "C0NN3C71NG Y0UR D* 4CC0UN7 15 51MPL3! JU57 3N73R Y0UR D* 1D (<b>%{diaspora_id}</b>) FR0M Y0UR CUBB135 <a href='%{href_link}'>settings page</a> 4ND H17 C0NN3C7!"
       daniels_account: "D4N13L5 D* 4CC0UN7"
-      log_in_with_diaspora_is_comming: "PR377Y 500N U W1LL B3 4BL3 2 C0NN3C7 2 4 N3W 4PP W17H0U7 CR3471NG 4 53PP3R473 4CC0UN7!"
       love_to_try: "W3D L0V3 F0R U 2 7RY 11 0U7!\""
       making_the_connection: "M4K1NG 7H3 C0NN3C710N"
       screenshot_explanation: "%{link1}.  7H15 P4R71CUL4R CUBB13 15 L1NK3D 2 %{link2}."
diff --git a/config/locales/diaspora/en_pirate.yml b/config/locales/diaspora/en_pirate.yml
index 65827058d..f25225c20 100644
--- a/config/locales/diaspora/en_pirate.yml
+++ b/config/locales/diaspora/en_pirate.yml
@@ -111,9 +111,9 @@ en_pirate:
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
-        tag_bug: "#bug"
-        tag_feature: "#feature"
-        tag_question: "#question"
+        tag_bug: "bug"
+        tag_feature: "feature"
+        tag_question: "question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
@@ -846,7 +846,6 @@ en_pirate:
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is simple!  Just enter your Diaspora ID (<b>%{diaspora_id}</b>) from your cubbies <a href='%{href_link}'>settings page</a> and hit connect."
       daniels_account: "Daniel's Diaspora account"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 97d0124df..427fcd2c6 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -846,7 +846,6 @@ en_shaw:
       connect_to_cubbies: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑑 Cubbi.es"
       connecting_is_simple: "𐑒𐑩𐑯𐑧𐑒𐑑𐑦𐑙 𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑩𐑒𐑬𐑯𐑑 𐑦𐑟 𐑕𐑦𐑥𐑐𐑩𐑤! 𐑡𐑳𐑕𐑑 𐑧𐑯𐑑𐑼 𐑿𐑼 𐑲𐑛𐑧𐑯𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯 (<b>%{diaspora_id}</b>) 𐑓𐑮𐑳𐑥 𐑿𐑼 𐑒𐑳𐑚𐑦𐑟 <a href='%{href_link}'>settings page</a> 𐑯 𐑣𐑦𐑑 𐑒𐑩𐑯𐑧𐑒𐑑."
       daniels_account: "·𐑛𐑨𐑯𐑘𐑩𐑤𐑟 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑩𐑒𐑬𐑯𐑑"
-      log_in_with_diaspora_is_comming: "𐑐𐑮𐑦𐑑𐑦 𐑕𐑵𐑯, 𐑿𐑤 𐑚𐑰 𐑱𐑚𐑩𐑤 𐑑 𐑒𐑩𐑯𐑧𐑒𐑑 𐑑 𐑩 𐑯𐑿 𐑨𐑐𐑤𐑦𐑒𐑱𐑖𐑩𐑯 𐑢𐑦𐑞𐑬𐑑 𐑒𐑮𐑦𐑱𐑑𐑦𐑙 𐑩𐑯 𐑩𐑒𐑬𐑯𐑑 𐑕𐑧𐑐𐑮𐑩𐑑 𐑓𐑮𐑳𐑥 𐑿𐑼 𐑢𐑳𐑯 𐑪𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩."
       love_to_try: "𐑢𐑰'𐑛 𐑤𐑳𐑝 𐑓𐑹 𐑿 𐑑 𐑑𐑮𐑲 𐑦𐑑 𐑬𐑑."
       making_the_connection: "𐑥𐑱𐑒𐑦𐑙 𐑞 𐑒𐑩𐑯𐑧𐑒𐑖𐑩𐑯"
       screenshot_explanation: "%{link1}.  𐑞𐑦𐑕 𐑐𐑼𐑑𐑦𐑒𐑿𐑤𐑼 𐑒𐑩𐑚𐑦 𐑦𐑟 𐑤𐑦𐑙𐑒𐑑 𐑑 %{link2}."
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index cf7bb8b10..ac22676d1 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -846,7 +846,6 @@ eo:
       connect_to_cubbies: "Konekti al Cubbi.es"
       connecting_is_simple: "Konekti vian DIASPORA* konton estas tiel facila!  Skribu vian DIASPORA* uzantnomon (<b>%{diaspora_id}</b>) de via cubbi.es <a href='%{href_link}'>settings page</a> kaj kliku \"connect\"."
       daniels_account: "La DIASPORA* konto de Daniel"
-      log_in_with_diaspora_is_comming: "Baldaŭ, vi povos konekti novan aplikaĵon sen devon krei konton, kiu estas malsama ol via DIASPORA* konto."
       love_to_try: "Ni vin amus, se vi provi ĝin."
       making_the_connection: "Konektanta"
       screenshot_explanation: "%{link1}.  Tiu aparta cubby ligas kun %{link2}."
diff --git a/config/locales/diaspora/es-AR.yml b/config/locales/diaspora/es-AR.yml
index 3b0b48378..7e84a4673 100644
--- a/config/locales/diaspora/es-AR.yml
+++ b/config/locales/diaspora/es-AR.yml
@@ -675,8 +675,8 @@ es-AR:
     failure:
       error: "hubo un error al conectar al servicio"
     finder:
-      fetching_contacts: "Diaspora está tomando sus amigos de %{service} por favor volvé en unos minutos."
-      no_friends: "No se han encontrado amigos de Facebook."
+      fetching_contacts: "Diaspora está tomando sus contactos de %{service} por favor volvé en unos minutos."
+      no_friends: "No se han encontrado contactos de Facebook."
       service_friends: "%{service} Amigos"
     index:
       connect_to_facebook: "Conectar a Facebook"
@@ -727,7 +727,7 @@ es-AR:
       from_facebook: "Desde Facebook"
       invitations_left: "quedan %{count}"
       invite_someone: "Invitá a alguien"
-      invite_your_friends: "Invitá a tus amigos"
+      invite_your_friends: "Invitá a tus contactos"
       invites: "Invitaciones"
       invites_closed: "Las invitaciones en este servidor Diáspora* están cerradas actualmente"
     notification:
@@ -846,7 +846,6 @@ es-AR:
       connect_to_cubbies: "Conectar a Cubbi.es"
       connecting_is_simple: "Conectar tu cuenta Diáspora* es tan simple como introducir tu Diaspora ID (<b>%{diaspora_id}</b>) desde la <a href='%{href_link}'>configuración</a> de Cubbi."
       daniels_account: "Cuenta de Daniel en Diáspora*"
-      log_in_with_diaspora_is_comming: "Pronto podrás conectarte a una nueva aplicación sin crear una cuenta separada de la tuya en Diáspora."
       love_to_try: "Nos encantaría que la pruebes."
       making_the_connection: "Haciendo la conexión"
       screenshot_explanation: "%{link1}. Este cubby en particular está enlazado a %{link2}."
@@ -900,7 +899,7 @@ es-AR:
       hooking_up_fb: "conectando con tu cuenta de Facebook"
       saved: ¡Guardado!
       we_can_speed_things_up: "Podemos acelerar las cosas un poquito vía"
-      well_hello_there: "Bueno, ¡Hola!"
+      well_hello_there: "Bueno, ¡hola!"
       what_are_you_in_to: "¿Qué sos por dentro?"
       what_facebook_does: "con Diaspora. Esto mostraŕa tu nombre y foto, y activará la publicación cruzada."
       who_are_you: "¿Quién sos?"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index ea6fbca3f..abfd6a7c0 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -29,7 +29,7 @@ es-CL:
         reshare:
           attributes:
             root_guid:
-              taken: "Ya compartiste ese post!"
+              taken: "¡Acabas de compartir ese post!"
         user:
           attributes:
             email:
@@ -61,9 +61,9 @@ es-CL:
       done_editing: "Aceptar"
     aspect_listings:
       add_an_aspect: "+ Añadir un aspecto"
-      deselect_all: "Deselect all"
+      deselect_all: "Desmarcar todo"
       edit_aspect: "Editar %{name}"
-      select_all: "Select all"
+      select_all: "Marcar todo"
     aspect_stream:
       stay_updated: "Stay Updated"
       stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
@@ -141,8 +141,8 @@ es-CL:
       name: "Nombre(solo visible para ti)"
     no_contacts_message:
       community_spotlight: "comunidad creativa"
-      or_spotlight: "Or you can share with %{link}"
-      try_adding_some_more_contacts: "Puedes buscar (arriba) o invitar (derecha) más contactos."
+      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 mas contactos!"
     no_posts_message:
       start_talking: "Nadie ha dicho nada aún!"
@@ -200,7 +200,7 @@ es-CL:
     few: "%{count} contactos"
     index:
       add_a_new_aspect: "Agregar un nuevo aspecto"
-      add_to_aspect: "Agregar contactos a %{name}"
+      add_to_aspect: "Añadir contactos a %{name}"
       all_contacts: "Todos los Contactos"
       check_out: "Desmarcar"
       many_people_are_you_sure: "Estas seguro que quieres iniciar una conversación privada con más de %{suggested_limit} contactos? Postear algo en este aspecto quizás sea una mejor manera de contactarte con ellos."
@@ -397,7 +397,7 @@ es-CL:
       many: "A %{actors} les gustó tu %{post_link}."
       one: "A %{actors} le gustó tu %{post_link}."
       other: "A %{actors} le gustó tu %{post_link}."
-      two: "%{actors} les gusto tu %{post_link}."
+      two: "A %{actors} les gusto tu %{post_link}."
       zero: "A %{actors} le gustó tu %{post_link}."
     liked_post_deleted:
       few: "%{actors} les gustó tu post eliminado."
@@ -432,9 +432,9 @@ es-CL:
       few: "%{actors} compartieron tu %{post_link}."
       many: "%{actors} compartieron tu %{post_link}."
       one: "%{actors} compartió tu %{post_link}."
-      other: "%{actors} compartieron tu %{post_link}."
+      other: "%{actors} compartió tu %{post_link}."
       two: "%{actors} compartieron tu %{post_link}."
-      zero: "%{actors} compartieron tu %{post_link}."
+      zero: "%{actors} compartió tu %{post_link}."
     reshared_post_deleted:
       few: "%{actors} compartieron tu post eliminado."
       many: "%{actors} compartieron tu post eliminado."
@@ -619,13 +619,13 @@ es-CL:
       unhappy: ¿Triste?
       update: "Actualizar"
     new:
-      create_my_account: "Crear mi cuenta"
+      create_my_account: "¡Crear mi cuenta!"
       enter_email: "Ingresa un email"
       enter_password: "Ingresar contraseña"
       enter_password_again: "Ingresa la misma contraseña anterior"
       enter_username: "Escoge un nick (solo letras, números, y guión bajo)"
       join_the_movement: "Unete al movimiento!"
-      sign_up_message: "Social Networking with a <3"
+      sign_up_message: "Redes Sociales con un ♥"
   requests:
     create:
       sending: "Enviando"
@@ -633,7 +633,7 @@ es-CL:
     destroy:
       error: "¡Por favor selecciona un aspecto!"
       ignore: "Ignorar la solicitud de contacto."
-      success: "Ahora son amigos."
+      success: "Ahora estás compartiendo."
     helper:
       new_requests:
         few: "%{count} nuevas solicitudes!"
@@ -677,7 +677,7 @@ es-CL:
     finder:
       fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes."
       no_friends: "Ningún amigo de Facebook encontrado."
-      service_friends: "Los %{service} de tus amigos"
+      service_friends: "Contactos de %{service}"
     index:
       connect_to_facebook: "Conectar a facebook"
       connect_to_tumblr: "Conectar a Tumblr"
@@ -727,7 +727,7 @@ es-CL:
       from_facebook: "Desde Facebook"
       invitations_left: "quedan %{count}"
       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 están temporalmente cerradas en este servidor de Diaspora"
     notification:
@@ -747,7 +747,7 @@ es-CL:
       discard_post: "Descartar post"
       make_public: "hacer público"
       new_user_prefill:
-        hello: "Hola a todo el mundo, esta es mi #%{new_user_tag}. "
+        hello: "Hola a todo el mundo, esta es mi #%{new_user_tag}."
         i_like: "Tengo interés en %{tags}."
         invited_by: "Thanks for the invite, "
         newhere: "PrimeraPublicación"
@@ -764,7 +764,7 @@ es-CL:
       connect_to_comment: "Connect to this user to comment on their post"
       currently_unavailable: "commenting currently unavailable"
       dislike: "No me gusta esto"
-      hide_and_mute: "Ocultar y silenciar"
+      hide_and_mute: "Ignorar este post"
       ignore_user: "Ignore %{name}"
       ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Me gusta esto"
@@ -799,39 +799,39 @@ es-CL:
       zero: "No more comments"
   streams:
     aspects:
-      title: "Your Aspects"
-    aspects_stream: "Aspects"
-    commented_on: "commented on"
-    community_spotlight_stream: "Community Spotlight"
+      title: "Aspectos"
+    aspects_stream: "Aspectos"
+    commented_on: "comentado"
+    community_spotlight_stream: "Comunidad Creativa"
     followed_tag:
       add_a_tag: "Add a tag"
-      contacts_title: "People who dig these tags"
+      contacts_title: "Gente con esos tags"
       follow: "Follow"
-      title: "#Followed Tags"
-    followed_tags_stream: "#Followed Tags"
-    mentioned_stream: "@Mentions"
+      title: "#Tags"
+    followed_tags_stream: "#Tags"
+    mentioned_stream: "@Menciones"
     mentions:
       contacts_title: "Personas que te han mencionado"
-      title: "Tus Menciones"
+      title: "@Menciones"
     multi:
-      contacts_title: "People in your Stream"
+      contacts_title: "Gente en tu Stream"
       title: "Stream"
-    posted: "posted"
+    posted: "publicado"
     public:
       contacts_title: "Posters recientes"
       title: "Actividad publica"
-    recently: "recently:"
+    recently: "recientemente:"
     tags:
-      contacts_title: "Personas que comparten estos tags"
+      contacts_title: "Gente que usa este tag"
       tag_prefill_text: "The thing about %{tag_name} is... "
       title: "Posts con el tag: %{tags}"
   tag_followings:
     create:
-      failure: "Error al seguir a: #%{name}"
-      success: "Ahora sigues a: #%{name}"
+      failure: "Error al seguir: #%{name}. Tal vez ya lo hiciste..."
+      success: "Bien, ahora sigues: #%{name}."
     destroy:
-      failure: "Error al dejar de seguir a: #%{name}"
-      success: "Ya no sigues mas a: #%{name}"
+      failure: "Error al dejar de seguir: #%{name}. Tal vez ya lo hiciste..."
+      success: "Bien, ya no sigues más: #%{name}"
   tags:
     show:
       follow: "Seguir a #%{tag}"
@@ -846,7 +846,6 @@ es-CL:
       connect_to_cubbies: "Conectarse a Cubbi.es"
       connecting_is_simple: "Conectar la cuenta de diáspora es simple! Solo ingresa tu ID de Diaspora (<b>%{diaspora_id}</b>) en la <a href='%{href_link}'>pagina de configuración</a> de cubbies y presiona conectar."
       daniels_account: "La cuenta de Diaspora de Daniel"
-      log_in_with_diaspora_is_comming: "Muy pronto, podrás conectarte a nuevas aplicaciones sin crear una cuenta separada de la de Diaspora."
       love_to_try: "Nos encantaría que lo pruebes."
       making_the_connection: "Haciendo la conexión"
       screenshot_explanation: "%{link1}.  Este cubby en particular esta linkeado a %{link2}."
@@ -886,10 +885,10 @@ es-CL:
       private_message: "...recibes un mensaje privado?"
       receive_email_notifications: "Recibir notificaciones por correo electrónico cuando..."
       reshared: "...alguien comparte tu post?"
-      show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_community_spotlight: "¿Mostras a la Comunidad Creativa en tu Stream?"
       show_getting_started: "Re-enable Getting Started"
       started_sharing: "...alguien comienza a compartir contigo?"
-      stream_preferences: "Stream Preferences"
+      stream_preferences: "Preferencias de Stream"
       your_email: "Tu correo electrónico"
       your_handle: "Tu id de diaspora"
     getting_started:
@@ -902,7 +901,7 @@ es-CL:
       we_can_speed_things_up: "We can speed things up a bit by"
       well_hello_there: "Well, hello there!"
       what_are_you_in_to: "What are you into?"
-      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      what_facebook_does: "con Diaspora. Esto mostrará tu nombre y foto, también activará la publicación cruzada."
       who_are_you: "Who are you?"
     logged_out:
       go_mobile: "Ahora desde tu celular"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 3cd5180e8..2cdc6d582 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -151,7 +151,7 @@ es:
     seed:
       acquaintances: Conocid@s
       family: "Familia"
-      friends: "Amigos"
+      friends: "Contactos"
       work: "Trabajo"
     selected_contacts:
       manage_your_aspects: "Gestiona tus aspectos."
@@ -675,9 +675,9 @@ es:
     failure:
       error: "hubo un error conectando ese servicio"
     finder:
-      fetching_contacts: "Diaspora está trasladando a tus amigos de %{service}, por favor compruébalo de nuevo en unos minutos."
-      no_friends: "No se han encontrados amig@s de Facebook."
-      service_friends: "%{service} Amigos"
+      fetching_contacts: "Diaspora está trasladando a tus contactos de %{service}, por favor compruébalo de nuevo en unos minutos."
+      no_friends: "No se han encontrados contactos en Facebook."
+      service_friends: "Contactos de %{service}"
     index:
       connect_to_facebook: "Conecta con Facebook"
       connect_to_tumblr: "Conecta con Tumblr"
@@ -727,7 +727,7 @@ es:
       from_facebook: "Por Facebook"
       invitations_left: "%{count} restantes"
       invite_someone: "Invita a alguien"
-      invite_your_friends: "Invita a tus amig@s"
+      invite_your_friends: "Invita a tus contactos"
       invites: "Invitaciones"
       invites_closed: "Las invitaciones en este servidor Diaspora* están actualmente cerradas."
     notification:
@@ -747,10 +747,10 @@ es:
       discard_post: "Descartar publicación"
       make_public: "hacer público"
       new_user_prefill:
-        hello: "Hola a tod@s, esta es mi #%{new_user_tag}."
+        hello: "Hola a todo el mundo, esta es mi #%{new_user_tag}."
         i_like: "Tengo interés en %{tags}."
         invited_by: "Gracias por la invitación, "
-        newhere: "NuevoAquí"
+        newhere: "PrimeraPublicación"
       post_a_message_to: "Publicar un mensaje en %{aspect}"
       posting: Publicando...
       publishing_to: "publicar en:"
@@ -836,7 +836,7 @@ es:
     show:
       follow: "Seguir #%{tag}"
       followed_by: "seguido por"
-      following: "Siguiendo a #%{tag}"
+      following: "Siguiendo #%{tag}"
       nobody_talking: "Nadie esta hablando sobre %{tag} todavía."
       people_tagged_with: "Perfiles con %{tag}"
       posts_tagged_with: "Publicaciones con #%{tag}"
@@ -846,7 +846,6 @@ es:
       connect_to_cubbies: "Conecta con Cubbi.es"
       connecting_is_simple: "Conectar tu cuenta de Diaspora* es sencillo. Solo introduce tu identidad Diaspora*(<b>%{diaspora_id}</b>) desde tu página de <a href='%{href_link}'>ajustes</a> de cubbi y dale a conectar."
       daniels_account: "La cuenta de Diaspora de Daniel"
-      log_in_with_diaspora_is_comming: "Muy pronto podrás conectar a una nueva aplicación sin tener que crear una cuenta aparte de Diaspora*."
       love_to_try: "Nos encantaría que lo pruebes."
       making_the_connection: "Creando la conexión"
       screenshot_explanation: "%{link1}. Este cubby en particular está conectado con %{link2}."
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 69a49b42a..598adb4a0 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -846,7 +846,6 @@ eu:
       connect_to_cubbies: "Cubbi.es-era lotu"
       connecting_is_simple: "Zure Diaspora kontua lotzea erraza da! Idatzi zure Diaspora IDa (<b>%{diaspora_id}</b>) zure cubbiesen <a href='%{href_link}'>ezarpenen orrialdetik</a> eta sakatu lotu."
       daniels_account: "Danielen Diaspora kontua"
-      log_in_with_diaspora_is_comming: "Laster, aplikazio berri batera konektatu ahal izango zara, kontu berri bat sortu gabe zerbitzu horretan."
       love_to_try: "Zuk probatzea gustatuko litzaiguke."
       making_the_connection: "Lotura Ezartzen"
       screenshot_explanation: "%{link1}. Cubby hau %{link2}(r)ekin lotuta dago."
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 684764697..2da7c1720 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -846,7 +846,6 @@ fi:
       connect_to_cubbies: "Yhdistä kohteeseen Cubbi.es"
       connecting_is_simple: "Diaspora-tilisi yhdistäminen on helppoa! Syötä vain Diaspora-tunnuksesi (<b>%{diaspora_id}</b>) Cubbi.es-<a href='%{href_link}'>asetussivulle</a> ja yhdistä."
       daniels_account: "Danielin Diaspora-käyttäjätili"
-      log_in_with_diaspora_is_comming: "Pian voit lisätä uuden sovelluksen luomatta uutta käyttäjätiliä nykyisen tilisi lisäksi."
       love_to_try: "Kokeile sinäkin."
       making_the_connection: "Yhteyden muodostaminen"
       screenshot_explanation: "%{link1}. Tämä tila on linkitetty tänne: %{link2}."
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 3f5b8a6b8..f3d7d2dfd 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -65,8 +65,8 @@ fr:
       edit_aspect: "Éditer %{name}"
       select_all: "Tout sélectionner"
     aspect_stream:
-      stay_updated: "Restez informés"
-      stay_updated_explanation: "Votre flux principal est completé par vos contacts, vos tags suivis, et les messages de certains membres de la communauté."
+      stay_updated: "Restez informé"
+      stay_updated_explanation: "Votre flux principal est complété par vos contacts, vos tags suivis, et les messages de certains membres de la communauté."
     contacts_not_visible: "Les contacts dans cet aspect ne se verront pas les uns les autres."
     contacts_visible: "Les contacts dans cet aspect pourront se voir entre eux."
     create:
@@ -172,10 +172,10 @@ fr:
   back: "Retour"
   blocks:
     create:
-      failure: "Je ne pouvais pas ignorer cet utilisateur.  #evasion"
-      success: "Très bien, vous ne verrez plus cet utilisateur dans votre flux. #silencio!"
+      failure: "Je ne pouvais pas ignorer cet utilisateur. #evasion"
+      success: "Très bien, vous ne verrez plus cet utilisateur dans votre flux. #silencio !"
     destroy:
-      failure: "Je ne pouvais plus cesser d'ignorer cet utilisateur.  #evasion"
+      failure: "Je ne pouvais plus cesser d'ignorer cet utilisateur. #evasion"
       success: "Voyons ce qu'ils ont à dire ! #sayhello"
   bookmarklet:
     explanation: "Publiez sur Diaspora depuis n'importe où en ajoutant %{link} à vos marque-pages."
@@ -301,7 +301,7 @@ fr:
       comma_seperated_plz: "Vous pouvez entrer plusieurs adresses de courrier électronique séparées par des virgules."
       if_they_accept_info: "s'ils acceptent, ils seront ajoutés à l'aspect dans lequel vous les avez invités."
       invite_someone_to_join: "Inviter quelqu'un à rejoindre Diaspora !"
-      language: "Langage"
+      language: "Langue"
       personal_message: "Message personnel"
       resend: "Envoyer à nouveau"
       send_an_invitation: "Envoyer une invitation"
@@ -668,7 +668,7 @@ fr:
   services:
     create:
       already_authorized: "Un utilisateur dont l'id diaspora est %{diaspora_id} a déjà autorisé ce compte %{service_name}."
-      failure: "L'authentification a échouée."
+      failure: "L'authentification a échoué."
       success: "Authentification réussie."
     destroy:
       success: "Authentification supprimée."
@@ -736,11 +736,11 @@ fr:
       control_your_audience: "Contrôlez votre audience"
       logged_in: "connecté(e) à %{service}"
       manage: "gérer les services connectés"
-      new_user_welcome_message: "Utilisez les #tags pour classer vos messages et trouver des personnes qui partagent vos intérêts. Appelez des personnes impressionnantes avec les @Mentions"
+      new_user_welcome_message: "Utilisez les #tags pour classer vos messages et trouver des personnes qui partagent vos intérêts. Interpellez des personnes géniales avec les @Mentions"
       outside: "Les messages publics pourront être vus par d'autres en dehors de Diaspora."
       share: "Partager"
       title: "Mettre en place des services connectés"
-      visibility_dropdown: "Utilisez ce menu déroulant pour modifier la visibilité de votre messages. (Nous vous conseillons de faire ce premier message public)"
+      visibility_dropdown: "Utilisez ce menu déroulant pour modifier la visibilité de votre message. (Nous vous conseillons de faire ce premier message public.)"
     publisher:
       all: "tous"
       all_contacts: "tous les contacts"
@@ -762,7 +762,7 @@ fr:
       reshare: "Repartager"
     stream_element:
       connect_to_comment: "Ajoutez cet utilisateur pour commenter son message"
-      currently_unavailable: "les commentaires sont actuellement indisponible"
+      currently_unavailable: "les commentaires sont actuellement indisponibles"
       dislike: "Je n'aime pas"
       hide_and_mute: "Masquer et mettre le message en sourdine"
       ignore_user: "Ignorez %{name}"
@@ -799,7 +799,7 @@ fr:
       zero: "Plus de commentaire."
   streams:
     aspects:
-      title: "Vos Aspects"
+      title: "Vos aspects"
     aspects_stream: "Aspects"
     commented_on: "commenté"
     community_spotlight_stream: "Actualités de la communauté"
@@ -814,7 +814,7 @@ fr:
       contacts_title: "Personnes qui vous ont mentionné"
       title: "@Mentions"
     multi:
-      contacts_title: "Personnes dans votre Flux"
+      contacts_title: "Personnes dans votre flux"
       title: "Flux"
     posted: "posté"
     public:
@@ -823,7 +823,7 @@ fr:
     recently: "récemment :"
     tags:
       contacts_title: "Personnes qui suivent ce tag"
-      tag_prefill_text: "La chose à propos de %{tag_name} est... "
+      tag_prefill_text: "Une chose que jaime à propos de %{tag_name} est... "
       title: "Messages tagués : %{tags}"
   tag_followings:
     create:
@@ -846,7 +846,6 @@ fr:
       connect_to_cubbies: "Se connecter à Cubbi.es"
       connecting_is_simple: "Pour vous connecter à votre compte Diaspora, c'est facile ! Il vous suffit d'entrer votre ID Diaspora (<b>%{diaspora_id}</b>) sur votre <a href='%{href_link}'>page des paramètres</a> cubbies et de cliquer sur \"connect\"."
       daniels_account: "compte Diaspora de Daniel"
-      log_in_with_diaspora_is_comming: "Très bientôt, vous serez en mesure de vous connecter à une nouvelle application sans créer un compte distinct du vôtre sur Diaspora."
       love_to_try: "Nous aimerions beaucoup que vous essayiez."
       making_the_connection: "Créez la connexion"
       screenshot_explanation: "%{link1}. Cette page cubbi est liée au %{link2}."
@@ -886,10 +885,10 @@ fr:
       private_message: "…vous recevez un message privé ?"
       receive_email_notifications: "Recevoir des notifications par courrier électronique lorsque…"
       reshared: "...quelqu'un a partagé votre message ?"
-      show_community_spotlight: "Afficher les actualités de la communauté dans votre Flux ?"
+      show_community_spotlight: "Afficher les actualités de la communauté dans votre flux ?"
       show_getting_started: "Réactiver la page de découverte"
       started_sharing: "... quelqu'un commence à partager avec vous ?"
-      stream_preferences: "Préférences du Flux"
+      stream_preferences: "Préférences du flux"
       your_email: "Votre adresse électronique"
       your_handle: "Votre identifiant diaspora"
     getting_started:
@@ -912,7 +911,7 @@ fr:
       works_on_modern: "Fonctionne sur tous les smartphones modernes"
     privacy_settings:
       ignored_users: "Utilisateurs ignorés"
-      stop_ignoring: "Arrêter d'ignorer."
+      stop_ignoring: "Arrêter d'ignorer"
       title: "Paramètres de confidentialité"
     public:
       does_not_exist: "L'utilisateur %{username} n'existe pas !"
@@ -922,7 +921,7 @@ fr:
       language_not_changed: "Échec lors de la mise à jour de la langue"
       password_changed: "Mot de passe mis à jour. Vous pouvez maintenant vous identifier avec votre nouveau mot de passe."
       password_not_changed: "Échec de la mise à jour du mot de passe"
-      settings_not_updated: "La mise à jour des paramètre a échouée"
+      settings_not_updated: "La mise à jour des paramètres a échoué"
       settings_updated: "Mise à jour des paramètres"
       unconfirmed_email_changed: "Adresse électronique changée. Activation nécessaire."
       unconfirmed_email_not_changed: "Le changement d'adresse électronique a échoué"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index 984cf8107..aade8bd47 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -846,7 +846,6 @@ ga:
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index c3016c017..e00e661e4 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -846,7 +846,6 @@ he:
       connect_to_cubbies: "התחברות ל־Cubbi.es"
       connecting_is_simple: "חיבור חשבון הדיאספורה שלך הנה משימה פשוטה! עליך להכניס את המזהה שלך בדיאספורה (<b>%{diaspora_id}</b>) ב<a href='%{href_link}'>עמוד ההגדרות</a> בחשבון ה־cubbies שלך וללחוץ על התחברות."
       daniels_account: "חשבון הדיאספורה של דניאל"
-      log_in_with_diaspora_is_comming: "ממש בקרוב, תהיה לך האפשרות להתחבר ליישום חדש מבלי ליצור חשבון נפרד מחשבונך בדיאספורה."
       love_to_try: "נשמח אם תנסו זאת."
       making_the_connection: "יצירת הקשר"
       screenshot_explanation: "%{link1}.  ה־cubby המסוים הזה מקושר שלך %{link2}."
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 8bb4f3699..b0925eef9 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -848,7 +848,6 @@ hu:
       connect_to_cubbies: "Csatlakozás ehhez: Cubbi.es"
       connecting_is_simple: "A csatlakozás sima ügy, csak írd be a Diaspora azonosítódat."
       daniels_account: "Adam Diaspora* fiókja"
-      log_in_with_diaspora_is_comming: "Hamarosan egy új applikációhoz tudsz majd csatlakozni a Diaspora azonosítóddal."
       love_to_try: "Szeretnénk, ha kipróbálnád."
       making_the_connection: "Kapcsolat létrehozása"
       screenshot_explanation: "%{link1}.  Ez a cubby ehhez van linkelve: %{link2}."
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index f693729fb..d247167ff 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -846,7 +846,6 @@ id:
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index bff6359fa..39d29645d 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -846,7 +846,6 @@ is:
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 3af61aeae..a0c5c323a 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -846,7 +846,6 @@ it:
       connect_to_cubbies: "Connettiti a Cubbi.es"
       connecting_is_simple: "Connettere il tuo account Diaspora è semplice! Inserisci il tuo ID (<b>%{diaspora_id}</b>) nella <a href='%{href_link}'>pagina delle impostazioni</a> di cubbies e premi <i>connect</i>."
       daniels_account: "account Diaspora di Daniel"
-      log_in_with_diaspora_is_comming: "Presto potrai connetterti ad una nuova applicazione senza dover creare un account separato da quello che hai già su Diaspora."
       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}."
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index 88de43b3a..b7db0de65 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -846,7 +846,6 @@ ja:
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index d0371b901..3efee11b7 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -451,13 +451,13 @@ ko:
       zero: "%{actors}님이 나와 공유를 시작했습니다."
   notifier:
     a_post_you_shared: "공유물"
-    click_here: "여기를 클릭하세요"
+    click_here: "여기를 클릭"
     comment_on_post:
       reply: "%{name}님의 공유물에 댓글달기 >"
     confirm_email:
       click_link: "새 이메일 주소 %{unconfirmed_email} 를 활성화하려면 이 링크를 클릭해주세요:"
       subject: "새 이메일 주소 %{unconfirmed_email} 를 활성화해주세요"
-    email_sent_by_diaspora: "이 메일은 디아스포라가 보냈습니다. 앞으로 받고싶지 않다면"
+    email_sent_by_diaspora: "디아스포라가 보낸 이메일입니다. 앞으로 받고싶지 않다면, 내 알림 설정을 바꾸기 위해"
     hello: "%{name}님!"
     liked:
       liked: "%{name}님이 내 공유물을 좋아합니다:"
@@ -478,7 +478,7 @@ ko:
       subject: "%{name}님이 디아스포라*에서 나와 공유를 시작했습니다."
       view_profile: "%{name}님의 프로필 보기"
     thanks: 고맙습니다.
-    to_change_your_notification_settings: "내 알림 설정을 바꾸기 위해"
+    to_change_your_notification_settings: "하세요"
   ok: "확인"
   or: "또는"
   password: "암호"
@@ -846,7 +846,6 @@ ko:
       connect_to_cubbies: "Cubbi.es에 연결하기"
       connecting_is_simple: "내 Cubbi.es에 있는 account 메뉴의 두 항목을 채워넣기만 하면 내 다이스포라 계정을 연결할 수 있습니다."
       daniels_account: "Daniel님의 디아스포라 계정"
-      log_in_with_diaspora_is_comming: "곧 디아스포라 계정이 아닌 별도의 계정을 만들지 않고도 새 애플리케이션에 연결할 수 있게됩니다."
       love_to_try: "꼭 써보세요!"
       making_the_connection: "연결하기"
       screenshot_explanation: "%{link1}. 이 cubby는 %{link2}에 연결되어 있습니다."
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index f908dba46..efb241dbc 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -846,7 +846,6 @@ lt:
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 1767c25cb..ac63b37bf 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -846,7 +846,6 @@ mk:
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index d2ec3bbfe..c01ee82ff 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -846,7 +846,6 @@ nb:
       connect_to_cubbies: "Koble til Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniels Diasporabruker"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
       love_to_try: "Vi vil veldig gjerne at du skal prøve det."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  Denne cubby-en er lenket til %{link2}."
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 112250fd9..12025b5ae 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -846,7 +846,6 @@ nl:
       connect_to_cubbies: "Verbind met Cubbi.es"
       connecting_is_simple: "Je Diaspora account verbinden is simpel! Vul je Diaspora ID (<b>%{diaspora_id}</b>) in op cubbies <a href='%{href_link}'>settings page</a> en klik op connect."
       daniels_account: "Daniel's Diaspora account"
-      log_in_with_diaspora_is_comming: "Binnenkort is het mogelijk om met een nieuwe applicatie te verbinden zonder eerst een apart account aan te hoeven maken."
       love_to_try: "We zouden het erg leuk vinden als je het uitprobeert."
       making_the_connection: "Verbindend"
       screenshot_explanation: "%{link1}.  Deze cubby is gelinkt aan %{link2}."
diff --git a/config/locales/diaspora/nn.yml b/config/locales/diaspora/nn.yml
index eb2eae845..3f7f1e205 100644
--- a/config/locales/diaspora/nn.yml
+++ b/config/locales/diaspora/nn.yml
@@ -846,7 +846,6 @@ nn:
       connect_to_cubbies: "Kopla deg til Cubbi.es"
       connecting_is_simple: "Det er lett å kopla til Diaspora-kontoen. Skriv berre inn Diaspora-ID-en din (<b>%{diaspora_id}</b>) frå <a href='%{href_link}'>innstillingssida</a> di på cubbi.es og trykk 'kopla til'."
       daniels_account: "Daniel sin Diaspora-konto"
-      log_in_with_diaspora_is_comming: "Snart vil du kunna kopla deg til ein ny applikasjon utan å laga endå ein konto i tillegg til han du allereie har hos Diaspora."
       love_to_try: "Vi vonar du vil prøva det."
       making_the_connection: "Koplar til"
       screenshot_explanation: "%{link1}. Denne cubbyen er lenka til %{link2}."
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index 4a15be49d..879ddbdba 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -846,7 +846,6 @@ pa:
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 86402b5e2..ced326977 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -846,7 +846,6 @@ pl:
       connect_to_cubbies: "Połącz z Cubbi.es"
       connecting_is_simple: "Połączenie Twojego konta na Diasporze jest proste! Po prostu wpisz Identyfikator Diaspory (<b>%{diaspora_id}</b>) ze <a href='%{href_link}'>strony ustawień</a> cubbies i kliknij \"Połącz\"."
       daniels_account: "Konto Daniela na Diasporze"
-      log_in_with_diaspora_is_comming: "Już niedługo, będziesz mieć możliwość połączenia z nową aplikacją bez tworzenia konta oddzielnego od tego na Diasporze."
       love_to_try: "Zapraszamy cię do wypróbowania!"
       making_the_connection: "Dokonywanie połączenia"
       screenshot_explanation: "%{link1}. Ten konkretny cubby jest połączony z %{link2}."
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 7a9164dfe..51f049169 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -846,7 +846,6 @@ pt-BR:
       connect_to_cubbies: "Conectar-se em Cubbi.es"
       connecting_is_simple: "Conectar-se com a sua conta Diaspora é simples! Somente digite sua Diaspora ID (<b>%{diaspora_id}</b>) na <a href='%{href_link}'>página de configurações</a> do Cubbies e conecte-se."
       daniels_account: "Conta de Daniel Diaspora"
-      log_in_with_diaspora_is_comming: "Em breve você será capaz de se conectar a um aplicativo sem ter que criar uma conta separada de Diaspora."
       love_to_try: "Nós adorariamos se você experimentasse."
       making_the_connection: "Realizando a conexão"
       screenshot_explanation: "%{link1}.  Este está ligado à %{link2}."
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index e01c75049..42dc360d1 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -846,7 +846,6 @@ pt-PT:
       connect_to_cubbies: "Ligar ao Cubbi.es"
       connecting_is_simple: "Ligar à sua conta do Diaspora é simples! É só introduzir a sua identificação do Diaspora (<b>%{diaspora_id}</b>) na sua <a href='%{href_link}'>página de definições</a> do Cubbi.es."
       daniels_account: "conta do Diaspora do Daniel"
-      log_in_with_diaspora_is_comming: "Muito em breve, poderá conectar a novas aplicações sem criar uma conta separada da sua conta no Diaspora."
       love_to_try: "Adoraríamos que o experimentasse."
       making_the_connection: "Fazer a Ligação"
       screenshot_explanation: "%{link1}.  Este cubby em particular está ligado à %{link2}."
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index f1fd00472..c8b13fe94 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -846,7 +846,6 @@ ro:
       connect_to_cubbies: "Conectarea la Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Contul Diaspora a lui Daniel"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 1e815276e..65bb2136a 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -846,7 +846,6 @@ ru:
       connect_to_cubbies: "Подключение к Cubbi.es"
       connecting_is_simple: "Подключить аккаунт Диаспоры легко! Просто введите ваш идентификатор в Диаспоре (<b>%{diaspora_id}</b>) на <a href='%{href_link}'>странице настроек</a> cubbies и нажмите \"подключить\"."
       daniels_account: "Аккаунт Даниила в Диаспоре"
-      log_in_with_diaspora_is_comming: "Очень скоро вы сможете подключаться к новым приложениям без необходимости заводить новую учетную запись вне Диаспоры."
       love_to_try: "Мы будем рады, если вы попробуете это."
       making_the_connection: "Создание подключения"
       screenshot_explanation: "%{link1}.  Этот аккаунт cubbi связан с %{link2}."
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 906e3ad90..2cadf9ec0 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -846,7 +846,6 @@ sk:
       connect_to_cubbies: "Pripojiť sa na Cubbi.es"
       connecting_is_simple: "Pripojiť sa na účet na Diaspore je jednoduché! Stačí zadať ID na Diaspore.(<b>%{diaspora_id}</b>) zo&nbsp;<a href='%{href_link}'>stránky s&nbsp;nastaveniami</a> vašich prvkov cubby a&nbsp;stlačiť tlačidlo Pripojiť sa."
       daniels_account: "Danielov účet na Diaspore"
-      log_in_with_diaspora_is_comming: "Čoskoro sa budete môcť cez&nbsp;svoj účet pripojiť na novú aplikáciu bez&nbsp;toho, aby ste si na Diaspore museli založiť ďalší."
       love_to_try: "Bolo by super, keby ste to vyskúšali."
       making_the_connection: "Vytvára sa prepojenie"
       screenshot_explanation: "%{link1}.  Táto konkrétna cubby je prepojená s(o)&nbsp;%{link2}."
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 490cff704..aad8c0d75 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -848,7 +848,6 @@ sl:
       connect_to_cubbies: "Povežite se Cubbi.es"
       connecting_is_simple: "Povezovanje računa Diaspore je preprosta! Samo vnesite svoj ID Diaspore (<b>%{diaspora_id}</b>) iz vaše cubbies  <a href='%{href_link}'>nastavitvene strani</a> in kliknite poveži."
       daniels_account: "Danielov Diasporin račun"
-      log_in_with_diaspora_is_comming: "Kmalu se boste lahko za povezali na novo aplikacijo, ne da bi ustvarili račun ločen od Diaspore."
       love_to_try: "Radi bi da jo preizkusite."
       making_the_connection: "Ustvarjanje stika"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to  %{link2}."
diff --git a/config/locales/diaspora/sq.yml b/config/locales/diaspora/sq.yml
index 84e3e38ba..0c59f3fb5 100644
--- a/config/locales/diaspora/sq.yml
+++ b/config/locales/diaspora/sq.yml
@@ -846,7 +846,6 @@ sq:
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index a3b5d8267..2df71c8c5 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -846,7 +846,6 @@ sv:
       connect_to_cubbies: "Koppla till Cubbi.es"
       connecting_is_simple: "Att ansluta ditt Diaspora konto är lätt! Fyll bara i ditt Diaspora ID (<b>%{diaspora_id}</b>) på din Cubbies <a href='%{href_link}'>settings page</a> och tryck på Connect."
       daniels_account: "Daniels Diasporakonto"
-      log_in_with_diaspora_is_comming: "Snart kommer det vara möjligt att ansluta nya applikationer utan att skapa ett konto som är separerat från Diaspora. "
       love_to_try: "Vi vill gärna att du provar."
       making_the_connection: "Koppla ihop"
       screenshot_explanation: "%{link1}. Just denna cubby är länkad till %{link2}."
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 5428cd66a..66f081fc3 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -846,7 +846,6 @@ tr:
       connect_to_cubbies: "Cubbi.es Bağlan"
       connecting_is_simple: "Diaspora'da hesap bağlama basittir! Sadece Diaspora ID'nizi girin (<b>%{diaspora_id}</b>) ve Cubbi.es <a href='%{href_link}'>ayarlar</a> sayfasına gidin."
       daniels_account: "Daniel'in Diaspora hesabı"
-      log_in_with_diaspora_is_comming: "Çok yakında,yeni bir hesap oluşturmadan diğer Diaspora uygualamlarına bağlanabileceksiniz."
       love_to_try: "Bunu denemek isterdim."
       making_the_connection: "Bağlantı Kurma"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
diff --git a/config/locales/diaspora/uk.yml b/config/locales/diaspora/uk.yml
index 080396ebe..901537127 100644
--- a/config/locales/diaspora/uk.yml
+++ b/config/locales/diaspora/uk.yml
@@ -846,7 +846,6 @@ uk:
       connect_to_cubbies: "Підключення до Cubbi.es"
       connecting_is_simple: "Підключити аккаунт Діаспори легко! Просто введіть ваш ідентифікатор в Діаспорі (<b>%{diaspora_id}</b>) на <a href='%{href_link}'>сторінці налаштувань</a> cubbies і натисніть \"підключити\"."
       daniels_account: "Діаспора-аккаунт Данила"
-      log_in_with_diaspora_is_comming: "Дуже скоро ви зможете підключатися до нових додатків без необхідності заводити новий обліковий запис поза Діаспорою."
       love_to_try: "Ми будемо ради, якщо ви спробуєте це."
       making_the_connection: "Створення підключення"
       screenshot_explanation: "%{link1}. Це особливо пов'язано з %{link2}."
diff --git a/config/locales/diaspora/ur-PK.yml b/config/locales/diaspora/ur-PK.yml
index 449c7ef0d..ba8e64a42 100644
--- a/config/locales/diaspora/ur-PK.yml
+++ b/config/locales/diaspora/ur-PK.yml
@@ -846,7 +846,6 @@ ur-PK:
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is simple!  Just enter your Diaspora ID (<b>%{diaspora_id}</b>) from your cubbies <a href='%{href_link}'>settings page</a> and hit connect."
       daniels_account: "Daniel's Diaspora account"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
diff --git a/config/locales/diaspora/vi.yml b/config/locales/diaspora/vi.yml
index 9f6730d9b..c1a72ce4f 100644
--- a/config/locales/diaspora/vi.yml
+++ b/config/locales/diaspora/vi.yml
@@ -846,7 +846,6 @@ vi:
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is simple!  Just enter your Diaspora ID (<b>%{diaspora_id}</b>) from your cubbies <a href='%{href_link}'>settings page</a> and hit connect."
       daniels_account: "Daniel's Diaspora account"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index 06e2b7113..aba1656e0 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -846,7 +846,6 @@ zh-CN:
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index aab2785b1..1c3ecb0ba 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -846,7 +846,6 @@ zh-TW:
       connect_to_cubbies: "與 Cubbi.es 連結"
       connecting_is_simple: "跟 Diapora 帳號連結很簡單! 只要從 cubbies <a href='%{href_link}'>設定頁面</a>輸入你的 Diaspora 識別碼, 再按下\"連結\"就可以了."
       daniels_account: "Daniel 的 Diaspora 帳號"
-      log_in_with_diaspora_is_comming: "很快你就可以使用 Diaspora 帳號連線至新的應用程式, 而不用另外再開新的帳號了."
       love_to_try: 希望你能試試看.
       making_the_connection: "建立連結"
       screenshot_explanation: "%{link1}. 這個cubby頁面是連結至%{link2}."