updated 62 locale files [ci skip]

config/locales/devise/devise.bg.yml

@@ -56,7 +56,7 @@ bg:
         subject: "Поканени сте да се присъедините към Diaspora!"
         team_diaspora: "Екипът на Diaspora"
         unsubscribe: "За да прекратите абонамента кликнете %{link}."
-        view_in: "View in"
+        view_in: "Преглед в браузъра."
       inviter:
         accept_at: "от %{url}, можете да приемете чрез връзката по-долу в писмото."
         has_invited_you: "%{name}"

config/locales/devise/devise.da.yml

@@ -19,7 +19,7 @@ da:
       unauthenticated: "Du skal logge ind eller oprette en konto for at fortsætte."
       unconfirmed: "Du skal bekræfte din konto for at fortsætte."
     invitations:
-      invitation_token_invalid: "Invitationen er ikke gyldig!"
+      invitation_token_invalid: "Beklager! Invitationen er ikke gyldig."
       send_instructions: "Din invitation er blevet sendt."
       updated: "Din adgangskode blev sat korrekt. Du er nu logget ind."
     mailer:
@@ -34,7 +34,7 @@ da:
         be_yourself: "Vær dig selv"
         be_yourself_paragraph: "Internettet har skabt nye unikke måder vi kan udtrykke os på. %{strong_diaspora} lader dig være dig selv og dele som du ønsker det, med eller uden dit rigtige navn."
         cubbies: Cubbi.es
-        displaying_correctly: "Ser e-mailen forkert ud? %{link} i din browser"
+        displaying_correctly: "Ser e-mailen forkert ud? %{link}"
         email_address: questions@joindiaspora.com
         email_us: "For generelle spørgsmål eller hjælp med din Diaspora-konto, send venligst en email til os på %{email}."
         finally: "Endelig er det her"
@@ -56,7 +56,7 @@ da:
         subject: "Du er blevet inviteret til at bruge Diaspora!"
         team_diaspora: "Team Diaspora"
         unsubscribe: "Hvis du gerne vil holde op med at få e-mails som denne, klik %{link}."
-        view_in: "Se i"
+        view_in: "Se den i din browser."
       inviter:
         accept_at: "på %{url}, du kan acceptere ved at følge linket nedenunder."
         has_invited_you: "%{name}"

config/locales/devise/devise.es-AR.yml

@@ -19,7 +19,7 @@ es-AR:
       unauthenticated: "Necesitás conectarte a tu cuenta, o registrarse, para continuar."
       unconfirmed: "Necesitás confirmar tu cuenta para continuar."
     invitations:
-      invitation_token_invalid: "¡El identificador de la invitación no es válido!"
+      invitation_token_invalid: "¡Perdón! ¡El identificador de la invitación no es válido!"
       send_instructions: "Ya se envió tu invitacíon."
       updated: "Tu contraseña se estableció sin problemas. Ya estás conectado."
     mailer:
@@ -30,33 +30,33 @@ es-AR:
       hello: "¡Hola %{email}!"
       invitation_instructions:
         accept: "Aceptar la invitación"
-        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
-        be_yourself: "Be Yourself"
-        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        arrived: "La red social por la que estuviste esperando ha llegado. Renovada, más segura, y más divertida, %{strong_diaspora} está lista para ayudarte a compartir y explorar la web en una forma totalmente nueva."
+        be_yourself: "Se vos mismo/a"
+        be_yourself_paragraph: "Internet creó nuevas formas únicas para que nos expresemos. %{strong_diaspora} te permite ser uno mismo y compartir lo que te parezca, con o sin tu nombre real."
         cubbies: Cubbi.es
-        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: questions@joindiaspora.com
-        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
-        finally: "Finally - it's here"
-        friends_saying: "What your friends are saying..."
-        get_connected: "Get Connected"
-        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
-        have_fun: "Have Fun"
-        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
-        help_fund: "help fund Diaspora"
-        here: "here"
+        displaying_correctly: "¿El email no se ve correctamente? %{link}"
+        email_address: preguntas@joindiaspora.com
+        email_us: "Para consultas generales o pedido de ayuda con su cuenta de Diaspora, por favor envianos un email a %{email}."
+        finally: "Finalmente - Ya llegó"
+        friends_saying: "Lo que tus amigos están diciendo..."
+        get_connected: "Conectate"
+        get_connected_paragraph: "Un movimiento internacional con una visión compartida para una mejor web, la principal característica de %{strong_diaspora} es su comunidad. Conocé gente nueva, conectáte con amigos y unite a la diversión."
+        have_fun: "Divertite"
+        have_fun_paragraph: "%{strong_diaspora} es descubrir contenido nuevo y sorprendente de personas que están online. %{link}, la primera aplicación del mundo para %{strong_diaspora} es sólo el comienzo. Recopilar y compartir en la web en toda su gloria."
+        help_fund: "Ayudá a financiar Diaspora"
+        here: "aquí"
         ignore: "Si no querés aceptar la invitación, por favor ignorá este correo."
-        join_team: "Join our Team"
-        love: "Love,"
-        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
-        more_people: "Even more people are excited to see you!"
+        join_team: "Unite a nuestro Equipo"
+        love: "Con amor,"
+        made_by_people: "%{strong_diaspora} está hecha por personas que aman Internet tanto como vos. %{jointeam}, o %{helpfund}!"
+        more_people: "¡Incluso más personas están emocionadas por verte!"
         no_account_till: "Tu cuenta no será creada hasta que accedas al anterior enlace y te registres."
-        or: "or"
-        sign_up_now: "Sign up now →"
+        or: "o"
+        sign_up_now: "Registrate ahora →"
         subject: "¡Te invitaron a unirte a Diáspora*!"
-        team_diaspora: "Team Diaspora"
-        unsubscribe: "To unsubscribe please click %{link}."
-        view_in: "View in"
+        team_diaspora: "Equipo Diaspora"
+        unsubscribe: "Para desuscribirte cliqueá %{link}."
+        view_in: "Ver en tu navegador."
       inviter:
         accept_at: "en %{url}, podes aceptarlo desde el link  de abajo "
         has_invited_you: "%{name} te ha invitado a unirte a Diaspora"

config/locales/devise/devise.fr.yml

@@ -19,7 +19,7 @@ fr:
       unauthenticated: "Vous devez vous connecter ou vous inscrire avant de continuer."
       unconfirmed: "Vous devez confirmer votre compte avant de continuer."
     invitations:
-      invitation_token_invalid: "Le jeton d’invitation fourni n’est pas valide !"
+      invitation_token_invalid: "Toutes nos excuses ! Cette invitation n'est pas valide."
       send_instructions: "Votre invitation a été envoyée."
       updated: "Votre mot de passe a été créé. Vous êtes à présent connecté(e)."
     mailer:
@@ -34,7 +34,7 @@ fr:
         be_yourself: "Soyez vous-même"
         be_yourself_paragraph: "L'Internet a créé de nouvelles façons uniques pour nous de nous exprimer. %{strong_diaspora} vous permet d'être vous-même et de partager comme vous le voulez, avec ou sans votre vrai nom."
         cubbies: Cubbi.es
-        displaying_correctly: "Ce courriel ne s'affiche pas correctement ? %{link} dans votre navigateur"
+        displaying_correctly: "Ce courriel ne s'affiche pas correctement ? %{link}"
         email_address: questions@joindiaspora.com
         email_us: "Pour des renseignements généraux ou de l'aide sur votre compte Diaspora, merci de nous envoyer un courriel à %{email}."
         finally: "Enfin - c'est ici"
@@ -56,7 +56,7 @@ fr:
         subject: "Vous avez été invité à rejoindre Diaspora!"
         team_diaspora: "L'Équipe Diaspora"
         unsubscribe: "Pour vous désinscrir, merci de cliquer %{link}."
-        view_in: "Afficher dans"
+        view_in: "L'afficher dans votre navigateur."
       inviter:
         accept_at: "à %{url}, vous pouvez l'accepter à travers le lien ci-dessous."
         has_invited_you: "%{name}"

config/locales/devise/devise.he.yml

@@ -32,26 +32,26 @@ he:
         accept: "אשר הזמנה"
         arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
         be_yourself: "Be Yourself"
-        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        be_yourself_paragraph: "הרשת יצרה עבורנו דרכים חדשות ויחודיות לביטא את עצמנו. %{strong_diaspora} נותנת לך להיות עצמך ולשתף בכל דרך שתרצה, עם או בלי שמך האמיתי."
         cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
         email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
-        get_connected: "Get Connected"
+        get_connected: "התחבר"
         get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
         have_fun: "Have Fun"
         have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
         help_fund: "help fund Diaspora"
-        here: "here"
+        here: "כאן"
         ignore: "אם אין ברצונך לאשר את ההזמנה, ניתן להתעלם מהודעה זו."
-        join_team: "Join our Team"
-        love: "Love,"
+        join_team: "הצטרף לצוות שלנו"
+        love: "באהבה,"
         made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
         more_people: "Even more people are excited to see you!"
         no_account_till: " החשבון שלך לא ייווצר עד לכניסתך לקישור המופיע למעלה וההרשמה לשירות."
-        or: "or"
+        or: "או"
         sign_up_now: "Sign up now →"
         subject: "הוזמנת להצטרף לדיאספורה!"
         team_diaspora: "Team Diaspora"

config/locales/devise/devise.hu.yml

@@ -19,7 +19,7 @@ hu:
       unauthenticated: "Be kell jelentkezned, vagy regisztrálj."
       unconfirmed: "Előbb meg kell erősítened fiókodat."
     invitations:
-      invitation_token_invalid: "A Token által adott meghívóazonosító nem érvényes!"
+      invitation_token_invalid: "Sajnáljuk, de a meghívás nem érvényes."
       send_instructions: "A meghívód elküldve."
       updated: "A jelszó módosítva. Be vagy jelentkezve."
     mailer:
@@ -34,7 +34,7 @@ hu:
         be_yourself: "Légy Önmagad"
         be_yourself_paragraph: "Az Internet egy új lehetőséged ad az önkifejezésre. A %{strong_diaspora} lehetőséged ad, hogy önmagad légy,  megossz amit akarsz, valódi neveddel vagy anélkül."
         cubbies: Cubbi.es
-        displaying_correctly: "Levelünk hibásan jelenik meg? %{link} böngészöben"
+        displaying_correctly: "Levelünk hibásan jelenik meg? %{link}"
         email_address: questions@joindiaspora.com
         email_us: "Felhasználói fiókoddal kapcsolatos kérdésekkel kérjük írj a %{email} címre."
         finally: "Végre - Itt van!"
@@ -56,7 +56,7 @@ hu:
         subject: "Meghívtak, hogy csatlakozz a Diaspora* közösségi hálóhoz."
         team_diaspora: "Diaspora* Csapat"
         unsubscribe: "Leiratkozáshoz kattints %{link}."
-        view_in: "Megtekintés"
+        view_in: "Megtekintés böngészőben"
       inviter:
         accept_at: "Meghívás elfogadása: %{url}"
         has_invited_you: "%{name}"

config/locales/devise/devise.it.yml

@@ -34,7 +34,7 @@ it:
         be_yourself: "Sii te stesso"
         be_yourself_paragraph: "Internet ha creato nuovi modi per poterci esprimere. %{strong_diaspora} ti permette di essere te stesso e di condividere come vuoi tu, con o senza il tuo vero nome."
         cubbies: Cubbi.es
-        displaying_correctly: "L'email non compare correttamente? %{link} nel browser"
+        displaying_correctly: "L'email non compare correttamente? %{link}"
         email_address: questions@joindiaspora.com
         email_us: "Per domande generali e per avere aiuto riguardo al tuo account Diaspora, scrivi pure a %{email}."
         finally: "Finalmente - è qui"
@@ -56,7 +56,7 @@ it:
         subject: "Hai un invito per iscriverti a Diaspora!"
         team_diaspora: "Il team di Diaspora"
         unsubscribe: "Per rimuoverti clicca %{link}."
-        view_in: "Vedi"
+        view_in: "Visualizza nel tuo browser."
       inviter:
         accept_at: "su %{url}, puoi accettare dal link qua sotto."
         has_invited_you: "%{name} ti ha invitato ad entrare in Diaspora"

config/locales/devise/devise.pl.yml

@@ -34,7 +34,7 @@ pl:
         be_yourself: "Bądź sobą"
         be_yourself_paragraph: "Internet dostarcza wiele zupełnie nowych sposobów wyrażania siebie. %{strong_diaspora} pozwala Ci być sobą i udostępniać cokolwiek chcesz, podając lub nie swoje prawdziwe imię i nazwisko."
         cubbies: Cubbi.es
-        displaying_correctly: "E-mail nie wyświetla się poprawnie? Otwórz %{link} w przeglądarce"
+        displaying_correctly: "Wiadomość nie jest wyświetlana prawidłowo? %{link}"
         email_address: questions@joindiaspora.com
         email_us: "Pytania ogólne oraz zgłoszenia problemów z kontem na Diasporze należy kierować do nas na adres %{email}."
         finally: "Nareszcie - jest tutaj"
@@ -56,7 +56,7 @@ pl:
         subject: "Zapraszamy do dołączenia do Diaspory!"
         team_diaspora: "Zespół Diaspory"
         unsubscribe: "Aby zrezygnować z subskrypcji kliknij %{link}."
-        view_in: "Wyświetl w"
+        view_in: "Wyświetl w przeglądarce."
       inviter:
         accept_at: "na %{url}, możesz je zaakceptować używając poniższego łącza."
         has_invited_you: "%{name}"

config/locales/devise/devise.sv.yml

@@ -19,7 +19,7 @@ sv:
       unauthenticated: "Du måste logga in innan du kan fortsätta."
       unconfirmed: "Du måste verifiera ditt konto innan du kan fortsätta."
     invitations:
-      invitation_token_invalid: "Denna inbjudan är ej giltig!"
+      invitation_token_invalid: "Vi ber om ursäkt! Den här inbjudan är inte giltig!"
       send_instructions: "Din inbjudan är nu skickad."
       updated: "Ditt lösenord är nu inställt och du är inloggad."
     mailer:
