updated 35 locale files [ci skip]

config/locales/diaspora/bg.yml

@@ -863,6 +863,7 @@ bg:
       wrong_password: "Въведената парола не съвпада с текущата парола на акаунта."
     edit:
       also_commented: "...някой коментира публикация на ваш контакт?"
+      auto_follow_back: "Automatically follow back if a someone follows you"
       change: Промяна
       change_email: "Промяна на ел. поща"
       change_language: "Промяна на езика"

config/locales/diaspora/br.yml

@@ -471,6 +471,7 @@ br:
       email_confirmed: "E-Mail %{email} activated"
       email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     edit:
+      auto_follow_back: "Automatically follow back if a someone follows you"
       change: Cheñch
       change_email: "Change E-Mail"
       change_language: "Cheñch Yezh"

config/locales/diaspora/cs.yml

@@ -783,6 +783,7 @@ cs:
       email_not_confirmed: "E-mail nemohl být aktivován. Špatný odkaz?"
     edit:
       also_commented: "...někdo komentoval váš příspěvek?"
+      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"

config/locales/diaspora/cy.yml

@@ -507,6 +507,7 @@ cy:
       email_confirmed: "E-Mail %{email} activated"
       email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     edit:
+      auto_follow_back: "Automatically follow back if a someone follows you"
       change_email: "Newid yr E-Bost"
       change_language: "Newid yr iaith"
       change_password: "Newid cyfrinair"

config/locales/diaspora/de.yml

@@ -872,6 +872,8 @@ 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"
@@ -893,6 +895,7 @@ 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?"
@@ -933,6 +936,8 @@ 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

@@ -850,6 +850,7 @@ de_formal:
       email_not_confirmed: "Die E-Mail-Adresse konnte nicht aktiviert werden. Falscher Link?"
     edit:
       also_commented: "… jemand ebenfalls den Beitrag eines Kontaktes kommentiert?"
+      auto_follow_back: "Automatically follow back if a someone follows you"
       change: Ändern
       change_email: "E-Mail-Adresse ändern"
       change_language: "Sprache ändern"

config/locales/diaspora/el.yml

@@ -863,6 +863,7 @@ el:
       wrong_password: "Ο κωδικός που εισάγατε δεν ταιριάζει με τον τωρινό κωδικό σας."
     edit:
       also_commented: "...κάποιος επίσης σχολίασε σε δημοσίευση επαφής σας;"
+      auto_follow_back: "Automatically follow back if a someone follows you"
       change: Αλλαγή
       change_email: "Αλλαγή διεύθυνσης ηλεκτρονικού ταχυδρομείου"
       change_language: "Αλλαγή Γλώσσας"

config/locales/diaspora/en_1337.yml

@@ -781,6 +781,7 @@ en_1337:
       email_not_confirmed: "M41L C0ULD N07 B3 4C71V473D, WR0NG L1NK?"
     edit:
       also_commented: "...50M30N3 4L50 5P4M5 0N 4 N00B5 5P4M?"
+      auto_follow_back: "Automatically follow back if a someone follows you"
       change: CH4NG3
       change_email: "CH4NG3 M41L"
       change_language: "CH4NG3 L4NGU4G3"

config/locales/diaspora/en_pirate.yml

@@ -322,5 +322,7 @@ en_pirate:
       failure: "Failed to stop following: #%{name}"
       success: "Successfully stopped following: #%{name}"
   users:
+    edit:
+      auto_follow_back: "Automatically follow back if a someone follows you"
     getting_started:
       what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."

config/locales/diaspora/en_shaw.yml

@@ -733,6 +733,7 @@ en_shaw:
       email_not_confirmed: "𐑦-𐑥𐑱𐑤 𐑒𐑫𐑛 𐑯𐑪𐑑 𐑚𐑰 𐑨𐑒𐑑𐑦𐑝𐑱𐑑𐑩𐑛. 𐑮𐑪𐑙 𐑤𐑦𐑙𐑒?"
     edit:
       also_commented: "...𐑕𐑳𐑥𐑢𐑩𐑯 𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑕 𐑪𐑯 𐑿𐑼 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕 𐑐𐑴𐑕𐑑?"
