updated 83 locale files [ci skip]

83 files changed, 4540 insertions, 718 deletions

diff --git a/config/locales/devise/devise.de_formal.yml b/config/locales/devise/devise.de_formal.yml
index 15fa7e415..679011461 100644
--- a/config/locales/devise/devise.de_formal.yml
+++ b/config/locales/devise/devise.de_formal.yml
@@ -33,7 +33,7 @@ de_formal:
       inviter:
         accept_at: "unter %{url}, können Sie sie über den untenstehenden Link akzeptieren."
         has_invited_you: "%{name}"
-        have_invited_you: "%{names} hat Sie eingeladen diaspora* beizutreten"
+        have_invited_you: "%{names} hat Sie eingeladen, diaspora* beizutreten"
       reset_password_instructions:
         change: "Mein Kennwort ändern"
         ignore: "Wenn Sie dies nicht angefordert haben, ignorieren Sie bitte diese E-Mail."
@@ -43,7 +43,7 @@ de_formal:
       unlock_instructions:
         account_locked: "Ihr Konto wurde aufgrund von zu vielen fehlgeschlagenen Anmeldeversuchen gesperrt."
         click_to_unlock: "Folgen Sie dem unten aufgeführten Link, um Ihr Konto zu entsperren:"
-        subject: "Anweisungen entsperren"
+        subject: "Anweisungen zum Entsperren"
         unlock: "Mein Konto entsperren"
       welcome: "Willkommen %{email}!"
     passwords:
diff --git a/config/locales/devise/devise.en_valspeak.yml b/config/locales/devise/devise.en_valspeak.yml
new file mode 100644
index 000000000..d4492a383
--- /dev/null
+++ b/config/locales/devise/devise.en_valspeak.yml
@@ -0,0 +1,93 @@
+#   Copyright (c) 2010-2013, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+
+en_valspeak:
+  devise:
+    confirmations:
+      confirmed: "Ur account was like... confirmed!!! U r nao signed in!!! YAY! :DDD"
+      new:
+        resend_confirmation: "Resend meh teh stuff to confirm mah stuff plz."
+      send_instructions: "U will like, receive an email tellin u how 2 confirm ur account in a few min. So just liek, chillax n watch netflix r somethin, kay? Kay."
+    failure:
+      inactive: "Ur account is like... not activate yet. U should like, get on that. Kay?"
+      invalid: "Thats like... a invalid usahname or passwerd, kay?"
+      invalid_token: "sry, like, invalid authenty tokennn </3"
+      locked: "Ur account is locked :("
+      not_found_in_database: "sry, this is like... a wrong email or passwerd... sry bout tht... :\\"
+      timeout: "Ur time on d* has like... ended. plz sign in again to continue n stuff."
+      unauthenticated: "U like... need 2 sign in er sign up b4 continuin.."
+      unconfirmed: "U have 2 confirm ur account b4 continuin..."
+    invitations:
+      invitation_token_invalid: "sry bout this but, that invite token is liek, not valid... sry :\\ u mad bro?"
+      send_instructions: "Ur liek, invite was sent n ffuts..."
+      updated: "Ur passwerd was like, set!!! U r nao signed in!!! OMFGBBQ YAAAAAYYYY! :DDDD"
+    mailer:
+      confirmation_instructions:
+        confirm: "Confirm mah account!!"
+        subject: "Stuff liek, tellin u how 2 confirm ur account n stuff..."
+        you_can_confirm: "U can confirm ur account through teh link below:"
+      hello: "Ohai %{email}!!"
+      inviter:
+        accept_at: "so like, @ %{url} u can accept it through the link below. Kay? <3"
+        has_invited_you: "%{name}"
+        have_invited_you: "so like, %{names} have invited u to join diaspora*!!! :DDD"
+      reset_password_instructions:
+        change: "Change mah passwerd"
+        ignore: "So like, if u didnt want this email, plz just like, ignore it. Kthx!!!<33"
+        someone_requested: "Some1 like, wanted a link 2 change ur passwerd. if it like, was u, u can like, do this through the link below. Kay?(:"
+        subject: "Reset passwerd info"
+        wont_change: "Ur passwerd like, wont change until u click the link abov n like, make a new 1."
+      unlock_instructions:
+        account_locked: "So liek, ur account has liek, been locked cuz u liek... tried loggin in 2 many times n it didnt work... sry bout tht :\\"
+        click_to_unlock: "Click teh link below 2 unlock ur account, kay?:"
+        subject: "Unlock ur stuff info"
+        unlock: "Unlock mah account!!!"
+      welcome: "OHAI! %{email}!"
+    passwords:
+      edit:
+        change_password: "Change mah passwerddd"
+        confirm_password: "Cunfirm passwerd"
+        new_password: "New passwerddd"
+      new:
+        email: "Email addy"
+        forgot_password: "Oh noes!? did u like, forget ur passwerd? D:"
+        no_account: "sry but liek, no account that has this email existz... sry bout that :\\"
+        reset_password: "Reset passwerd"
+        send_password_instructions: "Send meh stuff on how 2 reset mah passwerd plz! Kthxbye <3"
+      send_instructions: "U will like, receive an email wit some txt on how 2 liek... reset ur passwerd in a few min, kay? So just chillax till then, kay? Kay. <3"
+      updated: "Ur passwerd was liek... changed!! U r nao liek.. signed in.((:"
+    registrations:
+      destroyed: "Byez! Ur account was trashed. hope we c u again! peace out, cub scout! <33"
+      signed_up: "U have signed up n its all good bro. so like, if enabled, a thingy was sent 2 ur email, kay?"
+      updated: "Ur account was liek, updated!!! YAY! <33333"
+    sessions:
+      new:
+        login: "Check in!!"
+        modern_browsers: "only supports like... browsers that arent like... junk n weird. sry bout that :\\"
+        password: "Passwerd"
+        remember_me: "Remembah me bro!"
+        sign_in: "Check innnn <3"
+        username: "Usahname"
+      signed_in: "Checked in successfully!!! OMG YAY! KITTIES! <3"
+      signed_out: "Bounced successfully! Byez! <3 :*"
+    shared:
+      links:
+        forgot_your_password: "forgot ur passwerd?"
+        receive_confirmation: "didnt get the stuff to confirm ur stuff?"
+        receive_unlock: "didnt get the stuff to unlock ur stuff?"
+        sign_in: "sign innn"
+        sign_up: "sign upppp"
+        sign_up_closed: "sry butt, open signups r closed right nao. sry bout that :\\"
+    unlocks:
+      new:
+        resend_unlock: "Resend the unlock stuff..."
+      send_instructions: "U will liek, get an email tellin u how to unlock ur phone.. erm.. i mean account in a few min, kay?"
+      unlocked: "Ur account was liek, unlocked!!! U r nao signed in!!! YAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYYY!!!"
+  errors:
+    messages:
+      already_confirmed: "was like... already confirmed n stuff"
+      not_found: "couldnt find it :\\"
+      not_locked: "was like.. not locked.."
diff --git a/config/locales/devise/devise.fr.yml b/config/locales/devise/devise.fr.yml
index 24655bb2d..a8c646e8b 100644
--- a/config/locales/devise/devise.fr.yml
+++ b/config/locales/devise/devise.fr.yml
@@ -33,15 +33,15 @@ fr:
       inviter:
         accept_at: "à %{url}, vous pouvez l'accepter à travers le lien ci-dessous."
         has_invited_you: "%{name}"
-        have_invited_you: "%{names} vous a invité à rejoindre Diaspora"
+        have_invited_you: "%{names} vous a invité à rejoindre diaspora*"
       reset_password_instructions:
         change: "Changer mon mot de passe"
         ignore: "Si vous n'avez pas demandé cela, merci d'ignorer ce courriel."
-        someone_requested: "Une personne a demandé la génération d'un lien pour modifier votre mot de passe. Si vous êtes à l'origine de cette demande, vous pouvez le faire en cliquant sur le lien ci-dessous."
+        someone_requested: "Quelqu'un a demandé la génération d'un lien pour modifier votre mot de passe. Si vous êtes à l'origine de cette demande, vous pouvez le faire en cliquant sur le lien ci-dessous."
         subject: "Instructions de réinitialisation de mot de passe"
         wont_change: "Votre mot de passe ne changera pas tant que vous n'en aurez pas créé un nouveau en accédant au lien ci-dessus."
       unlock_instructions:
-        account_locked: "Votre compte a été bloqué à cause d'un nombre excessif de tentatives infructueuses de connexion."
+        account_locked: "Votre compte a été verrouillé en raison d'un nombre excessif de tentatives infructueuses de connexion."
         click_to_unlock: "Cliquez sur le lien ci-dessous pour débloquer votre compte :"
         subject: "Instructions de déverrouillage"
         unlock: "Débloquer mon compte"
diff --git a/config/locales/devise/devise.ia.yml b/config/locales/devise/devise.ia.yml
index 8f9e53072..433159229 100644
--- a/config/locales/devise/devise.ia.yml
+++ b/config/locales/devise/devise.ia.yml
@@ -16,6 +16,7 @@ ia:
       invalid: "Nomine de usator o contrasigno invalide."
       invalid_token: "Indicio de authentication invalide."
       locked: "Tu conto es blocate."
+      not_found_in_database: "E-mail o contrasigno invalide."
       timeout: "Le session ha expirate. Per favor aperi session de novo pro continuar."
       unauthenticated: "Tu debe aperir session o crear un conto ante de continuar."
       unconfirmed: "Tu debe confirmar tu conto ante de continuar."
@@ -32,15 +33,15 @@ ia:
       inviter:
         accept_at: "a %{url}, tu pote acceptar lo per le ligamine sequente."
         has_invited_you: "%{name}"
-        have_invited_you: "%{names} te ha invitate a unir te a Diaspora"
+        have_invited_you: "%{names} te ha invitate a unir te a diaspora*"
       reset_password_instructions:
         change: "Cambiar mi contrasigno"
         ignore: "Si tu non ha demandate isto, per favor ignora iste message."
-        someone_requested: "Qualcuno ha demandate un ligamine pro cambiar tu contrasigno. Tu pote facer isto per le ligamine sequente."
+        someone_requested: "Qualcuno ha demandate un ligamine pro cambiar tu contrasigno. Si tu faceva iste demanda, tu pote facer isto per le ligamine sequente."
         subject: "Instructiones pro reinitialisar contrasigno"
         wont_change: "Le contrasigno non cambiara si tu non clicca sur le ligamine precedente e specifica un nove."
       unlock_instructions:
-        account_locked: "Tu conto ha essite blocate a causa de un numero excessive de tentativas fallite de accesso a tu conto."
+        account_locked: "Tu conto ha essite blocate a causa de un numero excessive de tentativas fallite de accesso."
         click_to_unlock: "Clicca sur le ligamine sequente pro disblocar tu conto:"
         subject: "Instructiones pro disblocar"
         unlock: "Disblocar mi conto"
@@ -48,14 +49,18 @@ ia:
     passwords:
       edit:
         change_password: "Cambiar mi contrasigno"
+        confirm_password: "Confirmar contrasigno"
+        new_password: "Nove contrasigno"
       new:
+        email: "Adresse de e-mail"
         forgot_password: "Contrasigno oblidate?"
-        no_account: "Nulle conto con iste adresse de e-mail existe. Si tu attende un invitation, nos te lo inviara le plus tosto possibile."
-        send_password_instructions: "Inviar me instructiones pro reinitialisar mi contrasigno"
+        no_account: "Nulle conto con iste adresse de e-mail existe."
+        reset_password: "Reinitialisar contrasigno"
+        send_password_instructions: "Inviar instructiones pro reinitialisar contrasigno"
       send_instructions: "Tu recipera in pauc minutas un message de e-mail con instructiones pro reinitialisar le contrasigno."
       updated: "Le contrasigno ha essite cambiate con successo. Tu ha aperite session."
     registrations:
-      destroyed: "Adeo! Tu conto ha essite cancellate. Nos spera revider te bentosto."
+      destroyed: "Adeo! Le deletion de tu conto ha succedite. Nos spera revider te bentosto."
       signed_up: "Conto create con successo. Si applicabile, un confirmation ha essite inviate a tu adresse de e-mail."
       updated: "Conto actualisate con successo."
     sessions:
diff --git a/config/locales/devise/devise.nds.yml b/config/locales/devise/devise.nds.yml
new file mode 100644
index 000000000..075f96e64
--- /dev/null
+++ b/config/locales/devise/devise.nds.yml
@@ -0,0 +1,57 @@
+#   Copyright (c) 2010-2013, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+
+nds:
+  devise:
+    confirmations:
+      confirmed: "Dien Konto is erfolgriek bestätigt worrn. Du bist nu anmellt."
+      new:
+        resend_confirmation: "Bestätigungsanwiesungen nochmol schicken"
+    failure:
+      inactive: "Dien Konto is noch nich in gang set woorn."
+      locked: "Dien Konto is sparrt."
+      not_found_in_database: "Ungüllige E-Mail-Adress or Passwoort."
+      unauthenticated: "Du muss die anmellen or registreren, bevöör du wiedermokst."
+      unconfirmed: "Du muss dien Konto in gang setten, bevöör du wiedermokst."
+    invitations:
+      send_instructions: "Diene Inladung is afschickt worrn."
+      updated: "Dien Passwoort is erfolgriek set worrn. Du bist nu anmellt."
+    mailer:
+      hello: "Hallo %{email}!"
+      welcome: "Willkomen %{email}!"
+    passwords:
+      edit:
+        change_password: "Änner mien Passwoort"
+        confirm_password: "Passwoort bestätigen"
+        new_password: "Nee’es Passwoort"
+      new:
+        email: "E-Mail-Adress"
+        forgot_password: "Hest du dien Passwoort vergeten?"
+        no_account: "Dat gift keen Konto mit disse E-Mail-Adress"
+        reset_password: "Passwoort trüchsetten"
+        send_password_instructions: "Schick mi Anwieungen ton Trüchsetten von mien Passwort"
+      updated: "Dien Passwoort is erfolgriek ännert worrn. Du bist nu anmellt."
+    registrations:
+      updated: "Du hest dien Konto erfolgriek ännert."
+    sessions:
+      new:
+        login: "Anmellen"
+        modern_browsers: "ünnerstütt nur moderne Netkieker."
+        password: "Passwoort"
+        remember_me: "Erinner di an mi"
+        sign_in: "Anmellen"
+        username: "Brukernaam"
+      signed_in: "Erfolgriek anmellt."
+      signed_out: "Erfolgriek afmellt."
+    shared:
+      links:
+        sign_in: "Anmellen"
+        sign_up: "Registreren"
+  errors:
+    messages:
+      already_confirmed: "wöör schon bestätigt"
+      not_found: "nich funnen"
+      not_locked: "wöör nich sparrt"
\ No newline at end of file
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index f7f85bb83..8fc9f31e3 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -208,7 +208,6 @@ ar:
       no_contacts_message: "انظر في  {community_spotlight}%"
       no_contacts_message_with_aspect: "انظر في %{community_spotlight} او %{add_to_aspect_link}"
       only_sharing_with_me: "فقط يتشاركون معي"
-      remove_person_from_aspect: "احذف %{person_name} من \"%{aspect_name}\""
       start_a_conversation: "ابدأ محادثة"
       title: "جهات الاتصال"
       your_contacts: "جهات الاتصال"
@@ -790,13 +789,7 @@ ar:
       no_message_to_display: "ﻻ توجد رسائل لعرضها."
     new:
       mentioning: "ذكر %{person}"
-    too_long:
-      few: "المرجو ان تكون رسالتك أقل من %{count} حرف"
-      many: "المرجو ان تكون رسالتك أقل من %{count} حرف"
-      one: "المرجو ان تكون رسالتك أقل من %{count} حروف"
-      other: "المرجو ان تكون رسالتك أقل من %{count} حروف"
-      two: "المرجو ان تكون رسالتك أقل من %{count} حرف"
-      zero: "المرجو ان تكون رسالتك أقل من %{count} حروف"
+    too_long: "{\"few\"=>\"المرجو ان تكون رسالتك أقل من %{count} حرف\", \"many\"=>\"المرجو ان تكون رسالتك أقل من %{count} حرف\", \"one\"=>\"المرجو ان تكون رسالتك أقل من %{count} حروف\", \"other\"=>\"المرجو ان تكون رسالتك أقل من %{count} حروف\", \"two\"=>\"المرجو ان تكون رسالتك أقل من %{count} حرف\", \"zero\"=>\"المرجو ان تكون رسالتك أقل من %{count} حروف\"}"
   stream_helper:
     hide_comments: "أخْفِ كل التعليقات"
     show_comments:
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index 45ff8323d..23ee89723 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -190,7 +190,6 @@ bg:
       no_contacts_message: "Проверете %{community_spotlight}"
       no_contacts_message_with_aspect: "Проверете %{community_spotlight} или %{add_to_aspect_link}"
       only_sharing_with_me: "Само споделящите с мен"
-      remove_person_from_aspect: "Премахване на %{person_name} от \"%{aspect_name}\""
       start_a_conversation: "Начало на разговор"
       title: "Контакти"
       your_contacts: "Вашите контакти"
@@ -718,13 +717,7 @@ bg:
       no_message_to_display: "Няма съобщение за изобразяване."
     new:
       mentioning: "Споменаване на %{person}"
-    too_long:
-      few: ", моля съкратете съобщението си до %{count} знака"
-      many: ", моля съкратете съобщението си до %{count} знака"
-      one: ", моля съкратете съобщението си до %{count} знака"
-      other: ", моля съкратете съобщението си до %{count} знака"
-      two: ", моля съкратете съобщението си до %{count} знака"
-      zero: ", моля съкратете съобщението си до %{count} знака"
+    too_long: "{\"few\"=>\", моля съкратете съобщението си до %{count} знака\", \"many\"=>\", моля съкратете съобщението си до %{count} знака\", \"one\"=>\", моля съкратете съобщението си до %{count} знака\", \"other\"=>\", моля съкратете съобщението си до %{count} знака\", \"two\"=>\", моля съкратете съобщението си до %{count} знака\", \"zero\"=>\", моля съкратете съобщението си до %{count} знака\"}"
   stream_helper:
     hide_comments: "Скриване на коментарите"
     show_comments:
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index ed6dd755b..7324cfbea 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -101,6 +101,7 @@ br:
     aspect_stream:
       make_something: "Grit un dra bennak"
       stay_updated: "Heuliañ an nevezenti"
+      stay_updated_explanation: "O red pennañ a zo peurleugniet gant o darempredoù, o tagoù heuliet, ha dre mesajoù izili zo ar rouedad."
     contacts_not_visible: "Ne vo ket gouest an darempredoù er strollad-mañ d'en em welet an eil d'egile."
     contacts_visible: "Gouest e vo an darempredoù er strollad-mañ d'en em welet an eil d'egile."
     create:
@@ -137,7 +138,11 @@ br:
         any_problem: "Ur gudenn bennak?"
         contact_podmin: "Kit e darempred gant merour ho pod!"
         do_you: "Hag:"
+        email_feedback: "Kasit ur roudenn dre %{link}, ma'z e fell gwelloc'h deoc'h."
         email_link: "Postel"
+        feature_suggestion: "... ul %{link} ?"
+        find_a_bug: "... kavet ur %{link} ?"
+        have_a_question: "... ul %{link} ?"
         here_to_help: "Izili kumuniezh Diaspora zo aze evit sikour !"
         need_help: "Ezhomm skoazell ?"
         tag_bug: "#draen"
@@ -182,6 +187,7 @@ br:
     selected_contacts:
       manage_your_aspects: "Merañ ho strolladoù"
       no_contacts: "N'hoc'h eus darempred ebet amañ evit poent."
+      view_all_community_spotlight: "Gwellout holl nevezentioù ar c'hevrad"
       view_all_contacts: "Gwelet an holl zarempredoù"
     show:
       edit_aspect: "aozañ ar strollad"
@@ -216,10 +222,13 @@ br:
       add_to_aspect: "Ouzhpennañ darempredoù da %{name}"
       add_to_aspect_link: "ouzhpennañ darempredoù da %{name}"
       all_contacts: "An holl zarempredoù"
+      community_spotlight: "Nevezenti ar rouedad"
+      many_people_are_you_sure: "Sur oc'h kregiñ ur gaozeadenn prevez gant muioc'h evit %{suggested_limit} darempred ? Kas masajoù dre ar strollad-se  a rankfe bezañ un doare gwelloc'h o kontaktiñ."
       my_contacts: "Ma darempredoù"
       no_contacts: "Evit doare hoc'h eus ezhomm da ouzhpennañ un nebeud darempredoù"
+      no_contacts_message: "Klaskit %{community_spotlight}"
+      no_contacts_message_with_aspect: "Klaskit %{community_spotlight} pe %{add_to_aspect_link}"
       only_sharing_with_me: "O rannañ keleier ganin hepken"
-      remove_person_from_aspect: "Lemel %{person_name} kuit diwar %{aspect_name}"
       start_a_conversation: "Boulc'hañ ur gaoz"
       title: "Darempredoù"
       your_contacts: "Ho tarempredoù"
@@ -264,6 +273,11 @@ br:
       delete: "diverkañ ha kraouiañ ar gaoz"
       reply: "respont"
       replying: "O respont..."
+  date:
+    formats:
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Diverkañ"
   email: "Postel"
   error_messages:
@@ -481,6 +495,8 @@ br:
     index:
       couldnt_find_them: "N'eus ket bet gallet kavout anezho ?"
       no_one_found: "... ha n'eus ket bet kavet den."
+      no_results: "Hopala ! Ret e deoc'h klask un dra bennak."
+      results_for: "Implijerien o klotañ %{search_term}"
       search_handle: "Ober gant ho kod anaout diaspora* (username@pod.tld) evit bezañ sur da gavout ho mignoned."
       searching: "O klask, gortozit ur pennadig..."
       send_invite: "Netra c'hoazh ? Kas ur bedadenn !"
@@ -491,6 +507,7 @@ br:
       add_contact: "Ouzhpennañ an darempred"
       already_connected: "Kevreet c'hoazh"
       pending_request: "Rekedoù e-skourr"
+      thats_you: "C'hwi eo !"
     profile_sidebar:
       bio: "Buhez"
       born: "Deiziad ganedigezh"
@@ -503,6 +520,7 @@ br:
       remove_from: "Dilemel %{name} a-ziwar %{aspect}?"
     show:
       does_not_exist: "An den-mañ n'eus ket anezhañ !"
+      incoming_request: "%{name} n'efe c'hoant eskemm diganit"
       mention: "Meneg"
       message: "Kemmenadenn"
       not_connected: "Ne rannit ket keleier gant an den-mañ"
@@ -706,10 +724,7 @@ br:
   status_messages:
     helper:
       no_message_to_display: "Kemennadenn ebet da ziskouez."
-    too_long:
-      one: "Lezit ho kemennadennoù statud dindan %{count}"
-      other: "Lezit ho kemennadennoù statud dindan %{count}"
-      zero: "Lezit ho kemennadennoù statud dindan %{count}"
+    too_long: "{\"one\"=>\"Lezit ho kemennadennoù statud dindan %{count}\", \"other\"=>\"Lezit ho kemennadennoù statud dindan %{count}\", \"zero\"=>\"Lezit ho kemennadennoù statud dindan %{count}\"}"
   stream_helper:
     hide_comments: "Kuzhat an holl evezhiadennoù"
     show_comments:
diff --git a/config/locales/diaspora/bs.yml b/config/locales/diaspora/bs.yml
index 1a206fecd..5bdbcba7f 100644
--- a/config/locales/diaspora/bs.yml
+++ b/config/locales/diaspora/bs.yml
@@ -272,7 +272,6 @@ bs:
       no_contacts_message: "Probajte %{community_spotlight}"
       no_contacts_message_with_aspect: "Probajte %{community_spotlight} ili %{add_to_aspect_link}"
       only_sharing_with_me: "Samo dijele sa mnom"
-      remove_person_from_aspect: "Ukloni %{person_name} iz \"%{aspect_name}\""
       start_a_conversation: "Započni razgovor"
       title: "Kontakti"
       your_contacts: "Vaši Kontakti"
@@ -937,12 +936,7 @@ bs:
       no_message_to_display: "Nema poruka za prikaz."
     new:
       mentioning: "Spominje %{person}"
-    too_long:
-      few: "molimo da vaše poruke statusa sadrže manje nego %{count} karaktera"
-      many: "molimo da vaše poruke statusa sadrže manje nego %{count} karaktera"
-      one: "molimo da vaše poruke statusa sadrže manje nego %{count} karakter"
-      other: "molimo da vaše poruke statusa sadrže manje nego %{count} karaktera"
-      zero: "molimo da vaše poruke statusa sadrže manje nego %{count} karaktera"
+    too_long: "{\"few\"=>\"molimo da vaše poruke statusa sadrže manje nego %{count} karaktera\", \"many\"=>\"molimo da vaše poruke statusa sadrže manje nego %{count} karaktera\", \"one\"=>\"molimo da vaše poruke statusa sadrže manje nego %{count} karakter\", \"other\"=>\"molimo da vaše poruke statusa sadrže manje nego %{count} karaktera\", \"zero\"=>\"molimo da vaše poruke statusa sadrže manje nego %{count} karaktera\"}"
   stream_helper:
     hide_comments: "Sakrij sve komentare"
     show_comments:
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index b55d3764f..0378d2ad3 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -270,7 +270,6 @@ cs:
       no_contacts_message: "Shlédněte %{community_spotlight}"
       no_contacts_message_with_aspect: "Shlédněte %{community_spotlight} nebo %{add_to_aspect_link}"
       only_sharing_with_me: "Pouze sdílejí se mnou"
-      remove_person_from_aspect: "Odstranit %{person_name} z \"%{aspect_name}\""
       start_a_conversation: "Zahájit konverzaci"
       title: "Kontakty"
       your_contacts: "Vaše kontakty"
@@ -1007,11 +1006,7 @@ cs:
       no_message_to_display: "Žádná zpráva k zobrazení."
     new:
       mentioning: "Zmínka: %{person}"
-    too_long:
-      few: "prosím zkraťte svou zprávu na méně než %{count} znaky"
-      one: "prosím zkraťte svou zprávu na méně než %{count} znak"
-      other: "prosím zkraťte svou zprávu na méně než %{count} znaků"
-      zero: "prosím zkraťte svou zprávu na méně než %{count} znaků"
+    too_long: "{\"few\"=>\"prosím zkraťte svou zprávu na méně než %{count} znaky\", \"one\"=>\"prosím zkraťte svou zprávu na méně než %{count} znak\", \"other\"=>\"prosím zkraťte svou zprávu na méně než %{count} znaků\", \"zero\"=>\"prosím zkraťte svou zprávu na méně než %{count} znaků\"}"
   stream_helper:
     hide_comments: "Skrýt všechny komentáře"
     show_comments:
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 8f4b703c9..46dd445b8 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -91,7 +91,6 @@ cy:
       all_contacts: "Cysylltiadau i gŷd"
       my_contacts: "Fy nghysylltiadau"
       no_contacts: "No contacts."
-      remove_person_from_aspect: "Tynnu %{person_name} oddi ar \"%{aspect_name}\""
       title: "Cysylltiadau"
       your_contacts: "Eich Cysylltiadau chi"
     many: "%{count} contacts"
@@ -445,13 +444,7 @@ cy:
   status_messages:
     helper:
       no_message_to_display: "Dim neges i arddangos."
-    too_long:
-      few: "please make your status messages less than %{count} characters"
-      many: "please make your status messages less than %{count} characters"
-      one: "please make your status messages less than %{count} character"
-      other: "please make your status messages less than %{count} characters"
-      two: "please make your status messages less than %{count} characters"
-      zero: "please make your status messages less than %{count} characters"
+    too_long: "{\"few\"=>\"please make your status messages less than %{count} characters\", \"many\"=>\"please make your status messages less than %{count} characters\", \"one\"=>\"please make your status messages less than %{count} character\", \"other\"=>\"please make your status messages less than %{count} characters\", \"two\"=>\"please make your status messages less than %{count} characters\", \"zero\"=>\"please make your status messages less than %{count} characters\"}"
   stream_helper:
     hide_comments: "hide comments"
     show_comments:
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index ce0edf7c5..02073cac4 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -10,9 +10,9 @@ da:
   _contacts: "Kontakter"
   _help: "Hjælp"
   _home: "Hjem"
-  _photos: "Billeder"
+  _photos: "billeder"
   _services: "Tjenester"
-  _terms: "Betingelser"
+  _terms: "betingelser"
   account: "Konto"
   activerecord:
     errors:
@@ -198,13 +198,13 @@ da:
         mail_podmin: "Podmin e-mail"
         need_help: "Brug for hjælp?"
         tag_bug: "fejl"
-        tag_feature: "funktion"
+        tag_feature: "feature"
         tag_question: "spørgsmål"
         tutorial_link_text: "Guider"
         tutorials_and_wiki: "%{faq}, %{tutorial} og %{wiki}: Hjælp til at komme i gang."
       introduce_yourself: "Dette er din strøm. Hop ud i den og introducér dig selv."
       keep_diaspora_running: "Hjælp udviklingen af Diaspora* med en månedlig donation!"
-      keep_pod_running: "Hjælp med at få %{pod} til at køre, og sørg for at administratoren kan få sig en håndbajer i ny og næ med en månedlig donation."
+      keep_pod_running: "Hjælp med at få %{pod} til at køre, og sørg for at administratoren kan få sig en kop kaffe i ny og næ med en månedlig donation."
       new_here:
         follow: "Følg %{link} og byd nye brugere velkommen til Diaspora*!"
         learn_more: "Lær mere"
@@ -282,6 +282,7 @@ da:
     few: "%{count} kontaktpersoner"
     index:
       add_a_new_aspect: "Tilføj nyt aspekt"
+      add_contact: "Tilføj kontakt"
       add_to_aspect: "Tilføj kontaktpersoner til %{name}"
       add_to_aspect_link: "tilføj kontakter til %{name}"
       all_contacts: "Alle kontakter"
@@ -292,9 +293,10 @@ da:
       no_contacts_message: "Se %{community_spotlight}"
       no_contacts_message_with_aspect: "Se %{community_spotlight} eller %{add_to_aspect_link}"
       only_sharing_with_me: "Deler kun med mig"
-      remove_person_from_aspect: "Fjern %{person_name} fra \"%{aspect_name}\""
+      remove_contact: "Fjern kontakt"
       start_a_conversation: "Start en samtale"
       title: "Kontakter"
+      user_search: "Søg efter brugere"
       your_contacts: "Dine kontakter"
     many: "%{count} kontakter"
     one: "Én kontaktperson"
@@ -431,7 +433,7 @@ da:
     miscellaneous:
       back_to_top_a: "Ja. Når du har rullet en hel side ned kan du klikke på den grå pil der vises i nederste højre hjørne af browservinduet."
       back_to_top_q: "Er der en hurtig måde at gå tilbage til toppen af siden når jeg har rullet ned?"
-      diaspora_app_a: "Der er flere Android-apps under udvikling. Flere er forladte projekter og fungerer derfor ikke godt sammen med den aktuelle version af diaspora *. Forvent ikke meget af disse apps. I øjeblikket er den bedste måde at få adgang til diaspora * fra din mobile enhed, gennem en browser, fordi vi har udviklet en mobil version af hjemmesiden, som bør virke godt på alle enheder. Der er i øjeblikket ingen app til iOS. Igen bør diaspora * fungere fint via din browser."
+      diaspora_app_a: "Der er flere Android-apps under udvikling. Flere er forladte projekter og fungerer derfor ikke godt sammen med den aktuelle version af Diaspora*. Forvent ikke meget af disse apps. I øjeblikket er den bedste måde at få adgang til Diaspora* fra din mobile enhed gennem en browser, fordi vi har udviklet en mobil version af hjemmesiden som bør virke godt på alle enheder. Der er i øjeblikket ingen app til iOS. Igen bør Diaspora* fungere fint via din browser."
       diaspora_app_q: "Findes der en Diaspora*-app til Android eller IOS?"
       photo_albums_a: "Nej, ikke i øjeblikket. Men du kan se en strøm af deres uploadede billeder fra fotosektionen i sidekolonnen af deres profilside."
       photo_albums_q: "Er der billed, eller videoalbums?"
@@ -447,7 +449,7 @@ da:
       what_is_a_pod_a: "En pod er en server, der kører Diaspora*-softwaren og er forbundet til diaspora*-netværket. \"Pod\" er engelsk for en plantebælg, og er således en metafor: En bælg indeholder frø på samme måde som en server indeholder brugerkonti. Der er mange forskellige pods. Du kan tilføje venner fra andre pods og kommunikere med dem. (Du kan tænke på en diaspora* pod som du tænker på en e-mailudbyder: Der er offentlige pods, private pods og med en vis indsats kan du endda køre din egen)."
       what_is_a_pod_q: "Hvad er en pod?"
     posts_and_posting:
-      char_limit_services_a: "I dette tilfælde vil dit indlæg være begrænset til et mindre antal tegn (140 i tilfælde af Twitter, 1000 i tilfælde af Tumblr), og antallet af tegn, du har tilbage vises, når denne tjenestes ikon er fremhævet. Du kan stadig skrive til disse tjenester, hvis dit indlæg er længere end deres grænse, men teksten vil i så fald blive afkortet på disse tjenester."
+      char_limit_services_a: "I dette tilfælde vil dit indlæg være begrænset til et mindre antal tegn (140 tegn hvis det drejer sg om Twitter, 1000 tegn for Tumblr), og antallet af tegn, du har tilbage vises, når denne tjenestes ikon er fremhævet. Du kan stadig skrive til disse tjenester, hvis dit indlæg er længere end deres grænse, men teksten vil i så fald blive afkortet på disse tjenester."
       char_limit_services_q: "Hvad er tegngrænsen for indlæg der deles via en tilsluttet tjeneste, der kræver et mindre antal tegn?"
       character_limit_a: "65.535 tegn. Det er 65.395 flere tegn end du får på Twitter! ;)"
       character_limit_q: "Hvad er grænsen for hvor mange tegn der må være i et indlæg?"
@@ -1170,10 +1172,7 @@ da:
       no_message_to_display: "Ingen beskeder at vise."
     new:
       mentioning: "Nævnt: %{person}"
-    too_long:
-      one: "Lav venligst en statusopdatering på under %{count} tegn"
-      other: "Lav venligst en statusopdatering på under %{count} tegn"
-      zero: "Lav venligst en statusopdatering på under %{count} tegn"
+    too_long: "Lav venligst en statusopdatering på under %{count} tegn. Lige nu er der %{current_length} tegn."
   stream_helper:
     hide_comments: "Skjul alle kommentarer"
     show_comments:
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 0e0ccefa4..3633c2174 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -96,9 +96,9 @@ de:
       id: "ID"
       last_seen: "Zuletzt gesehen"
       ? "no"
-      : Nein
+      : nein
       nsfw: "NSFW (unpassend für den Arbeitsplatz)"
-      unknown: "Unbekannt"
+      unknown: "unbekannt"
       ? "yes"
       : ja
     user_search:
@@ -112,7 +112,7 @@ de:
         one: "%{count} Benutzer gefunden"
         other: "%{count} Benutzer gefunden"
         zero: "%{count} Benutzer gefunden"
-      view_profile: "Profil anzeigen"
+      view_profile: "Profil ansehen"
       you_currently:
         one: "Du hast noch eine Einladung übrig %{link}"
         other: "Du hast noch %{count} Einladungen übrig %{link}"
@@ -282,6 +282,7 @@ de:
     few: "%{count} Kontakte"
     index:
       add_a_new_aspect: "Einen neuen Aspekt hinzufügen"
+      add_contact: "Kontakt hinzufügen"
       add_to_aspect: "Füge Kontakte zu %{name} hinzu"
       add_to_aspect_link: "füge Kontakte zu »%{name}« hinzu"
       all_contacts: "Alle Kontakte"
@@ -292,9 +293,10 @@ de:
       no_contacts_message: "Guck’ in den %{community_spotlight}"
       no_contacts_message_with_aspect: "Guck’ in den %{community_spotlight} oder %{add_to_aspect_link}"
       only_sharing_with_me: "Nur mit dir Teilende"
-      remove_person_from_aspect: "Entferne %{person_name} aus \"%{aspect_name}\""
+      remove_contact: "Kontakt entfernen"
       start_a_conversation: "Beginne eine Unterhaltung"
       title: "Kontakte"
+      user_search: "Nutzersuche"
       your_contacts: "Deine Kontakte"
     many: "%{count} Kontakte"
     one: "Ein Kontakt"
@@ -665,7 +667,7 @@ de:
         zero: "Keine neuen Benachrichtigungen"
     index:
       all_notifications: "Alle Benachrichtigungen"
-      also_commented: "Auch Kommentiert"
+      also_commented: "Auch kommentiert"
       and: "und"
       and_others:
         few: "und %{count} anderen"
@@ -958,7 +960,7 @@ de:
     two: "%{count} Reaktionen"
     zero: "Keine Reaktionen"
   registrations:
-    closed: "Neuregistrierungen sind auf diesem Pod geschlossen."
+    closed: "Neuregistrierungen sind auf diesem diaspora*-Pod geschlossen."
     create:
       success: "Du bist diaspora* beigetreten!"
     edit:
@@ -1145,7 +1147,7 @@ de:
       posting: "Senden …"
       preview: "Vorschau"
       publishing_to: "Veröffentlichen an: "
-      remove_location: "Position entfernen"
+      remove_location: "Ort entfernen"
       share: "Teilen"
       share_with: "Teile mit"
       upload_photos: "Fotos hochladen"
@@ -1183,13 +1185,7 @@ de:
       no_message_to_display: "Keine Nachricht zum Anzeigen."
     new:
       mentioning: "Erwähnt: %{person}"
-    too_long:
-      few: "Bitte kürze deinen Beitrag auf weniger als %{count} Zeichen."
-      many: "Bitte kürze deinen Beitrag auf weniger als %{count} Zeichen."
-      one: "Bitte kürze deinen Beitrag auf weniger als %{count} Zeichen."
-      other: "Bitte kürze deinen Beitrag auf weniger als %{count} Zeichen."
-      two: "Bitte kürze deinen Beitrag auf unter %{count} Zeichen."
-      zero: "Bitte kürze deinen Beitrag auf weniger als %{count} Zeichen."
+    too_long: "Bitte kürze deinen Beitrag auf weniger als %{count} Zeichen. Im Moment enthält er %{current_length} Zeichen"
   stream_helper:
     hide_comments: "Alle Kommentare verbergen"
     show_comments:
diff --git a/config/locales/diaspora/de_formal.yml b/config/locales/diaspora/de_formal.yml
index 5ed3dca7b..18eb07ebb 100644
--- a/config/locales/diaspora/de_formal.yml
+++ b/config/locales/diaspora/de_formal.yml
@@ -12,6 +12,7 @@ de_formal:
   _home: "Startseite"
   _photos: "Fotos"
   _services: "Dienste"
+  _terms: "Bedingungen"
   account: "Konto"
   activerecord:
     errors:
@@ -161,8 +162,8 @@ de_formal:
       success: "%{name} wurde erfolgreich entfernt."
     edit:
       add_existing: "Einen bereits bestehenden Kontakt hinzufügen"
-      aspect_list_is_not_visible: "Die Aspektliste wird vor anderen im Aspekt versteckt"
-      aspect_list_is_visible: "Die Aspektliste ist für andere im Aspekt sichtbar"
+      aspect_list_is_not_visible: "Kontakte in diesem Aspekt können einander nicht sehen."
+      aspect_list_is_visible: "Kontakte in diesem Aspekt können einander sehen."
       confirm_remove_aspect: "Sind Sie sich sicher, dass Sie diesen Aspekt löschen möchten?"
       done: "Fertig"
       make_aspect_list_visible: "Kontakte aus diesem Aspekt öffentlich machen?"
@@ -179,9 +180,9 @@ de_formal:
       remove: "entfernen"
     index:
       diaspora_id:
-        content_1: "Ihre diaspora* ID ist:"
-        content_2: "Geben Sie diese weiter und seien Sie somit auf diaspora* leicht zu finden."
-        heading: "diaspora* ID"
+        content_1: "Ihre diaspora*-ID ist:"
+        content_2: "Geben Sie diese an andere weiter und sie werden Sie leicht auf diaspora* finden können."
+        heading: "diaspora*-ID"
       donate: "Spenden"
       handle_explanation: "Das ist Ihre diaspora* ID. Sie können sie wie eine E-Mail-Adresse weitergeben, damit andere Nutzer mit Ihnen Kontakt aufnehmen können."
       help:
@@ -281,6 +282,7 @@ de_formal:
     few: "%{count} Kontakte"
     index:
       add_a_new_aspect: "Einen neuen Aspekt hinzufügen"
+      add_contact: "Kontakt hinzufügen"
       add_to_aspect: "Füge Kontakte zu %{name} hinzu"
       add_to_aspect_link: "Füge Kontakte zu %{name} hinzu"
       all_contacts: "Alle Kontakte"
@@ -291,9 +293,10 @@ de_formal:
       no_contacts_message: "Erkunden Sie den %{community_spotlight}"
       no_contacts_message_with_aspect: "Schauen Sie in den %{community_spotlight} oder %{add_to_aspect_link}"
       only_sharing_with_me: "Nur mit Ihnen Teilende"
-      remove_person_from_aspect: "Entferne %{person_name} aus \"%{aspect_name}\""
+      remove_contact: "Kontakt entfernen"
       start_a_conversation: "Starten Sie eine Unterhaltung"
       title: "Kontakte"
+      user_search: "Nutzersuche"
       your_contacts: "Ihre Kontakte"
     many: "%{count} Kontakte"
     one: "Ein Kontakt"
@@ -434,7 +437,7 @@ de_formal:
       diaspora_app_q: "Gibt es eine diaspora* App für Android oder iOS?"
       photo_albums_a: "Nein, momentan nicht. Aber Sie können sich die hochgeladenen Bilder in der Fotosektion in der linke Leiste auf dem Profil ansehen."
       photo_albums_q: "Gibt es Foto- oder Videoalben?"
-      subscribe_feed_a: "Ja, allerdings ist diese Funktion noch immer nicht ganz ausgereift und das Ergebnis wird nicht ganz richtig formatiert. Wenn Sie die Funktion dennoch benutzen wollen, gehen Sie einfach zu der Profilseite der Person und klicken Sie auf die Feed-Schaltfläche deines Browsers oder kopieren Sie die Profil-URL (z.B. https://joindiaspora.com/people/irgendeinenummer) und fügen Sie sie in den Feedreader ein. Die resultierenden Feed-Adressen sehen aus wie https://joindiaspora.com/public/benutzername.atom. diaspora* benutzt Atom an Stelle von RSS."
+      subscribe_feed_a: "Ja, allerdings ist diese Funktion noch immer nicht ganz ausgereift und das Ergebnis wird nicht ganz richtig formatiert. Wenn Sie die Funktion dennoch benutzen wollen, gehen Sie einfach zu der Profilseite der Person und klicken Sie auf die Feed-Schaltfläche deines Browsers oder kopieren Sie die Profil-URL (z.B. https://joindiaspora.com/people/irgendeinenummer) und fügen Sie sie in den Feedreader ein. Die resultierenden Feed-Adressen sehen aus wie https://joindiaspora.com/public/benutzername.atom – diaspora* benutzt Atom an Stelle von RSS."
       subscribe_feed_q: "Kann ich die öffentlichen Beiträge einer Person mit einem Feedreader verfolgen?"
       title: "Diverses"
     pods:
@@ -640,12 +643,9 @@ de_formal:
   no_results: "Keine Ergebnisse gefunden."
   notifications:
     also_commented:
-      few: "%{actors} haben auch %{post_author}s %{post_link} kommentiert."
-      many: "%{actors} haben auch %{post_author}s %{post_link} kommentiert."
-      one: "%{actors} hat auch %{post_author}s %{post_link} kommentiert."
-      other: "%{actors} haben auch %{post_author}s %{post_link} kommentiert."
-      two: "%{actors} haben auch %{post_author}s %{post_link} kommentiert."
-      zero: "%{actors} hat auch %{post_author}s %{post_link} kommentiert."
+      one: "%{actors} hat auch %{post_author}s Beitrag %{post_link} kommentiert."
+      other: "%{actors} haben auch %{post_author}s Beitrag %{post_link} kommentiert."
+      zero: "%{actors} hat auch %{post_author}s Beitrag %{post_link} kommentiert."
     also_commented_deleted:
       few: "%{actors} haben einen inzwischen gelöschten Beitrag kommentiert."
       many: "%{actors} haben einen inzwischen gelöschten Beitrag kommentiert."
@@ -654,12 +654,9 @@ de_formal:
       two: "%{actors} haben deinen inzwischen gelöschten Beitrag kommentiert."
       zero: "Niemand hat einen inzwischen gelöschten Beitrag kommentiert."
     comment_on_post:
-      few: "%{actors} haben Ihren %{post_link} kommentiert."
-      many: "%{actors} haben Ihren %{post_link} kommentiert."
-      one: "%{actors} hat Ihren %{post_link} kommentiert."
-      other: "%{actors} haben Ihren %{post_link} kommentiert."
-      two: "%{actors} hat Ihren %{post_link} kommentiert."
-      zero: "Niemand hat Ihren %{post_link} kommentiert."
+      one: "%{actors} hat Ihren Beitrag %{post_link} kommentiert."
+      other: "%{actors} haben Ihren Beitrag %{post_link} kommentiert."
+      zero: "%{actors} hat Ihren Beitrag %{post_link} kommentiert."
     helper:
       new_notifications:
         few: "%{count} neue Benachrichtigungen"
@@ -682,6 +679,7 @@ de_formal:
       comment_on_post: "Einen Beitrag Kommentiert"
       liked: "Gefällt"
       mark_all_as_read: "Markiere alle als gelesen"
+      mark_all_shown_as_read: "Alle angezeigten als gelesen markieren"
       mark_read: "Als gelesen markieren"
       mark_unread: "als ungelesen markieren"
       mentioned: "Erwähnt"
@@ -835,7 +833,7 @@ de_formal:
       looking_for: "Suchen Sie mit %{tag_link} getaggte Beiträge?"
       no_one_found: "… und niemand wurde gefunden."
       no_results: "Hey! Sie müssen nach etwas suchen."
-      results_for: "Suchergebnisse für"
+      results_for: "Suchergebnisse für %{search_term}"
       search_handle: "Nutzen Sie die diaspora* ID (nutzername@pod.tld) Ihrer Freunde, um sie leichter zu finden."
       searching: "suche, bitte warten..."
       send_invite: "Immer noch nichts? Verschicken Sie eine Einladung!"
@@ -989,6 +987,8 @@ de_formal:
       sign_up: "REGISTRIEREN"
       sign_up_message: "Soziales Netzwerken mit <3"
       submitting: "Absenden..."
+      terms: "Indem Sie ein Konto erstellen, akzeptieren Sie die %{terms_link}."
+      terms_link: "Nutzungsbedingungen"
       username: "BENUTZERNAME"
   report:
     comment_label: "<b>Kommentar</b>:<br>%{data}"
@@ -1179,13 +1179,7 @@ de_formal:
       no_message_to_display: "Keine Nachricht zum Anzeigen."
     new:
       mentioning: "Erwähnt: %{person}"
-    too_long:
-      few: "Bitte kürzen Sie Ihren Beitrag auf weniger als %{count} Zeichen."
-      many: "Bitte kürzen Sie Ihren Beitrag auf weniger als %{count} Zeichen."
-      one: "Bitte kürzen Sie Ihren Beitrag auf weniger als %{count} Zeichen."
-      other: "Bitte kürzen Sie Ihren Beitrag auf weniger als %{count} Zeichen."
-      two: "Bitte kürzen Sie Ihren Beitrag auf unter %{count} Zeichen."
-      zero: "Bitte kürzen Sie Ihren Beitrag auf weniger als %{count} Zeichen."
+    too_long: "Bitte kürzen Sie Ihren Beitrag auf weniger als %{count} Zeichen. Im Moment enthält er %{current_length} Zeichen"
   stream_helper:
     hide_comments: "Alle Kommentare verbergen"
     show_comments:
@@ -1259,8 +1253,8 @@ de_formal:
       wrong_password: "Das eingegebene Kennwort stimmt nicht mit Ihrem aktuellen Kennwort überein."
     edit:
       also_commented: "… jemand ebenfalls den Beitrag eines Kontaktes kommentiert?"
-      auto_follow_aspect: "Aspekt für automatisch gefolgte Benutzer:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
+      auto_follow_aspect: "Aspekt für automatisch gefolgte Kontakte:"
+      auto_follow_back: "Automatisch mit Benutzern teilen, die anfangen, mit Ihnen zu teilen"
       change: "Ändern"
       change_email: "E-Mail-Adresse ändern"
       change_language: "Sprache ändern"
@@ -1284,7 +1278,7 @@ de_formal:
       edit_account: "Konto bearbeiten"
       email_awaiting_confirmation: "Wir haben Ihnen einen Aktivierungslink zu %{unconfirmed_email} geschickt. Solange Sie dem Link nicht gefolgt sind und die neue Adresse aktiviert haben, werden wir weiterhin Ihre ursprüngliche E-Mail-Adresse %{email} verwenden."
       export_data: "Daten exportieren"
-      following: "Folgen-Einstellungen"
+      following: "Teilen-Einstellungen"
       getting_started: "Einstellungen für neue Nutzer"
       liked: "… wenn jemandem Ihr Beitrag gefällt?"
       mentioned: "… Sie in einem Beitrag erwähnt werden?"
@@ -1293,8 +1287,8 @@ de_formal:
       private_message: "… Sie eine private Nachricht erhalten?"
       receive_email_notifications: "E-Mail-Benachrichtigungen empfangen, wenn …"
       reshared: "… jemand Ihren Beitrag weitersagt?"
-      show_community_spotlight: "Gemeinschafts-Schaukasten im Stream anzeigen?"
-      show_getting_started: "Einstieg reaktivieren"
+      show_community_spotlight: "Gemeinschafts-Schaukasten im Stream anzeigen"
+      show_getting_started: "Einstiegshinweise anzeigen"
       someone_reported: "jemand hat eine Meldung gesendet"
       started_sharing: "… jemand mit Ihnen zu teilen anfängt?"
       stream_preferences: "Stream-Einstellungen"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 5c5dc026e..8f5a6e5ec 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -258,7 +258,6 @@ el:
       no_contacts_message: "Δες και %{community_spotlight}"
       no_contacts_message_with_aspect: "Δες και %{community_spotlight} ή %{add_to_aspect_link}"
       only_sharing_with_me: "Μοιράζονται μόνο με εμένα"
-      remove_person_from_aspect: "Μετακίνηση του χρήστη %{person_name} από την πτυχή \"%{aspect_name}\""
       start_a_conversation: "Ξεκινήστε μια συζήτηση"
       title: "Επαφές"
       your_contacts: "Οι Επαφές σας"
@@ -277,7 +276,7 @@ el:
       participants: "Συμμετέχοντες"
     create:
       fail: "Μη έγκυρο μήνυμα"
-      no_contact: "Ε, πρέπει πρώτα να προσθέσετε μια επαφή!"
+      no_contact: "Πρέπει πρώτα να προσθέσετε μια επαφή!"
       sent: "Μήνυμα εστάλη"
     destroy:
       success: "Η συζήτηση αφαιρέθηκε επιτυχώς"
@@ -343,7 +342,7 @@ el:
     irc: "Κανάλι συζήτησης IRC"
     tutorial: "οδηγός"
     tutorials: "οδηγοί"
-    wiki: "βικιλεξικό (wiki)"
+    wiki: "wiki"
   hide: "Απόκρυψη"
   invitation_codes:
     excited: "Ο/Η %{name} χαίρεται που σε βλέπει εδώ."
@@ -881,13 +880,7 @@ el:
       no_message_to_display: "Κανένα μήνυμα"
     new:
       mentioning: "Αναφορά σε: %{person}"
-    too_long:
-      few: "παρακαλώ μετατρέψτε τα μηνύματα κατάστασης σας σε λιγότερους από %{count} χαρακτήρες"
-      many: "παρακαλώ ελαττώστε το μύνημα κατάστασης σας σε λιγότερο από %{count} χαρακτήρες"
-      one: "παρακαλώ μετατρέψτε τα μηνύματα κατάστασης σας σε λιγότερο από %{count} χαρακτήρα"
-      other: "παρακαλώ μετατρέψτε τα μηνύματα κατάστασης σας σε λιγότερους από %{count} χαρακτήρες"
-      two: "παρακαλούμε ορίστε το μήνυμα κατάστασής σας σε λιγότερους από %{count} χαρακτήρες"
-      zero: "παρακαλώ μετατρέψτε τα μηνύματα κατάστασης σας σε λιγότερους από %{count} χαρακτήρες"
+    too_long: "{\"few\"=>\"παρακαλώ μετατρέψτε τα μηνύματα κατάστασης σας σε λιγότερους από %{count} χαρακτήρες\", \"many\"=>\"παρακαλώ ελαττώστε το μύνημα κατάστασης σας σε λιγότερο από %{count} χαρακτήρες\", \"one\"=>\"παρακαλώ μετατρέψτε τα μηνύματα κατάστασης σας σε λιγότερο από %{count} χαρακτήρα\", \"other\"=>\"παρακαλώ μετατρέψτε τα μηνύματα κατάστασης σας σε λιγότερους από %{count} χαρακτήρες\", \"two\"=>\"παρακαλούμε ορίστε το μήνυμα κατάστασής σας σε λιγότερους από %{count} χαρακτήρες\", \"zero\"=>\"παρακαλώ μετατρέψτε τα μηνύματα κατάστασης σας σε λιγότερους από %{count} χαρακτήρες\"}"
   stream_helper:
     hide_comments: "Απόκρυψη όλων των σχολίων"
     show_comments:
diff --git a/config/locales/diaspora/en_1337.yml b/config/locales/diaspora/en_1337.yml
index 6b7405fa0..f535c1ca7 100644
--- a/config/locales/diaspora/en_1337.yml
+++ b/config/locales/diaspora/en_1337.yml
@@ -175,7 +175,6 @@ en_1337:
       my_contacts: "Y0UR N00B5"
       no_contacts: "L00K5 L1K3 U N33D 70 PWN M0R3 N00B5!"
       only_sharing_with_me: "0NLY 5H4R1NG W17H U"
-      remove_person_from_aspect: "R3M0V3 %{person_name} FR0M \"%{aspect_name}\""
       start_a_conversation: "574R7 4 N3W C0NV3R54710N!"
       title: "N00B5"
       your_contacts: "Y0UR N00B5"
@@ -710,13 +709,7 @@ en_1337:
       no_message_to_display: "N0 5P4M 2 D15PL4Y!"
     new:
       mentioning: "M3N710N1NG: %{person}"
-    too_long:
-      few: "PL3453 M4K3 Y0UR 5P4M5 L355 7H3N %{count} CH4R4C73R5"
-      many: "PL3453 M4K3 Y0UR 5P4M5 L355 7H3N %{count} CH4R4C73R5"
-      one: "PL3453 M4K3 Y0UR 5P4M5 L355 7H3N %{count} CH4R4C73R\""
-      other: "PL3453 M4K3 Y0UR 5P4M5 L355 7H3N %{count} CH4R4C73R5"
-      two: "PL3453 M4K3 Y0UR 5P4M5 L355 7H3N %{count} CH4R4C73R5"
-      zero: "PL3453 M4K3 Y0UR 5P4M5 L355 7H3N %{count} CH4R4C73R5"
+    too_long: "{\"few\"=>\"PL3453 M4K3 Y0UR 5P4M5 L355 7H3N %{count} CH4R4C73R5\", \"many\"=>\"PL3453 M4K3 Y0UR 5P4M5 L355 7H3N %{count} CH4R4C73R5\", \"one\"=>\"PL3453 M4K3 Y0UR 5P4M5 L355 7H3N %{count} CH4R4C73R\\\"\", \"other\"=>\"PL3453 M4K3 Y0UR 5P4M5 L355 7H3N %{count} CH4R4C73R5\", \"two\"=>\"PL3453 M4K3 Y0UR 5P4M5 L355 7H3N %{count} CH4R4C73R5\", \"zero\"=>\"PL3453 M4K3 Y0UR 5P4M5 L355 7H3N %{count} CH4R4C73R5\"}"
   stream_helper:
     hide_comments: "H1D3 4LL 5P4M5!"
     show_comments:
diff --git a/config/locales/diaspora/en_pirate.yml b/config/locales/diaspora/en_pirate.yml
index 88d1f130b..6c98a6433 100644
--- a/config/locales/diaspora/en_pirate.yml
+++ b/config/locales/diaspora/en_pirate.yml
@@ -5,21 +5,50 @@
 
 
 en_pirate:
+  _applications: "Applications"
+  _comments: "Comments"
   _contacts: "Mateys"
   _home: "Home Port"
   _photos: "Portraits"
+  _services: "Ye Services"
+  account: "Ye account"
   activerecord:
     errors:
       models:
+        contact:
+          attributes:
+            person_id:
+              taken: "must be unique among this matey's mates."
+        person:
+          attributes:
+            diaspora_handle:
+              taken: "has been hornswaggled!"
+        request:
+          attributes:
+            from_id:
+              taken: "is a another one of something that already exists ye scallywag!"
         reshare:
           attributes:
             root_guid:
               taken: "Ye've already reshared that post!"
         user:
           attributes:
+            email:
+              taken: "has been hornswaggled!"
+            person:
+              invalid: "be invalid."
             username:
-              invalid: "is invalid. We only allow letters, numbers, 'n underscores"
+              invalid: "is invalid. We only allow letters, numbers, 'n underscores."
+              taken: "has been hornswaggled!"
+  ago: "%{time} ago arrr"
   all_aspects: "Yer Crews"
+  application:
+    helper:
+      unknown_person: "unknown scallywag"
+      video_title:
+        unknown: "Arrgh! Unknown Video Title"
+  are_you_sure: "Are ye sure?"
+  are_you_sure_delete_account: "Are ye sure you want t' walk the plank? Yer account will be shark bait!"
   aspect_memberships:
     destroy:
       failure: "Blast! Failed to kick matey out yer crew"
@@ -29,33 +58,87 @@ en_pirate:
     add_to_aspect:
       failure: "Failed to add contact to crew."
       success: "Successfully added contact to crew."
+    aspect_contacts:
+      done_editing: "done editin' cap'n!"
     aspect_listings:
       add_an_aspect: "+ Add a crew"
-    contacts_not_visible: "Contacts in this crew will nah be able to see each other."
+      deselect_all: "Unchoose all"
+      edit_aspect: "Edit %{name}"
+      select_all: "Choose all"
+    aspect_stream:
+      stay_updated: "Stay up 't date"
+      stay_updated_explanation: "Yer main stream is populated with all of yer contacts, tags ye follow, and posts from some creative members of the community."
+    contacts_not_visible: "Mateys in this crew will nah be able to see each other."
     contacts_visible: "Contacts in this crew will be able to see each other."
     create:
       failure: "Crew creation failed."
       success: "Yer new crew %{name} was created"
+    destroy:
+      failure: "%{name} not be empty and could not be removed YARGH!"
+      success: "%{name} was removed successfully mate."
     edit:
+      add_existing: "Enlist this mate into ye crew"
       aspect_list_is_not_visible: "Yer crew list is hidden to others in crew"
       aspect_list_is_visible: "Yer crew list is visible to others in crew"
       confirm_remove_aspect: "Are ye sure ye wants t' scuttle this crew?"
+      done: "Done, matey"
       make_aspect_list_visible: "make crew list visible?"
       remove_aspect: "Fire this crew"
+      rename: "rename"
+      update: "update"
+      updating: "updatin'"
     few: "%{count} crews"
     helper:
       are_you_sure: "Are ye sure ye want t' scuttle this crew?"
       aspect_not_empty: "Crew not empty"
+      remove: "scuttle"
     index:
-      handle_explanation: "This is yer diaspora id. Like an email address, you can give this to scallywags to reach you."
+      diaspora_id:
+        content_1: "Ye ship name be:"
+        content_2: "Give it to anyone 'n they'll be able to find ye on diaspora*. Yargh."
+        heading: "diaspora* ID"
+      donate: "Give some dubloons!"
+      handle_explanation: "This is yer diaspora id. Like a ship name, ye can give this to mates to reach ye."
       help:
+        do_you: "Do ye:"
+        email_feedback: "%{link} yer feedback, if ye prefer"
+        feature_suggestion: "... do ye have a %{link} suggestion?"
+        find_a_bug: "... ye find a %{link}?"
+        have_a_question: "do ye have a %{link}?"
         here_to_help: "Diaspora community is here to help!"
+        need_help: "S.O.S."
+        tag_bug: "blunder"
+        tag_feature: "addition"
+        tag_question: "wanna know somethin'!"
+      introduce_yourself: "This be yer sea. Make yerself acquainted ye bucko."
+      new_here:
+        follow: "Follow %{link} 'n welcome new mateys 't diaspora*!"
+        learn_more: "Learn more matey"
+        title: "Welcome New Buccaneers"
       no_contacts: "No mateys"
+      no_tags: "+ Find an interestin' somethin' t' follow"
+      people_sharing_with_you: "Buccaneers sharin' with ye"
+      post_a_message: "send a letter"
+      services:
+        content: "Ye can connect the following services to diaspora*:"
+        heading: "Connect ye services"
+      unfollow_tag: "Stop followin' #%{tag}"
+      welcome_to_diaspora: "Welcome to diaspora*, %{name}. Ye old seadog!"
     many: "%{count} crews"
+    move_contact:
+      error: "Problem moving mate: %{inspect} matey!"
+      failure: "didn't work %{inspect} ye scallywag!"
+      success: "Matey moved to new crew!"
     new:
+      create: "Forge"
       name: "Name"
     no_contacts_message:
+      community_spotlight: "crew spotlight"
+      or_spotlight: "Or ye can share with %{link}"
       try_adding_some_more_contacts: "You can search (top) or invite (right) more mateys."
+      you_should_add_some_more_contacts: "Ye should add some more contacts!"
+    no_posts_message:
+      start_talking: "None of yer mates has said anything yet!"
     one: "1 crew"
     other: "%{count} crews"
     seed:
@@ -63,36 +146,133 @@ en_pirate:
       family: "Kin"
       friends: "Mateys"
       work: "Shipmates"
+    selected_contacts:
+      manage_your_aspects: "Manage ye crew."
+      no_contacts: "Ye don't have any mates here yet!"
+      view_all_community_spotlight: "See all crew spotlight"
+      view_all_contacts: "View all mateys"
+    show:
+      edit_aspect: "edit crew"
+    two: "%{count} crews"
+    update:
+      failure: "Yer crew, %{name}, had too many words, YARGH!"
+      success: "Yer crew, %{name}. has been edited matey!"
+    zero: "Ye have no crews! Yargh!"
+  back: "Backs"
+  blocks:
+    create:
+      failure: "Could not send'em to the brig!"
+      success: "Alright mate, ye wont see that scallywag in yer sea again. #walkedtheplank!"
+    destroy:
+      failure: "Couldnt stop ignorin' that scallywag."
+  bookmarklet:
+    explanation: "Post to diaspora* from anywhere by marking this link on yer map => %{link}"
+    heading: "Mark on ye map"
+    post_something: "Post 't d*"
+    post_success: "Sent! Closing!"
+  cancel: "Nevermind"
+  comments:
+    few: "%{count} comments mate"
+    many: "%{count} comments mate!"
+    new_comment:
+      comment: "Comm'nt"
+      commenting: "Commentin'"
+    one: "1 comment mate"
+    other: "%{count} comments mate"
+    two: "%{count} comments mate"
+    zero: "no comments mate"
   contacts:
-    few: "%{count} contacts"
+    create:
+      failure: "Failed 't create contact"
+    few: "%{count} mateys"
     index:
+      add_a_new_aspect: "Add a new crew"
       add_to_aspect: "Add more mateys to %{name}"
+      add_to_aspect_link: "add mates to %{name}"
       all_contacts: "All yer mateys"
+      many_people_are_you_sure: "Are ye sure ye want to start a private letter with more than %{suggested_limit} mateys? Posting to this crew may be a better way to talk to them."
       my_contacts: "Me Mateys"
       no_contacts: "No Mateys."
+      only_sharing_with_me: "Mateys only sharin' with me"
+      start_a_conversation: "Send a letter"
       title: "Mateys"
       your_contacts: "Yer Mateys"
-    many: "%{count} contacts"
-    one: "1 contact"
-    other: "%{count} contacts"
-    two: "%{count} contacts"
-    zero: "contacts"
+    many: "%{count} mateys"
+    one: "1 matey"
+    other: "%{count} mateys"
+    sharing:
+      people_sharing: "Buccaneers sharin' with ye:"
+    two: "%{count} mateys"
+    zero: "mates"
   conversations:
+    create:
+      fail: "Problem with letter, YARGH!"
+      sent: "Letter sent"
+    destroy:
+      success: "Letter successfully ripped up"
     helper:
       new_messages:
-        few: "%{count} new messages"
-        many: "%{count} new messages"
-        one: "1 new messages"
-        other: "%{count} new messages"
-        two: "%{count} new messages"
-        zero: "No new messages"
+        one: "1 new letter"
+        other: "%{count} new letters"
+        zero: "No new letters"
+    index:
+      inbox: "Pigeon's nest"
+      no_conversation_selected: "no message chosen, mate"
+      no_messages: "no letters"
+    new:
+      abandon_changes: "Abandon ye changes?"
+      sending: "Sendin'..."
+      to: "'t"
+    show:
+      delete: "scuttle and batten down the discussion"
+      reply: "send a letter back"
+      replying: "Replyin'"
+  delete: "Scuttle"
+  email: "Yer Carrier Pigeon (Email)"
+  error_messages:
+    helper:
+      correct_the_following_errors_and_try_again: "Correct ye blunders 'n try again ye scallywag!"
+      invalid_fields: "N'valid fields"
+  fill_me_out: "Fill me out arrr"
+  find_people: "Scour fer mates or treasures"
+  hide: "Cover"
+  invitations:
+    a_facebook_user: "A Facebook scallywag"
+    create:
+      already_contacts: "Ye are already mates with this buccaneer!"
+      already_sent: "Ye already invited this bucko."
+      no_more: "Ye have no more invitations."
+      own_address: "Ye can't send an invitation t' yer own address ye scallywag."
+      rejected: "Yer pigeon can't deliver to the followin' addresses: "
+      sent: "Invitations have been sent t': %{emails}"
+    edit:
+      accept_your_invitation: "Accept yer invitation"
+      your_account_awaits: "Yer ship awaits!"
+    new:
+      already_invited: "The following landblubbers have not accepted yer invitation:"
+      aspect: "Crew"
+      check_out_diaspora: "Avast ye! Check out diaspora*! ARRR!!"
+      if_they_accept_info: "if they accept, they will be added to the crew ye invited them."
+      invite_someone_to_join: "Invite a bucko t' diaspora*!"
+      language: "What do ye speak?"
+      personal_message: "Personal letter"
+      send_an_invitation: "Send n' invitation"
+      to: "Who's this goin' t'?"
   layouts:
     application:
+      back_to_top: "Back to crow's nest"
+      powered_by: "This ship be POWERED BY diaspora*"
+      public_feed: "Sea-wide diaspora* feed for %{name}"
       toggle: "toggl' mobile site"
+      whats_new: "what be new?"
+      your_aspects: "yer crews"
     header:
+      admin: "cap'n"
+      login: "check in with ye captain"
       logout: "Abandon Ship"
       profile: "Ye Ship"
       settings: "Ye Ships Rigging"
+      view_all: "Show all"
   likes:
     likes:
       people_dislike_this:
@@ -116,6 +296,10 @@ en_pirate:
         other: "%{count} likes"
         two: "%{count} likes"
         zero: "no likes"
+  limited: "Only ye crews"
+  more: "More!"
+  next: "next"
+  no_results: "Ye results be in davey jones' locker. Yargh!"
   notifications:
     also_commented:
       few: "%{actors} also commented on %{post_author}'s %{post_link}."
@@ -147,6 +331,7 @@ en_pirate:
         two: "%{count} new notifications"
         zero: "No new notifications"
     index:
+      and: "'n"
       and_others:
         few: "'n %{count} others"
         many: "'n %{count} others"
@@ -211,37 +396,136 @@ en_pirate:
       two: "%{actors} started sharin' with ye."
       zero: "%{actors} started sharin' with ye."
   notifier:
+    click_here: "look here"
+    comment_on_post:
+      reply: "Reply or see %{name}'s post >"
     confirm_email:
       click_link: "To activate yer new email %{unconfirmed_email} in a bottle coordinates , please click 'tis link."
+      subject: "Please activate yer new email %{unconfirmed_email}"
+    email_sent_by_diaspora: "This letter was sent by %{pod_name}. If ye'd like to stop gettin' letters like this,"
+    hello: "Hello %{name}! How are ye, matey?"
     liked:
-      liked: "%{name} just liked yer post"
+      liked: "%{name} just like'd yer post"
+      view_post: "Read post >"
+    mentioned:
+      mentioned: "mention'd ye in a post:"
+      subject: "%{name} has mention'd ye on diaspora*"
+    private_message:
+      reply_to_or_view: "Reply 't or read this conversation >"
     reshared:
-      reshared: "%{name} just reshared yer post"
+      reshared: "%{name} just reshare'd yer post"
+      view_post: "Read post >"
+    single_admin:
+      admin: "Yer diaspora* cap'n"
+      subject: "A message about yer diaspora* account:"
+    started_sharing:
+      sharing: "has start'd sharin' with ye!"
+      subject: "%{name} started sharin' with ye on diaspora*"
+      view_profile: "Look at %{name}'s ship"
+    to_change_your_notification_settings: "t' change yer notification settin's"
+  nsfw: "Not safe for lad's or lasses'"
   ok: "Aye"
+  or: "er"
+  password: "Secret pact"
+  password_confirmation: "Confirm yer secret pact!"
   people:
+    add_contact_small:
+      add_contact_from_tag: "add matey from tag"
     few: "%{count} people"
+    helper:
+      results_for: " results fer %{params}"
+    index:
+      looking_for: "Lookin' fer posts tagged %{tag_link}?"
+      no_one_found: "...and no landblubbers were found."
+      no_results: "Ahoy! Ye need 't search fer somethin'."
+      results_for: "Scallywags matchin' %{search_term}"
     many: "%{count} people"
     one: "1 person"
     other: "%{count} people"
+    person:
+      add_contact: "add mate"
+      pending_request: "Pendin' request"
+      thats_you: "That's ye!"
     profile_sidebar:
       born: "date o' birth"
+      edit_my_profile: "Edit me profile"
+      gender: "Ye gender"
+      location: "Sea I be in"
+      remove_contact: "remove matey"
+    show:
+      closed_account: "This ship has been sunk."
+      does_not_exist: "Matey does not exist! Arrr"
+      has_not_shared_with_you_yet: "%{name} has not shared any posts with ye yet!"
+      ignoring: "Yer ignorin' all posts from %{name}."
+      incoming_request: "%{name} wants 't share with ye"
+      not_connected: "Yer not sharin' with this scallywag."
+      return_to_aspects: "Return 't yer mateys page"
+      start_sharing: "start sharin'"
+      to_accept_or_ignore: "'t accept or deny it."
+    sub_header:
+      you_have_no_tags: "ye have no tags!"
     two: "%{count} people"
+    webfinger:
+      fail: "Sorry mate, we couldnt spot %{handle}."
     zero: "no people"
   photos:
+    comment_email_subject: "%{name}'s portrait"
+    create:
+      integrity_error: "Portrait hanging failed.  Are ye sure that was a portrait?"
+      runtime_error: "Portrait hanging failed.  Are ye sure yer hatches be battened down?"
+      type_error: "Portrait hangin' failed.  Are ye sure a portrait was added mate?"
+    destroy:
+      notice: "Portrait scuttled!"
+    edit:
+      editing: "Editin'"
     new:
       new_photo: "New Portrait"
+      post_it: "Fire!"
+    new_photo:
+      empty: "{file} be empty, choose yer files again without it mate."
+      invalid_ext: "{file} not be valid ye scallywag. Only {extensions} be allowed."
+      size_error: "{file} be 't large mate, the biggest file size be {sizeLimit}."
+    new_profile_photo:
+      or_select_one_existing: "or choose one from yer already existin' %{photos}"
+      upload: "Hang a new portrait in ye ship!"
+    photo:
+      view_all: "look at all of %{name}'s portraits"
+    show:
+      delete_photo: "Delete Portrait"
+      edit_delete_photo: "Edit portrait tale / get rid of portrait"
+      make_profile_photo: "make profile portrait"
+      update_photo: "Update Portrait"
+    update:
+      error: "Failed to change portrait cap'n!"
+      notice: "Portrait changed, cap'n!"
   posts:
     show:
+      destroy: "Scuttle"
+      not_found: "Sorry cap'n, we couldn't find that X."
       photos_by:
-        few: "%{count} photos by %{author}"
-        many: "%{count} photos by %{author}"
-        one: "One photo by %{author}"
-        other: "%{count} photos by %{author}"
-        two: "Two photos by %{author}"
-        zero: "No photos by %{author}"
+        one: "One portrait by %{author}"
+        other: "%{count} portraits by %{author}"
+        zero: "No portraits by %{author}"
+  previous: "previous"
+  privacy: "Ye privacy settin's"
+  privacy_policy: "Ye privacy policy"
+  profile: "Ye duffle"
   profiles:
     edit:
+      allow_search: "Allow fer scallywags to search fer ye within diaspora*"
+      your_bio: "Ye story"
       your_birthday: "Yer day o' birth"
+      your_gender: "Lad, lass, or something else?"
+      your_location: "Where ye be in the sea?"
+      your_name: "Yer name"
+      your_photo: "Ye portrait"
+      your_private_profile: "Ye private profile"
+      your_public_profile: "Ye public profile"
+      your_tags: "Describe yerself in 5 words, mate."
+      your_tags_placeholder: "like #treasure #ships #plunderin #sea #rum"
+    update:
+      failed: "Failed to update profile, matey!"
+  public: "The Sea can see this"
   reactions:
     few: "%{count} reactions"
     many: "%{count} reactions"
@@ -250,10 +534,25 @@ en_pirate:
     two: "%{count} reactions"
     zero: "0 reactions"
   registrations:
+    closed: "Signups be closed on this ship!"
+    create:
+      success: "Ye've joined diaspora*! YARGH!"
+    edit:
+      cancel_my_account: "Walk the plank"
+      leave_blank: "(leave blank if ye dont want 't change it)"
+      password_to_confirm: "we need yer current password 'to confirm yer changes)"
     new:
       create_my_account: "Create my account"
+      join_the_movement: "Join the pirate life, YARGH!"
       sign_up_message: "Social Networking with a <3"
   requests:
+    create:
+      sending: "Sendin'"
+      sent: "Ye've asked 't share with %{name}.  They should be able 't see it next time they come aboard diaspora*."
+    destroy:
+      error: "Select a crew!"
+      ignore: "The brig."
+      success: "Ye are now sharin'."
     helper:
       new_requests:
         few: "%{count} new requests!"
@@ -262,7 +561,12 @@ en_pirate:
         other: "%{count} new requests!"
         two: "%{count} new requests!"
         zero: "no new requests"
+    manage_aspect_contacts:
+      existing: "Existin' mates"
+      manage_within: "Manage mates within"
   reshares:
+    create:
+      failure: "There be an error resharin' this post."
     reshare:
       reshare:
         few: "%{count} reshares"
@@ -273,8 +577,26 @@ en_pirate:
         zero: "Reshare"
   search: "Scour"
   services:
+    create:
+      already_authorized: "A matey named %{diaspora_id} already authorized that %{service_name} record. ARR!"
+    failure:
+      error: "there be an error connectin' that service"
+    finder:
+      fetching_contacts: "diaspora* is populatin' yer %{service} mates, come back in a bit mate."
+      no_friends: "Couldnt find any Facebook mateys."
+      service_friends: "%{service} Mateys"
+    index:
+      connect_to_facebook: "Connect 't Facebook"
+      connect_to_tumblr: "Connect 't Tumblr"
+      connect_to_twitter: "Connect 't Twitter"
+      no_services: "Ye have not connected any services yet."
     inviter:
       click_link_to_accept_invitation: "Click this link t' accept yer invitation"
+  settings: "Settin's"
+  share_visibilites:
+    update:
+      post_hidden_and_muted: "%{name}'s be hidden, 'n notifications be muted."
+      see_it_on_their_profile: "If ye be wantin' 't see updates on this post, look at %{name}'s ship, ARRGH!"
   shared:
     aspect_dropdown:
       add_to_aspect: "Add to aspect"
@@ -285,23 +607,40 @@ en_pirate:
         other: "In %{count} aspects"
         two: "In %{count} aspects"
         zero: "Add to aspect"
+    footer:
+      your_aspects: "yer mateys"
+    public_explain:
+      logged_in: "on deck at %{service}"
+      new_user_welcome_message: "Use #hashtags t' classify yer posts n' find mateys.  Call out mateys with @Mentions"
+      outside: "Sea-wide messages will be available fer others outside of diaspora* t' see."
+      visibility_dropdown: "Use this dropdown t' change the visibility of yer post.  (It's good idear ye make this first one sea-wide.)"
     publisher:
+      all_contacts: "all mateys"
+      discard_post: "Scuttle post"
       new_user_prefill:
         i_like: "I be interested in %{tags}."
+        newhere: "NewMatey"
+      posting: "Firin!"
       share: "Fire!"
+      upload_photos: "Hang up portraits"
       whats_on_your_mind: "What be botherin' you?"
     stream_element:
+      connect_to_comment: "Connect t' this scallywag t' comm'nt on their post"
+      currently_unavailable: "comm'ntin currently not working"
       hide_and_mute: "Hide and Mute"
       shared_with: "Fired at: %{aspect_names}"
   status_messages:
-    too_long:
-      few: "Ye scallywag, make yer status messages less than %{count} characters"
-      many: "Ye scallywag,make yer status messages less than %{count} characters"
-      one: "Ye scallywag, make yer status messages less than %{count} character"
-      other: "Ye scallywag, make yer status messages less than %{count} characters"
-      two: "Ye scallywag, make yer status messages less than %{count} characters"
-      zero: "Ye scallywag,make yer status messages less than %{count} characters"
+    create:
+      success: "Ye've successfully mentioned: %{names}"
+    destroy:
+      failure: "Failed t' get rid of post"
+    helper:
+      no_message_to_display: "No message t' display."
+    new:
+      mentioning: "Mentionin': %{person}"
+    too_long: "{\"few\"=>\"Ye scallywag, make yer status messages less than %{count} characters\", \"many\"=>\"Ye scallywag,make yer status messages less than %{count} characters\", \"one\"=>\"Ye scallywag, make yer status messages less than %{count} character\", \"other\"=>\"Ye scallywag, make yer status messages less than %{count} characters\", \"two\"=>\"Ye scallywag, make yer status messages less than %{count} characters\", \"zero\"=>\"Ye scallywag,make yer status messages less than %{count} characters\"}"
   stream_helper:
+    hide_comments: "Hide all comm'nts"
     show_comments:
       few: "Show %{count} more comments"
       many: "Show %{count} more comments"
@@ -312,20 +651,44 @@ en_pirate:
   streams:
     aspects:
       title: "Yer Aspects"
+    aspects_stream: "Crews"
     mentions:
+      contacts_title: "Seadogs that mentioned ye"
       title: "Yer Mentions"
+    multi:
+      contacts_title: "Mateys in yer Sea"
+      title: "Sea"
     tags:
       contacts_title: "scallywags who dig these tags"
   tag_followings:
     create:
       failure: "Failed to follow: #%{name}"
+      none: "Ye cannot follow a blank tag!"
       success: "Successfully followin': #%{name}"
     destroy:
       failure: "Failed to stop followin': #%{name}"
-      success: "Successfully stopped followin': #%{name}"
+      success: "Avast! Successfully stopped followin': #%{name}"
+  tags:
+    show:
+      following: "Followin' #%{tag}"
+      nobody_talking: "Nobody be talkin' about %{tag} yet."
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      stop_following: "Stop Followin' #%{tag}"
+  terms_and_conditions: "Terms 'n conditions"
+  undo: "Undo?"
+  username: "Yer Username"
   users:
     edit:
       auto_follow_back: "Automatically follow back if someone follows ye"
       close_account:
+        dont_go: "Yo Ho HO! No need t' walk the plank!"
+        make_diaspora_better: "We want ye t' make diaspora* better arr, so ye should help before ye walk the plank and feed the fishes. If ye do want t' walk, we want ye t' be savvy on what happens next ye old seadog arrr."
+        mr_wiggles: "Mr Wiggles will be sad t' see ye go mate."
         what_we_delete: "We scuttle all of yer posts, profile data, as soon as humanly possible. Yer comments will hang around, but be associated with yer Diaspora Handle."
-      your_handle: "Yer diaspora id"
\ No newline at end of file
+      download_photos: "download ye portraits"
+      download_xml: "download ye booty"
+      show_community_spotlight: "Show Community Spotlight in sea"
+      stream_preferences: "Sea settin's"
+      your_email: "Yer email"
+      your_handle: "Yer diaspora id"
+  welcome: "Ahoy, matey!"
\ No newline at end of file
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 1add816ad..15e3225a2 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -160,7 +160,6 @@ en_shaw:
       my_contacts: "𐑥𐑲 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
       no_contacts: "𐑯𐑴 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕."
       only_sharing_with_me: "𐑴𐑯𐑤𐑦 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑥𐑰"
-      remove_person_from_aspect: "𐑮𐑦𐑥𐑵𐑝 %{person_name} 𐑓𐑮𐑳𐑥 \"%{aspect_name}\""
       start_a_conversation: "𐑕𐑑𐑸𐑑 𐑩 𐑒𐑪𐑯𐑝𐑼𐑕𐑱𐑖𐑩𐑯"
       title: "𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
       your_contacts: "𐑿𐑼 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
@@ -667,13 +666,7 @@ en_shaw:
       no_message_to_display: "𐑯𐑴 𐑥𐑧𐑕𐑩𐑡 𐑑 𐑛𐑦𐑕𐑐𐑤𐑱."
     new:
       mentioning: "𐑥𐑧𐑯𐑖𐑩𐑯𐑦𐑙: %{person}"
-    too_long:
-      few: "𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼𐑟"
-      many: "𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼𐑟"
-      one: "𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼"
-      other: "𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼𐑟"
-      two: "please make your status messages less than %{count} characters"
-      zero: "𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼𐑟"
+    too_long: "{\"few\"=>\"𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼𐑟\", \"many\"=>\"𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼𐑟\", \"one\"=>\"𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼\", \"other\"=>\"𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼𐑟\", \"two\"=>\"please make your status messages less than %{count} characters\", \"zero\"=>\"𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼𐑟\"}"
   stream_helper:
     hide_comments: "𐑣𐑲𐑛 𐑷𐑤 𐑒𐑪𐑥𐑩𐑯𐑑𐑕"
     show_comments:
diff --git a/config/locales/diaspora/en_valspeak.yml b/config/locales/diaspora/en_valspeak.yml
new file mode 100644
index 000000000..2e1f4fe3d
--- /dev/null
+++ b/config/locales/diaspora/en_valspeak.yml
@@ -0,0 +1,1286 @@
+#   Copyright (c) 2010-2013, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+
+en_valspeak:
+  _applications: "Appz"
+  _comments: "Txts"
+  _contacts: "BFFs <3"
+  _help: "Need halp!!"
+  _home: "ur place"
+  _photos: "Picz n selfiez"
+  _services: "Other socialz"
+  _terms: "boring legal stuff"
+  account: "Like ur account"
+  activerecord:
+    errors:
+      models:
+        contact:
+          attributes:
+            person_id:
+              taken: "it must be like... different among this homie's homiez. duh."
+        person:
+          attributes:
+            diaspora_handle:
+              taken: "is like... already taken. sry :\\"
+        poll:
+          attributes:
+            poll_answers:
+              not_enough_poll_answers: "Theres like... not enough stuff to select in the poll..."
+        poll_participation:
+          attributes:
+            poll:
+              already_participated: "uve like... already voted on this poll!! derp."
+        request:
+          attributes:
+            from_id:
+              taken: "is like...  the same as another thing.."
+        reshare:
+          attributes:
+            root_guid:
+              taken: "Umm, wtf r u doing? U already reshared that postie? Duh?"
+        user:
+          attributes:
+            email:
+              taken: "is like... already taken."
+            person:
+              invalid: "is like... not valid n junk."
+            username:
+              invalid: "is like... not valid n junk. u have 2 liek... use letterz, numbahz, and these thingz \"_\" but like witout the quote thingz..."
+              taken: "some1 like, already bought those shoez. sry bout that :\\"
+  admins:
+    admin_bar:
+      correlations: "Correlationz"
+      pages: "Pagies!"
+      pod_stats: "Pod statsss <3"
+      report: "Reportz"
+      sidekiq_monitor: "Technical thingy called Sidekiq monitor... wasnt that like... a phone once? OMG! IT WAS! :DD"
+      user_search: "Ppl search"
+      weekly_user_stats: "Weekly ppl stats"
+    correlations:
+      correlations_count: "Correlationz wit sign in count:"
+    stats:
+      2weeks: "2 weekz"
+      50_most: "ZOMG THE 50 MOST POPULAR TAGZ!!!"
+      comments:
+        one: "%{count} comment!!!(:"
+        other: "%{count} commentz!! :DDD"
+        zero: "%{count} commentz :("
+      current_segment: "So like, the current segment is like.. averagin <b>%{post_yest}</b> posties per usah, from <b>%{post_day}</b>"
+      daily: "Dailyy"
+      display_results: "Showin results from the like.. <b>%{segment}</b> segment"
+      go: "go!!"
+      month: "Month"
+      posts:
+        one: "%{count} postie"
+        other: "%{count} posties!"
+        zero: "%{count} posties :("
+      shares:
+        one: "%{count} share!(:"
+        other: "OMG u like have %{count} sharez!! :DDD"
+        zero: "%{count} sharez :c"
+      tag_name: "Tag Nameuh: <b>%{name_tag}</b> Countuh: <b>%{count_tag}</b>"
+      usage_statistic: "Usage staties"
+      users:
+        one: "%{count} ppl!(:"
+        other: "%{count} ppl!!! :DDD"
+        zero: "%{count} ppl :c"
+      week: "Week"
+    user_entry:
+      account_closed: "account trashed <3"
+      diaspora_handle: "d* handle"
+      email: "Emale"
+      guid: "gee yew eye dee"
+      id: "eye dee"
+      last_seen: "was like, last seen"
+      ? "no"
+      : "no way!"
+      nsfw: "#groody"
+      unknown: "dunno them"
+      ? "yes"
+      : totally
+    user_search:
+      account_closing_scheduled: "So like, the account of %{name} is waitin 2 b closed. it will b done in a few min, kay?"
+      add_invites: "add invites!! <3"
+      are_you_sure: "R u like... totally sure u wanna trash this account?"
+      close_account: "trash account"
+      email_to: "Email for the ppl 2 invite <3"
+      under_13: "show ppl undah 13 (COPPA)"
+      users:
+        one: "%{count} was like... found! :D"
+        other: "%{count} ppl found!! :D"
+        zero: "%{count} ppl found :("
+      view_profile: "look at profile"
+      you_currently:
+        one: "u only have 1 invite left %{link}"
+        other: "u have like... %{count} invites left %{link}"
+        zero: "u like... have no invites left %{link} :\\"
+    weekly_user_stats:
+      amount_of:
+        one: "Number of new ppl this week: %{count}"
+        other: "Number of new ppl this week: %{count}"
+        zero: "Number of new ppl this week: none :\\"
+      current_server: "So like... the current server date ish like... %{date}"
+  ago: "it was like... %{time} ago"
+  all_aspects: "All aspectz"
+  application:
+    helper:
+      unknown_person: "this person is like... not known... sry bout that :\\"
+      video_title:
+        unknown: "this video title is like... not known... sry bout that :\\"
+  are_you_sure: "R u like, for sure?"
+  are_you_sure_delete_account: "R u like, mental? U like, wanna close ur account? U should like stay! YOLO! Well if u do, remember, like, this CANT b undone. Kay?"
+  aspect_memberships:
+    destroy:
+      failure: "The person was not like... removed... sry bout that :\\"
+      no_membership: "like... we couldnt find the ppl u picked in that aspect... sry bout tht :\\"
+      success: "The person was like... removed.. n stuff..."
+  aspects:
+    add_to_aspect:
+      failure: "there was like... a problem addin bff to aspect."
+      success: "OMG! Movin them like, totally WORKED! <333"
+    aspect_contacts:
+      done_editing: "done like... changin stuff"
+    aspect_listings:
+      add_an_aspect: "+ Addn aspect"
+      deselect_all: "unhighlight everythin"
+      edit_aspect: "Like edit %{name}"
+      select_all: "highlight everythin"
+    aspect_stream:
+      make_something: "Make somethin.."
+      stay_updated: "stay like... up 2 date"
+      stay_updated_explanation: "Ur wall has like... ur BFFs n tagz n junk on it..."
+    contacts_not_visible: "Ppl in this group will like... not b able 2 c each other n stuff"
+    contacts_visible: "Ppl in this aspect will like.. b able 2 c each other n stuff"
+    create:
+      failure: "group makin failed."
+      success: "Ur new group %{name} was like... created"
+    destroy:
+      failure: "%{name} is like... not gone n so it like... cant b removed... sry bout tht :\\"
+      success: "%{name} is nao like... gone n stuff."
+    edit:
+      add_existing: "Add some1 that is like... already in ur aspectz"
+      aspect_list_is_not_visible: "Ppl in this aspect r like.. not able 2 c each other."
+      aspect_list_is_visible: "Ppl in this aspect r like.. able 2 c each other."
+      confirm_remove_aspect: "R u sure u want 2 like... remove this aspect?"
+      done: "K"
+      make_aspect_list_visible: "make ppl in this group like... able 2 see each other?"
+      manage: "Manage<3"
+      remove_aspect: "Git rid of this aspect"
+      rename: "bag this name.."
+      set_visibility: "Set look at prefs"
+      update: "make like... newer..."
+      updating: "makin like... newer..."
+    few: "%{count} aspectz"
+    helper:
+      are_you_sure: "R u sure u wanna trash this aspect? Like, RLLY sure? Totally SURE?"
+      aspect_not_empty: "Umm, the aspect is like... not empty..."
+      remove: "delete thing.."
+    index:
+      diaspora_id:
+        content_1: "ur diaspora* id is:"
+        content_2: "give it 2 ne1, except for creepers, n theyll b able to like... find u.."
+        heading: "ur like... id"
+      donate: "give like... free money"
+      handle_explanation: "This is like... ur name thingy. Its like an email... like.. that thing that my mom uses... she's like... so totally disgustin... she like, wheres mom jeans its like barf out! Gag me with a spoon! So like, neway, this will like... let ppl reach u n stuff."
+      help:
+        any_problem: "Havin drama?"
+        contact_podmin: "Contact the dude that manages ur pod!"
+        do_you: "do u... like:"
+        email_feedback: "%{link} ur feedback n junk"
+        email_link: "Emailll <3"
+        feature_suggestion: "... do u like... have a %{link} suggestion?"
+        find_a_bug: "... find a like... %{link}?"
+        have_a_question: "... have a like... %{link}?"
+        here_to_help: "diaspora ppl r here... yay!"
+        mail_podmin: "the email for the ppl who like... run this bitch"
+        need_help: "so like, wat?"
+        tag_bug: "OMG, i like... have an issue!"
+        tag_feature: "cool new thang"
+        tag_question: "q4u"
+        tutorial_link_text: "Tutorialz!!"
+        tutorials_and_wiki: "%{faq}, %{tutorial}, && %{wiki}: Halp for ur first stepz."
+      introduce_yourself: "so this is like, ur stream thing... its like facebooks wall thingy but like... less annoyin n wit like... less adz n picz of food and stuff... like, post sumthin n see if ne1 repliez... like... yeah"
+      keep_diaspora_running: "Keep d* from suckin wit a monthly donation! :D<3"
+      keep_pod_running: "So like, keep %{pod} from bein all slow n stupid by like... donatin monthly n stuff! <3(:"
+      new_here:
+        follow: "follow %{link} n like ... welcome new ppl 2 diaspora*!"
+        learn_more: "like... learn moar n stuff..."
+        title: "dude! u should like, totally whalecum the new diaspora ppl. its a blast like... yeah.."
+      no_contacts: "No BFFs :("
+      no_tags: "+ Find a tag 2 like... follow n junk"
+      people_sharing_with_you: "ppl sharin wit u"
+      post_a_message: "txt somethin >>"
+      services:
+        content: "U can like... connect the followin things 2 d*:"
+        heading: "connect like... other stuff.."
+      unfollow_tag: "Stop creepin on ppl who like... post stuff usin %{tag}"
+      welcome_to_diaspora: "OMG HEY! Like, welcome to diaspora*, %{name}. its pretty bitchin' n has electrolytes(;"
+    many: "%{count} aspectz"
+    move_contact:
+      error: "Like, there was drama when movin BFF: %{inspect}"
+      failure: "like... didn't work.. %{inspect}"
+      success: "BFF moved to new aspect"
+    new:
+      create: "Make like.. a new aspect"
+      name: "Name (only like... u can c it)"
+    no_contacts_message:
+      community_spotlight: "d* celebz"
+      or_spotlight: "Or u can like... share wit %{link}"
+      try_adding_some_more_contacts: "U can like... search or like... invite moar ppl."
+      you_should_add_some_more_contacts: "U should like... add some moar ppl!"
+    no_posts_message:
+      start_talking: "No 1z gossiped yet! Lame :\\"
+    one: "1 azpect"
+    other: "%{count} aspectz"
+    seed:
+      acquaintances: "Some ppl I sorta kno"
+      family: "Fam"
+      friends: "BFFs"
+      work: "Work bffs"
+    selected_contacts:
+      manage_your_aspects: "manage ur aspectz"
+      no_contacts: "u dont have ne ppl here yet"
+      view_all_community_spotlight: "C all the d* celebz"
+      view_all_contacts: "View all BFFs <3"
+    show:
+      edit_aspect: "like... edit aspect"
+    two: "%{count} aspectz"
+    update:
+      failure: "Ur group, %{name}, had like... a rlly long name.. so yeah... it wasnt saved... sry :\\"
+      success: "Ur aspect, %{name}, has like... not flipped out. So ur good!(:"
+    zero: "no aspectz"
+  back: "go back"
+  blocks:
+    create:
+      failure: "couldnt ignore the h8ter.  #lame"
+      success: "Aight, u wont c that weirdo on ur wall again. Ur welcome. ;)"
+    destroy:
+      failure: "I couldnt like... unblock that h8ter.  #couldntunblockh8terlame"
+      success: "Lets c wat they have 2 say!! #sayhaithar"
+  bookmarklet:
+    explanation: "post 2 d* from like.. anywhere by like... saving this thing => %{link}"
+    heading: "save page thingy"
+    post_something: "put it on d* n stuff"
+    post_success: "its like posted nao... byez! <3"
+  cancel: "Nvm"
+  comments:
+    few: "OMG! u got like %{count} commentz!!!"
+    many: "OMG! u got like %{count} commentz!!!"
+    new_comment:
+      comment: "say somethin"
+      commenting: "sayin somethin"
+    one: "OMG! u got a comment!!!"
+    other: "OMG! u got like %{count} commentz!!!"
+    two: "OMG! u got like %{count} commentz!!!"
+    zero: "like... no commentz :("
+  contacts:
+    create:
+      failure: "there was like... drama when makin a BFF"
+    few: "%{count} BFFs"
+    index:
+      add_a_new_aspect: "add a new aspect!"
+      add_contact: "Add BFF <3"
+      add_to_aspect: "add BFFs 2 %{name}"
+      add_to_aspect_link: "add BFFs 2 %{name}"
+      all_contacts: "All BFFs!!"
+      community_spotlight: "d* celebz <33"
+      many_people_are_you_sure: "R u like totally sure u want 2 like... start a privy convo with moar than %{suggested_limit} ppl? postin 2 this group may b a like... better way 2 talk 2 them.. yeah..."
+      my_contacts: "My BFFs!!! <333"
+      no_contacts: "u like... need 2 add sum ppl"
+      no_contacts_message: "OMG! u should like... check out %{community_spotlight}"
+      no_contacts_message_with_aspect: "OMG! u should like totally check out %{community_spotlight} or like... %{add_to_aspect_link}"
+      only_sharing_with_me: "only sharin wit me"
+      remove_contact: "Trash BFF :("
+      start_a_conversation: "start a like... convo"
+      title: "BFFs"
+      user_search: "Ppl stalk"
+      your_contacts: "ur BFFs"
+    many: "%{count} BFFs"
+    one: "1 BFF"
+    other: "%{count} BFFs"
+    sharing:
+      people_sharing: "ppl sharin wit u:"
+    spotlight:
+      community_spotlight: "d* celebz!! <3"
+      suggest_member: "Suggest a membah!!(:"
+    two: "%{count} BFFs"
+    zero: "BFFs"
+  conversations:
+    conversation:
+      participants: "Ppl participatin"
+    create:
+      fail: "bad txt"
+      no_contact: "Umm HELLO, u need 2 like, add them first! Duh!"
+      sent: "txt sent"
+    destroy:
+      success: "there was like... no drama when removin message! tubular!!"
+    helper:
+      new_messages:
+        one: "1 new txts! ZOMG!!!"
+        other: "%{count} new txts! ZOMG!!!"
+        zero: "No new txts :("
+    index:
+      conversations_inbox: "Convos - Inbox"
+      create_a_new_conversation: "start a new convo"
+      inbox: "Txts <3"
+      new_conversation: "New convo"
+      no_conversation_selected: "no convo picked :\\"
+      no_messages: "therez like... no messagez :( </3"
+    new:
+      abandon_changes: "nvm?"
+      send: "txt"
+      sending: "txtin..."
+      subject: "topic"
+      to: "2"
+    new_conversation:
+      fail: "Bad txt"
+    show:
+      delete: "get rid of n like... block the convo"
+      reply: "txt bak"
+      replying: "txtin bak..."
+  date:
+    formats:
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
+  delete: "Trash"
+  email: "thing b4 txtin like i think its called like email er sumthin?"
+  error_messages:
+    helper:
+      correct_the_following_errors_and_try_again: "so much drama! chillax n try again, k?"
+      invalid_fields: "not the like... rite fieldz..."
+    login_try_again: "Plz <a href='%{login_link}'> like login</a> n like... try again. Kthx <3"
+    post_not_public: "Umm, the postie u r tryin 2 look at is like... not public! derrp"
+    post_not_public_or_not_exist: "So like, the postie u r tryin to look at is not public or it like.. doesnt exist. sry bout tht :\\"
+  fill_me_out: "Like, put ur txt into here like, K?"
+  find_people: "find new BFFs or #stuff"
+  help:
+    account_and_data_management:
+      close_account_a: "Go like.. 2 the bottom of ur settins page n click the Trash Account button."
+      close_account_q: "how do i like... trash my account?"
+      data_other_podmins_a: "So like, once u r sharin wit some1 on anotha pod, ne posties u share wit them n a copy of ur profile stuff r put on their pod, n r accessible 2 that pod'z database keeper... person.. thing. When u trash a postie err profile content is is trashed from ur pod n ne other podz where it was stored. YAY! <3"
+      data_other_podmins_q: "So like, can the ppl of other pods see my stuff? D:"
+      data_visible_to_podmin_a: "Convos between podz is like... super top secret... like... pinky promise not tell ne1. but like... the stuff on the pod is like... not top secret. the person who like, manages ur pod n stuff can like.. see everythin u put on it which is like... wat FB does like... constantlay. totally freaking lame, right? but theres like this cool part of d* where u can run like ur OWN pod n like thats more private n stuff cuz u like control everythin. freakin sick nasty right? :DDD"
+      data_visible_to_podmin_q: "so like... how much of my stuff can the ppl who run this pod like... see? #creepedout"
+      download_data_a: "ya. at like... the bottom of the account tab thingy in ur like... settins page there r like... 2 buttons for dling ur stuff."
+      download_data_q: "can I like... dl a copy of all my stuff on my account?"
+      move_pods_a: "so like, in the future, u will like... b able 2 export ur account from a pod n like... import it on another but this is like, not possible right nao. sry bout that. but u could like.. always open another account n add ur BFFs 2 groups on that new account, n like... ask them 2 add ur new account 2 their groups. K?"
+      move_pods_q: "So like, how do I move my account from one pod 2 another one? :o"
+      title: "Account n stuff management"
+    aspects:
+      change_aspect_of_post_a: "Nope, butt u can always like... make a new postie wit the same stuff and post eet 2 a different aspect. c:"
+      change_aspect_of_post_q: "So like, once ive posted somethin, can i like.. change the aspect(z) that can like.. see it? :o"
+      contacts_know_aspect_a: "nah. they cant."
+      contacts_know_aspect_q: "do like... my BFFs kno which aspects i like.. put them in?"
+      contacts_visible_a: "If u like, pick this option then ppl from that aspect will like... b able 2 c who else is in it on ur profile under ur pic. its like... best 2 pick this option only if like... the ppl in the aspect all kno each other. but like, they still wont kno wat the aspect is called, kay?"
+      contacts_visible_q: "so like, what does \"make BFFs in this aspect able to be seen by each other\" mean? its moar confusin than my Math class."
+      delete_aspect_a: "So like, in ur list of aspectz on the left side of the main page thingy, point ur mouse at like... the aspect u wanna trash. click the adorable little 'edit' pencil thingy that comes up on the right. then like, click the trash button in the box that comes up. Kay?"
+      delete_aspect_q: "How do I like... trash a group?"
+      person_multiple_aspects_a: "Ya. Like, go 2 ur BFFs page n click on my BFFs. for each BFF u can like... use the menu on the right 2 add them 2 (or like... trash them from) as many aspectz as u want. or u can like... add them 2 a new aspect (or trash them from an aspect) by like.. clickin the aspect picker button on their profile. or u can even like... just move the pointer thingy over their name where u like.. c it n the stream, n a 'hover-card' will like... come up. u can change the aspectz they r in right tharrr <3"
+      person_multiple_aspects_q: "So like, can I add a person 2 many aspects?"
+      post_multiple_aspects_a: "Ya. When u like.. make a postie, use the aspect picker button 2 pick or unpick aspectz. Ur post will b shown to like... ALL the aspectz u pick. u could also like... pick the aspectz u wanna post 2 in the sidebar thingy.  when u post, the aspect(z) u picked in the list on teh left will automagically b picked in the aspect picker when u start 2 make a new postie <3 Kay? <3"
+      post_multiple_aspects_q: "So like, can i like, make a postie of some stuff n send it 2 many aspects @ once?"
+      remove_notification_a: "Nah"
+      remove_notification_q: "So like, if i trashed some1 from an aspect, err all of mah aspects, r they like... notified of this?"
+      rename_aspect_a: "Ya. In ur aspectz list thingy on the left side of the main page, like, point ur mouse at the aspect u wanna change the name of. then like, click the ADORABLE little 'edit' pencil thingy that like... comes up on the right. then liek, click rename in the box that comes up. yeah."
+      rename_aspect_q: "can i like, change the name of an aspect?"
+      restrict_posts_i_see_a: "ya. u have 2 like... click on My Aspects err whatever its called. its like in the sidebar thingy n then click individual (woah that weird was so big it made me lightheaded like that 1 time at band camp) aspects in the list thing 2 pick or not pick them. only like... the posties by ppl in the picked aspects will b seen by u on ur Wall n stuff."
+      restrict_posts_i_see_q: "so like, can i like... restrict the posties i c 2 just those from certain aspects?"
+      title: "Aspectz <33"
+      what_is_an_aspect_a: "Aspectz r like, the way u group ur BFFs on d*. an aspect is like... one of the faces u show 2 the world. sort of like wat brittany does. shes such a two-faced bitch fer sure. but like, on d* its like.. kay cuz liek u dont have 2 b showin ur grandpa ur like.. bikini picz which is like.. super gnarly... its totally tubular!!! :D"
+      what_is_an_aspect_q: "Wat is an aspect er group er whatev?"
+      who_sees_post_a: "so like, if u like... make a postie thats like... limited, it will only like, b seen by the ppl u have in ur aspect or group or groups err whatever. BFFs u have that like... arent in the aspect have like... no way of seein the postie, unless u set it 2 like... internet or public n junk. like, only like... posties that r set 2 public can b seen by ppl who u havent like... place in 1 of ur aspects. totally weird, right?"
+      who_sees_post_q: "when i like... make a postie 2 a aspect er whatever.. who can like.. see it?"
+    foundation_website: "d* foundation site! i lurve it!! <3"
+    getting_help:
+      get_support_a_hashtag: "ask in a public postie on d* usin the %{question} hashtag"
+      get_support_a_irc: "join us on %{irc} (Live, nerdy chat)"
+      get_support_a_tutorials: "check out our like, %{tutorials}"
+      get_support_a_website: "like, go to our %{link}"
+      get_support_a_wiki: "search teh %{link} :D!"
+      get_support_q: "So like, wat if mah queztion is like... not answered in this FAQ thingy? Where else can I like.. get support?"
+      getting_started_a: "OMG! ur in luck! :D. Try the %{tutorial_series} on our site thingy. It will like, take u step by step (Not the old TV show btw) through the registration process n like teach u all the thingys u need 2 kno bout usin d*! :D Like, totally try it! <3"
+      getting_started_q: "Halp!! i need sum like... simple halp 2 get me started!"
+      title: "Gettin halp"
+    getting_started_tutorial: "'Gettin started' tutorial seriez"
+    here: "like, here."
+    irc: "Nerd chat, gross"
+    keyboard_shortcuts:
+      keyboard_shortcuts_a1: "In the steam u can like use these keybored shorties:"
+      keyboard_shortcuts_li1: "j - to like... go to next postie"
+      keyboard_shortcuts_li2: "k - to like... go to last postie"
+      keyboard_shortcuts_li3: "c - comment on the current postie"
+      keyboard_shortcuts_li4: "l - <3 the current postie"
+      keyboard_shortcuts_q: "What key shorties r available?(:"
+      title: "Keypad shorties!!!"
+    markdown: "markydown"
+    mentions:
+      how_to_mention_a: "So like, you type this thing: @ n start typin their name. Then this like... little menu thingy will come up n like let u pick their name. But like, remember that u can like.. only mention ppl u've added n stuff. Totally lame sometimes :\\"
+      how_to_mention_q: "So like, how do I like... mention some1 when making a postie?"
+      mention_in_comment_a: "Mmm... nope. sry bout that :\\"
+      mention_in_comment_q: "So can I like... mention some1 in a comment? :o"
+      see_mentions_a: "Ya, click \"Mentionz\" in the like.. left column on ur home page. K?"
+      see_mentions_q: "Is there like, a way 2 c the posties that ive been mentioned in?"
+      title: "Mentionz!"
+      what_is_a_mention_a: "So like, a mention is a link 2 a persons profile that comes up in a postie. When some1 is mentioned they like... get a notie that bugs them when their doin stuff n gets them 2 come check it out."
+      what_is_a_mention_q: "Wats a mention?"
+    miscellaneous:
+      back_to_top_a: "Ya. After scrollin down a page, like, click on teh grey arrow tht comes up in the bottom right corner of ur web browser window thingy..."
+      back_to_top_q: "Is there like... a quick way 2 go back 2 the like... top of a page after i like... scroll down?"
+      diaspora_app_a: "There r many Android apps in like... super early makin. many r like.. not worked on projects n they liek dont work well wit the current version of d*. so like dont expect totally awesome stuff wit these. just use a browser on ur mobile thingy cuz weve made a like... mobile version of teh site which should work well on like... ALL things. there is currently no iOS app tho. sry bout tht :\\"
+      diaspora_app_q: "Is there like... a d* app for Android err iOS err Windows Phone? :o"
+      photo_albums_a: "Nah, not right nao. Butt u can like, look at a stream of their added pics from the Pics and Selfies section in their profile."
+      photo_albums_q: "R there like... pic or vid albumz?"
+      subscribe_feed_a: "Ya, butt this is like... stil not a rlly great workin feature n the formattin of the resultz is kinda groody... but if u like, wanna try it neway, go 2 some1s profile n click the feed button in ur browser, or u can copy pasta the profile link into a feed reader thingy. the resultin feed addy lookz like this: https://joindiaspora.com/public/usahname.atom -- D* uses Atom rather than RSS. JustFYI! <333"
+      subscribe_feed_q: "Can i like... subscribe 2 some1's public posties wit a feed reader thingy?"
+      title: "Misc. stuff"
+    pods:
+      find_people_a: "Invite ur frandz usin the email link in the sidebar thingy. Follow #tagz 2 discovah otherz that liek the same stuff u liek n add those who post thingz that u liek 2 2 an aspect. b for sure 2 liek, say ur #newhere in a public postie! <3"
+      find_people_q: "So like, I just joined a pod thingy. How can I like... find ppl 2 share wit?"
+      title: "Podz"
+      use_search_box_a: "So like, if u kno their fill d* ID (e.g. usahname@podname.org), u can find them by searchin for it. if u r on the same pod u can look for just their usahname. another thing u can do is look for them by their profile name. if lookin them up doesnt work the first time, try again. Kay?"
+      use_search_box_q: "How do I like... use the search box thingy 2 find ppl?"
+      what_is_a_pod_a: "So like, a pod is a compy runnin d* on it and it can liek talk 2 the rest of d*. \"Pod\" as in like, plants that have seedz, yes... liek that plant hehe... just liek how a server, computah thingy has a bunch of different accountz. therez lotz of podz n u can add BFFs from othah podz n talk wit them. n stuff."
+      what_is_a_pod_q: "Wats a pod?"
+    posts_and_posting:
+      char_limit_services_a: "in like, that case ur postie is like, limited 2 the smallah key pressed cont (twittar is liek, 140 n tumblar is liek, 1000), n the numbah of key presses u have left 2 use r display when that servie's icon is highlighted. u can stil post 2 these servies if ur postie is longer than their limit, but the txt is like.. smallar on those servies, kay?"
+      char_limit_services_q: "Wat is the amount of times for posties shared 2 other servies wit a smallar key pressed count?"
+      character_limit_a: "Like, a lot. Its like, 65,535 presses. Which is like.. totally rad cuz like... Twittar only lets u have like.. 140. totally lame..."
+      character_limit_q: "so wats the like, amount of times can i press a key in my posties?"
+      embed_multimedia_a: "U can like, usually just paste a link (like, http://www.youtube.com/watch?v=3dcxtEKShXA) into ur postie n the vid or sound will b in the thingy automagically. some of the sitez that r able 2 do this r: YT, Vimeo, soundcloud, flickah n a few moar. d* uses this thingy called oEmbed for this featuh. were supportin new sitez all the time. remembah 2 alwayz post simple, fill linkz: no shortend linkz && no weird symbolz after the link; n give it a lil time b4 u reload the page after postin 2 c the preview. Kthx!!! <33"
+      embed_multimedia_q: "How do I like... put a vid, tune, err other media stuff into a postie?"
+      format_text_a: "By usin like... %{markdown}. U can find teh full Markydown stuff %{here}. The preview button rlly halps, as u can c how ur txt will look b4 u post it."
+      format_text_q: "So how can I like, format txt in mah posties (bold, slanted txt, etc)?"
+      hide_posts_a: "So like, if u point ur mouse at the top of a postie, a cute lil X comes up on the right. click it 2 hide the postie n mute noties bout it. u can still c the post f u visit the profile of the person who made it.(:"
+      hide_posts_q: "So like, how do I like.. hide a postie? N how do I stop gettin noties bout a postie that i like.. commented on? :o"
+      image_text: "pic txt"
+      image_url: "pic linkk"
+      insert_images_a: "So like, click on the cute lil camera thingy 2 add a pic into a postie. Press the pic icon thingy again 2 add another pic, or u can like... pick multiple pics 2 add in 1 go at it. :D"
+      insert_images_comments_a1: "The followin Markydown code"
+      insert_images_comments_a2: "can b used 2 like.. put pics from the web into comments as well as in posties :)"
+      insert_images_comments_q: "Can I insert picz into commentz? :o"
+      insert_images_q: "How do I like... put picz into posties?"
+      size_of_images_a: "No :\\ Pics r resized automagically 2 fit the Wall err stream. Markydown doesnt have a code for specifyin a picz size n stuff."
+      size_of_images_q: "Can I like... customize the size of pics in posties or commentz?"
+      stream_full_of_posts_a1: "ur Wall err stream err whatever is like.. made up of 3 kindsa posties:"
+      stream_full_of_posts_li1: "Posties by ppl u r sharin wit, which come in 2 kinds: public posties n limited posties shared wit an aspect tht u r part of. 2 trash these posties from ur stream, just stop sharin wit the person."
+      stream_full_of_posts_li2: "Like, public posties containin 1 of the tagz tht u follow. 2 trash these, stop followin the tag. yeah..."
+      stream_full_of_posts_li3: "Public posties by ppl listed in the d* celebz thingy. these can b trashed by uncheckin' the \"show d* celebz in stream?\" thingy in the account tab of ur settins."
+      stream_full_of_posts_q: "So like, y is my streem full of posties from ppl idk n dont share wit?"
+      title: "Posties and postin"
+    private_posts:
+      can_comment_a: "Only like, d* ppl who r logged in that r in tht aspect can comment on or liek ur private postie."
+      can_comment_q: "Who can like.. comment on err liek mah private posties?"
+      can_reshare_a: "No1. Private posties r not resharable. d* ppl tht r logged in tht r in tht r in that aspect can just copy pasta it tho. sry bout tht :\\"
+      can_reshare_q: "So who can like... reshare my private posties?"
+      see_comment_a: "Only the ppl that the postie was shared wit (the ppl who r in the aspectz picked by the poster) can c its commentz n likez. "
+      see_comment_q: "when i like, comment on or liek a private postie, who can c it???"
+      title: "Privy posties!"
+      who_sees_post_a: "Only like, d* ppl who r logged in that r in tht aspect can c ur private postie."
+      who_sees_post_q: "So like, when i post a txt 2 an aspect (as in a private postie), who can c it???"
+    private_profiles:
+      title: "Private profilez!!!"
+      whats_in_profile_a: "ur like, bio, location, gendah, n bday. its the stuff in the bottom part of the edit profile page thingy. all this info is optional - its up 2 u whether u fill it in. logged in ppl who u have added 2 ur aspectz r the only ppl who can c ur private stuff. they will also like, c the private posties that r made to the aspectz they r in, mixed in with ur public posties, n when they look at ur profile. kay?"
+      whats_in_profile_q: "So like, wats in mah private profile? :o"
+      who_sees_profile_a: "ne logged in ppl that u r sharin wit (meanin, u have added them 2 1 of ur aspectz). howevah, ppl followin u, but u do not follow, will c only ur public info."
+      who_sees_profile_q: "Who can like... c my private profile?"
+      who_sees_updates_a: "Ne in ur aspectz can like... c the changes 2 ur private profile. "
+      who_sees_updates_q: "Who can like... c updates 2 mah private profile? :o"
+    public_posts:
+      can_comment_reshare_like_a: "Ne d* ppl who r logged in can do that. Yeah."
+      can_comment_reshare_like_q: "Who can like... comment on, reshare or like... like my public posties?"
+      deselect_aspect_posting_a: "unpickin aspectz doesnt affect a public postie. it will like, still come up in the streamz of all ur BFFs. 2 make a postie viewable only 2 certain aspectz, u need to like, pick those aspects from the button thingy under the liek, publisher thing. yeah."
+      deselect_aspect_posting_q: "So like, what happenz when i like... unpick 1 err moar aspectz when makin a public postie?"
+      find_public_post_a: "Ur like, public posties will come up in the streamz of ne1 followin u. if u included #tagz in ur public postie, ne1 followin those tagz will find ur posy in their streamz. every public postie also has a certain link that ne1 can look at, even if theyre not logged in - so public posties may b linked 2 directly from twittar, blogz, etc. public posts may like, also b indexed by google n other nosey search engine ppl. just fyi!!!"
+      find_public_post_q: "So how can like.. other ppl find my public postie?"
+      see_comment_reshare_like_a: "Ne like, logged in d* ppl n ne1 else on the interwebz can c it. like, commentz, likez, n reshares of public posties r also public n stuff. yeah."
+      see_comment_reshare_like_q: "So like, when i comment on, reshare or like... like a public postie, who can c it then? :o"
+      title: "Public posties!!!"
+      who_sees_post_a: "ne1 usin the internet can possibly c a postie u mark public, so make for sure u rlly do want ur postie 2 b public. its a great way of reachin out 2 the world tho."
+      who_sees_post_q: "When I like... post somethin publicly, like, who can c it?"
+    public_profiles:
+      title: "Public profilez!"
+      what_do_tags_do_a: "They halp ppl get 2 kno u. Ur profile pic will also come up on the left side of those certain tag pagez, along wit ne1 else who has them in their public profile n stuff."
+      what_do_tags_do_q: "Wat do the tagz on mah public profile do? Like, so confused.."
+      whats_in_profile_a: "Ur like, name, the 5 tagz u chose 2 describe urself, n ur pic. its the stuff in the top part of the edit profile page thingy. u can like, make this profile info as obvious or not obvious as u would like. Ur profile page also showz ne public posties u have made.."
+      whats_in_profile_q: "So like, wats in my public profile?"
+      who_sees_profile_a: "ne logged in d* usah, as well as the internetz, can c it. so liek, each profile has a link, so it may b linked 2 directly from other sites. it may b listed by search engine ppl."
+      who_sees_profile_q: "Who can like.. c my public profile? o_o"
+      who_sees_updates_a: "Ne1 can like... c changes if they go to ur profile page..."
+      who_sees_updates_q: "Who like... c's updates 2 my public profile?"
+    resharing_posts:
+      reshare_private_post_aspects_a: "Nah, its not possible 2 reshare a private postie. This is 2 respect the intention of teh original poster who only shared it wit a certain group of ppl. Kay? Kay, good."
+      reshare_private_post_aspects_q: "Can I like... reshare a private postie with like... only certain aspectz?"
+      reshare_public_post_aspects_a: "Nah, when u like, reshare a public postie, it automagically bcomes 1 of ur public posties. 2 share it wit certain aspectz, copy pasta the stuff of the postie in2 a new postie."
+      reshare_public_post_aspects_q: "so can i like, reshare a public postie wit only certain aspectz?"
+      title: "Resharin posties"
+    sharing:
+      add_to_aspect_a1: "lets say that Brittany adds Ben 2 an aspect, but Ben has not (yet) like, added Brittany 2 an aspect:"
+      add_to_aspect_a2: "this is called like.. asymmetrical sharin (big word, woah!!!). if n when Ben also adds Brittany 2 an aspect then it would bcome mutual sharin, wit both Brittany's n Ben's public posties and related private posties appearin in each otherz streamz, etc. "
+      add_to_aspect_li1: "So like, Ben will like, get a notie that Brittany has like... \"started sharin\" wit him. probs sharin an STD knowin her. that bitch."
+      add_to_aspect_li2: "Brittany will like...  start to c Ben's public posties in her stream. as well as THC... that bitch..."
+      add_to_aspect_li3: "Brittany will like... not c ne of Ben's private posties."
+      add_to_aspect_li4: "Ben will like... not c ne of Brittany's public or private posties in his stream either."
+      add_to_aspect_li5: "But liek, if Ben goes to Brittany's profile, then he will c Amy's private posties that that bitch makes to her aspects that hes in. as well as like.. her public posties which ne1 can c there)."
+      add_to_aspect_li6: "Ben will like... b able 2 c Brittany's private profile (bio, location, gender, bday, small boobs, etc)."
+      add_to_aspect_li7: "Brittany will like... come up under \"Only sharin wit me\" on Ben's BFFs page."
+      add_to_aspect_q: "so like, wat happenz when i add some1 2 1 of my aspectz? or when some1 adds me 2 1 of their aspectz?"
+      list_not_sharing_a: "Nah, butt u can c whether err not some1 is sharin wit u by lookin at their profile. if they r, the bar under their profile pic will be green; if not, itll b grey like mah kitty. U should liek, get a notie each time some1 starts sharin wit u. Kay?"
+      list_not_sharing_q: "is there liek, a list of ppl who i like, added 2 1 of mah aspectz, butt who have like, not added me to 1 of theirs yet?"
+      only_sharing_a: "These r ppl that have like, added u 2 1 of their aspectz, butt who r not (yet) in ne of ur aspectz. In other wordz, they r sharin wit you, butt u r not sharin wit them (that big werd asymmetrical sharin again). if u add them 2 an aspect, they will then show up under tht aspect n not under \"only sharin wit u\". Look above.(;"
+      only_sharing_q: "so like, who r the ppl listed in \"Only sharin wit meh\" on mah BFFs page?"
+      see_old_posts_a: "Nah. They will only b able 2 c new posties 2 tht aspect. they (n every1 else) can c ur older public posties on ur profile, n they may also c them in their stream."
+      see_old_posts_q: "So liek, when i add some1 2 an aspect, can they c oldr posties tht I have like, already posted 2 that aspect???"
+      title: "Sharin"
+    tags:
+      filter_tags_a: "Sry but this is like, not yet workin through d*, butt some %{third_party_tools} have like, been made tht might do this. YAY FREE SOFTWARE!!! :DDD"
+      filter_tags_q: "So liek, how can i liek, get rid of certain tagz from mah stream???"
+      followed_tags_a: "After like, lookin for a like, tag like, u can liek, click the button at like the top of teh tag'z page 2 like \"follow\" tht tag. then it will like, come up in ur list of like, followed tagz on the like left. clickin 1 of ur like followed tagz takez u 2 tht tag'z like, page thingy, so u can like, c recent postiez wit tht tag in it. u can like, click on #Followed Tagz 2 c a stream of postiez tht include 1 of ne of ur followed tagz. Kay? "
+      followed_tags_q: "Wat r \"#Followed Tagz\" neway? How do u like.. follow them?"
+      people_tag_page_a: "They r ppl who have picked tht tag to describe themselves in their public profile... so yeah like... yeah..."
+      people_tag_page_q: "So like, who r the ppl listed on the left side of a tag page thingy???"
+      tags_in_comments_a: "A tag added 2 a comment will still come up as a link 2 tht tag'z page, butt it will not make tht postie (or comment) come up on tht tag page. This only workz for tagz in postiez."
+      tags_in_comments_q: "Can I like... put tagz in commentz or just in like... posties..?"
+      title: "Tagz!!"
+      what_are_tags_for_a: "Tagz r a way to organize postiez by a certain topic usually. Lookin for a tag showz all postiez wit tht tah tht u can c (both public and private postiez). This letz ppl who liek the same topic find public postiez bout it."
+      what_are_tags_for_q: "Wat r tagz like... for?"
+    third_party_tools: "3rd partay toolz"
+    title_header: "Halp"
+    tutorial: "tutorial<3"
+    tutorials: "tutorialz!!"
+    wiki: "ZOMG D*'s OWN WIKIPEDIA!! :DDD"
+  hide: "Cover"
+  ignore: "Talk to the hand"
+  invitation_codes:
+    excited: "%{name} is like so TOTALLY excited 2 see u!! :D"
+  invitations:
+    a_facebook_user: "a like... fb usah"
+    check_token:
+      not_found: "invite token was like... not found :\\"
+    create:
+      already_contacts: "u r like.. already talkin 2 this ppl"
+      already_sent: "u like... already invited this ppl."
+      empty: "Plz enter at least 1 email addy, thx<3"
+      no_more: "u have like... no moar invites."
+      note_already_sent: "Invites have like... already been sent 2: %{emails}"
+      own_address: "Umm, u like... cant send an invite 2 ur own address.. duh."
+      rejected: "the followin email addys made drama: "
+      sent: "Ur invites have like... ben sent 2: %{emails}"
+    edit:
+      accept_your_invitation: "RSVP"
+      your_account_awaits: "ur account like.. awaits! OMG! TOTALLY!"
+    new:
+      already_invited: "The followin ppl didnt like accept ur invite:"
+      aspect: "Aspectt"
+      check_out_diaspora: "check out d* dude!!"
+      codes_left:
+        one: "So theres like... one invite left on this code. Yup."
+        other: "ZOMG! theres like %{count} invites left on this code... yeah..."
+        zero: "sry, theres like no invites left on this code. omg like totally lame.... yeah... wanna go 2 taco bell?(:"
+      comma_separated_plz: "U can enter lots of different email addies by usin commaz! <3"
+      if_they_accept_info: "if they like... accept, they will b added 2 the group u like invited them 2..."
+      invite_someone_to_join: "invite sum1 2 da partay!!!"
+      language: "what do u like... speak?"
+      paste_link: "Share this link wit ur BFFs 2 invite them 2 d*, or like... txt them the link n stuff."
+      personal_message: "sext(;"
+      resend: "Re-txt"
+      send_an_invitation: "send an invite"
+      send_invitation: "send invite"
+      sending_invitation: "Sendin invite, hold up..."
+      to: "2"
+  layouts:
+    application:
+      back_to_top: "Go back 2 the top"
+      powered_by: "this site is like... powered by diaspora*... far out!!"
+      public_feed: "the feed for %{name} that like... every1 can c n stuff"
+      source_package: "dl code n stuff.."
+      toggle: "make like... phone friendly..."
+      whats_new: "sup?"
+      your_aspects: "ur like... aspectz"
+    header:
+      admin: "the man"
+      blog: "bllllooog"
+      code: "code"
+      help: "Halp"
+      login: "check in"
+      logout: "Bounce"
+      profile: "Wall"
+      recent_notifications: "Recent noties! <3"
+      settings: "Settins"
+      view_all: "Look at all"
+  likes:
+    likes:
+      people_dislike_this:
+        one: "%{count} dislike :("
+        other: "%{count} dislikes :((("
+        zero: "no dislikes(:"
+      people_like_this:
+        one: "1 like!! OMG!!!"
+        other: "%{count} likes!!! OMFG!!!"
+        zero: "omg, theres like.. no likes :("
+      people_like_this_comment:
+        one: "%{count} like!!!"
+        other: "%{count} likez!!! :D"
+        zero: "no likes :("
+  limited: "Only ur BFFs can c these! OMG!"
+  more: "Moar"
+  next: "next!"
+  no_results: "no results found... lame..."
+  notifications:
+    also_commented:
+      one: "%{actors} also like... commented on %{post_author}'s postie %{post_link}!!"
+      other: "%{actors} also like... commented on %{post_author}'s postie %{post_link}!!"
+      zero: "%{actors} also like... commented on %{post_author}'s postie %{post_link}!!"
+    also_commented_deleted:
+      one: "%{actors} like... commented on a trashed postie."
+      other: "%{actors} like... commented on a trashed postie."
+      zero: "%{actors} like... commented on a trashed postie."
+    comment_on_post:
+      one: "%{actors} commented on ur postie %{post_link}. OMG!"
+      other: "%{actors} commented on ur postie %{post_link}. OMG!"
+      zero: "%{actors} like... commented on ur postie %{post_link}."
+    helper:
+      new_notifications:
+        one: "1 new notie!!"
+        other: "%{count} new noties!!! :D"
+        zero: "no new noties :("
+    index:
+      all_notifications: "All noties"
+      also_commented: "Also comment'd"
+      and: "n"
+      and_others:
+        one: "n 1 more"
+        other: "n like.. %{count} others"
+        zero: "n no1 else"
+      comment_on_post: "Comment on postie"
+      liked: "lieked"
+      mark_all_as_read: "i totally read them all"
+      mark_all_shown_as_read: "I read all of these..."
+      mark_read: "i liek, read this"
+      mark_unread: "umm, HELLO, i havent read this"
+      mentioned: "Mentioned"
+      notifications: "Noties!"
+      reshared: "Reshared! <3"
+      show_all: "show like, all"
+      show_unread: "show like, unread stuff"
+      started_sharing: "Started like... sharin"
+    liked:
+      one: "%{actors} has like... liked ur postie %{post_link}."
+      other: "%{actors} have like... liked ur postie %{post_link}."
+      zero: "%{actors} have like... liked ur postie %{post_link}."
+    liked_post_deleted:
+      one: "%{actors} like.. liked ur trashed postie."
+      other: "%{actors} like... liked ur trashed postie."
+      zero: "%{actors} like.. liked ur trashed postie."
+    mentioned:
+      one: "%{actors} has like.. mentioned u in the postie %{post_link}."
+      other: "%{actors} have like... mentioned u in the postie %{post_link}."
+      zero: "%{actors} have like... mentioned u in the postie %{post_link}. :("
+    mentioned_deleted:
+      one: "%{actors} like... mentioned u in a trashed postie."
+      other: "%{actors} like... mentioned u in a trashed postie."
+      zero: "%{actors} like... mentioned u in a trashed postie."
+    post: "postie!!"
+    private_message:
+      one: "%{actors} sent u a txt"
+      other: "%{actors} sent u a txt"
+      zero: "0 %{actors} sent u a txt"
+    reshared:
+      one: "%{actors} has like... reshared ur postie %{post_link} && stuff.."
+      other: "%{actors} have like... reshared ur postie %{post_link} && stuff.."
+      zero: "%{actors} have like... reshared ur postie %{post_link} && stuff.."
+    reshared_post_deleted:
+      one: "%{actors} like...  reshared ur trashed postie."
+      other: "%{actors} like... reshared ur trashed postie."
+      zero: "%{actors} like... reshared ur trashed postie."
+    started_sharing:
+      one: "%{actors} started sharin wit u."
+      other: "%{actors} started sharin wit u!!! :DDD"
+      zero: "%{actors} started sharin wit u :("
+  notifier:
+    a_post_you_shared: "a postie!!"
+    accept_invite: "RSVP ur d* invite!!"
+    click_here: "click this txt"
+    comment_on_post:
+      reply: "Reply or like... look at %{name}'s postie >"
+    confirm_email:
+      click_link: "2 like, activate ur like new email %{unconfirmed_email}, plz like, follow this link:"
+      subject: "Plz like... confirm ur new email %{unconfirmed_email}. K thx!!! <3"
+    email_sent_by_diaspora: "This email was like... sent by %{pod_name}. If u'd like... to like... stop gettin emails like this,"
+    hello: "OMG HEY! %{name}"
+    invite:
+      message: |-
+          Ohai!
+
+          U have like... been invited 2 join diaspora*!
+
+          Click this link thingy 2 like.. get started
+
+          [%{invite_url}][1]
+
+
+          <3,
+
+          The d* email robot!
+
+          [1]: %{invite_url}
+    invited_you: "%{name} invited u 2 d*!!!"
+    liked:
+      liked: "OMG! %{name} has like liked ur postie!!!"
+      view_post: "Look at postie >"
+    mentioned:
+      mentioned: "mentioned u in a postie:"
+      subject: "OMG! %{name} has like... mentioned u on d*"
+    private_message:
+      reply_to_or_view: "Reply 2 or like... look at this convo >"
+    report_email:
+      body: |-
+          Ohai!
+
+          the %{type} wit ID %{id} waz marked as groody. yeah.
+
+          [%{url}][1]
+
+          Plz like, check in on this, kay?
+
+
+          Kthxbye,
+
+          The d* email robot <3
+
+          [1]: %{url}
+      subject: "A new %{type} was like... marked as gag me with a spoon."
+      type:
+        comment: "commentt<3"
+        post: "postie"
+    reshared:
+      reshared: "%{name} like... reshared ur postie... tubular!!"
+      view_post: "Look at postie >"
+    single_admin:
+      admin: "ur dude that runs everythin"
+      subject: "A txt bout ur d* account:"
+    started_sharing:
+      sharing: "has like... started sharin wit u!"
+      subject: "ZOMG!! so like.. %{name} has TOTALLY started sharin wit u!!!(:"
+      view_profile: "Look at %{name}'s profile"
+    thanks: "thx,"
+    to_change_your_notification_settings: "2 change ur notie settins"
+  nsfw: "OMG! GROODY!"
+  ok: "For SURE"
+  or: "or like"
+  password: "Passwerd"
+  password_confirmation: "2 make sure u put in the right passwerd n junk"
+  people:
+    add_contact:
+      invited_by: "u were like... invited by"
+    add_contact_small:
+      add_contact_from_tag: "add BFF frum tag"
+    aspect_list:
+      edit_membership: "like.. edit aspect membership n junk"
+    few: "%{count} ppl"
+    helper:
+      is_not_sharing: "%{name} is not sharin wit u :("
+      is_sharing: "%{name} is sharin wit u!!"
+      results_for: " ur like.. resultz for %{params}"
+    index:
+      couldnt_find_them: "couldnt find them? thats totally lame :("
+      looking_for: "U like... lookin for posties tagged %{tag_link}?"
+      no_one_found: "...and nothin was like... found. sry bout that :\\"
+      no_results: "OMG! Hey! U like, need 2 search for sumthin."
+      results_for: "Ppl who match ur like... search thingy %{search_term}"
+      search_handle: "use their d* ID (usahname@pod.tld) to b for sure 2 find ur BFFs."
+      searching: "im lookin, brb... <3"
+      send_invite: "still nothin? :( send an invite!!! :DDD"
+    many: "%{count} ppl"
+    one: "1 personz"
+    other: "%{count} ppl"
+    person:
+      add_contact: "add BFF <3"
+      already_connected: "ur like... already connected n stuff"
+      pending_request: "waitin' on request"
+      thats_you: "OMG! thats u!!!! FAR OUT!"
+    profile_sidebar:
+      bio: "all about meee <333"
+      born: "Bday"
+      edit_my_profile: "change my stuff.."
+      gender: "dude or dudette or whatev..."
+      in_aspects: "in aspectz"
+      location: "my crib"
+      photos: "Picz n selfiez"
+      remove_contact: "delete BFF"
+      remove_from: "Do u like... wanna trash %{name} from %{aspect}?"
+    show:
+      closed_account: "this profile is gone dude..."
+      does_not_exist: "they dont like... exist :\\"
+      has_not_shared_with_you_yet: "%{name} has like... not shared ne posties wit u yet!"
+      ignoring: "U r like... ignorin all posties from %{name}."
+      incoming_request: "%{name} wants 2 like... share wit u"
+      mention: "Tag person"
+      message: "Txt"
+      not_connected: "ur not like... sharin wit this person... im sure!"
+      recent_posts: "Recent posties!!!"
+      recent_public_posts: "Recent posties that like... every1 can c!!!"
+      return_to_aspects: "bounce back 2 ur aspectz page... thingy..."
+      see_all: "C all!!!"
+      start_sharing: "start like... sharin"
+      to_accept_or_ignore: "2 like... accept or not accept.."
+    sub_header:
+      add_some: "like... add sum"
+      edit: "edit!"
+      you_have_no_tags: "Umm, u like have no tagz! Duh!"
+    two: "%{count} ppl"
+    webfinger:
+      fail: "sry, we cant find %{handle}"
+    zero: "no ppl"
+  photos:
+    comment_email_subject: "%{name}'s pic!"
+    create:
+      integrity_error: "The pic didnt like... upload.  R u like for sure that was a pic n not somethin else?"
+      runtime_error: "Pic didnt like... upload.  R u like for sure ur duck face is like.. ducky enough?"
+      type_error: "So like... ur pic wasnt added.  r u like... sure u actually like... added it?"
+    destroy:
+      notice: "Pic deleted :o"
+    edit:
+      editing: "Editin"
+    new:
+      back_to_list: "Go back to the like... list"
+      new_photo: "New pic!! OMG! -duck face-"
+      post_it: "OMG! post it!"
+    new_photo:
+      empty: "{file} is like... empty, plz pick the filez again witout that 1. kthx"
+      invalid_ext: "{file} is like... not able2 b uploaded cuz like... its not the right kinda file.. only like... these {extensions} r allowed... sry bout tht :\\"
+      size_error: "OMG {file} is 2 big!! the biggest i can take is like... {sizeLimit}.(;"
+    new_profile_photo:
+      or_select_one_existing: "or like... pick 1 from ur %{photos}"
+      upload: "Upload a new selfie!!! OMG!!"
+    photo:
+      view_all: "look at all of %{name}'z picz"
+    show:
+      collection_permalink: "the like... collection permalink... thing.."
+      delete_photo: "Delete pic"
+      edit: "edit picz and selfiez"
+      edit_delete_photo: "Edit pic topic / trash pic"
+      make_profile_photo: "make profile pic"
+      show_original_post: "Show da original postie"
+      update_photo: "Change Pic"
+    update:
+      error: "the pic wasnt like... edited... sry bout that :\\"
+      notice: "pic changed <3"
+  posts:
+    presenter:
+      title: "A postie from %{name}"
+    show:
+      destroy: "Trash ur pic"
+      not_found: "Sry, but we like... couldnt find that postie. :\\"
+      permalink: "like... permalink"
+      photos_by:
+        one: "One pic by %{author}"
+        other: "%{count} picz by %{author}"
+        zero: "No picz by %{author}"
+      reshare_by: "Reshare is like... by %{author}"
+  previous: "prevy!"
+  privacy: "OMG give me some privacy!"
+  privacy_policy: "Wat like... privacy u have"
+  profile: "Like ur profile"
+  profiles:
+    edit:
+      allow_search: "Do u wanna like... let ppl stalk u within d*?"
+      edit_profile: "Edit profie!!"
+      first_name: "First name? Kthx"
+      last_name: "Last name? Kthx"
+      nsfw_check: "Like, mark everythin i share as groody"
+      nsfw_explanation: "Groody (NSFW) is d*'s thingy to hide nudes n other groody stuff that like.. can get u in trouble. make sure u liek, check this thingy if u plan to post this kind of stuff a lot. Kthxbye <3"
+      nsfw_explanation2: "if u liek, choose 2 not pick this option, then liek, plz add the #nsfw or #groody tag thingy each time u share naughty stuff. Kay? Thx!!! <3"
+      update_profile: "Change ur stuff"
+      your_bio: "Ur bio. Kthx."
+      your_birthday: "Ur bday"
+      your_gender: "Ur gender? Kthx"
+      your_location: "Ur place"
+      your_name: "Ur name"
+      your_photo: "Ur pic"
+      your_private_profile: "Ur like... private profile..."
+      your_public_profile: "Ur like... profile where every1 can like... c it..."
+      your_tags: "Describe urself in like... 5 werdz"
+      your_tags_placeholder: "like #twilight #selfies #Belieber #iphone #mtv"
+    update:
+      failed: "Ur profie didnt update :("
+      updated: "Profie updated!!! <3"
+  public: "like, every1 can c this"
+  reactions:
+    one: "1 reaction!!(:"
+    other: "like... %{count} reactionz!!! :DDD"
+    zero: "0 reactionz"
+  registrations:
+    closed: "Signups r like... closed on here... sry bout that :\\ totally lame, right?"
+    create:
+      success: "u've joined d*!!! OMFG YAAAAAYYY!! :DDD"
+    edit:
+      cancel_my_account: "Trash mah account! Plz Kthx"
+      edit: "edit %{name} n junk"
+      leave_blank: "(dont like... type nething if u like.. dont wanna change it kthx)"
+      password_to_confirm: "(we liek... need ur current secret code thingy to make sure it like.. matches the other 1... kthx)"
+      unhappy: "Butthurt? :("
+      update: "Like... update"
+    invalid_invite: "OMG, dude, ur invite link is like... SOOOO old... like... gross. so like, sry but its no longer valid. Kthxbye<3"
+    new:
+      continue: "Continuah!"
+      create_my_account: "Make ur account!!! :DD"
+      diaspora: "<33 diaspora*"
+      email: "EMAIL<3"
+      enter_email: "Enter like... an email"
+      enter_password: "Enter a like... secret code thats like... moar than 6 keys n junk"
+      enter_password_again: "enter what u liek... entered b4"
+      enter_username: "So like.. pick a name that ppl will like... call u by.. n sry but u can only like.. use letters numbers n these things \"_\" but like.. witout the up n down lines n junk..."
+      hey_make: "OHAI,<br/>LIKE<br/>MAKE<br/>SOMETHING.<br/>YOLO!"
+      join_the_movement: "Join the awesomeness!!!"
+      password: "PASSWERD<3"
+      password_confirmation: "PASSWERD CONFIRMATION!!"
+      sign_up: "SIGN UP!!"
+      sign_up_message: "This is like.. social networkin with a <3"
+      submitting: "Submittin... just a sec..."
+      terms: "By creatin an account u like... accept the %{terms_link}."
+      terms_link: "more boring legal stuff"
+      username: "USERNAMEEE<3"
+  report:
+    comment_label: "Like, <b>Comment</b>:<br>%{data}"
+    confirm_deletion: "R u sure u wanna trash this?"
+    delete_link: "Trash item"
+    not_found: "<u>The postie/comment like, wasnt found. mayb it was liek.. trashed by the usah!</u>"
+    post_label: "<b>Postie</b>: %{title}"
+    reason_label: "Reazun: %{text}"
+    reported_label: "<b>Like, reported by</b> %{person}"
+    review_link: "Mark as like, reviewed n stuff"
+    status:
+      created: "OMG some1s in troubleee!! A report was made :o"
+      destroyed: "The postie went bye byez!"
+      failed: "Somethin screwed up. sry bout that :\\"
+      marked: "So umm, like, the report was like, marked as reviewed and stuff."
+    title: "Reportz Ovahview"
+  requests:
+    create:
+      sending: "Sendin"
+      sent: "U've like... asked 2 share wit %{name}.  They should like... c it the like.. next time they check into d* <3"
+    destroy:
+      error: "Plz pick an aspect!! Kthx<3"
+      ignore: "Ignored h8ter request"
+      success: "U r nao sharin!"
+    helper:
+      new_requests:
+        one: "new request!!!"
+        other: "%{count} new requests!!! :D"
+        zero: "no new requests :("
+    manage_aspect_contacts:
+      existing: "Existin BFFs"
+      manage_within: "Manage BFFs within"
+    new_request_to_person:
+      sent: "sent!!!"
+  reshares:
+    comment_email_subject: "%{resharer}'s like... reshare of %{author}'s postie"
+    create:
+      failure: "There was drama when resharin this postie :("
+    reshare:
+      deleted: "The original postie was like... deleted by the person who made it :("
+      reshare:
+        one: "1 reshare!!!"
+        other: "%{count} reshares!! :DD"
+        zero: "Like... reshare"
+      reshare_confirmation: "Like... reshare %{author}'z postie n stuff?"
+      reshare_original: "Reshare the like, original"
+      reshared_via: "like reshared via"
+      show_original: "Show the like... original"
+  search: "like look for stuff like #shoes!"
+  services:
+    create:
+      already_authorized: "A person wit like... the d* id %{diaspora_id} already like... enabled that %{service_name} account n stuff..."
+      failure: "So like... it failed n stuff... sry bout tht :\\"
+      read_only_access: "this is like.. read-only... plz try 2 like.. authorize again l8ter. kthx <3"
+      success: "so like... ur connected nao n stuff"
+    destroy:
+      success: "Yay! Trashed eet woo!!"
+    failure:
+      error: "there was drama when connectin 2 that thing :\\"
+    finder:
+      fetching_contacts: "d* is like... populatin ur %{service} BFFs, plz check back n liek... a few mins. Kthxbye <3"
+      no_friends: "No FB friendz found. :\\"
+      service_friends: "Ur like... %{service} BFFs"
+    index:
+      connect_to_facebook: "Connect to FB!!!"
+      connect_to_tumblr: "Connect to Tumblar!!!"
+      connect_to_twitter: "Connect to Twittar!!!"
+      connect_to_wordpress: "Connect 2 WP!"
+      disconnect: "like disconnect"
+      edit_services: "Edit servies!!!"
+      logged_in_as: "ur like... checkin in as"
+      no_services: "U have not like... connected ne stuff yet."
+      really_disconnect: "drop %{service}?"
+      services_explanation: "Connectin 2 servies gives u like... the ability 2 post ur posties 2 them as u write them in d*! :p"
+    inviter:
+      click_link_to_accept_invitation: "so like... follow this link 2 like... accept ur invite"
+      join_me_on_diaspora: "Chill wit me on diaspora*!"
+    remote_friend:
+      invite: "invite!!"
+      not_on_diaspora: "Not yet on d* :("
+      resend: "retxt"
+  settings: "Like ur settinz"
+  share_visibilites:
+    update:
+      post_hidden_and_muted: "%{name}'s has like... ben hidden, n noties have been like... made quiet."
+      see_it_on_their_profile: "If u like... want 2 c updates on this postie, go 2 %{name}'z profile n stuff."
+  shared:
+    add_contact:
+      add_new_contact: "add a new BFF"
+      create_request: "Find by d* id thing.."
+      diaspora_handle: "nick@pod.org"
+      enter_a_diaspora_username: "Enter a d* usernameeee:"
+      know_email: "do u liek... kno their email addy? U should like TOTALLY invite them!!"
+      your_diaspora_username_is: "Ur d* username is like: %{diaspora_handle}"
+    aspect_dropdown:
+      add_to_aspect: "Add BFF"
+      toggle:
+        one: "In like... %{count} aspect"
+        other: "In like... %{count} aspectz"
+        zero: "add BFF"
+    contact_list:
+      all_contacts: "All BFFs!!"
+    footer:
+      logged_in_as: "checkin in as %{name}"
+      your_aspects: "ur aspectz"
+    invitations:
+      by_email: "By email(:"
+      dont_have_now: "U dont like.. have ne right nao :\\ BUT moar invites r comin soon! yay! :D"
+      from_facebook: "From FB"
+      invitations_left: "so like... theres %{count} left"
+      invite_someone: "Invite ppl!"
+      invite_your_friends: "Invite ur BFFs!!"
+      invites: "Invites!!"
+      invites_closed: "so like... invites r closed for this pod... sry bout that :\\"
+      share_this: "Share this link like... via email, blogg, or social netz!"
+    notification:
+      new: "OMG new %{type} from %{from}!!!"
+    public_explain:
+      atom_feed: "Feed thingy"
+      control_your_audience: "Control ur ppl"
+      logged_in: "checked in 2 %{service}"
+      manage: "Like... manage servies ur like... connected 2"
+      new_user_welcome_message: "Like, use #hashtags 2 like... make ur posties bout somethin n find ppl who like... share ur interests.  call out awesome ppl wit @Mentions"
+      outside: "So like... these txts r able 2 b seen by the internet.."
+      share: "Sharrr"
+      title: "Set up other servies"
+      visibility_dropdown: "Use dis dropdown 2 change who can like... c ur postie.  (we like... recommend u make this first 1 2 where ne1 can c it.)"
+    publisher:
+      all: "allll"
+      all_contacts: "all ppl"
+      discard_post: "Trash postie"
+      formatWithMarkdown: "U can like... use %{markdown_link} to make ur postie totally awesome!!(:"
+      get_location: "Get ur place in the world!"
+      make_public: "make it so like... every1 can c it"
+      new_user_prefill:
+        hello: "OMG liek HEY PPL! im #%{new_user_tag} "
+        i_like: "im like... rlly into %{tags}. "
+        invited_by: "Thx for the invite, "
+        newhere: "Newbie<3"
+      poll:
+        add_a_poll: "Add a pole"
+        add_poll_answer: "Like, add an optionnnn"
+        option: "Option #1"
+        question: "q4u"
+        remove_poll_answer: "Trash option"
+      post_a_message_to: "Txt 2 %{aspect}"
+      posting: "Postin..."
+      preview: "Look at b4 its a postie"
+      publishing_to: "publish 2: "
+      remove_location: "Trash where u r"
+      share: "Share!!!"
+      share_with: "share wit"
+      upload_photos: "Upload picz!!"
+      whats_on_your_mind: "Sup dude?"
+    reshare:
+      reshare: "Liek... reshare"
+    stream_element:
+      connect_to_comment: "Connect 2 this peep 2 comment on their postie"
+      currently_unavailable: "commenting isnt workin right nao... sry bout that :\\"
+      dislike: "Thumbs down"
+      hide_and_mute: "Hide n like... make postie quiet"
+      ignore_user: "h8te %{name}"
+      ignore_user_description: "Block n delete h8ter from all aspectz?"
+      like: "Thumbs up"
+      nsfw: "This postie has lyke... been flagged as Groody by its author. %{link} n stuff"
+      shared_with: "Shared wit: %{aspect_names}"
+      show: "make seen"
+      unlike: "</3"
+      via: "like... via %{link}"
+      via_mobile: "via mobilez!!"
+      viewable_to_anyone: "This postie can b seen by ne1 on the internetz"
+  simple_captcha:
+    label: "enter teh stuff in the box:"
+    message:
+      default: "The captcha didnt match wit the pic D:"
+      failed: "so like, r u human? cuz u have to b in order to get past this :\\ sry bout tht. :\\"
+      user: "The secret pic n code werent the same D:"
+    placeholder: "like, enter in the stuff in the pic"
+  status_messages:
+    create:
+      success: "YAY! %{names} has been mentioned!! :D"
+    destroy:
+      failure: "so like... ur postie didnt get trashed... sry bout that :\\"
+    helper:
+      no_message_to_display: "No txt 2 display :("
+    new:
+      mentioning: "Mentionin: %{person}"
+    too_long: "Plz make ur status txt smaller than %{count} key presses. Right nao its like... %{current_length} key presses"
+  stream_helper:
+    hide_comments: "Cover up... like... all commentz"
+    show_comments:
+      one: "Show like... 1 moar comment"
+      other: "Show like... %{count} moar commentz"
+      zero: "No moar commentz :("
+  streams:
+    activity:
+      title: "My happenins"
+    aspects:
+      title: "My Aspectz"
+    aspects_stream: "Aspectz"
+    comment_stream:
+      contacts_title: "Ppl whose posties u commented on"
+      title: "Commented Posties"
+    community_spotlight_stream: "D* celebz!!"
+    followed_tag:
+      add_a_tag: "Add a like... tag"
+      contacts_title: "Ppl who <3 these tags"
+      follow: "Stalk"
+      title: "#Followed Tagz"
+    followed_tags_stream: "#Followed Tagz"
+    like_stream:
+      contacts_title: "Ppl whos posties u <3"
+      title: "Like Wall"
+    mentioned_stream: "@Mentionz"
+    mentions:
+      contacts_title: "Ppl who like... mentioned u"
+      title: "@Mentionz"
+    multi:
+      contacts_title: "Ppl on ur Wall"
+      title: "Wall"
+    public:
+      contacts_title: "Recent Posterz"
+      title: "Stuff every1 can like... c"
+    tags:
+      contacts_title: "Ppl who <3 this tag"
+      tag_prefill_text: "Umm, so the thing bout %{tag_name} is... "
+      title: "Posties tagged: %{tags}"
+  tag_followings:
+    create:
+      failure: "So like... followin %{name} didnt like... work.  R u like... already followin it?"
+      none: "Umm, u like... cant follow a blank tag! Duh."
+      success: "OMG! Ur nao followin #%{name}. YAAAAY! :DD"
+    destroy:
+      failure: "So like... there was drama when tryin 2 stop followin %{name}. Mayb u already like... stopped followin it?"
+      success: "So like, u rnt followin #%{name} nemore..."
+  tags:
+    show:
+      follow: "Follow like... #%{tag}"
+      followed_by_people:
+        one: "followed by one person!! ZOMG!"
+        other: "ZOMG! this is like, followed by %{count} ppl!!!"
+        zero: "no1 is followin u :("
+      following: "Followin #%{tag}"
+      nobody_talking: "No1 is like... talkin bout %{tag} yet :\\"
+      none: "Umm, so the like... empty tag doesnt like... exist :\\"
+      people_tagged_with: "Ppl tagged wit %{tag}"
+      posts_tagged_with: "Posties tagged wit #%{tag}"
+      stop_following: "Stop like... followin #%{tag}"
+  terms_and_conditions: "wat ur like... allowed to do and stuff"
+  undo: "do u wanna like.. undo?"
+  username: "ur like... name ppl will find u by or whatever"
+  users:
+    confirm_email:
+      email_confirmed: "Ur email %{email} is like... activated"
+      email_not_confirmed: "So like, ur email could not like... b activated for sum reason. Do u have the like... wrong link? D:"
+    destroy:
+      no_password: "Plz enter ur like... current passwerd 2 like... trash ur account."
+      success: "Ur account has like... been locked.  and it like.. may take like 20 mins for us 2 like... finish closin ur account..  thx for checkin out d*. byezz <33"
+      wrong_password: "so like, the passwerd u entered didnt match ur like... current 1... yeah."
+    edit:
+      also_commented: "some1 comments on a postie u've commented on"
+      auto_follow_aspect: "Group for automagically added BFFs:"
+      auto_follow_back: "Automagically share wit ppl who start sharin wit u"
+      change: "Changeee"
+      change_email: "Change email <3"
+      change_language: "Change what u read n speak n stuff"
+      change_password: "Change passwerd"
+      character_minimum_expl: "must b like... 6 buttons..."
+      close_account:
+        dont_go: "DUDE! WTF!? Dont leave!"
+        if_you_want_this: "If u like... rlly want this, type in ur passwerd below n click on 'Trash Account'"
+        lock_username: "So this will liek.. lock ur username thingy if u decided 2 sign back up n stuff."
+        locked_out: "U will like... get like.. automagically bounced n locked out of ur account."
+        make_diaspora_better: "We like... want u 2 help make d* bettah n stuff, so u should like.. help us out instead of leavin(: if u do wanna leave, we like... wanna make sure u know wat happens next. K?"
+        mr_wiggles: "Mr Wigglez will b sad :(( </3 </3"
+        no_turning_back: "So theres like, no turnin back nao. sry! <3"
+        what_we_delete: "We will like... trash all of ur posties n profile stuff asap. Ur comments will still hang out, but they would b associated wit ur d* ID instead of ur name. K?"
+      close_account_text: "Trash account"
+      comment_on_post: "some1 comments on ur postie"
+      current_password: "Current passwerd :3"
+      current_password_expl: "the 1 u like sign in wit... OMG"
+      download_photos: "dl mah picz"
+      download_xml: "dl my stuff"
+      edit_account: "Edit ur account <3"
+      email_awaiting_confirmation: "So we like... sent u a link 2 like activate %{unconfirmed_email}. Until u like... follow this link && activate this new addy, we will continue 2 like.. use ur original addy %{email}. Kay?"
+      export_data: "dl data!!!"
+      following: "Sharin settins"
+      getting_started: "New user prefies"
+      liked: "some1 likes ur postie"
+      mentioned: "u r mentioned in a postie"
+      new_password: "New passwerd(;"
+      photo_export_unavailable: "Pic downloadin not available... sry bout that :\\"
+      private_message: "u receive a sext :o"
+      receive_email_notifications: "Receive email noties when like:"
+      reshared: "some1 reshares ur postie"
+      show_community_spotlight: "Show d* celebs on Wall"
+      show_getting_started: "Show gettin started stuff"
+      someone_reported: "some1 told on some1"
+      started_sharing: "some1 starts sharin wit u"
+      stream_preferences: "Wall prefies"
+      your_email: "Ur emailll <3"
+      your_handle: "Ur d* ID"
+    getting_started:
+      awesome_take_me_to_diaspora: "Sweet! Take me 2 d*!!!"
+      community_welcome: "omg, like, thx for comin! <3"
+      connect_to_facebook: "We can like, speed things up a lil by %{link} 2 d*. This will like, pull ur name n pic n allow cross-posties <3"
+      connect_to_facebook_link: "hookin up ur FB account"
+      hashtag_explanation: "Ok so like, hashtags allow u 2 talk bout n follow ur interests.  theyre like... also a sweet way 2 find new ppl on d* :D"
+      hashtag_suggestions: "Try followin tags like #justinbeiber #16andpregnant #monster #xbox and stuff.."
+      saved: "Saved!!!(:"
+      well_hello_there: "Ohai thar! <3"
+      what_are_you_in_to: "Wat r u into?"
+      who_are_you: "Umm like, who r u?"
+    privacy_settings:
+      ignored_users: "Haters"
+      stop_ignoring: "Stop ignorin hater"
+      title: "Privie settins"
+    public:
+      does_not_exist: "Umm like... %{username} doesnt exist... yeah.."
+    update:
+      email_notifications_changed: "Ur email noties have been changed <3"
+      follow_settings_changed: "Stalkin settins changed <3"
+      follow_settings_not_changed: "so like, changin the follow settins didnt work.. sry bout that :\\"
+      language_changed: "Language changedddd <3"
+      language_not_changed: "Oh noes the language change like... didnt work! D:"
+      password_changed: "Passwerd changed!  U can nao check in wit ur new passwerd! <33 :D"
+      password_not_changed: "Ur passwerd like... didnt change... sry bout that :\\"
+      settings_not_updated: "Settins update didnt work... sry bout that :\\"
+      settings_updated: "Settins updated!!! <33"
+      unconfirmed_email_changed: "Ur email was like... changed. N nao it needs activation. K?"
+      unconfirmed_email_not_changed: "so like, the email change didnt work. sry bout that :\\"
+  webfinger:
+    fetch_failed: "so like... i couldnt fetch the like... webfinger profile thingy for %{profile_url}. sry bout that :\\"
+    hcard_fetch_failed: "so like, there was like... drama when gettin the hcard for %{account}. yeah, sry bout that :\\"
+    no_person_constructed: "No person could like... b made from this hcard thingy..."
+    not_enabled: "so like... webfinger doesnt seem 2 b enabled for %{account}'s host :\\"
+    xrd_fetch_failed: "there like... was drama when tryin 2 get the xrd from account %{account}..."
+  welcome: "Like, OMG, hey!"
+  will_paginate:
+    next_label: "next!! &raquo;"
+    previous_label: "&laquo; previe!!"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index ac5391cee..003609b2c 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -250,7 +250,6 @@ eo:
       no_contacts_message: "Esploru %{community_spotlight}"
       no_contacts_message_with_aspect: "Esploru %{community_spotlight} aŭ %{add_to_aspect_link}"
       only_sharing_with_me: "Nur koniganta al mi"
-      remove_person_from_aspect: "Forigi %{person_name} de \"%{aspect_name}\""
       start_a_conversation: "Komenci interparoladon"
       title: "Kontaktoj"
       your_contacts: "Viaj kontaktoj"
@@ -852,10 +851,7 @@ eo:
       no_message_to_display: "Neniu afiŝo montrenda."
     new:
       mentioning: "Mencianta: %{person}"
-    too_long:
-      one: "bonvolu igi viajn afiŝojn malpli longaj ol %{count} signoj"
-      other: "bonvolu igi viajn afiŝojn malpli longaj ol %{count} signoj"
-      zero: "bonvolu igi viajn afiŝojn malpli longaj ol %{count} signoj"
+    too_long: "{\"one\"=>\"bonvolu igi viajn afiŝojn malpli longaj ol %{count} signoj\", \"other\"=>\"bonvolu igi viajn afiŝojn malpli longaj ol %{count} signoj\", \"zero\"=>\"bonvolu igi viajn afiŝojn malpli longaj ol %{count} signoj\"}"
   stream_helper:
     hide_comments: "kaŝi ĉiujn komentojn"
     show_comments:
diff --git a/config/locales/diaspora/es-AR.yml b/config/locales/diaspora/es-AR.yml
index 5fa6039fc..292a899e5 100644
--- a/config/locales/diaspora/es-AR.yml
+++ b/config/locales/diaspora/es-AR.yml
@@ -279,6 +279,7 @@ es-AR:
     few: "%{count} contactos"
     index:
       add_a_new_aspect: "Añadir un nuevo aspecto"
+      add_contact: "Agregar contacto"
       add_to_aspect: "añade contactos a %{name}"
       add_to_aspect_link: "Agregar contactos a %{name}"
       all_contacts: "Todos los Contactos"
@@ -289,9 +290,10 @@ es-AR:
       no_contacts_message: "Echa un vistazo a %{community_spotlight}"
       no_contacts_message_with_aspect: "Echa un vistazo a %{community_spotlight} o %{add_to_aspect_link}"
       only_sharing_with_me: "Compartiendo solo conmigo"
-      remove_person_from_aspect: "Quitar a %{person_name} de \"%{aspect_name}\""
+      remove_contact: "Eliminar contacto"
       start_a_conversation: "Empezar una conversación"
       title: "Contactos"
+      user_search: "Búsqueda de usuarios"
       your_contacts: "Tus contactos"
     many: "%{count} contactos"
     one: "1 contacto"
@@ -1155,10 +1157,7 @@ es-AR:
       no_message_to_display: "No hay mensajes que mostrar."
     new:
       mentioning: "Mencionar a: %{person}"
-    too_long:
-      one: "Por favor, hacé que tu mensaje de estado tenga menos de %{count} caracter"
-      other: "Por favor, hacé que tu mensaje de estado tenga menos de %{count} caracteres"
-      zero: "Por favor, hacé que tu mensaje de estado tenga menos de %{count} caracteres"
+    too_long: "Por favor haz que tu mensaje de estado tenga menos de %{count} caracteres. En este momento el máximo permitido es de %{current_length} caracteres."
   stream_helper:
     hide_comments: "Ocultar comentarios"
     show_comments:
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 7c3c2f0de..62449fd2d 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -260,7 +260,6 @@ es-CL:
       no_contacts_message: "Echa un vistazo a %{community_spotlight}"
       no_contacts_message_with_aspect: "Echa un vistazo a %{community_spotlight} o %{add_to_aspect_link}"
       only_sharing_with_me: "Solo compartiendo conmigo"
-      remove_person_from_aspect: "Eliminar a %{person_name} de \"%{aspect_name}\""
       start_a_conversation: "Comenzar una conversación"
       title: "Contactos"
       your_contacts: "Tus Contactos"
@@ -1014,13 +1013,7 @@ es-CL:
       no_message_to_display: "No hay mensaje que mostrar."
     new:
       mentioning: "Mencionar a: %{person}"
-    too_long:
-      few: "Tu mensaje de estado debe tener menos de %{count} caracteres"
-      many: "Tu mensaje de estado debe tener menos de %{count} caracteres"
-      one: "Tu mensaje de estado debe tener menos de %{count} caracter"
-      other: "Tu mensaje de estado debe tener menos de %{count} caracteres"
-      two: "tu mensaje de estado tiene que tener menos de %{count} caracteres"
-      zero: "Tu mensaje de estado debe tener menos de %{count} caracteres"
+    too_long: "{\"few\"=>\"Tu mensaje de estado debe tener menos de %{count} caracteres\", \"many\"=>\"Tu mensaje de estado debe tener menos de %{count} caracteres\", \"one\"=>\"Tu mensaje de estado debe tener menos de %{count} caracter\", \"other\"=>\"Tu mensaje de estado debe tener menos de %{count} caracteres\", \"two\"=>\"tu mensaje de estado tiene que tener menos de %{count} caracteres\", \"zero\"=>\"Tu mensaje de estado debe tener menos de %{count} caracteres\"}"
   stream_helper:
     hide_comments: "ocultar todos los comentarios"
     show_comments:
diff --git a/config/locales/diaspora/es-CO.yml b/config/locales/diaspora/es-CO.yml
index 4936279a5..2b20cff67 100644
--- a/config/locales/diaspora/es-CO.yml
+++ b/config/locales/diaspora/es-CO.yml
@@ -191,7 +191,6 @@ es-CO:
       no_contacts_message: "Echa un vistazo a %{community_spotlight}"
       no_contacts_message_with_aspect: "Echa un vistazo a %{community_spotlight} o %{add_to_aspect_link}"
       only_sharing_with_me: "Compartiendo solo conmigo"
-      remove_person_from_aspect: "Eliminar a %{person_name} de \"%{aspect_name}\""
       start_a_conversation: "Inicia una conversación"
       title: "Contactos"
       your_contacts: "Tus Contactos"
diff --git a/config/locales/diaspora/es-MX.yml b/config/locales/diaspora/es-MX.yml
index d78f1f796..76e2f2193 100644
--- a/config/locales/diaspora/es-MX.yml
+++ b/config/locales/diaspora/es-MX.yml
@@ -262,7 +262,6 @@ es-MX:
       no_contacts_message: "Echa un vistazo a %{community_spotlight}"
       no_contacts_message_with_aspect: "Echa un vistazo a %{community_spotlight} o %{add_to_aspect_link}"
       only_sharing_with_me: "Compartiendo solo conmigo"
-      remove_person_from_aspect: "Eliminar a %{person_name} de \"%{aspect_name}\""
       start_a_conversation: "Inicia una conversación"
       title: "Contactos"
       your_contacts: "Tus contactos"
@@ -1016,10 +1015,7 @@ es-MX:
       no_message_to_display: "No hay mensaje que mostrar."
     new:
       mentioning: "Mencionar a: %{person}"
-    too_long:
-      one: "por favor, haz que tu mensaje de estado tenga un carácter menos"
-      other: "por favor, haz que tu mensaje de estado tenga %{count} caracteres menos"
-      zero: "por favor, haz que tu mensaje de estado tenga %{count} caracteres menos"
+    too_long: "{\"one\"=>\"por favor, haz que tu mensaje de estado tenga un carácter menos\", \"other\"=>\"por favor, haz que tu mensaje de estado tenga %{count} caracteres menos\", \"zero\"=>\"por favor, haz que tu mensaje de estado tenga %{count} caracteres menos\"}"
   stream_helper:
     hide_comments: "Ocultar todos los comentarios"
     show_comments:
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 89847b651..06973b3b7 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -282,6 +282,7 @@ es:
     few: "%{count} contactos"
     index:
       add_a_new_aspect: "Añade un nuevo aspecto"
+      add_contact: "Añadir contacto"
       add_to_aspect: "Añadir contactos a %{name}"
       add_to_aspect_link: "añade contactos a %{name}"
       all_contacts: "Todos los contactos"
@@ -292,9 +293,10 @@ es:
       no_contacts_message: "Echa un vistazo a la %{community_spotlight}"
       no_contacts_message_with_aspect: "Echa un vistazo a la %{community_spotlight} o %{add_to_aspect_link}"
       only_sharing_with_me: "Solo compartiendo conmigo"
-      remove_person_from_aspect: "Eliminar a %{person_name} de \"%{aspect_name}\""
+      remove_contact: "Eliminar contacto"
       start_a_conversation: "Inicia una conversación"
       title: "Contactos"
+      user_search: "Buscar usuarios"
       your_contacts: "Tus Contactos"
     many: "%{count} contactos"
     one: "1 contacto"
@@ -1128,10 +1130,7 @@ es:
       no_message_to_display: "No hay mensajes que mostrar."
     new:
       mentioning: "Menciones: %{person}"
-    too_long:
-      one: "por favor, escribe tu mensaje con menos de %{count} carácter"
-      other: "por favor, escribe tu mensaje con menos de %{count} caracteres"
-      zero: "por favor, escribe tu mensaje con menos de %{count} caracteres"
+    too_long: "Por favor, pon un mensaje de estado menor de %{count} caracteres. Actualmente ocupa %{current_length} caracteres."
   stream_helper:
     hide_comments: "Ocultar comentarios"
     show_comments:
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 2844213ed..b2f9b3e5f 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -252,7 +252,6 @@ eu:
       no_contacts_message: "Ikus ezazu %{community_spotlight}"
       no_contacts_message_with_aspect: "Ikus ezazu %{community_spotlight} edo %{add_to_aspect_link}"
       only_sharing_with_me: "Bakarrik nirekin harremanetan"
-      remove_person_from_aspect: "Ezabatu %{person_name} \"%{aspect_name}\"(e)tik"
       start_a_conversation: "Elkarrizketa bat hasi"
       title: "Adiskideak"
       your_contacts: "Zure Adiskideak"
@@ -861,13 +860,7 @@ eu:
       no_message_to_display: "Erakusteko mezurik ez."
     new:
       mentioning: "Aipatzen: %{person}"
-    too_long:
-      few: "mesedez, egin itzazu zure mezuak %{count} karaktere baino motzagoak"
-      many: "mesedez, egin itzazu zure mezuak %{count} karaktere baino motzagoak"
-      one: "mesedez, egin itzazu zure mezuak karaktere %{count} baino motzagoak"
-      other: "mesedez, egin itzazu zure mezuak %{count} karaktere baino motzagoak"
-      two: "mesedez egin itzazu zure mezuak %{count} laraktere baino motzagoak"
-      zero: "mesedez, egin itzazu zure mezuak %{count} karaktere baino motzagoak"
+    too_long: "{\"few\"=>\"mesedez, egin itzazu zure mezuak %{count} karaktere baino motzagoak\", \"many\"=>\"mesedez, egin itzazu zure mezuak %{count} karaktere baino motzagoak\", \"one\"=>\"mesedez, egin itzazu zure mezuak karaktere %{count} baino motzagoak\", \"other\"=>\"mesedez, egin itzazu zure mezuak %{count} karaktere baino motzagoak\", \"two\"=>\"mesedez egin itzazu zure mezuak %{count} laraktere baino motzagoak\", \"zero\"=>\"mesedez, egin itzazu zure mezuak %{count} karaktere baino motzagoak\"}"
   stream_helper:
     hide_comments: "Iruzkin guztiak ezkutatu"
     show_comments:
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 28843a55f..d77b05289 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -12,6 +12,7 @@ fi:
   _home: "Etusivu"
   _photos: "kuvat"
   _services: "Ulkoiset palvelut"
+  _terms: "Ehdot"
   account: "Käyttäjätili"
   activerecord:
     errors:
@@ -281,6 +282,7 @@ fi:
     few: "%{count} henkilöä"
     index:
       add_a_new_aspect: "Lisää näkymä"
+      add_contact: "Lisää henkilö"
       add_to_aspect: "lisää henkilöitä näkymään %{name}"
       add_to_aspect_link: "lisää henkilöitä näkymään %{name}"
       all_contacts: "Kaikki henkilöt"
@@ -291,9 +293,10 @@ fi:
       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}\""
+      remove_contact: "Poista kontakti"
       start_a_conversation: "Aloita keskustelu"
       title: "Henkilöt"
+      user_search: "Käyttäjähaku"
       your_contacts: "Kontaktisi"
     many: "%{count} henkilöä"
     one: "1 henkilö"
@@ -631,9 +634,9 @@ fi:
   no_results: "Tuloksia ei löytynyt"
   notifications:
     also_commented:
-      one: "Myös %{actors} kommentoi käyttäjän %{post_author} %{post_link}a."
-      other: "Myös %{actors} kommentoivat käyttäjän %{post_author} %{post_link}a."
-      zero: "Myös %{actors} kommentoi käyttäjän %{post_author} %{post_link}a."
+      one: "Myös %{actors} kommentoi käyttäjän %{post_author} julkaisua %{post_link}."
+      other: "Myös %{actors} kommentoivat käyttäjän %{post_author} julkaisua %{post_link}."
+      zero: "Myös %{actors} kommentoi käyttäjän %{post_author} julkaisua %{post_link}."
     also_commented_deleted:
       one: "%{actors} kommentoi poistettua julkaisuasi."
       other: "%{actors} on kommentoinut poistettua julkaisuasi."
@@ -664,6 +667,7 @@ fi:
       comment_on_post: "Kommentoi julkaisua"
       liked: "Tykätyt"
       mark_all_as_read: "Merkitse kaikki luetuiksi"
+      mark_all_shown_as_read: "Merkitse kaikki näytettäviksi luettuina"
       mark_read: "Merkitse luetuksi"
       mark_unread: "Merkitse lukemattomaksi"
       mentioned: "Mainittu"
@@ -683,10 +687,10 @@ fi:
     mentioned:
       few: "%{actors} ovat maininneet sinut %{post_link}ssä."
       many: "%{actors} ovat maininneet sinut %{post_link}ssä."
-      one: "%{actors} on maininnut sinut %{post_link}ssä."
-      other: "%{actors} ovat maininneet sinut %{post_link}ssä."
+      one: "%{actors} on maininnut sinut julkaisussa %{post_link}."
+      other: "%{actors} ovat maininneet sinut julkaisussa %{post_link}."
       two: "%{actors} ovat maininneet sinut %{post_link}ssä."
-      zero: "%{actors} on maininnut sinut %{post_link}ssä."
+      zero: "%{actors} on maininnut sinut julkaisussa %{post_link}."
     mentioned_deleted:
       one: "%{actors} mainitsi sinut poistetussa julkaisussa."
       other: "%{actors} mainitsivat sinut poistetussa julkaisussa."
@@ -952,6 +956,8 @@ fi:
       sign_up: "REKISTERÖIDY"
       sign_up_message: "Yhteisöpalvelu suurella ♥:llä"
       submitting: "Lähettää..."
+      terms: "Luomalla tilin hyväksyt %{terms_link}"
+      terms_link: "palvelun käyttöehdot"
       username: "KÄYTTÄJÄNIMI"
   report:
     comment_label: "<b>Kommentti</b>:<br>%{data}"
@@ -1139,10 +1145,7 @@ fi:
       no_message_to_display: "Ei näytettäviä viestejä."
     new:
       mentioning: "Mainitse: %{person}"
-    too_long:
-      one: "tilapäivityksen merkkimäärä voi olla enimmillään %{count}"
-      other: "tilapäivityksen merkkimäärä voi olla enimmillään %{count}"
-      zero: "tilapäivityksen merkkimäärä voi olla enimmillään %{count}"
+    too_long: "{\"one\"=>\"tilapäivityksen merkkimäärä voi olla enimmillään %{count}\", \"other\"=>\"tilapäivityksen merkkimäärä voi olla enimmillään %{count}\", \"zero\"=>\"tilapäivityksen merkkimäärä voi olla enimmillään %{count}\"}"
   stream_helper:
     hide_comments: "Piilota kaikki kommentit"
     show_comments:
diff --git a/config/locales/diaspora/fil.yml b/config/locales/diaspora/fil.yml
index eb86ba7c0..c45ba8b78 100644
--- a/config/locales/diaspora/fil.yml
+++ b/config/locales/diaspora/fil.yml
@@ -333,13 +333,7 @@ fil:
       hide_and_mute: "Hide and Mute"
       shared_with: "Fired at: %{aspect_names}"
   status_messages:
-    too_long:
-      few: "please make your status messages less than %{count} characters"
-      many: "please make your status messages less than %{count} characters"
-      one: "please make your status messages less than %{count} character"
-      other: "please make your status messages less than %{count} characters"
-      two: "please make your status messages less than %{count} characters"
-      zero: "please make your status messages less than %{count} characters"
+    too_long: "{\"few\"=>\"please make your status messages less than %{count} characters\", \"many\"=>\"please make your status messages less than %{count} characters\", \"one\"=>\"please make your status messages less than %{count} character\", \"other\"=>\"please make your status messages less than %{count} characters\", \"two\"=>\"please make your status messages less than %{count} characters\", \"zero\"=>\"please make your status messages less than %{count} characters\"}"
   stream_helper:
     show_comments:
       few: "Show %{count} more comments"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 9ceaa927c..a4112130d 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -102,7 +102,7 @@ fr:
       ? "yes"
       : Oui
     user_search:
-      account_closing_scheduled: "La fermeture du compte %{name} est plannifiée. Elle sera effectuée sous peu."
+      account_closing_scheduled: "La fermeture du compte %{name} est planifiée. Elle sera effectuée sous peu."
       add_invites: "ajouter des invitations"
       are_you_sure: "Êtes-vous sûr de vouloir fermer ce compte ?"
       close_account: "Fermer ce compte"
@@ -116,9 +116,9 @@ fr:
       you_currently: "Il vous reste actuellement %{user_invitation} invitations %{link}"
     weekly_user_stats:
       amount_of:
-        one: "nombre de nouveaux utilisateurs cette semaine: %{count}"
-        other: "nombre de nouveaux utilisateurs cette semaine: %{count}"
-        zero: "nombre de nouveaux utilisateurs cette semaine: aucun"
+        one: "%{count} nouvel utilisateur cette semaine."
+        other: "%{count} nouveaux utilisateurs cette semaine."
+        zero: "Aucun nouvel utilisateur cette semaine."
       current_server: "La date actuelle du serveur est %{date}"
   ago: "Il y a %{time}"
   all_aspects: "Tous les aspects"
@@ -178,10 +178,10 @@ fr:
     index:
       diaspora_id:
         content_1: "Votre identifiant diaspora* est :"
-        content_2: "Communiquez-le à tout le monde et ils pourront vous trouver sur Diaspora."
+        content_2: "Communiquez-le à tous les destinataires et ils pourront vous trouver sur Diaspora."
         heading: "Identifiant diaspora*"
       donate: "Faire un don"
-      handle_explanation: "Ceci est votre identifiant diaspora*. Comme une adresse de courrier électronique, vous pouvez le communiquer à d'autres personnes pour leur permettre de vous joindre."
+      handle_explanation: "Ceci est votre identifiant diaspora*. Comme une adresse de courrier électronique, communiquez-le à d'autres personnes pour leur permettre de vous contacter."
       help:
         any_problem: "Un problème ?"
         contact_podmin: "Contacter l'administrateur de votre pod !"
@@ -200,12 +200,12 @@ fr:
         tutorial_link_text: "Tutoriels"
         tutorials_and_wiki: "%{faq}, %{tutorial} & %{wiki} : Aide pour les débutants."
       introduce_yourself: "Ceci est votre flux. Rejoignez-nous et présentez-vous."
-      keep_diaspora_running: "Participez à un développement rapide de Diaspora avec un don mensuel !"
+      keep_diaspora_running: "Participez à un développement rapide de diaspora* par un don mensuel !"
       keep_pod_running: "Permettez à %{pod} de fonctionner rapidement et offrez une dose de café mensuelle à nos serveurs !"
       new_here:
         follow: "Suivez %{link} et souhaitez la bienvenue aux nouveaux utilisateurs de diaspora* !"
         learn_more: "En savoir plus"
-        title: "Bienvenue Nouvel Utilisateur"
+        title: "Accueillir les nouveaux"
       no_contacts: "Aucun contact"
       no_tags: "+ Trouver un tag à suivre"
       people_sharing_with_you: "Personnes partageant avec vous"
@@ -213,7 +213,7 @@ fr:
       services:
         content: "Vous pouvez connecter les services suivants à Diaspora :"
         heading: "Services connectés"
-      unfollow_tag: "Arrêter de suivre #%{tag}"
+      unfollow_tag: "Ne plus suivre #%{tag}"
       welcome_to_diaspora: "Bienvenue sur Diaspora*, %{name} !"
     many: "%{count} aspects"
     move_contact:
@@ -279,6 +279,7 @@ fr:
     few: "%{count} contacts"
     index:
       add_a_new_aspect: "Ajouter un nouvel aspect"
+      add_contact: "Ajouter ce contact"
       add_to_aspect: "ajouter les contacts à %{name}"
       add_to_aspect_link: "ajoutez les contacts à %{name}"
       all_contacts: "Tous les contacts"
@@ -289,9 +290,10 @@ fr:
       no_contacts_message: "Consultez %{community_spotlight}"
       no_contacts_message_with_aspect: "Consultez %{community_spotlight} ou %{add_to_aspect_link}"
       only_sharing_with_me: "Partage uniquement avec moi"
-      remove_person_from_aspect: "Enlever %{person_name} de \"%{aspect_name}\""
+      remove_contact: "Retirer ce contact"
       start_a_conversation: "Démarrer une conversation"
       title: "Contacts"
+      user_search: "Checher un contact"
       your_contacts: "Vos contacts"
     many: "%{count} contacts"
     one: "1 contact"
@@ -353,7 +355,7 @@ fr:
     login_try_again: "Merci de vous <a href='%{login_link}'>connecter</a> et d'essayer de nouveau."
     post_not_public: "Le message que vous essayez de voir n'est pas public !"
     post_not_public_or_not_exist: "Le message que vous essayez de voir n'est pas public, ou n'existe pas !"
-  fill_me_out: "Remplissez-moi"
+  fill_me_out: "Écrire ici"
   find_people: "Rechercher des personnes ou des #tags"
   help:
     account_and_data_management:
@@ -361,7 +363,7 @@ fr:
       close_account_q: "Comment puis-je supprimer mon compte ?"
       data_other_podmins_a: "Une fois que vous avez partagé avec des personnes d'un autre pod, chacun des messages que vous partagez avec eux ainsi qu'une copie des informations de votre profil sont stockés sur leur pod, et sont accessibles par l'administrateur de la base de données de ce pod. Quand vous supprimez un message ou des informations de votre profil ces données sont supprimées de votre pod et de tous les autres pods sur lesquels elles étaient stockées."
       data_other_podmins_q: "Est-ce que les administrateurs des autres pods peuvent voir mes informations ?"
-      data_visible_to_podmin_a: "La communication entre les pods est toujours chiffrée (en utilisant SSL et le propre chiffrage d'échange de diaspora*), mais le stockage des données sur les pods ne sont pas chiffrés. S'il le veut, l'administrateur de la base de données de votre pod (généralement la personne qui administre le pod) peut accéder à toutes les données de profil et à tous vos messages (comme c'est le cas pour la plupart des sites web qui stockent des données d'utilisateurs). Utiliser votre propre pod fournit plus de vie privée parce que vous avez le contrôle de l'accès à la base de données."
+      data_visible_to_podmin_a: "La communication entre les pods est toujours chiffrée (en utilisant SSL et le propre chiffrage d'échange de diaspora*), mais le stockage des données sur les pods n'est pas chiffré. S'il le veut, l'administrateur de la base de données de votre pod (généralement la personne qui administre le pod) peut accéder à toutes les données de profil et à tous vos messages (comme c'est le cas pour la plupart des sites web qui stockent des données d'utilisateurs). Utiliser votre propre pod garantit plus de vie privée parce que vous avez le contrôle de l'accès à la base de données."
       data_visible_to_podmin_q: "Quelle quantité de mes informations l'administrateur du pod peut-il voir ?"
       download_data_a: "Oui. En bas de l'onglet Compte de votre page de paramètres il y a deux boutons pour télécharger vos données."
       download_data_q: "Puis-je télécharger une copie de toutes les données contenues dans mon compte ?"
@@ -373,11 +375,11 @@ fr:
       change_aspect_of_post_q: "Une fois que j'ai publié quelque chose, puis-je changer les aspects qui peuvent le voir ?"
       contacts_know_aspect_a: "Non, ils ne peuvent en aucun cas voir le nom des aspects où vous les avez placés."
       contacts_know_aspect_q: "Est-ce que mes contacts savent dans quels aspects je les ai mis ?"
-      contacts_visible_a: "Si vous cochez cette option, les contacts de cet aspect pourront voir qui d'autres est présent dedans, sur votre page de profil en dessous de votre image. Il est préférable de choisir cette option uniquement si tous les contacts de cet aspect se connaissent mutuellement. Ils ne pourront toutefois pas voir le nom de l'aspect."
+      contacts_visible_a: "Si vous cochez cette option, les contacts de cet aspect pourront voir qui d'autre est présent dedans, sur votre page de profil en dessous de votre image. Il est préférable de choisir cette option uniquement si tous les contacts de cet aspect se connaissent mutuellement. Ils ne pourront toutefois pas voir le nom de l'aspect."
       contacts_visible_q: "Que signifie \"rendre les contacts dans cet aspect visibles entre eux\" ?"
       delete_aspect_a: "Dans la liste des aspects sur le côté gauche de la page principale, pointez votre souris sur l'aspect que vous désirez supprimer. Cliquez sur le petit crayon d'édition qui apparaît sur la droite. Clique sur le bouton de suppression dans la boîte qui apparait."
       delete_aspect_q: "Comment puis-je supprimer un aspect ?"
-      person_multiple_aspects_a: "Oui. Allez sur votre page de contacts et cliquez sur \"Mes Contacts\". Pour chaque contact, vous pouvez utiliser le menu sur la droite pour l'ajouter (ou le retirer) d'autant d'aspects que vous le souhaitez. Ou, vous pouvez l'ajouter à un nouvel aspect (ou le retirer d'un aspect) en cliquant sur le bouton de sélection des aspects sur leur page de profil. Ou, vous pouvez même juste passer le pointeur de votre souris sur leur nom là où vous le voyez dans le flux et une carte de visite va apparaître. Vous pouvez changer les aspects auxquels ils appartiennent directement dedans."
+      person_multiple_aspects_a: "Oui. Allez sur votre page de contacts et cliquez sur Mes Contacts. Pour chaque contact, vous pouvez utiliser le menu sur la droite pour l'ajouter (ou le retirer) d'autant d'aspects que vous le souhaitez. Ou, vous pouvez l'ajouter à un nouvel aspect (ou le retirer d'un aspect) en cliquant sur le bouton de sélection des aspects sur sa page de profil. Ou encore, vous pouvez même juste passer le pointeur de votre souris sur son nom là où vous le voyez dans le flux et un « cadre en superposition » va apparaître. Vous pouvez changer les aspects auxquels ils appartiennent directement dedans."
       person_multiple_aspects_q: "Puis-je ajouter une personne à plusieurs aspects ?"
       post_multiple_aspects_a: "Oui. Quand vous êtes en train d'écrire un message, utilisez le bouton de sélection des aspects pour sélectionner ou désélectionner des aspects. Votre message sera visible par tous les aspects que vous sélectionnez. Vous pouvez aussi sélectionner les aspects auxquels vous voulez partager dans le panneau latéral. Lorsque vous partagez, le(s) aspect(s) que vous avez sélectionné(s) dans la liste sur la gauche seront automatiquement sélectionnés dans le sélectionneur d'aspects quand vous écrivez un nouveau message."
       post_multiple_aspects_q: "Puis-je envoyer un message à plusieurs aspects à la fois ?"
@@ -385,12 +387,12 @@ fr:
       remove_notification_q: "Si je supprime quelqu'un de l'un de mes aspects, ou toutes les personnes d'un aspect, sont elles prévenues ?"
       rename_aspect_a: "Oui. Dans votre liste d'aspects sur le côté gauche de la page principale, placez votre souris sur l'aspect que vous voulez renommer. Cliquez sur le petit crayon \"éditer\" qui apparaît sur la droite. Cliquez sur \"renommer\" dans la boîte qui apparaît."
       rename_aspect_q: "Puis-je renommer un aspect ?"
-      restrict_posts_i_see_a: "Oui. Cliquez sur Mes Aspects dans la barre latérale puis cliquez sur des aspects individuels dans la liste pour les sélectionner ou les déselectionner. Seuls les messages des personnes de ces aspects apparaîtront dans votre flux."
+      restrict_posts_i_see_a: "Oui. Cliquez sur Mes Aspects dans la barre latérale puis cliquez sur l'un ou l'autre aspect dans la liste pour les sélectionner ou les retirer. Seuls les messages des personnes appartenant à ces aspects apparaîtront dans votre flux."
       restrict_posts_i_see_q: "Puis-je afficher uniquement les messages de certains aspects ?"
       title: "Aspects"
       what_is_an_aspect_a: "Les Aspects sont un moyen de grouper vos contacts sur diaspora*. Un Aspect est l'une des facettes que vous montrez au monde. Cela pourrait être qui vous êtes au travail, ou qui vous êtes pour votre famille, ou qui vous êtes pour les amis de votre club ou association."
       what_is_an_aspect_q: "Qu'est-ce qu'un aspect ?"
-      who_sees_post_a: "Si vous créez un message privé, il sera uniquement visible par les gens que vous avez placé dans cet aspect (ou les aspects, si vous le publiez à plusieurs aspects). Les contacts que vous avez et qui ne sont pas dans ces aspects n'ont aucun moyen de voir le message, sauf si vous l'avez rendu public. Seuls les messages publics seront visibles à quiconque ne sera pas placé dans vos aspects."
+      who_sees_post_a: "Si vous créez un message privé, il sera uniquement visible par les gens que vous avez placés dans cet aspect (ou les aspects, si vous le publiez à plusieurs aspects). Les contacts que vous avez et qui ne sont pas dans ces aspects n'ont aucun moyen de voir le message, sauf si vous l'avez rendu public. Seuls les messages publics seront visibles à quiconque ne sera pas placé dans vos aspects."
       who_sees_post_q: "Lorsque je publie un message dans un aspect, qui peut le voir ?"
     foundation_website: "site internet de la fondation diaspora"
     getting_help:
@@ -407,7 +409,7 @@ fr:
     here: "ici"
     irc: "IRC"
     keyboard_shortcuts:
-      keyboard_shortcuts_a1: "Dans le flux, vous pouvez utiliser les raccourcis clavier suivant :"
+      keyboard_shortcuts_a1: "Dans le flux, vous pouvez utiliser les raccourcis clavier suivants :"
       keyboard_shortcuts_li1: "j - Aller au message suivant"
       keyboard_shortcuts_li2: "k - Aller au message précédent"
       keyboard_shortcuts_li3: "c - Commenter le message courant"
@@ -416,7 +418,7 @@ fr:
       title: "Raccourcis clavier"
     markdown: "Markdown"
     mentions:
-      how_to_mention_a: "Tapez le symbole \"@\" et commencez à taper leur nom. Un menu déroulant devrait apparaître pour vous permettre de les choisir plus facilement. Notez qu'il est uniquement possible de mentionner des gens que vous avez ajouté à un aspect."
+      how_to_mention_a: "Tapez le symbole \"@\" et commencez à taper leur nom. Un menu déroulant devrait apparaître pour vous permettre de les choisir plus facilement. Notez qu'il est uniquement possible de mentionner des gens que vous avez ajoutés à un aspect."
       how_to_mention_q: "Comment puis-je mentionner quelqu'un lorsque je rédige un message ?"
       mention_in_comment_a: "Non, pas pour le moment."
       mention_in_comment_q: "Puis-je mentionner quelqu'un dans un commentaire ?"
@@ -430,9 +432,9 @@ fr:
       back_to_top_q: "Il y a t-il un moyen de rapidement revenir en haut d'une page après avoir atteint le bas de celle-ci ?"
       diaspora_app_a: "Il y a quelques applications Android encore dans les toutes premières phases de développement. Plusieurs sont des projets abandonnés depuis un peu de temps et ne marchent donc pas bien avec la version actuelle de diaspora*. N'en attendez pas trop pour le moment. Actuellement, la meilleure façon accéder à diaspora* à partir d'un téléphone portable est à travers un navigateur web car nous avons créé une version mobile du site qui devrait fonctionner correctement sur tous les appareils. Il n'y a pour l'instant aucune application pour iOS. Encore une fois, diaspora* devrait marcher correctement via votre navigateur web."
       diaspora_app_q: "Existe t-il une application diaspora* pour Android ou iOS ?"
-      photo_albums_a: "Non, pas actuellement. Cependant vous pouvez voir l'ensemble des images d'un utilisateurs à partir de la section Photos de la barre latérale de son profil."
+      photo_albums_a: "Non, pas actuellement. Cependant vous pouvez voir l'ensemble des images d'un utilisateur à partir de la section Photos de la barre latérale de son profil."
       photo_albums_q: "Il y a t-il des albums photos ou vidéos ?"
-      subscribe_feed_a: "Oui, mais ce n'est pas encore une fonctionnalité terminée et le formatage des résultats est encore un peu brute. Si vous voulez toutefois l'essayer, allez sur la page de profil de quelqu'un et cliquez sur le bouton de flux RSS de votre navigateur, ou vous pouvez copier l'URL du profil (ex : https://joindiaspora.com/people/somenumber, et le coller dans un lecteur de flux RSS. Le résultat du flux ressemble à ceci : https://joindiaspora.com/public/username.atom. Diaspora utilise Atom plutôt que RSS."
+      subscribe_feed_a: "Oui, mais cette fonctionnalité est encore imparfaite et le formatage des résultats reste assez rustique. Si vous voulez tout de même l'essayer, allez sur la page de profil de quelqu'un et cliquez sur le bouton de flux RSS de votre navigateur. Ou alors, vous pouvez copier l'adresse du profil (p. ex. https://joindiaspora.com/people/un-nombre) et la coller dans un lecteur de flux RSS. L'adresse de flux qui en résultera ressemblera à https://joindiaspora.com/public/nom-d-utilisateur.atom : en effet, diaspora* utilise Atom plutôt que RSS."
       subscribe_feed_q: "Puis-je m'inscrire aux messages publics d'une personne avec un lecteur de flux ?"
       title: "Divers"
     pods:
@@ -441,11 +443,11 @@ fr:
       title: "Pods"
       use_search_box_a: "Si vous connaissez leur identifiant diaspora* complet (ex : nomdutilisateur@nomdupod.org), vous pouvez les trouver en les recherchant avec. Si vous êtes sur le même pod vous pouvez les retrouver avec uniquement nomdutilisateur. Une alternative est de les rechercher par leur nom de profil (le nom que vous voyez à l'écran). Si une recherche ne fonctionne pas la première fois, réessayez un petit peu plus tard."
       use_search_box_q: "Comment dois-je utiliser le champ de recherche pour trouver quelqu'un en particulier ?"
-      what_is_a_pod_a: "Un pod est un serveur faisant tourner le logiciel diaspora* et connecté au réseau diaspora*. \"Pod\" est une métaphore pour le pot de plantes, chaque compte utilisateur étant une graine dans le pot. Il y a beaucoup de pods différents. Vous pouvez communiquer avec vos amis de la même manière peu importe le pod où ils sont. (Vous pouvez comparer un pod diaspora* à un fournisseur d'adresses email : il y a les pods publics, les pods privés, et avec quelques efforts vous pouvez installer le votre)."
+      what_is_a_pod_a: "Un pod est un serveur faisant tourner le logiciel diaspora* et connecté au réseau diaspora*. \"Pod\" est une métaphore pour le pot de plantes, chaque compte utilisateur étant une graine dans le pot. Il y a beaucoup de pods différents. Vous pouvez communiquer avec vos amis de la même manière, peu importe le pod où ils sont (vous pouvez comparer un pod diaspora* à un fournisseur d'adresses email : il y a les pods publics, les pods privés, et avec quelques efforts vous pouvez installer le vôtre)."
       what_is_a_pod_q: "Qu'est-ce qu'un pod ?"
     posts_and_posting:
       char_limit_services_a: "Dans ce cas votre publication est limitée au nombre minimum de caractères (140 pour Twitter; 1000 pour Tumblr), et le nombre de caractères restant est affiché lorsque l'icône de ce service est sélectionnée. Vous pouvez toujours poster sur ces services si votre publication est plus longue que la limite, mais le texte sera tronqué sur ces services."
-      char_limit_services_q: "Quelle est la limite de caractères pour les messages partagés avec un service connecté qui à une limite de caractères plus petite ?"
+      char_limit_services_q: "Quelle est la limite de caractères pour les messages partagés avec un service connecté qui a une limite de caractères plus petite ?"
       character_limit_a: "65,535 caractères. C'est 65,395 caractères de plus que Twitter ! ;)"
       character_limit_q: "Quelle est la limite de caractères pour un message ?"
       embed_multimedia_a: "Vous pouvez généralement juste coller l'URL (ex : http://www.youtube.com/watch?v=nnnnnnnnnnn) au sein de votre message et la vidéo ou l'audio seront intégrés automatiquement. Les quelques sites qui sont supportés sont : Youtube, Vimeo, SoundCloud, Flickr et bien d'autres. Diaspora* utilise oEmbed pour cette version. Nous supportons de nouveaux sites tout le temps. Souvenez-vous de toujours publier des liens complets et simples : pas de liens raccourcis, pas d'opérateurs après l'URL de base; et laissez-lui un peu de temps avant de rafraîchir la page après avoir publié un message pour voir son aperçu."
@@ -466,13 +468,13 @@ fr:
       stream_full_of_posts_a1: "Votre flux est constitué de trois types de messages:"
       stream_full_of_posts_li1: "Les publications des personnes avec qui vous êtes en train de partager vont appraître sous deux formes : les messages publics et les messages limités à l'aspect avec lequel vous partagez. Pour retirer ces publications de votre flux, cessez simplement de partager avec la personne."
       stream_full_of_posts_li2: "Les messages publics contiennent l'un des tags que vous suivez. Pour les supprimer, cessez de suivre le tag."
-      stream_full_of_posts_li3: "Les messages publics des personnes affichés dans la liste des gens mis en valeur. Ils peuvent être supprimés en décochant l'option \"Montrer les personnes mises en valeur ?\" dans l'onglet Compte de vos paramètres."
-      stream_full_of_posts_q: "Pourquoi mon flux est-il plein de messages provenants de personnes que je ne connais pas et avec lesquelles je ne partage pas ?"
+      stream_full_of_posts_li3: "Les messages publics des personnes affichées dans la liste des gens mis en valeur. Ils peuvent être supprimés en décochant l'option \"Montrer les personnes mises en valeur ?\" dans l'onglet Compte de vos paramètres."
+      stream_full_of_posts_q: "Pourquoi mon flux est-il plein de messages provenant de personnes que je ne connais pas et avec lesquelles je ne partage pas ?"
       title: "Messages et publications"
     private_posts:
       can_comment_a: "Seuls les utilisateurs placés dans cet aspect et connectés à diaspora* peuvent commenter ou aimer votre message privé."
       can_comment_q: "Qui peut commenter ou aimer mon message privé ?"
-      can_reshare_a: "Personne. Les messages privés ne sont pas repartageables. Les utilisateurs identifiés dans diaspora* dans cet aspect peuvent potentiellement le copier et le coller cependant."
+      can_reshare_a: "Personne. Il n'est pas permis de repartage un message privé. Cependant, les utilisateurs appartenant à cet aspect sont susceptibles de le copier et le coller."
       can_reshare_q: "Qui peut repartager mes messages privés ?"
       see_comment_a: "Seuls les gens avec qui le message a été partagé (les gens qui sont dans les aspects sélectionnés par le rédacteur original) peuvent voir ses commentaires et les aimer. "
       see_comment_q: "Lorsque je commente ou que j'aime un message privé, qui peut le voir ?"
@@ -481,70 +483,70 @@ fr:
       who_sees_post_q: "Lorsque j'envois un message à un aspect (ex : un message privé), qui peut le voir ?"
     private_profiles:
       title: "Profils privés"
-      whats_in_profile_a: "La biographie, la localisation, le sexe, et l'anniversaire. Ce sont les éléments dans le bas de la section de l'édition de la page de profil. Toutes ces informations sont optionnelles - c'est à vous de décider si vous les renseignez ou nin.  Les utilisateurs connectés que vous avez ajouté à vos aspects sont les seuls qui peuvent lire votre profil privé. Ils verront aussi les messages privés publiés dans les aspects dont ils font partie, mélangés avec vos publications publiques, lorsque ils visiteront votre page de profil."
+      whats_in_profile_a: "La biographie, la localisation, le sexe, et l'anniversaire. Ce sont les éléments dans le bas de la section de l'édition de la page de profil. Toutes ces informations sont optionnelles - c'est à vous de décider si vous les renseignez ou non.  Les utilisateurs connectés que vous avez ajoutés à vos aspects sont les seuls qui peuvent lire votre profil privé. Ils verront aussi les messages privés publiés dans les aspects dont ils font partie, mélangés avec vos publications publiques, lorsqu'ils visiteront votre page de profil."
       whats_in_profile_q: "Qu'est ce que mon profil privé ?"
       who_sees_profile_a: "N'importe quel utilisateur avec qui vous êtes en train de partager (ce qui signifie que vous avez ajouté dans l'un de vos aspects). Cependant, les gens qui vous suivent, mais que vous ne suivez pas, verrons uniquement vos informations publiques."
       who_sees_profile_q: "Qui peut voir mon profil privé ?"
-      who_sees_updates_a: "N'importe qui dans vos aspects peuvent voir les modifications de votre profil privé. "
+      who_sees_updates_a: "N'importe qui dans vos aspects peut voir les modifications de votre profil privé. "
       who_sees_updates_q: "Qui peut voir les mises à jour de mon profil privé ?"
     public_posts:
-      can_comment_reshare_like_a: "N'importe quel utilisateur connecté à diaspora* peut commenter, repartager, ou aimer votre post public."
+      can_comment_reshare_like_a: "N'importe quel utilisateur connecté à diaspora* peut commenter, repartager, ou aimer votre message public."
       can_comment_reshare_like_q: "Qui peut commenter, repartager, ou aimer mon message public ?"
-      deselect_aspect_posting_a: "Dé-sélectionner des aspects n'affectera pas les messages publics. Ils apparaîtront toujours dans le flux de tous vos contacts. Pour rendre un message visible seulement à des aspects spécifiques, vous avez besoin de sélectionner ces aspects via le bouton sous la publication en cours de rédaction."
-      deselect_aspect_posting_q: "Que ce passe t-il lorsque je dé-sélectionne un ou plusieurs aspects au moment ou je rédige un message public ?"
-      find_public_post_a: "Les messages publics apparaîtront dans le flux de tout ceux qui vous suivent. Si vous incluez des #tags dans votre message public, tout ceux qui suivent ces tags trouveront votre message dans leurs flux. Tout message public a aussi une URL spécifique que n'importe qui peut voir, sauf s'ils ne sont pas connectés - ces messages publiques peuvent êtres échangés directement sur Twitter, les blogs, etc. Les messages publics peuvent aussi être indexés par les moteurs de recherche."
-      find_public_post_q: "Comment les autres personnes peuvent elles trouver mes messages publics ?"
-      see_comment_reshare_like_a: "N'importe quel utilisateur connecté à diaspora* et n'importe qui d'autre sur internet. Les commentaires, \"likes\", et repartages des messages publics sont aussi publics."
+      deselect_aspect_posting_a: "Décocher des aspects n'affectera pas les messages publics : ils apparaîtront toujours dans le flux de tous vos contacts. Pour qu'un message ne soit visible qu'à certains aspects, vous devez sélectionner ces aspects via le bouton qui se trouve sous la boite de rédaction."
+      deselect_aspect_posting_q: "Que se passe-t-il lorsque je décoche un ou plusieurs aspects au moment où je rédige un message public ?"
+      find_public_post_a: "Les messages publics apparaîtront dans le flux de tous ceux qui vous suivent. Si vous incluez des #tags dans votre message public, tous ceux qui suivent ces tags trouveront votre message dans leurs flux. Tout message public a aussi une URL spécifique que n'importe qui peut voir, sauf s'ils ne sont pas connectés - ces messages publics peuvent êtres échangés directement sur Twitter, les blogs, etc. Les messages publics peuvent aussi être indexés par les moteurs de recherche."
+      find_public_post_q: "Comment les autres personnes peuvent-elles trouver mes messages publics ?"
+      see_comment_reshare_like_a: "N'importe quel utilisateur connecté à diaspora* et n'importe qui d'autre sur Internet. Les commentaires, « j'aime », et repartages des messages publics sont aussi publics."
       see_comment_reshare_like_q: "Lorsque je commente, repartage, ou aime un message public, qui peut le voir ?"
       title: "Messages publics"
       who_sees_post_a: "N'importe qui utilisant internet peut potentiellement voir un message que vous marquez comme public, donc soyez sûrs de vouloir rendre ce message public. C'est le meilleur moyen de s'ouvrir sur le monde."
       who_sees_post_q: "Lorsque je publie quelque chose publiquement, qui peut le voir ?"
     public_profiles:
       title: "Profils publics"
-      what_do_tags_do_a: "Ils aident les gens à mieux vous connaître. Votre photo de profil apparaîtra également dans le panneau latéral sur la gauche des pages de ces tags, au milieu de tout le monde les ayant dans leur profil public."
+      what_do_tags_do_a: "Ils aident les gens à mieux vous connaître. Votre photo de profil apparaîtra également dans le panneau latéral sur la gauche des pages de ces tags, avec tous ceux qui les ont dans leur profil public."
       what_do_tags_do_q: "Qu'est ce que font les tags sur mon profil public ?"
-      whats_in_profile_a: "Votre nom, les cinq tags que vous choisissez pour vous décrire, et votre photo. C'est l'ensemble des éléments dans la partie haute de votre page d'édition de profil. Vous pouvez créer un profil avec des informations vous identifiant ou vous laissant anonyme selon votre souhait. Votre page de profil montre uniquement les messages publics que vous avez crée."
-      whats_in_profile_q: "Qu'il-y-a t-il dans mon profil public ?"
+      whats_in_profile_a: "Votre nom, les cinq tags que vous choisissez pour vous décrire, et votre photo. C'est l'ensemble des éléments dans la partie haute de votre page d'édition de profil. Vous pouvez créer un profil avec des informations vous identifiant ou vous laissant anonyme selon votre souhait. Votre page de profil montre uniquement les messages publics que vous avez créés."
+      whats_in_profile_q: "Qu'y a-t-il dans mon profil public ?"
       who_sees_profile_a: "N'importe quel utilisateur de diaspora* connecté ainsi que plus généralement internet peut le voir. Chaque profil a une URL directe, permettant d'avoir un lien pointant dessus sur des sites extérieurs. Il peut être indexé par les moteurs de recherche."
       who_sees_profile_q: "Qui peut voir mon profil public ?"
-      who_sees_updates_a: "N'importe qui peut voir ces changements si il visite votre page de profil."
+      who_sees_updates_a: "N'importe qui peut voir ces changements en visitant votre page de profil."
       who_sees_updates_q: "Qui peut voir les mises à jour de mon profil public ?"
     resharing_posts:
       reshare_private_post_aspects_a: "Non, il n'est pas possible de repartager un message privé. Ceci dans le but de respecter les intentions du rédacteur initial qui souhaite uniquement partager avec un groupe particulier de personnes."
-      reshare_private_post_aspects_q: "Puis repartager un message privé uniquement avec certains aspects ?"
-      reshare_public_post_aspects_a: "Non, lorsque vous repartagez un message public il devient automatiquement l'un de vos messages publics. Pour le partager avec certaines aspects, copiez et collez le contenu du message dans un nouveau."
-      reshare_public_post_aspects_q: "Puis repartager un message public uniquement avec certains aspects ?"
+      reshare_private_post_aspects_q: "Puis-je repartager un message privé uniquement avec certains aspects ?"
+      reshare_public_post_aspects_a: "Non, lorsque vous repartagez un message public il devient automatiquement l'un de vos messages publics. Pour le partager avec certains aspects, copiez et collez le contenu du message dans un nouveau."
+      reshare_public_post_aspects_q: "Puis-je repartager un message public uniquement avec certains aspects ?"
       title: "Repartager les messages."
     sharing:
       add_to_aspect_a1: "Imaginons qu'Amy ajoute Ben dans un aspect, mais Ben n'a pas (encore) ajouté Amy dans un aspect :"
       add_to_aspect_a2: "On dit que c'est un partage asymétrique. Si Ben ajoute aussi Amy dans un aspect alors cela deviendra un partage mutuel, avec les messages publics et privés de Amy et Ben, et leurs messages privés concernés dans leurs flux, etc.  "
-      add_to_aspect_li1: "Ben recevra une notifications indiquant que Amy \"a commencé à partager\" avec Ben."
+      add_to_aspect_li1: "Ben recevra une notification indiquant que Amy \"a commencé à partager\" avec Ben."
       add_to_aspect_li2: "Amy commencera à voir les messages publics de Ben dans son flux."
       add_to_aspect_li3: "Amy ne verra aucun des messages privés de Ben."
       add_to_aspect_li4: "Ben ne verra pas les messages publics ou privés d'Amy dans son flux."
       add_to_aspect_li5: "Mais si Ben se rend sur la page de profil d'Amy, alors il verra les messages privés d'Amy qu'elle a rédigé pour l'aspect dans lequel il se trouve (de la même façon que ses messages publics qui peuvent êtres vu par tout le monde)."
       add_to_aspect_li6: "Ben sera autorisé à voir le profil privé d'Amy (bio, localisation, genre, anniversaire)."
       add_to_aspect_li7: "Amy apparaîtra en tant que \"Seulement en train de partager avec moi\" sur la page des contacts de Ben."
-      add_to_aspect_q: "Que ce passe t-il lorsque j'ajoute quelqu'un dans l'un de mes aspects ? Ou lorsque quelqu'un m'ajoute dans l'un de ses aspects ?"
+      add_to_aspect_q: "Que se passe-t-il lorsque j'ajoute quelqu'un dans l'un de mes aspects ? Ou lorsque quelqu'un m'ajoute dans l'un de ses aspects ?"
       list_not_sharing_a: "Non. Mais vous pouvez voir si quelqu'un partage avec vous en visitant sa page de profil. Si c'est le cas, la barre sous son image de profil sera verte. Si non, elle sera grise. Vous devriez recevoir une notification à chaque fois qu'une personne commence à partager avec vous."
-      list_not_sharing_q: "Existe-il une liste des personnes que j'ai ajouté à un de mes aspects mais qui ne m'ont pas ajouté à l'un des leurs ?"
-      only_sharing_a: "Il y a des personnes qui vous ont ajouté dans l'un de leurs aspects, mais qui ne font pas (encore) partie de l'un des votres. En d'autres termes, ils partagent avec vous, mais vous ne partagez pas avec eux (partage asymétrique). Si vous les ajoutez dans un aspect, ils apparaîtront dans cet aspect et pas dans \"partage uniquement avec vous\". Voir ci-dessus."
+      list_not_sharing_q: "Existe-t-il une liste des personnes que j'ai ajoutées à un de mes aspects mais qui ne m'ont pas ajouté à l'un des leurs ?"
+      only_sharing_a: "Il y a des personnes qui vous ont ajouté dans l'un de leurs aspects, mais qui ne font pas (encore) partie de l'un des vôtres. En d'autres termes, ils partagent avec vous, mais vous ne partagez pas avec eux (partage asymétrique). Si vous les ajoutez dans un aspect, ils apparaîtront dans cet aspect et pas dans \"partage uniquement avec vous\". Voir ci-dessus."
       only_sharing_q: "Qui sont les gens listés dans \"Partage seulement avec moi\" de ma page de contacts ?"
-      see_old_posts_a: "Non. Ils seront seulement autorisés à voir vos nouveaux messages pour cet aspect. Ils (et n'importe qui d'autre) peuvent voir vos vieux messages publics sur votre page de profil, et ils les verront aussi dans leur flux."
-      see_old_posts_q: "Lorsque j'ajoute quelqu'un dans un aspect, peut-il voir les anciens messages que j'ai déjà publié dans cet aspect ?"
+      see_old_posts_a: "Non. Ceux que vous venez d'ajouter seront seulement autorisés à voir vos nouveaux messages pour cet aspect. Ils (et n'importe qui d'autre) peuvent voir vos anciens messages publics sur votre page de profil, et ils les verront aussi dans leur flux."
+      see_old_posts_q: "Lorsque j'ajoute quelqu'un dans un aspect, peut-il voir les anciens messages que j'ai déjà publiés dans cet aspect ?"
       title: "Partage"
     tags:
       filter_tags_a: "Ce n'est pas encore possible directement via diaspora*, mais certains %{third_party_tools} permettant cela ont été écrits."
       filter_tags_q: "Comment puis-je filtrer/exclure certaines tags de mon flux ?"
-      followed_tags_a: "Après avoir recherché un tag vous pouvez cliquer sur le bouton en haut de la page de tags pour \"suivre\" ce tag. Il apparaîtra dans votre liste de tags suivis sur la gauche. Cliquer sur l'un des tags que vous suivez vous emmène sur la page du tag donc vous pouvez voir les messages récents contenant le tag. Cliquez sur \"#Tags suivis\" pour voir un flux de messages incluant l'un ou l'intégralité des tags que vous suivez.   "
+      followed_tags_a: "Après avoir recherché un tag vous pouvez cliquer sur le bouton en haut de la page de tags pour \"suivre\" ce tag. Il apparaîtra dans votre liste de tags suivis sur la gauche. Cliquer sur l'un des tags que vous suivez vous emmène sur la page du tag donc vous pouvez voir les messages récents contenant le tag. Cliquez sur \"#Tags suivis\" pour voir un flux de messages incluant l'un des tags que vous suivez ou leur intégralité.   "
       followed_tags_q: "Que sont les \"#Tags Suivis\" et comment puis-je suivre un tag ?"
       people_tag_page_a: "Il y a des personnes qui ont listé ce tag pour se décrire elles-même dans leur profil public."
       people_tag_page_q: "Qui sont les personnes listées sur la partie gauche d'une page de tag ?"
       tags_in_comments_a: "Un tag ajouté dans un commentaire apparaîtra toujours sous forme de lien pointant sur la page de ce tag, mais cela ne fera pas apparaître ce message (ou ce commentaire) sur la page du tag. Cela fonctionne uniquement pour les tags dans un message."
       tags_in_comments_q: "Puis-je insérer des tags dans un commentaire ou juste dans des messages ?"
       title: "Tags"
-      what_are_tags_for_a: "Les tags sont une manière de catégoriser un message, généralement par sujets. Rechercher un tag montre tous les messages avec ce tag que vous pouvez voir (à la fois dans les messages publics et privés). Cela laisse les personnes qui sont intéressées par un sujet précis trouver les messages publics le concernant."
-      what_are_tags_for_q: "A quoi servent les tags ?"
+      what_are_tags_for_a: "Les tags sont une manière de catégoriser un message, généralement par sujets. Rechercher un tag montre tous les messages avec ce tag que vous pouvez voir (à la fois dans les messages publics et privés). Cela permet aux personnes qui sont intéressées par un sujet précis de trouver les messages publics le concernant."
+      what_are_tags_for_q: "À quoi servent les tags ?"
     third_party_tools: "outils tiers"
     title_header: "Aide"
     tutorial: "tutoriel"
@@ -593,7 +595,7 @@ fr:
     application:
       back_to_top: "Retour en haut"
       powered_by: "PROPULSÉ PAR diaspora*"
-      public_feed: "Flux diaspora* public pour %{name}"
+      public_feed: "Flux diaspora* public de %{name}"
       source_package: "téléchargez le code source"
       toggle: "activer/désactiver la version mobile"
       whats_new: "Quoi de neuf ?"
@@ -632,9 +634,9 @@ fr:
   no_results: "Aucun résultat trouvé"
   notifications:
     also_commented:
-      one: "%{actors} a également commenté sur %{post_link} de %{post_author}."
-      other: "%{actors} ont également commenté sur %{post_link} de %{post_author}."
-      zero: "%{actors} a également commenté sur %{post_link} de %{post_author}."
+      one: "%{actors} a également commenté sur le message %{post_link} de %{post_author}."
+      other: "%{actors} ont également commenté sur le message %{post_link} de %{post_author}."
+      zero: "%{actors} a également commenté sur le message %{post_link} de %{post_author}."
     also_commented_deleted:
       one: "%{actors} a commenté votre message supprimé."
       other: "%{actors} ont commenté votre message supprimé."
@@ -642,7 +644,7 @@ fr:
     comment_on_post:
       one: "%{actors} a commenté votre message %{post_link}."
       other: "%{actors} ont commenté votre message %{post_link}."
-      zero: "%{actors} a commenté sur votre %{post_link}."
+      zero: "%{actors} n'a commenté sur votre message %{post_link}."
     helper:
       new_notifications:
         few: "%{count} nouvelles notifications"
@@ -675,17 +677,17 @@ fr:
       show_unread: "montrer les non-lus"
       started_sharing: "A commencé à partager"
     liked:
-      one: "%{actors} a aimé votre %{post_link}."
-      other: "%{actors} ont aimé votre %{post_link}."
-      zero: "%{actors} a aimé votre %{post_link}."
+      one: "%{actors} a aimé votre message %{post_link}."
+      other: "%{actors} ont aimé votre message %{post_link}."
+      zero: "%{actors} a aimé votre message %{post_link}."
     liked_post_deleted:
       one: "%{actors} a aimé votre message supprimé."
       other: "%{actors} ont aimé votre message supprimé."
       zero: "%{actors} a aimé votre message supprimé."
     mentioned:
-      one: "%{actors} vous a mentionné(e) dans un %{post_link}."
-      other: "%{actors} vous ont mentionné(e) dans un %{post_link}."
-      zero: "%{actors} vous a mentionné(e) dans un %{post_link}."
+      one: "%{actors} vous a mentionné(e) dans le message %{post_link}."
+      other: "%{actors} vous ont mentionné(e) dans le message %{post_link}."
+      zero: "%{actors} ne vous a mentionné(e) dans le message %{post_link}."
     mentioned_deleted:
       one: "%{actors} vous a mentionné-e dans un message supprimé."
       other: "%{actors} vous ont mentionné-e dans un message supprimé."
@@ -696,13 +698,13 @@ fr:
       other: "%{actors} vous ont envoyé un message."
       zero: "%{actors} vous a envoyé un message."
     reshared:
-      one: "%{actors} a repartagé votre %{post_link}."
-      other: "%{actors} ont repartagé votre %{post_link}."
-      zero: "%{actors} a repartagé votre %{post_link}."
+      one: "%{actors} a repartagé votre message %{post_link}."
+      other: "%{actors} ont repartagé votre message %{post_link}."
+      zero: "%{actors} n'a repartagé votre message %{post_link}."
     reshared_post_deleted:
-      one: "%{actors} a partagé le message que vous avez supprimé."
-      other: "%{actors} ont partagé le message que vous avez supprimé."
-      zero: "%{actors} a partagé votre message supprimé."
+      one: "%{actors} a repartagé le message que vous avez supprimé."
+      other: "%{actors} ont repartagé le message que vous avez supprimé."
+      zero: "%{actors} n'a repartagé votre message supprimé."
     started_sharing:
       one: "%{actors} a commencé à partager avec vous."
       other: "%{actors} ont commencé à partager avec vous."
@@ -766,8 +768,8 @@ fr:
       reshared: "%{name} a repartagé votre message"
       view_post: "Voir le message >"
     single_admin:
-      admin: "Votre administrateur Diaspora"
-      subject: "Un message concernant votre compte Diaspora :"
+      admin: "Votre administrateur diaspora*"
+      subject: "Un message concernant votre compte diaspora* :"
     started_sharing:
       sharing: "a commencé à partager avec vous !"
       subject: "%{name} a commencé à partager avec vous sur diaspora*"
@@ -893,7 +895,7 @@ fr:
   profile: "Profil"
   profiles:
     edit:
-      allow_search: "Permettre à tous de vous rechercher dans Diaspora"
+      allow_search: "Permettre à tous de vous rechercher dans diaspora*"
       edit_profile: "Modifier le profil"
       first_name: "Prénom"
       last_name: "Nom de famille"
@@ -943,7 +945,7 @@ fr:
       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)"
-      hey_make: "HÉ !<br/>FAÎTES<br/>QUELQUE CHOSE."
+      hey_make: "HÉ !<br/>FAITES<br/>QUELQUE CHOSE."
       join_the_movement: "Rejoignez le mouvement !"
       password: "MOT DE PASSE"
       password_confirmation: "CONFIRMATION DU MOT DE PASSE"
@@ -957,7 +959,7 @@ fr:
     comment_label: "<b>Commentaire</b>:<br>%{data}"
     confirm_deletion: "Etes vous vraiment sur de vouloir supprimer cet élément ?"
     delete_link: "Supprimer l’élément"
-    not_found: "<u>Le message/commentaire n'a pas été trouvé. Il a pu être supprimé par l'utilisateur !</u>"
+    not_found: "<u>Le message/commentaire n'a pas été trouvé. On dirait qu'il a été supprimé par l'utilisateur !</u>"
     post_label: "<b>Message</b>: %{title}"
     reason_label: "Raison : %{text}"
     reported_label: "<b>Signalé par</b> %{person}"
@@ -971,7 +973,7 @@ fr:
   requests:
     create:
       sending: "En cours d'envoi"
-      sent: "Vous avez demandé à partager avec %{name}. Il le verra lors de sa prochaine connexion à Diaspora."
+      sent: "Vous avez demandé à partager avec %{name}. Il devrait le voir lors de sa prochaine connexion à diaspora*."
     destroy:
       error: "Veuillez sélectionner un aspect !"
       ignore: "Requête de contact ignorée."
@@ -998,12 +1000,12 @@ fr:
       reshare:
         few: "%{count} partages"
         many: "%{count} partages"
-        one: "1 partage"
-        other: "%{count} partages"
+        one: "1 repartage"
+        other: "%{count} repartages"
         two: "%{count} partages"
         zero: "Repartager"
-      reshare_confirmation: "Partager le message d'%{author} ?"
-      reshare_original: "Partager l'original"
+      reshare_confirmation: "Repartager le message d'%{author} ?"
+      reshare_original: "Repartager l'original"
       reshared_via: "repartagé par"
       show_original: "Afficher l'original"
   search: "Rechercher"
@@ -1018,7 +1020,7 @@ fr:
     failure:
       error: "une erreur s'est produite lors de la connexion avec ce service"
     finder:
-      fetching_contacts: "Diaspora est en train d'importer vos amis %{service}. Revenez dans quelques minutes."
+      fetching_contacts: "Diaspora* est en train d'importer vos amis %{service}. Revenez dans quelques minutes."
       no_friends: "Aucun ami Facebook trouvé."
       service_friends: "Amis %{service}"
     index:
@@ -1031,13 +1033,13 @@ fr:
       logged_in_as: "connecté(e) en tant que"
       no_services: "Vous n'êtes connecté à aucun service pour le moment."
       really_disconnect: "déconnecter %{service} ?"
-      services_explanation: "Se connecter à des services vous donne la possibilité d'y publier vos messages depuis Diaspora*."
+      services_explanation: "Se connecter à des services vous donne la possibilité d'y publier vos messages depuis diaspora*."
     inviter:
       click_link_to_accept_invitation: "Suivez ce lien pour accepter l'invitation"
       join_me_on_diaspora: "Rejoignez-moi sur diaspora*"
     remote_friend:
       invite: "inviter"
-      not_on_diaspora: "Pas encore sur Diaspora"
+      not_on_diaspora: "Pas encore sur diaspora*"
       resend: "envoyer à nouveau"
   settings: "Paramètres"
   share_visibilites:
@@ -1049,9 +1051,9 @@ fr:
       add_new_contact: "Ajouter un nouveau contact"
       create_request: "Rechercher par identifiant diaspora*"
       diaspora_handle: "diaspora@pod.org"
-      enter_a_diaspora_username: "Entrez un nom d'utilisateur Diaspora :"
+      enter_a_diaspora_username: "Entrez un nom d'utilisateur diaspora* :"
       know_email: "Connaissez-vous leur adresse de courrier électronique ? Vous devriez les inviter"
-      your_diaspora_username_is: "Votre nom d'utilisateur Diaspora est : %{diaspora_handle}"
+      your_diaspora_username_is: "Votre nom d'utilisateur diaspora* est : %{diaspora_handle}"
     aspect_dropdown:
       add_to_aspect: "Ajouter le contact"
       toggle:
@@ -1074,7 +1076,7 @@ fr:
       invite_someone: "Inviter quelqu'un"
       invite_your_friends: "Invitez vos amis"
       invites: "Invitations"
-      invites_closed: "Les invitations sont actuellement fermées sur ce pod Diaspora"
+      invites_closed: "Les invitations sont actuellement fermées sur ce pod diaspora*"
       share_this: "Partagez ce lien par courriel, sur un blog ou via votre réseau social favori !"
     notification:
       new: "Nouveau/nouvelle %{type} de %{from}"
@@ -1084,7 +1086,7 @@ fr:
       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. Interpellez des personnes géniales avec les @Mentions"
-      outside: "Les messages publics pourront être vus par d'autres en dehors de Diaspora."
+      outside: "Les messages publics pourront être vus par tous, même 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 message. (Nous vous conseillons de rendre public ce premier message.)"
@@ -1135,7 +1137,7 @@ fr:
   simple_captcha:
     label: "Entrez le code dans le champ"
     message:
-      default: "Le code ne correspond pas à l'image"
+      default: "Le code fourni ne correspond pas à l'image"
       failed: "La vérification anti-robot a échoué"
       user: "L'image et le code sont différents"
     placeholder: "Saisissez le contenu de l'image"
@@ -1148,13 +1150,7 @@ fr:
       no_message_to_display: "Aucun message à afficher."
     new:
       mentioning: "Mentionne : %{person}"
-    too_long:
-      few: "merci de bien vouloir écrire des messages de moins de %{count} caractères"
-      many: "merci de bien vouloir écrire des messages de moins de %{count} caractères"
-      one: "merci de bien vouloir écrire des messages de moins de %{count} caractère"
-      other: "merci de bien vouloir écrire des messages de moins de %{count} caractères"
-      two: "votre statut doit faire moins de %{count} caractères"
-      zero: "merci de bien vouloir écrire des messages de moins de %{count} caractère"
+    too_long: "Veillez à écrire un message de statut de %{count} caractères au plus. Il compte actuellement %{current_length} caractères."
   stream_helper:
     hide_comments: "Masquer tous les commentaires"
     show_comments:
@@ -1224,11 +1220,11 @@ fr:
       email_not_confirmed: "L'adresse électronique n'a pas pu être activée. Lien erroné ?"
     destroy:
       no_password: "Veuillez introduire votre mot de passe actuel pour fermer votre compte."
-      success: "Votre compte a été bloqué. 20 minutes pourraient être nécessaires pour la finalisation de sa fermeture. Merci d'avoir essayé d'utiliser Diaspora."
+      success: "Votre compte est verrouillé. Cela peut nous prendre jusqu'à vingt minutes pour terminer de le fermer. Merci d'avoir essayé diaspora*."
       wrong_password: "Le mot de passe introduit ne correspond pas à  votre mot de passe actuel."
     edit:
-      also_commented: "…quelqu'un d'autre commente une publication de votre contact ?"
-      auto_follow_aspect: "Aspect pour les utilisateurs suivis automatiquement :"
+      also_commented: "…quelqu'un commente un message que vous avez déjà commenté."
+      auto_follow_aspect: "Aspect où ranger les utilisateurs suivis automatiquement :"
       auto_follow_back: "Suivre automatiquement en retour ceux qui vous suivent"
       change: "Modifier"
       change_email: "Changer d'adresse électronique"
@@ -1237,15 +1233,15 @@ fr:
       character_minimum_expl: "doit comporter au moins six caractères"
       close_account:
         dont_go: "Hey, s'il vous plaît ne partez pas !"
-        if_you_want_this: "Si vous le voulez vraiment, tapez votre mot de passe ci-dessous et cliquez sur 'Supprimer le compte'"
+        if_you_want_this: "Si vous le voulez vraiment, saisissez votre mot de passe ci-dessous et cliquez sur 'Supprimer le compte'"
         lock_username: "Ceci bloquera votre nom d'utilisateur si jamais vous décidiez de revenir."
         locked_out: "Vous serez déconnecté et bloqué de votre compte."
-        make_diaspora_better: "Nous avons besoin de vous pour rendre Diaspora meilleur, vous devriez nous aider au lieu de partir. Si vous voulez partir, on voudrait que vous sachiez ce qu'il se passera prochainement."
+        make_diaspora_better: "Nous avons besoin de vous pour rendre diaspora* meilleur, aussi, vous devriez nous aider au lieu de partir. Si vous voulez partir malgré tout, nous tenons à ce que vous sachiez ce qui va maintenant se passer."
         mr_wiggles: "Mr Wiggles sera triste de vous voir partir."
         no_turning_back: "Pour l'instant, on ne peut pas revenir en arrière."
         what_we_delete: "Nous supprimerons tous vos envois et les données de votre profil dès que possible. Vos commentaires resteront sur le site, mais seront associés à votre identifiant diaspora* plutôt qu'à votre nom.."
       close_account_text: "Fermer le compte"
-      comment_on_post: "…quelqu'un commente votre publication ?"
+      comment_on_post: "…quelqu'un commente un de vos messages."
       current_password: "Mot de passe actuel"
       current_password_expl: "Celui avec lequel vous vous connectez ..."
       download_photos: "télécharger mes photos"
@@ -1253,28 +1249,28 @@ fr:
       edit_account: "Modifier le compte"
       email_awaiting_confirmation: "Nous vous avons envoyé un lien d'activation à %{unconfirmed_email}. Jusqu'à ce que vous suiviez ce lien et activiez la nouvelle adresse, nous allons continuer à utiliser votre adresse originale %{email}."
       export_data: "Exporter des données"
-      following: "Paramètres de suivi"
+      following: "Paramètres de partage"
       getting_started: "Préférences de nouvel utilisateur"
-      liked: "... quelqu'un a épinglé votre message ?"
-      mentioned: "…vous êtes mentionné-e dans une publication ?"
+      liked: "…quelqu'un a aimé votre message."
+      mentioned: "…l'on vous mentionne dans un message."
       new_password: "Nouveau mot de passe"
       photo_export_unavailable: "L'exportation des photos est actuellement indisponible"
-      private_message: "…vous recevez un message privé ?"
+      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 ?"
+      reshared: "…quelqu'un a repartagé votre message."
+      show_community_spotlight: "Afficher les actualités de la communauté dans votre flux"
       show_getting_started: "Réactiver la page de découverte"
       someone_reported: "Quelqu'un a signalé un message"
-      started_sharing: "... quelqu'un commence à partager avec vous ?"
+      started_sharing: "…quelqu'un commence à partager avec vous."
       stream_preferences: "Préférences du flux"
       your_email: "Votre adresse électronique"
       your_handle: "Votre identifiant diaspora*"
     getting_started:
       awesome_take_me_to_diaspora: "Impressionnant ! Guidez-moi vers diaspora*"
-      community_welcome: "La communauté Diaspora* est heureuse de vous avoir à bord !"
-      connect_to_facebook: "Nous pouvons accélerer un peu les choses en %{link} à Diaspora. Cela va importer votre nom et votre photo et activer l'écriture de messages entre les comptes."
+      community_welcome: "La communauté diaspora* est heureuse de vous avoir à bord !"
+      connect_to_facebook: "Nous pouvons accélérer un peu les choses en %{link} à diaspora*. Cela va importer votre nom et votre photo, et permettre de publier des messages sur plusieurs services à la fois."
       connect_to_facebook_link: "connectant votre compte Facebook"
-      hashtag_explanation: "Les tags vous permettent de parler de vos intérêts et de les suivre. Ils sont aussi un excellent moyen de rencontrer de nouvelles personnes sur Diaspora."
+      hashtag_explanation: "Les tags vous permettent de parler de vos centres d'intérêt et de suivre ce qui s'en dit. Ils sont aussi un excellent moyen de rencontrer de nouvelles personnes sur diaspora*."
       hashtag_suggestions: "Essayez de suivre des tags comme #art, #films, #french, etc."
       saved: "Sauvé !"
       well_hello_there: "Bienvenue !"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index c479a7bcc..06a7fca06 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -273,7 +273,6 @@ he:
       no_contacts_message: "כדאי לבדוק %{community_spotlight}"
       no_contacts_message_with_aspect: "כדאי לבדוק %{community_spotlight} או %{add_to_aspect_link}"
       only_sharing_with_me: "רק אלו המשתפים אתי"
-      remove_person_from_aspect: "הסרת %{person_name} מההיבט \"%{aspect_name}\""
       start_a_conversation: "התחלת שיחה"
       title: "אנשי קשר"
       your_contacts: "אנשי הקשר שלך"
@@ -912,10 +911,7 @@ he:
       no_message_to_display: "אין הודעה להצגה."
     new:
       mentioning: "אזכור: %{person}"
-    too_long:
-      one: "נא לקצר את הודעות הסטטוס שלך לפחות מתו אחד"
-      other: "נא לקצר את הודעות הסטטוס שלך לפחות מ-%{count} תווים"
-      zero: "נא לקצר את הודעות הסטטוס שלך לפחות מ-%{count} תווים"
+    too_long: "{\"one\"=>\"נא לקצר את הודעות הסטטוס שלך לפחות מתו אחד\", \"other\"=>\"נא לקצר את הודעות הסטטוס שלך לפחות מ-%{count} תווים\", \"zero\"=>\"נא לקצר את הודעות הסטטוס שלך לפחות מ-%{count} תווים\"}"
   stream_helper:
     hide_comments: "הסתרת כל התגובות"
     show_comments:
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index ac0f71a43..15af01a48 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -279,9 +279,9 @@ hu:
       no_contacts_message: "Tekintsd meg %{community_spotlight} álló népszerű tagokat"
       no_contacts_message_with_aspect: "Tekintsd meg %{community_spotlight} álló népszerű közösségi tagokat vagy lehetőségedben áll még %{add_to_aspect_link}"
       only_sharing_with_me: "Követők"
-      remove_person_from_aspect: "%{person_name} eltávolítása a(z) \"%{aspect_name}\" csoportból."
       start_a_conversation: "Beszélgetés indítása"
       title: "Ismerősök"
+      user_search: "Felhasználó keresése"
       your_contacts: "Ismerőseid"
     many: "%{count} ismerős"
     one: "1 ismerős"
@@ -1080,9 +1080,7 @@ hu:
       no_message_to_display: "Nincs üzenet."
     new:
       mentioning: "Megemlít: %{person}"
-    too_long:
-      other: "Rövidíts. Az állapotfrissítésed hossza nem lehet több %{count} leütésnél"
-      zero: "Rövidíts. Az állapotfrissítésed hossza nem lehet több %{count} leütésnél"
+    too_long: "Rövidíts. Az állapotfrissítésed nem lehet hosszabb %{count} leütésnél. Jelenleg %{current_length} karakterből áll"
   stream_helper:
     hide_comments: "hozzászólások elrejtése"
     show_comments:
diff --git a/config/locales/diaspora/hy.yml b/config/locales/diaspora/hy.yml
index aeed6b167..4005d163a 100644
--- a/config/locales/diaspora/hy.yml
+++ b/config/locales/diaspora/hy.yml
@@ -8,6 +8,7 @@ hy:
   _applications: "Հավելվածներ"
   _comments: "Մեկնաբանություններ"
   _contacts: "Կոնտակտներ"
+  _help: "Օգնություն"
   _home: "Գլխավոր էջ"
   _photos: "նկարներ"
   _services: "Ծառայություններ"
@@ -45,6 +46,7 @@ hy:
       correlations: "Կախվածություններ"
       pages: "Էջեր"
       pod_stats: "Փոդի վիճակագրություն"
+      sidekiq_monitor: "Sidekiq մոնիտոր"
       user_search: "Օգտատերի որոնում"
       weekly_user_stats: "Օգտատերերի շաբաթական վիճակագրություն"
     correlations:
@@ -79,6 +81,7 @@ hy:
     user_search:
       add_invites: "ավելացնել հրավերներ"
       email_to: "Հրավիրել նամակով"
+      under_13: "Ցուցադրել օգտատերերին որ 13 (COPPA)֊ից ցածր են։"
       users:
         one: "%{count} օգտատեր գտնվեց"
         other: "%{count} օգտատեր գտնվեց"
@@ -134,11 +137,13 @@ hy:
       confirm_remove_aspect: "Վստա՞հ ես, որ ուզում ես ջնջել այս խումբը։"
       done: "Պատրաստ է"
       make_aspect_list_visible: "այս խմբի կոնտակտներին դարձնե՞լ տեսանելի միմյանց համար։"
+      manage: "Կարգավորել"
       remove_aspect: "Ջնջել այս խումբը"
       rename: "վերանվանել"
+      set_visibility: "Կարգավորել տեսանելիությունը"
       update: "թարմացնել"
       updating: "թարմացվում է"
-    few: "%{count} խմբեր"
+    few: "%{count} խումբ"
     helper:
       are_you_sure: "Վստա՞հ ես, որ ուզում ես ջնջել այս խումբը։"
       aspect_not_empty: "Խումբը դատարկ չէ"
@@ -151,17 +156,22 @@ hy:
       donate: "Նվիրաբերել"
       handle_explanation: "Սա քո Diaspora ID-ն է։ Մարդիկ կարող են գտնել քեզ ինչպես քո էլ. հասցեով, այնպես էլ քո Diaspora ID-ով։"
       help:
-        do_you: "Դու."
+        any_problem: "Խնդիրնեն կա՞ն։"
+        contact_podmin: "Կապվի՛ր քո փոդի ադմինի հետ։"
+        do_you: "Արդյո՞ք."
         email_feedback: "Կարող ես նաև %{link}-ին ուղարկել քո կարծիքը։"
         email_link: "էլ․ փոստ"
         feature_suggestion: "… %{link} ունե՞ք։"
-        find_a_bug: "… %{link} ե՞ս գտել։"
-        have_a_question: "… %{link} ունե՞ս։"
+        find_a_bug: "… %{link} ես գտել։"
+        have_a_question: "… %{link} ունես։"
         here_to_help: "Համայնքն այստե՜ղ է։"
+        mail_podmin: "Փոդմինի էլ․փոստը"
         need_help: "Օգնությու՞ն"
         tag_bug: "բագ"
         tag_feature: "առաջարկություն"
         tag_question: "հարց"
+        tutorial_link_text: "Ուսուցանող նյութեր"
+        tutorials_and_wiki: "%{faq}, %{tutorial}, և %{wiki}՝ օգնություն առաջին քայլերիդ համար։"
       introduce_yourself: "Սա քո լրահոսն է։ Ընկղմվիր և ներկայացրու քեզ։"
       keep_diaspora_running: "Օգնի՛ր Diaspora-ի արագ զարգացմանը ամսական նվիրատվությամբ։"
       keep_pod_running: "Փող քցվենք %{pod} -ի առողջության համար:"
@@ -221,6 +231,7 @@ hy:
       failure: "Չստացվեց դադարեցնել արհամարհել այդ օգտատիրոջը։"
       success: "Եկ տեսնենք՝ ինչ ունեն նրանք ասելու։ #sayhello"
   bookmarklet:
+    explanation: "Գրառիր Սփյուռքում* ցանկացած տեղից նշելով այս հղումը => %{link}"
     post_something: "Գրառել Diaspora-ում"
     post_success: "Գրառվեց։ Փակվում եմ։ ։Ճ"
   cancel: "Չեղարկել"
@@ -248,9 +259,8 @@ hy:
       my_contacts: "Իմ ընկերները"
       no_contacts: "Երևում է՝ նոր ընկերների կարիք ունես։"
       no_contacts_message: "Ստուգել %{community_spotlight}"
-      no_contacts_message_with_aspect: "Աչքի անցկացրու %{community_spotlight}-ը կամ %{add_to_aspect_link}"
+      no_contacts_message_with_aspect: "Աչքի անցկացրու %{community_spotlight}ը կամ %{add_to_aspect_link}"
       only_sharing_with_me: "Միայն ինձ հետ կիսվողները"
-      remove_person_from_aspect: "Հեռացնել %{person_name}-ին %{aspect_name}-ից"
       start_a_conversation: "Խոսակցություն սկսել"
       title: "Կոնտակտներ"
       your_contacts: "Քո կոնտակտները"
@@ -261,10 +271,15 @@ hy:
       people_sharing: "Քեզ հետ կիսվող մարդիկ"
     spotlight:
       community_spotlight: "Համայնքի նորությունները"
+      suggest_member: "Անդամ առաջարկի՛ր"
     two: "%{count} ընկեր"
     zero: "կոնտակտ"
   conversations:
+    conversation:
+      participants: "Մասնակիցները"
     create:
+      fail: "Անվավեր հաղորդագրություն"
+      no_contact: "Հեե՜յ, սկզբում կոնտակտին պիտի ավելացնես։"
       sent: "Նամակն ուղարկված է"
     destroy:
       success: "Զրույցը հաջողությամբ ջնջվեց"
@@ -300,16 +315,63 @@ hy:
       invalid_fields: "Անվավեր դաշտեր"
     login_try_again: "<a href='%{login_link}'>մուտք գործիր</a> և փորձիր նորից:"
     post_not_public: "Գրառումը, որ փորձում ես դիտել, հրապարակային չէ։"
+    post_not_public_or_not_exist: "Գրառումը, որ փորձում ես դիտել, հանրային չէ կամ գոյություն չունի։"
   fill_me_out: "Լրացրու՛ ինձ"
   find_people: "Գտնել մարդկանց կամ #պիտակներ"
+  help:
+    account_and_data_management:
+      close_account_a: "Գնա Կարգավորումներ -> Հաշիվ ու սեղմիր էջի ամենաներքևի «Փակել հաշիվս» կոճակը։"
+      close_account_q: "Ինչպե՞ս ջնջեմ իմ հաշիվը։"
+      data_visible_to_podmin_q: "Իմ հաշվում եղած տվյալների ո՞ր մասը կարող է տեսնել իմ փոդի ադմինը։"
+      download_data_a: "Այո՛․ գնա Կարգավորումներ -> Հաշիվ, էջի ամենաներքևում կա երկու կոճակ քո տվյալները ներբեռնելու համար։"
+      download_data_q: "Կարո՞ղ եմ ներբեռնել իմ հաշվում եղած բոլոր տվյալների պատճեն։"
+      move_pods_a: "Հետագայում հնարավոր կլինի տեղափոխել քո հաշիվը մի փոդից դեպի մյուսը, սակայն այժմ դա հնարավոր չէ։ Դու միշտ կարող ես բացել նոր հաշիվ ու ավելացնել քո ընկենրեին այնտեղի խմբերին և խնդրել նրանց, որ ավելացնեն քո նոր հաշիվը իրենց մոտ։"
+      move_pods_q: "Ինչպե՞ս տեղափոխեմ իմ հաշիվը մի փոդից դեպի մյուսը:"
+      title: "Հաշվի և տվյալների կառավարում"
+    aspects:
+      what_is_an_aspect_q: "Ի՞նչ է խումբը։"
+    foundation_website: "Դիասպորա հիմնադրամի կայքը"
+    getting_help:
+      get_support_a_hashtag: "հարցրու Սփյուռքում հրապարակային գրառմամբ ու օգտագործիր %{question} հեշթագը"
+      get_support_a_irc: "միացիր մեզ %{irc}֊ում (Կենդանի չաթ/խոսակցություն)"
+      get_support_a_tutorials: "աչքի անցկացրու մեր %{tutorials}"
+      get_support_a_website: "այցելիր մեր %{link}"
+      get_support_a_wiki: "փորփրիր %{link}֊ը"
+      get_support_q: "Իսկ ի՞նչ, եթե իմ հարցը պատասխան չունի այս ՀՏՀ֊ում։ Ուրիշ որտեղի՞ց կարող եմ օգնություն ստանալ։"
+      getting_started_a: "Դու բախտավոր ե՜ս։ Փորձիր %{tutorial_series} մեր նախագծի կայքում։ Այն քեզ կօգնի քայլ առ քայլ հասկանալ գրանցման գործընթացը և կսովորեցնի բոլոր հիմունքային բաները, որ քեզ անհրաժեշտ են Սփյուռքից (diaspora֊այից) օգտվելու համար։"
+      getting_started_q: "Օգնեե՜ք։ Ես սկզբնական օգնության կարիք ունեմ, որ կարողանամ սկսել։"
+      title: "Օգնություն"
+    getting_started_tutorial: "«ԻՆչպե՞ս սկսել» ուսուցանող նյութերի շարքը"
+    here: "այստեղ"
+    irc: "IRC"
+    markdown: "Նշաձև(Markdown)"
+    mentions:
+      mention_in_comment_a: "Ոչ, դեռ ոչ։"
+      mention_in_comment_q: "Կարո՞ղ եմ նշել ինչ֊որ մեկին մեկնաբանության մեջ։"
+      see_mentions_a: "Ահա, սեղմիր «@Հիշատակումներ»֊ը հիմնական էջի ձախ կողմում։"
+      see_mentions_q: "Կարո՞ղ եմ տեսնել այն գրառումները, ուր ես հիշատակված եմ։"
+    pods:
+      find_people_a: "Հրավիրի՛ր ընկերներիդ օգտագործելով աջ կողմի հղումը։ Հետևերի #թագերին , որպեսզի բացահայտես ուրիշների, որ կիսում են քո հետաքրքրությունները և ավելացրու խմբերում նրանց, ով գրառում է քեզ հետաքրքրող բաներ։ Ասա, #ԵսՆորեկԵմ հանրային գրառմամբ ու մարդիկ կկարողանան գտնել քեզ։"
+      find_people_q: "Ես հենց նոր միացա փոդին, ինչպե՞ս կարող եմ գտնել մարդկանց ու կիսվել նրանց հետ։"
+      title: "Փոդեր"
+      what_is_a_pod_a: "Փոդը այն սերվերն է, որի վրա աշխատում է Դիասպորայի ծրագիրը և որը կապված է Դիասպորայաի ցանցին։ «Փոդը» մետաֆորա է /անգլերենում/, որ վերաբերում է պատիճներին, որ իրենց մեջ պարունակում են սերմեր/հաշիվը անգլերենում կոչում են «սերմ»/, ճիշտ նույն ձև ոնց սերվերը իր մեջ պարունակում է հաշիվները։ Կան բազում տարբեր փոդեր։ Դու կարող ես ընկերներ ավելացնել այլ փոդերից և հաղորդակցվել նրանց հետ։ Կարող ես մտածել, որ Դիասպորայի փոդերը /ինչպիսին է օրինակ Սփյուռքը/ նման են էլ․ փոստ տրամադրողներին․ կան հանրային փոդեր, անձնական փոդեր և որոշ ջանք ներդնելու դեպքում նույնիսկ կարող ես քո սեփականը ստեղծել։"
+      what_is_a_pod_q: "Ի՞նչ է փոդը։"
+    third_party_tools: "երրորդ կողմի գործիքներ"
+    tutorial: "ուսուցանող նյութ"
+    tutorials: "ուսուցանող նյութեր"
+    wiki: "վիկի"
   hide: "Թաքցնել"
+  ignore: "Արհամարհել"
   invitation_codes:
     excited: "%{name} ուրախ է քեզ այստեղ տեսնել։"
   invitations:
     a_facebook_user: "Facebook-յան օգտատեր"
+    check_token:
+      not_found: "Հրավերի համարը(token) չգտնվեց"
     create:
       already_contacts: "Այս մարդու հետ արդեն կապ հաստատել ես"
       already_sent: "Այս մարդուն արդեն հրավիրել ես։"
+      empty: "Գոնե մի էլ․փոստ գրիր։"
       no_more: "Այլևս հրավեր ուղարկելու իրավունք չունես։"
       note_already_sent: "Հրավերները արդեն ուղարկվել են հետևյալ հադցեներին. %{emails}"
       own_address: "Դու չես կարող հրավեր ուղարկել քո սեփական հասցեին։"
@@ -335,6 +397,7 @@ hy:
       resend: "Կրկին ուղարկել"
       send_an_invitation: "Հրավեր ուղարկել"
       send_invitation: "Հրավեր ուղարկել"
+      sending_invitation: "Հրավերը ուղարկվում է․․․"
       to: "Ու՞մ"
   layouts:
     application:
@@ -349,6 +412,7 @@ hy:
       admin: "ղեկավար"
       blog: "բլոգ"
       code: "ծածկագիր"
+      help: "Օգնություն"
       login: "մտնել"
       logout: "Դուրս գալ"
       profile: "Անձնական էջ"
@@ -495,6 +559,8 @@ hy:
       edit_membership: "փոփոխել խմբի անդամներին"
     few: "%{count} մարդ"
     helper:
+      is_not_sharing: "%{name}֊ը հետդ չի կիսվում"
+      is_sharing: "%{name} սկսեց կիսվել քո հետ ։)"
       results_for: " արդյունքներ %{params}-ի համար"
     index:
       looking_for: "%{tag_link} պիտակո՞վ գրառումներ ես փնտրում։"
@@ -517,6 +583,7 @@ hy:
       gender: "սեռ"
       in_aspects: "խմբերում"
       location: "տեղակայություն"
+      photos: "Նկարները"
       remove_contact: "ջնջել ընկերոջը"
       remove_from: "Ջնջե՞լ %{name}-ին %{aspect} խմբից։"
     show:
@@ -662,6 +729,7 @@ hy:
     new_request_to_person:
       sent: "ուղարկվեց"
   reshares:
+    comment_email_subject: "%{resharer}֊ը տարածել է %{author}֊ի գրառումը"
     create:
       failure: "Գրառումը տարածելիս խնդիրներ առաջացան։"
     reshare:
@@ -674,10 +742,11 @@ hy:
       reshare_original: "Տարածել բնօրինակը"
       reshared_via: "Տարածվել է"
       show_original: "Ցույց տալ բնօրինակը"
-  search: "Որոնում"
+  search: "Որոնել"
   services:
     create:
       failure: "Նույնականացումը չստացվեց"
+      read_only_access: "Քեզ միայն հասանելի է կարդալը, փորձիր մի անգամ էլ մուտք գործել մի քիչ ուշ"
       success: "Նույնականացումը բարեհաջող անցավ։"
     destroy:
       success: "Նույնականացումը բարեհաջող ջնջվեց։"
@@ -690,11 +759,13 @@ hy:
       connect_to_facebook: "Միացնել Facebook-ին"
       connect_to_tumblr: "Միացնել Tumblr-ին"
       connect_to_twitter: "Միացնել Twitter-ին"
+      connect_to_wordpress: "Միացնել Wordpress֊ին"
       disconnect: "խզել կապը"
       edit_services: "Փոփոխել ծառայությունները"
       logged_in_as: "համակարգում ես որպես"
       no_services: "Դեռևս որևիցե ծառայություն չես միացրել։"
       really_disconnect: "խզե՞լ կապը %{service}-ի հետ"
+      services_explanation: "Այլ ծառայություններ միացնելը հնարավորություն է տալիս հրապարակել քո գրառումները այդ ծառայություններով Սփյուռքում գրառելուն զուգընթաց։"
     inviter:
       click_link_to_accept_invitation: "Անցիր այս հղումով, որ ընդունես քո հրավերը"
       join_me_on_diaspora: "Միացի՛ր ինձ DIASPORA*-ում"
@@ -717,6 +788,10 @@ hy:
       your_diaspora_username_is: "Քո Diaspora-ի օգտանունն է՝ %{diaspora_handle}"
     aspect_dropdown:
       add_to_aspect: "Ավելացնել"
+      toggle:
+        one: "%{count} խմբում"
+        other: "%{count} խմբերում"
+        zero: "Ավելացնել ընկերոջը "
     contact_list:
       all_contacts: "Բոլոր ընկերները"
     footer:
@@ -742,10 +817,14 @@ hy:
       new_user_welcome_message: "Օգտագործիր #hashպիտակները՝ գրառումներդ դասակարգելու և հետաքրքրություններդ կիսող մարդկանց գտնելու համար։ Նշիր ընկերներիդ՝ օգտագործելով @Հիշատակել"
       outside: "Հրապարակային գրառումները տեսանելի կլինեն Diaspora-ից դուրս։"
       share: "Կիսվել"
+      title: "Կարգավորել միացված ծառայությունները"
       visibility_dropdown: "Սեղմիր այս սլաքը՝ քո գրառման տեսանելիությունը ընտրելու համար։  (Խորհուրդ կտանք՝ այս առաջինը հրապարակային նշես։)"
     publisher:
       all: "բոլորը"
       all_contacts: "բոլոր կոնտակտները"
+      discard_post: "Չեղարկել գրառումը"
+      formatWithMarkdown: "Կարող ես օգտագործել %{markdown_link} ֊ը , որպեսզի ձևավորես քո գրառումը"
+      get_location: "Պարզել քո տեղակայությունը"
       make_public: "դարձնել հանրամատչելի"
       new_user_prefill:
         hello: "Ողջու՛յն, ժողովուրդ, #%{new_user_tag}։ "
@@ -754,7 +833,10 @@ hy:
         newhere: "ԵսՆորեկԵմ"
       post_a_message_to: "Գրառել %{aspect}ի կոնտակտների համար"
       posting: "Գրառվում է..."
+      preview: "Նախադիտել"
+      publishing_to: "հրապարակվում է դեպի "
       share: "Կիսվել"
+      share_with: "կիսվել"
       upload_photos: "Վերբեռնել նկարները"
       whats_on_your_mind: "Ի՞նչ կա մտքիդ։"
     reshare:
@@ -768,11 +850,19 @@ hy:
       ignore_user_description: "Ուզում ե՞ս արհամարհել օգտատիրոջն ու ջնջել նրան բոլոր խմբերից"
       like: "Հավանել"
       nsfw: "Այս գրառումը նշված է որպես NSFW հեղինակի կողմից։ %{link}"
+      shared_with: "Տարածվածը տեսանելի է %{aspect_names}֊ին"
       show: "ցուցադրել"
       unlike: "Ապահավանել"
       via: "ըստ %{link}"
       via_mobile: "հեռախոսով"
       viewable_to_anyone: "Այս գրառումը տեսանելի է համացանցում ամենքին"
+  simple_captcha:
+    label: "Ներմուծիր կոդը տուփիկում․"
+    message:
+      default: "Գաղտնի կոդը չի համապատասխանում նկարին"
+      failed: "Կարող ա՞ մարդ չես։ Մարդ լինելու ստուգումը տապալվեց։ Մի հատ կստուգվես։ ;)"
+      user: "Գաղտնի կոդը և նկարը տարբեր են"
+    placeholder: "Ներմուծիր նկարի արժեքը"
   status_messages:
     create:
       success: "%{names} բարեհաջող հիշատակվեցին"
@@ -782,10 +872,7 @@ hy:
       no_message_to_display: "Նամկներ չկան ցույց տալու համար"
     new:
       mentioning: "Հիշատակելով %{person}-ին"
-    too_long:
-      one: "պակասեցրու գրառումդ %{count} նիշով "
-      other: "պակասեցրու գրառումդ %{count} նիշով"
-      zero: "պակասեցրու գրառումդ %{count} նիշով"
+    too_long: "{\"one\"=>\"պակասեցրու գրառումդ %{count} նիշով \", \"other\"=>\"պակասեցրու գրառումդ %{count} նիշով\", \"zero\"=>\"պակասեցրու գրառումդ %{count} նիշով\"}"
   stream_helper:
     hide_comments: "Թաքցնել բոլոր մեկնաբանությունները"
     show_comments:
@@ -865,6 +952,7 @@ hy:
         dont_go: "Հեե՜յ, մի հեռացիր, այստեղ լավ է։"
         if_you_want_this: "Եթե իրոք վստահ ես, ապա ստորև մուտքագրիր գաղտնաբառդ և սեղմիր \"Փակել հաշիվս\""
         lock_username: "Արդյունքում ներկայիս օգտանունդ արգելափակվելու է, եթե որոշես հետագայում ետ գրանցվել։"
+        locked_out: "Դուք դուրս կգաք Ձեր հաշվից և այլևս երբեք չեք կարողանա մտնել։"
         make_diaspora_better: "Կուզենայինք, որ օգնեիր դարձնել Diaspora-ն առավել լավ, այնպես որ հեռանալու փոխարեն լավ կլիներ, որ օգնեիր մեզ այդ հարցում։ Բայց եթե որոշել ես գնալ, ապա ծանոթացիր, թե ինչ կլինի դրա արդյունքում՝"
         mr_wiggles: "Պրն. Փիսոն կտխրի, եթե դու գնաս"
         no_turning_back: "Առայժմ ետդարձի ճանապարհ չկա։"
@@ -896,7 +984,9 @@ hy:
     getting_started:
       awesome_take_me_to_diaspora: "Զի՛լ է։ Տար ինձ Diaspora*"
       community_welcome: "Diaspora-ի համայնքը ուրախ է տեսնել քեզ այստեղ։"
+      connect_to_facebook: "Մենք կարողենք ամենը մի քիչ արագացնել %{link} Դիասպորային։ Դա կներմուծի քո անունը, նկարը և հնարավոր կդարձնի գրառելը երկու տեղում միաժամանակ(cross-posting)։"
       connect_to_facebook_link: "միացրու քո ֆեյսբուքյան հաշվին"
+      hashtag_explanation: "Հեշթեգերը թույլ են տալիս խոսել քո հետաքրքրությունների մասին և հետևել դրանց։  Ինչպես նաև ահավոր հավես ձև է Սփյուռքում* նոր մարդկանց գտնելու համար։"
       hashtag_suggestions: "Փորձիր հետևել պիտակներ, ինչպիսիք են #արվեստ #կինոնկար #gif և այլն։"
       saved: "Պահված է"
       well_hello_there: "Դե ինչ, ողջու՜յն։"
@@ -920,6 +1010,10 @@ hy:
       settings_updated: "Կարգավորումները թարմացված են"
       unconfirmed_email_changed: "Էլ.հասցեն փոխված է և ակտիվացնելու կարիք ունի։"
       unconfirmed_email_not_changed: "Էլ.հասցեի փոփոխումը չհաջողվեց"
+  webfinger:
+    hcard_fetch_failed: "%{account} հաշվի hcard֊ը միացնելիս(fetching) խնդիրներ առաջացան"
+    no_person_constructed: "Անհնար եղավ այս hcard֊ից մարդ ձևավորել։"
+    xrd_fetch_failed: "%{account} հաշվից xrd ստանալիս սխալ եղավ"
   welcome: "Բարի գալու՜ստ"
   will_paginate:
     next_label: "հաջորդ &raquo;"
diff --git a/config/locales/diaspora/ia.yml b/config/locales/diaspora/ia.yml
index 584a9c414..fad8b19bd 100644
--- a/config/locales/diaspora/ia.yml
+++ b/config/locales/diaspora/ia.yml
@@ -12,6 +12,7 @@ ia:
   _home: "Initio"
   _photos: "photos"
   _services: "Servicios"
+  _terms: "terminos"
   account: "Conto"
   activerecord:
     errors:
@@ -24,6 +25,14 @@ ia:
           attributes:
             diaspora_handle:
               taken: "es jam in uso."
+        poll:
+          attributes:
+            poll_answers:
+              not_enough_poll_answers: "Insufficiente optiones de sondage."
+        poll_participation:
+          attributes:
+            poll:
+              already_participated: "Tu ha jam participate a iste sondage."
         request:
           attributes:
             from_id:
@@ -46,6 +55,7 @@ ia:
       correlations: "Correlationes"
       pages: "Paginas"
       pod_stats: "Statisticas de pod"
+      report: "Reportos"
       sidekiq_monitor: "Monitor Sidekiq"
       user_search: "Recerca de usatores"
       weekly_user_stats: "Statisticas septimanal de usatores"
@@ -62,12 +72,36 @@ ia:
       tag_name: "Nomine del etiquetta: <b>%{name_tag}</b> Occurrentias: <b>%{count_tag}</b>"
       usage_statistic: "Statisticas de uso"
       week: "Septimana"
+    user_entry:
+      account_closed: "conto claudite"
+      diaspora_handle: "Pseudonymo de Diaspora"
+      email: "E-mail"
+      guid: "GUID"
+      id: "ID"
+      last_seen: "ultime visita"
+      ? "no"
+      : "no"
+      nsfw: "#nsfw"
+      unknown: "incognite"
+      ? "yes"
+      : si
     user_search:
+      account_closing_scheduled: "Le conto de %{name} es planate a esser claudite. Illo essera processate in alcun momentos…"
       add_invites: "adder invitationes"
+      are_you_sure: "Es tu secur de voler clauder iste conto?"
+      close_account: "clauder conto"
       email_to: "Adresse de e-mail a invitar"
       under_13: "Monstrar usatores con minus de 13 annos (COPPA)"
-      you_currently: "in iste momento, il te resta %{user_invitation} invitationes %{link}"
+      view_profile: "vider profilo"
+      you_currently:
+        one: "il te resta un invitation %{link}"
+        other: "il te resta %{count} invitationes %{link}"
+        zero: "il non te resta invitationes %{link}"
     weekly_user_stats:
+      amount_of:
+        one: "Numero de nove usatores iste septimana: %{count}"
+        other: "Numero de nove usatores iste septimana: %{count}"
+        zero: "Numero de nove usatores iste septimana: zero"
       current_server: "Le data actual del servitor es %{date}"
   ago: "%{time} retro"
   all_aspects: "Tote le aspectos"
@@ -108,13 +142,15 @@ ia:
       success: "%{name} ha essite removite con successo."
     edit:
       add_existing: "Adder un contacto existente"
-      aspect_list_is_not_visible: "le lista de aspectos es celate pro alteres in iste aspecto"
-      aspect_list_is_visible: "le lista de aspectos es visibile pro alteres in iste aspecto"
+      aspect_list_is_not_visible: "Le contactos in iste aspecto non pote vider le un le altere."
+      aspect_list_is_visible: "Le contactos in iste aspecto pote vider le un le altere."
       confirm_remove_aspect: "Es tu secur de voler deler iste aspecto?"
       done: "Finite"
       make_aspect_list_visible: "render contactos in iste aspecto visibile le unes pro le alteres?"
+      manage: "Gerer"
       remove_aspect: "Deler iste aspecto"
       rename: "renominar"
+      set_visibility: "Definir visibilitate"
       update: "actualisar"
       updating: "actualisation in curso"
     few: "%{count} aspectos"
@@ -124,11 +160,11 @@ ia:
       remove: "remover"
     index:
       diaspora_id:
-        content_1: "Tu identitate in Diaspora es:"
-        content_2: "Da lo a alteres e illes potera trovar te in Diaspora."
-        heading: "Identitate in Diaspora"
+        content_1: "Tu ID de diaspora* es:"
+        content_2: "Da lo a alteres e illes potera trovar te in diaspora*."
+        heading: "ID de diaspora*"
       donate: "Donar"
-      handle_explanation: "Isto es tu identitate in Diaspora. Como un adresse de e-mail, tu pote dar isto a personas pro attinger te."
+      handle_explanation: "Isto es tu ID de diaspora*. Como un adresse de e-mail, tu pote dar isto a alteres a fin que illes pote attinger te."
       help:
         any_problem: "Problema?"
         contact_podmin: "Contacta le administrator de tu pod!"
@@ -138,30 +174,30 @@ ia:
         feature_suggestion: "... ha un suggestion de %{link}?"
         find_a_bug: "... ha trovate un %{link}?"
         have_a_question: "... ha un %{link}?"
-        here_to_help: "Le communitate de Diaspora es a tu disposition!"
+        here_to_help: "Le communitate de diaspora* es a tu disposition!"
         mail_podmin: "E-mail del \"podmin\""
         need_help: "Require adjuta?"
         tag_bug: "defecto"
         tag_feature: "functionalitate"
         tag_question: "question"
         tutorial_link_text: "Tutoriales"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Adjuta pro le prime passos."
+        tutorials_and_wiki: "%{faq}, %{tutorial} & %{wiki}: Adjuta pro le prime passos."
       introduce_yourself: "Iste fluxo es le tue. Non hesita… presenta te!"
-      keep_diaspora_running: "Mantene le disveloppamento de Diaspora rapide con un donation mensual!"
+      keep_diaspora_running: "Mantene le disveloppamento de diaspora* rapide con un donation mensual!"
       keep_pod_running: "Adjuta al mantenentia e melioration de %{pod} (e al caffeination de su gerentes) con un donation mensual!"
       new_here:
         follow: "Seque %{link} e saluta nove usatores in diaspora*!"
         learn_more: "Leger plus"
-        title: "Dar le benvenita a nove usatores"
+        title: "Accolliger nove usatores"
       no_contacts: "Nulle contacto"
       no_tags: "+ Cercar un etiquetta a sequer"
       people_sharing_with_you: "Personas qui divide con te"
       post_a_message: "publicar un message >>"
       services:
-        content: "Tu pote connecter le sequente servicios a Diaspora:"
+        content: "Tu pote connecter le sequente servicios a diaspora*:"
         heading: "Connecter servicios"
       unfollow_tag: "Cessar de sequer #%{tag}"
-      welcome_to_diaspora: "Benvenite a Diaspora, %{name}!"
+      welcome_to_diaspora: "Benvenite a diaspora*, %{name}!"
     many: "%{count} aspectos"
     move_contact:
       error: "Error durante le displaciamento del contacto: %{inspect}"
@@ -205,10 +241,10 @@ ia:
       failure: "Io non poteva cessar de ignorar iste usator.  #evasion"
       success: "Vamos vider lo que iste usator ha a dicer! #salutes"
   bookmarklet:
-    explanation: "Invia cosas a Diaspora ab ubique con iste ligamine: %{link}"
+    explanation: "Invia cosas a diaspora* ab ubique con iste ligamine: %{link}"
     heading: "Mini-marcapaginas"
-    post_something: "Inviar a Diaspora"
-    post_success: "Invio succedite!"
+    post_something: "Inviar a diaspora*"
+    post_success: "Invio succedite! Claude…"
   cancel: "Cancellar"
   comments:
     few: "%{count} commentos"
@@ -226,6 +262,7 @@ ia:
     few: "%{count} contactos"
     index:
       add_a_new_aspect: "Adder un nove aspecto"
+      add_contact: "Adder contacto"
       add_to_aspect: "adder contactos a %{name}"
       add_to_aspect_link: "adder contactos a %{name}"
       all_contacts: "Tote le contactos"
@@ -236,9 +273,10 @@ ia:
       no_contacts_message: "Visita %{community_spotlight}"
       no_contacts_message_with_aspect: "Visita %{community_spotlight} o %{add_to_aspect_link}"
       only_sharing_with_me: "Solmente qui divide cosas con me"
-      remove_person_from_aspect: "Remover %{person_name} de \"%{aspect_name}\""
+      remove_contact: "Remover contacto"
       start_a_conversation: "Initiar un conversation"
       title: "Contactos"
+      user_search: "Recerca de usatores"
       your_contacts: "Tu contactos"
     many: "%{count} contactos"
     one: "1 contacto"
@@ -260,7 +298,10 @@ ia:
     destroy:
       success: "Conversation removite con successo"
     index:
+      conversations_inbox: "Conversationes – Cassa de entrata"
+      create_a_new_conversation: "initiar un nove conversation"
       inbox: "Cassa de entrata"
+      new_conversation: "Nove conversation"
       no_conversation_selected: "nulle conversation seligite"
       no_messages: "nulle message"
     new:
@@ -269,6 +310,8 @@ ia:
       sending: "Invia…"
       subject: "subjecto"
       to: "a"
+    new_conversation:
+      fail: "Message non valide"
     show:
       delete: "deler e blocar conversation"
       reply: "responder"
@@ -286,6 +329,7 @@ ia:
       invalid_fields: "Campos invalide"
     login_try_again: "Per favor <a href='%{login_link}'>aperi session</a> e reproba."
     post_not_public: "Le entrata que tu vole vider non es public!"
+    post_not_public_or_not_exist: "Le entrata que tu tenta vider non es public, o non existe."
   fill_me_out: "Plena me"
   find_people: "Cercar personas o #etiquettas"
   help:
@@ -339,6 +383,14 @@ ia:
     getting_started_tutorial: "Serie de tutoriales 'Prime passos'"
     here: "hic"
     irc: "IRC"
+    keyboard_shortcuts:
+      keyboard_shortcuts_a1: "In le vista de fluxo tu pote usar le sequente claves accelerator:"
+      keyboard_shortcuts_li1: "j - saltar al proxime entrata"
+      keyboard_shortcuts_li2: "k - saltar al previe entrata"
+      keyboard_shortcuts_li3: "c - commentar le entrata actual"
+      keyboard_shortcuts_li4: "l - appreciar le entrata actual"
+      keyboard_shortcuts_q: "Qual claves accelerator es disponibile?"
+      title: "Claves accelerator"
     markdown: "Markdown"
     mentions:
       how_to_mention_a: "Dactylographa le signo \"@\" e comencia a dactylographar su nomine. Un menu disrolante deberea apparer que permitte seliger le nomine plus facilemente. Nota ben que il es solmente possibile mentionar personas que tu ha addite a un aspecto."
@@ -350,6 +402,16 @@ ia:
       title: "Mentiones"
       what_is_a_mention_a: "Un mention es un ligamine al pagina de profilo de un persona que appare in un entrata. Quando un persona es mentionate, illa recipe un notification que dirige su attention verso le entrata."
       what_is_a_mention_q: "Que es un \"mention\"?"
+    miscellaneous:
+      back_to_top_a: "Si. Post rolar a basso in un pagina, clicca sur le sagitta gris que appare in le angulo dextre al fundo de tu fenestra de navigator."
+      back_to_top_q: "Ha il un maniera rapide de retornar al cyma del pagina post que io rola a basso?"
+      diaspora_app_a: "Il ha plure applicationes de Android in un stadio precoce de disveloppamento. Plures de iste projectos es abandonate e non functiona ben con le version actual de diaspora*. Non expecta troppo de iste apps in iste momento. Actualmente le melior maniera de acceder a diaspora* a partir de tu dispositivo mobile es per medio de un navigator web, perque nos ha designate un version mobile del sito que deberea functionar ben in tote le dispositivos. Actualmente il non ha un app pro iOS. De novo, diaspora* deberea functionar ben in tu navigator."
+      diaspora_app_q: "Ha il un app diaspora* pro Android o iOS?"
+      photo_albums_a: "No, non in iste momento. Nonobstante, tu pote vider un fluxo de su imagines incargate a partir del section Photos in le barra lateral de lor pagina de profilo."
+      photo_albums_q: "Ha il albumes de photos o videos?"
+      subscribe_feed_a: "Si, ma iste functionalitate non es ancora polite e le formato del resultato es assatis crude. Si tu vole essayar lo in omne caso, va al pagina de profilo de un persona e clicca sur le button de syndication in tu navigator, o tu pote copiar le URL del profilo (p.ex. https://joindiaspora.com/people/alcunnumero) e collar lo in un lector de syndication. Le adresse de syndication resultante ha iste aspecto: https://joindiaspora.com/public/nominedeusator.atom (diaspora* usa Atom, non RSS)."
+      subscribe_feed_q: "Pote io subscriber me al entratas public de un persona con un lector de syndication?"
+      title: "Miscellanea"
     pods:
       find_people_a: "Invita tu amicos usante le ligamine de e-mail in le barra lateral. Seque #etiquettas pro discoperir personas con interesses commun al tues, e adde le personas qui invia cosas de tu interesse a un aspecto. Annuncia tu presentia in disaspora* in un entrata public con le etiquetta #newhere."
       find_people_q: "Io ha justo adherite a un pod, como pote io trovar gente con qui divider?"
@@ -432,6 +494,7 @@ ia:
       title: "Repeter entratas"
     sharing:
       add_to_aspect_a1: "Suppone que Julia adde Mario a un aspecto, ma Mario non ha (ancora) addite Julia a un aspecto:"
+      add_to_aspect_a2: "Isto se appella diffusion asymmetric. Si e quando Ben adde Amy a un aspecto alora illo devenirea un intercambio reciproc: le entratas public e private de Amy e de Ben apparerea in le fluxos le un del altere, etc. "
       add_to_aspect_li1: "Mario recipera notification del facto que Julia a \"comenciate a divider\" con Mario."
       add_to_aspect_li2: "Julia videra ab iste momento in su fluxo le entratas public de Mario."
       add_to_aspect_li3: "Julia non videra alcun entrata private de Mario."
@@ -440,18 +503,32 @@ ia:
       add_to_aspect_li6: "Ben potera vider le profilo private de Amy (biographia, loco, sexo, die de nascentia)."
       add_to_aspect_li7: "Amy apparera sub \"Divide solmente con me\" in le pagina de contactos de Ben."
       add_to_aspect_q: "Que eveni quando io adde un persona a un de mi aspectos, o quando un persona me adde a un de su aspectos?"
+      list_not_sharing_a: "No, ma tu pote determinar si un persona divide cosas con te per visitar su pagina de profilo. Si le persona lo face, le barra sub su imagine de profilo es verde; si non, illo es gris. Tu recipe un notification cata vice que un persona comencia a divider cosas con te."
+      list_not_sharing_q: "Ha il un lista de personas que io ha addite a un de mi aspectos, ma qui non me ha addite a un del lores?"
+      only_sharing_a: "Se tracta del personas qui te ha addite a un de lor aspectos, ma qui non es (ancora) in alcun de tu aspectos. In altere parolas, illes divide cosas con te, ma tu non divide alcun cosa con illes (diffusion asymmetric). Si tu les adde a un aspecto, illes apparera sub ille aspecto e non sub \"divide solmente con me\". Vide hic supra."
+      only_sharing_q: "Proque es le personas listate in \"Divide solmente con me\" in mi pagina de contactos?"
+      see_old_posts_a: "No. Ille potera vider solmente le entratas nove in ille aspecto. Ille (e tote le mundo) pote vider tu entratas public ancian in tu pagina de profilo, e ille los videra forsan in su fluxo."
+      see_old_posts_q: "Quando io adde un persona a un aspecto, pote ille vider le ancian entratas que io ha jam inviate a ille aspecto?"
       title: "Divider"
     tags:
+      filter_tags_a: "Iste functionalitate non es ancora disponibile directemente de diaspora*, ma alcun %{third_party_tools} ha essite scribite que pote fornir lo."
+      filter_tags_q: "Como pote io filtrar/excluder alcun etiquettas de mi fluxo?"
+      followed_tags_a: "Post cercar un etiquetta tu pote cliccar sur le button al cyma del pagina del etiquetta pro \"sequer\" ille etiquetta. Illo apparera in le lista de etiquettas sequite al sinistra. Un clic sur un de tu etiquettas sequite te porta al pagina de ille etiquetta, de sorta que tu pote vider le entrata recente que contine ille etiquetta. Clicca sur \"#etiquettas sequite\" pro vider un fluxo de entratas que include qualcunque etiquetta que tu seque. "
+      followed_tags_q: "Que es \"etiquettas #sequite\" e como seque io un etiquetta?"
+      people_tag_page_a: "Illes es le personas qui ha listate ille etiquetta pro describer se in lor profilos public."
+      people_tag_page_q: "Qui es le personas listate al latere sinistre de un pagina de etiquetta?"
       tags_in_comments_a: "Un etiquetta addite a un entrata appare como ligamine al pagina de iste etiquetta, ma non face le message (o commento) in question apparer in iste pagina de etiquetta. Isto functiona solmente pro etiquettas in entratas."
       tags_in_comments_q: "Pote io mitter etiquettas in commentos o solmente in messages?"
       title: "Etiquettas"
       what_are_tags_for_a: "Etiquettas servi a categorisar un entrata, normalmente per topico. Si tu cerca un etiquetta, es monstrate tote le entratas visibile pro te (public e private) con iste etiquetta. Isto permitte al personas interessate in un certe topico cercar le entratas public concernente lo."
       what_are_tags_for_q: "A que servi etiquettas?"
     third_party_tools: "instrumentos de tertie personas"
+    title_header: "Adjuta"
     tutorial: "tutorial"
     tutorials: "tutoriales"
     wiki: "wiki"
   hide: "Celar"
+  ignore: "Ignorar"
   invitation_codes:
     excited: "%{name} es multo felice de vider te hic."
   invitations:
@@ -473,10 +550,10 @@ ia:
     new:
       already_invited: "Le sequente personas non ha acceptate tu invitation:"
       aspect: "Aspecto"
-      check_out_diaspora: "Discoperi Diaspora!"
+      check_out_diaspora: "Discoperi diaspora*!"
       comma_separated_plz: "Tu pote entrar plure adresses de e-mail separante los per commas."
       if_they_accept_info: "si iste persona accepta, illa essera addite al aspecto in le qual tu la invitava."
-      invite_someone_to_join: "Invita qualcuno a unir se a Diaspora!"
+      invite_someone_to_join: "Invita qualcuno a unir se a diaspora*!"
       language: "Lingua"
       paste_link: "Divide iste ligamine con tu amicos pro invitar les a diaspora*, o invia le ligamine directemente a illes per e-mail."
       personal_message: "Message personal"
@@ -489,7 +566,7 @@ ia:
     application:
       back_to_top: "Retornar al cyma"
       powered_by: "Actionate per diaspora*"
-      public_feed: "Fluxo public de Diaspora pro %{name}"
+      public_feed: "Fluxo public de diaspora* pro %{name}"
       source_package: "discargar le pacchetto con le codice-fonte"
       toggle: "(dis)activar mobile"
       whats_new: "que es nove?"
@@ -498,23 +575,69 @@ ia:
       admin: "admin"
       blog: "blog"
       code: "codice"
+      help: "Adjuta"
       login: "aperir session"
       logout: "Clauder session"
       profile: "Profilo"
       recent_notifications: "Notificationes recente"
       settings: "Configuration"
       view_all: "Vider totes"
+  likes:
+    likes:
+      people_dislike_this:
+        one: "%{count} antipathia"
+        other: "%{count} antipathias"
+        zero: "nulle antipathia "
   limited: "Limitate"
   more: "Plus"
   next: "sequente"
   no_results: "Nulle resultato trovate"
   notifications:
+    also_commented:
+      one: "%{actors} anque commentava le entrata de %{post_author}, %{post_link}."
+      other: "%{actors} anque commentava le entrata de %{post_author}, %{post_link}."
+      zero: "%{actors} anque commentava le entrata de %{post_author}, %{post_link}."
+    comment_on_post:
+      one: "%{actors} commentava tu entrata %{post_link}."
+      other: "%{actors} commentava tu entrata %{post_link}."
+      zero: "%{actors} commentava tu entrata %{post_link}."
     index:
+      all_notifications: "Tote le notificationes"
+      also_commented: "Anque commentate"
       and: "e"
+      comment_on_post: "Commentar iste entrata"
+      liked: "Appreciate"
       mark_all_as_read: "Marcar totes como legite"
+      mark_all_shown_as_read: "Marcar tote le entratas monstrate como legite"
+      mark_read: "Marcar como legite"
       mark_unread: "Marcar como non legite"
+      mentioned: "Mentionate"
       notifications: "Notificationes"
+      reshared: "Repetite"
+      show_all: "monstrar totes"
+      show_unread: "monstrar non legite"
+      started_sharing: "Comenciate a divider"
+    liked:
+      one: "%{actors} ha appreciate tu entrata %{post_link}."
+      other: "%{actors} ha appreciate tu entrata %{post_link}."
+      zero: "%{actors} ha appreciate tu entrata %{post_link}."
+    mentioned:
+      one: "%{actors} te ha mentionate in le entrata %{post_link}."
+      other: "%{actors} te ha mentionate in le entrata %{post_link}."
+      zero: "%{actors} te ha mentionate in le entrata %{post_link}."
     post: "entrata"
+    private_message:
+      one: "%{actors} te ha inviate un message."
+      other: "%{actors} te ha inviate un message."
+      zero: "%{actors} te ha inviate un message."
+    reshared:
+      one: "%{actors} ha repetite tu entrata %{post_link}."
+      other: "%{actors} ha repetite tu entrata %{post_link}."
+      zero: "%{actors} ha repetite tu entrata %{post_link}."
+    started_sharing:
+      one: "%{actors} ha comenciate a divider cosas con te."
+      other: "%{actors} ha comenciate a divider cosas con te."
+      zero: "%{actors} ha comenciate a divider cosas con te."
   notifier:
     a_post_you_shared: "un entrata."
     accept_invite: "Accepta tu invitation a diaspora*!"
@@ -530,7 +653,7 @@ ia:
       message: |-
           Hallo,
 
-          Tu ha essite invitate a unir te a Diaspora*!
+          Tu ha essite invitate a unir te a diaspora*!
 
           Clicca sur iste ligamine pro comenciar:
 
@@ -539,7 +662,7 @@ ia:
 
           Cordialmente,
 
-          Le robot de e-mail de Diaspora*
+          Le messagero robotic de diaspora*
 
           [1]: %{invite_url}
     invited_you: "%{name} te ha invitate a diaspora*"
@@ -551,12 +674,32 @@ ia:
       subject: "%{name} te ha mentionate in diaspora*"
     private_message:
       reply_to_or_view: "Responde o lege iste conversation >"
+    report_email:
+      body: |-
+          Salute,
+
+          le %{type} con ID %{id} ha essite marcate como offensive.
+
+          [%{url}][1]
+
+          Per favor revide isto le plus tosto possibile!
+
+
+          Cordialmente,
+
+          Le messagero robotic de diaspora*
+
+          [1]: %{url}
+      subject: "Un nove %{type} ha essite marcate como offensive"
+      type:
+        comment: "commento"
+        post: "entrata"
     reshared:
       reshared: "%{name} ha repetite tu entrata"
       view_post: "Vider entrata >"
     single_admin:
-      admin: "Tu administrator de Diaspora"
-      subject: "Un message concernente tu conto de Diaspora:"
+      admin: "Le tue administrator de diaspora*"
+      subject: "Un message concernente tu conto de diaspora*:"
     started_sharing:
       sharing: "ha comenciate a divider con te!"
       subject: "%{name} comenciava a divider cosas con te in diaspora*"
@@ -581,11 +724,14 @@ ia:
       is_sharing: "%{name} is sharing with you"
       results_for: " resultatos pro %{params}"
     index:
+      couldnt_find_them: "Non trovate?"
       looking_for: "Cerca entratas con le etiquetta %{tag_link}?"
       no_one_found: "…e nemo ha essite trovate."
       no_results: "Un momento! Tu debe cercar qualcosa."
-      results_for: "cercar resultatos pro"
+      results_for: "Usatores correspondente a %{search_term}"
+      search_handle: "Usa lor ID de diaspora* (p.ex. nominedeusator@pod.tld) pro cercar tu amicos."
       searching: "recerca in curso, un momento per favor..."
+      send_invite: "Ancora nihil? Invia un invitation!"
     many: "%{count} personas"
     one: "1 persona"
     other: "%{count} personas"
@@ -675,10 +821,13 @@ ia:
   profile: "Profilo"
   profiles:
     edit:
-      allow_search: "Permitter que on te cerca in Diaspora"
+      allow_search: "Permitter que on te cerca in diaspora*"
       edit_profile: "Modificar profilo"
       first_name: "Prenomine"
       last_name: "Nomine de familia"
+      nsfw_check: "Marcar toto que io divide como NSFW"
+      nsfw_explanation: "NSFW (‘not safe for work’, non appropriate pro le travalio) es un standard communitari pro contento que poterea esser inappropriate a vider durante que on es al travalio. Si tu intende a frequentemente divider tal material, per favor, marca iste option, de sorta que tote le cosas que tu divide essera celate pro le personas qui non ha optate pro vider los."
+      nsfw_explanation2: "Si tu non selige iste option, per favor, adde le etiquetta #nsfw cata vice que tu divide tal material."
       update_profile: "Actualisar profilo"
       your_bio: "Tu bio"
       your_birthday: "Tu data de nascentia"
@@ -695,9 +844,9 @@ ia:
       updated: "Profilo actualisate"
   public: "Public"
   registrations:
-    closed: "Le creation de contos es claudite in iste pod de Diaspora."
+    closed: "Le creation de contos es claudite in iste pod de diaspora*."
     create:
-      success: "Tu ha adherite a Diaspora!"
+      success: "Tu ha adherite a diaspora*!"
     edit:
       cancel_my_account: "Cancellar mi conto"
       edit: "Modificar %{name}"
@@ -709,7 +858,7 @@ ia:
     new:
       continue: "Continuar"
       create_my_account: "Crear mi conto!"
-      diaspora: "<3 Diaspora*"
+      diaspora: "<3 diaspora*"
       email: "E-MAIL"
       enter_email: "Specifica adresse de e-mail"
       enter_password: "Elige un contrasigno (de sex characteres al minimo)"
@@ -721,11 +870,29 @@ ia:
       password_confirmation: "CONFIRMA CONTRASIGNO"
       sign_up: "CREAR CONTO"
       sign_up_message: "Rete social con ♥"
+      submitting: "Submitte…"
+      terms: "Per crear un conto tu accepta le %{terms_link}."
+      terms_link: "conditiones de servicio"
       username: "NOMINE DE USATOR"
+  report:
+    comment_label: "<b>Commento</b>:<br>%{data}"
+    confirm_deletion: "Es tu secur de voler deler le elemento?"
+    delete_link: "Deler elemento"
+    not_found: "<u>Le entrata/commento non ha essite trovate. Pare que le usator lo ha delite.</u>"
+    post_label: "<b>Entrata</b>: %{title}"
+    reason_label: "Motivo: %{text}"
+    reported_label: "<b>Reportate per</b> %{person}"
+    review_link: "Marcar como revidite"
+    status:
+      created: "Un reporto ha essite create"
+      destroyed: "Le entrata ha essite destruite"
+      failed: "Qualcosa ha errate"
+      marked: "Le reporto ha essite marcate como revidite"
+    title: "Summario de reportos"
   requests:
     create:
       sending: "Invio in curso"
-      sent: "Tu ha demandate de divider con %{name}. Iste persona lo videra le proxime vice que illa aperira session in Diaspora."
+      sent: "Tu ha demandate de divider con %{name}. Iste persona lo videra le proxime vice que illa aperira session in diaspora*."
     destroy:
       error: "Per favor selige un aspecto!"
       ignore: "Demanda de contacto ignorate."
@@ -757,25 +924,26 @@ ia:
     failure:
       error: "un error occurreva durante le connexion a iste servicio"
     finder:
-      fetching_contacts: "Diaspora obtene presentemente tu amicos de %{service}. Per favor reveni in alcun pauc minutas."
+      fetching_contacts: "diaspora* obtene presentemente tu amicos de %{service}. Per favor reveni in alcun pauc minutas."
       no_friends: "Nulle amico de Facebook trovate."
       service_friends: "Amicos de %{service}"
     index:
       connect_to_facebook: "Connecter a Facebook"
       connect_to_tumblr: "Connecter a Tumblr"
       connect_to_twitter: "Connecter a Twitter"
+      connect_to_wordpress: "Connecter a WordPress"
       disconnect: "disconnecter"
       edit_services: "Modificar servicios"
       logged_in_as: "identificate como"
       no_services: "Tu non ha ancora connectite alcun servicio."
       really_disconnect: "disconnecter %{service}?"
-      services_explanation: "Le connexion a servicios da le possibilitate de publicar tu messages anque in illos si tu los scribe in Diaspora."
+      services_explanation: "Le connexion a servicios da le possibilitate de publicar tu messages anque in illos si tu los scribe in diaspora*."
     inviter:
       click_link_to_accept_invitation: "Seque iste ligamine pro acceptar tu invitation"
       join_me_on_diaspora: "Veni con me in diaspora*"
     remote_friend:
       invite: "invitar"
-      not_on_diaspora: "Non ancora in Diaspora"
+      not_on_diaspora: "Non ancora in diaspora*"
       resend: "reinviar"
   settings: "Configuration"
   share_visibilites:
@@ -785,11 +953,11 @@ ia:
   shared:
     add_contact:
       add_new_contact: "Adder un nove contacto"
-      create_request: "Cercar per ID de Diaspora"
+      create_request: "Cercar per ID de diaspora*"
       diaspora_handle: "diaspora@pod.org"
-      enter_a_diaspora_username: "Entra un nomine de usator de Diaspora:"
+      enter_a_diaspora_username: "Entra un nomine de usator de diaspora*:"
       know_email: "Si tu cognosce su adresse de e-mail, tu deberea invitar le/la."
-      your_diaspora_username_is: "Tu nomine de usator de Diaspora es: %{diaspora_handle}"
+      your_diaspora_username_is: "Tu nomine de usator de diaspora* es: %{diaspora_handle}"
     aspect_dropdown:
       add_to_aspect: "Adder contacto"
     contact_list:
@@ -805,8 +973,8 @@ ia:
       invite_someone: "Invitar un persona"
       invite_your_friends: "Invitar tu amicos"
       invites: "Invitationes"
-      invites_closed: "Le invitationes es actualmente claudite pro iste pod de Diaspora."
-      share_this: "Divide iste ligamine per e-mail, blog, o tu rete social favorite!"
+      invites_closed: "Le invitationes es actualmente claudite pro iste pod de diaspora*."
+      share_this: "Divide iste ligamine per e-mail, blog o rete social!"
     notification:
       new: "Nove %{type} de %{from}"
     public_explain:
@@ -815,7 +983,7 @@ ia:
       logged_in: "identificate in %{service}"
       manage: "Gerer servicios connectite"
       new_user_welcome_message: "Usa #etiquettas pro classificar tu messages e trovar personas con interesses in commun. Commenda personas extraordinari con @Mentiones."
-      outside: "Le messages public essera visibile pro altere personas foras de Diaspora."
+      outside: "Le messages public essera visibile pro altere personas foras de diaspora*."
       share: "Divider"
       title: "Connecter altere servicios"
       visibility_dropdown: "Iste menu disrolante es pro cambiar le visibilitate de tu message. (Nos suggere que tu rende iste prime message public.)"
@@ -823,6 +991,7 @@ ia:
       all: "totes"
       all_contacts: "tote le contactos"
       discard_post: "Abandonar message"
+      formatWithMarkdown: "Tu pote usar %{markdown_link} pro formatar tu entrata"
       get_location: "Localisar te"
       make_public: "render public"
       new_user_prefill:
@@ -830,10 +999,17 @@ ia:
         i_like: "Io me interessa in %{tags}. "
         invited_by: "Gratias pro le invitation, "
         newhere: "NewHere"
+      poll:
+        add_a_poll: "Adder un sondage"
+        add_poll_answer: "Adder option"
+        option: "Option 1"
+        question: "Question"
+        remove_poll_answer: "Remover option"
       post_a_message_to: "Inviar un message a %{aspect}"
       posting: "Invio in curso…"
       preview: "Previsualisation"
       publishing_to: "va publicar in: "
+      remove_location: "Remover loco"
       share: "Divider"
       share_with: "divider con"
       upload_photos: "Incargar photos"
@@ -855,6 +1031,13 @@ ia:
       via: "via %{link}"
       via_mobile: "via mobile"
       viewable_to_anyone: "Iste message es visibile pro tote le mundo in le web"
+  simple_captcha:
+    label: "Scribe le codice in le quadro:"
+    message:
+      default: "Le codice secrete non corresponde al imagine"
+      failed: "Verification human fallite"
+      user: "Le imagine secrete e le codice differe"
+    placeholder: "Scribe le valor del imagine"
   status_messages:
     create:
       success: "Ha essite mentionate: %{names}"
@@ -864,6 +1047,7 @@ ia:
       no_message_to_display: "Nulle message a presentar."
     new:
       mentioning: "Mentiona: %{person}"
+    too_long: "Per favor, non scribe plus de %{count} characteres in tu message de stato. In iste momento illo ha %{current_length} characteres."
   stream_helper:
     hide_comments: "Celar tote le commentos"
   streams:
@@ -910,6 +1094,10 @@ ia:
   tags:
     show:
       follow: "Sequer #%{tag}"
+      followed_by_people:
+        one: "sequite per un persona"
+        other: "sequite per %{count} personas"
+        zero: "sequite per necuno"
       following: "Sequente #%{tag}"
       nobody_talking: "Nemo parla ancora de \"%{tag}\"."
       none: "Le etiquetta vacue non existe!"
@@ -925,12 +1113,12 @@ ia:
       email_not_confirmed: "Le adresse de e-mail non poteva esser activate. Ligamine incorrecte?"
     destroy:
       no_password: "Per favor entra tu contrasigno actual pro clauder tu conto."
-      success: "Tu conto ha essite blocate. Le clausura definitive de tu conto pote durar 20 minutas. Gratias pro haber essayate Diaspora."
+      success: "Tu conto ha essite blocate. Le clausura definitive de tu conto pote durar 20 minutas. Gratias pro haber essayate diaspora*."
       wrong_password: "Le contrasigno entrate non corresponde a tu contrasigno actual."
     edit:
-      also_commented: "...un altere persona commenta un entrata de un contacto tue?"
-      auto_follow_aspect: "Aspecto pro usatores sequite automaticamente:"
-      auto_follow_back: "Sequer automaticamente omne persona qui comencia a sequer te"
+      also_commented: "un persona commenta un entrata que tu ha commentate"
+      auto_follow_aspect: "Aspecto pro contactos automaticamente addite:"
+      auto_follow_back: "Divider automaticamente con omne persona qui comencia a divider con te"
       change: "Cambiar"
       change_email: "Cambiar adresse de e-mail"
       change_language: "Cambiar de lingua"
@@ -941,12 +1129,12 @@ ia:
         if_you_want_this: "Si tu vermente vole facer isto, entra hic infra tu contrasigno e clicca sur 'Clauder conto'."
         lock_username: "Isto reserva tu nomine de usator in caso que tu decide de re-crear tu conto."
         locked_out: "Tu session essera claudite e tu essera excludite de tu conto."
-        make_diaspora_better: "Nos ha besonio de adjuta pro meliorar Diaspora, dunque, per favor contribue in loco de partir. Si tu vermente vole partir, nos vole informar te de lo que evenira."
+        make_diaspora_better: "Nos ha besonio de adjuta pro meliorar diaspora*, dunque, per favor contribue in loco de quitar. Si tu vermente vole quitar, nos vole informar te de lo que evenira."
         mr_wiggles: "Sr. Wiggles essera triste de vider te partir"
         no_turning_back: "Tu ha arrivate al puncto de non retorno."
-        what_we_delete: "Nos va deler, le plus tosto possibile, tote le entratas e datos de profilo pertinente a te. Tu commentos remanera, ma essera associate con tu ID de Diaspora in loco de tu nomine."
+        what_we_delete: "Nos va deler, le plus tosto possibile, tote le entratas e datos de profilo pertinente a te. Tu commentos remanera, ma essera associate con tu ID de diaspora* in loco de tu nomine."
       close_account_text: "Clauder conto"
-      comment_on_post: "...un persona commenta un entrata tue?"
+      comment_on_post: "un persona commenta un entrata tue"
       current_password: "Contrasigno actual"
       current_password_expl: "illo con que tu aperi session..."
       download_photos: "discargar mi photos"
@@ -954,27 +1142,28 @@ ia:
       edit_account: "Modificar conto"
       email_awaiting_confirmation: "Nos te ha inviate un ligamine de activation al adresse %{unconfirmed_email}. Usque al momento que tu seque iste ligamine pro activar le nove adresse, nos va continuar a usar tu adresse original %{email}."
       export_data: "Exportar datos"
-      following: "Configuration de sequimento"
+      following: "Configuration de divider"
       getting_started: "Preferentias de nove usator"
-      liked: "...un persona apprecia tu entrata?"
-      mentioned: "...un persona te mentiona in un entrata sue?"
+      liked: "un persona apprecia un entrata tue"
+      mentioned: "un persona te mentiona in un entrata sue"
       new_password: "Contrasigno nove"
       photo_export_unavailable: "Le exportation de photos non es actualmente disponibile"
-      private_message: "...tu recipe un message private?"
-      receive_email_notifications: "Reciper notificationes per e-mail quando..."
-      reshared: "...un persona repete tu entrata?"
-      show_community_spotlight: "Monstrar \"Usatores in evidentia\" in fluxo?"
-      show_getting_started: "Re-activar \"Como initiar\""
-      started_sharing: "...un persona comencia a divider cosas con te?"
+      private_message: "tu recipe un message private"
+      receive_email_notifications: "Reciper notificationes per e-mail quando:"
+      reshared: "un persona repete un entrata tue"
+      show_community_spotlight: "Monstrar \"Usatores in evidentia\" in fluxo"
+      show_getting_started: "Monstrar le avisos \"Como initiar\""
+      someone_reported: "alcuno ha inviate un reporto"
+      started_sharing: "un persona comencia a divider cosas con te"
       stream_preferences: "Preferentias de fluxo"
       your_email: "Tu adresse de e-mail"
-      your_handle: "Tu ID de Diaspora"
+      your_handle: "Tu ID de diaspora*"
     getting_started:
       awesome_take_me_to_diaspora: "Superbe! Conduce me a diaspora*"
-      community_welcome: "Le communitate de Diaspora es felice de dar te le benvenita!"
-      connect_to_facebook: "Nos pote accelerar le cosas un poco per %{link} a Diaspora. Isto insere automaticamente tu nomine e photo, e permitte inviar entratas a ambe sitos."
+      community_welcome: "Le communitate de diaspora* es felice de accolliger te!"
+      connect_to_facebook: "Nos pote accelerar le cosas un poco per %{link} a diaspora*. Isto insere automaticamente tu nomine e photo, e permitte inviar entratas a ambe sitos."
       connect_to_facebook_link: "connecter tu conto de Facebook"
-      hashtag_explanation: "Le #etiquettas permitte discuter e sequer tu interesses. Illos anque es un bon maniera de trovar nove personas in Diaspora."
+      hashtag_explanation: "Le #etiquettas permitte discuter e sequer tu interesses. Illos anque es un bon maniera de trovar nove personas in diaspora*."
       hashtag_suggestions: "Tenta sequer etiquettas como #arte, #films, #gif, etc."
       saved: "Salveguardate!"
       well_hello_there: "Salutationes a te!"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 56c2bee63..099d2e271 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -191,7 +191,6 @@ id:
       no_contacts_message: "Lihat juga %{community_spotlight}"
       no_contacts_message_with_aspect: "Lihat %{community_spotlight} atau %{add_to_aspect_link}"
       only_sharing_with_me: "Hanya berbagi dengan saya"
-      remove_person_from_aspect: "Hapus %{aspect_name} dari \"%{person_name}\""
       start_a_conversation: "Mulai pembicaraan"
       title: "Kontak"
       your_contacts: "Kontakmu"
@@ -636,13 +635,7 @@ id:
   status_messages:
     helper:
       no_message_to_display: "Tidak ada pesan yang dapat ditampilkan."
-    too_long:
-      few: "please make your status messages less than %{count} characters"
-      many: "please make your status messages less than %{count} characters"
-      one: "please make your status messages less than %{count} character"
-      other: "please make your status messages less than %{count} characters"
-      two: "please make your status messages less than %{count} characters"
-      zero: "please make your status messages less than %{count} characters"
+    too_long: "{\"few\"=>\"please make your status messages less than %{count} characters\", \"many\"=>\"please make your status messages less than %{count} characters\", \"one\"=>\"please make your status messages less than %{count} character\", \"other\"=>\"please make your status messages less than %{count} characters\", \"two\"=>\"please make your status messages less than %{count} characters\", \"zero\"=>\"please make your status messages less than %{count} characters\"}"
   stream_helper:
     hide_comments: "hide comments"
     show_comments:
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index 0bc2b1a42..4fb2032cd 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -681,13 +681,7 @@ is:
       failure: "Ekki tókst að eyða færslu"
     helper:
       no_message_to_display: "Engin skilaboð að sýna!"
-    too_long:
-      few: "please make your status messages less than %{count} characters"
-      many: "please make your status messages less than %{count} characters"
-      one: "please make your status messages less than %{count} character"
-      other: "please make your status messages less than %{count} characters"
-      two: "please make your status messages less than %{count} characters"
-      zero: "please make your status messages less than %{count} characters"
+    too_long: "{\"few\"=>\"please make your status messages less than %{count} characters\", \"many\"=>\"please make your status messages less than %{count} characters\", \"one\"=>\"please make your status messages less than %{count} character\", \"other\"=>\"please make your status messages less than %{count} characters\", \"two\"=>\"please make your status messages less than %{count} characters\", \"zero\"=>\"please make your status messages less than %{count} characters\"}"
   stream_helper:
     hide_comments: "fela athugasemdir"
     show_comments:
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index ff0b43f14..3662768a1 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -261,7 +261,6 @@ it:
       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"
       title: "Contatti"
       your_contacts: "I tuoi contatti"
@@ -1031,10 +1030,7 @@ it:
       no_message_to_display: "Nessun messaggio da visualizzare."
     new:
       mentioning: "Stai menzionando: %{person}"
-    too_long:
-      one: "per favore scrivi i tuoi stati con meno di %{count} carattere"
-      other: "per favore scrivi i tuoi stati con meno di %{count} caratteri"
-      zero: "per favore scrivi i tuoi stati con meno di %{count} caratteri"
+    too_long: "{\"one\"=>\"per favore scrivi i tuoi stati con meno di %{count} carattere\", \"other\"=>\"per favore scrivi i tuoi stati con meno di %{count} caratteri\", \"zero\"=>\"per favore scrivi i tuoi stati con meno di %{count} caratteri\"}"
   stream_helper:
     hide_comments: "Nascondi i commenti"
     show_comments:
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index 7a1e04dd4..55c8aac42 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -204,7 +204,6 @@ ja:
       no_contacts_message: "%{community_spotlight}をチェックアウトする"
       no_contacts_message_with_aspect: "%{community_spotlight}または%{add_to_aspect_link}をチェックアウトする"
       only_sharing_with_me: "自分だけに共有する"
-      remove_person_from_aspect: "%{person_name}さんを%{aspect_name}から削除する"
       start_a_conversation: "会話を開始する"
       title: "連絡先"
       your_contacts: "あなたの連絡先"
@@ -774,13 +773,7 @@ ja:
       no_message_to_display: "表示するメッセージがありません。"
     new:
       mentioning: "%{person}さんのメンション"
-    too_long:
-      few: "please make your status messages less than %{count} characters"
-      many: "please make your status messages less than %{count} characters"
-      one: "please make your status messages less than %{count} character"
-      other: "please make your status messages less than %{count} characters"
-      two: "please make your status messages less than %{count} characters"
-      zero: "please make your status messages less than %{count} characters"
+    too_long: "{\"few\"=>\"please make your status messages less than %{count} characters\", \"many\"=>\"please make your status messages less than %{count} characters\", \"one\"=>\"please make your status messages less than %{count} character\", \"other\"=>\"please make your status messages less than %{count} characters\", \"two\"=>\"please make your status messages less than %{count} characters\", \"zero\"=>\"please make your status messages less than %{count} characters\"}"
   stream_helper:
     hide_comments: "コメントを非表示にする"
     show_comments:
diff --git a/config/locales/diaspora/ka.yml b/config/locales/diaspora/ka.yml
index 06429357e..4a217c28e 100644
--- a/config/locales/diaspora/ka.yml
+++ b/config/locales/diaspora/ka.yml
@@ -196,7 +196,6 @@ ka:
       no_contacts_message: "ნახე %{community_spotlight}"
       no_contacts_message_with_aspect: "ნახე %{community_spotlight} ან %{add_to_aspect_link}"
       only_sharing_with_me: "აზიარებს მხოლოდ ჩემთან"
-      remove_person_from_aspect: "ამოშლა %{person_name} \"%{aspect_name}\"-დან"
       start_a_conversation: "დაიწყე საუბარი"
       title: "კონტაქტები"
       your_contacts: "შენი კონტაქტები"
@@ -753,13 +752,7 @@ ka:
       no_message_to_display: "არ არის მესიჯები."
     new:
       mentioning: "Mentioning: %{person}"
-    too_long:
-      few: "please make your status messages less than %{count} characters"
-      many: "please make your status messages less than %{count} characters"
-      one: "please make your status messages less than %{count} character"
-      other: "please make your status messages less than %{count} characters"
-      two: "please make your status messages less than %{count} characters"
-      zero: "please make your status messages less than %{count} characters"
+    too_long: "{\"few\"=>\"please make your status messages less than %{count} characters\", \"many\"=>\"please make your status messages less than %{count} characters\", \"one\"=>\"please make your status messages less than %{count} character\", \"other\"=>\"please make your status messages less than %{count} characters\", \"two\"=>\"please make your status messages less than %{count} characters\", \"zero\"=>\"please make your status messages less than %{count} characters\"}"
   stream_helper:
     hide_comments: "დამალე ყველა კომენატარი"
     show_comments:
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index 3d116d3a9..9cba1f4a6 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -254,7 +254,6 @@ ko:
       no_contacts_message: "%{community_spotlight}를 확인하세요"
       no_contacts_message_with_aspect: "%{community_spotlight}를 확인하거나 %{add_to_aspect_link}"
       only_sharing_with_me: "나와만 공유하고 있는 사람들"
-      remove_person_from_aspect: "\"%{aspect_name} 애스펙에서 %{person_name}님 지우기"
       start_a_conversation: "대화를 시작하세요"
       title: "컨택"
       your_contacts: "내 컨택"
@@ -885,9 +884,7 @@ ko:
       no_message_to_display: "표시할 게시물이 없습니다."
     new:
       mentioning: "%{person}님을 멘션합니다"
-    too_long:
-      other: "상태 메시지를 %{count}자보다 적게 줄여주세요"
-      zero: "상태 메시지를 %{count}자보다 적게 줄여주세요"
+    too_long: "{\"other\"=>\"상태 메시지를 %{count}자보다 적게 줄여주세요\", \"zero\"=>\"상태 메시지를 %{count}자보다 적게 줄여주세요\"}"
   stream_helper:
     hide_comments: "모든 댓글 숨기기"
     show_comments:
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 1fa7387b5..c172f8d74 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -191,7 +191,6 @@ lt:
       no_contacts_message: "Peržiūrėti %{community_spotlight}"
       no_contacts_message_with_aspect: "Peržiūrėti %{community_spotlight} arba %{add_to_aspect_link}"
       only_sharing_with_me: "Tik tie, kurie su manimi dalijasi"
-      remove_person_from_aspect: "Ištrinti %{person_name} iš kategorijos \"%{aspect_name}\""
       start_a_conversation: "Pradėti pokalbį"
       title: "Kontaktai"
       your_contacts: "Jūsų kontaktai"
@@ -602,11 +601,7 @@ lt:
   status_messages:
     helper:
       no_message_to_display: "Žinučių nėra."
-    too_long:
-      few: "Sutrumpinkite savo statuso pranešimą %{count} ženklais"
-      one: "Sutrumpinkite savo statuso pranešimą %{count} ženklu"
-      other: "Sutrumpinkite savo statuso pranešimą %{count} ženklų"
-      zero: "Sutrumpinkite savo statuso pranešimą %{count} ženklų"
+    too_long: "{\"few\"=>\"Sutrumpinkite savo statuso pranešimą %{count} ženklais\", \"one\"=>\"Sutrumpinkite savo statuso pranešimą %{count} ženklu\", \"other\"=>\"Sutrumpinkite savo statuso pranešimą %{count} ženklų\", \"zero\"=>\"Sutrumpinkite savo statuso pranešimą %{count} ženklų\"}"
   stream_helper:
     hide_comments: "Slėpti visus komentarus"
     show_comments:
diff --git a/config/locales/diaspora/lv.yml b/config/locales/diaspora/lv.yml
index 39f29885c..8246ad461 100644
--- a/config/locales/diaspora/lv.yml
+++ b/config/locales/diaspora/lv.yml
@@ -5,15 +5,213 @@
 
 
 lv:
+  _applications: "Lietotnes"
   _comments: "Komentāri"
+  _contacts: "Kontakti"
   _home: "Mājās"
+  _photos: "Fotogrāfijas:"
+  _services: "Servisi"
   account: "Konts"
+  activerecord:
+    errors:
+      models:
+        contact:
+          attributes:
+            person_id:
+              taken: "ir jābūt unikālam starp lietotāja kontaktiem."
+        person:
+          attributes:
+            diaspora_handle:
+              taken: "ir aizņemts."
+        reshare:
+          attributes:
+            root_guid:
+              taken: "Baigi labais, jā? Tu jau esi dalījies ar šo ierakstu!"
+        user:
+          attributes:
+            email:
+              taken: "ir aizņemts."
+            person:
+              invalid: "nav derīgs."
+            username:
+              invalid: "nav derīgs. Ir atļauti tikai burti, cipari un apakšsvītras."
+              taken: "ir aizņemts."
+  ago: "pirms %{time}"
+  all_aspects: "Visas grupas"
+  application:
+    helper:
+      unknown_person: "nezināma persona"
+      video_title:
+        unknown: "Nenosaukts video"
+  are_you_sure: "Vai esi pārliecināts?"
+  are_you_sure_delete_account: "Vai tiešām vēlaties slēgt savu kontu? To nevarēs atjaunot!"
+  aspect_memberships:
+    destroy:
+      failure: "Neizdevās noņemt personu no grupas"
+      success: "Persona tika veiksmīgi noņemta no grupas"
+  aspects:
+    add_to_aspect:
+      failure: "Nesanāca pievienot kontaktu grupai."
+      success: "Kontakts veiksmīgi pievienots grupai."
+    aspect_contacts:
+      done_editing: "pabeigt labošanu"
+    aspect_listings:
+      add_an_aspect: "+ Pievienot grupu"
+      deselect_all: "Atlasīt neko"
+      edit_aspect: "Labot %{name}"
+      select_all: "Izvēlēties visus"
+    contacts_not_visible: "Kontakti šajā grupā nevarēs viens otru redzēs."
+    contacts_visible: "Kontakti šajā grupā varēs viens otru redzēt."
+    create:
+      failure: "Grupas izveide neizdevās."
+      success: "Grupa %{name} tika izveidota."
+    destroy:
+      failure: "%{name} nav tukša un to nevar noņemt."
+      success: "%{name} tika veiksmīgi noņemta."
+    edit:
+      add_existing: "Pievienot esošu kontaktu"
+      aspect_list_is_not_visible: "Kontakti šajā grupā neredz viens otru."
+      aspect_list_is_visible: "Kontakti šajā grupā var redzēt viens otru."
+      confirm_remove_aspect: "Vai jūs tiešām vēlaties dzēst šo grupu?"
+      done: "Gatavs"
+      make_aspect_list_visible: "ļaut kontaktiem šajā grupā viens otru redzēt?"
+      remove_aspect: "Dzēst šo grupu"
+      rename: "pārsaukt"
+      update: "atjaunot"
+      updating: "atjauno"
+    few: "%{count} grupas"
+    helper:
+      are_you_sure: "Vai jūs tiešām vēlaties dzēst šo grupu?"
+      aspect_not_empty: "Grupa nav tukša"
+      remove: "noņemt"
+    index:
+      diaspora_id:
+        content_1: "Tavs diaspora* ID:"
+        content_2: "Dod to citiem, lai viņi varētu tevi atrast diaspora* tīklā."
+        heading: "diaspora* ID"
+      donate: "Ziedot"
+      handle_explanation: "Šis ir tavs diaspora* ID. Tā ir kā e-pasta adrese, kuru tu dod, lai cilvēki varētu ar tevi sazināties."
+      help:
+        do_you: "Ja tev ir:"
+        feature_suggestion: "... %{link}?"
+        find_a_bug: "... zināma %{link}?"
+        have_a_question: "... %{link}?"
+        here_to_help: "Diaspora* kopiena tev palīdzēs!"
+        need_help: "Nepieciešama palīdzība?"
+        tag_bug: "kļūda"
+        tag_feature: "uzlabojums"
+        tag_question: "jautājums"
+      introduce_yourself: "Šī ir tava plūsma. Sāk rakstīt un iepazīstini ar sevi."
+      new_here:
+        follow: "Seko %{link} un sveicini jaunos lietotājus diaspora*!"
+        learn_more: "Lasīt vairāk"
+        title: "Sveicināti, jaunie lietotāji"
+      no_contacts: "Nav kontaktu"
+      no_tags: "+ Atrodi birku, kurai sekot"
+      services:
+        content: "Tu vari pieslēgt šādus servisus savam diaspora* profilam:"
+        heading: "Pieslēgt servisus"
+      unfollow_tag: "Vairs nerādīt %{tag}"
+      welcome_to_diaspora: "Laipni lūgti diaspora*, %{name}!"
+    many: "%{count} grupas"
+    move_contact:
+      error: "Kļūda pārvietojot kontaktu: %{inspect}"
+      success: "Persona ir pārvietota jaunā grupā"
+    new:
+      create: "Izveidot"
+      name: "Nosaukums (redzams tikai tev)"
+    no_contacts_message:
+      community_spotlight: "Kopienas uzmanībā"
+      or_spotlight: "Vai arī tu vari dalīties ar saiti %{link}"
+      try_adding_some_more_contacts: "Tu vari meklēt vai uzaicināt vairāk cilvēku."
+      you_should_add_some_more_contacts: "Pievieno vairāk cilvēku!"
+    one: "1 grupa"
+    other: "%{count} grupas"
+    seed:
+      acquaintances: "Paziņas"
+      family: "Ģimene"
+      friends: "Draugi"
+      work: "Darbs"
+    selected_contacts:
+      manage_your_aspects: "Pārvaldīt grupas."
+      no_contacts: "Tev vēl nav neviena kontakta."
+      view_all_contacts: "Skatīt visus kontaktus"
+    show:
+      edit_aspect: "labot grupu"
+    two: "%{count} grupas"
+    update:
+      failure: "Grupas %{name} nosaukums ir pārāk garš, lai to saglabātu."
+      success: "Grupa %{name} tika veiksmīgi labota."
+    zero: "nav grupu"
   back: "Atpakaļ"
   cancel: "Atcelt"
+  comments:
+    few: "%{count} komentāri"
+    many: "%{count} komentāri"
+    new_comment:
+      comment: "Komentēt"
+      commenting: "Komentē..."
+    one: "1 komentārs"
+    other: "%{count} komentāri"
+    two: "%{count} komentāri"
+    zero: "nav komentāru"
+  contacts:
+    create:
+      failure: "Neizdevās izveidot kontaktu"
+    few: "%{count} kontakti"
+    index:
+      add_a_new_aspect: "Pievienot jaunai grupai"
+      start_a_conversation: "Sākt sarunu"
+      title: "Kontakti"
+      your_contacts: "Tavi kontakti"
+    many: "%{count} kontakti"
+    one: "1 kontakts"
+    other: "%{count} kontakti"
+    two: "%{count} kontakti"
+    zero: "kontakti"
+  conversations:
+    create:
+      sent: "Ziņa aizsūtīta"
+    destroy:
+      success: "Saruna tika veiksmīgi dzēsta"
+    helper:
+      new_messages:
+        one: "1 jauna ziņa"
+        other: "%{count} jaunas ziņas"
+        zero: "Nav jaunu ziņu"
+    index:
+      inbox: "Ienākošās"
+    new:
+      abandon_changes: "Atcelt izmaiņas?"
+      send: "Sūtīt"
+      sending: "Sūta..."
+      subject: "Virsraksts"
+      to: "Adresāts"
+    show:
+      delete: "Dzēst un bloķēt sarunu"
+      reply: "atbildēt"
+      replying: "Atbild..."
   delete: "Dzēst"
+  email: "E-pasts"
+  error_messages:
+    helper:
+      correct_the_following_errors_and_try_again: "Izlabojiet sekojošās kļūdas un mēģiniet vēlreiz."
+      invalid_fields: "Nekorekti lauki"
+  fill_me_out: "Aizpildi mani"
+  find_people: "Meklēt cilvēkus vai #birkas"
   hide: "Slēpt"
+  invitations:
+    create:
+      already_sent: "Tu jau esi ielūdzis šo personu."
+      sent: "Ielūgumi ir aizsūtīt: %{emails}"
+    new:
+      language: "Valoda"
+  limited: "Ierobežota piekļuve"
   more: "Vairāk"
   next: "nākamais"
+  no_results: "Nekas netika atrasts."
+  ok: "Labi"
+  or: "vai"
   password: "Parole"
   password_confirmation: "Paroles apstiprinājums"
   previous: "iepriekšējais"
@@ -23,4 +221,7 @@ lv:
   public: "Publisks"
   search: "Meklēt"
   settings: "Iestatījumi"
-  username: "Lietotājvārds"
\ No newline at end of file
+  terms_and_conditions: "Noteikumi un nosacījumi"
+  undo: "Atsaukt"
+  username: "Lietotājvārds"
+  welcome: "Sveicināti!"
\ No newline at end of file
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index e107ceb72..1b7edb6bd 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -531,13 +531,7 @@ mk:
   status_messages:
     helper:
       no_message_to_display: "Нема пораки за прикажување."
-    too_long:
-      few: "please make your status messages less than %{count} characters"
-      many: "please make your status messages less than %{count} characters"
-      one: "please make your status messages less than %{count} character"
-      other: "please make your status messages less than %{count} characters"
-      two: "please make your status messages less than %{count} characters"
-      zero: "please make your status messages less than %{count} characters"
+    too_long: "{\"few\"=>\"please make your status messages less than %{count} characters\", \"many\"=>\"please make your status messages less than %{count} characters\", \"one\"=>\"please make your status messages less than %{count} character\", \"other\"=>\"please make your status messages less than %{count} characters\", \"two\"=>\"please make your status messages less than %{count} characters\", \"zero\"=>\"please make your status messages less than %{count} characters\"}"
   stream_helper:
     hide_comments: "hide comments"
     show_comments:
diff --git a/config/locales/diaspora/ml.yml b/config/locales/diaspora/ml.yml
index 5f92a6756..bccbda534 100644
--- a/config/locales/diaspora/ml.yml
+++ b/config/locales/diaspora/ml.yml
@@ -260,7 +260,6 @@ ml:
       no_contacts_message: "%{community_spotlight} കണ്ടുനോക്കു"
       no_contacts_message_with_aspect: "%{community_spotlight} കണ്ടുനോക്കു അല്ലെങ്കില്‍ %{add_to_aspect_link}"
       only_sharing_with_me: "നിങ്ങളുമായി മാത്രം പങ്ക് വച്ചത്"
-      remove_person_from_aspect: "\"%{aspect_name}\" - ഇല്‍നിന്ന് %{person_name} ഒഴിവാക്കുക"
       start_a_conversation: "സംഭാഷണം ആരംഭിക്കൂ"
       title: "സമ്പര്‍ക്കങ്ങള്‍"
       your_contacts: "നിങ്ങളുടെ സമ്പര്‍ക്കങ്ങള്‍"
@@ -984,13 +983,7 @@ ml:
       no_message_to_display: "സന്ദേശമൊന്നും കാണിക്കാനില്ല."
     new:
       mentioning: "സൂചിപ്പിക്കുന്നു: %{person}"
-    too_long:
-      few: "please make your status messages less than %{count} characters"
-      many: "please make your status messages less than %{count} characters"
-      one: "please make your status messages less than %{count} character"
-      other: "please make your status messages less than %{count} characters"
-      two: "please make your status messages less than %{count} characters"
-      zero: "please make your status messages less than %{count} characters"
+    too_long: "{\"few\"=>\"please make your status messages less than %{count} characters\", \"many\"=>\"please make your status messages less than %{count} characters\", \"one\"=>\"please make your status messages less than %{count} character\", \"other\"=>\"please make your status messages less than %{count} characters\", \"two\"=>\"please make your status messages less than %{count} characters\", \"zero\"=>\"please make your status messages less than %{count} characters\"}"
   stream_helper:
     hide_comments: "Hide all comments"
     show_comments:
diff --git a/config/locales/diaspora/ms.yml b/config/locales/diaspora/ms.yml
index a38b58438..1b3822a8b 100644
--- a/config/locales/diaspora/ms.yml
+++ b/config/locales/diaspora/ms.yml
@@ -48,9 +48,12 @@ ms:
       video_title:
         unknown: "Tajuk Wayang Tidak Diketahui"
   are_you_sure: "Anda yakin?"
+  are_you_sure_delete_account: "Adakah anda pasti anda mahu menutup akaun anda? Ini tidak boleh diundur!"
   aspect_memberships:
     destroy:
       failure: "Gagal mengeluarkan individu daripada aspek"
+      no_membership: "Tidak dapat mencari orang yang dipilih dalam aspek itu"
+      success: "Orang berjaya dikeluarkan dari aspek"
   aspects:
     destroy:
       success: "%{name} telah berjaya dikeluarkan."
@@ -105,7 +108,11 @@ ms:
       work: "Kerja"
     two: "%{count} aspects"
     zero: "no aspects"
+  back: "Undur"
   bookmarklet:
+    explanation: "Pos kepada diaspora * dari mana-mana sahaja dengan bookmark link ini => %{link}."
+    heading: "Bookmarklet"
+    post_something: "Pos kepada diaspora*"
     post_success: "Telah Di Pos! Tutup!"
   cancel: "Batal"
   comments:
@@ -153,6 +160,12 @@ ms:
       reply: "balas"
       replying: "Membalas..."
   delete: "Padam"
+  error_messages:
+    helper:
+      correct_the_following_errors_and_try_again: "Betulkan kesilapan-kesilapan berikut dan cuba lagi."
+      invalid_fields: "bidang tidak sah"
+  find_people: "Cari orang atau #tag"
+  hide: "Sembunyikan"
   invitations:
     create:
       already_contacts: "Anda telah disambungkan dengan orang ini"
@@ -306,6 +319,8 @@ ms:
     a_post_you_shared: "pos."
     click_here: "klik di sini"
     to_change_your_notification_settings: "untuk menukar tetapan pemberitahuan anda"
+  nsfw: "NSFW"
+  ok: "Baiklah"
   or: "atau"
   password: "kata laluan"
   password_confirmation: "pengesahan kata laluan"
@@ -355,6 +370,11 @@ ms:
         other: "%{count} photos by %{author}"
         two: "Two photos by %{author}"
         zero: "No photos by %{author}"
+  previous: "Terdahulu"
+  privacy: "Privasi"
+  privacy_policy: "Polisi Privasi"
+  profile: "Profil"
+  public: "Awam"
   reactions:
     few: "%{count} reactions"
     many: "%{count} reactions"
@@ -380,6 +400,8 @@ ms:
         other: "%{count} reshares"
         two: "%{count} reshares"
         zero: "Reshare"
+  search: "Cari"
+  settings: "Tetapan"
   shared:
     aspect_dropdown:
       toggle:
@@ -390,13 +412,7 @@ ms:
         two: "In %{count} aspects"
         zero: "Add contact"
   status_messages:
-    too_long:
-      few: "please make your status messages less than %{count} characters"
-      many: "please make your status messages less than %{count} characters"
-      one: "please make your status messages less than %{count} character"
-      other: "please make your status messages less than %{count} characters"
-      two: "please make your status messages less than %{count} characters"
-      zero: "please make your status messages less than %{count} characters"
+    too_long: "{\"few\"=>\"please make your status messages less than %{count} characters\", \"many\"=>\"please make your status messages less than %{count} characters\", \"one\"=>\"please make your status messages less than %{count} character\", \"other\"=>\"please make your status messages less than %{count} characters\", \"two\"=>\"please make your status messages less than %{count} characters\", \"zero\"=>\"please make your status messages less than %{count} characters\"}"
   stream_helper:
     show_comments:
       few: "Show %{count} more comments"
@@ -408,8 +424,12 @@ ms:
   streams:
     aspects:
       title: "Your Aspects"
+  terms_and_conditions: "Terma dan Syarat"
+  undo: "Batalkan?"
+  username: "Nama Pengguna"
   users:
     edit:
       close_account:
         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."
-      your_handle: "Your diaspora id"
\ No newline at end of file
+      your_handle: "Your diaspora id"
+  welcome: "Selamat datang!"
\ No newline at end of file
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 729ced5f5..65e521967 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -292,7 +292,6 @@ nb:
       no_contacts_message: "Sjekk ut %{community_spotlight}"
       no_contacts_message_with_aspect: "Sjekk ut %{community_spotlight} eller %{add_to_aspect_link}"
       only_sharing_with_me: "Deler bare med meg "
-      remove_person_from_aspect: "Fjern %{person_name} fra «%{aspect_name}»"
       start_a_conversation: "Start en samtale"
       title: "Kontakter"
       your_contacts: "Dine kontakter"
@@ -1169,13 +1168,7 @@ nb:
       no_message_to_display: "Ingen melding å vise."
     new:
       mentioning: "Nevner: %{person}"
-    too_long:
-      few: "du bør begrense statusmeldingene dine til %{count} tegn"
-      many: "Du bør begrense statusmeldingene dine til %{count} characters"
-      one: "du bør begrense statusmeldingene dine til %{count} tegn"
-      other: "du må gjøre statusmeldingene dine kortere enn %{count} tegn"
-      two: "vær så snill og skriv statusoppdateringer som er under %{count} tegn"
-      zero: "Statusmeldinger må være lengre enn ingenting."
+    too_long: "{\"few\"=>\"du bør begrense statusmeldingene dine til %{count} tegn\", \"many\"=>\"Du bør begrense statusmeldingene dine til %{count} characters\", \"one\"=>\"du bør begrense statusmeldingene dine til %{count} tegn\", \"other\"=>\"du må gjøre statusmeldingene dine kortere enn %{count} tegn\", \"two\"=>\"vær så snill og skriv statusoppdateringer som er under %{count} tegn\", \"zero\"=>\"Statusmeldinger må være lengre enn ingenting.\"}"
   stream_helper:
     hide_comments: "Skjul kommentarer"
     show_comments:
diff --git a/config/locales/diaspora/nds.yml b/config/locales/diaspora/nds.yml
new file mode 100644
index 000000000..fcbbc9baf
--- /dev/null
+++ b/config/locales/diaspora/nds.yml
@@ -0,0 +1,956 @@
+#   Copyright (c) 2010-2013, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+
+nds:
+  _applications: "Programme"
+  _comments: "Kommentore"
+  _contacts: "Kontakte"
+  _help: "Hülp"
+  _home: "Startsiet"
+  _photos: "Biller"
+  _services: "Deenste"
+  account: "Konto"
+  activerecord:
+    errors:
+      models:
+        contact:
+          attributes:
+            person_id:
+              taken: "mut ünner de Kontakte von dissen Bruker eendüdig ween."
+        person:
+          attributes:
+            diaspora_handle:
+              taken: "is schon vergeven"
+        request:
+          attributes:
+            from_id:
+              taken: "is een Dubbel von een Anfroog, de dat schon gift."
+        reshare:
+          attributes:
+            root_guid:
+              taken: "Teemlich good, wat?  Du hest dissen Bidrag all wiederseggt!"
+        user:
+          attributes:
+            email:
+              taken: "is schon vergeven"
+            person:
+              invalid: "is ungüllig."
+            username:
+              invalid: "is ungüllig. Wi erlauven nur Bookstaven, Nummern und Ünnerstreeke."
+              taken: "is schon vergeven."
+  admins:
+    admin_bar:
+      pages: "Sieten"
+      pod_stats: "Podstatistiken"
+      user_search: "Brukersök"
+      weekly_user_stats: "Weekentliche Brukerstatistiken"
+    stats:
+      2weeks: "Twee Weken"
+      50_most: "De 50 an meisten benutzten Tags"
+      comments:
+        one: "Een Kommentor"
+        other: "%{count} Kommentore"
+        zero: "Keene Kommentore"
+      daily: "Dag för Dag"
+      display_results: "Zeig Resultate von dat <b>%{segment}</b> Segment"
+      month: "Monat"
+      posts:
+        one: "Een Bidrag"
+        other: "%{count} Bidräg"
+        zero: "Keene Bidräg"
+      shares:
+        one: "Een mol deelt"
+        other: "%{count} mol deelt"
+        zero: "Noch nich deelt."
+      usage_statistic: "Nutzungsstatistiken"
+      users:
+        one: "Een Bruker"
+        other: "%{count} Bruker"
+        zero: "Keene Bruker"
+      week: "Week"
+    user_search:
+      add_invites: "Inladungen dortodoon"
+      email_to: "E-Mail-Adress ton Inladen"
+      under_13: "Zeig Brukers ünner 13 (COPPA)"
+      users:
+        one: "Een Bruker funnen"
+        other: "%{count} Bruker funnen"
+        zero: "Keen Bruker funnen"
+      you_currently:
+        one: "Du hest noch eene Inladung öber %{link}"
+        other: "Du hest noch %{count} Inladungen öber %{link}"
+        zero: "Du hest graad keene Inladungen mehr öber %{link}"
+    weekly_user_stats:
+      amount_of:
+        one: "Antohl von nee’e Bruker in disse Week: Een"
+        other: "Antohl von nee’e Bruker in disse Week: %{count}"
+        zero: "Antohl von nee’e Bruker in disse Week: keene"
+      current_server: "Dat Serverdatum is graad %{date}"
+  ago: "%{time} her"
+  all_aspects: "All Aspekte"
+  application:
+    helper:
+      unknown_person: "unbekannte Person"
+      video_title:
+        unknown: "Unbekannte Videotitel"
+  are_you_sure: "Bist du seker?"
+  are_you_sure_delete_account: "Bist du di seker, dat du dien Konto tomoken wist? Dat kanns du nich rückgängig moken!"
+  aspect_memberships:
+    destroy:
+      failure: "Kunn Person nich ut den Aspekt wegmaken"
+      no_membership: "Kunn de utwählte Person nich in den Aspekt finnen"
+      success: "Person erfolgriek ut den Aspekt wegmakt"
+  aspects:
+    add_to_aspect:
+      failure: "Kunn Kontakt nich ton Aspekt dortodoon."
+      success: "Kontakt erfolgriek ton Aspekt dortodaan."
+    aspect_contacts:
+      done_editing: "Bearbeiden ferdig"
+    aspect_listings:
+      add_an_aspect: "+ Een Aspekt dortodoon"
+      deselect_all: "All afwählen"
+      edit_aspect: "%{name} bearbeiden"
+      select_all: "All utwählen"
+    aspect_stream:
+      make_something: "Mok wat"
+      stay_updated: "Bliev op den neesten Stand"
+      stay_updated_explanation: "Dien Hauptstream warrd mit all diene Kontakte, de Tags de du folgst und Bidräg von een poor kreative Lüü ut de Gemeenschaft füllt."
+    contacts_not_visible: "Kontakte in dissen Aspekt warrd sick gegensiedich nich seihn künnen."
+    contacts_visible: "Kontakte in dissen Aspekt warrd sick gegensiedich seihn künnen."
+    create:
+      failure: "Kunn Aspekt nich anleggen."
+      success: "Dien nee’en Aspekt %{name} is anleggt worrn."
+    destroy:
+      failure: "%{name} is nich leer un kunn nich wegmakt warrn."
+      success: "%{name} is erfolgriek wegmakt worrn."
+    edit:
+      add_existing: "Wen dortodoon, mit den du schon Kontakt hest"
+      aspect_list_is_not_visible: "Kontakte in dissen Aspekt künnt sick nich gegensiedich seihn."
+      aspect_list_is_visible: "Kontakte in dissen Aspekt künnt sick gegensiedich seihn."
+      confirm_remove_aspect: "Bist du seker, dat du dissen Aspekt löschen wist?"
+      done: "Ferdig"
+      make_aspect_list_visible: "Kontakte in dissen Aspekt to sick sülbst sichtbor moken?"
+      remove_aspect: "Dissen Aspekt löschen"
+      rename: "ümnömen"
+      update: "opfrischen"
+      updating: "frisch op"
+    few: "een poor Aspekte"
+    helper:
+      are_you_sure: "Bist du seker, dat du dissen Aspekt löschen wist?"
+      aspect_not_empty: "Aspekt nich leer"
+      remove: "wegmaken"
+    index:
+      diaspora_id:
+        content_1: "Diene diaspora*-ID is:"
+        content_2: "Geev ehr to annere Lüü, dormit se di op diaspora* finnen künnt."
+        heading: "diaspora*-ID"
+      donate: "Spennen"
+      handle_explanation: "Dit is diene diaspora*-ID. Wie eene E-Mail-Adress kannst du ehr an annere Lüü geven, dormit se di erreichen künnt."
+      help:
+        any_problem: "Irgendwelche Probleme?"
+        do_you: "Hest du:"
+        email_feedback: "Diene Meenung per %{link}"
+        email_link: "E-Mail"
+        feature_suggestion: "... een Vörslag för eene nee’e %{link}?"
+        find_a_bug: "... een %{link} funnen?"
+        have_a_question: "... eene %{link}?"
+        here_to_help: "De diaspora*-Gemeenschaft is för di dor!"
+        need_help: "Brukst du Hülp?"
+        tag_bug: "Fehler"
+        tag_feature: "Funktion"
+        tag_question: "Froog"
+        tutorial_link_text: "Anleidungen"
+        tutorials_and_wiki: "%{faq}, %{tutorial} un %{wiki}: Hülp för diene eersten Schritte"
+      introduce_yourself: "Dit is dien Stream.  Leg los un stell di vör."
+      new_here:
+        follow: "Folg %{link} un begrööt nee’e Brukers op diaspora*!"
+        learn_more: "Mehr rutkriegen"
+        title: "Begrööt nee’e Brukers"
+      no_contacts: "Keene Kontakte"
+      no_tags: "+ Een Tag ton Folgen finnen"
+      people_sharing_with_you: "Lüü de mit di deelt"
+      post_a_message: "verfat een Bidrag >>"
+      services:
+        content: "Du kanns disse Deenste mit diaspora* verbinnen:"
+        heading: "Verbunnene Deenste"
+      unfollow_tag: "Ophören, #%{tag} to folgen"
+      welcome_to_diaspora: "Willkomen to diaspora*, %{name}!"
+    many: "veele Aspekte"
+    move_contact:
+      error: "Fehler bin verschuben von den Kontakt: %{inspect}"
+      failure: "hett nich fungscheneert %{inspect}"
+      success: "Person in nee’en Aspekt verschoben"
+    new:
+      create: "Anleggen"
+      name: "Naam (nur för di sichtbor)"
+    no_contacts_message:
+      or_spotlight: "Or du kanns mit den %{link} deelen"
+      try_adding_some_more_contacts: "Du kanns mehr Kontakte söken or inladen."
+      you_should_add_some_more_contacts: "Du schust een poor mehr Kontakte sluten!"
+    no_posts_message:
+      start_talking: "Noch keener hett wat seggt!"
+    one: "een Aspekt"
+    other: "%{count} Aspekte"
+    seed:
+      acquaintances: "Bekannte"
+      family: "Familie"
+      friends: "Frünnen"
+      work: "Arbeid"
+    selected_contacts:
+      manage_your_aspects: "Verwalt diene Aspekte."
+      no_contacts: "Du hest hier noch keene Kontakte."
+      view_all_contacts: "Alle Kontakte ankieken"
+    show:
+      edit_aspect: "Aspekt bearbeiden"
+    two: "twee Aspekte"
+    update:
+      failure: "De Naam von dien Aspekt, %{name}, wöör to lang ton Spiekern."
+      success: "Dien Aspekt, %{name}, is erfolgriek ännert worrn."
+    zero: "keene Aspekte"
+  back: "Trüch"
+  blocks:
+    create:
+      failure: "Ik kunn dissen Bruker nich ignoreren.  #evasion"
+      success: "Allns kloor, du warrst dissen Bruker nich mehr in dien Stream seihn. #silencio!"
+    destroy:
+      failure: "Ik kunn nich ophören, den Bruker to ignoreren.  #evasion"
+      success: "Loot us man kieken, wat de to seggen hebbt! #segghallo"
+  bookmarklet:
+    explanation: "Verfat nee’e Bidräg von öberall, indem du dissen Link to diene Leseteken dortodeist => %{link}"
+    heading: "Leseteken."
+    post_something: "Schriev wat in diaspora*"
+    post_success: "Verfat! Mok to!"
+  cancel: "afbreken"
+  comments:
+    few: "een poor Kommentore"
+    many: "veele mögt dissen Kommentor"
+    new_comment:
+      comment: "Kommenteren"
+      commenting: "Kommentere..."
+    one: "een Kommentor"
+    other: "%{count} Kommentore"
+    two: "twee Kommentore"
+    zero: "keene Kommentore"
+  contacts:
+    create:
+      failure: "Kunn keen Kontakt sluten"
+    few: "een poor Kontakte"
+    index:
+      add_a_new_aspect: "Do een nee’en Kontakt dorto"
+      add_to_aspect: "Kontakte to %{name} dortodoon"
+      add_to_aspect_link: "do Kontakte to %{name} dorto"
+      all_contacts: "Alle Kontakte"
+      many_people_are_you_sure: "Bist du seker dat du een privaten Snack mit mehr as %{suggested_limit} Lüü anfangen wist? Een Bidrag an dissen Aspekt to verfaten is villicht eene betere Lösung."
+      my_contacts: "Miene Kontakte"
+      no_contacts: "Süht so ut, as op du een poor mehr Kontakte sluten muss!"
+      only_sharing_with_me: "Nur mit di deelende"
+      start_a_conversation: "Fang een Snack an"
+      title: "Kontakte"
+      your_contacts: "Diene Kontakte"
+    many: "veele Kontakte"
+    one: "een Kontakt"
+    other: "%{count} Kontakte"
+    sharing:
+      people_sharing: "Lüü, de mit di deelt:"
+    spotlight:
+      suggest_member: "Slag wen vör"
+    two: "twee Kontakte"
+    zero: "keene Kontakte"
+  conversations:
+    conversation:
+      participants: "Bedeeligte"
+    create:
+      fail: "Ungüllige Naricht"
+      no_contact: "He, du muss erst Kontakt sluten!"
+      sent: "Naricht afschickt"
+    destroy:
+      success: "Snack erfolgriek wegmakt"
+    helper:
+      new_messages:
+        one: "Eene nee’e Naricht"
+        other: "%{count} nee’e Narichten"
+        zero: "Keene nee’en Narichten"
+    index:
+      inbox: "Ingang"
+      no_conversation_selected: "Keen Snack utwählt"
+      no_messages: "keene Narichten"
+    new:
+      abandon_changes: "Ännerungen wegsmieten?"
+      send: "Schicken"
+      sending: "Send..."
+      subject: "Saak"
+      to: "an"
+    show:
+      delete: "Snack löschen und blocken"
+      reply: "antwoorden"
+      replying: "antwoord..."
+  delete: "Löschen"
+  email: "E-Mail"
+  error_messages:
+    helper:
+      correct_the_following_errors_and_try_again: "Kiek mol de folgenden Fehler dörch und versök dat nochmol."
+      invalid_fields: "Ungüllige Feller"
+    login_try_again: "Bidde <a href='%{login_link}'>meld di an</a> un versök dat nochmol."
+    post_not_public: "De Bidrag, den du versökst, di antokieken, is nich opentlich!"
+  fill_me_out: "Füll mi ut"
+  find_people: "Lüü or #Tags finnen"
+  help:
+    account_and_data_management:
+      data_other_podmins_q: "Künnt de Administrateren von annere Pods miene Informationen seihn?"
+      data_visible_to_podmin_q: "Wie veel von miene Informationen kann de Pod-Administrator seihn?"
+      title: "Konto- un Datenverwaltung"
+    aspects:
+      title: "Aspekte"
+      what_is_an_aspect_q: "Wat is een Aspekt?"
+    getting_help:
+      get_support_a_hashtag: "froog in een opentlichen Bidrag op diaspora* mit den %{question} Hashtag"
+      get_support_a_irc: "komm to us in den %{irc} (Echttied-Tippsnack)"
+      get_support_a_tutorials: "bekiek unsere %{tutorials}"
+      get_support_a_website: "bekiek unsere %{link}"
+      get_support_a_wiki: "sök in dat %{link}"
+      get_support_q: "Wat, wenn de FAQ miene Froog nich beantwoord? Wo kann ik noch Hülp kriegen?"
+      getting_started_a: "Du hest Glück. Probeer de %{tutorial_series} op unsere Projektsiet ut. De warrd die Schritt för Schritt dörch de Registreerung föhren un die all de grundlegenden Saaken bibringen, de du öber dat Bruken von diaspora* weten muss."
+      getting_started_q: "Hülp! Ik bruk een beten grundlegende Hülp, üm lostoleggen!"
+      title: "Krieg Hülp"
+    here: "hier"
+    irc: "IRC"
+    markdown: "Markdown"
+    third_party_tools: "Drittanbeederwarktüüch"
+    tutorial: "Anleidung"
+    tutorials: "Anleidungen"
+    wiki: "Wiki"
+  hide: "versteken"
+  invitation_codes:
+    excited: "%{name} is hen un weg, di hier to seihn."
+  invitations:
+    a_facebook_user: "Een Facebook-Bruker"
+    check_token:
+      not_found: "Inladungstoken nich funnen"
+    create:
+      already_contacts: "Du bist schon mit disse Person verbunnen"
+      already_sent: "Du hest disse Person schon inlad."
+      empty: "Bidde geev minstens eene E-Mail-Adress in."
+      no_more: "Du kannst keene Inladungen mehr schicken."
+      note_already_sent: "Inladungen sind schon schickt worrn an: %{emails}"
+      own_address: "Du kanns keene Inladung an diene egene Adress schicken."
+      rejected: "Bi disse E-Mail-Adressen geev dat Probleme: "
+      sent: "Inladungen sind schickt worrn an: %{emails}"
+    edit:
+      accept_your_invitation: "Nimm diene Inladung an"
+      your_account_awaits: "Dien Konto töövt op di!"
+    new:
+      already_invited: "Disse Lüü hebbt diene Inladung nich annommen:"
+      aspect: "Aspekt"
+      check_out_diaspora: "Bekiek mal diaspora*!"
+      codes_left:
+        one: "Eene Inladung op dissen Code öber"
+        other: "%{count} Inladungen op dissen Code öber"
+        zero: "Keene Inladungen op dissen Code öber"
+      comma_separated_plz: "Du kanns mehrere E-Mail-Adressen dörch Kommas trennt ingeben."
+      if_they_accept_info: "wenn se annehmt, warrd se von sülbst to den Aspekt dortodoon, in den du jüm inlad hest."
+      invite_someone_to_join: "Lad eenen to diaspora* in!"
+      language: "Sprook"
+      personal_message: "Persönliche Naricht"
+      resend: "Nochmool schicken"
+      send_an_invitation: "Eene Inladung schicken"
+      send_invitation: "Inladung afschicken"
+      sending_invitation: "Schick Inladung..."
+      to: "An"
+  layouts:
+    application:
+      back_to_top: "Trüch no boben"
+      powered_by: "ANDREVEN VON diaspora*"
+      public_feed: "Opentliche diaspora*-Feed för %{name}"
+      source_package: "lad dat Quellcodepaket rünner"
+      whats_new: "Wat gift dat Nee’es?"
+      your_aspects: "Diene Aspekte"
+    header:
+      admin: "Admin"
+      blog: "Blog"
+      code: "Code"
+      login: "Anmellen"
+      logout: "Afmellen"
+      profile: "Profil"
+      recent_notifications: "Letzte Benarichtigungen"
+      settings: "Instellungen"
+      view_all: "All ankieken"
+  likes:
+    likes:
+      people_dislike_this:
+        one: "Eener mag dat nich"
+        other: "%{count} mögt dat nich"
+        zero: "Keener mag dat nich"
+      people_like_this:
+        one: "Eener mag dat"
+        other: "%{count} Lüü mögt dat"
+        zero: "Keener mag dat"
+      people_like_this_comment:
+        one: "Eener mag dissen Kommentor"
+        other: "%{count} Lüü mögt dissen Kommentor"
+        zero: "Keener mag dissen Kommentor"
+  limited: "Inschränkt"
+  more: "Mehr"
+  next: "neegste"
+  no_results: "Keene Resultate funnen"
+  notifications:
+    also_commented:
+      one: "%{actors} hett ok %{post_author}s Bidrag %{post_link} kommenteert."
+      other: "%{actors} hebbt ok %{post_author}s Bidrag %{post_link} kommenteert."
+      zero: "Keener hett ok %{post_author}s Bidrag %{post_link} kommenteert."
+    also_commented_deleted:
+      one: "%{actors} hett een löschten Bidrag kommenteert."
+      other: "%{actors} hebbt een löschten Bidrag kommenteert."
+      zero: "Keener hett een löschten Bidrag kommenteert."
+    comment_on_post:
+      one: "%{actors} hett dien Bidrag %{post_link} kommenteert."
+      other: "%{actors} hebbt dien Bidrag %{post_link} kommenteert."
+      zero: "Keener hett dien Bidrag %{post_link} kommenteert."
+    helper:
+      new_notifications:
+        one: "Eene nee’e Benarichtigung"
+        other: "%{count} nee’e Benarichtigungen"
+        zero: "Keene nee’en Benarichtigungen"
+    index:
+      and: "un"
+      and_others:
+        one: "un noch een"
+        other: "un %{count} annere"
+        zero: "un sonst keener"
+      mark_all_as_read: "All as lesen markeren"
+      mark_unread: "As unlesen markeren"
+      notifications: "Benarichtigungen"
+    liked:
+      one: "%{actors} mag dien Bidrag %{post_link}."
+      other: "%{actors} mögt dien Bidrag %{post_link}."
+      zero: "Keener mag dien Bidrag %{post_link}."
+    liked_post_deleted:
+      one: "%{actors} mag dien löschten Bidrag."
+      other: "%{actors} mögt dien löschten Bidrag."
+      zero: "Keener mag dien löschten Bidrag."
+    mentioned:
+      one: "%{actors} hett di in den Bidrag %{post_link} erwähnt."
+      other: "%{actors} hebbt di in den Bidrag %{post_link} erwähnt."
+      zero: "Keener hett di in den Bidrag %{post_link} erwähnt."
+    mentioned_deleted:
+      one: "%{actors} hett di in een löschten Bidrag erwähnt."
+      other: "%{actors} hebbt di in een löschten Bidrag erwähnt."
+      zero: "Keener hett di in een löschten Bidrag erwähnt."
+    post: "Bidrag"
+    private_message:
+      one: "%{actors} hett di eene Naricht schickt"
+      other: "%{actors} hebbt di eene Naricht schickt"
+      zero: "Keener hett di eene Naricht schickt"
+    reshared:
+      one: "%{actors} hett dien Bidrag %{post_link} wiederseggt."
+      other: "%{actors} hebbt dien Bidrag %{post_link} wiederseggt."
+      zero: "Keener hett dien Bidrag %{post_link} wiederseggt."
+    reshared_post_deleted:
+      one: "%{actors} hett dien löschten Bidrag wiederseggt."
+      other: "%{actors} hebbt dien löschten Bidrag wiederseggt."
+      zero: "Keener hett dien löschten Bidrag wiederseggt."
+    started_sharing:
+      one: "%{actors} hett anfungen, mit di to deelen"
+      other: "%{actors} hebbt anfungen, mit di to deelen"
+      zero: "Keener hett anfungen, mit di to deelen"
+  notifier:
+    a_post_you_shared: "een Bidrag."
+    accept_invite: "Nimm diene diaspora*-Inladung an!"
+    click_here: "klick hier"
+    comment_on_post:
+      reply: "%{name}s Bidrag antwoorden or ankieken >"
+    confirm_email:
+      click_link: "Bidde folg dissen Link, üm diene nee’e E-Mail-Adress %{unconfirmed_email} in gang to setten:"
+      subject: "Bidde set diene nee’e E-Mail-Adress %{unconfirmed_email} in gang"
+    email_sent_by_diaspora: "Disse E-Mail is von %{pod_name} schickt worrn. Wenn du keene seuke E-Mails mehr kriegen wist,"
+    hello: "Hallo %{name}!"
+    invite:
+      message: |-
+          Hallo!
+
+          Du bist inlad worrn, op diaspora* to kommen!
+
+          Klick op dissen Link, üm antofangen
+
+          [%{invite_url}][1]
+
+
+          Alles Leeve,
+
+          De E-Mail-Roboter von diaspora*!
+
+          [1]: %{invite_url}
+    invited_you: "%{name} hett di to diaspora* inlad."
+    liked:
+      liked: "%{name} mag dien Bidrag"
+      view_post: "Bidrag ankieken >"
+    mentioned:
+      mentioned: "hett di in een Bidrag erwähnt:"
+      subject: "%{name} hett di op diaspora* erwähnt"
+    private_message:
+      reply_to_or_view: "Dissen Snack antwoorden or ankieken >"
+    reshared:
+      reshared: "%{name} hett dien Bidrag wiederseggt"
+      view_post: "Bidrag ankieken >"
+    single_admin:
+      admin: "Dien diaspora*-Administrater"
+      subject: "Eene Naricht öber dien diaspora*-Konto:"
+    started_sharing:
+      sharing: "hett anfungen, mit di to deelen!"
+      subject: "%{name} hett anfungen, mit di op diaspora* to deelen"
+      view_profile: "%{name}s Profil ankieken"
+    thanks: "Danke,"
+    to_change_your_notification_settings: "üm diene Benarichtigungsinstellungen to ännern"
+  nsfw: "NSFW (unpassend för den Arbeidsplatz)"
+  ok: "OK"
+  or: "or"
+  password: "Passwoort"
+  password_confirmation: "Passwoortbestätigung"
+  people:
+    add_contact:
+      invited_by: "Du bist inladen worrn von"
+    add_contact_small:
+      add_contact_from_tag: "Kontakt öber een Hashtag sluten"
+    aspect_list:
+      edit_membership: "Aspekttogehörigkeit ännern"
+    few: "een poor Lüü"
+    helper:
+      is_not_sharing: "%{name} deelt nich mit di"
+      is_sharing: "%{name} deelt mit di"
+      results_for: " Resultate för %{params}"
+    index:
+      looking_for: "Sökst du no Bidräg, de mit %{tag_link} taggt sind?"
+      no_one_found: "...un nix is funnen worrn."
+      no_results: "He! Du muss no wat söken."
+      results_for: "%{search_term} entsprekende Bruker"
+      searching: "sök, bidde wees geduldig..."
+    many: "veele Lüü"
+    one: "eene Person"
+    other: "%{count} Lüü"
+    person:
+      add_contact: "Kontakt sluten"
+      already_connected: "Schon verbunnen"
+      pending_request: "Utstohnde Anfroog"
+      thats_you: "Dat bist du!"
+    profile_sidebar:
+      bio: "Beschriebung"
+      born: "Geburtsdag"
+      edit_my_profile: "Mien Profil ännern"
+      gender: "Geschlecht"
+      in_aspects: "in Aspekte"
+      location: "Ort"
+      photos: "Biller"
+      remove_contact: "Kontakt wegmaken"
+      remove_from: "%{name} ut %{aspect} wegmaken?"
+    show:
+      closed_account: "Dit Konto is tomokt worrn."
+      does_not_exist: "De Person gift dat nich!"
+      has_not_shared_with_you_yet: "%{name} hett noch keene Bidräg mit di deelt!"
+      ignoring: "Du ignoreerst alle Bidräg von %{name}."
+      incoming_request: "%{name} will mit di deelen"
+      mention: "Erwähnung"
+      message: "Naricht"
+      not_connected: "Du deels nich mit disse Person"
+      recent_posts: "Letzte Bidräg"
+      recent_public_posts: "Letzte Opentliche Bidräg"
+      return_to_aspects: "Trüch to diene Aspekte-Siet"
+      see_all: "Alle ankieken"
+      start_sharing: "mit Deelen anfangen"
+      to_accept_or_ignore: "üm dat antonehmen or to ignoreren."
+    sub_header:
+      add_some: "do een poor dorto"
+      edit: "ännern"
+      you_have_no_tags: "du hest keene Tags!"
+    two: "twee Lüü"
+    webfinger:
+      fail: "Deit mi leed, wi kunnen %{handle} nich finnen."
+    zero: "keene Lüü"
+  photos:
+    comment_email_subject: "%{name}s Bild"
+    create:
+      integrity_error: "Hoochladen von dat Bild fehlslaan.  Bist du seker, dat dat een Bild wöör?"
+      runtime_error: "Hoochladen von dat Bild fehlslaan.  Bist du seker, dat du di ansnallt hest?"
+      type_error: "Hoochladen von dat Bild fehlslaan.  Bist du seker, dat du een Bild dortodoon hest?"
+    destroy:
+      notice: "Bild löscht."
+    edit:
+      editing: "Änner"
+    new:
+      back_to_list: "Trüch to de Liste"
+      new_photo: "Nee’es Bild"
+      post_it: "verfat dat!"
+    new_photo:
+      empty: "{file} is leer, bidde wähl de Dateien noch mol ohne er ut."
+      invalid_ext: "{file} hett een ungülliges Enn. Nur {extensions} sind erlaubt."
+      size_error: "{file} is to groot, Dateien dröfft höchstens {sizeLimit} groot ween."
+    new_profile_photo:
+      or_select_one_existing: "or een von de %{photos} utwählen, de du schon hoochlad hest."
+      upload: "Nee’es Profilbild hoochladen!"
+    photo:
+      view_all: "Alle Biller von%{name} ankieken"
+    show:
+      collection_permalink: "Permalink to disse Sammlung"
+      delete_photo: "Bild löschen"
+      edit: "ännern"
+      edit_delete_photo: "Bildbeschriebung ännern / Bild löschen"
+      make_profile_photo: "as Profilbild bruken"
+      show_original_post: "Originalbidrag anzeigen"
+      update_photo: "Bild opfrischen"
+    update:
+      error: "Kunn Bild nich ännern."
+      notice: "Bild is erfolgriek opfrischt worrn."
+  posts:
+    presenter:
+      title: "Een Bidrag von %{name}"
+    show:
+      destroy: "Löschen"
+      not_found: "Deit mi leed, wi kunnen den Bidrag nich finnen."
+      permalink: "Permalink"
+      photos_by:
+        one: "Een Bild von %{author}"
+        other: "%{count} Biller von %{author}"
+        zero: "Keene Biller von %{author}"
+      reshare_by: "Wiederseggt von %{author}"
+  previous: "vörherige"
+  privacy: "Privatsphäre"
+  privacy_policy: "Datenschutz"
+  profile: "Profil"
+  profiles:
+    edit:
+      allow_search: "Lüü erlauben, op diaspora* no di to söken"
+      edit_profile: "Profil ännern"
+      first_name: "Vörnaam"
+      last_name: "Nonaam"
+      update_profile: "Bild opfrischen"
+      your_bio: "Diene Beschriebung"
+      your_birthday: "Dien Geburtsdag"
+      your_gender: "Dien Geschlecht"
+      your_location: "Dien Ort"
+      your_name: "Dien Naam"
+      your_photo: "Dien Bild"
+      your_private_profile: "Dien privates Profil"
+      your_public_profile: "Dien opentliches Profil"
+      your_tags: "Beschriev di sülbst in fiev Wüür"
+      your_tags_placeholder: "to’n Bispel #Filme #Katten #Reisen #Lehrer #NewYork"
+    update:
+      failed: "Kunn Profil nich opfrischen"
+      updated: "Profil opfrischt"
+  public: "Opentlich"
+  reactions:
+    one: "Eene Reaktion"
+    other: "%{count} Reaktionen"
+    zero: "keene Reaktionen"
+  registrations:
+    closed: "Registrerungen sind op dissen diaspora*-Pod sloten."
+    create:
+      success: "Du bist nu bi diaspora*!"
+    edit:
+      cancel_my_account: "Slut mien Konto"
+      edit: "%{name} ännern"
+      leave_blank: "(lot dat leer, wenn du dat nich ännern wist)"
+      password_to_confirm: "(wi brukt dien jetziges Passwoort, üm de Ännerung to bestätigen)"
+      unhappy: "Unglücklich?"
+      update: "Ännern"
+    new:
+      continue: "Wiedermoken"
+      create_my_account: "Legg mien Konto an!"
+      diaspora: "<3 diaspora*"
+      email: "E-MAIL-ADRESS"
+      enter_email: "Geev een E-Mail-Adress in"
+      enter_password: "Geev een Passwoort in (minnens söss Teken)"
+      enter_password_again: "Geev dat glieke Passwoort wie vörher in"
+      enter_username: "Sök di een Brukernaam ut (nur Bookstaven, Nummern un Ünnerstreeke)"
+      hey_make: "HE,<br/>MOK<br/>WAT."
+      join_the_movement: "Mok bi de Bewegung mit!"
+      password: "PASSWOORT"
+      password_confirmation: "PASSWOORTBESTÄTIGUNG"
+      sign_up: "REGISTREREN"
+      sign_up_message: "Soziales Nettwarken mit een ♥"
+      username: "BRUKERNAAM"
+  requests:
+    create:
+      sending: "Schick"
+      sent: "Du hest beden, mit %{name} to deelen.  He schull dat seihn, wenn he sik dat neegste Mol bi diaspora* anmellt."
+    destroy:
+      error: "Bidde wähl een Aspekt ut!"
+      ignore: "Ignorerte Kontaktanfroogen."
+      success: "Du deelst nu."
+    helper:
+      new_requests:
+        one: "Eene nee’e Anfroog!"
+        other: "%{count} nee’e Anfroogen!"
+        zero: "Keene nee’en Anfroogen"
+    manage_aspect_contacts:
+      existing: "Existerende Kontakte"
+      manage_within: "Verwalt Kontakte in"
+    new_request_to_person:
+      sent: "schickt!"
+  reshares:
+    comment_email_subject: "%{resharer}s Version von %{author}s Bidrag"
+    create:
+      failure: "Dat geev een Fehler bin Wiederseggen von den Bidrag."
+    reshare:
+      deleted: "Originalbidrag von den Autor löscht."
+      reshare:
+        one: "Een mol wiederseggt"
+        other: "%{count} mol wiederseggt"
+        zero: "Keen mol wiederseggt"
+      reshare_confirmation: "%{author}s Bidrag wiederseggen?"
+      reshare_original: "Original wiederseggen"
+      reshared_via: "wiederseggt öber"
+      show_original: "Original anzeigen"
+  search: "Söken"
+  services:
+    create:
+      already_authorized: "Een Bruker mit de diaspora-ID %{diaspora_id} hett dit %{service_name}-Konto schon autoriseert."
+      failure: "Authentifizeeren fehlslaan."
+      success: "Authentifizeeren erfolgriek."
+    destroy:
+      success: "Autoriseeren erfolgriek rückgängig mokt."
+    failure:
+      error: "dat geev een Fehler bin Verbinnen mit den Deenst"
+    finder:
+      fetching_contacts: "diaspora* lad diene Frünnen von %{service} graad in, bidde kiek in een poor Minuten noch mol trüch."
+      no_friends: "Keene Facebook-Frünnen funnen."
+      service_friends: "%{service}-Frünnen"
+    index:
+      connect_to_facebook: "Mit Facebook verbinnen"
+      connect_to_tumblr: "Mit Tumblr verbinnen"
+      connect_to_twitter: "Mit Twitter verbinnen"
+      disconnect: "Verbinnung trennen"
+      edit_services: "Deenste ännern"
+      logged_in_as: "anmellt as"
+      no_services: "Du hest noch keene Deenste verbunnen."
+      really_disconnect: "Verbinnung to %{service} trennen?"
+    inviter:
+      click_link_to_accept_invitation: "Folg dissen Link, üm diene Inladung to akzepteren"
+      join_me_on_diaspora: "Komm to mi op diaspora*"
+    remote_friend:
+      invite: "inladen"
+      not_on_diaspora: "Noch nich op diaspora*"
+      resend: "nochmol schicken"
+  settings: "Instellungen"
+  share_visibilites:
+    update:
+      post_hidden_and_muted: "%{name}s Bidrag is verstekt worrn und Benarichtigungen sind stummschalt worrn."
+      see_it_on_their_profile: "Wenn du nee’es von dissen Bidrag sehn wist, bekiek %{name}s Profilsiet."
+  shared:
+    add_contact:
+      add_new_contact: "Een nee’en Kontakt sluten"
+      create_request: "Anhand von de diaspora*-ID finnen"
+      diaspora_handle: "diaspora@pod.org"
+      enter_a_diaspora_username: "Geev een diaspora*-Brukernaam in:"
+      know_email: "Du kennst jümmer E-Mail-Adress? Du schust jüm inladen"
+      your_diaspora_username_is: "Dien diaspora*-Brukernaam is: %{diaspora_handle}"
+    aspect_dropdown:
+      add_to_aspect: "Kontakt sluten"
+      toggle:
+        one: "In een Aspekt"
+        other: "In %{count} Aspekte"
+        zero: "Kontakt sluten"
+    contact_list:
+      all_contacts: "Alle Kontakte"
+    footer:
+      logged_in_as: "anmellt as %{name}"
+      your_aspects: "Diene Aspekte"
+    invitations:
+      by_email: "Per E-Mail"
+      dont_have_now: "Du hest graad keene, aber mehr Inladungen kommt bald!"
+      from_facebook: "Von Facebook"
+      invitations_left: "%{count} öber"
+      invite_someone: "Lad wen in"
+      invite_your_friends: "Lad dien Frünnen in"
+      invites: "Inladungen"
+      invites_closed: "Inladungen sind op dissen diaspora*-Pod graad sloten"
+      share_this: "Deel dissen Link öber E-Mail, dien Blog oder soziale Nettwaark!"
+    notification:
+      new: "Nee’e %{type} von %{from}"
+    public_explain:
+      atom_feed: "Atom-Feed"
+      control_your_audience: "Legg diene anpielte Grupp fast"
+      logged_in: "anmellt bi %{service}"
+      manage: "Verbunnene Deenste verwalten"
+      new_user_welcome_message: "Bruk #Hashtags, üm diene Bidräg intoordnen un Lüü to finnen, de diene Interessen deelt.  Rop nah tolle Lüü mit @Erwähnungen"
+      share: "Deelen"
+    publisher:
+      all: "All"
+      all_contacts: "alle Kontakte"
+      make_public: "opentlich moken"
+      new_user_prefill:
+        hello: "Moin all, Ik bin #%{new_user_tag}. "
+        i_like: "Ik interessier mi för %{tags}. "
+        invited_by: "Danke för de Inladung, "
+        newhere: "NeeHier"
+      post_a_message_to: "Verfat eene Naricht an %{aspect}"
+      posting: "Verfat..."
+      preview: "Vörschau"
+      publishing_to: "veropentlichen to: "
+      share: "Deelen"
+      share_with: "deelen mit"
+      upload_photos: "Biller hoochladen"
+      whats_on_your_mind: "Wat geiht di dörch den Kopp?"
+    reshare:
+      reshare: "Wiederseggen"
+    stream_element:
+      connect_to_comment: "Verbinn di mit dissen Bruker, üm sien Bidrag to kommenteren"
+      currently_unavailable: "Kommenteren is graad nich parat"
+      dislike: "Mag ik nich"
+      hide_and_mute: "Bidrag versteken un stummschalten"
+      ignore_user: "%{name} ignoreren"
+      ignore_user_description: "Bruker ignorieren un ut alle Aspekte wegmoken?"
+      like: "Mag ik"
+      nsfw: "Disse Bidrag is von sien Autor as NSFW markeert worrn. %{link}"
+      shared_with: "Deelt mit: %{aspect_names}"
+      show: "anzeigen"
+      unlike: "Mag ik nich mehr"
+      via: "öber %{link}"
+      viewable_to_anyone: "Disse Bidrag is för alle in’t Internet sichtbor."
+  status_messages:
+    create:
+      success: "Erfolgriek erwähnt: %{names}"
+    destroy:
+      failure: "Kunn Bidrag nich löschen"
+    helper:
+      no_message_to_display: "Keene Narichten ton anzeigen."
+    new:
+      mentioning: "Erwähn: %{person}"
+    too_long: "Bidde mok dien Bidrag kötter as %{count} Teken. In Moment is he %{current_length} Teken lang"
+  stream_helper:
+    hide_comments: "Verstek alle Kommentare"
+    show_comments:
+      one: "Zeig een annern Kommentor"
+      other: "Zeig %{count} annere Kommentore"
+      zero: "Keene annern Kommentore"
+  streams:
+    activity:
+      title: "Mien Rumröören"
+    aspects:
+      title: "Miene Aspekte"
+    aspects_stream: "Aspekte"
+    comment_stream:
+      contacts_title: "Lüü, von de du de Bidräg kommenteert hest"
+      title: "Kommentierte Bidräg"
+    followed_tag:
+      add_a_tag: "Een Tag dortodoon"
+      follow: "Folgen"
+      title: "#Folgte Tags"
+    followed_tags_stream: "#Folgte Tags"
+    like_stream:
+      contacts_title: "Lüü, von de du de Bidräg magst"
+    mentioned_stream: "@Erwähnungen"
+    mentions:
+      contacts_title: "Lüü, de di erwähnt hebbt"
+      title: "@Erwähnungen"
+    multi:
+      contacts_title: "Lüü in dien Stream"
+      title: "Stream"
+    public:
+      title: "Opentliches Rumröören"
+    tags:
+      tag_prefill_text: "Dat Interessante an %{tag_name} is... "
+      title: "Bidräg tagged mit: %{tags}"
+  tag_followings:
+    create:
+      failure: "Kunn #%{name} nich folgen.  Folgst du dat schon?"
+      none: "Du kanns keen leeres Tag folgen!"
+      success: "Hurra!  Du folgst nu #%{name}."
+    destroy:
+      failure: "Kunn nich ophören, #%{name} to folgen. Villicht folgst du dat schon gor nich mehr?"
+      success: "Alas! Du folgst #%{name} nich mehr."
+  tags:
+    show:
+      follow: "Folg #%{tag}"
+      followed_by_people:
+        one: "von eene Person folgt"
+        other: "von %{count} Lüü folgt"
+        zero: "von keenen folgt"
+      following: "Du folgst #%{tag}"
+      nobody_talking: "Noch keener snackt öber %{tag}."
+      none: "Den leeren Tag gift dat nich!"
+      people_tagged_with: "Mit %{tag} markeerte Lüü"
+      posts_tagged_with: "Mit #%{tag} taggte Bidräg"
+      stop_following: "#%{tag} nich mehr folgen"
+  terms_and_conditions: "Allgemeene Geschäftsregeln"
+  undo: "Rückgängig moken?"
+  username: "Brukernaam"
+  users:
+    confirm_email:
+      email_confirmed: "E-Mail-Adress %{email} in gang set"
+      email_not_confirmed: "Kunn E-Mail-Adress nich in gang setten. Falsche Link?"
+    destroy:
+      no_password: "Bidde geev dien jetziges Passwoort in, üm dien Konto to sluten."
+      success: "Dien Konto is sparrt worrn.  Wi brukt bit to 20 Minuten, üm dien Konto vullständig to sluten. Danke, dat du diaspora* utprobeert hest."
+      wrong_password: "Dat ingebene Passwoort het dien jetziges Passwoort nich entsproken."
+    edit:
+      also_commented: "wen een Bidrag kommenteert, den du ok kommenteert hest"
+      auto_follow_aspect: "Aspekt för automatisch slotene Kontakte:"
+      auto_follow_back: "Automatisch mit Bruker deelen, de anfangt, mit mi to deelen"
+      change: "Ännern"
+      change_email: "E-Mail-Adress ännern"
+      change_language: "Sprook ännern"
+      change_password: "Passwoort ännern"
+      character_minimum_expl: "mut minstens söss Teken lang ween"
+      close_account:
+        dont_go: "He, bidde goh nich!"
+        if_you_want_this: "Wenn du dat wirklich wist, geev dien Passwoort ünnen in un klick op „Konto sluten“"
+        lock_username: "Dat warrd dien Brukernaam sparrn, wenn du die entschieds, di wedder to registreren."
+        locked_out: "Du warrst afmellt un ut dien Konto utsparrt warrn."
+        make_diaspora_better: "Wi witt, dat du us hülps, diaspora* beter to moken, statt us to verloten. Wenn du wirklich weggahn wilst, witt wi, dat du mitkriegst, wat dat Nee’es gift."
+        mr_wiggles: "Herr Wiggles warrd trurig ween, di gahn to seihn."
+        no_turning_back: "In’n Moment gift dat keen Trüch."
+        what_we_delete: "Wi warrd all diene Bidräg un Profildaten so schnell, as dat man geiht, löschen. Diene Kommentare warrd nich löscht, aber de warrd mit diene diaspora*-ID anstee von dien Naam verknüppt."
+      close_account_text: "Konto sluten"
+      comment_on_post: "wen dien Bidrag kommenteert"
+      current_password: "Jetziges Passwoort"
+      current_password_expl: "dat, mit dat du di anmellst..."
+      download_photos: "miene Biller rünnerladen"
+      download_xml: "Mien XML rünnerladen"
+      edit_account: "Konto ännern"
+      email_awaiting_confirmation: "Wie hebbt di een Link ton In-Gang-Setten an %{unconfirmed_email} schickt. Bit du dissen Link folgst und diene nee’e E-Mail-Adress in gang sets, warrd wi wieder diene ole Adress %{email} bruken."
+      export_data: "Daten exporteren"
+      following: "Deelen-Instellungen"
+      getting_started: "Instellungen för nee’e Bruker"
+      liked: "wen dien Bidrag mag"
+      mentioned: "du in een Bidrag erwähnt warrst"
+      new_password: "Nee’es Passwoort"
+      photo_export_unavailable: "Biller Exporteren geiht graad nich"
+      private_message: "du eene private Naricht kriegst"
+      receive_email_notifications: "E-Mail-Benarichtigungen kriegen wenn:"
+      reshared: "wen dien Bidrag wiederseggt"
+      show_getting_started: "Anfangshenwiese weer anzeigen"
+      started_sharing: "wen anfangt, mit di to deelen"
+      stream_preferences: "Stream-Instellungen"
+      your_email: "Diene E-Mail-Adress"
+      your_handle: "Diene diaspora*-ID"
+    getting_started:
+      awesome_take_me_to_diaspora: "Toll! Bring mi to diaspora*"
+      community_welcome: "De Gemeenschaft von diaspora* freit sik, di an Boord to hebben!"
+      hashtag_suggestions: "Versök mol, Tags wie #Kunst, #Filme, #gif oder so to folgen"
+      saved: "Spiekert!"
+      well_hello_there: "Naja, hallo erstmool!"
+      what_are_you_in_to: "Wat magst du?"
+      who_are_you: "Wer bist du?"
+    privacy_settings:
+      ignored_users: "Ignorerte Bruker"
+      stop_ignoring: "Nich mehr ignoreren"
+      title: "Privatsphäre-Instellungen"
+    public:
+      does_not_exist: "Den Bruker %{username} gift dat nich!"
+    update:
+      email_notifications_changed: "E-Mail-Benarichtigungen ännert"
+      follow_settings_changed: "Folgen-Instellungen ännert"
+      follow_settings_not_changed: "Ännern von de Folgen-Instellungen fehlslaan."
+      language_changed: "Sprook ännert"
+      language_not_changed: "Kunn Sprook nich ännern"
+      password_changed: "Passwoort ännert.  Du kannst di nu mit dien nee’es Passwoort anmellen."
+      password_not_changed: "Ännern von’t Passwoort fehlslaan"
+      settings_not_updated: "Opfrischen von de Instellungen fehlslaan"
+      settings_updated: "Instellungen opfrischt"
+      unconfirmed_email_changed: "E-Mail-Adress ännert. Mutt in gang set warrn."
+      unconfirmed_email_not_changed: "Ännern von de E-Mail-Adress fehlslaan"
+  welcome: "Willkomen!"
+  will_paginate:
+    next_label: "neegste &raquo;"
+    previous_label: "&laquo; vörherige"
\ No newline at end of file
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 2425f3f65..2c13b9ccd 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -282,6 +282,7 @@ nl:
     few: "%{count} contacten"
     index:
       add_a_new_aspect: "Voeg een aspect toe"
+      add_contact: "Toevoegen contactpersoon"
       add_to_aspect: "voeg contacten toe aan %{name}"
       add_to_aspect_link: "contacten toevoegen aan %{name}"
       all_contacts: "Alle Contacten"
@@ -292,9 +293,10 @@ nl:
       no_contacts_message: "Bekijk %{community_spotlight} eens"
       no_contacts_message_with_aspect: "Bekijk %{community_spotlight} eens, of %{add_to_aspect_link}"
       only_sharing_with_me: "Delen alleen met mij"
-      remove_person_from_aspect: "Verwijder %{person_name} uit \"%{aspect_name}\""
+      remove_contact: "verwijder contactpersoon"
       start_a_conversation: "Start een conversatie"
       title: "Contacten"
+      user_search: "Zoek gebruiker"
       your_contacts: "Jouw Contacten"
     many: "%{count} contacten"
     one: "1 contact"
@@ -1169,10 +1171,7 @@ nl:
       no_message_to_display: "Geen bericht om te weergeven."
     new:
       mentioning: "Noem: %{person}"
-    too_long:
-      one: "zorg ervoor dat je statusbericht korter is dan %{count} teken"
-      other: "zorg ervoor dat je statusberichten korter zijn dan %{count} tekens"
-      zero: "zorg ervoor dat je statusberichten korter zijn dan %{count} tekens"
+    too_long: "Zorg ervoor dat je statusbericht korter is dan %{count} tekens. Nu is het %{current_length} tekens lang"
   stream_helper:
     hide_comments: "Verberg alle reacties"
     show_comments:
diff --git a/config/locales/diaspora/nn.yml b/config/locales/diaspora/nn.yml
index 4328c516e..a5ba37f22 100644
--- a/config/locales/diaspora/nn.yml
+++ b/config/locales/diaspora/nn.yml
@@ -259,7 +259,6 @@ nn:
       no_contacts_message: "Ta ein titt på %{community_spotlight}"
       no_contacts_message_with_aspect: "Ta ein titt på %{community_spotlight} eller %{add_to_aspect_link}"
       only_sharing_with_me: "Deler berre med meg"
-      remove_person_from_aspect: "Fjerna %{person_name} frå \"%{aspect_name}\""
       start_a_conversation: "Start ein samtale"
       title: "Kontaktar"
       your_contacts: "Kontaktane dine"
@@ -860,13 +859,7 @@ nn:
       no_message_to_display: "Ingen innlegg kan synast."
     new:
       mentioning: "Nemner: %{person}"
-    too_long:
-      few: "sjå til at statusmeldingane dine har færre enn %{count} teikn"
-      many: "sjå til at statusmeldingane dine har færre enn %{count} teikn"
-      one: "sjå til at statusmeldingane dine har færre enn %{count} teikn"
-      other: "sjå til at statusmeldingane dine har færre enn %{count} teikn"
-      two: "sjå til at statusmeldingane dine har færre enn %{count} teikn"
-      zero: "sjå til at statusmeldingane dine har færre enn %{count} teikn"
+    too_long: "{\"few\"=>\"sjå til at statusmeldingane dine har færre enn %{count} teikn\", \"many\"=>\"sjå til at statusmeldingane dine har færre enn %{count} teikn\", \"one\"=>\"sjå til at statusmeldingane dine har færre enn %{count} teikn\", \"other\"=>\"sjå til at statusmeldingane dine har færre enn %{count} teikn\", \"two\"=>\"sjå til at statusmeldingane dine har færre enn %{count} teikn\", \"zero\"=>\"sjå til at statusmeldingane dine har færre enn %{count} teikn\"}"
   stream_helper:
     hide_comments: "Gøym alle kommentarane"
     show_comments:
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index e5de45f08..7eab8f872 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -353,13 +353,7 @@ pa:
   status_messages:
     helper:
       no_message_to_display: "ਵੇਖਾਉਣ ਲਈ ਕੋਈ ਸੁਨੇਹਾ ਨਹੀਂ ਹੈ।"
-    too_long:
-      few: "please make your status messages less than %{count} characters"
-      many: "please make your status messages less than %{count} characters"
-      one: "please make your status messages less than %{count} character"
-      other: "please make your status messages less than %{count} characters"
-      two: "please make your status messages less than %{count} characters"
-      zero: "please make your status messages less than %{count} characters"
+    too_long: "{\"few\"=>\"please make your status messages less than %{count} characters\", \"many\"=>\"please make your status messages less than %{count} characters\", \"one\"=>\"please make your status messages less than %{count} character\", \"other\"=>\"please make your status messages less than %{count} characters\", \"two\"=>\"please make your status messages less than %{count} characters\", \"zero\"=>\"please make your status messages less than %{count} characters\"}"
   stream_helper:
     hide_comments: "ਟਿੱਪਣੀਆਂ ਓਹਲੇ ਕਰੋ"
     show_comments:
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index d236f0897..e6fb3e858 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -12,6 +12,7 @@ pl:
   _home: "Główna"
   _photos: "zdjęcia"
   _services: "Usługi"
+  _terms: "warunki"
   account: "Konto"
   activerecord:
     errors:
@@ -95,8 +96,21 @@ pl:
         other: "%{count} użytkowników"
         zero: "Żaden użytkownik"
       week: "Tydzień"
+    user_entry:
+      account_closed: "konto zamknięte"
+      diaspora_handle: "Identyfikator Diaspory"
+      email: "Email"
+      guid: "GUID"
+      id: "ID"
+      last_seen: "ostatnio widziany"
+      ? "no"
+      : nie
+      nsfw: "#nsfw"
+      unknown: "nieznany"
+      ? "yes"
+      : tak
     user_search:
-      account_closing_scheduled: "Konto należące do %{name} jest przewidziane do zamknięcia. Zostanie to wykonane w przecigu kilku minut..."
+      account_closing_scheduled: "Konto należące do %{name} jest przewidziane do zamknięcia. Zostanie to wykonane w przecigu kilku chwil..."
       add_invites: "dodaj zaproszenia"
       are_you_sure: "Czy na pewno chcesz zamknąć to konto?"
       close_account: "zamknij konto"
@@ -282,6 +296,7 @@ pl:
     few: "%{count} kontakty"
     index:
       add_a_new_aspect: "Dodaj aspekt"
+      add_contact: "Dodaj kontakt"
       add_to_aspect: "dodaj kontakty do %{name}"
       add_to_aspect_link: "dodaj kontakty do %{name}"
       all_contacts: "Wszystkie kontakty"
@@ -292,9 +307,10 @@ pl:
       no_contacts_message: "Sprawdź kto jest %{community_spotlight}"
       no_contacts_message_with_aspect: "Sprawdź kto jest w %{community_spotlight} lub %{add_to_aspect_link}"
       only_sharing_with_me: "Udostępniający tylko mnie"
-      remove_person_from_aspect: "Usuń %{person_name} z aspektu \"%{aspect_name}\""
+      remove_contact: "Usuń kontakt"
       start_a_conversation: "Rozpocznij rozmowę"
       title: "Kontakty"
+      user_search: "Wyszukiwanie użytkowników"
       your_contacts: "Twoje kontakty"
     many: "%{count} kontaktów"
     one: "1 kontakt"
@@ -408,6 +424,14 @@ pl:
     getting_started_tutorial: "serię samouczków \"Pierwsze kroki\""
     here: "Tutaj"
     irc: "IRC"
+    keyboard_shortcuts:
+      keyboard_shortcuts_a1: "W widoku strumienia możesz używać tych skrótów:"
+      keyboard_shortcuts_li1: "j - przejdź do następnego wpisu"
+      keyboard_shortcuts_li2: "k - przejdź do poprzedniego wpisu"
+      keyboard_shortcuts_li3: "c - skomentuj bieżacy wpis"
+      keyboard_shortcuts_li4: "l - polub bieżący wpis"
+      keyboard_shortcuts_q: "Jakie skróty klawiszowe są dostępne?"
+      title: "Skróty klawiszowe"
     markdown: "Markdown"
     mentions:
       how_to_mention_a: "Wprowadź znak \"@\", a po nim zacznij wpisywać imię osoby. Pojawi się menu, które pozwoli Ci wybrać tą osobę. Pamiętaj, że w ten sposób wspomnisz tylko o osobach, które dodałeś do któregoś z aspektów."
@@ -668,6 +692,7 @@ pl:
       comment_on_post: "Komentarz do wpisu"
       liked: "Polubili"
       mark_all_as_read: "Oznacz wszystkie jako przeczytane"
+      mark_all_shown_as_read: "Oznacz widoczne jako przeczytane"
       mark_read: "Oznacz jako przeczytane"
       mark_unread: "Oznacz jako nieprzeczytane"
       mentioned: "Wspomnieli o tobie"
@@ -968,12 +993,14 @@ pl:
       sign_up: "REJESTRACJA"
       sign_up_message: "Social Networking z ♥"
       submitting: "Wysyłanie..."
+      terms: "Zakładając konto akceptujesz %{terms_link}."
+      terms_link: "warunki korzystania z serwisu"
       username: "NAZWA UŻYTKOWNIKA"
   report:
     comment_label: "<b>Komentarz</b>:<br/>%{data}"
     confirm_deletion: "Czy masz pewność, że chcesz usunąć ten element?"
     delete_link: "Usuń element"
-    not_found: "<u>Ten wpis lub komentarz nie został znaleziony. Wygląda na to, że został usunięty!</u>"
+    not_found: "<u>Ten wpis/komentarz nie został znaleziony. Wygląda na to, że został usunięty przez autora!</u>"
     post_label: "<b>Wpis</b>: %{title}"
     reason_label: "Powód: %{text}"
     reported_label: "<b>Zgłoszony przez</b> %{person}"
@@ -1161,12 +1188,7 @@ pl:
       no_message_to_display: "Brak wiadomości do wyświetlenia."
     new:
       mentioning: "Wspominasz o: %{person}"
-    too_long:
-      few: "skróć swoje wiadomości statusowe do mniej niż %{count} znaków"
-      many: "skróć swoje wiadomości statusowe do mniej niż %{count} znaków"
-      one: "skróć swoje wiadomości statusowe do mniej niż %{count} znaku"
-      other: "skróć swoje wiadomości statusowe do mniej niż %{count} znaków"
-      zero: "skróć swoje wiadomości statusowe do mniej niż %{count} znaków"
+    too_long: "Skróć swoją wiadomość statusową poniżej %{count} znaków. Obecnie jej długość to %{current_length} znaków."
   stream_helper:
     hide_comments: "Ukryj wszystkie komentarze"
     show_comments:
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 1fab7ec15..75e7fcf15 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -12,6 +12,7 @@ pt-BR:
   _home: "Início"
   _photos: "Fotos"
   _services: "Serviços"
+  _terms: "Termos"
   account: "Conta"
   activerecord:
     errors:
@@ -54,7 +55,7 @@ pt-BR:
       correlations: "Correlações"
       pages: "Páginas"
       pod_stats: "Status do Servidor"
-      report: "Relatórios"
+      report: "Relatos"
       sidekiq_monitor: "Monitor Sidekiq"
       user_search: "Busca de Usuários"
       weekly_user_stats: "Estatísticas Semanais"
@@ -143,7 +144,7 @@ pt-BR:
     aspect_contacts:
       done_editing: "Edição concluída"
     aspect_listings:
-      add_an_aspect: "+ Adicione um aspecto"
+      add_an_aspect: "+ Adicione um Aspecto"
       deselect_all: "Desmarcar tudo"
       edit_aspect: "Editar %{name}"
       select_all: "Selecionar tudo"
@@ -163,27 +164,27 @@ pt-BR:
       add_existing: "Adicione um contato existente"
       aspect_list_is_not_visible: "Contatos neste aspecto não podem ver uns aos outros."
       aspect_list_is_visible: "Contatos neste aspecto podem ver uns aos outros."
-      confirm_remove_aspect: "Tem certeza que deseja deletar este aspecto?"
+      confirm_remove_aspect: "Tem certeza que deseja apagar este aspecto?"
       done: "Feito"
-      make_aspect_list_visible: "Tornar contatos nesse aspecto visíveis entre si?"
+      make_aspect_list_visible: "Tornar contatos desse aspecto visíveis entre si?"
       manage: "Gerenciar"
-      remove_aspect: "Deletar este aspecto"
+      remove_aspect: "Apagar este aspecto"
       rename: "Renomear"
-      set_visibility: "Configurar Visibilidade"
+      set_visibility: "Configurar visibilidade"
       update: "atualizar"
       updating: "atualizando"
     few: "%{count} aspectos"
     helper:
-      are_you_sure: "Tem certeza em deletar este aspecto?"
+      are_you_sure: "Tem certeza em apagar este aspecto?"
       aspect_not_empty: "Aspecto não está vazio"
       remove: "remover"
     index:
       diaspora_id:
-        content_1: "Seu diaspora* ID é:"
+        content_1: "Sua diaspora* ID é:"
         content_2: "Forneça-o às pessoas e elas poderão te encontrar em diaspora*."
         heading: "diaspora* ID"
       donate: "Faça uma Doação"
-      handle_explanation: "Esse é seu diaspora* ID. Como um endereço de e-mail, você pode fornecê-lo para que outras pessoas contatem com você."
+      handle_explanation: "Essa é sua diaspora* ID. Como um endereço de e-mail, você pode fornecê-la para que outras pessoas contatem com você."
       help:
         any_problem: "Algum Problema?"
         contact_podmin: "Entre em contato com o administrador do seu servidor!"
@@ -200,14 +201,14 @@ pt-BR:
         tag_feature: "feature"
         tag_question: "pergunta"
         tutorial_link_text: "Tutoriais"
-        tutorials_and_wiki: "%{faq}, %{tutorial} & %{wiki}: Ajuda para seus primeiros passos."
+        tutorials_and_wiki: "%{faq}, %{tutorial} & %{wiki}: ajudas para seus primeiros passos."
       introduce_yourself: "Este é seu fluxo. Se apresente!"
       keep_diaspora_running: "Mantenha o desenvolvimento de diaspora* acelerado com uma doação mensal!"
-      keep_pod_running: "Mantenha %{pod} rodando bem e compre o café para nossos servidores com uma doação mensal!"
+      keep_pod_running: "Mantenha %{pod} funcionando bem e pague um café para nossos voluntários com uma doação fixa mensal!"
       new_here:
         follow: "Siga %{link} e dê boas vindas aos novos usuários de Diaspora*!"
         learn_more: "Saiba mais"
-        title: "Dê as boas vindas aos novos usuários"
+        title: "Dê boas vindas aos novatos"
       no_contacts: "Nenhum contato"
       no_tags: "+ Procurar uma tag para seguir"
       people_sharing_with_you: "Pessoas compartilhando com você"
@@ -260,7 +261,7 @@ pt-BR:
       failure: "Eu não conseguirei parar de ignorar este usuário. #evasão"
       success: "Vamos ver o que eles têm a dizer! #digaoi"
   bookmarklet:
-    explanation: "Publique em diaspora* de qualquer lugar favoritando este link => %{link}."
+    explanation: "Publique em diaspora* de qualquer lugar favoritando este link: %{link}"
     heading: "Favoritos"
     post_something: "Publicar em diaspora*"
     post_success: "Publicado! Fechando!"
@@ -281,9 +282,10 @@ pt-BR:
     few: "%{count} contatos"
     index:
       add_a_new_aspect: "Adicione um novo aspecto"
+      add_contact: "Adicionar contato"
       add_to_aspect: "Adicionar contatos para %{name}"
       add_to_aspect_link: "adicionar contatos para %{name}"
-      all_contacts: "Todos Contatos"
+      all_contacts: "Todos os Contatos"
       community_spotlight: "Destaque da Comunidade"
       many_people_are_you_sure: "Tem certeza de que deseja iniciar uma conversa privada com mais de %{suggested_limit} contatos? Uma publicação para o aspecto que eles estão pode ser uma melhor maneira de contactá-los."
       my_contacts: "Meus Contatos"
@@ -291,9 +293,10 @@ pt-BR:
       no_contacts_message: "Veja %{community_spotlight}"
       no_contacts_message_with_aspect: "Veja %{community_spotlight} ou %{add_to_aspect_link}"
       only_sharing_with_me: "Só compartilhando comigo"
-      remove_person_from_aspect: "Remover %{person_name} de \"%{aspect_name}\""
+      remove_contact: "Remover contato"
       start_a_conversation: "Iniciar uma conversa"
       title: "Contatos"
+      user_search: "Busca de Usuário"
       your_contacts: "Seus Contatos"
     many: "%{count} contatos"
     one: "1 contato"
@@ -324,7 +327,7 @@ pt-BR:
         zero: "Nenhuma mensagem nova"
     index:
       conversations_inbox: "Conversas - Caixa de Entrada"
-      create_a_new_conversation: "começar uma nova conversa"
+      create_a_new_conversation: "iniciar uma nova conversa"
       inbox: "Entrada"
       new_conversation: "Nova conversa"
       no_conversation_selected: "nenhuma conversa selecionada"
@@ -338,7 +341,7 @@ pt-BR:
     new_conversation:
       fail: "Mensagem inválida"
     show:
-      delete: "deletar e bloquear esta conversa"
+      delete: "apagar e fechar esta conversa"
       reply: "responder"
       replying: "Respondendo..."
   date:
@@ -346,7 +349,7 @@ pt-BR:
       birthday: "%d %B"
       birthday_with_year: "%d de %B de %Y"
       fullmonth_day: "%d de %B"
-  delete: "Deletar"
+  delete: "Apagar"
   email: "Email"
   error_messages:
     helper:
@@ -377,8 +380,8 @@ pt-BR:
       contacts_know_aspect_q: "Meus contactos sabem em que aspectos eu os coloquei?"
       contacts_visible_a: "Se você selecionar esta opção, então os contatos daquele aspecto serão capazes de ver quem mais está lá dentro, na sua página de perfil, sob a sua imagem pessoal. É melhor selecionar esta opção somente se todos os contatos naquele aspecto se conhecerem. Eles ainda não serão capazes de poder ver o nome do aspecto."
       contacts_visible_q: "O que significa \"tornar contatos neste aspecto visíveis entre eles\"?"
-      delete_aspect_a: "Na sua lista de aspectos do lado esquerdo na página principal, aponte o mouse para o aspecto que você quer deletar. Clique no pequeno lápis de edição que aparece à direita. Clique no botão Deletar na caixa que aparece."
-      delete_aspect_q: "Como eu deleto um aspecto?"
+      delete_aspect_a: "Na sua lista de aspectos do lado esquerdo na página principal, aponte o mouse para o aspecto que você quer apagar. Clique no pequeno lápis de edição que aparece à direita. Clique no botão Apagar na caixa que aparece."
+      delete_aspect_q: "Como eu apago um aspecto?"
       person_multiple_aspects_a: "Sim. Vá até sua página de contatos e clique em meus contatos. Para cada contato você pode usar o menu à direita para adicioná-los para (ou removê-los de) tantos aspectos quanto você quiser. Ou você pode adicioná-los a um novo aspecto (ou removê-los de um aspecto) clicando no botão seletor de aspectos na sua página de perfil. Ou você pode ainda apenas mover o cursor sobre o nome que você vê no fluxo, e um 'cartão flutuante' aparecerá. Você pode mudar os aspectos que estão à direita."
       person_multiple_aspects_q: "Posso adicionar uma pessoa a múltiplos aspectos?"
       post_multiple_aspects_a: "Sim. Quando você está fazendo uma publicação, use o botão seletor de aspectos para selecionar ou desselecionar aspectos. Sua publicação será visível a todos os aspectos que você selecionou. Você pode também selecionar na barra lateral os aspectos para os quais você quer publicar. Quando você publica, o(s) aspecto(s) que você selecionou da lista à esquerda será(ão) automaticamente selecionado(s) no seletor de aspectos."
@@ -403,7 +406,7 @@ pt-BR:
       get_support_a_wiki: "procure o %{link}"
       get_support_q: "E se minha pergunta não for respondida neste FAQ? Onde mais eu posso encontrar ajuda?"
       getting_started_a: "Você está com sorte. Tente o %{tutorial_series} no nosso site do projeto. Ele te levará passo-a-passo através do processo de registro e te ensinará todas as coisas básicas que você precisa saber para utilizar diaspora*."
-      getting_started_q: "Socorro! Preciso de ajuda para começar!"
+      getting_started_q: "Socorro! Preciso de alguma ajuda básica para começar!"
       title: "Obter ajuda"
     getting_started_tutorial: "tutorial da série 'Começando'"
     here: "aqui"
@@ -611,7 +614,7 @@ pt-BR:
       whats_new: "O que há de novo?"
       your_aspects: "Seus aspectos"
     header:
-      admin: "Administrador"
+      admin: "Administração"
       blog: "Blog"
       code: "Código"
       help: "Ajuda"
@@ -643,13 +646,13 @@ pt-BR:
         zero: "ninguém curtiu"
   limited: "Limitado"
   more: "Mais"
-  next: "Próximo"
+  next: "próximo"
   no_results: "Nenhum Resultado Encontrado"
   notifications:
     also_commented:
-      one: "%{actors} também comentou sobre a %{post_link} de %{post_author}."
-      other: "%{actors} também comentaram sobre a %{post_link} de %{post_author}."
-      zero: "%{actors} comentou sobre a %{post_link} de %{post_author}."
+      one: "%{actors} também comentou sobre %{post_link} de %{post_author}."
+      other: "%{actors} também comentaram sobre %{post_link} de %{post_author}."
+      zero: "%{actors} comentou sobre %{post_link} de %{post_author}."
     also_commented_deleted:
       one: "%{actors} comentou em uma publicação apagada."
       other: "%{actors} comentaram em uma publicação apagada."
@@ -677,21 +680,22 @@ pt-BR:
         other: "e %{count} outros"
         two: "e %{count} outros"
         zero: "e mais ninguém"
-      comment_on_post: "Comentar na publicação"
+      comment_on_post: "Comentou na publicação"
       liked: "Curtiu"
       mark_all_as_read: "Marcar tudo como lido"
+      mark_all_shown_as_read: "marcar tudo como lido"
       mark_read: "Marcar como lido"
       mark_unread: "Marcar como não lida"
       mentioned: "Mencionou"
       notifications: "Notificações"
-      reshared: "Re-compartilhada"
+      reshared: "Recompartilhou"
       show_all: "mostrar tudo"
       show_unread: "mostrar não lido"
       started_sharing: "Começou a compartilhar"
     liked:
-      one: "%{actors} curtiu sua %{post_link}."
-      other: "%{actors} curtiram sua %{post_link}."
-      zero: "%{actors} curtiu sua %{post_link}."
+      one: "%{actors} curtiu sua publicação %{post_link}."
+      other: "%{actors} curtiram sua publicação %{post_link}."
+      zero: "%{actors} curtiu sua publicação %{post_link}."
     liked_post_deleted:
       one: "%{actors} curtiu sua publicação apagada."
       other: "%{actors} curtiram sua publicação apagada."
@@ -710,9 +714,9 @@ pt-BR:
       other: "%{actors} te enviaram uma mensagem."
       zero: "Ninguém te enviou uma mensagem."
     reshared:
-      one: "%{actors} recompartilhou a sua %{post_link}."
-      other: "%{actors} recompartilharam a sua %{post_link}."
-      zero: "%{actors} recompartilhou a sua %{post_link}."
+      one: "%{actors} recompartilhou a sua publicação %{post_link}."
+      other: "%{actors} recompartilharam a sua publicação %{post_link}."
+      zero: "%{actors} recompartilhou a sua publicação %{post_link}."
     reshared_post_deleted:
       one: "%{actors} recompartilhou sua publicação apagada."
       other: "%{actors} recompartilharam sua publicação apagada."
@@ -811,7 +815,7 @@ pt-BR:
       no_one_found: "...e ninguém foi encontrado."
       no_results: "Ei! Você precisa procurar por alguma coisa."
       results_for: "Resultado da busca por %{search_term}"
-      search_handle: "Para que você encontre seus amigos, use o diaspora* ID deles (nomedeusuario@pod.tld)."
+      search_handle: "Para que você encontre seus amigos, use a diaspora* ID deles (nomedeusuario@nomedopod.org)."
       searching: "pesquisando, por favor tenha paciência..."
       send_invite: "Nada ainda? Envie um convite!"
     many: "%{count} pessoas"
@@ -825,7 +829,7 @@ pt-BR:
     profile_sidebar:
       bio: "Biografia"
       born: "Aniversário"
-      edit_my_profile: "Editar Meu Perfil"
+      edit_my_profile: "Editar meu perfil"
       gender: "Sexo"
       in_aspects: "em aspectos"
       location: "Localização"
@@ -862,7 +866,7 @@ pt-BR:
       runtime_error: "O envio falhou! Você colocou seu cinto de segurança?"
       type_error: "O envio da foto falhou. Tem certeza que a imagem é válida?"
     destroy:
-      notice: "Foto deletada."
+      notice: "Foto apagada."
     edit:
       editing: "Editando"
     new:
@@ -880,9 +884,9 @@ pt-BR:
       view_all: "Ver todas as fotos do(a) %{name}"
     show:
       collection_permalink: "links permanentes"
-      delete_photo: "Deletar Foto"
+      delete_photo: "Apagar Foto"
       edit: "Editar"
-      edit_delete_photo: "Editar descrição / deletar foto"
+      edit_delete_photo: "Editar descrição / apagar foto"
       make_profile_photo: "Marcar como foto do perfil"
       show_original_post: "Ver publicação original"
       update_photo: "Atualizar Foto"
@@ -893,7 +897,7 @@ pt-BR:
     presenter:
       title: "Uma publicação de %{name}"
     show:
-      destroy: "Deletar"
+      destroy: "Apagar"
       not_found: "Desculpe! Não foi possível encontrar."
       permalink: "link permanente"
       photos_by:
@@ -901,7 +905,7 @@ pt-BR:
         other: "%{count} fotos de %{author}"
         zero: "Não há fotos de %{author}"
       reshare_by: "Recompartilhado por %{author}"
-  previous: "Anterior"
+  previous: "anterior"
   privacy: "Privacidade"
   privacy_policy: "Política de Privacidade"
   profile: "Perfil"
@@ -964,6 +968,8 @@ pt-BR:
       sign_up: "INSCREVER"
       sign_up_message: "Rede social com um ♥"
       submitting: "Enviando..."
+      terms: "Ao criar uma conta você aceita os %{terms_link}."
+      terms_link: "Termos de Serviço"
       username: "USUÁRIO"
   report:
     comment_label: "<b>Comentário</b>:<br>%{data}"
@@ -975,11 +981,11 @@ pt-BR:
     reported_label: "<b>Relatado por</b> %{person}"
     review_link: "Marcar como revisado"
     status:
-      created: "Um relatório foi criado"
+      created: "Um relato foi criado"
       destroyed: "A publicação foi destruída"
       failed: "Alguma coisa deu errado"
-      marked: "O relatório foi marcado como revisado"
-    title: "Visão Geral de Relatórios"
+      marked: "Um relato foi marcado como revisado"
+    title: "Visão Geral de Relatos"
   requests:
     create:
       sending: "Enviando"
@@ -1006,7 +1012,7 @@ pt-BR:
     create:
       failure: "Houve um erro ao recompartilhar esta publicação."
     reshare:
-      deleted: "A publicação original foi deletada pelo autor."
+      deleted: "A publicação original foi apagada pelo autor."
       reshare:
         one: "1 recompartilhamento"
         other: "%{count} recompartilhamentos"
@@ -1023,7 +1029,7 @@ pt-BR:
       read_only_access: "O nível de acesso é somente-leitura, por favor tente autorização novamente mais tarde"
       success: "Sucesso na autenticação."
     destroy:
-      success: "Autenticação deletada com sucesso."
+      success: "A autenticação foi apagada com sucesso."
     failure:
       error: "houve um erro na conexão deste serviço"
     finder:
@@ -1056,7 +1062,7 @@ pt-BR:
   shared:
     add_contact:
       add_new_contact: "Adicione um novo contato"
-      create_request: "Procurar por diaspora* ID"
+      create_request: "Procurar pela diaspora* ID"
       diaspora_handle: "diaspora@pod.org"
       enter_a_diaspora_username: "Digite um nome de usuário diaspora*:"
       know_email: "Você sabe seus e-mails? Convide-os!"
@@ -1078,7 +1084,7 @@ pt-BR:
       from_facebook: "Do Facebook"
       invitations_left: "%{count} restantes"
       invite_someone: "Convidar alguém"
-      invite_your_friends: "Convide seus amigos"
+      invite_your_friends: "Convide seus Amigos"
       invites: "Convites"
       invites_closed: "Convites estão temporariamente desativados neste servidor diaspora*"
       share_this: "Compartilhe este link via email, blog, ou redes sociais!"
@@ -1107,7 +1113,7 @@ pt-BR:
         invited_by: "Obrigado pelo convite, "
         newhere: "Novato"
       poll:
-        add_a_poll: "Adcionar uma enquete"
+        add_a_poll: "Adicionar uma enquete"
         add_poll_answer: "Adicionar opção"
         option: "Opção 1"
         question: "Pergunta"
@@ -1149,15 +1155,12 @@ pt-BR:
     create:
       success: "Mencionados com sucesso: %{names}"
     destroy:
-      failure: "Falha ao deletar a publicação"
+      failure: "Falha ao apagar a publicação"
     helper:
       no_message_to_display: "Nenhuma mensagem para mostrar."
     new:
       mentioning: "Mencionando: %{person}"
-    too_long:
-      one: "por favor, crie mensagens de status com menos de %{count} caracteres"
-      other: "por favor, crie mensagens de status com menos de %{count} caracteres"
-      zero: "por favor, crie mensagens de status com menos de %{count} caracteres"
+    too_long: "Por favor, faça com que suas mensagens de status sejam menores que %{count} caracteres. Neste momento elas estão com %{current_length} caracteres."
   stream_helper:
     hide_comments: "Ocultar todos os comentários"
     show_comments:
@@ -1166,7 +1169,7 @@ pt-BR:
       zero: "Nenhum comentário"
   streams:
     activity:
-      title: "Minhas Atividades"
+      title: "Minha Atividade"
     aspects:
       title: "Meus Aspectos"
     aspects_stream: "Aspectos"
@@ -1186,10 +1189,10 @@ pt-BR:
     mentioned_stream: "@Menções"
     mentions:
       contacts_title: "Pessoas que você mencionou"
-      title: "Suas menções"
+      title: "@Menções"
     multi:
-      contacts_title: "Pessoas em seus Fluxos"
-      title: "Fluxos"
+      contacts_title: "Pessoas em seu Fluxo"
+      title: "Fluxo"
     public:
       contacts_title: "Publicadores Recentes"
       title: "Atividade Pública"
@@ -1218,7 +1221,7 @@ pt-BR:
       people_tagged_with: "Pessoas marcadas com %{tag}"
       posts_tagged_with: "Publicações marcadas com #%{tag}"
       stop_following: "Parar de seguir #%{tag}"
-  terms_and_conditions: "Termos e condições"
+  terms_and_conditions: "Termos e Condições"
   undo: "Desfazer?"
   username: "Usuário"
   users:
@@ -1246,7 +1249,7 @@ pt-BR:
         make_diaspora_better: "Nós queremos que você faça diaspora* melhor, então nos ajude ao invés de sair. Se você quer mesmo sair, queremos que você saiba o que ainda acontecerá."
         mr_wiggles: "Mr Wiggles ficará triste se você for."
         no_turning_back: "Atualmente, não tem volta."
-        what_we_delete: "Vamos deletar todas as suas publicações e informações do perfil assim que possível. Seus comentários ainda ficarão, mas serão associados ao seu diaspora* ID ao invés do seu nome."
+        what_we_delete: "Vamos apagar todas as suas publicações e informações do perfil assim que possível. Seus comentários ainda ficarão, mas serão associados a sua diaspora* ID ao invés do seu nome."
       close_account_text: "Encerrar conta"
       comment_on_post: "alguém comenta sua publicação"
       current_password: "Senha Atual"
@@ -1265,13 +1268,13 @@ pt-BR:
       private_message: "você recebe uma mensagem privada"
       receive_email_notifications: "Receber notificações por email quando:"
       reshared: "alguém recompartilha sua publicação"
-      show_community_spotlight: "Mostrar Destaque da Comunidade no fluxo"
-      show_getting_started: "Mostrar dicas de Como Começar"
-      someone_reported: "alguém enviou um relatório"
+      show_community_spotlight: "Mostrar Destaque da Comunidade no Fluxo"
+      show_getting_started: "Mostrar dicas de como começar"
+      someone_reported: "alguém envia um relato"
       started_sharing: "alguém começa a compartilhar com você"
-      stream_preferences: "Preferências do fluxo"
+      stream_preferences: "Preferências do Fluxo"
       your_email: "Seu Email"
-      your_handle: "Seu diaspora* ID"
+      your_handle: "Sua diaspora* ID"
     getting_started:
       awesome_take_me_to_diaspora: "Incrível! Leve-me ao Diaspora*."
       community_welcome: "A comunidade diaspora* está feliz em tê-lo(a) a bordo!"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 8602fc21a..d992b78d0 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -263,7 +263,6 @@ pt-PT:
       no_contacts_message: "Verifique %{community_spotlight}"
       no_contacts_message_with_aspect: "Verifique %{community_spotlight} ou %{add_to_aspect_link}"
       only_sharing_with_me: "Apenas a partilhar comigo"
-      remove_person_from_aspect: "Remover %{person_name} de \"%{aspect_name}\""
       start_a_conversation: "Iniciar uma conversa"
       title: "Contactos"
       your_contacts: "Os seus contactos"
@@ -396,10 +395,13 @@ pt-PT:
       what_is_a_pod_a: "Um pod e um servidor a correr o software diaspora* e ligado à rede diaspora*. \"Pod\" e uma metáfora referindo-se às vagens nas plantas que contém sementes, da maneira que um servidor contém um número de contas de usuários. Existem muitos pods diferentes. Pode adicionar amigos de outros pods e comunicar com eles. (Pode pensar num pod diaspora* como sendo parecido a um provedor de serviço de email: há pods públicos, pods privados, e com algum esforço pode até mesmo correr o seu próprio)."
       what_is_a_pod_q: "O que é um servidor?"
     posts_and_posting:
+      char_limit_services_a: "Neste caso a sua publicação é limitada à menor contagem de caracteres (140 no Twitter; 1000 no Tumblr), e o número de caracteres não utilizados é mostrado quando o ícone daquele serviço é assinalado. Ainda poderá publicar nestes serviços se a sua publicação ultrapassar os respetivos limites, no entanto o texto será truncado nesses serviços."
       char_limit_services_q: "Qual é o limite de carateres para publicações compartilhadas através de um servço conetado com um cálculo de carateres pequeno?"
       character_limit_a: "65,535 carateres. Isto é, mais de 65,395 carateres do que o que obtém no Twitter! ;)"
       character_limit_q: "Qual é o limite de caracteres em publicações?"
+      embed_multimedia_a: "Geralmente basta colar a hiperligação (por exemplo: http://www.youtube.com/watch?v=nnnnnnnnn) na sua publicação, e o vídeo ou áudio será incorporado automaticamente. Alguns dos sites suportados são: YouTube, Vimeo, SoundCloud e Flickr entre outros. diaspora* utiliza oEmbed para esse efeito. A todo o momento novos sites vão sendo acrescentados a este suporte. Lembre-se de fazer sempre uma publicação de links simples e completos: não utilize links abreviados; nem caracteres depois da hiperligação base; e aguarde um instante antes de refrescar a página para ver a previsão de como ficará depois de publicar."
       embed_multimedia_q: "Como é que eu integro um vídeo, áudio, ou outro conteúdo de multimédia numa publicação?"
+      format_text_a: "Ao utilizar um sistema simplificado chamado %{markdown}. Pode encontrar a sintaxe Markdown completa %{here}. O botão de pré-visualização é muito útil aqui, pois permite ver como aparecerá a sua mensagem antes de a compartilhar."
       format_text_q: "Como é que eu formato o texto nas minhas publicações (negrito, itálico, etc.)?"
       hide_posts_a: "Se apontar o seu rato no topo de uma publicação, aparece um X à direita. Clique-o para ocultar a publicação e cancelar as notificações sobre a mesma. Ainda pode continuar a ver a publicação se visitar a página de perfil da pessoas que a publicou."
       hide_posts_q: "Como é que eu oculto uma publicação? Como é que eu deixo de receber notificações sobre uma publicação com o meu comentário?"
@@ -413,19 +415,26 @@ pt-PT:
       size_of_images_a: "Não. As imagens são redimensionadas automaticamente para se ajustarem ao fluxo. A redução não tem um código para especificar o tamanho de uma imagem."
       size_of_images_q: "Posso personalizar o tamanho das imagens em publicações ou comentários?"
       stream_full_of_posts_a1: "O seu grupo é constituido até 3 tipos de publicações:"
+      stream_full_of_posts_li1: "Publicações de pessoas com quem você está a compartilhar, que podem ser de dois tipos: publicações públicas ou publicações limitadas compartilhadas com um grupo do qual você faz parte. Para remover essas publicações do seu fluxo, basta parar de compartilhar com essa pessoa."
       stream_full_of_posts_li2: "Publicações públicas contendo uma das etiquetas que segue. Para as remover, deixe de seguir a etiqueta."
+      stream_full_of_posts_li3: "Publicações públicas feitas por pessoas listadas em \"Destaque da Comunidade\". Estas podem ser removidas desmarcando a opção \"Mostrar Destaques da Comunidade no Fluxo?\" na aba \"Conta\" das suas \"Definições\"."
       stream_full_of_posts_q: "Porque é que o meu grupo está cheio de publicações de pessoas que não conheço, e que não compartilho com elas?"
       title: "Publicações e publicar"
     private_posts:
+      can_comment_a: "Apenas os utilizadores logados em diaspora* que associou a esse grupo podem comentar ou gostar da sua publicação privada."
       can_comment_q: "Quem é que pode comentar ou gostar da minha publicação privada?"
+      can_reshare_a: "Ninguém. Publicações privadas não são recompartilháveis. Entretanto, utilizadores logados em diaspora* que estejam nesse grupo podem potencialmente copiar e colar a publicação."
       can_reshare_q: "Quem é que pode recompartilhar a minha publicação privada?"
       see_comment_a: "Só as pessoas que compartilham a publicação (as pessoas que foram selecionadas em aspeto por quem publica o original) podem ver os seus comentários e o gosto. "
       see_comment_q: "Quando comento ou gosto de uma publicação privada, quem é que pode ver?"
       title: "Publicações Privadas"
+      who_sees_post_a: "Apenas os utilizadores logados em diaspora* que associou a esse grupo podem ver a sua publicação privada."
       who_sees_post_q: "Quando eu coloco uma mensagem num aspeto (ex.:, uma publicação privada), quem a pode ver?"
     private_profiles:
       title: "Perfis Privados"
+      whats_in_profile_a: "Biografia, localização, sexo, e data de nascimento. É o que aparece na parte de baixo da página de edição do perfil. Toda esta informação é opcional - depende de você preencher ou não. Os utilizadores logados que você tenha adicionado aos seus grupos são as únicas pessoas que podem ver o seu perfil privado. Eles também verão as publicações privadas feitas no(s) grupos(s) em que os colocou, misturadas com as publicações públicas feitas por si, quando visitarem a sua página de perfil."
       whats_in_profile_q: "O que faz parte do meu perfil privado?"
+      who_sees_profile_a: "Qualquer utilizador logado com quem você esteja a compartilhar (significa que você os adicionou a um dos seus grupos). De qualquer forma, as pessoas que o seguem mas que você não segue, verão apenas a sua informação pública."
       who_sees_profile_q: "Quem vê o meu perfil privado?"
       who_sees_updates_a: "Qualquer pessoa nos seus aspetos, vê as alterações do seu perfil privado. "
       who_sees_updates_q: "Quem vê as atualizações ao meu perfil privado?"
@@ -437,6 +446,7 @@ pt-PT:
       see_comment_reshare_like_a: "Qualquer utilizador do diaspora* com sessão iniciada, e também qualquer outra pessoa na Internet pode comentar e compartilhar publicações pública."
       see_comment_reshare_like_q: "Quando eu comento em, volto a partilhar, ou gosto de uma publicação pública, quem é que pode ver?"
       title: "Publicações Públicas"
+      who_sees_post_a: "Qualquer pessoa que utilize a internet pode potencialmente ver uma publicação marcada por si como pública, por isso assegure-se de que realmente quer que ela seja pública. É uma ótima forma de apelar ao mundo lá fora."
       who_sees_post_q: "Quando eu publico qualquer coisa publicamente, quem é que pode ver?"
     public_profiles:
       title: "Perfis públicos"
@@ -988,10 +998,7 @@ pt-PT:
       no_message_to_display: "Não há mensagens para mostrar."
     new:
       mentioning: "A mencionar: %{person}"
-    too_long:
-      one: "por favour, não utilize mais de %{count} carateres nas suas mensagens de estado"
-      other: "por favour, não utilize mais de %{count} carateres nas suas mensagens de estado"
-      zero: "por favor, não utilize mais de %{count} carateres nas suas mensagens de estado"
+    too_long: "{\"one\"=>\"por favour, não utilize mais de %{count} carateres nas suas mensagens de estado\", \"other\"=>\"por favour, não utilize mais de %{count} carateres nas suas mensagens de estado\", \"zero\"=>\"por favor, não utilize mais de %{count} carateres nas suas mensagens de estado\"}"
   stream_helper:
     hide_comments: "Ocultar todos comentários"
     show_comments:
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 2007e0e6d..5b9982416 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -687,13 +687,7 @@ ro:
       failure: "Nu sa putut şterge postul"
     helper:
       no_message_to_display: "Nici un mesaj nou."
-    too_long:
-      few: "please make your status messages less than %{count} characters"
-      many: "please make your status messages less than %{count} characters"
-      one: "please make your status messages less than %{count} character"
-      other: "please make your status messages less than %{count} characters"
-      two: "please make your status messages less than %{count} characters"
-      zero: "please make your status messages less than %{count} characters"
+    too_long: "{\"few\"=>\"please make your status messages less than %{count} characters\", \"many\"=>\"please make your status messages less than %{count} characters\", \"one\"=>\"please make your status messages less than %{count} character\", \"other\"=>\"please make your status messages less than %{count} characters\", \"two\"=>\"please make your status messages less than %{count} characters\", \"zero\"=>\"please make your status messages less than %{count} characters\"}"
   stream_helper:
     hide_comments: "ascunde comentariile"
     show_comments:
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 17c28c00c..3e19e4793 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -96,12 +96,17 @@ ru:
         zero: "%{count} пользователей"
       week: "Неделя"
     user_entry:
+      email: "Почта"
+      guid: "Групповой идентификатор"
+      id: "Идентификатор"
       ? "no"
       : Нет
       ? "yes"
       : Да
     user_search:
+      account_closing_scheduled: "Учётная запись %{name} поставлена в очередь на закрытие. Будет завершено через несколько секунд..."
       add_invites: "добавить приглашения"
+      are_you_sure: "Вы уверены, что хотите закрыть эту учётную запись?"
       close_account: "Удалить учетную запись"
       email_to: "E-mail для приглашения"
       under_13: "Показать пользователей моложе 13 (COPPA)"
@@ -295,7 +300,6 @@ ru:
       no_contacts_message: "Загляните на страницу %{community_spotlight}"
       no_contacts_message_with_aspect: "Вы можете проверить страницу %{community_spotlight} или %{add_to_aspect_link}"
       only_sharing_with_me: "Только добавившие меня"
-      remove_person_from_aspect: "Удалить %{person_name} из \"%{aspect_name}\""
       start_a_conversation: "Начать беседу"
       title: "Контакты"
       your_contacts: "Ваши контакты"
@@ -1170,12 +1174,7 @@ ru:
       no_message_to_display: "Новых сообщений нет."
     new:
       mentioning: "Упоминание: %{person}"
-    too_long:
-      few: "сократите, пожалуйста, ваше сообщение до %{count} символов"
-      many: "сократите, пожалуйста, ваше сообщение до %{count} символов"
-      one: "сократите, пожалуйста, ваше сообщение до %{count} символа"
-      other: "сократите, пожалуйста, ваше сообщение до %{count} символов"
-      zero: "сократите, пожалуйста, ваше сообщение до %{count} символов"
+    too_long: "{\"few\"=>\"сократите, пожалуйста, ваше сообщение до %{count} символов\", \"many\"=>\"сократите, пожалуйста, ваше сообщение до %{count} символов\", \"one\"=>\"сократите, пожалуйста, ваше сообщение до %{count} символа\", \"other\"=>\"сократите, пожалуйста, ваше сообщение до %{count} символов\", \"zero\"=>\"сократите, пожалуйста, ваше сообщение до %{count} символов\"}"
   stream_helper:
     hide_comments: "Скрыть все комментарии"
     show_comments:
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index f61d11553..9f611ef01 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -272,7 +272,6 @@ sk:
       no_contacts_message: "Pozri si %{community_spotlight}"
       no_contacts_message_with_aspect: "Pozri si %{community_spotlight} alebo %{add_to_aspect_link}"
       only_sharing_with_me: "Ľudia, ktorí majú v kontaktoch iba mňa"
-      remove_person_from_aspect: "Odstrániť použ. %{person_name} z kategórie %{aspect_name}"
       start_a_conversation: "Začať rozhovor"
       title: "Kontakty"
       your_contacts: "Tvoje kontakty"
@@ -986,11 +985,7 @@ sk:
       no_message_to_display: "Žiadna správa na zobrazenie."
     new:
       mentioning: "Spomína sa: %{person}"
-    too_long:
-      few: "prosím, skráť svoje správy v statuse na menej ako %{count} znakov"
-      one: "prosím, skráť svoje správy v statusoch na menej ako %{count} znak"
-      other: "prosím, skráť svoje správy v statuse na menej ako %{count} znakov"
-      zero: "prosím, skráť svoje správy v statusoch na menej ako %{count} znakov"
+    too_long: "{\"few\"=>\"prosím, skráť svoje správy v statuse na menej ako %{count} znakov\", \"one\"=>\"prosím, skráť svoje správy v statusoch na menej ako %{count} znak\", \"other\"=>\"prosím, skráť svoje správy v statuse na menej ako %{count} znakov\", \"zero\"=>\"prosím, skráť svoje správy v statusoch na menej ako %{count} znakov\"}"
   stream_helper:
     hide_comments: "schovať komentáre"
     show_comments:
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index e646fb828..f673e3dc6 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -267,7 +267,6 @@ sl:
       no_contacts_message: "Preveri %{community_spotlight}"
       no_contacts_message_with_aspect: "Preveri %{community_spotlight} ali %{add_to_aspect_link}"
       only_sharing_with_me: "Delijo samo z mano"
-      remove_person_from_aspect: "Odstrani %{person_name} iz \"%{aspect_name}\""
       start_a_conversation: "Začni pogovor"
       title: "Stiki"
       your_contacts: "Vaši stiki"
@@ -867,12 +866,7 @@ sl:
       no_message_to_display: "Ni sporočil."
     new:
       mentioning: "Omembe: %{person}"
-    too_long:
-      few: "vaše spročilo o stanju morajo vsebovati manj kot %{count} znake"
-      one: "vaše spročilo o stanju morajo vsebovati manj kot %{count} znak"
-      other: "vaše spročilo o stanju morajo vsebovati manj kot %{count} znakov"
-      two: "vaše spročilo o stanju morajo vsebovati manj kot %{count} znaka"
-      zero: "vaše spročilo o stanju morajo vsebovati manj kot %{count} znakov"
+    too_long: "{\"few\"=>\"vaše spročilo o stanju morajo vsebovati manj kot %{count} znake\", \"one\"=>\"vaše spročilo o stanju morajo vsebovati manj kot %{count} znak\", \"other\"=>\"vaše spročilo o stanju morajo vsebovati manj kot %{count} znakov\", \"two\"=>\"vaše spročilo o stanju morajo vsebovati manj kot %{count} znaka\", \"zero\"=>\"vaše spročilo o stanju morajo vsebovati manj kot %{count} znakov\"}"
   stream_helper:
     hide_comments: "Skrij vsa mnenja"
     show_comments:
diff --git a/config/locales/diaspora/sr.yml b/config/locales/diaspora/sr.yml
index 0fcdfcecf..40d359b30 100644
--- a/config/locales/diaspora/sr.yml
+++ b/config/locales/diaspora/sr.yml
@@ -170,7 +170,6 @@ sr:
       all_contacts: "Сви контакти"
       my_contacts: "Моји контакти"
       no_contacts: "Изгледа да треба да додаш неке контакте!"
-      remove_person_from_aspect: "Уклони %{person_name} из аспекта %{aspect_name}"
       title: "Контакти"
       your_contacts: "Твоји контакти"
   conversations:
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 964724bd5..127b69336 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -282,6 +282,7 @@ sv:
     few: "%{count} kontakter"
     index:
       add_a_new_aspect: "Lägg till en ny aspekt"
+      add_contact: "Lägg till kontakt"
       add_to_aspect: "lägg till kontakter i %{name}"
       add_to_aspect_link: "lägg till kontakter i %{name}"
       all_contacts: "Alla kontakter"
@@ -292,9 +293,10 @@ sv:
       no_contacts_message: "Kolla in %{community_spotlight}"
       no_contacts_message_with_aspect: "Kolla in %{community_spotlight} eller %{add_to_aspect_link}"
       only_sharing_with_me: "Delar enbart med mig"
-      remove_person_from_aspect: "Ta bort %{person_name} från \"%{aspect_name}\""
+      remove_contact: "Ta bort kontakt"
       start_a_conversation: "Inled en konversation"
       title: "Kontakter"
+      user_search: "Användarsökning"
       your_contacts: "Kontakter"
     many: "%{count} kontakter"
     one: "en kontakt"
@@ -1140,10 +1142,7 @@ sv:
       no_message_to_display: "Inget meddelande att visa."
     new:
       mentioning: "Nämner: %{person}"
-    too_long:
-      one: "ditt statusmeddelande får inte vara längre än en bokstav"
-      other: "ditt statusmeddelande får inte vara längre än %{count} bokstäver"
-      zero: "ditt statusmeddelande får inte vara längre än %{count} bokstäver"
+    too_long: "Var bussig och håll antalet tecken i inlägget under %{count}. Just nu är det %{current_length} tecken långt."
   stream_helper:
     hide_comments: "Dölj alla kommentarer"
     show_comments:
diff --git a/config/locales/diaspora/te.yml b/config/locales/diaspora/te.yml
index 74fb0d6b4..a1db45ce6 100644
--- a/config/locales/diaspora/te.yml
+++ b/config/locales/diaspora/te.yml
@@ -249,7 +249,6 @@ te:
       no_contacts_message: "%{community_spotlight}ని సందర్శించండి"
       no_contacts_message_with_aspect: "%{add_to_aspect_link} లేక %{community_spotlight}ని సందర్శించండి"
       only_sharing_with_me: "నాతో మాత్రమే పంచుకునే వారు"
-      remove_person_from_aspect: "\"%{aspect_name}\" నుంచి %{person_name}ని తొలగించు"
       start_a_conversation: "సంభాషణను ప్రారంభించండి"
       title: "పరిచయాలు"
       your_contacts: "మీ పరిచయాలు"
@@ -849,10 +848,7 @@ te:
       no_message_to_display: "చూపించడానికి ఏ సందేశాలు లేవు."
     new:
       mentioning: "పేర్కోలు: %{person}"
-    too_long:
-      one: "దయచేసి మీ స్థితి సందేశాలలో అక్షరాల సంఖ్య %{count} కంటే తక్కువ ఉండేటట్లు చూసుకోండి"
-      other: "దయచేసి మీ స్థితి సందేశాలలో అక్షరాల సంఖ్య %{count} కంటే తక్కువ ఉండేటట్లు చూసుకోండి"
-      zero: "దయచేసి మీ స్థితి సందేశాలలో అక్షరాల సంఖ్య %{count} కంటే తక్కువ ఉండేటట్లు చూసుకోండి"
+    too_long: "{\"one\"=>\"దయచేసి మీ స్థితి సందేశాలలో అక్షరాల సంఖ్య %{count} కంటే తక్కువ ఉండేటట్లు చూసుకోండి\", \"other\"=>\"దయచేసి మీ స్థితి సందేశాలలో అక్షరాల సంఖ్య %{count} కంటే తక్కువ ఉండేటట్లు చూసుకోండి\", \"zero\"=>\"దయచేసి మీ స్థితి సందేశాలలో అక్షరాల సంఖ్య %{count} కంటే తక్కువ ఉండేటట్లు చూసుకోండి\"}"
   stream_helper:
     hide_comments: "అన్ని వ్యాఖ్యలను దాచు"
     show_comments:
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 33dfd37d3..676d2774a 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -256,7 +256,6 @@ tr:
       no_contacts_message: "%{community_spotlight}'ni ziyaret et"
       no_contacts_message_with_aspect: "%{community_spotlight}'ni ziyaret et ya da %{add_to_aspect_link}"
       only_sharing_with_me: "Benimle paylaşım yapan"
-      remove_person_from_aspect: "%{person_name} kişisini \"%{aspect_name}\" yönünden kaldır"
       start_a_conversation: "Bir iletişim başlatın"
       title: "Kişiler"
       your_contacts: "Kişiler"
@@ -950,9 +949,7 @@ tr:
       no_message_to_display: "Gösterilecek mesaj yok."
     new:
       mentioning: "Bahseden: %{person}"
-    too_long:
-      other: "durum mesajları %{count} karakterden az olmalıdır."
-      zero: "durum mesajları %{count} karakterden az olmalıdır."
+    too_long: "{\"other\"=>\"durum mesajları %{count} karakterden az olmalıdır.\", \"zero\"=>\"durum mesajları %{count} karakterden az olmalıdır.\"}"
   stream_helper:
     hide_comments: "Yorumları gizle"
     show_comments:
diff --git a/config/locales/diaspora/uk.yml b/config/locales/diaspora/uk.yml
index 808956820..0e08f7e2d 100644
--- a/config/locales/diaspora/uk.yml
+++ b/config/locales/diaspora/uk.yml
@@ -10,8 +10,9 @@ uk:
   _contacts: "Контакти"
   _help: "Довідка"
   _home: "Головна"
-  _photos: "фотографій"
+  _photos: "світлини"
   _services: "Сервіси"
+  _terms: "Умови"
   account: "Обліковий запис"
   activerecord:
     errors:
@@ -53,11 +54,11 @@ uk:
     admin_bar:
       correlations: "Кореляція"
       pages: "Сторінки"
-      pod_stats: "Активність поду"
+      pod_stats: "Статистика сервера"
       report: "Доноси"
       sidekiq_monitor: "Монітор Sidekiq"
       user_search: "Пошук користувачів"
-      weekly_user_stats: "Щотижнева активність користувачів"
+      weekly_user_stats: "Щотижнева статистика користувачів"
     correlations:
       correlations_count: "Зв'язок з числом входів:"
     stats:
@@ -95,8 +96,23 @@ uk:
         other: "користувачів: %{count}"
         zero: "жодного користувача"
       week: "Тиждень"
+    user_entry:
+      account_closed: "аккаунт закрито"
+      email: "Пошта"
+      guid: "GUID"
+      id: "ID"
+      last_seen: "останній раз заходив"
+      ? "no"
+      : ні
+      nsfw: "#nsfw"
+      unknown: "невідомо"
+      ? "yes"
+      : так
     user_search:
+      account_closing_scheduled: "Планується закриття аккаунту з ім'ям %{name}. Обробка займе кілька хвилин..."
       add_invites: "додати запрошення"
+      are_you_sure: "Ви впевнені, що бажаєте закрити цей аккаунт?"
+      close_account: "закрити аккаунт"
       email_to: "Адреса для запрошення"
       under_13: "Показати користувачів молодших 13 (COPPA)"
       users:
@@ -105,6 +121,7 @@ uk:
         one: "знайдено користувачів: %{count}"
         other: "знайдено користувачів: %{count}"
         zero: "не знайдено жодного користувача"
+      view_profile: "перегляд профілю"
       you_currently:
         few: "Запрошень в наявності: %{count}. %{link}"
         many: "Запрошень в наявності: %{count}. %{link}"
@@ -278,6 +295,7 @@ uk:
     few: "%{count} контакт[-у, -iв]"
     index:
       add_a_new_aspect: "Новий аспект"
+      add_contact: "Додати контакт"
       add_to_aspect: "додати контакти до %{name}"
       add_to_aspect_link: "додати контакти до аспекту %{name}"
       all_contacts: "Усі контакти"
@@ -288,9 +306,10 @@ uk:
       no_contacts_message: "Зазирніть до %{community_spotlight}"
       no_contacts_message_with_aspect: "Зазирніть до %{community_spotlight}%{community_spotlight} або %{add_to_aspect_link}"
       only_sharing_with_me: "Що тільки додали мене"
-      remove_person_from_aspect: "Вилучити %{person_name} з \"%{aspect_name}\""
+      remove_contact: "Видалити контакт"
       start_a_conversation: "Почати бесіду"
       title: "Контакти"
+      user_search: "Пошук користувача"
       your_contacts: "Ваші контакти"
     many: "%{count} контакт[-у, -iв]"
     one: "1 контакт"
@@ -405,7 +424,15 @@ uk:
     getting_started_tutorial: "\"Інструкції для початківців\""
     here: "сюди"
     irc: "IRC"
-    markdown: "Верстка"
+    keyboard_shortcuts:
+      keyboard_shortcuts_a1: "у відображенні потоку Ви можете використовувати наступні поєднання клавіш:"
+      keyboard_shortcuts_li1: "j - перейти до наступного запису"
+      keyboard_shortcuts_li2: "k - перейти до попереднього запису"
+      keyboard_shortcuts_li3: "c - прокоментувати запис"
+      keyboard_shortcuts_li4: "l - лайкнути запис"
+      keyboard_shortcuts_q: "Які поєднання клавіш доступні?"
+      title: "Гарячі клавіші"
+    markdown: "Markdown"
     mentions:
       how_to_mention_a: "Напишіть знак \"@\" та почніть набирати ім'я. З'явиться меню з вибором відповідних користувачів. Зауважте, що згадувати користувача можна тільки, якщо ви додали його у свої аспекти."
       how_to_mention_q: "Як мені згадати кого-небудь, коли я створюю запис?"
@@ -421,8 +448,8 @@ uk:
       back_to_top_q: "Чи є швидкий спосіб повернутись до початку сторінки, яку я проскролив вниз?"
       diaspora_app_a: "Є дещо декілька досить сирих додатків під андроїд. Деякі давно покинуті і досить погано працюють з новими версіями Діаспори. Не чекайте від них багато чого. Проте у Діаспори є версія сайту під мобільні браузери, так що ви можете скористатися вашим улюбленим мобильним пристрієм для доступу до Діаспори. Цей спосіб працює не лише під андроїдом і ios, але і під іншими телефонами."
       diaspora_app_q: "Чи є додаток для Діаспори під андроїд або ios?"
-      photo_albums_a: "Поки ні. Хоча у бічній панелі є посилання на потік завантажених фотографій, до якої ви можете отримати доступ, якщо користувач вас додав."
-      photo_albums_q: "Чи є в діаспорі фото і відео альбоми?"
+      photo_albums_a: "Поки що ні. Хоча у бічній панелі є посилання на потік завантажених світлин."
+      photo_albums_q: "Чи є в діаспорі фото- і відео-альбоми?"
       subscribe_feed_a: "Так, але це ще не закінчена функція і форматування у фіді буде досить грубою. Якщо ви все одно хочете спробувати, зайдіть в чий-небудь профіль і кликніть по кнопці фіду у вашому браузері або скопіюйте адресу профілю (наприклад https://joindiaspora.com/people/userID) і додайте в агрегатор. Кінцевий результат виглядатиме так: https://joindiaspora.com/public/username.atom Діаспора використовує atom протокол, а не rss."
       subscribe_feed_q: "Чи можу я стежити за чиїми-небудь публічними записами, через агрегатор?"
       title: "Інше"
@@ -441,14 +468,14 @@ uk:
       character_limit_q: "Яка максимальна кількість символів для запису?"
       embed_multimedia_a: "Для цього вам достатньо просто вставити посилання (наприклад http://www.youtube.com/watch?v=nnnnnnnnnnn ) у ваш пост і відео або аудіо буде додано автоматично. Сайти, які підтримуються: YouTube, Vimeo, SoundCloud, Flickr та деякі інші. Цей список постійно поповнюється. Пам'ятайте завжди використовувати прості, повні посилання; не укорочені; жодних операторів після основного посилання; і зачекайте трохи перед тим як перезавантажувати сторінку після викладення поста, задля того аби побачити попередній вигляд."
       embed_multimedia_q: "Як я можу прикріплювати відео, аудіо, чи інший мультимедійний контент у мої пости?"
-      format_text_a: "Діаспора підтримує синтаксис %{markdown}.Ви можете знайти опис синтаксису по посиланні %{here} або на російській http://rukeba.com/by-the-way/markdown-sintaksis-po-russki Якщо у Вас є сумніви ,у тому ,чи правильно Ви оформили запис ,Ви можете скористатися кнопкою \"Попередній огляд\"."
+      format_text_a: "Діаспора підтримує синтаксис %{markdown}. Його повний опис можна знайти %{here}. Якщо Ви сумніваєтесь, чи правильно оформили запис, Ви можете скористатися кнопкою \"Попередній огляд\"."
       format_text_q: "Як мені оформити текст моїх записів (полужирний, курсив і т.д.)?"
       hide_posts_a: "Якщо Ви наведете мишкою на запис, справа вверху з'явиться хрестик.Натисніть на нього.Ви все одно зможете бачити запис і коментарі, якщо зайдете на сторінку до автора цього запису."
       hide_posts_q: "Як мені приховати запис і перестати отримувати повідомлення про коментарі до нього?"
       image_text: "спливаючий текст"
       image_url: "Адреса зображення"
-      insert_images_a: "Натисність піктограму фотокамери та укажіть потрібне зображення для завантаження з вашого комп'ютера. Якщо ж ви бажаєте вставити зображення з Інтернету, ви можете скористатися синтаксисом Мarkdown."
-      insert_images_comments_a1: "Наступний код Markdown"
+      insert_images_a: "Натисність піктограму фотокамери та вкажіть потрібне зображення для завантаження з вашого комп'ютера. Якщо ж Ви бажаєте вставити зображення з Інтернету, у Вас є можливість можете скористатися синтаксисом Мarkdown."
+      insert_images_comments_a1: "Такий код Markdown"
       insert_images_comments_a2: "може бути використаний як для коментарів, так і для записів."
       insert_images_comments_q: "Чи можу я додати зображення у коментарі?"
       insert_images_q: "Як мені додати у запис зображення?"
@@ -668,6 +695,7 @@ uk:
       comment_on_post: "Коментар до запису"
       liked: "Сподобалася"
       mark_all_as_read: "Позначити всі як прочитані"
+      mark_all_shown_as_read: "Відзначити все як прочитане"
       mark_read: "Помітити як прочитане"
       mark_unread: "позначити як непрочитане"
       mentioned: "Згадав"
@@ -837,7 +865,7 @@ uk:
       gender: "стать"
       in_aspects: "у аспектах"
       location: "розташування"
-      photos: "Фото"
+      photos: "Світлини"
       remove_contact: "вилучити контакт"
       remove_from: "Видалити %{name} з %{aspect}?"
     show:
@@ -866,16 +894,16 @@ uk:
   photos:
     comment_email_subject: "Фотографія %{name}"
     create:
-      integrity_error: "Помилка при завантаженні фотографії. Ви впевнені, що це графічний файл?"
-      runtime_error: "Збій при завантаженні фотографії."
-      type_error: "Збій при завантаженні фототрафії. Ви впевнені, що додали графічний файл?"
+      integrity_error: "Помилка при завантаженні світлини. Ви впевнені, що це графічний файл?"
+      runtime_error: "Збій при завантаженні світлини."
+      type_error: "Збій при завантаженні світлини. Ви впевнені, що додали графічний файл?"
     destroy:
       notice: "Фотографію вилучено."
     edit:
       editing: "Редагування"
     new:
       back_to_list: "Повернутися до списку"
-      new_photo: "Нова Фотографія"
+      new_photo: "Нова світлина"
       post_it: "Опублікувати!"
     new_photo:
       empty: "{file} порожній, будь ласка, виберіть файли ще раз, але без нього."
@@ -885,18 +913,18 @@ uk:
       or_select_one_existing: "чи виберіть одну із вже завантажених %{photos}"
       upload: "Завантажити нове фото для профілю!"
     photo:
-      view_all: "Подивитися усі фотографії %{name}"
+      view_all: "Подивитися усі світлини %{name}"
     show:
       collection_permalink: "постійне посилання на колекцію"
-      delete_photo: "Вилучити фотографію"
+      delete_photo: "Вилучити світлину"
       edit: "редагувати"
-      edit_delete_photo: "Змінити опис фотографії / вилучити фотографію"
-      make_profile_photo: "зробити фотографією профілю"
+      edit_delete_photo: "Змінити опис світлини / вилучити світлину"
+      make_profile_photo: "зробити світлиною профілю"
       show_original_post: "Показати початковий запис"
-      update_photo: "Оновити фотографію"
+      update_photo: "Оновити світлину"
     update:
-      error: "Не вдалося змінити фотографію."
-      notice: "Фотографія завантажена вдало."
+      error: "Не вдалося змінити світлину."
+      notice: "Світлина завантажена вдало."
   posts:
     presenter:
       title: "Запис %{name}"
@@ -905,11 +933,11 @@ uk:
       not_found: "Вибачте, ми не змогли знайти цей запис."
       permalink: "постiйне посилання"
       photos_by:
-        few: "%{count} фото користувача %{author}"
-        many: "%{count} фото користувача %{author}"
-        one: "фото користувача %{author}"
-        other: "%{count} фото користувача %{author}"
-        zero: "Немає фото користувача %{author}"
+        few: "%{count} світлини користувача %{author}"
+        many: "%{count} світлин користувача %{author}"
+        one: "світлина користувача %{author}"
+        other: "%{count} світлин користувача %{author}"
+        zero: "Немає світлин користувача %{author}"
       reshare_by: "Поширено %{author}"
   previous: "попередня"
   privacy: "Конфіденційність"
@@ -930,7 +958,7 @@ uk:
       your_gender: "Ваша стать"
       your_location: "Ваше місце розташування"
       your_name: "Ваше ім'я"
-      your_photo: "Ваша фотографія"
+      your_photo: "Ваша світлина"
       your_private_profile: "Ваш особистий профіль"
       your_public_profile: "Ваш публічний профіль"
       your_tags: "Опишіть себе в п'яти словах"
@@ -966,13 +994,15 @@ uk:
       enter_password: "Введіть пароль (щонайменьше шість символів)"
       enter_password_again: "Повторіть пароль"
       enter_username: "Виберіть ім'я користувача (дозволені тільки латинські букви, цифри і підкреслення)"
-      hey_make: "Привіт,<br/>створіть<br/>що-небуть"
+      hey_make: "Привіт,<br/>створіть<br/>що-небудь"
       join_the_movement: "Приєднуйтеся до руху!"
       password: "Пароль"
       password_confirmation: "ПІДТВЕРДЖЕННЯ ПАРОЛЯ"
       sign_up: "Реєстрація"
       sign_up_message: "Соціальна мережа з ♥"
       submitting: "Відправка..."
+      terms: "Зареєструвавшись Ви приймаєте %{terms_link}."
+      terms_link: "умови надання послуг"
       username: "Ім’я користувача"
   report:
     comment_label: "<b>Коментар</b>:<br>%{data}"
@@ -1133,7 +1163,7 @@ uk:
       remove_location: "Видалити місцезнаходження"
       share: "Поділитися"
       share_with: "поділитися з"
-      upload_photos: "Завантажити фотографії"
+      upload_photos: "Завантажити світлини"
       whats_on_your_mind: "Про що ви думаєте?"
     reshare:
       reshare: "Поділитися повторно"
@@ -1168,12 +1198,7 @@ uk:
       no_message_to_display: "Нових повідомлень немає."
     new:
       mentioning: "Згадати: %{person}"
-    too_long:
-      few: "скоротіть, будь ласка, ваше повідомлення до %{count} символів"
-      many: "скоротіть, будь ласка, ваше повідомлення до %{count} символів"
-      one: "скоротіть, будь ласка, ваше повідомлення до %{count} символів"
-      other: "скоротіть, будь ласка, ваше повідомлення до %{count} символів"
-      zero: "скоротіть, будь ласка, ваше повідомлення до %{count} символів"
+    too_long: "{\"few\"=>\"скоротіть, будь ласка, ваше повідомлення до %{count} символів\", \"many\"=>\"скоротіть, будь ласка, ваше повідомлення до %{count} символів\", \"one\"=>\"скоротіть, будь ласка, ваше повідомлення до %{count} символів\", \"other\"=>\"скоротіть, будь ласка, ваше повідомлення до %{count} символів\", \"zero\"=>\"скоротіть, будь ласка, ваше повідомлення до %{count} символів\"}"
   stream_helper:
     hide_comments: "Приховати усі коментарі"
     show_comments:
@@ -1211,7 +1236,7 @@ uk:
       title: "Потік"
     public:
       contacts_title: "Нещодавно написали"
-      title: "Публічна Активність"
+      title: "Публічна діяльність"
     tags:
       contacts_title: "Люди, яким подобаються ця мітка"
       tag_prefill_text: "Щодо %{tag_name} я думаю, що..."
@@ -1272,7 +1297,7 @@ uk:
       comment_on_post: "хтось прокоментував ваш запис"
       current_password: "Поточний пароль"
       current_password_expl: "який ви використовуєте для входу..."
-      download_photos: "Звантажити мої фотографії"
+      download_photos: "Звантажити мої світлини"
       download_xml: "Звантажити мою інформацію в XML"
       edit_account: "Редагувати аккаунт"
       email_awaiting_confirmation: "Ми надіслали посилання для активації на %{unconfirmed_email}. Поки ви не скористаєтесь ним і не активуєте нову адресу, ми використовуватимемо ваш колишній ящик %{email}."
@@ -1282,7 +1307,7 @@ uk:
       liked: "комусь подобається ваш запис"
       mentioned: "вас згадали у записі"
       new_password: "Новий пароль"
-      photo_export_unavailable: "Функція експорту фото зараз недоступна"
+      photo_export_unavailable: "Функція експорту світлин зараз недоступна"
       private_message: "ви отримали особисте повідомлення"
       receive_email_notifications: "Отримувати повідомлення електронною поштою, коли:"
       reshared: "хтось ділиться вашим записом"
@@ -1296,7 +1321,7 @@ uk:
     getting_started:
       awesome_take_me_to_diaspora: "Чудово! Пустіть мене до Діаспори*"
       community_welcome: "Товариство Діаспори раде вітати вас!"
-      connect_to_facebook: "Ми можемо трохи прискорити процес через %{link} на Діаспору. Ця дія довантажить ваше ім'я і фотографію, а також додасть кросспостінг."
+      connect_to_facebook: "Ми можемо трохи прискорити процес через %{link} на Діаспору. Ця дія довантажить ваше ім'я і світлину, а також додасть кросспостінг."
       connect_to_facebook_link: "Підключаємо ваш Facebook аккаунт"
       hashtag_explanation: "Мітки дозволяють вам обговорювати і стежити за темами, що цікавлять вас. Це також відмінний спосіб пошуку однодумців в Діаспорі."
       hashtag_suggestions: "Спробуйте, наприклад, мітки #мистецтво, #кіно, #gif і т.п."
diff --git a/config/locales/diaspora/ur-PK.yml b/config/locales/diaspora/ur-PK.yml
index 66a7b8c9f..8ab6bd2f4 100644
--- a/config/locales/diaspora/ur-PK.yml
+++ b/config/locales/diaspora/ur-PK.yml
@@ -339,13 +339,7 @@ ur-PK:
     stream_element:
       hide_and_mute: "Hide and Mute"
   status_messages:
-    too_long:
-      few: "please make your status messages less than %{count} characters"
-      many: "please make your status messages less than %{count} characters"
-      one: "please make your status messages less than %{count} character"
-      other: "please make your status messages less than %{count} characters"
-      two: "please make your status messages less than %{count} characters"
-      zero: "please make your status messages less than %{count} characters"
+    too_long: "{\"few\"=>\"please make your status messages less than %{count} characters\", \"many\"=>\"please make your status messages less than %{count} characters\", \"one\"=>\"please make your status messages less than %{count} character\", \"other\"=>\"please make your status messages less than %{count} characters\", \"two\"=>\"please make your status messages less than %{count} characters\", \"zero\"=>\"please make your status messages less than %{count} characters\"}"
   stream_helper:
     show_comments:
       few: "Show %{count} more comments"
diff --git a/config/locales/diaspora/vi.yml b/config/locales/diaspora/vi.yml
index cc7b07f53..f4dcf1dc6 100644
--- a/config/locales/diaspora/vi.yml
+++ b/config/locales/diaspora/vi.yml
@@ -240,7 +240,6 @@ vi:
       no_contacts_message: "Kiểm tra %{community_spotlight}"
       no_contacts_message_with_aspect: "Kiểm tra %{community_spotlight} hoặc %{add_to_aspect_link}"
       only_sharing_with_me: "Chỉ chia sẻ với tôi"
-      remove_person_from_aspect: "Loại bỏ %{person_name} khỏi \"%{aspect_name}\""
       start_a_conversation: "Bắt đầu một cuộc trò chuyện"
       title: "Liên lạc"
       your_contacts: "Liên lạc của bạn"
@@ -798,9 +797,7 @@ vi:
       no_message_to_display: "Không có tin nhắn."
     new:
       mentioning: "Đang nhắc đến: %{person}"
-    too_long:
-      other: "trạng thái của bạn phải có ít hơn %{count} kí tự"
-      zero: "trạng thái của bạn phải có ít hơn %{count} kí tự"
+    too_long: "{\"other\"=>\"trạng thái của bạn phải có ít hơn %{count} kí tự\", \"zero\"=>\"trạng thái của bạn phải có ít hơn %{count} kí tự\"}"
   stream_helper:
     hide_comments: "Ẩn tất cả bình luận"
     show_comments:
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index 425c44689..526c7c903 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -246,7 +246,6 @@ zh-CN:
       no_contacts_message: "来看看 %{community_spotlight}"
       no_contacts_message_with_aspect: "来看看 %{community_spotlight} 或者 %{add_to_aspect_link}"
       only_sharing_with_me: "和我分享内容的人"
-      remove_person_from_aspect: "将 %{person_name} 从 %{aspect_name} 中移除"
       start_a_conversation: "开始对话"
       title: "好友"
       your_contacts: "您的好友"
@@ -769,9 +768,7 @@ zh-CN:
       no_message_to_display: "暂无信息可显示。"
     new:
       mentioning: "提及发布中: %{person}"
-    too_long:
-      other: "请确保您的状态信息不超过 %{count} 个字符"
-      zero: "请确保您的状态信息不超过 %{count} 个字符"
+    too_long: "{\"other\"=>\"请确保您的状态信息不超过 %{count} 个字符\", \"zero\"=>\"请确保您的状态信息不超过 %{count} 个字符\"}"
   stream_helper:
     hide_comments: "隐藏评论"
     show_comments:
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 6ccbaef84..85a2b2e24 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -256,7 +256,6 @@ zh-TW:
       no_contacts_message: "來看看 %{community_spotlight}"
       no_contacts_message_with_aspect: "來看看 %{community_spotlight} 或是 %{add_to_aspect_link}"
       only_sharing_with_me: "和我分享的人"
-      remove_person_from_aspect: "將 %{person_name} 從\"%{aspect_name}\"中移除"
       start_a_conversation: "開始對話"
       title: "聯絡人"
       your_contacts: "你的聯絡人"
@@ -875,13 +874,7 @@ zh-TW:
       no_message_to_display: "沒有訊息可顯示。"
     new:
       mentioning: "指指點點中：%{person}"
-    too_long:
-      few: "請限制狀態訊息在%{count}個字內"
-      many: "請限制狀態訊息在%{count}個字內"
-      one: "請限制狀態訊息在%{count}個字內"
-      other: "請限制狀態訊息在%{count}個字內"
-      two: "請縮短你的狀態訊息在%{count}個字元以下"
-      zero: "請限制狀態訊息在%{count}個字內"
+    too_long: "{\"few\"=>\"請限制狀態訊息在%{count}個字內\", \"many\"=>\"請限制狀態訊息在%{count}個字內\", \"one\"=>\"請限制狀態訊息在%{count}個字內\", \"other\"=>\"請限制狀態訊息在%{count}個字內\", \"two\"=>\"請縮短你的狀態訊息在%{count}個字元以下\", \"zero\"=>\"請限制狀態訊息在%{count}個字內\"}"
   stream_helper:
     hide_comments: "隱藏所有意見"
     show_comments:
diff --git a/config/locales/javascript/javascript.da.yml b/config/locales/javascript/javascript.da.yml
index e09225406..10053eb46 100644
--- a/config/locales/javascript/javascript.da.yml
+++ b/config/locales/javascript/javascript.da.yml
@@ -28,8 +28,8 @@ da:
       no_aspects: "Ingen valgte aspekter"
       select_all: "Vælg alle"
     bookmarklet:
-      post_something: "Slå op på diaspora*"
-      post_submit: "Indsender indlæg"
+      post_something: "Slå op på Diaspora*"
+      post_submit: "Indsender indlæg ..."
       post_success: "Det er indsendt! lukker popup vinduet ..."
     comma: ","
     comments:
@@ -37,6 +37,13 @@ da:
       no_comments: "Der er endnu ingen kommentarer."
       show: "Vis alle kommentarer"
     confirm_dialog: "Er du sikker?"
+    contacts:
+      add_contact: "Tilføj kontakt"
+      aspect_list_is_not_visible: "Kontakter i dette aspekt kan ikke se hinanden"
+      aspect_list_is_visible: "Kontakter i dette aspekt kan se hinanden"
+      error_add: "Kunne ikke tilføje <%= name %> til aspektet :("
+      error_remove: "Kunne ikke fjerne <%= name %> fra aspektet :("
+      remove_contact: "Fjern kontakt"
     conversation:
       participants: "Deltagere"
     delete: "Slet"
@@ -73,11 +80,19 @@ da:
     my_activity: "Min aktivitet"
     my_aspects: "Mine aspekter"
     my_stream: "Strøm"
+    no_results: "Ingen resultater fundet"
     notifications:
       mark_read: "Marker som læst"
       mark_unread: "Marker som ulæst"
     people:
+      edit_my_profile: "Rediger min profil"
+      helper:
+        is_not_sharing: "<%= name %> deler ikke med dig"
+        is_sharing: "<%= name %> deler med dig"
+      mention: "Nævn"
+      message: "Besked"
       not_found: "og ingen blev fundet ..."
+      stop_ignoring: "Hold op med at ignorere"
     photo_uploader:
       completed: "<%= file %> fuldført."
       empty: "{file} er tom. Vælg venligst filer igen uden den."
@@ -93,6 +108,17 @@ da:
       result: "Resultat"
       show_result: "Vis resultat"
       vote: "Stem"
+    profile:
+      add_some: "tilføj nogen"
+      bio: "Biografi"
+      born: "Fødselsdag"
+      contacts: "Kontakter"
+      edit: "rediger"
+      gender: "Køn"
+      ignoring: "Du ignorerer alle indlæg fra <%= name %>"
+      location: "Sted"
+      photos: "Fotos"
+      you_have_no_tags: "du har ingen tags!"
     publisher:
       add_option: "Tilføj et svar"
       at_least_one_aspect: "Du skal dele med mindst et aspekt"
@@ -178,6 +204,7 @@ da:
       wordSeparator: " "
       year: "ca. et år"
       years: "%d år"
+    unblock_failed: "Det lykkedes ikke at afblokere denne bruger"
     videos:
       unknown: "Ukendt videotype"
       watch: "Se denne video på <%= provider %>"
diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml
index ba5874903..8d6e1921f 100644
--- a/config/locales/javascript/javascript.de.yml
+++ b/config/locales/javascript/javascript.de.yml
@@ -37,6 +37,13 @@ de:
       no_comments: "Bisher sind keine Kommentare vorhanden."
       show: "Alle Kommentare zeigen"
     confirm_dialog: "Bist du dir sicher?"
+    contacts:
+      add_contact: "Kontakt hinzufügen"
+      aspect_list_is_not_visible: "Kontakte in diesem Aspekt können einander nicht sehen."
+      aspect_list_is_visible: "Kontakte in diesem Aspekt können einander sehen"
+      error_add: "Konnte <%= name %> nicht zum Aspekt hinzufügen :("
+      error_remove: "Konnte <%= name %> nicht aus dem Aspekt entfernen :("
+      remove_contact: "Kontakt entfernen"
     conversation:
       participants: "Teilnehmer"
     delete: "Löschen"
@@ -73,11 +80,19 @@ de:
     my_activity: "Meine Aktivitäten"
     my_aspects: "Meine Aspekte"
     my_stream: "Stream"
+    no_results: "Keine Treffer"
     notifications:
       mark_read: "Als gelesen markieren"
       mark_unread: "Als ungelesen markieren"
     people:
+      edit_my_profile: "Mein Profil bearbeiten"
+      helper:
+        is_not_sharing: "<%= name %> teilt nicht mit dir"
+        is_sharing: "<%= name %> teilt mit dir"
+      mention: "Erwähnen"
+      message: "Nachricht"
       not_found: "und niemand wurde gefunden..."
+      stop_ignoring: "Ignorieren beenden"
     photo_uploader:
       completed: "<%= file %> hochgeladen"
       empty: "Die Datei {file} ist leer. Bitte treffe eine erneute Auswahl ohne diese Datei."
@@ -89,16 +104,27 @@ de:
       close_result: "Ergebnis ausblenden"
       count:
         one: "Bisher eine Stimme"
-        other: "Bisher <%=count%> Stimmen."
+        other: "Bisher <%=count%> Stimmen"
       result: "Ergebnis"
       show_result: "Ergebnis anzeigen"
       vote: "Abstimmen"
+    profile:
+      add_some: "Füge neue hinzu"
+      bio: "Bio"
+      born: "Geburtstag"
+      contacts: "Kontakte"
+      edit: "bearbeite"
+      gender: "Geschlecht"
+      ignoring: "Sie ignorieren sämtliche Beiträge von <%= name %>"
+      location: "Ort"
+      photos: "Fotos"
+      you_have_no_tags: "Du hast keine Tags!"
     publisher:
       add_option: "Antwortmöglichkeit hinzufügen"
       at_least_one_aspect: "Du musst zumindest zu einem Aspekt posten"
       limited: "Eingeschränkt - dein Beitrag wird nur Leuten sichtbar sein, mit denen du teilst"
       near_from: "Gesendet aus <%= location %>"
-      option: "Antwort <%= nr %>"
+      option: "Antwort"
       public: "Öffentlich - dein Beitrag ist für alle sichtbar und kann von Suchmaschinen gefunden werden"
       question: "Frage"
     report:
@@ -123,7 +149,7 @@ de:
         follow: "Folgen"
         title: "#Tags, denen du folgst"
       hide: "Ausblenden"
-      hide_nsfw_posts: "#nsfw-Posts verstecken"
+      hide_nsfw_posts: "#nsfw-Beiträge verstecken"
       like: "Gefällt mir"
       likes:
         few: "<%= count %> Personen gefällt das"
@@ -175,6 +201,7 @@ de:
       wordSeparator: " "
       year: "etwa einem Jahr"
       years: "%d Jahren"
+    unblock_failed: "Den Benutzer zu entblocken ist fehlgeschlagen."
     videos:
       unknown: "Unbekanntes Videoformat"
       watch: "Dieses Video auf <%= provider %> ansehen"
diff --git a/config/locales/javascript/javascript.de_formal.yml b/config/locales/javascript/javascript.de_formal.yml
index 0ea1b21ea..9f9299406 100644
--- a/config/locales/javascript/javascript.de_formal.yml
+++ b/config/locales/javascript/javascript.de_formal.yml
@@ -34,6 +34,13 @@ de_formal:
       no_comments: "Bisher sind keine Kommentare vorhanden."
       show: "Alle Kommentare zeigen"
     confirm_dialog: "Sind Sie sich sicher?"
+    contacts:
+      add_contact: "Kontakt hinzufügen"
+      aspect_list_is_not_visible: "Kontakte in diesem Aspekt können einander nicht sehen."
+      aspect_list_is_visible: "Kontakte in diesem Aspekt können einander sehen"
+      error_add: "Konnte <%= name %> nicht zum Aspekt hinzufügen :("
+      error_remove: "Konnte <%= name %> nicht aus dem Aspekt entfernen :("
+      remove_contact: "Kontakt entfernen"
     conversation:
       participants: "Teilnehmer"
     delete: "Löschen"
@@ -62,6 +69,7 @@ de_formal:
       settings: "Einstellungen"
       view_all: "Alle ansehen"
     ignore: "Ignorieren"
+    ignore_failed: "Konnte Benutzer nicht ignorieren"
     ignore_user: "Benutzer ignorieren?"
     infinite_scroll:
       no_more: "Keine weiteren Beiträge."
@@ -69,6 +77,7 @@ de_formal:
     my_activity: "Meine Aktivitäten"
     my_aspects: "Ihre Aspekte"
     my_stream: "Stream"
+    no_results: "Keine Treffer"
     notifications:
       mark_read: "Als gelesen markieren"
       mark_unread: "Als ungelesen markieren"
@@ -90,11 +99,11 @@ de_formal:
       show_result: "Ergebnis anzeigen"
       vote: "Abstimmen"
     publisher:
-      add_option: "Option hinzufügen"
+      add_option: "Antwortmöglichkeit hinzufügen"
       at_least_one_aspect: "Sie müssen zumindest zu einem Aspekt posten"
       limited: "Eingeschränkt - Ihr Beitrag wird nur Leuten sichtbar sein, mit denen Sie teilen"
       near_from: "In der Nähe von <%= location %>"
-      option: "Option <%= nr %>"
+      option: "Antwort"
       public: "Öffentlich - Ihr Beitrag ist für alle sichtbar und kann von Suchmaschinen gefunden werden"
       question: "Frage"
     report:
diff --git a/config/locales/javascript/javascript.en_valspeak.yml b/config/locales/javascript/javascript.en_valspeak.yml
new file mode 100644
index 000000000..168f92852
--- /dev/null
+++ b/config/locales/javascript/javascript.en_valspeak.yml
@@ -0,0 +1,207 @@
+#   Copyright (c) 2010-2013, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+
+en_valspeak:
+  javascripts:
+    and: "n"
+    aspect_dropdown:
+      add_to_aspect: "Add BFF"
+      all_aspects: "All aspectz"
+      error: "So like, couldnt start sharin wit <%= name %>.  R u like, blockin them?"
+      error_remove: "so like, i couldnt remove <%= name %> from the aspect :( sry bout that :("
+      select_aspects: "Pick aspectz"
+      started_sharing_with: "U have started sharin wit <%= name %>! :DD"
+      stopped_sharing_with: "U stopped sharin wit <%= name %>."
+      toggle:
+        one: "In <%= count %> aspect <3"
+        other: "In like, <%= count %> aspectz"
+        zero: "Pick aspectz"
+    aspect_navigation:
+      add_an_aspect: "+ Add an aspect!!!"
+      deselect_all: "Unhighlight all"
+      no_aspects: "No aspectz picked"
+      select_all: "Highlight all"
+    bookmarklet:
+      post_something: "Make a postie to d*!!"
+      post_submit: "Submitting postie... hold up..."
+      post_success: "Posted!!! Closin popup windowww... <3"
+    comma: ","
+    comments:
+      hide: "hide commentz"
+      no_comments: "Theres no commentz yet. :("
+      show: "show all commentz"
+    confirm_dialog: "R u like... fer sure?"
+    contacts:
+      add_contact: "Add BFF"
+      aspect_list_is_not_visible: "So like, BFFs in this aspect r not able 2 like... c each other..."
+      aspect_list_is_visible: "BFFs in this aspect r like.. able 2 c each other. JustFYI, K?"
+      error_add: "Couldnt like... add <%= name %> 2 the aspect :(("
+      error_remove: "Couldnt like... trash <%= name %> from the aspect :(("
+      remove_contact: "Remove BFF"
+    conversation:
+      participants: "Ppl up in here"
+    delete: "Trash"
+    edit: "Edit!"
+    failed_to_like: "Ur <3 didnt work :("
+    failed_to_post_message: "so like, i couldnt post txt... sry bout tht... :\\"
+    failed_to_remove: "So like, there was an issue when removin the entry... sry bout that :\\"
+    getting_started:
+      alright_ill_wait: "Aight, ill hold up."
+      hey: "Ohai, <%= name %>!"
+      no_tags: "Ohai! u havent like, followed ne tags!  Continue neway? :)"
+      preparing_your_stream: "Preparin ur Wall thingy..."
+    header:
+      admin: "The man"
+      close: "byez"
+      contacts: "Besties!"
+      conversations: "Convoz!"
+      help: "Halp"
+      home: "Homee"
+      log_out: "Bounce"
+      mark_all_as_read: "Read them all"
+      notifications: "Noties"
+      profile: "Profilee"
+      recent_notifications: "Recent Noties"
+      search: "Look for"
+      settings: "Settins"
+      view_all: "Look at all"
+    ignore: "Block"
+    ignore_failed: "Cant block this h8ter :\\"
+    ignore_user: "Ignore this h8ter?"
+    infinite_scroll:
+      no_more: "No moar posties :("
+      no_more_contacts: "No more besties :("
+    my_activity: "My Happenins"
+    my_aspects: "My Aspectz"
+    my_stream: "Wall"
+    no_results: "So like, no resultz were found... sry bout tht :\\"
+    notifications:
+      mark_read: "Seen it"
+      mark_unread: "Havent seen it"
+    people:
+      edit_my_profile: "Edit mah profile!!"
+      helper:
+        is_not_sharing: "<%= name %> is not like... sharin wit u :( lame.."
+        is_sharing: "Like, OMG! <%= name %> is sharin wit u!!! :DD"
+      mention: "Mentionnn <3"
+      message: "Txt"
+      not_found: "nothing was found... not even my shoes :("
+      stop_ignoring: "Stop ignorin"
+    photo_uploader:
+      completed: "<%= file %> completed!!! YAY!"
+      empty: "{file} is like, empty... plz pick the file again witout it. Kay?"
+      error: "So like, there was an issue when like, uploadin file <%= file %>... sry bout tht... :\\"
+      invalid_ext: "{file} like, has an extension that is like... not valid. Only like, {extensions} r allowed, kay?"
+      looking_good: "OMG, u look totally awesome! :D <3"
+      size_error: "{file} is like... 2 big, the biggest size i can take is {sizeLimit}. Kay?(;"
+    poll:
+      close_result: "Stop peekin at result...O_O"
+      count:
+        one: "1 vote so far!!(:"
+        other: "OMG! u have like... <%=count%> votes so far!!! :DDD"
+      result: "Like... the results"
+      show_result: "Peek at result...shh"
+      vote: "Make a differenceeee"
+    profile:
+      add_some: "add summ<3"
+      bio: "All about meeee <333"
+      born: "Bday"
+      contacts: "BFFs <33"
+      edit: "edit!"
+      gender: "So Im like..."
+      ignoring: "U r ignorin all posties from <%= name %>."
+      location: "My crib"
+      photos: "Pics and selfies <3"
+      you_have_no_tags: "u like... have no tagz!"
+    publisher:
+      add_option: "Like, add an ansah!"
+      at_least_one_aspect: "U like... must add to at least 1 group"
+      limited: "Limited - ur postie will only b seen by ppl u r sharin wit"
+      near_from: "Postie from: <%= location %>"
+      option: "Mah ansah<3"
+      public: "Internetz - ur postie will b seen by any1 on the internet"
+      question: "Question!!!"
+    report:
+      name: "Tattle on"
+      prompt: "Plz say y:"
+      prompt_default: "groody content"
+      status:
+        created: "The report was like, created. Yay."
+        exists: "The report like, already existz..."
+    reshares:
+      duplicate: "OMG that gr8t eh?  uve like, already reshared tht postie!! :P"
+      post: "do u wanna like, reshare <%= name %>'s postie?"
+      successful: "The postie was reshared!!! :D"
+    search_for: "Look for <%= name %>"
+    show_more: "show moar"
+    stream:
+      comment: "Comment!!"
+      follow: "Stalk"
+      followed_tag:
+        add_a_tag: "Add a tag!!"
+        contacts_title: "Ppl who <3 these tagz"
+        follow: "Folloe!!"
+        title: "#Followed Tagz"
+      hide: "Hyde"
+      hide_nsfw_posts: "Hide #groody posties. Gag me with a spoon!"
+      like: "<3"
+      likes:
+        one: "<%= count %> like!!(:"
+        other: "OMG! u got like... <%= count %> likez!!! :DDD"
+        zero: "<%= count %> likes :("
+      limited: "Limitedd"
+      more_comments:
+        one: "Show like, <%= count %> more comment"
+        other: "Show liek, <%= count %> more commentz"
+        zero: "Show <%= count %> more commentz"
+      original_post_deleted: "so like, the original postie was trashed by the maker of it :\\"
+      public: "Internetz"
+      reshare: "Reshar"
+      reshares:
+        one: "<%= count %> Reshare!!!(:"
+        other: "OMG!! <%= count %> reshares!!! :DDD"
+        zero: "<%= count%> Reshares :("
+      show_nsfw_post: "Show postie"
+      show_nsfw_posts: "Show allll"
+      tags:
+        follow: "Follow #<%= tag %>!!"
+        following: "Followin #<%= tag %>"
+        stop_following: "Stop followin #<%= tag %>"
+      unfollow: "Stop stalkin"
+      unlike: "</3"
+      via: "like, via <%= provider %>"
+    tags:
+      wasnt_that_interesting: "K, I guess #<%= tagName %> wasnt all that gr8. Whatev."
+    timeago:
+      day: "like... a day"
+      days: "like... %d dayz"
+      hour: "bout an hr"
+      hours: "bout %d hrs"
+      minute: "bout a min"
+      minutes: "%d mins"
+      month: "bout like... a month"
+      months: "like %d months"
+      prefixAgo: ""
+      prefixFromNow: ""
+      seconds: "less than a min"
+      suffixAgo: "like... ago"
+      suffixFromNow: "from nao"
+      wordSeparator: ""
+      year: "bout like... a yr"
+      years: "like %d yrs"
+    unblock_failed: "Unblockin this h8ter didnt work :("
+    videos:
+      unknown: "i dunno what kinda vid this is :("
+      watch: "Watch this vid on <%= provider %>"
+    viewer:
+      comment: "Comment!!"
+      follow_post: "Follow postie"
+      home: "HOOOMMMMEEEE"
+      like: "<3"
+      reshare: "Reshare!!"
+      reshared: "Reshared<33"
+      stop_following_post: "Stop followin postie"
+      unlike: "</3"
diff --git a/config/locales/javascript/javascript.es-AR.yml b/config/locales/javascript/javascript.es-AR.yml
index 6eba17095..d342d8849 100644
--- a/config/locales/javascript/javascript.es-AR.yml
+++ b/config/locales/javascript/javascript.es-AR.yml
@@ -34,6 +34,13 @@ es-AR:
       no_comments: "Aún no hay comentarios."
       show: "mostrar todos los comentarios"
     confirm_dialog: "¿Estás seguro?"
+    contacts:
+      add_contact: "Agregar contacto"
+      aspect_list_is_not_visible: "La lista de contactos de este aspecto no es visible."
+      aspect_list_is_visible: "La lista de contactos de este aspecto es visible."
+      error_add: "No se puede agregar a <%= name %> a este aspecto :("
+      error_remove: "No se puede eliminar a <%= name %> de este aspecto :("
+      remove_contact: "Eliminar contacto"
     conversation:
       participants: "Participantes"
     delete: "Borrar"
@@ -70,11 +77,19 @@ es-AR:
     my_activity: "Mi actividad"
     my_aspects: "Mis aspectos"
     my_stream: "Entrada"
+    no_results: "No se encontraron resultados"
     notifications:
       mark_read: "Marcar como leído"
       mark_unread: "Marcar como no leído"
     people:
+      edit_my_profile: "Editar mi perfil"
+      helper:
+        is_not_sharing: "<%= name %> no está compartiendo con vos"
+        is_sharing: "<%= name %> está compartiendo con vos"
+      mention: "Mención"
+      message: "Mensaje"
       not_found: "...y no se encontró a nadie."
+      stop_ignoring: "Dejar de ignorar"
     photo_uploader:
       completed: "<%= file %> completado"
       empty: "El archivo {file} está vacío, por favor selecciona los archivos nuevamente sin incluir este."
@@ -90,6 +105,17 @@ es-AR:
       result: "Resultados"
       show_result: "Mostrar resultados"
       vote: "Votar"
+    profile:
+      add_some: "agregar algunas"
+      bio: "Biografía"
+      born: "Fecha de nacimiento"
+      contacts: "Contactos"
+      edit: "editar"
+      gender: "Género"
+      ignoring: "Estás ignorando todas las publicaciones de <%= name %>."
+      location: "Ubicación"
+      photos: "Fotos"
+      you_have_no_tags: "¡no tienes etiquetas!"
     publisher:
       add_option: "Añadir respuesta"
       at_least_one_aspect: "Tenés que publicarlo en, por lo menos, un aspecto"
@@ -166,6 +192,7 @@ es-AR:
       wordSeparator: " "
       year: "cerca de un año"
       years: "%d años"
+    unblock_failed: "Falló el desbloqueo del usuario"
     videos:
       unknown: "Tipo de video desconocido"
       watch: "Ver este video en <%= provider %>"
diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml
index 3b4dd84b5..d6cc5605a 100644
--- a/config/locales/javascript/javascript.es.yml
+++ b/config/locales/javascript/javascript.es.yml
@@ -34,6 +34,13 @@ es:
       no_comments: "Aún no hay comentarios."
       show: "mostrar todos los comentarios"
     confirm_dialog: "¿Estás seguro?"
+    contacts:
+      add_contact: "Añadir contacto"
+      aspect_list_is_not_visible: "Los contactos de este aspecto no pueden verse entre ellos."
+      aspect_list_is_visible: "Los contactos de este aspecto pueden verse entre ellos."
+      error_add: "No se pudo añadir a <%= name %> al aspecto :("
+      error_remove: "No se pudo eliminar <%= name %> del aspecto :("
+      remove_contact: "Eliminar contacto"
     conversation:
       participants: "Participantes"
     delete: "Eliminar"
@@ -70,11 +77,19 @@ es:
     my_activity: "Mi Actividad"
     my_aspects: "Mis aspectos"
     my_stream: "Portada"
+    no_results: "No se ha encontrado nada"
     notifications:
       mark_read: "Marcar como leído"
       mark_unread: "Marcar como no leído"
     people:
+      edit_my_profile: "Editar mi perfil"
+      helper:
+        is_not_sharing: "<%= name %> no está compartiendo contigo"
+        is_sharing: "<%= name %> está compartiendo contigo"
+      mention: "Mención"
+      message: "Mensaje"
       not_found: "...y no se encontró a nadie."
+      stop_ignoring: "Dejar de ignorar"
     photo_uploader:
       completed: "<%= file %> completado"
       empty: "{file} está vacío, por favor selecciona otros archivos."
@@ -90,6 +105,17 @@ es:
       result: "Resultados"
       show_result: "Mostrar resultados"
       vote: "Votar"
+    profile:
+      add_some: "añadir algo"
+      bio: "Biografía"
+      born: "Cumpleaños"
+      contacts: "Contactos"
+      edit: "editar"
+      gender: "Sexo"
+      ignoring: "Estás ignorando todas las publicaciones de <%= name %>."
+      location: "Ubicación"
+      photos: "Fotos"
+      you_have_no_tags: "¡no tienes etiquetas!"
     publisher:
       add_option: "Añadir una respuesta"
       at_least_one_aspect: "Debes publicarlo al menos en un aspecto"
@@ -166,6 +192,7 @@ es:
       wordSeparator: " "
       year: "un año aproximadamente"
       years: "%d años"
+    unblock_failed: "Falló el desbloqueo del usuario"
     videos:
       unknown: "Tipo de vídeo desconocido"
       watch: "Ver este video con <%= provider %>"
diff --git a/config/locales/javascript/javascript.fi.yml b/config/locales/javascript/javascript.fi.yml
index 840647961..f8a56ba32 100644
--- a/config/locales/javascript/javascript.fi.yml
+++ b/config/locales/javascript/javascript.fi.yml
@@ -37,6 +37,12 @@ fi:
       no_comments: "Kommentteja ei vielä ole."
       show: "näytä kaikki kommentit"
     confirm_dialog: "Oletko varma?"
+    contacts:
+      add_contact: "Lisää henkilö"
+      aspect_list_is_not_visible: "Henkilöt tässä näkymässä eivät voi nähdä toisiaan."
+      aspect_list_is_visible: "Henkilöt tässä näkymässä voivat nähdä toisensa."
+      error_remove: "Käyttäjää <%= name %> ei voitu poistaa näkymästä :("
+      remove_contact: "Poista henkilö"
     conversation:
       participants: "Osallistujat"
     delete: "Poista"
@@ -72,16 +78,24 @@ fi:
     my_activity: "Oma toimintani"
     my_aspects: "Omat näkymäni"
     my_stream: "Virta"
+    no_results: "Ei tuloksia"
     notifications:
       mark_read: "Merkitse luetuksi"
       mark_unread: "Merkitse lukemattomaksi"
     people:
+      edit_my_profile: "Muokkaa profiiliasi"
+      helper:
+        is_not_sharing: "<%= name %> ei jaa kanssasi"
+        is_sharing: "<%= name %> jakaa kanssasi"
+      mention: "Mainitse"
+      message: "Viesti"
       not_found: "...ketään ei löytynyt."
+      stop_ignoring: "Lakkaa sivuuttamasta"
     photo_uploader:
       completed: "<%= file %> suoritettu"
       empty: "Tiedosto {file} on tyhjä, valitse tiedostot uudelleen ilman kyseistä tiedostoa."
       error: "On tapahtunut virhe lähetettäessä tiedostoa <%= file %>"
-      invalid_ext: "Tiedostolla {file} on epäkelpo tiedostopääte. Vain {extensions} päätteet ovat sallittuja."
+      invalid_ext: "Tiedostolla {file} on epäkelpo tiedostopääte. Vain päätteet {extensions} ovat sallittuja."
       looking_good: "OMG, näytät upealta!"
       size_error: "Tiedosto {file} on liian iso, suurin sallittu tiedostokoko on {sizeLimit}"
     poll:
@@ -92,6 +106,16 @@ fi:
       result: "Tulos"
       show_result: "Näytä tulokset"
       vote: "Äänestä"
+    profile:
+      bio: "Elämäkerta"
+      born: "Syntymäpäivä"
+      contacts: "Henkilöt"
+      edit: "muokkaa"
+      gender: "Sukupuoli"
+      ignoring: "Sivuutat nyt kaikki julkaisut, jotka <%= name %> lähettää."
+      location: "Sijainti"
+      photos: "Kuvat"
+      you_have_no_tags: "sinulla ei ole tageja!"
     publisher:
       add_option: "Lisää vastausvaihtoehto"
       at_least_one_aspect: "Sinun täytyy julkaista vähintään yhdelle näkymälle."
diff --git a/config/locales/javascript/javascript.fr.yml b/config/locales/javascript/javascript.fr.yml
index a6111291a..2ed6d6a08 100644
--- a/config/locales/javascript/javascript.fr.yml
+++ b/config/locales/javascript/javascript.fr.yml
@@ -37,6 +37,13 @@ fr:
       no_comments: "Il n'y a pas encore de commentaires."
       show: "Afficher tous les commentaires"
     confirm_dialog: "Êtes-vous certain-e ?"
+    contacts:
+      add_contact: "Ajouter ce contact"
+      aspect_list_is_not_visible: "Les contacts de cet aspect ne peuvent pas se voir entre eux."
+      aspect_list_is_visible: "Les contacts de cet aspect peuvent se voir entre eux."
+      error_add: "Impossible d'ajouter <%= name %> à cet aspect :("
+      error_remove: "Impossible de retirer <%= name %> de cet aspect :("
+      remove_contact: "Retirer ce contact"
     conversation:
       participants: "Participants"
     delete: "Effacer"
@@ -73,11 +80,19 @@ fr:
     my_activity: "Mon activité"
     my_aspects: "Mes Aspects"
     my_stream: "Flux"
+    no_results: "Aucun résultat"
     notifications:
       mark_read: "Marquer comme lu"
       mark_unread: "Marquer comme non lu"
     people:
+      edit_my_profile: "Modifier mon profil"
+      helper:
+        is_not_sharing: "<%= name %> ne partage pas avec vous"
+        is_sharing: "<%= name %> partage avec vous"
+      mention: "Mentionner"
+      message: "Message"
       not_found: "Et personne n'a été trouvé ..."
+      stop_ignoring: "Ne plus ignorer"
     photo_uploader:
       completed: "<%= file %> complété"
       empty: "{file} est vide, merci de sélectionner d'autres fichiers."
@@ -93,6 +108,17 @@ fr:
       result: "Résultat"
       show_result: "Afficher les résultats"
       vote: "Vote"
+    profile:
+      add_some: "ajouter"
+      bio: "Biographie"
+      born: "Anniversaire"
+      contacts: "Contacts"
+      edit: "modifier"
+      gender: "Genre"
+      ignoring: "Vous ignorez tous les messages de <%= name %>."
+      location: "Localisation"
+      photos: "Photos"
+      you_have_no_tags: "vous n'avez pas de tag !"
     publisher:
       add_option: "Ajouter un choix"
       at_least_one_aspect: "Vous devez créer au moins un aspect"
@@ -153,7 +179,7 @@ fr:
         follow: "Suivre #<%= tag %>"
         following: "Suivant #<%= tag %>"
         stop_following: "Arrêter de suivre #<%= tag %>"
-      unfollow: "Ne pas suivre"
+      unfollow: "Ne plus suivre"
       unlike: "Je n'aime plus"
       via: "via <%= provider %>"
     tags:
@@ -175,6 +201,7 @@ fr:
       wordSeparator: " "
       year: "un an"
       years: "%d ans"
+    unblock_failed: "Impossible de débloquer cet utilisateur"
     videos:
       unknown: "Type de vidéo inconnu"
       watch: "Voir cette vidéo sur <%= provider %>"
diff --git a/config/locales/javascript/javascript.hu.yml b/config/locales/javascript/javascript.hu.yml
index 5bf33364a..13dbb6d55 100644
--- a/config/locales/javascript/javascript.hu.yml
+++ b/config/locales/javascript/javascript.hu.yml
@@ -37,6 +37,9 @@ hu:
       no_comments: "Még nincs hozzászólás."
       show: "összes hozzászólás"
     confirm_dialog: "Biztos vagy benne?"
+    contacts:
+      aspect_list_is_not_visible: "A csoport tagjai nem láthatják egymást."
+      aspect_list_is_visible: "A csoport tagjai láthatják egymást."
     conversation:
       participants: "Résztvevők"
     delete: "Töröl"
@@ -73,6 +76,7 @@ hu:
     my_activity: "Tevékenységeim"
     my_aspects: "Csoportjaim"
     my_stream: "Hírfolyam"
+    no_results: "Nincs találat"
     notifications:
       mark_read: "Olvasottnak jelöl"
       mark_unread: "Olvasatlannak jelöl"
diff --git a/config/locales/javascript/javascript.hy.yml b/config/locales/javascript/javascript.hy.yml
index 65e496c3b..e14acf559 100644
--- a/config/locales/javascript/javascript.hy.yml
+++ b/config/locales/javascript/javascript.hy.yml
@@ -10,13 +10,13 @@ hy:
       add_to_aspect: "Ավելացնել"
       all_aspects: "Բոլոր խմբերը"
       error: "Չի ստացվում կիսվել <%= name %>-ի հետ։ Արհամարհու՞մ ես նրանց։"
-      select_aspects: "Ընտրիր խմբերը"
+      select_aspects: "Ընտրել խմբերը"
       started_sharing_with: "Սկսեցիր կիսվել <%= name %>-ի հետ։"
       stopped_sharing_with: "Դու այլևս չես կիսվում <%= name %>-ի հետ։"
       toggle:
         one: "<%= count %> խմբում"
         other: "<%= count %> խմբերում"
-        zero: "Ընտրիր խմբերը"
+        zero: "Ընտրել խմբերը"
     aspect_navigation:
       deselect_all: "Ապանշել ամբողջը"
       no_aspects: "Ոչ մի խումբ ընտրված չէ"
@@ -42,7 +42,7 @@ hy:
       mark_all_as_read: "Նշել ամբողջը որպես ընթերցված"
       notifications: "Ծանուցումներ"
       profile: "Անձնական էջ"
-      recent_notifications: "Վերջին ծանուցումներ"
+      recent_notifications: "Վերջին ծանուցումները"
       search: "Որոնում"
       settings: "Կարգավորումներ"
       view_all: "Ցույցադրել ամբողջը"
diff --git a/config/locales/javascript/javascript.ia.yml b/config/locales/javascript/javascript.ia.yml
index 34a0b17d5..3803153f6 100644
--- a/config/locales/javascript/javascript.ia.yml
+++ b/config/locales/javascript/javascript.ia.yml
@@ -20,17 +20,30 @@ ia:
       deselect_all: "Deseliger totes"
       no_aspects: "Nulle aspecto seligite"
       select_all: "Seliger totes"
+    bookmarklet:
+      post_something: "Inviar a diaspora*"
+      post_submit: "Submitte entrata…"
+      post_success: "Inviate! Le fenestra se claude ora…"
     comma: ","
     comments:
       hide: "celar commentos"
+      no_comments: "Il non ha ancora commentos."
       show: "revelar tote le commentos"
     confirm_dialog: "Es tu secur?"
+    contacts:
+      add_contact: "Adder contacto"
+      aspect_list_is_not_visible: "Le contactos in iste aspecto non pote vider le un le altere."
+      aspect_list_is_visible: "Le contactos in iste aspecto pote vider le un le altere."
+      error_add: "Non poteva adder <%= name %> al aspecto."
+      error_remove: "Non poteva remover <%= name %> del aspecto."
+      remove_contact: "Remover contacto"
     conversation:
       participants: "Participantes"
     delete: "Deler"
     edit: "Modificar"
     failed_to_like: "Appreciation fallite!"
     failed_to_post_message: "Publication del entrata fallite!"
+    failed_to_remove: "Le remotion del entrata ha fallite."
     getting_started:
       alright_ill_wait: "Ben, io attendera."
       hey: "Hallo, <%= name %>!"
@@ -40,6 +53,8 @@ ia:
       admin: "Administration"
       close: "clauder"
       contacts: "Contactos"
+      conversations: "Conversationes"
+      help: "Adjuta"
       home: "Initio"
       log_out: "Clauder session"
       mark_all_as_read: "Marcar totes como legite"
@@ -50,6 +65,7 @@ ia:
       settings: "Configuration"
       view_all: "Vider totes"
     ignore: "Ignorar"
+    ignore_failed: "Impossibile ignorar iste usator"
     ignore_user: "Ignorar iste usator?"
     infinite_scroll:
       no_more: "Nulle messages restante."
@@ -57,19 +73,60 @@ ia:
     my_activity: "Mi activitate"
     my_aspects: "Mi aspectos"
     my_stream: "Fluxo"
+    no_results: "Nulle resultato trovate"
+    notifications:
+      mark_read: "Marcar como legite"
+      mark_unread: "Marcar como non legite"
     people:
+      edit_my_profile: "Modificar mi profilo"
+      helper:
+        is_not_sharing: "<%= name %> non divide cosas con te"
+        is_sharing: "<%= name %> divide cosas con te"
+      mention: "Mention"
+      message: "Message"
       not_found: "e nemo ha essite trovate..."
+      stop_ignoring: "Cessar de ignorar"
     photo_uploader:
       completed: "<%= file %> complete"
       empty: "{file} es vacue. Per favor re-selige le files sin iste."
+      error: "Un problema ha occurrite durante le incargamento del file <%= file %>"
       invalid_ext: "{file} ha un extension inadmissibile. Solmente {extensions} es permittite."
       looking_good: "Oh, tu pare splendide!"
       size_error: "{file} es troppo grande. Le dimension maxime es {sizeLimit}."
+    poll:
+      close_result: "Celar resultato"
+      count:
+        one: "1 voto usque ora"
+        other: "<%=count%> votos usque ora"
+      result: "Resultato"
+      show_result: "Monstrar resultato"
+      vote: "Votar"
+    profile:
+      add_some: "adder alcunes"
+      bio: "Bio"
+      born: "Data de nascentia"
+      contacts: "Contactos"
+      edit: "modificar"
+      gender: "Sexo"
+      ignoring: "Tu ignora tote le entratas de <%= name %>."
+      location: "Loco"
+      photos: "Photos"
+      you_have_no_tags: "tu non ha etiquettas!"
     publisher:
+      add_option: "Adder un responsa"
       at_least_one_aspect: "Le publication debe esser includite in al minus un aspecto"
       limited: "Limitate: le message es visibile solmente pro le personas con qui tu lo divide"
-      near_from: "Vicinitate de: <%= location %>"
+      near_from: "Inviate ab: <%= location %>"
+      option: "Responsa"
       public: "Public: le message es visibile pro tote le mundo e trovabile pro motores de recerca"
+      question: "Question"
+    report:
+      name: "Reporto"
+      prompt: "Specifica un motivo:"
+      prompt_default: "contento offensive"
+      status:
+        created: "Le creation del reporto ha succedite"
+        exists: "Le reporto jam existe"
     reshares:
       duplicate: "Tu ha jam repetite iste entrata."
       post: "Repeter le entrata de <%= name %>?"
@@ -99,6 +156,7 @@ ia:
         stop_following: "Cessar de sequer #<%= tag %>"
       unfollow: "Non plus sequer"
       unlike: "Non plus appreciar"
+      via: "via <%= provider %>"
     tags:
       wasnt_that_interesting: "OK, io suppone que #<%= tagName %> non es si interessante..."
     timeago:
@@ -115,8 +173,10 @@ ia:
       seconds: "minus de un minuta"
       suffixAgo: "retro"
       suffixFromNow: "ab ora"
+      wordSeparator: " "
       year: "circa un anno"
       years: "%d annos"
+    unblock_failed: "Le action de disblocar iste usator ha fallite"
     videos:
       unknown: "Typo de video incognite"
       watch: "Spectar iste video sur <%= provider %>"
diff --git a/config/locales/javascript/javascript.nds.yml b/config/locales/javascript/javascript.nds.yml
new file mode 100644
index 000000000..1464eab63
--- /dev/null
+++ b/config/locales/javascript/javascript.nds.yml
@@ -0,0 +1,116 @@
+#   Copyright (c) 2010-2013, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+
+nds:
+  javascripts:
+    and: "un"
+    aspect_dropdown:
+      all_aspects: "Alle Aspekte"
+      toggle:
+        one: "In een Aspekt"
+        other: "In <%= count %> Aspekte"
+        zero: "Aspekte utwählen"
+    aspect_navigation:
+      add_an_aspect: "+ Do een nee’en Aspekt dorto"
+      deselect_all: "Alle afwählen"
+      no_aspects: "Keene Aspekte utwählt"
+      select_all: "Alle utwählen"
+    bookmarklet:
+      post_something: "Schriev wat in diaspora*"
+      post_submit: "Schick Bidrag af..."
+      post_success: "Verfat! Mok Pop-Up-Fenster to..."
+    comma: ","
+    comments:
+      hide: "Kommentore versteken"
+      no_comments: "Dat gift noch keene Kommentore."
+      show: "Alle Kommentore anzeigen"
+    contacts:
+      add_contact: "Kontakt sluten"
+      aspect_list_is_not_visible: "Kontakte in dissen Aspekt künnt sick nich gegensiedich seihn."
+      aspect_list_is_visible: "Kontakte in dissen Aspekt künnt sick gegensiedich seihn."
+      error_add: "Kunn <%= name %> nich ton Aspekt dortodoon :("
+      error_remove: "Kunn <%= name %> nich ut den Aspekt wegmoken :("
+      remove_contact: "Kontakt wegmoken"
+    conversation:
+      participants: "Bedeeligte"
+    edit: "Ännern"
+    failed_to_remove: "Kunn denn Indrag nich wegmoken!"
+    getting_started:
+      hey: "He, <%= name %>!"
+    header:
+      admin: "Admin"
+      close: "sluten"
+      contacts: "Kontakte"
+      conversations: "Snacks"
+      help: "Hülp"
+      home: "Startsiet"
+      log_out: "Afmellen"
+      notifications: "Benarichtigungen"
+      profile: "Profil"
+      search: "Söken"
+      settings: "Instellungen"
+    ignore_failed: "Kunn dissen Bruker nich ignoreren"
+    ignore_user: "Dissen Bruker ignoreren?"
+    infinite_scroll:
+      no_more_contacts: "Keene annern Kontakte."
+    my_aspects: "Miene Aspekte"
+    no_results: "Keene Resultate funnen"
+    notifications:
+      mark_read: "As lesen markeren"
+      mark_unread: "As unlesen markeren"
+    people:
+      not_found: "un keener is funnen worrn..."
+    photo_uploader:
+      error: "Dat geev een Problem bin hoochladen von de Datei <%= file %>"
+      looking_good: "OMG, du sühst toll ut!"
+    poll:
+      close_result: "Resultat versteken"
+      count:
+        one: "Een Stimm bit nu"
+        other: "<%=count%> Stimmen bit nu"
+      result: "Resultat"
+      show_result: "Resultat zeigen"
+      vote: "Afstimmen"
+    publisher:
+      add_option: "Do eene Antwort dorto"
+      near_from: "Verfat von: <%= location %>"
+      option: "Antwort"
+      question: "Froog"
+    report:
+      prompt: "Bidde geev een Grund an:"
+    reshares:
+      post: "<%= name %>s Bidrag wiederseggen?"
+      successful: "De Bidrag is erfolgriek wiederseggt worrn!"
+    show_more: "mehr anzeigen"
+    stream:
+      comment: "Kommentor"
+      hide: "Versteken"
+      hide_nsfw_posts: "#nsfw-Bidräg versteken"
+      likes:
+        one: "Eener mag dat"
+        other: "<%= count %> Lüü mögt dat"
+        zero: "Keener mag dat"
+      more_comments:
+        one: "Zeig een annern Kommentor"
+        other: "Zeig <%= count %> annere Kommentore"
+        zero: "Zeig keene annern Kommentore"
+      original_post_deleted: "Originalbidrag von den Autor löscht."
+      public: "Opentlich"
+      reshares:
+        one: "Een mol wiederseggt"
+        other: "<%= count %> mol wiederseggt"
+        zero: "Keen mol wiederseggt"
+      show_nsfw_post: "Bidrag anzeigen"
+      show_nsfw_posts: "Alle anzeigen"
+      via: "öber <%= provider %>"
+    timeago:
+      prefixAgo: ""
+      prefixFromNow: ""
+      suffixAgo: ""
+      suffixFromNow: ""
+      wordSeparator: " "
+    viewer:
+      home: "STARTSIET"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.nl.yml b/config/locales/javascript/javascript.nl.yml
index 2fc08d596..63d8f27a0 100644
--- a/config/locales/javascript/javascript.nl.yml
+++ b/config/locales/javascript/javascript.nl.yml
@@ -37,6 +37,13 @@ nl:
       no_comments: "Er zijn nog geen reacties."
       show: "laat reacties zien"
     confirm_dialog: "Weet je het zeker?"
+    contacts:
+      add_contact: "Toevoegen contact"
+      aspect_list_is_not_visible: "Contactpersonen in dit aspect kunnen elkaar niet zien"
+      aspect_list_is_visible: "Contactpersonen in dit aspect kunnen elkaar zien"
+      error_add: "Kon <%= name %> niet toevoegen aan het aspect :("
+      error_remove: "Kon <%= name %> niet verwijderen uit het aspect :("
+      remove_contact: "verwijder contact"
     conversation:
       participants: "Deelnemers"
     delete: "Verwijder"
@@ -73,11 +80,19 @@ nl:
     my_activity: "Mijn activiteit"
     my_aspects: "Mijn aspecten"
     my_stream: "Stream"
+    no_results: "Geen zoekresultaten"
     notifications:
       mark_read: "Markeren als gelezen"
       mark_unread: "Markeren als ongelezen"
     people:
+      edit_my_profile: "Bewerk mijn profiel"
+      helper:
+        is_not_sharing: "<%= name %> deelr niet met jou"
+        is_sharing: "<%= name %> deelt met jou"
+      mention: "Vermelden"
+      message: "Bericht"
       not_found: "en niemand is gevonden..."
+      stop_ignoring: "Stop negeren"
     photo_uploader:
       completed: "<%= file %> gereed"
       empty: "{file} is leeg. Selecteer de bestanden opnieuw, zonder deze."
@@ -93,6 +108,17 @@ nl:
       result: "Resultaat"
       show_result: "Toon resultaat"
       vote: "Stem"
+    profile:
+      add_some: "voeg wat toe"
+      bio: "Bio"
+      born: "Verjaardag"
+      contacts: "Contacten"
+      edit: "bewerk"
+      gender: "Geslacht"
+      ignoring: "Je negeert alle berichten van <%= name %>"
+      location: "Locatie"
+      photos: "Foto's"
+      you_have_no_tags: "je hebt geen tags!"
     publisher:
       add_option: "Keuzemogelijkheid toevoegen"
       at_least_one_aspect: "Je moet op zijn minst één aspect publiceren"
@@ -169,6 +195,7 @@ nl:
       wordSeparator: " "
       year: "ongeveer een jaar"
       years: "%d jaar"
+    unblock_failed: "Deblokkeren van deze gebruiker is mislukt"
     videos:
       unknown: "Onbekend video type"
       watch: "Bekijk deze video op <%= provider %>"
diff --git a/config/locales/javascript/javascript.pl.yml b/config/locales/javascript/javascript.pl.yml
index 316652ccd..d17979f74 100644
--- a/config/locales/javascript/javascript.pl.yml
+++ b/config/locales/javascript/javascript.pl.yml
@@ -37,6 +37,13 @@ pl:
       no_comments: "Póki co nie ma jeszcze żadnych komentarzy."
       show: "wyświetl wszystkie komentarze"
     confirm_dialog: "Czy @{m,f:jesteś|n:na}{ pew}{m:ien|f:na|n:no}?"
+    contacts:
+      add_contact: "Dodaj kontakt"
+      aspect_list_is_not_visible: "Kontakty z tego aspektu nie widzą się nawzajem."
+      aspect_list_is_visible: "Kontakty z tego aspektu mogą zobaczyć się nawzajem."
+      error_add: "Nie udało się dodać <%= name %> do aspektu :("
+      error_remove: "Nie udało się usunąć <%= name %> z aspektu :("
+      remove_contact: "Usuń kontakt"
     conversation:
       participants: "Uczestnicy"
     delete: "Usuń"
@@ -65,6 +72,7 @@ pl:
       settings: "Ustawienia"
       view_all: "Wyświetl wszystko"
     ignore: "Ignoruj"
+    ignore_failed: "Nie można zignorować tego użytkownika"
     ignore_user: "Zignorować tego użytkownika?"
     infinite_scroll:
       no_more: "Nie ma więcej wpisów."
@@ -72,11 +80,19 @@ pl:
     my_activity: "Moja aktywność"
     my_aspects: "Moje aspekty"
     my_stream: "Strumień"
+    no_results: "Brak rezultatów"
     notifications:
       mark_read: "Oznacz jako przeczytane"
       mark_unread: "Oznacz jako nieprzeczytane"
     people:
+      edit_my_profile: "Edytuj profil"
+      helper:
+        is_not_sharing: "<%= name %> Ci nie udostępnia."
+        is_sharing: "<%= name %> Ci udostępnia."
+      mention: "Wzmianka"
+      message: "Wiadomość"
       not_found: "...i nikogo nie odnaleziono."
+      stop_ignoring: "Przestań ignorować"
     photo_uploader:
       completed: "<%= file %> ukończono"
       empty: "{file} jest pusty. Proszę dokonać nowego wyboru bez tego pliku."
@@ -95,12 +111,23 @@ pl:
       result: "Wynik"
       show_result: "Pokaż wynik"
       vote: "Zagłosuj"
+    profile:
+      add_some: "dodaj"
+      bio: "Opis"
+      born: "Urodziny"
+      contacts: "Kontakty"
+      edit: "zmień"
+      gender: "Płeć"
+      ignoring: "Ignorujesz wszystkie wpisy od <%= name %>."
+      location: "Miejscowość"
+      photos: "Zdjęcia"
+      you_have_no_tags: "nie masz tagów!"
     publisher:
-      add_option: "Dodaj opcję"
+      add_option: "Dodaj odpowiedź"
       at_least_one_aspect: "Musisz udostępnić dla co najmniej jednego aspektu"
       limited: "Ograniczony - wpis będzie widoczny tylko dla wybranej grupy osób"
       near_from: "Blisko <%= location %>"
-      option: "Opcja <%= nr %>"
+      option: "Odpowiedź"
       public: "Publiczny - wpis będzie widoczny dla wszystkich i można go znaleźć przez wyszukiwarki"
       question: "Pytanie"
     report:
@@ -177,6 +204,7 @@ pl:
       wordSeparator: " "
       year: "około roku"
       years: "%d lat"
+    unblock_failed: "Nie udało się odblokować tego użytkownika"
     videos:
       unknown: "Nieznany typ wideo"
       watch: "Zobacz ten film na <%= provider %>"
diff --git a/config/locales/javascript/javascript.pt-BR.yml b/config/locales/javascript/javascript.pt-BR.yml
index 50291ca1e..a4b98b772 100644
--- a/config/locales/javascript/javascript.pt-BR.yml
+++ b/config/locales/javascript/javascript.pt-BR.yml
@@ -22,7 +22,7 @@ pt-BR:
     aspect_navigation:
       add_an_aspect: "+ Adicionar um aspecto"
       deselect_all: "Desmarcar tudo"
-      no_aspects: "Sem aspecto selecionado"
+      no_aspects: "Nenhum aspecto selecionado"
       select_all: "Marcar tudo"
     bookmarklet:
       post_something: "Publicar em diaspora*"
@@ -34,6 +34,13 @@ pt-BR:
       no_comments: "Ainda não existem comentários."
       show: "mostrar todos comentários"
     confirm_dialog: "Tem certeza?"
+    contacts:
+      add_contact: "Adicionar contato"
+      aspect_list_is_not_visible: "Contatos neste aspecto não podem ver uns aos outros."
+      aspect_list_is_visible: "Contatos neste aspecto podem ver uns aos outros."
+      error_add: "Não foi possível adicionar <%= name %> ao aspecto :("
+      error_remove: "Não foi possível remover <%= name %> do aspecto :("
+      remove_contact: "Remover contato"
     conversation:
       participants: "Participantes"
     delete: "Apagar"
@@ -47,14 +54,14 @@ pt-BR:
       no_tags: "Ei, você não está seguindo todas as tags! Continuar assim mesmo?"
       preparing_your_stream: "Preparando seu fluxo personalizado..."
     header:
-      admin: "Administrador"
+      admin: "Administração"
       close: "fechar"
       contacts: "Contatos"
       conversations: "Conversas"
       help: "Ajuda"
       home: "Páginal Inicial"
       log_out: "Sair"
-      mark_all_as_read: "Marcar Todas como Lidas"
+      mark_all_as_read: "Marcar todas como lidas"
       notifications: "Notificações"
       profile: "Perfil"
       recent_notifications: "Notificações Recentes"
@@ -62,18 +69,27 @@ pt-BR:
       settings: "Configurações"
       view_all: "Ver todas"
     ignore: "Ignorar"
+    ignore_failed: "Não foi possível ignorar este usuário"
     ignore_user: "Ignorar este usuário?"
     infinite_scroll:
       no_more: "Não há mais publicações."
       no_more_contacts: "Sem mais contatos."
-    my_activity: "Minhas Atividades"
+    my_activity: "Minha Atividade"
     my_aspects: "Meus Aspectos"
     my_stream: "Fluxo"
+    no_results: "Nenhum Resultado Encontrado"
     notifications:
       mark_read: "Marcar como lida"
       mark_unread: "Marcar como não lida"
     people:
+      edit_my_profile: "Editar meu perfil"
+      helper:
+        is_not_sharing: "<%= name %> não está compartilhando com você"
+        is_sharing: "<%= name %> está compartilhando com você"
+      mention: "Menção"
+      message: "Mensagem"
       not_found: "e ninguém foi encontrado..."
+      stop_ignoring: "Parar de ignorar"
     photo_uploader:
       completed: "<%= file %> completo"
       empty: "{file} está vazio, por favor selecione arquivos novamente sem este."
@@ -89,21 +105,32 @@ pt-BR:
       result: "Resultado"
       show_result: "Mostrar resultado"
       vote: "Votar"
+    profile:
+      add_some: "adicionar alguns"
+      bio: "Apresentação Pessoal"
+      born: "Data de Aniversário"
+      contacts: "Contatos"
+      edit: "editar"
+      gender: "Sexo"
+      ignoring: "Você está ignorando todas as publicações de <%= name %>."
+      location: "Localização"
+      photos: "Fotos"
+      you_have_no_tags: "você não possui tags!"
     publisher:
-      add_option: "Adicionar opção"
+      add_option: "Adicionar uma resposta"
       at_least_one_aspect: "Você deve publicar em pelo menos um aspecto"
       limited: "Limitada - a sua publicação será visível apenas para as pessoas com quem você compartilha."
       near_from: "Publicado de: <%= location %>"
-      option: "Opção <%= nr %>"
+      option: "Resposta"
       public: "Pública - a sua publicação será totalmente visível na web e poderá ser encontrada por mecanismos de buscas, como Google, Bing e etc..."
       question: "Pergunta"
     report:
-      name: "Relatório"
+      name: "Relatar"
       prompt: "Por favor entre um motivo:"
       prompt_default: "conteúdo ofensivo"
       status:
-        created: "O relatório foi criado com sucesso"
-        exists: "O relatório já existe"
+        created: "O relato foi criado com sucesso"
+        exists: "O relato já existe"
     reshares:
       duplicate: "Que bom, hein? Você já recompartilhou essa publicação."
       post: "Recompartilhar a publicação de <%= name %>?"
@@ -130,7 +157,7 @@ pt-BR:
         one: "Mostre mais <%= count %> comentário"
         other: "Mostre mais <%= count %> comentários"
         zero: "Mostre mais <%= count %> comentário"
-      original_post_deleted: "A publicação original foi deletada pelo autor."
+      original_post_deleted: "A publicação original foi apagada pelo autor."
       public: "Público"
       reshare: "Recompartilhar"
       reshares:
@@ -165,6 +192,7 @@ pt-BR:
       wordSeparator: " "
       year: "cerca de um ano"
       years: "%d anos"
+    unblock_failed: "O desbloqueio deste usuário falhou"
     videos:
       unknown: "Tipo de vídeo desconhecido"
       watch: "Assista este vídeo no <%= provider %>"
diff --git a/config/locales/javascript/javascript.ru.yml b/config/locales/javascript/javascript.ru.yml
index cc6628d87..b184c4348 100644
--- a/config/locales/javascript/javascript.ru.yml
+++ b/config/locales/javascript/javascript.ru.yml
@@ -76,7 +76,11 @@ ru:
       mark_read: "Пометить как прочитанное"
       mark_unread: "Пометить как непрочитанное"
     people:
+      edit_my_profile: "Редактировать профиль"
+      mention: "Упоминание"
+      message: "Сообщение"
       not_found: "никого не найдено..."
+      stop_ignoring: "Отменить игнорирование"
     photo_uploader:
       completed: "<%= file %> готово"
       empty: "{file} пуст, выберите пожалуйста файл повторно."
@@ -95,6 +99,15 @@ ru:
       result: "Результаты"
       show_result: "Показать результаты"
       vote: "Голосовать"
+    profile:
+      born: "День рождения"
+      contacts: "Контакты"
+      edit: "Редактировать"
+      gender: "Пол"
+      ignoring: "Вы игнорируете все записи пользователя  <%= name %>."
+      location: "Местоположение"
+      photos: "Фотографии"
+      you_have_no_tags: "у вас нет меток!"
     publisher:
       add_option: "Добавить вариант"
       at_least_one_aspect: "Вам надо создать как минимум один аспект"
@@ -178,6 +191,7 @@ ru:
       wordSeparator: " "
       year: "около года"
       years: "%d лет"
+    unblock_failed: "Разблокировка пользователя не удалась"
     videos:
       unknown: "Неизвестный тип видео"
       watch: "Смотреть этот ролик на <%= provider %>"
diff --git a/config/locales/javascript/javascript.sv.yml b/config/locales/javascript/javascript.sv.yml
index 2c547d74b..bc94e6af7 100644
--- a/config/locales/javascript/javascript.sv.yml
+++ b/config/locales/javascript/javascript.sv.yml
@@ -37,6 +37,13 @@ sv:
       no_comments: "Inga kommentarer finns ännu."
       show: "visa alla kommentarer"
     confirm_dialog: "Är du säker?"
+    contacts:
+      add_contact: "Lägg till kontakt"
+      aspect_list_is_not_visible: "Aspektens kontakter kan inte se vilka som hör till aspekten."
+      aspect_list_is_visible: "Aspektens kontakter kan se vilka som hör till aspekten."
+      error_add: "Kunde inte lägga till <%= name %> till aspekten. :-("
+      error_remove: "Kunde inte ta bort <%= name %> från aspekten. :-("
+      remove_contact: "Ta bort kontakt"
     conversation:
       participants: "Deltagare"
     delete: "Radera"
@@ -73,11 +80,19 @@ sv:
     my_activity: "Min aktivitet"
     my_aspects: "Mina aspekter"
     my_stream: "Ström"
+    no_results: "Inga sökresultat"
     notifications:
       mark_read: "Lästmärk"
       mark_unread: "Olästmarkera"
     people:
+      edit_my_profile: "Ändra min profil"
+      helper:
+        is_not_sharing: "<%= name %> delar inte sina uppdateringar med dig."
+        is_sharing: "<%= name %> delar med sig till dig"
+      mention: "Nämn"
+      message: "Meddelande"
       not_found: "och ingen hittades..."
+      stop_ignoring: "Sluta ignorera"
     photo_uploader:
       completed: "<%= file %> klar"
       empty: "{file} är tom, var vänlig och välj filer igen utan den."
@@ -93,6 +108,17 @@ sv:
       result: "Resultat"
       show_result: "Visa resultat"
       vote: "Rösta"
+    profile:
+      add_some: "lägg till"
+      bio: "Biografi"
+      born: "Födelsedag"
+      contacts: "Kontakter"
+      edit: "ändra"
+      gender: "Kön"
+      ignoring: "Du ignorerar alla inlägg från <%= name %>."
+      location: "Plats"
+      photos: "Foton"
+      you_have_no_tags: "du har inga taggar!"
     publisher:
       add_option: "Lägg till alternativ"
       at_least_one_aspect: "Du måste publicera till minst en aspekt."
@@ -169,6 +195,7 @@ sv:
       wordSeparator: " "
       year: "ungefär ett år"
       years: "%d år"
+    unblock_failed: "Misslyckades med att häva blockeringen"
     videos:
       unknown: "Okänd videotyp"
       watch: "Se den här videon på <%= provider %>"
diff --git a/config/locales/javascript/javascript.uk.yml b/config/locales/javascript/javascript.uk.yml
index 3032e0858..cc4d41874 100644
--- a/config/locales/javascript/javascript.uk.yml
+++ b/config/locales/javascript/javascript.uk.yml
@@ -36,6 +36,13 @@ uk:
       no_comments: "Коментарів ще немає."
       show: "Показати усі коментарі"
     confirm_dialog: "Ви упевнені?"
+    contacts:
+      add_contact: "Додати контакт"
+      aspect_list_is_not_visible: "Контакти, з цього аспекту, не можуть бачити один одного."
+      aspect_list_is_visible: "Контакти, із цього аспекту, можуть бачити один одного."
+      error_add: "Неможливо додати <%= name %>  в аспект :("
+      error_remove: "Неможливо видалити <%= name %> з аспекту :("
+      remove_contact: "Видалити контакт"
     conversation:
       participants: "Учасники"
     delete: "Вилучити"
@@ -64,18 +71,27 @@ uk:
       settings: "Налаштування"
       view_all: "Показати все"
     ignore: "Iгнорувати"
+    ignore_failed: "Неможливо ігнорувати цього користувача"
     ignore_user: "Ігнорувати цього користувача?"
     infinite_scroll:
       no_more: "Повідомлень більше немає."
       no_more_contacts: "Контактів більше немає."
-    my_activity: "Моя активність"
+    my_activity: "Моя діяльність"
     my_aspects: "Мої аспекти"
     my_stream: "Мій потік"
+    no_results: "Нічого не знайдено"
     notifications:
       mark_read: "Помітити як прочитане"
       mark_unread: "Помітити як непрочитане"
     people:
+      edit_my_profile: "Редагувати мій профіль"
+      helper:
+        is_not_sharing: "<%= name %> не ділиться з вами"
+        is_sharing: "<%= name %> ділиться з вами"
+      mention: "Згадки"
+      message: "Повідомлення"
       not_found: "нікого не знайдено..."
+      stop_ignoring: "Припинити блокування"
     photo_uploader:
       completed: "<%= file %> готово"
       empty: "{file} порожній, виберіть будь ласка файл повторно."
@@ -94,8 +110,19 @@ uk:
       result: "Результати"
       show_result: "Показати результати"
       vote: "Голосувати"
+    profile:
+      add_some: "додати"
+      bio: "Про себе"
+      born: "День народження"
+      contacts: "Контакти"
+      edit: "редагувати"
+      gender: "Стать"
+      ignoring: "Ви блокуєте усі записи користувача <%= name %>."
+      location: "Адреса"
+      photos: "Світлини"
+      you_have_no_tags: "у вас немає міток!"
     publisher:
-      add_option: "Додати варіант"
+      add_option: "Додати відповідь"
       at_least_one_aspect: "Вам потрібно створити мінімум один аспект"
       limited: "Обмежена - ваш запис буде видимий тільки вказаним вами людям"
       near_from: "Відправлено з: <%= location %>"
@@ -175,6 +202,7 @@ uk:
       suffixFromNow: "з цієї миті"
       year: "біля року"
       years: "%d років"
+    unblock_failed: "Не вдалось розблокувати цього користувача"
     videos:
       unknown: "Невідомий відеоформат"
       watch: "Дивитися це відео на <%= provider %>"