@@ -34,7 +34,7 @@ sv:
         be_yourself: "Var Dig själv"
         be_yourself_paragraph: "Internet har skapat helt nya unika sätt att uttrycka sig på. %{strong_diaspora} låter dig vara dig själv och dela vad du vill, med eller utan ditt riktiga namn."
         cubbies: Cubbi.es
-        displaying_correctly: "Visas inte e-mail korrekt? %{link} i din webläsare"
+        displaying_correctly: "Visas inte e-mail korrekt? %{link}"
         email_address: questions@joindiaspora.com
         email_us: "För allmänna frågor eller support med ditt Diaspora konto, vänligen maila oss på %{email}."
         finally: "Slutligen - den är här"
@@ -56,7 +56,7 @@ sv:
         subject: "Du har blivit inbjuden att gå med i Diaspora!"
         team_diaspora: "Team Diaspora"
         unsubscribe: "Klicka för att avregistrera dig %{link}."
-        view_in: "Kolla in"
+        view_in: "Se den i din webbläsare."
       inviter:
         accept_at: "via %{url}. Du accepterar genom att klicka på länken nedan."
         has_invited_you: "%{name}"

config/locales/devise/devise.zh-TW.yml

@@ -19,7 +19,7 @@ zh-TW:
       unauthenticated: 繼續之前你必須先登入或登記.
       unconfirmed: 你必須先確認帳號才能繼續.
     invitations:
-      invitation_token_invalid: 提供的邀請信物無效!
+      invitation_token_invalid: "很抱歉! 此邀請信物無效."
       send_instructions: 邀請函已寄出.
       updated: "密碼已設定成功. 你已經登入了."
     mailer:
@@ -34,7 +34,7 @@ zh-TW:
         be_yourself: "做自己"
         be_yourself_paragraph: "網際網路為我們創造了表達我們自己的嶄新方式. %{strong_diaspora} 讓你做你自己, 分享你想分享的, 不管你用真名假名."
         cubbies: Cubbi.es
-        displaying_correctly: "Email無法正確顯示嗎? 用你的瀏覽器%{link}"
+        displaying_correctly: "電子郵件無法正確顯示嗎? %{link}"
         email_address: questions@joindiaspora.com
         email_us: "對 Diaspora 帳號需要諮詢服務或協助, 請寄信到 %{email} 給我們."
         finally: "終於 - 來了"
@@ -56,7 +56,7 @@ zh-TW:
         subject: "有人邀請你加入 Diaspora!"
         team_diaspora: "Diaspora 團隊"
         unsubscribe: "要取消訂閱請按%{link}."
-        view_in: "檢視看看"
+        view_in: 用瀏覽器檢視看看.
       inviter:
         accept_at: "於 %{url}, 你可以透過以下連結來接受."
         has_invited_you: "%{name}"

config/locales/diaspora/ar.yml

@@ -866,8 +866,6 @@ ar:
       wrong_password: "The entered password didn't match your current password."
     edit:
       also_commented: "...علق أحدهم على منشور مراسلك"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "تغيير"
       change_email: "عدِّل البريد الإلكتروني"
       change_language: "تغيير اللغة"
@@ -880,7 +878,6 @@ ar:
       edit_account: "تعديل الحساب"
       email_awaiting_confirmation: "لقد أرسلنا إليك رابط تفعيل إلى %{unconfirmed_email}. وحتى تتبع هذا الرابط وتفعل العنوان الجديد، سنستمر في استخدام بريدك الأساسي %{email}."
       export_data: "تصدير البيانات"
-      following: "Following Settings"
       getting_started: "New User Prefrences"
       liked: "...أعجب أحدهم بمنشورك"
       mentioned: "...تم ذكرك في رسالة"
@@ -921,8 +918,6 @@ ar:
       does_not_exist: "هذا المستخدم %{username} غير موجود"
     update:
       email_notifications_changed: "فشل تغيير اللغة"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "غُيِّرت اللغة بنجاح"
       language_not_changed: "فشل تغيير اللغة"
       password_changed: "غُيِّرت كلمة المرور بنجاح. يمكنك الولوج بكلمة سرك الجديدة."

config/locales/diaspora/bg.yml

@@ -866,8 +866,6 @@ bg:
       wrong_password: "Въведената парола не съвпада с текущата парола на акаунта."
     edit:
       also_commented: "...някой коментира публикация на ваш контакт?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Промяна"
       change_email: "Промяна на ел. поща"
       change_language: "Промяна на езика"
@@ -880,7 +878,6 @@ bg:
       edit_account: "Редактиране на акаунта"
       email_awaiting_confirmation: "Изпратена е връзка за активиране до %{unconfirmed_email}. Докато не я активирате ще бъде ползвана старата ел. поща (%{email})."
       export_data: "Сваляне на..."
-      following: "Following Settings"
       getting_started: "New User Prefrences"
       liked: "...някой хареса ваша публикация?"
       mentioned: "...бъдете споменат в публикация?"
@@ -921,8 +918,6 @@ bg:
       does_not_exist: "Потребителят %{username} не съществува!"
     update:
       email_notifications_changed: "Настройките за известяване бяха променени"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "Езикът е сменен"
       language_not_changed: "Езикът не бе сменен"
       password_changed: "Паролата е променена. Можете да се впишете с новата парола."

config/locales/diaspora/br.yml

@@ -866,8 +866,6 @@ br:
       wrong_password: "The entered password didn't match your current password."
     edit:
       also_commented: "...someone also comments on your contact's post?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Cheñch"
       change_email: "Change E-Mail"
       change_language: "Cheñch Yezh"
@@ -880,7 +878,6 @@ br:
       edit_account: "Edit account"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Export Data"
-      following: "Following Settings"
       getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
@@ -921,8 +918,6 @@ br:
       does_not_exist: "User %{username} does not exist!"
     update:
       email_notifications_changed: "Email notifications changed"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "Yezh Cheñchet"
       language_not_changed: "Kudennoù zo bet o cheñch ar yezh"
       password_changed: "Ger-Kuzh Cheñchet"

config/locales/diaspora/cs.yml

@@ -866,8 +866,6 @@ cs:
       wrong_password: "The entered password didn't match your current password."
     edit:
       also_commented: "...někdo komentoval váš příspěvek?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Změnit"
       change_email: "Změnit e-mail"
       change_language: "Změnit jazyk"
@@ -880,7 +878,6 @@ cs:
       edit_account: "Upravit účet"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Exportovat data"
-      following: "Following Settings"
       getting_started: "New User Prefrences"
       liked: "...někomu se líbí váš příspěvek?"
       mentioned: "...jste zmíněn v příspěvku?"
@@ -921,8 +918,6 @@ cs:
       does_not_exist: "Uživatel %{username} neexistuje!"
     update:
       email_notifications_changed: "Oznámení e-mailem změněno"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "Jazyk změněn"
       language_not_changed: "Změna jazyka selhala"
       password_changed: "Heslo bylo změněno. Nyní se můžete přihlásit s vaším novým heslem."

config/locales/diaspora/cy.yml

@@ -866,8 +866,6 @@ cy:
       wrong_password: "The entered password didn't match your current password."
     edit:
       also_commented: "...someone also comments on your contact's post?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Change"
       change_email: "Newid yr E-Bost"
       change_language: "Newid yr iaith"
@@ -880,7 +878,6 @@ cy:
       edit_account: "Edit account"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Data Allforio"
-      following: "Following Settings"
       getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
@@ -921,8 +918,6 @@ cy:
       does_not_exist: "Nid% Defnyddiwr {username} yn bodoli!"
     update:
       email_notifications_changed: "Language Change Failed"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "Iaith wedi newid"
       language_not_changed: "Newidiad iaith wedi methu"
       password_changed: "Password Changed"

config/locales/diaspora/da.yml

@@ -774,7 +774,7 @@ da:
       viewable_to_anyone: "Dette indlæg er synlig for alle på internettet"
   status_messages:
     create:
-      success: "%{names} nævnet med succes"
+      success: "%{names} nævnt med succes"
     destroy:
       failure: "Kunne ikke slette post."
     helper:
@@ -866,8 +866,6 @@ da:
       wrong_password: "Det indtastede kodeord stemmer ikke overens med dit nuværende kodeord."
     edit:
       also_commented: "...nogen har kommenteret på en af dine kontakters indlæg?"
-      auto_follow_aspect: "Aspekt til automatisk fulgte brugere:"
-      auto_follow_back: "Følg automatisk dem der vælger at følge dig"
       change: "Skift"
       change_email: "Skift e-mail"
       change_language: "Skift sprog"
@@ -880,7 +878,6 @@ da:
       edit_account: "Rediger konto"
       email_awaiting_confirmation: "Vi har sendt dig et aktiveringslink til %{unconfirmed_email}. Indtil du følger dette link og aktiverer den nye adresse, vil vi fortsætte med at bruge din oprindelige adresse %{email}."
       export_data: "Eksportér data"
-      following: "Følgeskab"
       getting_started: "Ny bruger opsætning"
       liked: "...nogen synes om dit indlæg?"
       mentioned: "...du er nævnt i et indlæg?"
@@ -921,8 +918,6 @@ da:
       does_not_exist: "Brugeren %{username} findes ikke!"
     update:
       email_notifications_changed: "E-mail notifikation ændret"
-      follow_settings_changed: "Indstillinger for Følgeskab ændret"
-      follow_settings_not_changed: "Kunne ikke ændre indstillinger for Følgeskab."
       language_changed: "Sprog ændret"
       language_not_changed: "Kunne ikke ændre sprog"
       password_changed: "Adgangskode ændret"

config/locales/diaspora/de.yml

@@ -866,8 +866,6 @@ de:
       wrong_password: "Das eingegebene Kennwort stimmt nicht mit deinem aktuellen Kennwort überein."
     edit:
       also_commented: "… jemand ebenfalls den Beitrag eines Kontaktes kommentiert?"
-      auto_follow_aspect: "Aspekt für automatisch gefolgten Benutzern:"
-      auto_follow_back: "Folge Benutzern automatisch, wenn sie dir folgen"
       change: "Ändern"
       change_email: "E-Mail-Adresse ändern"
       change_language: "Sprache ändern"
@@ -880,7 +878,6 @@ de:
       edit_account: "Konto bearbeiten"
       email_awaiting_confirmation: "Wir haben dir einen Aktivierungslink zu %{unconfirmed_email} geschickt. Solange du dem Link nicht gefolgt bist und die neue Adresse aktiviert hast, werden wir weiterhin deine ursprüngliche E-Mail-Adresse %{email} verwenden."
       export_data: "Daten exportieren"
-      following: Folgen-Einstellungen
       getting_started: "Einstellungen für neue Nutzer"
       liked: "… wenn jemandem dein Beitrag gefällt?"
       mentioned: "… du in einem Beitrag erwähnt wirst?"
@@ -921,8 +918,6 @@ de:
       does_not_exist: "Benutzer %{username} existiert nicht!"
     update:
       email_notifications_changed: "E-Mail-Benachrichtigungen geändert"
-      follow_settings_changed: "Folgen-Einstellungen geändert"
-      follow_settings_not_changed: "Ändern der Folgen-Einstellungen fehlgeschlagen."
       language_changed: "Sprache geändert"
       language_not_changed: "Fehler beim Ändern der Sprache."
       password_changed: "Kennwort geändert. Du kannst dich nun mit deinem neuen Kennwort anmelden."

config/locales/diaspora/de_formal.yml

@@ -866,8 +866,6 @@ de_formal:
       wrong_password: "The entered password didn't match your current password."
     edit:
       also_commented: "… jemand ebenfalls den Beitrag eines Kontaktes kommentiert?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Ändern"
       change_email: "E-Mail-Adresse ändern"
       change_language: "Sprache ändern"
@@ -880,7 +878,6 @@ 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: "Following Settings"
       getting_started: "Einstellungen für neue Nutzer"
       liked: "… wenn jemandem Ihr Beitrag gefällt?"
       mentioned: "… Sie in einem Beitrag erwähnt werden?"
@@ -921,8 +918,6 @@ de_formal:
       does_not_exist: "Benutzer %{username} existiert nicht!"
     update:
       email_notifications_changed: "E-Mail-Benachrichtigungen geändert"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "Sprache geändert"
       language_not_changed: "Fehler beim Ändern der Sprache."
       password_changed: "Kennwort geändert. Sie können sich nun mit Ihrem neuen Kennwort anmelden."

config/locales/diaspora/el.yml

@@ -866,8 +866,6 @@ el:
       wrong_password: "The entered password didn't match your current password."
     edit:
       also_commented: "...κάποιος επίσης σχολίασε σε δημοσίευση επαφής σας;"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Αλλαγή"
       change_email: "Αλλαγή διεύθυνσης ηλεκτρονικού ταχυδρομείου"
       change_language: "Αλλαγή Γλώσσας"
@@ -880,7 +878,6 @@ el:
       edit_account: "Επεξεργασία λογαριασμού"
       email_awaiting_confirmation: "Σας στείλαμε έναν σύνδεσμο ενεργοποίησης στο %{unconfirmed_email}. Μέχρι να ακολουθήσετε αυτόν τον σύνδεσμο και να ενεργοποιήσετε τη νέα διεύθυνση, θα συνεχίσουμε να χρησιμοποιούμε την αρχική σας %{email}."
       export_data: "Εξαγωγή Δεδομένων"
-      following: "Following Settings"
       getting_started: "New User Prefrences"
       liked: "...σε κάποιον αρέσει η δημοσίευση σας;"
       mentioned: "...επισημανθήκατε σε μία φωτογραφία?"
@@ -921,8 +918,6 @@ el:
       does_not_exist: "Ο χρήστης %{username} δεν υπάρχει!"
     update:
       email_notifications_changed: "Αλλαγή ειδοποιήσεων ηλεκτρονικού ταχυδρομείου,επιτυχής"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "Αλλαγή Γλώσσας επιτυχής"
       language_not_changed: "Η αλλαγή γλώσσας απέτυχε"
       password_changed: "Ο κωδικός σας άλλαξε. Μπορείτε τώρα να συνδεθείτε με τον νέο κωδικό. "

config/locales/diaspora/en_1337.yml

@@ -866,8 +866,6 @@ en_1337:
       wrong_password: "The entered password didn't match your current password."
     edit:
       also_commented: "...50M30N3 4L50 5P4M5 0N 4 N00B5 5P4M?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "CH4NG3"
       change_email: "CH4NG3 M41L"
       change_language: "CH4NG3 L4NGU4G3"
@@ -880,7 +878,6 @@ en_1337:
       edit_account: "H4CK Y0UR 4CC0UN7"
       email_awaiting_confirmation: "4C71V4510N L1NK 53N7 2 %{unconfirmed_email}. UN71L U F0LL0W 7H3 L1NK W3 W1LL C0N71NU3 2 U53 Y0UR 0R1G1N4L M41L %{email}."
       export_data: "3XP0R7 D474"
-      following: "Following Settings"
       getting_started: "New User Prefrences"
       liked: "...50M30N3 L1K35 Y0UR 5P4M?"
       mentioned: "...U 4R3 M3N710N3D 1N 4 5P4M?"
@@ -921,8 +918,6 @@ en_1337:
       does_not_exist: "U53R %{username} D035 N07 3X157!"
     update:
       email_notifications_changed: "M41L 5P4M CH4NG3D!"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "L4NGU4G3 CH4NG3D!"
       language_not_changed: "7URN 0FF 1337? -> F41L!"
       password_changed: "***** CH4NG3D!"

config/locales/diaspora/en_pirate.yml

@@ -866,8 +866,6 @@ en_pirate:
       wrong_password: "The entered password didn't match your current password."
     edit:
       also_commented: "...someone also comments on your contact's post?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Change"
       change_email: "Change email"
       change_language: "Change language"
@@ -880,7 +878,6 @@ en_pirate:
       edit_account: "Edit account"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Until you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Export Data"
-      following: "Following Settings"
       getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
@@ -921,8 +918,6 @@ en_pirate:
       does_not_exist: "User %{username} does not exist!"
     update:
       email_notifications_changed: "Email notifications changed"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "Language changed"
       language_not_changed: "Language change failed"
       password_changed: "Password changed.  You can now log in with your new password."

config/locales/diaspora/en_shaw.yml

@@ -866,8 +866,6 @@ en_shaw:
       wrong_password: "The entered password didn't match your current password."
     edit:
       also_commented: "...𐑕𐑳𐑥𐑢𐑩𐑯 𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑕 𐑪𐑯 𐑿𐑼 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕 𐑐𐑴𐑕𐑑?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "𐑗𐑱𐑯𐑡"
       change_email: "𐑗𐑱𐑯𐑡 𐑦-𐑥𐑱𐑤"
       change_language: "𐑗𐑱𐑯𐑡 𐑤𐑱𐑙𐑜𐑢𐑩𐑡"
@@ -880,7 +878,6 @@ en_shaw:
       edit_account: "𐑧𐑛𐑦𐑑 𐑩𐑒𐑬𐑯𐑑"
       email_awaiting_confirmation: "𐑢𐑰 𐑣𐑨𐑝 𐑕𐑧𐑯𐑑 𐑿 𐑩𐑯 𐑨𐑒𐑑𐑦𐑝𐑱𐑖𐑩𐑯 𐑤𐑦𐑙𐑒 𐑑 %{unconfirmed_email}. 𐑩𐑯𐑑𐑦𐑤 𐑿 𐑓𐑪𐑤𐑴 𐑞𐑦𐑕 𐑤𐑦𐑙𐑒 𐑯 𐑨𐑒𐑑𐑦𐑝𐑱𐑑 𐑞 𐑯𐑿 𐑨𐑛𐑮𐑧𐑕, 𐑢𐑰 𐑢𐑦𐑤 𐑒𐑩𐑯𐑑𐑦𐑯𐑿 𐑑 𐑿𐑟 𐑿𐑼 𐑩𐑮𐑦𐑡𐑩𐑯𐑩𐑤 𐑨𐑛𐑮𐑧𐑕 %{email}."
       export_data: "𐑧𐑒𐑕𐑐𐑹𐑑 𐑛𐑱𐑑𐑩"
-      following: "Following Settings"
       getting_started: "New User Prefrences"
       liked: "...𐑕𐑳𐑥𐑢𐑩𐑯 𐑤𐑲𐑒𐑕 𐑿𐑼 𐑐𐑴𐑕𐑑?"
       mentioned: "...𐑿 𐑸 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑦𐑯 𐑩 𐑐𐑴𐑕𐑑?"
@@ -921,8 +918,6 @@ en_shaw:
       does_not_exist: "𐑿𐑟𐑼 %{username} 𐑛𐑳𐑟 𐑯𐑪𐑑 𐑧𐑜𐑟𐑦𐑕𐑑!"
     update:
       email_notifications_changed: "𐑦-𐑥𐑱𐑤 𐑥𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟 𐑗𐑱𐑯𐑡𐑛"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "𐑤𐑱𐑙𐑜𐑢𐑩𐑡 𐑗𐑱𐑯𐑡𐑛"
       language_not_changed: "𐑤𐑱𐑙𐑜𐑢𐑩𐑡 𐑗𐑱𐑯𐑡 𐑓𐑱𐑤𐑛"
       password_changed: "𐑐𐑨𐑕𐑢𐑼𐑛 𐑗𐑱𐑯𐑡. 𐑿 𐑒𐑨𐑯 𐑯𐑬 𐑤𐑪𐑜 𐑦𐑯 𐑢𐑦𐑞 𐑿𐑼 𐑯𐑿 𐑐𐑨𐑕𐑢𐑼𐑛."

config/locales/diaspora/eo.yml

@@ -866,8 +866,6 @@ eo:
       wrong_password: "La entajpita pasvoroto ne kongruis kun la nuna pasvorto."
     edit:
       also_commented: "...iu ankaŭ komentis pri la afiŝo de via kontakto?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Ŝanĝi"
       change_email: "Redakti retpoŝtadreso"
       change_language: "Ŝanĝi lingvon"
@@ -880,7 +878,6 @@ eo:
       edit_account: "Redakti konton"
       email_awaiting_confirmation: "Ni poŝtis al vin aktivigadan ligilon ĉe %{unconfirmed_email}.  Ĝis vi klikos tiun ĉi ligilo kaj aktivigos la novan repoŝtadreson, ni uzados vian malŝanĝitan retpoŝtadreson %{email}."
       export_data: "Eksporti datumojn"
-      following: "Following Settings"
       getting_started: "Novaj uzanto-agordoj"
       liked: "...iu ŝatis vian afiŝon?"
       mentioned: "...vi estas menciita en afiŝo?"
@@ -921,8 +918,6 @@ eo:
       does_not_exist: "Uzanto %{username} ne ekzistas!"
     update:
       email_notifications_changed: "Retpoŝtaj sciigoj ŝanĝitaj"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "Lingvo ŝanĝita"
       language_not_changed: "Ne povis ŝanĝi lingvon"
       password_changed: "Pasvorto ŝanĝita. Vi nun povas ensaluti per via nova pasvorto."

config/locales/diaspora/es-AR.yml

@@ -65,7 +65,7 @@ es-AR:
       edit_aspect: "Editar %{name}"
       select_all: "Seleccionar todo"
     aspect_stream:
-      stay_updated: "Stay Updated"
+      stay_updated: "Mantenete actualizado"
       stay_updated_explanation: "En tu stream principal aparecen las publicaciones de tus contactos, más las de tus tags seguidos, y si lo deseas, las de algunos miembros creativos de la comunidad."
     contacts_not_visible: "Los contactos en este aspecto no van a poder verse entre ellos."
     contacts_visible: "Los contactos en este aspecto van a poder verse entre ellos."
@@ -115,7 +115,7 @@ es-AR:
         tag_feature: "idea"
         tag_question: "pregunta"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Tutoriales, wiki, noticias."
-      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
+      introduce_yourself: "Este es tu stream.  Zambullite en el y presentate."
       keep_us_running: "¡Haz que %{pod} vaya más rapido comprando a nuestros servidores su dosis de café mensual!"
       new_here:
         follow: "Sigue %{link} y da la bienvenida a los nuevos miembros de Diaspora*!"
@@ -141,7 +141,7 @@ es-AR:
       name: "Nombre (solo visible para ti)"
     no_contacts_message:
       community_spotlight: "comunidad creativa"
-      or_spotlight: "Or you can share with %{link}"
+      or_spotlight: "O lo podés compartir con %{link}"
       try_adding_some_more_contacts: "Podés buscar o invitar más contactos."
       you_should_add_some_more_contacts: "Deberías agregar más contactos!"
     no_posts_message:
@@ -172,13 +172,13 @@ es-AR:
   back: "Atrás"
   blocks:
     create:
-      failure: "I couldn't ignore that user.  #evasion"
-      success: "Alright, you won't see that user in your stream again. #silencio!"
+      failure: "No se puede ignorar ese usuario.  #evasion"
+      success: "Muy bien, no vas a volver a ver a ese usuario en tu stream de nuevo. #silencio!"
     destroy:
-      failure: "I couldn't stop ignoring that user.  #evasion"
-      success: "Let's see what they have to say! #sayhello"
+      failure: "No se pudo parar de ignorar a ese usuario.  #evasion"
+      success: "¡Veamos que tienen para decir! #dihola"
   bookmarklet:
-    explanation: "Publicá algo en Diáspora* desde donde quieras agregando %{link} al marcador."
+    explanation: "Publicá algo en Diáspora* desde donde quieras agregando %{link} a tus marcadores."
     explanation_link_text: "este enlace"
     heading: "Marcador"
     post_something: "Publicá algo en Diáspora*"
@@ -530,7 +530,7 @@ es-AR:
       start_sharing: "comenzar a compartir"
       to_accept_or_ignore: "aceptar o ignorar."
     sub_header:
-      add_some: "add some"
+      add_some: "Agregar algo"
       edit: "editar"
       you_have_no_tags: "no tenes tags!"
     two: "%{count} gente"
@@ -667,15 +667,15 @@ es-AR:
   search: "Buscar"
   services:
     create:
-      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
-      failure: "Authentication failed."
+      already_authorized: "Un usuario de Diaspora con id %{diaspora_id} ya autorizó la cuenta de servicio %{service_name}."
+      failure: "Falló la autenticación."
       success: "Autenticacíon correcta."
     destroy:
       success: "Autenticación eliminada."
     failure:
       error: "hubo un error al conectar al servicio"
     finder:
-      fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes."
+      fetching_contacts: "Diaspora está tomando sus amigos de %{service} por favor volvé en unos minutos."
       no_friends: "No se han encontrado amigos de Facebook."
       service_friends: "%{service} Amigos"
     index:
@@ -698,7 +698,7 @@ es-AR:
   share_visibilites:
     update:
       post_hidden_and_muted: "La publicación de %{name} ha sido ocultada y sus notificaciones desactivadas."
-      see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page."
+      see_it_on_their_profile: "Si querés ver actualizaciones sobre este post, visitá la página del perfil de %{name}."
   shared:
     add_contact:
       add_new_contact: "Añadir contacto"
@@ -805,7 +805,7 @@ es-AR:
     community_spotlight_stream: "Comunidad Creativa"
     followed_tag:
       add_a_tag: "Añade un tag"
-      contacts_title: "People who dig these tags"
+      contacts_title: "Personas que usaron estos tags"
       follow: "Seguir"
       title: "#Tags"
     followed_tags_stream: "#Tags"
@@ -814,7 +814,7 @@ es-AR:
       contacts_title: "Gente que te mencionó"
       title: "@Menciones"
     multi:
-      contacts_title: "People in your Stream"
+      contacts_title: "Personas en tu Stream"
       title: "Stream"
     posted: "publicado"
     public:
@@ -862,12 +862,10 @@ es-AR:
       email_not_confirmed: "El E-Mail no pudo ser activado. Link equivocado?"
     destroy:
       no_password: "Por favor, introduce tu contraseña actual para cerrar y destruir tu cuenta."
-      success: "Your account has been locked.  It may take 20 minutes for us to finish closing your account.  Thank you for trying Diaspora."
-      wrong_password: "The entered password didn't match your current password."
+      success: "Tu cuenta ha sido bloqueada.  Nos puede tomar unos 20 minutos cerrar tu cuenta definitivamente.  Te agradecemos por probar Diaspora."
+      wrong_password: "La contraseña ingresada no coincide con tu contraseña actual."
     edit:
       also_commented: "...alguien también comenta en una publicación en la que comentaste?"
-      auto_follow_aspect: "Aspecto para los usuarios seguidos automáticamente:"
-      auto_follow_back: "Seguir automáticamente a quien te siga"
       change: "Cambiar"
       change_email: "Cambiar E-Mail"
       change_language: "Cambiar idioma"
@@ -880,7 +878,6 @@ es-AR:
       edit_account: "Editar cuenta"
       email_awaiting_confirmation: "Te hemos enviado un link de activación a %{unconfirmed_email}. Hasta que sigas este link y actives la nueva dirección, continuaremos utilizando tu dirección original %{email}."
       export_data: "Exportar datos"
-      following: "Configuración de Seguimiento"
       getting_started: "Preferencias de Nuevos Usuarios"
       liked: "...a alguien le gusta una publicación tuya?"
       mentioned: "...te mencionan en una publicación?"
@@ -896,17 +893,17 @@ es-AR:
       your_email: "Tu correo electrónico"
       your_handle: "Tu identificación de  Diáspora*"
     getting_started:
-      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
-      community_welcome: "La comunidad de Diáspora está feliz de tenerte a bordo!"
+      awesome_take_me_to_diaspora: "¡Asombroso! Llevame a Diaspora*"
+      community_welcome: "¡La comunidad de Diáspora está feliz de tenerte a bordo!"
       hashtag_explanation: "Los hashtags te permiten seguir y hablar sobre tus intereses. También son una gran manera de encontrar gente nueva en Diáspora."
-      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
-      hooking_up_fb: "hooking up your Facebook account"
+      hashtag_suggestions: "Probá siguiendo tags como #arte, #películas, #gif, etc."
+      hooking_up_fb: "conectando con tu cuenta de Facebook"
       saved: ¡Guardado!
       we_can_speed_things_up: "Podemos acelerar las cosas un poquito vía"
-      well_hello_there: "Well, hello there!"
-      what_are_you_in_to: "What are you into?"
+      well_hello_there: "Bueno, ¡Hola!"
+      what_are_you_in_to: "¿Qué sos por dentro?"
       what_facebook_does: "con Diaspora. Esto mostraŕa tu nombre y foto, y activará la publicación cruzada."
-      who_are_you: "Who are you?"
+      who_are_you: "¿Quién sos?"
     logged_out:
       go_mobile: "Ahora en tu celular."
       on_your_mobile_device: "en tu dispositivo móvil para acceder a Diáspora* móvil."
@@ -921,8 +918,6 @@ es-AR:
       does_not_exist: "¡El usuariuo %{username} no existe!"
     update:
       email_notifications_changed: "Tus notificaciones por correo fueron cambiadas"
-      follow_settings_changed: "Configuración de seguimiento modificada"
-      follow_settings_not_changed: "Error actualizando la configuracion de seguimiento."
       language_changed: "Tu idioma se cambió"
       language_not_changed: "No pudo cambiarse el idioma"
       password_changed: "Tu contraseña se cambió.  Ya podés conectarte con tu nueva contraseña."
@@ -937,4 +932,4 @@ es-AR:
     no_person_constructed: "No pudo crearse ninguna persona a partir de esta 'hcard'."
     not_enabled: "Parece que webfinger no está habilitado para el servidor de %{account}"
     xrd_fetch_failed: "Hubo un error al buscar el 'xrd' de %{account}"
-  welcome: Bienvenido!
+  welcome: ¡Bienvenido!

config/locales/diaspora/es-CL.yml

@@ -866,8 +866,6 @@ es-CL:
       wrong_password: "The entered password didn't match your current password."
     edit:
       also_commented: "...alguien comenta en el post de tu amigo?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Modificar"
       change_email: "Cambiar email"
       change_language: "Cambiar Idioma"
@@ -880,7 +878,6 @@ es-CL:
       edit_account: "Editar cuenta"
       email_awaiting_confirmation: "Te enviamos un link de activación a %{unconfirmed_email}. Hasta que sigas ese link y actives la nueva dirección, nosotros seguiremos usando tu dirección original %{email}."
       export_data: "Exportar Datos"
-      following: "Following Settings"
       getting_started: "New User Prefrences"
       liked: "...a alguien le gusta tu post?"
       mentioned: "...te mencionan en un post?"
@@ -921,8 +918,6 @@ es-CL:
       does_not_exist: "¡El usuario %{username} no existe!"
     update:
       email_notifications_changed: "Notificaciones por email cambiadas"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "Idioma Cambiado"
       language_not_changed: "Error al cambiar de idioma"
       password_changed: "Contraseña Cambiada. Ahora puedes conectarte con la nueva contraseña."

config/locales/diaspora/es.yml

@@ -866,8 +866,6 @@ es:
       wrong_password: "La contraseña introducida no coincide con la contraseña actual."
     edit:
       also_commented: "...alguien comenta en la publicación de tu contacto?"
-      auto_follow_aspect: "Aspecto para los usuarios que sigues automáticamente:"
-      auto_follow_back: "Seguir automáticamente a quien te siga"
       change: "Cambiar"
       change_email: "Cambiar email"
       change_language: "Cambiar idioma"
@@ -880,7 +878,6 @@ es:
       edit_account: "Editar cuenta"
       email_awaiting_confirmation: "Te hemos enviado un enlace de activación a %{unconfirmed_email}. Hasta que no sigas ese enlace y actives tu nueva dirección, continuaremos usando la anterior %{email}."
       export_data: "Exportar datos"
-      following: "Ajustes de Seguimiento"
       getting_started: "Preferencias del Nuevo Usuario"
       liked: "...a alguien le gusta tu publicación?"
       mentioned: "...eres mencionad@ en una publicación?"
@@ -921,8 +918,6 @@ es:
       does_not_exist: "¡La persona %{username} no existe!"
     update:
       email_notifications_changed: "Notificaciones por email cambiadas"
-      follow_settings_changed: "Ajustes de seguimiento modificados"
-      follow_settings_not_changed: "Error modificando los ajustes de seguimiento."
       language_changed: "Idioma cambiado"
       language_not_changed: "Error cambiando de idioma"
       password_changed: "Contraseña cambiada. Ya puedes acceder con tu nueva contraseña."

config/locales/diaspora/eu.yml

@@ -866,8 +866,6 @@ eu:
       wrong_password: "The entered password didn't match your current password."
     edit:
       also_commented: "...beste norbaitek zure adiskide baten mezua iruzkintzen duenean?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Aldatu"
       change_email: "Aldatu e-posta"
       change_language: "Hizkuntza aldatu"
@@ -880,7 +878,6 @@ eu:
       edit_account: "Kontua aldatu"
       email_awaiting_confirmation: "Aktibaketa esteka bat bidali dizugu %{unconfirmed_email}(e)ra. Esteka hau jarraitzen duzun arte, zure jatorrizko e-postak, %{email}, jarraituko du erabilpenean."
       export_data: "Datuak esportatu"
-      following: "Following Settings"
       getting_started: "Erabiltzeile Berriaren Lehentasunak"
       liked: "...norbaitek zure mezu bat gustoko duenean?"
       mentioned: "...mezu batean aipatzen zaituztenean?"
@@ -921,8 +918,6 @@ eu:
       does_not_exist: "%{username} erabiltzailerik ez dago!"
     update:
       email_notifications_changed: "E-posta janirazpenak aldatu dituzu"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "Hizkuntza aldatu da"
       language_not_changed: "Hizkuntza aldaketak huts egin du"
       password_changed: "Pasahitza aldatu duzu. Orain zure pasahitz berria erabiliz sar zaitezke."

config/locales/diaspora/fi.yml

@@ -104,7 +104,7 @@ fi:
       handle_explanation: "Tämä on Diaspora-tunnuksesi. Voit antaa sen ihmisille kuten sähköpostiosoitteesi, jotta he voivat sen avulla tavoittaa sinut Diasporasta."
       help:
         do_you: "Haluatko:"
-        email_feedback: "Voit halutessasi lähettää palautteesi %{link}ina"
+        email_feedback: "Voit halutessasi lähettää palautteesi %{link}lla"
         feature_suggestion: "... ehdottaa uutta ominaisuutta? %{link}"
         find_a_bug: "... raportoida ohjelmistovirheen? %{link}"
         have_a_question: "... kysyä kysymyksen? %{link}"
@@ -141,7 +141,7 @@ fi:
       name: "Nimi (näkyy vain sinulle)"
     no_contacts_message:
       community_spotlight: "yhteisön valokeila"
-      or_spotlight: "Or you can share with %{link}"
+      or_spotlight: "Voit myös jakaa %{link}n kanssa"
       try_adding_some_more_contacts: "Voit etsiä (ylhäällä) tai kutsua (oikealla) lisää kontakteja."
       you_should_add_some_more_contacts: "Sinun pitäisi lisätä kontakteja!"
     no_posts_message:
@@ -205,7 +205,7 @@ fi:
       check_out: "Katso"
       many_people_are_you_sure: "Oletko varma, että haluat aloittaa yksityiskeskustelun useamman kuin %{suggested_limit} kontaktin kanssa? Viestin lähettäminen tähän näkymään voisi olla parempi tapa olla yhteydessä heihin."
       my_contacts: "Kontaktini"
-      no_contacts: "Ei kontakteja."
+      no_contacts: "Sinun pitäisi näköjään lisätä kontakteja!"
       only_sharing_with_me: "Jakaa vain kanssani"
       remove_person_from_aspect: "Poista %{person_name} näkymästä: \"%{aspect_name}\""
       start_a_conversation: "Aloita keskustelu"
@@ -259,7 +259,7 @@ fi:
       birthday_with_year: "%e. %Bta %Y"
       fullmonth_day: "%e. %Bta"
   delete: "Poista"
-  email: "Sähköpostiosoite"
+  email: "Sähköposti"
   error_messages:
     helper:
       correct_the_following_errors_and_try_again: "Korjaa seuraavat virheet ja yritä uudelleen."
@@ -353,12 +353,12 @@ fi:
   no_results: "Tuloksia ei löytynyt"
   notifications:
     also_commented:
-      few: "%{actors} kommentoi myös %{post_author}:n viestiä: %{post_link}."
-      many: "%{actors} kommentoi myös %{post_author}:n viestiä: %{post_link}."
-      one: "%{actors} kommentoi myös %{post_author}:n viestiä: %{post_link}."
-      other: "%{actors} kommentoi myös %{post_author}:n viestiä: %{post_link}."
+      few: "Myös %{actors} kommentoivat käyttäjän %{post_author} %{post_link}ä."
+      many: "Myös %{actors} kommentoivat käyttäjän %{post_author} %{post_link}ä."
+      one: "Myös %{actors} kommentoi käyttäjän %{post_author} %{post_link}ä."
+      other: "Myös %{actors} kommentoivat käyttäjän %{post_author} %{post_link}ä."
       two: "%{actors} also commented on %{post_author}'s %{post_link}."
-      zero: "%{actors} kommentoi myös %{post_author}:n viestiä: %{post_link}."
+      zero: "Myös %{actors} kommentoi käyttäjän %{post_author} %{post_link}ä."
     also_commented_deleted:
       few: "%{actors} kommentoi poistettua viestiä."
       many: "%{actors} kommentoi poistettua viestiä."
@@ -367,12 +367,12 @@ fi:
       two: "%{actors} commented on a deleted post."
       zero: "%{actors} kommentoivat poistettua viestiä."
     comment_on_post:
-      few: "%{actors} kommentoi viestiäsi: %{post_link}."
-      many: "%{actors} kommentoi viestiäsi: %{post_link}."
-      one: "%{actors} kommentoi viestiäsi: %{post_link}."
-      other: "%{actors} kommentoi viestiäsi: %{post_link}."
+      few: "%{actors} kommentoivat %{post_link}äsi."
+      many: "%{actors} kommentoivat %{post_link}äsi."
+      one: "%{actors} kommentoi %{post_link}äsi."
+      other: "%{actors} kommentoivat %{post_link}äsi."
       two: "%{actors} commented on your %{post_link}."
-      zero: "%{actors} kommentoi viestiäsi: %{post_link}."
+      zero: "%{actors} kommentoi %{post_link}äsi."
     helper:
       new_notifications:
         few: "%{count} uutta ilmoitusta"
@@ -384,41 +384,41 @@ fi:
     index:
       and: "ja"
       and_others:
-        few: "ja %{count} muut"
-        many: "ja %{count} muut"
-        one: "ja yksi lisää"
-        other: "ja %{count} muut"
-        two: "and %{count} others"
+        few: "ja %{count} muuta"
+        many: "ja %{count} muuta"
+        one: "ja yksi muu"
+        other: "ja %{count} muuta"
+        two: "ja %{count} muuta"
         zero: "eikä kukaan muu"
       mark_all_as_read: "Merkitse kaikki luetuiksi"
       notifications: "Ilmoitukset"
     liked:
-      few: "%{actors} tykkää viestistäsi: %{post_link}."
-      many: "%{actors} tykkää viestistäsi: %{post_link}."
-      one: "%{actors} tykkää viestistäsi: %{post_link}."
-      other: "%{actors} tykkää viestistäsi: %{post_link}."
+      few: "%{actors} tykkäävät %{post_link}stäsi."
+      many: "%{actors} tykkäävät %{post_link}stäsi."
+      one: "%{actors} tykkää %{post_link}stäsi."
+      other: "%{actors} tykkäävät %{post_link}stäsi."
       two: "%{actors} has just liked your %{post_link}."
-      zero: "%{actors} tykkää viestistäsi: %{post_link}."
+      zero: "%{actors} tykkäävät %{post_link}stäsi."
     liked_post_deleted:
-      few: "%{actors} piti poistamastasi viestistä."
-      many: "%{actors} piti poistamastasi viestistä."
-      one: "%{actors} piti poistamastasi viestistä."
-      other: "%{actors} piti poistamastasi viestistä."
-      two: "%{actors} liked your deleted post."
-      zero: "%{actors} piti poistamastasi viestistä."
+      few: "%{actors} tykkäsivät poistamastasi viestistä."
+      many: "%{actors} tykkäsivät poistamastasi viestistä."
+      one: "%{actors} tykkäsi poistamastasi viestistä."
+      other: "%{actors} tykkäsivät poistamastasi viestistä."
+      two: "%{actors} tykkäsivät poistamastasi viestistä."
+      zero: "%{actors} tykkäsi poistamastasi viestistä."
     mentioned:
-      few: "%{actors} ovat maininneet sinut viestissä %{post_link}."
-      many: "%{actors} ovat maininneet sinut viestissä %{post_link}."
-      one: "%{actors} on maininnut sinut viestissä %{post_link}."
-      other: "%{actors} ovat maininneet sinut viestissä: %{post_link}."
-      two: "%{actors} ovat maininneet sinut viestissä: %{post_link}."
-      zero: "%{actors} on maininnut sinut viestissä %{post_link}."
+      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ä."
+      two: "%{actors} ovat maininneet sinut %{post_link}ssä."
+      zero: "%{actors} on maininnut sinut %{post_link}ssä."
     mentioned_deleted:
       few: "%{actors} mainitsi sinut poistetussa viestissä."
       many: "%{actors} mainitsi sinut poistetussa viestissä."
       one: "%{actors} mainitsi sinut poistetussa viestissä."
       other: "%{actors} mainitsi sinut poistetussa viestissä."
-      two: "%{actors} mentioned you in a deleted post."
+      two: "%{actors} mainitsivat sinut poistetussa viestissä."
       zero: "%{actors} mainitsi sinut poistetussa viestissä."
     post: "viesti"
     private_message:
@@ -429,12 +429,12 @@ fi:
       two: "%{actors} sent you a message."
       zero: "%{actors} lähetti sinulle viestin."
     reshared:
-      few: "%{actors} has reshared your %{post_link}."
-      many: "%{actors} has reshared your %{post_link}."
-      one: "%{actors} has reshared your %{post_link}."
-      other: "%{actors} has reshared your %{post_link}."
-      two: "%{actors} has reshared your %{post_link}."
-      zero: "%{actors} has reshared your %{post_link}."
+      few: "%{actors} ovat jakaneet %{post_link}si uudelleen."
+      many: "%{actors} ovat jakaneet %{post_link}si uudelleen."
+      one: "%{actors} on jakanut %{post_link}si uudelleen."
+      other: "%{actors} ovat jakaneet %{post_link}si uudelleen."
+      two: "%{actors} ovat jakaneet %{post_link}si uudelleen."
+      zero: "%{actors} on jakanut %{post_link}si uudelleen."
     reshared_post_deleted:
       few: "%{actors} reshared your deleted post."
       many: "%{actors} reshared your deleted post."
@@ -595,7 +595,7 @@ fi:
       your_private_profile: "Yksityinen profiilisi"
       your_public_profile: "Julkinen profiilisi"
       your_tags: "Kuvaile itseäsi viidellä sanalla"
-      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
+      your_tags_placeholder: "esim. #elokuvat #kissat #matkailu #opettaja #turku"
     update:
       failed: "Profiilin päivitys epäonnistui"
       updated: "Profiili päivitetty"
@@ -650,18 +650,18 @@ fi:
   reshares:
     comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
     create:
-      failure: "There was an error resharing this post."
+      failure: "Viestin uudelleen jakamisessa tapahtui virhe."
     reshare:
       deleted: "Kirjoittaja on poistanut alkuperäisen viestin."
       reshare:
-        few: "%{count} Reshares"
-        many: "%{count} Reshares"
-        one: "1 Reshare"
-        other: "%{count} Reshares"
-        two: "%{count} reshares"
-        zero: "Reshare"
-      reshare_confirmation: "Reshare %{author} - %{text}?"
-      reshare_original: "Reshare orignial"
+        few: "jaettu uudelleen %{count} kertaa"
+        many: "jaettu uudelleen %{count} kertaa"
+        one: "jaettu uudelleen kerran"
+        other: "jaettu uudelleen %{count} kertaa"
+        two: "jaettu uudelleen %{count} kertaa"
+        zero: "Jaa uudelleen"
+      reshare_confirmation: "Jaetaanko käyttäjän %{author} viesti uudelleen?"
+      reshare_original: "Jaa alkuperäinen uudelleen"
       reshared_via: "reshared via"
       show_original: "Näytä alkuperäinen"
   search: "Haku"
@@ -827,11 +827,11 @@ fi:
       title: "Posts tagged: %{tags}"
   tag_followings:
     create:
-      failure: "Seuraamisen aloittaminen #%{name}:lle epäonnistui"
-      success: "Onnistuneesti seurataan: #%{name}:a"
+      failure: "Tagin #%{name} seuraamisen aloittaminen epäonnistui. Seuraatko sitä jo?"
+      success: "Hiphei! Seuraat nyt tagia #%{name}."
     destroy:
-      failure: "Seuraamisen lopettaminen: #%{name} epäonnistui"
-      success: "Onnistuneesti lopetettiin #%{name}:n seuraaminen"
+      failure: "Tagin #%{name} seuraamisen lopettaminen epäonnistui. Oletko jo lopettanut sen seuraamisen?"
+      success: "Noin! Et seuraa enää tagia #%{name}."
   tags:
     show:
       follow: "Seuraa tagia #%{tag} "
@@ -866,8 +866,6 @@ fi:
       wrong_password: "Syötetty salasana ei vastannut nykyistä salasanaasi."
     edit:
       also_commented: "...joku myös kommentoi kontaktisi viestiin?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Vaihda"
       change_email: "Vaihda sähköpostiosoite"
       change_language: "Vaihda kieli"
@@ -880,7 +878,6 @@ fi:
       edit_account: "Muokkaa käyttäjätiliä"
       email_awaiting_confirmation: "Olemme lähettäneet sinulle aktivointilinkin osoitteeseen %{unconfirmed_email}. Jatkamme alkuperäisen osoitteesi %{email} käyttämistä siihen saakka, kunnes aktivoit uuden osoitteesi kyseisen linkin kautta."
       export_data: "Vie tietoja"
-      following: "Following Settings"
       getting_started: "New User Prefrences"
       liked: "...tykkää kirjoituksistasi?"
       mentioned: "...sinut mainitaan viestissä?"
@@ -888,7 +885,7 @@ fi:
       photo_export_unavailable: "Kuvien vienti ei tällä hetkellä mahdollista"
       private_message: "...saat uuden viestin?"
       receive_email_notifications: "Vastaanota sähköposti-ilmoituksia, kun.."
-      reshared: "...someone reshares your post?"
+      reshared: "...joku jakaa viestisi uudelleen?"
       show_community_spotlight: "Näytetäänkö Yhteisön valokeila virrassa?"
       show_getting_started: "Ota aloitusohjeet uudelleen käyttöön"
       started_sharing: "...aloittaa jakamaan kanssasi?"
@@ -898,8 +895,8 @@ fi:
     getting_started:
       awesome_take_me_to_diaspora: "Loistavaa! Mennään Diasporaan"
       community_welcome: "Diaspora-yhteisö on iloinen saadessaan sinut mukaan!"
-      hashtag_explanation: "Hashtagit mahdollistavat kiinnostuksen kohteistasi keskustelun ja niiden seuraamisen. Ne ovat myös hyvä keino ihmisten löytämiseen Diasporassa."
-      hashtag_suggestions: "Voit seurata vaikkapa tageja kuten #taide, #elokuvat, #gif jne."
+      hashtag_explanation: "Hashtagien avulla voit keskustella ja seurata keskusteluja kiinnostuksen kohteistasi. Ne ovat myös hyvä keino löytää ihmisiä Diasporassa."
+      hashtag_suggestions: "Voit seurata tageja kuten #taide, #elokuvat, #gif jne."
       hooking_up_fb: "yhdistämällä Facebook-tilisi"
       saved: Tallennettu!
       we_can_speed_things_up: "Voimme nopeuttaa asioita hieman"
@@ -921,8 +918,6 @@ fi:
       does_not_exist: "Käyttäjää %{username} ei ole olemassa!"
     update:
       email_notifications_changed: "Sähköposti-ilmoitukset vaihdettu"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "Kieli vaihdettu"
       language_not_changed: "Kielen vaihtaminen epäonnistui"
       password_changed: "Salasana vaihdettu. Voit nyt kirjautua uudella salasanallasi."

config/locales/diaspora/fr.yml

@@ -866,10 +866,6 @@ fr:
       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 automatiquement suivis :"
-      auto_follow_back: |-
-          Automatically follow back if a someone follows you
-          Retour suivant automatique si une personne vous suit
       change: "Modifier"
       change_email: "Changer d'adresse électronique"
       change_language: "Changer la langue"
@@ -882,7 +878,6 @@ fr:
       edit_account: "Modifier le compte"
       email_awaiting_confirmation: "Nous vous avons envoyé un lien d'activation à %{unconfirmed_email}. Jusqu'à ce que vous suivez ce lien et activez la nouvelle adresse, nous allons continuer à utiliser votre adresse originale %{email}."
       export_data: "Exporter des données"
-      following: "Paramètres suivants"
       getting_started: "Préférences de nouvel utilisateur"
       liked: "...quelqu'un aime votre message ?"
       mentioned: "…vous êtes mentionné(e) dans une publication ?"
@@ -923,8 +918,6 @@ fr:
       does_not_exist: "L'utilisateur %{username} n'existe pas !"
     update:
       email_notifications_changed: "Notifications par courriel modifiées"
-      follow_settings_changed: "Paramètres suivants"
-      follow_settings_not_changed: "Erreur des changements paramètres suivants "
       language_changed: "Langue mise à jour"
       language_not_changed: "Échec lors de la mise à jour de la langue"
       password_changed: "Mot de passe mis à jour. Vous pouvez maintenant vous identifier avec votre nouveau mot de passe."

config/locales/diaspora/ga.yml

@@ -866,8 +866,6 @@ ga:
       wrong_password: "The entered password didn't match your current password."
     edit:
       also_commented: "...someone also comments on your contact's post?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Athraigh"
       change_email: "Change E-Mail"
       change_language: "Athraigh Teanga"
@@ -880,7 +878,6 @@ ga:
       edit_account: "Athraigh cúntas"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Easpórtáil Sonraí"
-      following: "Following Settings"
       getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
@@ -921,8 +918,6 @@ ga:
       does_not_exist: "Níl aon úsáidóira, %{username}!"
     update:
       email_notifications_changed: "Athraigh Fógraí Ríomhphost"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "Teanga Athraithe"
       language_not_changed: "Níor Éirigh le Athrú Teanga"
       password_changed: "Pasfhocal Athraithe"

config/locales/diaspora/he.yml

@@ -866,8 +866,6 @@ he:
       wrong_password: "The entered password didn't match your current password."
     edit:
       also_commented: "...מישהו הגיב גם על הרשומה של איש הקשר שלך?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "שינוי"
       change_email: "החלפת כתובת הדוא״ל"
       change_language: "החלפת השפה"
@@ -880,7 +878,6 @@ he:
       edit_account: "עריכת החשבון"
       email_awaiting_confirmation: "שלחנו אליך קישור הפעלה לכתובת %{unconfirmed_email}.עד שתעקוב אחר קישור זה ותפעיל את הכתובת החדשה, אנו נמשיך להשתמש בכתובת המקורית שלך: %{email}."
       export_data: "יצוא הנתונים"
-      following: "Following Settings"
       getting_started: "New User Prefrences"
       liked: "...מישהו אהב את הרשומה שלך?"
       mentioned: "...מישהו ציין אותך ברשומה?"
@@ -921,8 +918,6 @@ he:
       does_not_exist: "המשתמש %{username} אינו קיים!"
     update:
       email_notifications_changed: "ההתרעות בדוא״ל השתנו"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "השפה הוחלפה"
       language_not_changed: "החלפת השפה נכשלה"
       password_changed: "הססמה הוחלפה. כעת באפשרותך להיכנס עם הססמה החדשה שלך."

config/locales/diaspora/hu.yml

@@ -111,9 +111,9 @@ hu:
         here_to_help: "A Diaspora közösség megérkezett!"
         need_help: "Segítségre van szüksége?"
         satisfaction: "%{link}: Közösségi támogatás"
-        tag_bug: "#bug"
-        tag_feature: "#feature"
-        tag_question: "#question"
+        tag_bug: "bug"
+        tag_feature: "funkció"
+        tag_question: "kérdés"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Közösségi leckék, módszerek, hírek"
       introduce_yourself: "Ez a te Hírfolyamod. Kezdd is el gyorsan egy bemutatkozással."
       keep_us_running: "Hogy gyors maradjon ez a pod (%{pod}), kérlek adományozz pénzt."
@@ -172,11 +172,11 @@ hu:
   back: "Vissza"
   blocks:
     create:
-      failure: "I couldn't ignore that user.  #evasion"
-      success: "Alright, you won't see that user in your stream again. #silencio!"
+      failure: "Nem tudtam figyelmen kívül hagyni azt a felhasználót. #elkerülés"
+      success: "Többet nem látod azt a felhasználót a hírfolyamban. #némítás!"
     destroy:
-      failure: "I couldn't stop ignoring that user.  #evasion"
-      success: "Let's see what they have to say! #sayhello"
+      failure: "Nem tudtam kikapcsolni annak a felhasználónak a figyelmen kívül hagyását. #elkerülés"
+      success: "Lássuk mit akarnak mondani! #sayhello"
   bookmarklet:
     explanation: "Küldj bejegyzést a Diaspora-ra bárhonnan, csak mentsd el ezt könyvjelzőként:"
     explanation_link_text: "ez a link"
@@ -494,7 +494,7 @@ hu:
       results_for: "eredmények %{params}"
     index:
       couldnt_find_them_send_invite: "Nem találod őket? Küldj meghívót nekik!"
-      looking_for: "Looking for posts tagged %{tag_link}?"
+      looking_for: "%{tag_link} címkéjű bejegyzéseket keresel?"
       no_one_found: "...és nem találni senkit."
       no_results: "Hé! Valamit keresned kell."
       results_for: "találatok keresése"
@@ -518,7 +518,7 @@ hu:
     show:
       does_not_exist: "Személy nem létezik!"
       has_not_shared_with_you_yet: "%{name} még nem oszt meg veled semmit."
-      ignoring: "You are ignoring all posts from %{name}."
+      ignoring: "Figyelmen kívül hagyod az összes bejegyzést tőle: %{name}."
       incoming_request: "%{name} megosztást kezdeményezett veled."
       mention: "Megemlít"
       message: "Üzenet"
@@ -556,7 +556,7 @@ hu:
       invalid_ext: "{file} érvénytelen kiterjesztés. Csak {extensions} kiterjesztések megengedettek."
       size_error: "{file} túl nagy, maximum fájlméret {sizeLimit}."
     new_profile_photo:
-      or_select_one_existing: "or select one from your already existing %{photos}"
+      or_select_one_existing: "vagy válassz egyet a már meglévők közül %{photos}"
       upload: "Új profilkép feltöltése!"
     photo:
       view_all: "%{name} összes képének megtekintése"
@@ -577,7 +577,7 @@ hu:
       not_found: "Bocsi, de nem találjuk a bejegyzést."
       permalink: "permalink"
   previous: "előző"
-  privacy: "Privacy"
+  privacy: "Adatvédelem"
   profile: "Profil"
   profiles:
     edit:
@@ -675,7 +675,7 @@ hu:
     failure:
       error: "Hiba történt a szolgáltatáshoz kapcsolódás közben"
     finder:
-      fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes."
+      fetching_contacts: "A Diaspora keresi a %{service} ismerőseidet, nézz vissza néhány perc múlva."
       no_friends: "Nincs Facebook ismerősöd"
       service_friends: "%{service} ismerős"
     index:
@@ -697,8 +697,8 @@ hu:
   settings: "Beállítások"
   share_visibilites:
     update:
-      post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted."
-      see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page."
+      post_hidden_and_muted: "%{name} bejegyzései és értesítései el lettek rejtve."
+      see_it_on_their_profile: "Ha szeretnéd látni a frissítéseket ezen a bejegyzésen, látogasd meg %{name} profil oldalát."
   shared:
     add_contact:
       add_new_contact: "Új ismerős"
@@ -752,7 +752,7 @@ hu:
         hello: "Sziasztok, én #%{new_user_tag} vagyok. "
         i_like: "Engem ezek érdekelnek: %{tags}."
         invited_by: "Köszi a meghívásért,"
-        newhere: "NewHere"
+        newhere: "Újonc"
       post_a_message_to: "Bejegyzés küldése ennek a csoportnak: %{aspect}"
       posting: Küldés...
       publishing_to: "Publikálás:"
@@ -766,9 +766,9 @@ hu:
       connect_to_comment: "Csatlakozz ehhez a személyhez, hogy hozzászólhass a bejegyzéseihez"
       currently_unavailable: "a hozzászólás jelenleg felfüggesztve"
       dislike: "Nem tetszik"
-      hide_and_mute: "Elrejt és elnémít"
-      ignore_user: "Ignore %{name}"
-      ignore_user_description: "Ignore and remove user from all aspects?"
+      hide_and_mute: "Bejegyzés elrejtése és némítása"
+      ignore_user: "Mellőz: %{name}"
+      ignore_user_description: "A felhasználó eltávolítása és mellőzése az összes körből?"
       like: "Tetszik"
       shared_with: "Megosztva vele: %{aspect_names}"
       unlike: "Nem tetszik"
@@ -793,12 +793,12 @@ hu:
   stream_helper:
     hide_comments: "hozzászólások elrejtése"
     show_comments:
-      few: "Show %{count} more comments"
-      many: "Show %{count} more comments"
-      one: "Show one more comment"
-      other: "Show %{count} more comments"
-      two: "Show two more comments"
-      zero: "No more comments"
+      few: "Még %{count} hozzászólás megtekintése"
+      many: "Még %{count} hozzászólás megtekintése"
+      one: "Még egy hozzászólás megtekintése"
+      other: "Még %{count} hozzászólás megtekintése"
+      two: "Még két hozzászólás megtekintése"
+      zero: "Nincs több hozzászólás"
   streams:
     aspects:
       title: "Csoportjaid"
@@ -825,7 +825,7 @@ hu:
     recently: "Utoljára:"
     tags:
       contacts_title: "Emberek, akik ezeket a címkéket követik"
-      tag_prefill_text: "The thing about %{tag_name} is... "
+      tag_prefill_text: "Mi újság erről: %{tag_name} ?"
       title: "Bejegyzés megjelölve: %{tags}"
   tag_followings:
     create:
@@ -863,13 +863,11 @@ hu:
       email_confirmed: "E-Mail (%{email}) aktiválva"
       email_not_confirmed: "Email cím aktiválása sikertelen. Rossz a link?"
     destroy:
-      no_password: "Please enter your current password to close your account."
-      success: "Your account has been locked.  It may take 20 minutes for us to finish closing your account.  Thank you for trying Diaspora."
-      wrong_password: "The entered password didn't match your current password."
+      no_password: "Add meg a jelszavad, hogy megszüntesd a fiókod."
+      success: "A fiókod le van zárva. Húsz percbe is beletelhet, mire befejezzük a fiókod törlését. Köszönjük, hogy kipróbáltad a Diaspora közösségi oldalt."
+      wrong_password: "A megadott jelszó nem felel meg."
     edit:
       also_commented: "...más is hozzászólt az ismerősöd bejegyzéséhez?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Módosítás"
       change_email: "Email megváltoztatása"
       change_language: "Nyelv megváltoztatása"
@@ -882,7 +880,6 @@ hu:
       edit_account: "Fiók szerkesztése"
       email_awaiting_confirmation: "Aktivációs link elküldve ide: %{unconfirmed_email}. Amíg nem erősíted meg az új címed, addig a régit használjuk: %{email}."
       export_data: "Adatok exportálása"
-      following: "Following Settings"
       getting_started: "Új felhasználó beállítások"
       liked: "... valakinek tetszik a bejegyzésed?"
       mentioned: "...meg vagy említve egy bejegyzésben?"
@@ -916,15 +913,13 @@ hu:
       simply_visit: "Tekintsd meg"
       works_on_modern: "Az összes modern okostelefonon működik"
     privacy_settings:
-      ignored_users: "Ignored Users"
-      stop_ignoring: "Stop ignoring"
-      title: "Privacy Settings"
+      ignored_users: "Mellőzött felhasználók"
+      stop_ignoring: "Mellőzés feloldása"
+      title: "Adatvédelmi beállítások"
     public:
       does_not_exist: "%{username} nem létezik!"
     update:
       email_notifications_changed: "E-mail értesítések módosítva"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "Nyelv megváltozott"
       language_not_changed: "Nyelv megváltoztatása nem sikerült"
       password_changed: "A jelszó megváltozott, már bejelentkezhetsz az új jelszóval."

config/locales/diaspora/id.yml

@@ -866,8 +866,6 @@ id:
       wrong_password: "The entered password didn't match your current password."
     edit:
       also_commented: "...someone also comments on your contact's post?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Change"
       change_email: "Change E-Mail"
       change_language: "Change Language"
@@ -880,7 +878,6 @@ id:
       edit_account: "Edit account"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Export Data"
-      following: "Following Settings"
       getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
@@ -921,8 +918,6 @@ id:
       does_not_exist: "User %{username} does not exist!"
     update:
       email_notifications_changed: "Language Change Failed"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "Language Changed"
       language_not_changed: "Language Change Failed"
       password_changed: "Password Changed"

config/locales/diaspora/is.yml

@@ -866,8 +866,6 @@ is:
       wrong_password: "The entered password didn't match your current password."
     edit:
       also_commented: "...someone also comments on your contact's post?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Breyting"
       change_email: "Change E-Mail"
       change_language: "Breyta um tungumál"
@@ -880,7 +878,6 @@ is:
       edit_account: "Breyta notandastillingum"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Export Data"
-      following: "Following Settings"
       getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
@@ -921,8 +918,6 @@ is:
       does_not_exist: "Notandinn %{username} er ekki til!"
     update:
       email_notifications_changed: "Tilkynningum í tölvupósti var breytt."
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "breytt var um tungumál"
       language_not_changed: "ekki tókst að breyta um tungumál"
       password_changed: "Lykilorði var breytt"

config/locales/diaspora/it.yml

@@ -866,8 +866,6 @@ it:
       wrong_password: "Hai inserito una password che non corrisponde a quella attuale."
     edit:
       also_commented: "...qualcuno commenta un post dopo di te?"
-      auto_follow_aspect: "Impostazioni per gli utenti seguiti automaticamente:"
-      auto_follow_back: "Segui automaticamente chi ti segue"
       change: "Cambia"
       change_email: "Cambia email"
       change_language: "Cambia lingua"
@@ -880,7 +878,6 @@ it:
       edit_account: "Modifica account"
       email_awaiting_confirmation: "È stato spedito su %{unconfirmed_email} un link di attivazione. Continueremo ad usare la tua email originale %{email} finché non cliccherai sul link e attiverai il nuovo indirizzo."
       export_data: "Esporta Dati"
-      following: "Impostazioni di iscrizione"
       getting_started: "Preferenze nuovo utente"
       liked: "...a qualcuno piace un tuo post?"
       mentioned: "...sei menzionato in un post?"
@@ -921,8 +918,6 @@ it:
       does_not_exist: "L'utente %{username} non esiste!"
     update:
       email_notifications_changed: "Notifiche email modificate con successo"
-      follow_settings_changed: "Le impostazioni di iscrizione sono state cambiate"
-      follow_settings_not_changed: "Impossibile cambiare le impostazioni di iscrizione."
       language_changed: "Lingua cambiata"
       language_not_changed: "Impossibile cambiare lingua"
       password_changed: "Password cambiata. Ora puoi effettuare l'accesso con la tua nuova password."

config/locales/diaspora/ja.yml

@@ -866,8 +866,6 @@ ja:
       wrong_password: "The entered password didn't match your current password."
     edit:
       also_commented: "他の人も連絡先の投稿にコメントしたとき"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "変更"
       change_email: "Change E-Mail"
       change_language: "言語変更"
@@ -880,7 +878,6 @@ ja:
       edit_account: "アカウント編集"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "データ出力"
-      following: "Following Settings"
       getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "投稿に自分がメンションされたとき"
@@ -921,8 +918,6 @@ ja:
       does_not_exist: "ユーザ名「%{username}」は存在しません。"
     update:
       email_notifications_changed: メール通知の設定を変更しました。
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "言語の設定を変更しました"
       language_not_changed: "言語の選択に失敗しました"
       password_changed: "パスワードを変更しました"

config/locales/diaspora/ko.yml

@@ -866,8 +866,6 @@ ko:
       wrong_password: "입력하신 암호가 현재 암호와 맞지 않습니다."
     edit:
       also_commented: "댓글 달았던 공유물에 내 컨택도 댓글을 달았을 때"
-      auto_follow_aspect: "자동으로 팔로우된 사용자들을 위한 애스펙:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "바꾸기"
       change_email: "이메일 바꾸기"
       change_language: "언어 바꾸기"
@@ -880,7 +878,6 @@ ko:
       edit_account: "계정 고치기"
       email_awaiting_confirmation: "%{unconfirmed_email} 로 활성화 링크를 보냈습니다. 이 링크를 따라 새 주소를 활성화하기 전까지는 원래 이메일 주소 %{email} 를 사용합니다."
       export_data: "자료 뽑아내기"
-      following: "팔로잉 설정"
       getting_started: "새 사용자 환경 설정"
       liked: "누군가가 내 공유물을 좋아할 때"
       mentioned: "내가 멘션되었을 때"
@@ -921,8 +918,6 @@ ko:
       does_not_exist: "%{username}님을 찾을 수 없습니다!"
     update:
       email_notifications_changed: "이메일 알림을 바꿨습니다"
-      follow_settings_changed: "팔로잉 설정이 바뀌었습니다"
-      follow_settings_not_changed: "팔로잉 설정 바꾸기를 실패했습니다."
       language_changed: "언어를 바꿨습니다"
       language_not_changed: "언어를 바꿀 수 없습니다"
       password_changed: "암호를 바꿨습니다"

config/locales/diaspora/lt.yml

@@ -866,8 +866,6 @@ lt:
       wrong_password: "The entered password didn't match your current password."
     edit:
       also_commented: "...someone also comments on your contact's post?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Change"
       change_email: "Change E-Mail"
       change_language: "Keisti kalbą"
@@ -880,7 +878,6 @@ lt:
       edit_account: "Edit account"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Eksportuoti duomenis"
-      following: "Following Settings"
       getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
@@ -921,8 +918,6 @@ lt:
       does_not_exist: "Vartotojas %{username} neegzistuoja!"
     update:
       email_notifications_changed: "Language Change Failed"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "Kalba pakeista"
       language_not_changed: "Kalbos pakeisti nepavyko"
       password_changed: "Slaptažodis pakeistas"

config/locales/diaspora/mk.yml

@@ -866,8 +866,6 @@ mk:
       wrong_password: "The entered password didn't match your current password."
     edit:
       also_commented: "...someone also comments on your contact's post?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Change"
       change_email: "Change E-Mail"
       change_language: "Промени јазик"
@@ -880,7 +878,6 @@ mk:
       edit_account: "Edit account"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Изнеси податоци"
-      following: "Following Settings"
       getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
@@ -921,8 +918,6 @@ mk:
       does_not_exist: "Корисникот %{username} не постои!"
     update:
       email_notifications_changed: "Language Change Failed"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "Јазикот е променет"
       language_not_changed: "Изменувањето на јазик е неуспешно"
       password_changed: "Лозинката е променета"

config/locales/diaspora/nb.yml

@@ -866,8 +866,6 @@ nb:
       wrong_password: "Passordet du skrev inn er ikke lik ditt nåværende passord."
     edit:
       also_commented: " noen andre også kommenterte på din kontakts innlegg?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Endre"
       change_email: "Change E-Mail"
       change_language: "Endre Språk"
@@ -880,7 +878,6 @@ nb:
       edit_account: "Endre konto"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Eksporter Data"
-      following: "Following Settings"
       getting_started: "Ny bruker preferences"
       liked: "... noen liker innlegget ditt?"
       mentioned: " du nevnes i et innlegg?"
@@ -921,8 +918,6 @@ nb:
       does_not_exist: "Bruker %{username} finnes ikke!"
     update:
       email_notifications_changed: "Language Change Failed"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "Språk Endret"
       language_not_changed: "Endring av språk mislyktes"
       password_changed: "Passord Endret"

config/locales/diaspora/nl.yml

@@ -866,8 +866,6 @@ nl:
       wrong_password: "Het ingevoerde wachtwoord komt niet overeen met je huidige wachtwoord."
     edit:
       also_commented: "...iemand na jou op de post van jouw contact reageert?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Verander"
       change_email: "Verander e-mailadres"
       change_language: "Taal wijzigen"
@@ -880,7 +878,6 @@ nl:
       edit_account: "Bewerk account"
       email_awaiting_confirmation: "We hebben een activatielink verzonden naar %{unconfirmed_email}. Totdat je het adres geactiveerd hebt zullen we je originele adress blijven gebruiken %{email}."
       export_data: "Exporteer data"
-      following: "Following Settings"
       getting_started: "New User Prefrences"
       liked: "... iemand je post leuk vind?"
       mentioned: "...je genoemd word in een post?"
@@ -921,8 +918,6 @@ nl:
       does_not_exist: "Gebruiker %{username} bestaat niet!"
     update:
       email_notifications_changed: "E-mailnotificaties gewijzigd"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "Taal gewijzigd"
       language_not_changed: "Taal wijzigen mislukt"
       password_changed: "Wachtwoord gewijzigd. Je kunt nu inloggen met je nieuwe wachtwoord."

config/locales/diaspora/nn.yml

@@ -866,8 +866,6 @@ nn:
       wrong_password: "The entered password didn't match your current password."
     edit:
       also_commented: "… nokon òg kommenterer kontakten din sitt innlegg?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Endra"
       change_email: "Endra e-posten"
       change_language: "Endra språket"
@@ -880,7 +878,6 @@ nn:
       edit_account: "Endra kontoen"
       email_awaiting_confirmation: "Vi har sendt ei aktiveringslenkje til %{unconfirmed_email}. Vi vil halda fram med å senda til originaladressa di, %{email}, fram til du følgjer lenkja og tek i bruk den nye."
       export_data: "Eksporter data"