+      auto_follow_back: "Automatically follow back if a someone follows you"
       change: 𐑗𐑱𐑯𐑡
       change_email: "𐑗𐑱𐑯𐑡 𐑦-𐑥𐑱𐑤"
       change_language: "𐑗𐑱𐑯𐑡 𐑤𐑱𐑙𐑜𐑢𐑩𐑡"

config/locales/diaspora/eo.yml

@@ -858,6 +858,7 @@ 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_back: "Automatically follow back if a someone follows you"
       change: Ŝanĝi
       change_email: "Redakti retpoŝtadreso"
       change_language: "Ŝanĝi lingvon"

config/locales/diaspora/es.yml

@@ -875,6 +875,8 @@ 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: "Selecciona el aspecto en el que se incluirán los usuarios que sigues automáticamente:"
+      auto_follow_back: "Seguir automáticamente a quien empiece a seguirte"
       change: Cambiar
       change_email: "Cambiar email"
       change_language: "Cambiar idioma"
@@ -896,6 +898,7 @@ 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?"
@@ -936,6 +939,8 @@ 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 al cambiar 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

@@ -830,6 +830,7 @@ eu:
       email_not_confirmed: "E-MPosta ezin izan da gaitu. Esteka baliogabea agian?"
     edit:
       also_commented: "...beste norbaitek zure adiskide baten mezua iruzkintzen duenean?"
+      auto_follow_back: "Automatically follow back if a someone follows you"
       change: Aldatu
       change_email: "Aldatu e-posta"
       change_language: "Hizkuntza aldatu"

config/locales/diaspora/fi.yml

@@ -855,6 +855,7 @@ fi:
       wrong_password: "Syötetty salasana ei vastannut nykyistä salasanaasi."
     edit:
       also_commented: "...joku myös kommentoi kontaktisi viestiin?"
+      auto_follow_back: "Automatically follow back if a someone follows you"
       change: Vaihda
       change_email: "Vaihda sähköpostiosoite"
       change_language: "Vaihda kieli"

config/locales/diaspora/ga.yml

@@ -538,6 +538,7 @@ ga:
       email_confirmed: "E-Mail %{email} activated"
       email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     edit:
+      auto_follow_back: "Automatically follow back if a someone follows you"
       change: Athraigh
       change_email: "Change E-Mail"
       change_language: "Athraigh Teanga"

config/locales/diaspora/he.yml

@@ -891,6 +891,7 @@ he:
       wrong_password: "הסיסמה שהוכנסה לא תואמת"
     edit:
       also_commented: "...מישהו הגיב גם על הרשומה של איש הקשר שלך?"
+      auto_follow_back: "Automatically follow back if a someone follows you"
       change: שינוי
       change_email: "החלפת כתובת הדוא״ל"
       change_language: "החלפת השפה"

config/locales/diaspora/id.yml

@@ -420,6 +420,7 @@ id:
       email_confirmed: "E-Mail %{email} activated"
       email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     edit:
+      auto_follow_back: "Automatically follow back if a someone follows you"
       change_email: "Change E-Mail"
       change_language: "Change Language"
       change_password: "Change Password"

config/locales/diaspora/is.yml

@@ -595,6 +595,7 @@ is:
       email_confirmed: "E-Mail %{email} activated"
       email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     edit:
+      auto_follow_back: "Automatically follow back if a someone follows you"
       change: Breyting
       change_email: "Change E-Mail"
       change_language: "Breyta um tungumál"

config/locales/diaspora/ja.yml

@@ -669,6 +669,7 @@ ja:
       email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     edit:
       also_commented: 他の人も連絡先の投稿にコメントしたとき
+      auto_follow_back: "Automatically follow back if a someone follows you"
       change: 変更
       change_email: "Change E-Mail"
       change_language: 言語変更

config/locales/diaspora/ko.yml

@@ -834,7 +834,7 @@ ko:
     create:
       failure: "#%{name}님 팔로우를 실패하였습니다. 이미 팔로우하고 있습니까?"
       none: "빈 태그는 팔로우할 수 없습니다!"