-      following: "Following Settings"
       getting_started: "New User Prefrences"
       liked: "… nokon liker innlegget ditt?"
       mentioned: "… du er nemnt i eit innlegg?"
@@ -921,8 +918,6 @@ nn:
       does_not_exist: "Brukaren %{username} finst ikkje."
     update:
       email_notifications_changed: "E-postvarsla er endra"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "Språket er endra"
       language_not_changed: "Klarte ikkje å endra språket"
       password_changed: "Passordet er endra. Du kan no logga på med det nye passordet ditt."

config/locales/diaspora/pa.yml

@@ -866,8 +866,6 @@ pa:
       wrong_password: "The entered password didn't match your current password."
     edit:
       also_commented: "...someone also comments on your contact's post?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Change"
       change_email: "Change E-Mail"
       change_language: "Change Language"
@@ -880,7 +878,6 @@ pa:
       edit_account: "Edit account"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Export Data"
-      following: "Following Settings"
       getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
@@ -921,8 +918,6 @@ pa:
       does_not_exist: "User %{username} does not exist!"
     update:
       email_notifications_changed: "Email notifications changed"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "ਭਾਸ਼ਾ ਬਦਲੀ ਗਈ"
       language_not_changed: "Language Change Failed"
       password_changed: "ਪਾਸਵਰਡ ਬਦਲਿਆ ਗਿਆ"

config/locales/diaspora/pl.yml

@@ -650,19 +650,19 @@ pl:
   reshares:
     comment_email_subject: "%{resharer} podzieli@{m:ł|f:ła|n:ło} się z innymi wpisem %{author}"
     create:
-      failure: "Wystąpił błąd podczas ponownego udostępniania tego wpisu."
+      failure: "Przekazywanie dalej nie powiodło się."
     reshare:
       deleted: "Oryginał został usunięty przez autora."
       reshare:
         few: "Przekazano dalej: %{count}"
         many: "Przekazano dalej: %{count}"
         one: "Przekazano dalej: 1"
-        other: "%{count} ponowne udostępnienia"
+        other: "Przekazano dalej: %{count}"
         two: "Przekazano dalej: %{count}"
-        zero: "Ponownie udostępnij"
+        zero: "Przekaż dalej"
       reshare_confirmation: "Przekazać dalej wpis użytkownika %{author}?"
       reshare_original: "Przekaż dalej oryginał"
-      reshared_via: "Ponownie udostępniony przez"
+      reshared_via: "Przekazano dalej przez "
       show_original: "Wyświetl oryginał"
   search: "Znajdź"
   services:
@@ -866,8 +866,6 @@ pl:
       wrong_password: "Wprowadzone hasło nie jest zgodne z aktualnym hasłem."
     edit:
       also_commented: "...ktoś także skomentuje wpis jednego z z moich kontaktów"
-      auto_follow_aspect: "Aspekt dla automatycznie obserwowanych użytkowników:"
-      auto_follow_back: "Automatycznie dodaj do obserwowanych osobę, która zaczęła obserwować mnie"
       change: "Zmień"
       change_email: "Zmiana adresu e-mail"
       change_language: "Zmiana języka"
@@ -880,7 +878,6 @@ pl:
       edit_account: "Edycja konta"
       email_awaiting_confirmation: "Łącze aktywacyjne zostało wysłany na adres \"%{unconfirmed_email}\". Do momentu kliknięcia łącza i aktywacji nowego adresu, nadal będziemy korzystać z obecnego \"%{email}\"."
       export_data: "Eksport danych"
-      following: "Ustawienia obserwowania"
       getting_started: "Preferencje nowego użytkownika"
       liked: "...ktoś polubił mój wpis"
       mentioned: "...ktoś o mnie wspomniał we wpisie"
@@ -921,8 +918,6 @@ pl:
       does_not_exist: "Użytkownik %{username} nie istnieje!"
     update:
       email_notifications_changed: "Ustawienia powiadomień e-mail zostały zmienione"
-      follow_settings_changed: "Zmieniono ustawienia obserwowania"
-      follow_settings_not_changed: "Zmiana ustawień obserwowania nie powiodła się."
       language_changed: "Język został zmieniony"
       language_not_changed: "Zmiana języka nie powiodła się"
       password_changed: "Hasło zostało zmienione. Możesz teraz zalogować się używając nowego hasła."

config/locales/diaspora/pt-BR.yml

@@ -866,8 +866,6 @@ pt-BR:
       wrong_password: "A senha digitada não corresponde com sua senha atual."
     edit:
       also_commented: "...alguém comentar nas postagens dos teus contatos?"
-      auto_follow_aspect: "Aspectos seguidos automaticamente:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Alterar"
       change_email: "Alterar Email"
       change_language: "Alterar Idioma"
@@ -880,7 +878,6 @@ pt-BR:
       edit_account: "Editar Conta"
       email_awaiting_confirmation: "Temos que lhe enviar um link para a confirmação do email %{unconfirmed_email}. Enquanto você não confirmar o seu novo endereço de email, nós continuaremos utilizando o endereço antigo: %{email}."
       export_data: "Exportar Dados"
-      following: "Configurações Seguintes"
       getting_started: "Preferência de Novo Usuário"
       liked: "...alguém curtir a sua postagem?"
       mentioned: "...for mencionado(a) em uma postagem?"
@@ -921,8 +918,6 @@ pt-BR:
       does_not_exist: "O usuário %{username} não existe!"
     update:
       email_notifications_changed: "Notificação de email alterado."
-      follow_settings_changed: "Siga as configurações alteradas"
-      follow_settings_not_changed: "Falha em seguir as configurações."
       language_changed: "O idioma foi alterado."
       language_not_changed: "Alteração do idioma falhou!"
       password_changed: "Senha alterada com sucesso! Agora você poderá se conectar com a sua nova senha."

config/locales/diaspora/pt-PT.yml

@@ -868,8 +868,6 @@ pt-PT:
       wrong_password: "A palavra-passe digitada não corresponde à sua palavra-passe actual."
     edit:
       also_commented: "...alguém também comenta na publicação do seu contacto?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Alterar"
       change_email: "Mudar de email"
       change_language: "Mudar de idioma"
@@ -882,7 +880,6 @@ pt-PT:
       edit_account: "Editar conta"
       email_awaiting_confirmation: "Enviámos-lhe uma hiperligação de activação para %{unconfirmed_email}. Até que siga esta hiperligação e active o novo endereço, continuaremos a utilizar o seu endereço original %{email}."
       export_data: "Exportar Dados"
-      following: "Following Settings"
       getting_started: "Novas Preferências de Utilizador"
       liked: "...alguém gosta da sua publicação?"
       mentioned: "...é mencionado numa publicação?"
@@ -923,8 +920,6 @@ pt-PT:
       does_not_exist: "O utilizador %{username} não existe!"
     update:
       email_notifications_changed: "As notificações por email foram alteradas"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "O idioma foi alterado"
       language_not_changed: "Falha ao alterar o idioma"
       password_changed: "A palavra-passe foi alterada. Já pode iniciar sessão com a sua nova palavra-passe."

config/locales/diaspora/ro.yml

@@ -866,8 +866,6 @@ ro:
       wrong_password: "The entered password didn't match your current password."
     edit:
       also_commented: "...someone also comments on your contact's post?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Modifică"
       change_email: "Change E-Mail"
       change_language: "Modificare limbă"
@@ -880,7 +878,6 @@ ro:
       edit_account: "Editează cont"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Exportare de date"
-      following: "Following Settings"
       getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
@@ -921,8 +918,6 @@ ro:
       does_not_exist: "Utilizatorul %{username} nu există!"
     update:
       email_notifications_changed: "Language Change Failed"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "Limba schimbată"
       language_not_changed: "Nu s-a putut modifica limba"
       password_changed: "S-a modificat parola"

config/locales/diaspora/ru.yml

@@ -866,8 +866,6 @@ ru:
       wrong_password: "Введенный вами пароль не совпадает с вашим текущим паролем."
     edit:
       also_commented: "... кто-то комментировал сообщения ваших контактов?"
-      auto_follow_aspect: "Аспект для пользователей, которые автоматически следуют:"
-      auto_follow_back: "Автоматически следовать обратно, если кто-то следует за вами"
       change: "Изменить"
       change_email: "Изменить адрес"
       change_language: "Изменить язык"
@@ -880,7 +878,6 @@ ru:
       edit_account: "Редактировать аккаунт"
       email_awaiting_confirmation: "Мы послали ссылку для активации на %{unconfirmed_email}. Пока вы не пройдете по ней и не активируете новый адрес, мы будем использовать ваш прежний ящик %{email}."
       export_data: "Экспорт информации"
-      following: "Последующие настройки"
       getting_started: "Новые пользовательские настройки"
       liked: "...кому-нибудь нравится ваше сообщение?"
       mentioned: "... вы упомянуты в сообщении?"
@@ -921,8 +918,6 @@ ru:
       does_not_exist: "Пользователя %{username} не существует!"
     update:
       email_notifications_changed: "Настройки уведомлений сохранены"
-      follow_settings_changed: "Следуйте измененным настройкам"
-      follow_settings_not_changed: "Следуйте не удачно измененым настрокам."
       language_changed: "Язык изменён"
       language_not_changed: "Не удалось изменить язык"
       password_changed: "Пароль изменён. Теперь вы можете войти в систему с новым паролем."

config/locales/diaspora/sk.yml

@@ -866,8 +866,6 @@ sk:
       wrong_password: "Zadané heslo sa nezhoduje s vaším súčasným heslom."
     edit:
       also_commented: "...niekto okomentuje aj príspevok človeka vo vašich kontaktoch?"
-      auto_follow_aspect: "Kategória pre používateľov, ktorých automaticky sledujete:"
-      auto_follow_back: "Ak vás niekto sledujte, automaticky ho (ju) sledovať tiež"
       change: "Zmeniť"
       change_email: "Zmeniť e-mail"
       change_language: "Zmeniť jazyk"
@@ -880,7 +878,6 @@ sk:
       edit_account: "Upraviť účet"
       email_awaiting_confirmation: "Poslali sme vám odkaz na aktiváciu %{unconfirmed_email}. Kým nekliknete na tento odkaz a neaktivujete si novú adresu, budeme stále používať vašu pôvodnú adresu %{email}."
       export_data: "Exportovať dáta"
-      following: "Nastavenia sledovania"
       getting_started: "Nové nastavenia používateľa"
       liked: "...sa niekomu páči váš príspevok?"
       mentioned: "...vás spomenuli v príspevku?"
@@ -921,8 +918,6 @@ sk:
       does_not_exist: "Používateľ %{username} neexistuje!"
     update:
       email_notifications_changed: "Nastavenia oznamov e-mailom sa zmenili"
-      follow_settings_changed: "Nastavenia sledovania sa zmenili"
-      follow_settings_not_changed: "Nastavenia sledovania sa nepodarilo zmeniť."
       language_changed: "Jazyk sa zmenil"
       language_not_changed: "Nepodarilo sa zmeniť jazyk"
       password_changed: "Heslo sa zmenilo. Teraz sa môžete prihlásiť so svojím novým heslom."

config/locales/diaspora/sl.yml

@@ -868,8 +868,6 @@ sl:
       wrong_password: "Vneseno geslo se ne ujema z vašim trenutnim geslom."
     edit:
       also_commented: "...nekdo tudi komentira objavo vašega stika?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Spremeni"
       change_email: "Spremeni e-naslov"
       change_language: "Spremeni jezik"
@@ -882,7 +880,6 @@ sl:
       edit_account: "Uredi uporabniški račun"
       email_awaiting_confirmation: "Poslali smo vam povezavo za aktiviranje na %{unconfirmed_email}. Dokler ne sledite tej povezavi in ​​aktivirate nov naslov, bomo še naprej uporabljati vaš stari naslov %{email}."
       export_data: "Izvozi podatke"
-      following: "Following Settings"
       getting_started: "Nastavitve novega uporabnika"
       liked: "...je nekomu všeč vaša objava?"
       mentioned: "...ste omenjeni v objavi?"
@@ -923,8 +920,6 @@ sl:
       does_not_exist: "Uporabnik %{username} ne obstaja!"
     update:
       email_notifications_changed: "Obveščanje po e-pošti spremenjeno"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "Jezik spremenjen"
       language_not_changed: "Sprememba jezika ni uspela"
       password_changed: "Geslo spremenjeno. Sedaj se lahko prijavite z novim geslom."

config/locales/diaspora/sq.yml

@@ -866,8 +866,6 @@ sq:
       wrong_password: "The entered password didn't match your current password."
     edit:
       also_commented: "...someone also comments on your contact's post?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Change"
       change_email: "Change E-Mail"
       change_language: "Change Language"
@@ -880,7 +878,6 @@ sq:
       edit_account: "Edit account"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Export Data"
-      following: "Following Settings"
       getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
@@ -921,8 +918,6 @@ sq:
       does_not_exist: "User %{username} does not exist!"
     update:
       email_notifications_changed: "Email notifications changed"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "Language Changed"
       language_not_changed: "Language Change Failed"
       password_changed: "Password Changed"

config/locales/diaspora/sv.yml

@@ -390,7 +390,7 @@ sv:
         other: "och %{count} till"
         two: "och två till"
         zero: "och ingen mer"
-      mark_all_as_read: "Markera alla som läst"
+      mark_all_as_read: "Markera alla som lästa"
       notifications: "Notiser"
     liked:
       few: "%{actors} personer gillar din %{post_link}."
@@ -659,7 +659,7 @@ sv:
         one: "En sprider detta vidare"
         other: "%{count} sprider detta vidare"
         two: "Två sprider detta vidare"
-        zero: "Dela igen"
+        zero: "Sprid vidare"
       reshare_confirmation: "Sprid %{author}s inlägg vidare?"
       reshare_original: "Sprid originalet vidare"
       reshared_via: "sprids vidare via"
@@ -805,7 +805,7 @@ sv:
     community_spotlight_stream: "Gemenskapens Rampljus"
     followed_tag:
       add_a_tag: "Lägg till en tagg"
-      contacts_title: "Folk som gillar dessa taggar"
+      contacts_title: "Personer som gillar dessa taggar"
       follow: "Följ"
       title: "#Följda Taggar"
     followed_tags_stream: "#Följda Taggar"
@@ -814,7 +814,7 @@ sv:
       contacts_title: "Personer som omnämnt dig"
       title: "Omnämnanden"
     multi:
-      contacts_title: "Folk i din Ström"
+      contacts_title: "Personer i din Ström"
       title: "Ström"
     posted: "skrev ett inlägg"
     public:
@@ -865,11 +865,9 @@ sv:
       success: "Ditt konto har låsts. Det har ta 20 minuter för oss att avsluta ditt konto. Tack för att du testade Diaspora."
       wrong_password: "Det angivna lösenordet stämde inte med ditt nuvarande lösenord."
     edit:
-      also_commented: "...någon har också kommenterat på din kontakts post?"
-      auto_follow_aspect: "Aspekt för användare som automatiskt följs:"
-      auto_follow_back: "Följ automatiskt de som följer dig"
+      also_commented: "...någon kommenterar dina inlägg?"
       change: "Ändra"
-      change_email: "Ändra e-post"
+      change_email: "Ändra e-postadress"
       change_language: "Ändra språk"
       change_password: "Ändra lösenord"
       close_account: "Stäng kontot"
@@ -880,20 +878,19 @@ sv:
       edit_account: "Ändra konto"
       email_awaiting_confirmation: "Vi har skickat dig en länk till %{unconfirmed_email} för aktivering. Innan du har aktiverat din nya adress, kommer vi fortsätta att använda %{email}."
       export_data: "Exportera data"
-      following: "Inställningar för Följer "
       getting_started: "Inställningar för Ny Användare"
       liked: "...någon gillar ditt inlägg?"
-      mentioned: "...du är omnämnd i en post?"
+      mentioned: "...du omnämns i ett inlägg?"
       new_password: "Nytt lösenord"
       photo_export_unavailable: "Export av foton är för närvarande otillgängligt"
       private_message: "...du mottar ett privat meddelande?"
       receive_email_notifications: "Skicka notiser via e-post när..."
       reshared: "...någon sprider mina inlägg vidare?"
       show_community_spotlight: "Ska Gemenskapens Rampljus visas i din Ström?"
-      show_getting_started: "Återaktivera Komma Igång"
+      show_getting_started: "Återaktivera \"Komma Igång\""
       started_sharing: "...någon börjar dela med dig?"
       stream_preferences: "Inställningar för din Ström"
-      your_email: "Din epost"
+      your_email: "Din e-post"
       your_handle: "Ditt Diaspora ID"
     getting_started:
       awesome_take_me_to_diaspora: "Häftigt! Ta mig till Diaspora*"
@@ -921,8 +918,6 @@ sv:
       does_not_exist: "Användaren %{username} finns inte!"
     update:
       email_notifications_changed: "Notiser via e-post har ändrats"
-      follow_settings_changed: "Inställningar för Följer ändrade"
-      follow_settings_not_changed: "Misslyckades med att ändra inställningar för Följer"
       language_changed: "Språk är nu ändrat"
       language_not_changed: "Språket kunde inte ändras"
       password_changed: "Lösenordet är nu ändrat och klart att användas."

config/locales/diaspora/tr.yml

@@ -866,8 +866,6 @@ tr:
       wrong_password: "The entered password didn't match your current password."
     edit:
       also_commented: "...birisi gönderime yorum yazdığında?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Değiştir"
       change_email: "E-posta değiştir"
       change_language: "Dili değiştir"
@@ -880,7 +878,6 @@ tr:
       edit_account: "Hesap düzenle"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Bilgilerimi Dışarı taşı"
-      following: "Following Settings"
       getting_started: "Yeni Kullanıcı Tercihleri"
       liked: "...birisi gönderimi beğendiğinde?"
       mentioned: "...benden bahsedildiğinde?"
@@ -921,8 +918,6 @@ tr:
       does_not_exist: "%{username} kullanıcısı bulunmamaktadır!"
     update:
       email_notifications_changed: "E-posta bildirimleri değişti"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "Dil değişti"
       language_not_changed: "Dil değişikliği başarısız"
       password_changed: "Parola Değişti"

config/locales/diaspora/uk.yml

@@ -866,8 +866,6 @@ uk:
       wrong_password: "Введений вами пароль не співпадає з вашим поточним паролем."
     edit:
       also_commented: "... хтось коментував повідомлення ваших контактів?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Змінити"
       change_email: "Змінити адресу"
       change_language: "Змінити мову"
@@ -880,7 +878,6 @@ uk:
       edit_account: "Редагувати аккаунт"
       email_awaiting_confirmation: "Ми послали посилання для активації на %{unconfirmed_email}. Поки ви не пройдете по ньому і не активуєте нову адресу, ми використовуватимемо ваш колишній ящик %{email}."
       export_data: "Експорт інформації"
-      following: "Following Settings"
       getting_started: "Нові призначені для користувача налаштування"
       liked: "...кому-небудь подобається ваше повідомлення?"
       mentioned: "... ви згадані в повідомленні?"
@@ -921,8 +918,6 @@ uk:
       does_not_exist: "Користувача %{username} не існує!"
     update:
       email_notifications_changed: "Повідомлення по електронній пошті змінені"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "Мова змінена"
       language_not_changed: "Не вдалося змінити мову"
       password_changed: "Пароль змінений. Тепер ви можете увійти з новим паролем."

config/locales/diaspora/ur-PK.yml

@@ -866,8 +866,6 @@ ur-PK:
       wrong_password: "The entered password didn't match your current password."
     edit:
       also_commented: "...someone also comments on your contact's post?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Change"
       change_email: "Change email"
       change_language: "Change language"
@@ -880,7 +878,6 @@ ur-PK:
       edit_account: "Edit account"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Until you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Export Data"
-      following: "Following Settings"
       getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
@@ -921,8 +918,6 @@ ur-PK:
       does_not_exist: "User %{username} does not exist!"
     update:
       email_notifications_changed: "Email notifications changed"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "Language changed"
       language_not_changed: "Language change failed"
       password_changed: "Password changed.  You can now log in with your new password."

config/locales/diaspora/vi.yml

@@ -866,8 +866,6 @@ vi:
       wrong_password: "The entered password didn't match your current password."
     edit:
       also_commented: "...someone also comments on your contact's post?"
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Change"
       change_email: "Change email"
       change_language: "Change language"
@@ -880,7 +878,6 @@ vi:
       edit_account: "Edit account"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Until you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Export Data"
-      following: "Following Settings"
       getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
@@ -921,8 +918,6 @@ vi:
       does_not_exist: "User %{username} does not exist!"
     update:
       email_notifications_changed: "Email notifications changed"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "Language changed"
       language_not_changed: "Language change failed"
       password_changed: "Password changed.  You can now log in with your new password."

config/locales/diaspora/zh-CN.yml

@@ -866,8 +866,6 @@ zh-CN:
       wrong_password: "The entered password didn't match your current password."
     edit:
       also_commented: ……当有人也对您的好友的内容发表评论时？
-      auto_follow_aspect: "Aspect for automatically followed users:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "更改"
       change_email: "Change E-Mail"
       change_language: "更改语言"
@@ -880,7 +878,6 @@ zh-CN:
       edit_account: "编辑帐号"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "资料导出"
-      following: "Following Settings"
       getting_started: "New User Prefrences"
       liked: …有人喜欢您发布的内容？
       mentioned: ……当贴文中提到您时？
@@ -921,8 +918,6 @@ zh-CN:
       does_not_exist: "不存在 %{username} 这个用户！"
     update:
       email_notifications_changed: "邮件通知更改成功"
-      follow_settings_changed: "Follow settings changed"
-      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "语言更改成功"
       language_not_changed: "语言更改失败"
       password_changed: "密码更改成功"

config/locales/diaspora/zh-TW.yml

@@ -866,8 +866,6 @@ zh-TW:
       wrong_password: 輸入的密碼與你目前的密碼不符.
     edit:
       also_commented: "...當有人也對你的聯絡人的貼文發表意見時?"
-      auto_follow_aspect: "給被自動追蹤的使用者的面向:"
-      auto_follow_back: "當有人追蹤你時自動反追蹤回去"
       change: "更改"
       change_email: 更改E-Mail
       change_language: "更改語言"
@@ -880,7 +878,6 @@ zh-TW:
       edit_account: "編輯帳號"
       email_awaiting_confirmation: "我們已經將啟用連結寄到 %{unconfirmed_email} 給你. 在你使用該連結啟用新的位址之前, 我們還會繼續使用你原來的位址, 也就是 %{email}."
       export_data: "資料匯出"
-      following: "追蹤設定"
       getting_started: "新使用者偏好設定"
       liked: "...當有人對你的貼文說讚時?"
       mentioned: "...當貼文中點到你時?"
@@ -921,8 +918,6 @@ zh-TW:
       does_not_exist: "不存在 %{username} 這個使用者!"
     update:
       email_notifications_changed: "電郵通知已經更改了"
-      follow_settings_changed: "追蹤設定改變了"
-      follow_settings_not_changed: 追蹤設定改變失敗.
       language_changed: "語言已經更改了"
       language_not_changed: "語言更改失敗"
       password_changed: "密碼已經更改了. 從現在起你可以用新的密碼登入."

config/locales/javascript/javascript.es-AR.yml

@@ -6,19 +6,19 @@
 es-AR:
   javascripts:
     aspect_dropdown:
-      add_to_aspect: "Agregar al aspecto"
+      add_to_aspect: "Agregar contacto"
       all_aspects: "Todos los aspectos"
-      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
+      error: "No se pudo empezar a compartir con {{name}}.  ¿Será que lo/a estás ignorando?"
       select_aspects: "Selecciona aspectos"
-      started_sharing_with: "You have started sharing with {{name}}!"
-      stopped_sharing_with: "You have stopped sharing with {{name}}."
+      started_sharing_with: "Empezaste a compartir con {{name}}!"
+      stopped_sharing_with: "Dejaste de compartir con {{name}}."
       toggle:
         few: "En {{count}} aspectos"
         many: "En {{count}} aspectos"
         one: "En {{count}} aspecto"
         other: "En {{count}} aspectos"
         two: "En {{count}} aspectos"
-        zero: "Agregar a un aspecto"
+        zero: "Seleccionar aspectos"
     aspect_navigation:
       deselect_all: "De-seleccionar todo"
       no_aspects: "No hay aspectos seleccionados"
@@ -30,24 +30,24 @@ es-AR:
     failed_to_like: "¡No pudo marcarse como 'Me gusta'!"
     failed_to_post_message: "¡No pudo publicarse el mensaje!"
     getting_started:
-      alright_ill_wait: "Alright, I'll wait."
-      hey: "Hey, {{name}}!"
-      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
-      preparing_your_stream: "Preparing your personialized stream..."
+      alright_ill_wait: "Todo bien, voy a esperar."
+      hey: "Che, {{name}}!"
+      no_tags: "¡Che, no estás siguiendo ningún tag! ¿Continuar de todos modos?"
+      preparing_your_stream: "Preparando tu stream personalizado..."
     infinite_scroll:
       no_more: "No hay más publicaciones."
     photo_uploader:
-      looking_good: "OMG, you look awesome!"
+      looking_good: "¡Apa, te ves muy bien!"
     publisher:
       at_least_one_aspect: "Tenés que publicarlo en, por lo menos, un aspecto"
       limited: "Limitada - tu publicación sera vista solo por la gente con quien la compartes "
       public: "Publica - tu publicación sera visible para cualquiera y los buscadores podrán encontrarla"
     reshares:
-      duplicate: "Ya compartiste esa publicación!"
+      duplicate: "¿Te gustó eh? ¡Ya habías compartido esa publicación!"
     search_for: "Buscar a {{name}}"
     show_more: "mostrar más"
     tags:
-      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
+      wasnt_that_interesting: "OK, supongamos que #{{tagName}} no era tan interesante..."
     timeago:
       day: "un día"
       days: "%d días"

config/locales/javascript/javascript.he.yml

@@ -22,7 +22,7 @@ he:
     aspect_navigation:
       deselect_all: "Deselect all"
       no_aspects: "No aspects selected"
-      select_all: "Select all"
+      select_all: "בחר הכל"
     comments:
       hide: "הסתרת תגובות"
       show: "הצגת כל התגובות"
@@ -30,8 +30,8 @@ he:
     failed_to_like: "הסימון ב'אהבתי' נכשל!"
     failed_to_post_message: "פרסום ההודעה נכשל!"
     getting_started:
-      alright_ill_wait: "Alright, I'll wait."
-      hey: "Hey, {{name}}!"
+      alright_ill_wait: "בסדר, אני אמתין."
+      hey: "שלום, {{name}}!"
       no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
       preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll:

config/locales/javascript/javascript.hu.yml

@@ -8,7 +8,7 @@ hu:
     aspect_dropdown:
       add_to_aspect: "Hozzáadás a csoporthoz"
       all_aspects: "Összes csoport"
-      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
+      error: "Nem indult el a megosztás vele: {{name}}. Visszavonod?"
       select_aspects: "Csoportok kiválasztása"
       started_sharing_with: "Mostantól megosztassz vele: {{name}}!"
       stopped_sharing_with: "Nem osztassz meg többé vele: {{name}}."
@@ -57,7 +57,7 @@ hu:
       minutes: "%d perccel"
       month: "körülbelül egy hónappal"
       months: "%d hónappal"
-      prefixAgo: "javascripts:timeago:prefixAgo"
+      prefixAgo: ""
       prefixFromNow: ""
       seconds: "kevesebb mint egy perccel"
       suffixAgo: "ezelőtt"

config/locales/javascript/javascript.pl.yml

@@ -57,7 +57,7 @@ pl:
       minutes: "%d minut"
       month: "około miesiąca"
       months: "%d miesięcy"
-      prefixAgo: "javascripts:timeago:prefixAgo"
+      prefixAgo: " "
       prefixFromNow: "javascripts:timeago:prefixFromNow"
       seconds: "mniej niż minutę"
       suffixAgo: "temu"