-      success: "만세! 이제 #%{name}님을 팔로우합니다."
+      success: "만세! 이제 #%{name} 태그를 팔로우합니다."
     destroy:
       failure: "#%{name}님 팔로우 멈추기를 실패하였습니다. 이미 팔로우를 멈췄을 수 있습니다."
       success: "아아···. 더 이상 #%{name}님을 팔로우하지 않습니다."
@@ -872,6 +872,8 @@ ko:
       wrong_password: "입력하신 암호가 현재 암호와 맞지 않습니다."
     edit:
       also_commented: "댓글 달았던 게시물에 내 컨택도 댓글을 달았을 때"
+      auto_follow_aspect: "자동 팔로우 애스펙"
+      auto_follow_back: "나를 팔로우하는 사람을 자동으로 팔로우합니다"
       change: 바꾸기
       change_email: "이메일 바꾸기"
       change_language: "언어 바꾸기"
@@ -893,6 +895,7 @@ ko:
       edit_account: "계정 고치기"
       email_awaiting_confirmation: "%{unconfirmed_email} 로 활성화 링크를 보냈습니다. 이 링크를 따라 새 주소를 활성화하기 전까지는 원래 이메일 주소 %{email} 를 사용합니다."
       export_data: "자료 뽑아내기"
+      following: "팔로우 설정"
       getting_started: "새 사용자 환경 설정"
       liked: "누군가가 내 게시물을 좋아할 때"
       mentioned: "내가 멘션되었을 때"
@@ -933,6 +936,8 @@ 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

@@ -507,6 +507,7 @@ lt:
       email_confirmed: "E-Mail %{email} activated"
       email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     edit:
+      auto_follow_back: "Automatically follow back if a someone follows you"
       change_email: "Change E-Mail"
       change_language: "Keisti kalbą"
       change_password: "Keisti slaptažodį"

config/locales/diaspora/mk.yml

@@ -496,6 +496,7 @@ mk:
       email_confirmed: "E-Mail %{email} activated"
       email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     edit:
+      auto_follow_back: "Automatically follow back if a someone follows you"
       change_email: "Change E-Mail"
       change_language: "Промени јазик"
       change_password: "Промени лозинка"

config/locales/diaspora/nb.yml

@@ -763,6 +763,7 @@ 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_back: "Automatically follow back if a someone follows you"
       change: Endre
       change_email: "Change E-Mail"
       change_language: "Endre Språk"

config/locales/diaspora/nl.yml

@@ -812,6 +812,7 @@ 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_back: "Automatically follow back if a someone follows you"
       change: Verander
       change_email: "Verander e-mailadres"
       change_language: "Taal wijzigen"

config/locales/diaspora/nn.yml

@@ -748,6 +748,7 @@ nn:
       email_not_confirmed: "Klarte ikkje å slå på bruk av e-post. Feil lenkje?"
     edit:
       also_commented: "… nokon òg kommenterer kontakten din sitt innlegg?"
+      auto_follow_back: "Automatically follow back if a someone follows you"
       change: Endra
       change_email: "Endra e-posten"
       change_language: "Endra språket"

config/locales/diaspora/pa.yml

@@ -398,6 +398,7 @@ pa:
       email_confirmed: "E-Mail %{email} activated"
       email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     edit:
+      auto_follow_back: "Automatically follow back if a someone follows you"
       change_email: "Change E-Mail"
       change_language: "Change Language"
       change_password: "Change Password"

config/locales/diaspora/pl.yml

@@ -875,6 +875,8 @@ 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 zacznij obserwować, gdy ktoś zaczyna obserwować mnie"
       change: Zmień
       change_email: "Zmiana adresu e-mail"
       change_language: "Zmiana języka"
@@ -896,6 +898,7 @@ 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"
@@ -936,6 +939,8 @@ pl:
       does_not_exist: "Użytkownik %{username} nie istnieje!"
     update:
       email_notifications_changed: "Ustawienia powiadomień e-mail zostały zmienione"
+      follow_settings_changed: "Ustawienia obserwowania zostały zmienione"
+      follow_settings_not_changed: "Nie udało się zmienić ustawień obserwowania."
       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-PT.yml

@@ -868,6 +868,7 @@ 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_back: "Automatically follow back if a someone follows you"
       change: Alterar
       change_email: "Mudar de email"
       change_language: "Mudar de idioma"

config/locales/diaspora/ro.yml

@@ -14,6 +14,10 @@ ro:
   activerecord:
     errors:
       models:
+        contact:
+          attributes:
+            person_id:
+              taken: "trebuie sa fie unul singur in contactele acestui utilizator."
         person:
           attributes:
             diaspora_handle:
@@ -92,6 +96,7 @@ ro:
       no_contacts: "Niciun contact"
       no_tags: "No tags"
       post_a_message: "publicati un mesaj >>"
+      unfollow_tag: "Nu mai urma #%{tag}"
     many: "%{count} aspecte"
     move_contact:
       error: "Eroare la mutarea contactului: %{inspect}"
@@ -234,6 +239,7 @@ ro:
       profile: profile
       recent_notifications: "Notificări recente"
       settings: settings
+      view_all: "Arata tot"
   likes:
     likes:
       people_dislike_this:
@@ -392,15 +398,17 @@ ro:
       edit_membership: "editati apartenenta la aspect"
     few: "%{count} persoane"
     helper:
+      people_on_pod_are_aware_of: "persoanele de pe acest pod stiu despre"
       results_for: "rezultate pentru %{params}"
     index:
       couldnt_find_them_send_invite: "Nu i-ati gasit? Trimiteti o invitatie!"
+      looking_for: "Cautati publicatii marcate cu %{tag_link}?"
       no_one_found: "...nimeni nu a fost găsit."
       no_results: "Hey! Trebuie sa cautati ceva."
       results_for: "caută rezultate pentru"
     many: "%{count} persoane"
     one: "1 persoana"
-    other: "%{count} people"
+    other: "%{count} persoane"
     person:
       add_contact: "adaugă contact"
       already_connected: "Eşti deja conectat"
@@ -416,7 +424,10 @@ ro:
       remove_contact: "Elimină contactul"
       remove_from: "Elimini pe %{name} din %{aspect}?"
     show:
+      closed_account: "Acest cont a fost inchis."
       does_not_exist: "Persoana nu există!"
+      has_not_shared_with_you_yet: "%{name} nu a publicat inca nimic!"
+      ignoring: "De acum toate publicatiile de la %{name} vor fi ignorate."
       incoming_request: "You have an incoming request from this person."
       message: Mesaj
       not_connected: "You are not connected with this person"
@@ -427,6 +438,7 @@ ro:
       to_accept_or_ignore: "pentru acceptare / ignorare."
     sub_header:
       edit: editare
+      you_have_no_tags: "nu aveti nici un marcaj!"
     two: "%{count} people"
     webfinger:
       fail: "Ne pare rău, nu am putut găsi %{handle}."
@@ -480,6 +492,8 @@ ro:
       your_location: "Locaţia dvs"
       your_name: "Numele tău "
       your_photo: "Poza ta"
+      your_private_profile: "Profilul tau privat"
+      your_public_profile: "Profilul tau public"
       your_tags: "You: in 5 #tags"
       your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update:
@@ -605,6 +619,7 @@ ro:
       all: toate
       all_contacts: "toate contactele"
       discard_post: "Anuleaza publicatia"
+      make_public: "Vizibil pentru toti"
       new_user_prefill:
         i_like: "I'm interested in %{tags}."
       post_a_message_to: "Postati un mesaj catre %{aspect}"
@@ -612,6 +627,8 @@ ro:
       share: Distribuie
       share_with: "Share with %{aspect}"
       whats_on_your_mind: "what's on your mind?"
+    reshare:
+      reshare: Redistribuie
     stream_element:
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
@@ -653,7 +670,12 @@ ro:
       success: "Successfully stopped following: #%{name}"
   tags:
     show:
+      follow: "Urmeaza #%{tag}"
+      following: "Urmarind #%{tag}"
+      nobody_talking: "Nu se povesteste nimic despre %{tag} inca."
+      people_tagged_with: "Persoane marcate cu %{tag}"
       posts_tagged_with: "Publicatii marcate cu #%{tag}"
+      stop_following: "Nu mai urmari #%{tag}"
   tokens:
     show:
       connect_to_cubbies: "Conectarea la Cubbi.es"
@@ -669,6 +691,7 @@ ro:
       email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     edit:
       also_commented: "...cineva comenteaza de asemenea pe publicatia unei persoane din contacte?"
+      auto_follow_back: "Automatically follow back if a someone follows you"
       change: Modifică
       change_email: "Change E-Mail"
       change_language: "Modificare limbă"
@@ -683,6 +706,7 @@ ro:
       liked: "...cuiva ii place ce ai publicat?"
       mentioned: "...sunteti mentionat intr-un post ?"
       new_password: "Parolă nouă"
+      private_message: "...primesti un mesaj privat?"
       receive_email_notifications: "Receive email notificaions?"
       your_email: "E-mailul tău"
       your_handle: "Identificatorul tău pe Diaspora"

config/locales/diaspora/sl.yml

@@ -863,6 +863,7 @@ 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_back: "Automatically follow back if a someone follows you"
       change: Spremeni
       change_email: "Spremeni e-naslov"
       change_language: "Spremeni jezik"

config/locales/diaspora/sv.yml

@@ -856,6 +856,8 @@ sv:
       wrong_password: "Det angivna lösenordet stämde inte med ditt nuvarande lösenord."
     edit:
       also_commented: "...någon kommenterar dina inlägg?"
+      auto_follow_aspect: "Aspekt för automatiskt följda användare:"
+      auto_follow_back: "Följ automatiskt de som börjar följa dig"
       change: Ändra
       change_email: "Ändra e-postadress"
       change_language: "Ändra språk"
@@ -877,6 +879,7 @@ 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 omnämns i ett inlägg?"
@@ -917,6 +920,8 @@ 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 ändrades"
+      follow_settings_not_changed: "Misslyckades 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/ur-PK.yml

@@ -388,5 +388,7 @@ ur-PK:
       failure: "Failed to stop following: #%{name}"
       success: "Successfully stopped following: #%{name}"
   users:
+    edit:
+      auto_follow_back: "Automatically follow back if a someone follows you"
     getting_started:
       what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."

config/locales/diaspora/zh-CN.yml

@@ -677,6 +677,7 @@ zh-CN:
       email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     edit:
       also_commented: ……当有人也对您的好友的内容发表评论时？
+      auto_follow_back: "Automatically follow back if a someone follows you"
       change: 更改
       change_email: "Change E-Mail"
       change_language: 更改语言

config/locales/diaspora/zh-TW.yml

@@ -875,6 +875,8 @@ zh-TW:
       wrong_password: 輸入的密碼與你目前的密碼不符.
     edit:
       also_commented: "...當有人也對你的聯絡人的貼文發表意見時?"
+      auto_follow_aspect: "給被自動追蹤的使用者的面向:"
+      auto_follow_back: 當有人追蹤你時自動反追蹤回去
       change: 更改
       change_email: 更改E-Mail
       change_language: 更改語言
@@ -887,6 +889,7 @@ zh-TW:
       edit_account: 編輯帳號
       email_awaiting_confirmation: "我們已經將啟用連結寄到 %{unconfirmed_email} 給你. 在你使用該連結啟用新的位址之前, 我們還會繼續使用你原來的位址, 也就是 %{email}."
       export_data: 資料匯出
+      following: 追蹤設定
       getting_started: 新使用者偏好設定
       liked: "...當有人對你的貼文說讚時?"
       mentioned: "...當貼文中點到你時?"
@@ -927,6 +930,8 @@ 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.ro.yml

@@ -61,7 +61,7 @@ ro:
       prefixFromNow: "in timp de"
       seconds: "mai putin de un minut"
       suffixAgo: ""
-      suffixFromNow: ""
+      suffixFromNow: "in urma"
       year: "un an"
       years: "%d ani"
     videos: