updated 28 locale files [ci skip]

28 files changed, 264 insertions, 172 deletions

diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 7f3dbd4e9..dff43e5f7 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -224,7 +224,7 @@ hu:
   back: "Vissza"
   blocks:
     create:
-      failure: "Nem tudtam figyelmen kívül hagyni azt a felhasználót. #elkerülés"
+      failure: "Nem sikerült figyelmen kívül hagyni a felhasználót. #megkerülés"
       success: "Többet nem látod azt a felhasználót a hírfolyamban. #némítás!"
     destroy:
       failure: "Nem tudtam kikapcsolni annak a felhasználónak a figyelmen kívül hagyását. #elkerülés"
@@ -588,7 +588,7 @@ hu:
       return_to_aspects: "Menj vissza a csoportokhoz"
       see_all: "Összes"
       start_sharing: "Megosztás indítása"
-      to_accept_or_ignore: "hogy elfogadd vagy elutasítsd."
+      to_accept_or_ignore: "hogy elfogadd vagy figyelmen kívül hagyd."
     sub_header:
       add_some: "adj hozzá néhányat"
       edit: "szerkesztés"
@@ -709,7 +709,7 @@ hu:
       sent: "%{name} megosztásra kért(ek) fel. A következő belépésük alkalmával láthatják a megosztásaid."
     destroy:
       error: "Kérlek válassz egy csoportot!"
-      ignore: "Elutasított kapcsolati felkérés."
+      ignore: "Kapcsolati felkérés figyelmen kívül hagyva."
       success: "Mostantól ismerősök vagytok."
     helper:
       new_requests:
@@ -847,7 +847,7 @@ hu:
       dislike: "Nem tetszik"
       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?"
+      ignore_user_description: "A felhasználó mellőzése és eltávolítása az összes csoportból?"
       like: "Tetszik"
       nsfw: "Ez a bejegyzés \"nem biztonságos\" jelölést kapott a szerzőjétől. %{link}"
       shared_with: "Megosztva vele: %{aspect_names}"
diff --git a/config/locales/diaspora/ia.yml b/config/locales/diaspora/ia.yml
index 322a32e17..776539762 100644
--- a/config/locales/diaspora/ia.yml
+++ b/config/locales/diaspora/ia.yml
@@ -165,6 +165,80 @@ ia:
     zero: "nulle aspecto"
   back: "Retornar"
   cancel: "Cancellar"
+  comments:
+    few: "%{count} commentos"
+    many: "%{count} commentos"
+    new_comment:
+      comment: "Commentar"
+      commenting: "Commenta…"
+    one: "1 commento"
+    other: "%{count} commentos"
+    two: "%{count} commentos"
+    zero: "nulle commento"
+  contacts:
+    create:
+      failure: "Creation de contacto fallite"
+    few: "%{count} contactos"
+    index:
+      add_a_new_aspect: "Adder un nove aspecto"
+      add_to_aspect: "adder contactos a %{name}"
+      add_to_aspect_link: "adder contactos a %{name}"
+      all_contacts: "Tote le contactos"
+      community_spotlight: "Usatores in evidentia"
+      many_people_are_you_sure: "Es tu secur de voler initiar un conversation private con plus de %{suggested_limit} contactos? Publicar un message in iste aspecto pote esser un melior maniera de contactar les."
+      my_contacts: "Mi contactos"
+      no_contacts: "Il pare que tu debe adder alcun contactos!"
+      no_contacts_message: "Visita %{community_spotlight}"
+      no_contacts_message_with_aspect: "Visita %{community_spotlight} o %{add_to_aspect_link}"
+      only_sharing_with_me: "Solmente qui divide con me"
+      remove_person_from_aspect: "Remover %{person_name} de \"%{aspect_name}\""
+      start_a_conversation: "Initiar un conversation"
+      title: "Contactos"
+      your_contacts: "Tu contactos"
+    many: "%{count} contactos"
+    one: "1 contacto"
+    other: "%{count} contactos"
+    sharing:
+      people_sharing: "Personas qui divide con te:"
+    spotlight:
+      community_spotlight: "Usatores in evidentia"
+    two: "%{count} contactos"
+    zero: "contactos"
+  conversations:
+    create:
+      fail: "Message invalide"
+      sent: "Message inviate"
+    destroy:
+      success: "Conversation removite con successo"
+    helper:
+      new_messages:
+        human: "Nulle nove message"
+        po: "1 nove message"
+        yml: "%{count} nove messages"
+    index:
+      create_a_new_message: "crear un nove message"
+      inbox: "Cassa de entrata"
+      message_inbox: "Cassa de entrata de messages"
+      new_message: "Nove message"
+      no_conversation_selected: "nulle conversation seligite"
+      no_messages: "nulle message"
+    new:
+      abandon_changes: "Abandonar modificationes?"
+      send: "Inviar"
+      sending: "Invia…"
+      subject: "subjecto"
+      to: "a"
+    new_message:
+      fail: "Message invalide"
+    show:
+      delete: "deler e blocar conversation"
+      reply: "responder"
+      replying: "Responde…"
+  date:
+    formats:
+      birthday: "le %d de %B"
+      birthday_with_year: "le %d de %B %Y"
+      fullmonth_day: "le %d de %B"
   delete: "Deler"
   email: "E-mail"
   error_messages:
@@ -174,10 +248,141 @@ ia:
   fill_me_out: "Plena me"
   find_people: "Cercar personas o #etiquettas"
   hide: "Celar"
+  invitations:
+    a_facebook_user: "Un usator de Facebook"
+    check_token:
+      not_found: "Indicio de invitation non trovate"
+    create:
+      already_contacts: "Tu es jam connectite con iste persona."
+      already_sent: "Tu ha jam invitate iste persona."
+      no_more: "Tu non ha altere invitationes."
+      own_address: "Non es possibile inviar un invitation a tu proprie adresse."
+      rejected: "Le sequente adresses de e-mail habeva problemas: "
+      sent: "Invitationes ha essite inviate a: "
+    edit:
+      accept_your_invitation: "Acceptar tu invitation"
+      your_account_awaits: "Un conto te attende!"
+    new:
+      already_invited: "Le sequente personas non ha acceptate tu invitation:"
+      aspect: "Aspecto"
+      check_out_diaspora: "Discoperi Diaspora!"
+      if_they_accept_info: "si iste persona accepta, illa essera addite al aspecto in le qual tu la invitava."
+      invite_someone_to_join: "Invita qualcuno a unir se a Diaspora!"
+      language: "Lingua"
+      personal_message: "Message personal"
+      resend: "Reinviar"
+      send_an_invitation: "Inviar un invitation"
+      send_invitation: "Inviar invitation"
+      to: "A"
+  layouts:
+    application:
+      back_to_top: "Initio del pagina"
+      powered_by: "ACTIONATE PER DIASPORA*"
+      public_feed: "Fluxo public de Diaspora pro %{name}"
+      toggle: "(dis)activar mobile"
+      whats_new: "que es nove?"
+      your_aspects: "tu aspectos"
+    header:
+      admin: "admin"
+      blog: "blog"
+      code: "codice"
+      login: "aperir session"
+      logout: "Clauder session"
+      profile: "Profilo"
+      recent_notifications: "Notificationes recente"
+      settings: "Configuration"
+      view_all: "Vider totes"
+  likes:
+    likes:
+      people_dislike_this:
+        human: "nulle antipathia"
+        po: "%{count} antipathia"
+        yml: "%{count} antipathias"
+      people_like_this:
+        human: "nulle appreciation"
+        po: "%{count} appreciation"
+        yml: "%{count} appreciationes"
+      people_like_this_comment:
+        human: "nulle appreciation"
+        po: "%{count} appreciation"
+        yml: "%{count} appreciationes"
   limited: "Limitate"
   more: "Plus"
   next: "sequente"
   no_results: "Nulle resultato trovate"
+  notifications:
+    also_commented:
+      human: "%{actors} commentava anque le %{post_link} de %{post_author}."
+      po: "%{actors} commentava anque le %{post_link} de %{post_author}."
+      yml: "%{actors} commentava anque le %{post_link} de %{post_author}."
+    also_commented_deleted:
+      human: "%{actors} commentava un entrata delite."
+      po: "%{actors} commentava un entrata delite."
+      yml: "%{actors} commentava un entrata delite."
+    comment_on_post:
+      human: "%{actors} commentava tu %{post_link}."
+      po: "%{actors} commentava tu %{post_link}."
+      yml: "%{actors} commentava tu %{post_link}."
+    helper:
+      new_notifications:
+        human: "Nulle nove notification"
+        po: "1 nove notification"
+        yml: "%{count} nove notificationes"
+    index:
+      and: "e"
+      and_others:
+        human: "e nemo altere"
+        po: "e un altere"
+        yml: "e %{count} alteres"
+      mark_all_as_read: "Marcar totes como legite"
+      notifications: "Notificationes"
+    liked:
+      human: "%{actors} ha appreciate tu %{post_link}."
+      po: "%{actors} ha appreciate tu %{post_link}."
+      yml: "%{actors} ha appreciate tu %{post_link}."
+    liked_post_deleted:
+      human: "%{actors} appreciava tu entrata delite."
+      po: "%{actors} appreciava tu entrata delite."
+      yml: "%{actors} appreciava tu entrata delite."
+    mentioned:
+      human: "%{actors} te ha mentionate in un %{post_link}."
+      po: "%{actors} te ha mentionate in un %{post_link}."
+      yml: "%{actors} te ha mentionate in un %{post_link}."
+    mentioned_deleted:
+      human: "%{actors} te mentionava in un entrata delite."
+      po: "%{actors} te mentionava in un entrata delite."
+      yml: "%{actors} te mentionava in un entrata delite."
+    post: "entrata"
+    private_message:
+      human: "%{actors} te inviava un message."
+      po: "%{actors} te inviava un message."
+      yml: "%{actors} te inviava un message."
+    reshared:
+      human: "%{actors} ha repetite tu %{post_link}."
+      po: "%{actors} ha repetite tu %{post_link}."
+      yml: "%{actors} ha repetite tu %{post_link}."
+    reshared_post_deleted:
+      human: "%{actors} repeteva tu entrata delite."
+      po: "%{actors} repeteva tu entrata delite."
+      yml: "%{actors} repeteva tu entrata delite."
+    started_sharing:
+      human: "%{actors} comenciava a divider con te."
+      po: "%{actors} comenciava a divider con te."
+      yml: "%{actors} comenciava a divider con te."
+  notifier:
+    a_post_you_shared: "un entrata."
+    click_here: "clicca hic"
+    email_sent_by_diaspora: "Iste message ha essite inviate per %{pod_name}. Si tu non vole reciper altere e-mail como iste,"
+    hello: "Salute %{name}!"
+    single_admin:
+      admin: "Tu administrator de Diaspora"
+      subject: "Un message concernente tu conto de Diaspora:"
+    started_sharing:
+      sharing: "ha comenciate a divider con te!"
+      subject: "%{name} comenciava a divider con te in Diaspora*"
+      view_profile: "Vider le profilo de %{name}"
+    thanks: "Gratias,"
+    to_change_your_notification_settings: "pro cambiar tu configuration de notificationes"
   ok: "OK"
   or: "o"
   password: "Contrasigno"
@@ -187,6 +392,10 @@ ia:
   privacy_policy: "Politica de confidentialitate"
   profile: "Profilo"
   public: "Public"
+  reactions:
+    human: "0 responsas"
+    po: "1 responsa"
+    yml: "%{count} responsas"
   search: "Cercar"
   settings: "Configuration"
   terms_and_conditions: "Terminos e conditiones"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index d8f4dd377..8f8031232 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -81,7 +81,7 @@ pt-BR:
       add_invites: "enviar convites"
       email_to: "Email para convite"
       users:
-        one: "%{count} usuários encontrados"
+        one: "%{count} usuário encontrado"
         other: "%{count} usuários encontrados"
         zero: "%{count} usuário encontrado."
       you_currently: "você atualmente tem %{user_invitation} convites para enviar %{link}"
@@ -390,7 +390,7 @@ pt-BR:
         one: "1 não curtiu."
         other: "%{count} não curtiram."
         two: "%{count} não curtiram"
-        zero: "ninguém curtiu."
+        zero: "ninguém não curtiu."
       people_like_this:
         few: "%{count} curtiram"
         many: "%{count} curtiram"
@@ -414,21 +414,21 @@ pt-BR:
       few: "%{actors} também comentou sobre %{post_author}'s %{post_link}."
       many: "%{actors} também comentou sobre %{post_author}'s %{post_link}."
       one: "%{actors} também comentou sobre %{post_author}'s %{post_link}."
-      other: "%{actors} também comentou sobre %{post_author}'s %{post_link}."
+      other: "%{actors} também comentaram sobre %{post_author}'s %{post_link}."
       two: "%{actors} também comentou em %{post_author}'s %{post_link}."
       zero: "%{actors} também comentou sobre %{post_author}'s %{post_link}."
     also_commented_deleted:
       few: "%{actors}, comentou em uma postagem deletada."
       many: "%{actors}, comentou em uma postagem deletada."
       one: "%{actors}, comentou em uma postagem deletada."
-      other: "%{actors}, comentou em uma postagem deletada."
+      other: "%{actors}, comentaram em uma postagem deletada."
       two: "%{actors} comentou em uma postagem deletada."
       zero: "%{actors}, comentou em uma postagem deletada."
     comment_on_post:
       few: "%{actors}, comentou sua postagem %{post_link}."
       many: "%{actors}, comentou sua postagem %{post_link}."
       one: "%{actors}, comentou sua postagem %{post_link}."
-      other: "%{actors}, comentou sua postagem %{post_link}."
+      other: "%{actors}, comentaram sua postagem %{post_link}."
       two: "%{actors} comentou em seu %{post_link}."
       zero: "%{actors}, comentou sua postagem %{post_link}."
     helper:
@@ -457,12 +457,12 @@ pt-BR:
       one: "%{actors} curtiu sua postagem %{post_link}."
       other: "%{actors} curtiram sua postagem %{post_link}."
       two: "%{actors} acabou de curtir o seu %{post_link}."
-      zero: "%{actors} curtiram sua postagem %{post_link}."
+      zero: "%{actors} curtiu sua postagem %{post_link}."
     liked_post_deleted:
       few: "%{actors}, curtiu sua postagem deletada."
       many: "%{actors}, curtiu sua postagem deletada."
       one: "%{actors}, curtiu sua postagem deletada."
-      other: "%{actors}, curtiu sua postagem deletada."
+      other: "%{actors}, curtiram sua postagem deletada."
       two: "%{actors} gostaram da sua postagem deletada."
       zero: "%{actors}, curtiu sua postagem deletada."
     mentioned:
@@ -471,12 +471,12 @@ pt-BR:
       one: "%{actors} mencionou você em %{post_link}."
       other: "%{actors} mencionaram você em %{post_link}."
       two: "%{actors} mencionou você em um %{post_link}."
-      zero: "%{actors} mencionaram você em %{post_link}."
+      zero: "%{actors} mencionou você em %{post_link}."
     mentioned_deleted:
       few: "%{actors} mencionou você numa postagem deletada."
       many: "%{actors} mencionou você numa postagem deletada."
       one: "%{actors} mencionou você numa postagem deletada."
-      other: "%{actors} mencionou você numa postagem deletada."
+      other: "%{actors} mencionaram você numa postagem deletada."
       two: "%{actors} mencionaram você em uma postagem apagada."
       zero: "%{actors} mencionou você numa postagem deletada."
     post: "postagem"
@@ -491,14 +491,14 @@ pt-BR:
       few: "%{actors} compartilhou o seu %{post_link}."
       many: "%{actors} compartilhou o seu %{post_link}."
       one: "%{actors}, compartilhou o seu %{post_link}."
-      other: "%{actors} compartilhou o seu %{post_link}."
+      other: "%{actors} compartilharam o seu %{post_link}."
       two: "%{actors} compartilhou seu %{post_link}."
       zero: "%{actors} compartilhou o seu %{post_link}."
     reshared_post_deleted:
       few: "%{actors}, compartilhou sua postagem deletada."
       many: "%{actors}, compartilhou sua postagem deletada."
       one: "%{actors}, compartilhou sua postagem deletada."
-      other: "%{actors}, compartilhou sua postagem deletada."
+      other: "%{actors}, compartilharam sua postagem deletada."
       two: "%{actors} recompartilharam sua postagem deletada."
       zero: "%{actors}, compartilhou sua postagem deletada."
     started_sharing:
@@ -663,10 +663,10 @@ pt-BR:
       photos_by:
         few: "%{count} photos by %{author}"
         many: "%{count} photos by %{author}"
-        one: "One photo by %{author}"
-        other: "%{count} photos by %{author}"
+        one: "Uma foto de %{author}"
+        other: "%{count} fotos de %{author}"
         two: "Two photos by %{author}"
-        zero: "No photos by %{author}"
+        zero: "Não há fotos de %{author}"
       reshare_by: "Recompartilhado por %{author}"
   previous: "Anterior"
   privacy: "Privacidade"
@@ -720,7 +720,7 @@ pt-BR:
       diaspora: "<3 Diaspora*"
       email: "E-MAIL"
       enter_email: "Digite teu email"
-      enter_password: "Digite tua senha"
+      enter_password: "Digite a senha (seis caracteres no mínimo)"
       enter_password_again: "Digite novamente a tua senha"
       enter_username: "Escolha um nome de usuário (use somente letras, números e sublinhados)"
       hey_make: "HEY,<br/>FAÇA<br/>ALGO."
@@ -995,7 +995,7 @@ pt-BR:
         no_turning_back: "Atualmente, não tem volta."
         what_we_delete: "Vamos deletar todos os seus posts e informações do perfil assim que possível. Seus comentários ainda ficarão, mas serão associados ao seu Diaspora Handle."
       close_account_text: "Cancelar Conta"
-      comment_on_post: "...alguém comentou em sua postagem?"
+      comment_on_post: "...alguém comentar em sua postagem?"
       current_password: "Senha Atual"
       current_password_expl: "o que você usa atualmente..."
       download_photos: "Baixar minhas fotos"
@@ -1014,7 +1014,7 @@ pt-BR:
       reshared: "...alguém compartilhar a sua postagem?"
       show_community_spotlight: "Mostrar foco de comunidade no seu Fluxo?"
       show_getting_started: "Reativar Introdução"
-      started_sharing: "...alguém começou a compartilhar com você?"
+      started_sharing: "...alguém começar a compartilhar com você?"
       stream_preferences: "Preferências de Fluxos"
       your_email: "Seu Email"
       your_handle: "Seu Diaspora ID"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 1302daea5..06debf11a 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -272,7 +272,7 @@ sk:
       no_contacts: "Zdá sa, že potrebuješ pridať pár kontaktov!"
       no_contacts_message: "Pozri si %{community_spotlight}"
       no_contacts_message_with_aspect: "Pozri si %{community_spotlight} alebo %{add_to_aspect_link}"
-      only_sharing_with_me: "Tí, ktorí majú v kontaktoch iba mňa"
+      only_sharing_with_me: "Ľudia, ktorí majú v kontaktoch iba mňa"
       remove_person_from_aspect: "Odstrániť použ. %{person_name} z kategórie %{aspect_name}"
       start_a_conversation: "Začať rozhovor"
       title: "Kontakty"
@@ -488,7 +488,7 @@ sk:
   notifier:
     a_post_you_shared: "príspevok."
     accept_invite: "Prijmi svoju pozvánku na Diasporu!"
-    click_here: "Klikni sem"
+    click_here: "klikni sem"
     comment_on_post:
       reply: "Zobraziť príspevok použ. %{name} alebo naň odpovedať >"
     confirm_email:
@@ -532,7 +532,7 @@ sk:
       subject: "%{name} si ťa pridal(a) do kontaktov na Diaspore*"
       view_profile: "Zobraziť profil použ. %{name}"
     thanks: "Vďaka,"
-    to_change_your_notification_settings: "ak chceš zmeniť nastavenie oznamov"
+    to_change_your_notification_settings: "a budeš môcť zmeniť nastavenia oznamov"
   nsfw: "Nevhodné v práci"
   ok: "OK"
   or: "alebo"
@@ -787,10 +787,10 @@ sk:
     aspect_dropdown:
       add_to_aspect: "Pridať kontakt"
       toggle:
-        few: "V %{count} kategóriách"
+        few: "V(o) %{count} kategóriách"
         one: "V %{count} kategórii"
         other: "V(o) %{count} kategóriách"
-        zero: "Pridajte kontakt"
+        zero: "Pridať kontakt"
     contact_list:
       all_contacts: "Všetky kontakty"
     footer:
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 713e7da38..7cd36c1ba 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -381,6 +381,7 @@ sl:
       back_to_top: "Na vrh"
       powered_by: "STRAN POGANJA DIASPORA*"
       public_feed: "Javni vir Diaspore za %{name}"
+      source_package: ""
       toggle: "preklop mobilne strani"
       whats_new: "kaj je novega?"
       your_aspects: "vaši vidiki"
diff --git a/config/locales/diaspora/vi.yml b/config/locales/diaspora/vi.yml
index 6d77838ba..d828eb1c4 100644
--- a/config/locales/diaspora/vi.yml
+++ b/config/locales/diaspora/vi.yml
@@ -147,7 +147,7 @@ vi:
         find_a_bug: "... tìm thấy lỗi %{link}?"
         have_a_question: "... có một %{link}?"
         here_to_help: "Cộng đồng Diaspora!"
-        need_help: "Cần giúp đỡ?"
+        need_help: "Trợ giúp"
         tag_bug: "#bug"
         tag_feature: "#feature"
         tag_question: "#question"
@@ -158,7 +158,7 @@ vi:
       new_here:
         follow: "Theo dõi %{link} và chào đón người dùng mới đến với Diaspora*!"
         learn_more: "Tìm hiểu thêm"
-        title: "Chào mừng người dùng mới"
+        title: "Chào đón người dùng mới"
       no_contacts: "Không có liên lạc"
       no_tags: "+ Tìm thẻ để theo dõi"
       people_sharing_with_you: "Đang chia sẻ với bạn"
@@ -179,7 +179,7 @@ vi:
     no_contacts_message:
       community_spotlight: "nổi bật từ cộng đồng"
       or_spotlight: "Hoặc bạn có thể chia sẻ với %{link}"
-      try_adding_some_more_contacts: "Bạn có thể tìm kiếm hoặc mời thêm bạn."
+      try_adding_some_more_contacts: "Bạn có thể tìm hoặc mời thêm bạn."
       you_should_add_some_more_contacts: "Bạn có thể thêm một vài liên lạc!"
     no_posts_message:
       start_talking: "Chưa có ai nói gì!"
@@ -289,7 +289,7 @@ vi:
       send: "Gửi"
       sending: "Đang gửi..."
       subject: "tựa đề"
-      to: "đến"
+      to: "người nhận"
     new_message:
       fail: "Tin nhắn không hợp lệ"
     show:
@@ -491,7 +491,7 @@ vi:
   ok: "OK"
   or: "hoặc"
   password: "Mật khẩu"
-  password_confirmation: "Xác nhận mật khẩu"
+  password_confirmation: "Xác nhận mật khẩu mới"
   people:
     add_contact:
       invited_by: "bạn được mời bởi"
@@ -603,7 +603,7 @@ vi:
   profile: "Hồ sơ"
   profiles:
     edit:
-      allow_search: "Cho phép người khác trong Diaspora tìm thấy bạn"
+      allow_search: "Cho phép người khác trong Diaspora tìm thấy tôi"
       edit_profile: "Chỉnh sửa hồ sơ"
       first_name: "Tên"
       last_name: "Họ"
@@ -682,7 +682,7 @@ vi:
       reshare_original: "Chia sẻ lại bài gốc"
       reshared_via: "chia sẻ lại bởi"
       show_original: "Hiện bài đăng gốc"
-  search: "Tìm"
+  search: "Tìm kiếm"
   services:
     create:
       already_authorized: "Một người dùng với id diaspora %{diaspora_id} đã xác thực với tài khoản %{service_name}."
@@ -747,6 +747,7 @@ vi:
       atom_feed: "Nguồn tin"
       logged_in: "đã đăng nhập vào %{service}"
       manage: "quản lí các dịch vụ đã được kết nối"
+      new_user_welcome_message: "Sử dụng dấu thăng (#hashtags) để phân loại bài đăng và tìm người dùng khác."
       share: "Chia sẻ"
       title: "Cài đặt các dịch vụ đã được kết nối"
       visibility_dropdown: "Dùng nút thả xuống này để ẩn/hiện bài đăng của bạn.  (Bạn nên công khai bài đăng đầu tiên.)"
@@ -822,9 +823,10 @@ vi:
     like_stream:
       contacts_title: "Những người có bài đăng mà bạn thích"
       title: "Luồng thích"
+    mentioned_stream: "@Nhắc đến tôi"
     mentions:
       contacts_title: "Người đã nhắc đến bạn"
-      title: "Tin của bạn"
+      title: "@Nhắc đến tôi"
     multi:
       contacts_title: "Người trong luồng của bạn"
       title: "Luồng"
@@ -876,14 +878,14 @@ vi:
       success: "Tài khoản của bạn đã bị khoá. Có thể mất 20 phút để đóng tài khoản của bạn. Cám ơn vì đã dùng Diaspora."
       wrong_password: "Mật khẩu đã nhập không khớp với mật khẩu hiện tại."
     edit:
-      also_commented: "...ai đó bình luận vào bài đăng trong liên lạc của bạn?"
+      also_commented: "...có người bình luận vào bài đăng của người quen?"
       auto_follow_aspect: "Đặt người đó vào mối quan hệ:"
       auto_follow_back: "Tự động theo dõi lại người theo dõi bạn"
       change: "Thay đổi"
       change_email: "Đổi địa chỉ thư điện tử"
       change_language: "Đổi ngôn ngữ"
       change_password: "Đổi mật khẩu"
-      character_minimum_expl: "ít nhất phải có sáu kí tự"
+      character_minimum_expl: "ít nhất sáu kí tự"
       close_account:
         dont_go: "Đừng đi!"
         if_you_want_this: "Nếu bạn muốn, nhập mật khẩu và nhấn 'Đóng tài khoản'"
@@ -891,7 +893,7 @@ vi:
         make_diaspora_better: "Chúng tôi muốn bạn cùng phát triển Diaspora tốt hơn, vì vậy bạn nên giúp đỡ thay vì rời đi. Nếu bạn không muốn ở lại, chúng tôi muốn biết chuyện gì sẽ xảy ra tiếp theo."
         what_we_delete: "We delete all of your posts, profile data, as soon as humanly possible. Your comments will hang around, but be associated with your Diaspora Handle."
       close_account_text: "Đóng tài khoản"
-      comment_on_post: "...ai đó bình luận vào bài đăng của bạn?"
+      comment_on_post: "...có người bình luận vào bài đăng của tôi?"
       current_password: "Mật khẩu hiện tại"
       current_password_expl: "bạn dùng để đăng nhập..."
       download_photos: "tải ảnh của tôi"
@@ -901,18 +903,18 @@ vi:
       export_data: "Xuất dữ liệu"
       following: "Thiết lập theo dõi"
       getting_started: "Tuỳ chỉnh người dùng mới"
-      liked: "...ai đó thích bài đăng của bạn?"
+      liked: "...có người thích bài đăng của tôi?"
       mentioned: "...bạn được nhắc đến trong một bài đăng?"
       new_password: "Mật khẩu mới"
       photo_export_unavailable: "Chức năng xuất ảnh hiện chưa hoạt động"
       private_message: "...bạn nhận được một tin nhắn cá nhân?"
       receive_email_notifications: "Nhận thư điện tử thông báo khi..."
-      reshared: "...ai đó chia sẻ lại tin của bạn?"
+      reshared: "...có người chia sẻ lại bài đăng của tôi?"
       show_community_spotlight: "Hiện những tin từ cộng đồng?"
       show_getting_started: "Bật lại hướng dẫn cho người dùng mới"
-      started_sharing: "...ai đó bắt đầu chia sẻ với bạn?"
+      started_sharing: "...có người bắt đầu chia sẻ với tôi?"
       stream_preferences: "Tuỳ chỉnh luồng"
-      your_email: "Thư điện tử của bạn"
+      your_email: "Thư điện tử"
       your_handle: "ID Diaspora của bạn"
     getting_started:
       awesome_take_me_to_diaspora: "Tuyệt vời! Đưa tối đến Diaspora*"
@@ -940,8 +942,8 @@ vi:
       password_not_changed: "Đổi mật khẩu thất bại"
       settings_not_updated: "Cập nhật thiết lập thất bại"
       settings_updated: "Đã cập nhật thiết lập"
-      unconfirmed_email_changed: "Đã đổi thư điện tử. Cần kích hoạt ngay."
-      unconfirmed_email_not_changed: "Đổi thư điện tử thất bại"
+      unconfirmed_email_changed: "Đã đổi địa chỉ thư điện tử. Cần kích hoạt ngay."
+      unconfirmed_email_not_changed: "Đổi địa chỉ thư điện tử thất bại"
   welcome: "Chào mừng!"
   will_paginate:
     next_label: "sau &raquo;"
diff --git a/config/locales/javascript/javascript.br.yml b/config/locales/javascript/javascript.br.yml
index 21338d64a..8a86e838d 100644
--- a/config/locales/javascript/javascript.br.yml
+++ b/config/locales/javascript/javascript.br.yml
@@ -65,29 +65,20 @@ br:
       hide_nsfw_posts: "Kuzhat ar c'hemennadennoù #nsfw"
       like: "Plijout a ra din"
       likes:
-        few: "<%= count %> Likes"
-        many: "<%= count %> Likes"
         one: "<%= count %> Plijet"
         other: "<%= count %> Plijet"
-        two: "<%= count %> Likes"
         zero: "<%= count %> Plijet"
       limited: "Bevennet"
       more_comments:
-        few: "Show <%= count %> more comments"
-        many: "Show <%= count %> more comments"
         one: "Diskwel <%= count %> evezhiadenn ouzhpenn"
         other: "Diskwel <%= count %> evezhiadenn ouzhpenn"
-        two: "Show <%= count %> more comments"
         zero: "Diskwel <%= count %> evezhiadenn ouzhpenn"
       original_post_deleted: "Dilamet eo bet ar gemennadenn orin gant hec'h aozer."
       public: "Boutin"
       reshare: "Rannañ en-dro"
       reshares:
-        few: "<%= count %> Reshares"
-        many: "<%= count %> Reshares"
         one: "<%= count %> Adrannerezh"
         other: "<%= count %> Adrannerezh"
-        two: "<%= count %> Reshares"
         zero: "<%= count %> Adrannerezh"
       show_nsfw_post: "Diskouez ar gemennadenn"
       show_nsfw_posts: "Diskouez pep tra"
diff --git a/config/locales/javascript/javascript.el.yml b/config/locales/javascript/javascript.el.yml
index d1c2ce063..09182ca5b 100644
--- a/config/locales/javascript/javascript.el.yml
+++ b/config/locales/javascript/javascript.el.yml
@@ -14,11 +14,8 @@ el:
       started_sharing_with: "Ξεκινήσατε να διαμοιράζεστε με τον χρήστη <%= name %>!"
       stopped_sharing_with: "Σταματήσατε να διαμοιράζεστε με τον χρήστη <%= name %>."
       toggle:
-        few: "Σε {{count}} πτυχές"
-        many: "Σε {{count}} πτυχές"
         one: "Σε <%= count %> πτυχή"
         other: "Σε <%= count %> πτυχές"
-        two: "Σε {{count}} πτυχές"
         zero: "Επιλέξτε πτυχές"
     aspect_navigation:
       deselect_all: "Εξαίρεση όλων"
@@ -51,6 +48,7 @@ el:
       settings: "Ρυθμίσεις"
       view_all: "Προβολή όλων"
     ignore: "Αγνόησε"
+    ignore_user: "Να αγνοηθεί αυτός ο χρήστης;"
     infinite_scroll:
       no_more: "Δεν υπάρχουν άλλες δημοσιεύσεις."
     my_activity: "Η δραστηριότητα μου"
@@ -76,29 +74,20 @@ el:
       hide_nsfw_posts: "Απόκριψη των \"μη ασφαλών για εργασία\" δημοσιεύσεων"
       like: "Μου αρέσει"
       likes:
-        few: "<%= count %> Likes"
-        many: "<%= count %> Likes"
         one: "<%= count %> Μου αρέσει"
         other: "<%= count %> Μου αρέσει"
-        two: "<%= count %> Likes"
         zero: "<%= count %> Μου αρέσει"
       limited: "Περιορισμένο"
       more_comments:
-        few: "Show <%= count %> more comments"
-        many: "Show <%= count %> more comments"
         one: "Δες <%= count %> περισσότερα σχόλια"
         other: "Δες <%= count %> περισσότερα σχόλια"
-        two: "Show <%= count %> more comments"
         zero: "Δες <%= count %> περισσότερα σχόλια"
       original_post_deleted: "Η αρχική δημοσίευση διαγράφτηκε από τον δημιουργό της."
       public: "Δημόσιο"
       reshare: "ξαναμοίρασε"
       reshares:
-        few: "<%= count %> Reshares"
-        many: "<%= count %> Reshares"
         one: "<%= count %> Αναδημοσίευση"
         other: "<%= count %> Αναδημοσίευση"
-        two: "<%= count %> Reshares"
         zero: "<%= count %> Αναδημοσίευση"
       show_nsfw_post: "Προβολή δημοσίευσης"
       show_nsfw_posts: "Προβολή όλων"
diff --git a/config/locales/javascript/javascript.es-MX.yml b/config/locales/javascript/javascript.es-MX.yml
index 85fe6b115..9c44ae181 100644
--- a/config/locales/javascript/javascript.es-MX.yml
+++ b/config/locales/javascript/javascript.es-MX.yml
@@ -48,6 +48,7 @@ es-MX:
       settings: "Preferencias"
       view_all: "Ver todo"
     ignore: "Ignorar"
+    ignore_user: "¿Ignorar a este usuario?"
     infinite_scroll:
       no_more: "No hay más publicaciones."
     my_activity: "Mi actividad"
diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml
index e01864a5b..93c1f8d35 100644
--- a/config/locales/javascript/javascript.es.yml
+++ b/config/locales/javascript/javascript.es.yml
@@ -14,11 +14,8 @@ es:
       started_sharing_with: "¡Has empezado a compartir con <%= name %>!"
       stopped_sharing_with: "Ya no compartes más con <%= name %>."
       toggle:
-        few: "En <%= count %> aspectos"
-        many: "En <%= count %> aspectos"
         one: "En <%= count %> aspecto"
         other: "En <%= count %> aspectos"
-        two: "En <%= count %> aspectos"
         zero: "Elige los aspectos"
     aspect_navigation:
       deselect_all: "Desmarcar todos"
@@ -51,6 +48,7 @@ es:
       settings: "Ajustes"
       view_all: "Ver todo"
     ignore: "Ignorar"
+    ignore_user: "¿Ignorar a este usuario?"
     infinite_scroll:
       no_more: "No hay más publicaciones."
     my_activity: "Mi Actividad"
diff --git a/config/locales/javascript/javascript.eu.yml b/config/locales/javascript/javascript.eu.yml
index 03796b460..9ecc36456 100644
--- a/config/locales/javascript/javascript.eu.yml
+++ b/config/locales/javascript/javascript.eu.yml
@@ -14,11 +14,8 @@ eu:
       started_sharing_with: "<%= name %>(r)ekin harremanetan hasi zara!"
       stopped_sharing_with: "Jada ez zaude <%= name %>(r)ekin harremanetan."
       toggle:
-        few: "<%= count %> arlotan"
-        many: "<%= count %> arlotan"
         one: "Arlo <%= count %>ean"
         other: "<%= count %> arlotan"
-        two: "<%= count %> arlotan"
         zero: "Arloak hautatu"
     aspect_navigation:
       deselect_all: "Guztiak deshautatu"
diff --git a/config/locales/javascript/javascript.fr.yml b/config/locales/javascript/javascript.fr.yml
index 147496e24..620540b4c 100644
--- a/config/locales/javascript/javascript.fr.yml
+++ b/config/locales/javascript/javascript.fr.yml
@@ -84,11 +84,8 @@ fr:
         zero: "<%= count %> J'aime"
       limited: "Limité"
       more_comments:
-        few: "Montrer <%= count %> commentaires en plus"
-        many: "Montrer <%= count %> commentaires en plus"
         one: "Montrer <%= count %> commentaire supplémentaire"
         other: "Montrer <%= count %> commentaires supplémentaires"
-        two: "Montrer <%= count %> commentaires en plus"
         zero: "Montrer <%= count %> commentaires supplémentaires"
       original_post_deleted: "Le message original a été effacé par son auteur."
       public: "Public"
diff --git a/config/locales/javascript/javascript.hu.yml b/config/locales/javascript/javascript.hu.yml
index 820d1714e..fd83d6897 100644
--- a/config/locales/javascript/javascript.hu.yml
+++ b/config/locales/javascript/javascript.hu.yml
@@ -50,7 +50,8 @@ hu:
       search: "Keresés"
       settings: "Beállítások"
       view_all: "Összes"
-    ignore: "Elutasít"
+    ignore: "Mellőzés"
+    ignore_user: "Felhasználó mellőzése?"
     infinite_scroll:
       no_more: "Nincs több bejegyzés."
     my_activity: "Tevékenységeim"
@@ -76,11 +77,7 @@ hu:
       hide_nsfw_posts: "#nsfw bejegyzések rejtése"
       like: "Tetszik"
       likes:
-        few: "<%= count %> kedveli"
-        many: "<%= count %> kedveli"
-        one: "<%= count %> kedveli"
         other: "<%= count %> ember kedveli"
-        two: "<%= count %> kedveli"
         zero: "<%= count %> kedveli"
       limited: "Korlátozott"
       more_comments:
diff --git a/config/locales/javascript/javascript.id.yml b/config/locales/javascript/javascript.id.yml
index 52a406cf4..b1de63a7e 100644
--- a/config/locales/javascript/javascript.id.yml
+++ b/config/locales/javascript/javascript.id.yml
@@ -14,11 +14,7 @@ id:
       started_sharing_with: "Anda mulai berbagi dengan <%= name %> !"
       stopped_sharing_with: "Anda berhenti berbagi dengan <%= name %>"
       toggle:
-        few: "In {{count}} aspects"
-        many: "In {{count}} aspects"
-        one: "In {{count}} aspect"
         other: "Dalam <%= count %> Hal"
-        two: "In <%= count %> aspects"
         zero: "Dalam <%= count %> Hal"
     aspect_navigation:
       deselect_all: "Batalkan semua pilihan"
@@ -68,11 +64,7 @@ id:
         zero: "<%= count %> Likes"
       limited: "Terbatas"
       more_comments:
-        few: "Show <%= count %> more comments"
-        many: "Show <%= count %> more comments"
-        one: "Show <%= count %> more comment"
         other: "Tampilkan <%= count %> komentar"
-        two: "Show <%= count %> more comments"
         zero: "Tampilkan <%= count %> komentar"
       original_post_deleted: "Posting asli di hapus oleh penulis."
       public: "Publik"
diff --git a/config/locales/javascript/javascript.ko.yml b/config/locales/javascript/javascript.ko.yml
index 4265081dc..0baa6c1fb 100644
--- a/config/locales/javascript/javascript.ko.yml
+++ b/config/locales/javascript/javascript.ko.yml
@@ -84,21 +84,13 @@ ko:
         zero: "<%= count %>명이 좋아합니다"
       limited: "제한됨"
       more_comments:
-        few: "댓글 <%= count %>개 더 보기"
-        many: "댓글 <%= count %>개 더 보기"
-        one: "댓글 한 개 더 보기"
         other: "댓글 <%= count %>개 더 보기"
-        two: "댓글 <%= count %>개 더 보기"
         zero: "댓글 <%= count %>개 더 보기"
       original_post_deleted: "작성자가 원본을 지웠습니다."
       public: "공개"
       reshare: "재공유"
       reshares:
-        few: "<%= count %>명이 재공유했습니다."
-        many: "<%= count %>명이 재공유했습니다."
-        one: "한 명이 재공유했습니다."
         other: "재공유 <%= count %>번"
-        two: "<%= count %>명이 재공유했습니다"
         zero: "재공유 <%= count %>번"
       show_nsfw_post: "게시물 보기"
       show_nsfw_posts: "모두 보기"
diff --git a/config/locales/javascript/javascript.nb.yml b/config/locales/javascript/javascript.nb.yml
index fc626e5b6..cff2f3e22 100644
--- a/config/locales/javascript/javascript.nb.yml
+++ b/config/locales/javascript/javascript.nb.yml
@@ -72,29 +72,20 @@ nb:
       hide_nsfw_posts: "Gjem #nsfw-posts"
       like: "Liker"
       likes:
-        few: "<%= count %> Likes"
-        many: "<%= count %> Likes"
         one: "<%= count %> liker dette"
         other: "<%= count %> liker dette"
-        two: "<%= count %> Likes"
         zero: "<%= count %> liker dette"
       limited: "Begrenset"
       more_comments:
-        few: "Show <%= count %> more comments"
-        many: "Show <%= count %> more comments"
         one: "Vis <%= count %> kommentar til"
         other: "Vis <%= count %> komentarer til"
-        two: "Show <%= count %> more comments"
         zero: "Ikke flere kommentarer"
       original_post_deleted: "Den opprinnelige posten er slettet av forfatteren."
       public: "Offentlig"
       reshare: "Del"
       reshares:
-        few: "<%= count %> Reshares"
-        many: "<%= count %> Reshares"
         one: "<%= count %> deling"
         other: "<%= count %> delinger"
-        two: "<%= count %> Reshares"
         zero: "<%= count %> delinger"
       show_nsfw_post: "Vis innlegg"
       show_nsfw_posts: "Vis alle"
diff --git a/config/locales/javascript/javascript.nl.yml b/config/locales/javascript/javascript.nl.yml
index c0db552fe..d7dcfcd34 100644
--- a/config/locales/javascript/javascript.nl.yml
+++ b/config/locales/javascript/javascript.nl.yml
@@ -81,11 +81,8 @@ nl:
         zero: "<%= count %> mensen vinden dit leuk"
       limited: "Beperkt zichtbaar"
       more_comments:
-        few: "Toon nog <%= count %> reacties"
-        many: "Toon nog <%= count %> reacties"
         one: "Toon nog <%= count %> reactie"
         other: "Toon nog <%= count %> reacties"
-        two: "Toon nog <%= count %> reacties"
         zero: "Toon nog <%= count %> reacties"
       original_post_deleted: "Originele bericht verwijderd door de auteur."
       public: "Openbaar"
diff --git a/config/locales/javascript/javascript.nn.yml b/config/locales/javascript/javascript.nn.yml
index d45c87f91..b782a6084 100644
--- a/config/locales/javascript/javascript.nn.yml
+++ b/config/locales/javascript/javascript.nn.yml
@@ -73,29 +73,20 @@ nn:
       hide_nsfw_posts: "Gøym innlegg merka med #nsfw"
       like: "Lik"
       likes:
-        few: "<%= count %> Likes"
-        many: "<%= count %> Likes"
         one: "<%= count %> likar dette"
         other: "<%= count %> likar dette"
-        two: "<%= count %> Likes"
         zero: "<%= count %> likar dette"
       limited: "Avgrensa"
       more_comments:
-        few: "Show <%= count %> more comments"
-        many: "Show <%= count %> more comments"
         one: "Syn <%= count %> kommentar meir"
         other: "Syn <%= count %> fleire kommentarar"
-        two: "Show <%= count %> more comments"
         zero: "Syn <%= count %> fleire kommentarar"
       original_post_deleted: "Det opprinnelege innlegget er sletta av forfattaren."
       public: "Offentleg"
       reshare: "Del"
       reshares:
-        few: "<%= count %> Reshares"
-        many: "<%= count %> Reshares"
         one: "<%= count %> deling"
         other: "<%= count %> delingar"
-        two: "<%= count %> Reshares"
         zero: "<%= count %> delingar"
       show_nsfw_post: "Syn innlegg"
       show_nsfw_posts: "Syn alt"
diff --git a/config/locales/javascript/javascript.pl.yml b/config/locales/javascript/javascript.pl.yml
index 1de0dbb60..ccd28f0d9 100644
--- a/config/locales/javascript/javascript.pl.yml
+++ b/config/locales/javascript/javascript.pl.yml
@@ -85,10 +85,8 @@ pl:
       limited: "Ograniczone"
       more_comments:
         few: "Wyświetl <%= count %> komentarze więcej"
-        many: "Wyświetl <%= count %> więcej komentarzy"
         one: "Wyświetl <%= count %> komentarz więcej"
         other: "Wyświetl <%= count %> komentarzy więcej"
-        two: "Wyświetl <%= count %> komentarze więcej"
         zero: "Wyświetl <%= count %> komentarzy więcej"
       original_post_deleted: "Oryginalny wpis został usunięty przez autora."
       public: "Publiczny"
diff --git a/config/locales/javascript/javascript.pt-BR.yml b/config/locales/javascript/javascript.pt-BR.yml
index c09072b39..46352c459 100644
--- a/config/locales/javascript/javascript.pt-BR.yml
+++ b/config/locales/javascript/javascript.pt-BR.yml
@@ -48,6 +48,7 @@ pt-BR:
       settings: "Configurações"
       view_all: "Ver todas"
     ignore: "Ignorar"
+    ignore_user: "Ignorar este usuário?"
     infinite_scroll:
       no_more: "Não há mais postagem."
     my_activity: "Minhas Atividades"
@@ -73,29 +74,20 @@ pt-BR:
       hide_nsfw_posts: "Esconder posts não recomendáveis para serem visualizados no escritório."
       like: "Curtir"
       likes:
-        few: "<%= count %> Likes"
-        many: "<%= count %> Likes"
         one: "<%= count %> gostei"
         other: "<%= count %> gostei"
-        two: "<%= count %> Likes"
         zero: "<%= count %> gostei"
       limited: "Limitado"
       more_comments:
-        few: "Show <%= count %> more comments"
-        many: "Show <%= count %> more comments"
         one: "Mostre mais <%= count %> comentário"
         other: "Mostre mais <%= count %> comentários"
-        two: "Show <%= count %> more comments"
-        zero: "Mostre mais  <%= count %> comentário"
+        zero: "Mostre mais <%= count %> comentário"
       original_post_deleted: "A postagem original foi deletada pelo autor."
       public: "Público"
       reshare: "Recompartilhar"
       reshares:
-        few: "<%= count %> Reshares"
-        many: "<%= count %> Reshares"
         one: "<%= count %> Recompartilhamento"
         other: "<%= count %> Recompartilhamentos"
-        two: "<%= count %> Reshares"
         zero: "<%= count %> Recompartilhamento"
       show_nsfw_post: "Mostrar post"
       show_nsfw_posts: "Mostrar tudo"
diff --git a/config/locales/javascript/javascript.ru.yml b/config/locales/javascript/javascript.ru.yml
index 0932b335c..ff40d7a56 100644
--- a/config/locales/javascript/javascript.ru.yml
+++ b/config/locales/javascript/javascript.ru.yml
@@ -88,7 +88,6 @@ ru:
         many: "Еще <%= count %> комментариев"
         one: "Еще <%= count %> комментарий"
         other: "Еще <%= count %> комментариев"
-        two: "Остальные комментарии (<%= count %>)"
         zero: "Еще <%= count %> комментариев"
       original_post_deleted: "Исходная запись удалена автором."
       public: "Публичная"
diff --git a/config/locales/javascript/javascript.sk.yml b/config/locales/javascript/javascript.sk.yml
index c5830cb85..376894c7a 100644
--- a/config/locales/javascript/javascript.sk.yml
+++ b/config/locales/javascript/javascript.sk.yml
@@ -15,10 +15,8 @@ sk:
       stopped_sharing_with: "<%= name %> bol(a) vymazaný (-á) z tvojich kontaktov."
       toggle:
         few: "V <%= count %> kategóriách"
-        many: "V(o) <%= count %> kategóriách"
         one: "V <%= count %> kategórii"
         other: "V(o) <%= count %>kategóriách"
-        two: "V(o) <%= count %> kategóriách"
         zero: "Vyber si kategórie"
     aspect_navigation:
       deselect_all: "Odznačiť všetky"
diff --git a/config/locales/javascript/javascript.sl.yml b/config/locales/javascript/javascript.sl.yml
index 1f038a812..87194bf25 100644
--- a/config/locales/javascript/javascript.sl.yml
+++ b/config/locales/javascript/javascript.sl.yml
@@ -15,7 +15,6 @@ sl:
       stopped_sharing_with: "Prenehali ste deliti z <%= name %>."
       toggle:
         few: "V <%= count %> vidikih"
-        many: "V {{count}} pogledih"
         one: "V <%= count %> vidiku"
         other: "V <%= count %> vidikih"
         two: "V <%= count %> vidikih"
@@ -77,7 +76,6 @@ sl:
       like: "Všeč mi je"
       likes:
         few: "<%= count %> je to všeč"
-        many: "<%= count %> Likes"
         one: "<%= count %> je to všeč"
         other: "<%= count %> je to všeč"
         two: "<%= count %> je to všeč"
@@ -85,7 +83,6 @@ sl:
       limited: "Omejeno"
       more_comments:
         few: "Prikaži <%= count %> mnenja"
-        many: "Show <%= count %> more comments"
         one: "Prikaži <%= count %> mnenje"
         other: "Prikaži <%= count %> mnenj"
         two: "Prikaži <%= count %> mnenji"
@@ -95,7 +92,6 @@ sl:
       reshare: "Ponovno deli"
       reshares:
         few: "<%= count %> ponovna deljenja"
-        many: "<%= count %> Reshares"
         one: "<%= count %> ponovno deljenje"
         other: "<%= count %> ponovnih deljenj"
         two: "<%= count %> ponovni deljenji"
diff --git a/config/locales/javascript/javascript.sv.yml b/config/locales/javascript/javascript.sv.yml
index 5f9bf9709..c749632fe 100644
--- a/config/locales/javascript/javascript.sv.yml
+++ b/config/locales/javascript/javascript.sv.yml
@@ -76,19 +76,13 @@ sv:
       hide_nsfw_posts: "Dölj #nsfw-inlägg"
       like: "Gilla"
       likes:
-        few: "<%= count %> gillar"
-        many: "<%= count %> gillar"
         one: "En gillar"
         other: "<%= count %> gillar"
-        two: "<%= count %> gillar"
         zero: "Ingen gillar"
       limited: "Begränsad"
       more_comments:
-        few: "Visa <%= count %> till kommentarer"
-        many: "Visa <%= count %> till kommentarer"
         one: "Visa en kommentar till"
         other: "Visa <%= count %> kommentarer till"
-        two: "Visa <%= count %> till kommentarer"
         zero: "Visa inga fler kommentarer"
       original_post_deleted: "Det ursprungliga inlägget har blivit borttaget av författaren."
       public: "Publik"
diff --git a/config/locales/javascript/javascript.te.yml b/config/locales/javascript/javascript.te.yml
index 06cc84642..b89817f51 100644
--- a/config/locales/javascript/javascript.te.yml
+++ b/config/locales/javascript/javascript.te.yml
@@ -57,11 +57,8 @@ te:
       hide: "దాచు"
       like: "ఇష్టం"
       likes:
-        few: "<%= count %> Likes"
-        many: "<%= count %> Likes"
         one: "<%= count %> ఇష్టం"
         other: "<%= count %> ఇష్టాలు"
-        two: "<%= count %> Likes"
         zero: "<%= count %> ఇష్టాలు"
       limited: "పరిమితం"
       more_comments:
diff --git a/config/locales/javascript/javascript.tr.yml b/config/locales/javascript/javascript.tr.yml
index a89b4e29d..d21334008 100644
--- a/config/locales/javascript/javascript.tr.yml
+++ b/config/locales/javascript/javascript.tr.yml
@@ -76,29 +76,17 @@ tr:
       hide_nsfw_posts: "#nsfw gönderilerin gizle"
       like: "Beğen"
       likes:
-        few: "<%= count %> Likes"
-        many: "<%= count %> Likes"
-        one: "<%= count %> Like"
         other: "<%= count %> Beğeni"
-        two: "<%= count %> Likes"
         zero: "<%= count %> Beğeni"
       limited: "Sınırlı"
       more_comments:
-        few: "Show <%= count %> more comments"
-        many: "Show <%= count %> more comments"
-        one: "Show <%= count %> more comment"
         other: "Diğer <%= count %> yorum gör"
-        two: "Show <%= count %> more comments"
         zero: "Diğer <%= count %> yorumu gör"
       original_post_deleted: "İleti yazarı tarafından silindi."
       public: "Genel"
       reshare: "Yeniden paylaş"
       reshares:
-        few: "<%= count %> Reshares"
-        many: "<%= count %> Reshares"
-        one: "<%= count %> Reshare"
         other: "<%= count %> Yeniden paylaşma"
-        two: "<%= count %> Reshares"
         zero: "<%= count %> Yeniden paylaşma"
       show_nsfw_post: "İletiyi görüntüle"
       show_nsfw_posts: "Tümünü göster"
diff --git a/config/locales/javascript/javascript.vi.yml b/config/locales/javascript/javascript.vi.yml
index c83df2f8a..3fe9c52bf 100644
--- a/config/locales/javascript/javascript.vi.yml
+++ b/config/locales/javascript/javascript.vi.yml
@@ -57,7 +57,7 @@ vi:
       looking_good: "Ôi, trông bạn thật tuyệt!"
     publisher:
       at_least_one_aspect: "Bạn phải công khai ít nhất một mối quan hệ"
-      limited: "Giới hạn - tin của bạn được những người chỉ định nhìn thấy"
+      limited: "Giới hạn - bài đăng của bạn được những người chỉ định nhìn thấy"
       public: "Công khai - bài đăng của bạn được mọi người và máy tìm kiếm nhìn thấy"
     reshares:
       duplicate: "Bạn đã chia sẻ lại tin đó!"
diff --git a/config/locales/javascript/javascript.zh-CN.yml b/config/locales/javascript/javascript.zh-CN.yml
index 47c84a28d..8975bf1dd 100644
--- a/config/locales/javascript/javascript.zh-CN.yml
+++ b/config/locales/javascript/javascript.zh-CN.yml
@@ -14,11 +14,7 @@ zh-CN:
       started_sharing_with: "您已开始与 <%= name %> 共享内容。"
       stopped_sharing_with: "您已停止与 <%= name %> 共享内容。"
       toggle:
-        few: "在{{count}}个视图中"
-        many: "在{{count}}个视图中"
-        one: "在{{count}}个视图中"
         other: "在 <%= count %> 个分组中"
-        two: "In <%= count %> aspects"
         zero: "添加到分组"
     aspect_navigation:
       deselect_all: "清空选择"
@@ -51,6 +47,7 @@ zh-CN:
       settings: "设置"
       view_all: "查看所有"
     ignore: "忽略"
+    ignore_user: "忽略此用户？"
     infinite_scroll:
       no_more: "暂无更多的内容。"
     my_activity: "我的活动"
@@ -76,29 +73,17 @@ zh-CN:
       hide_nsfw_posts: "隐藏 #nsfw (工作不宜)的内容"
       like: "赞"
       likes:
-        few: "<%= count %> Likes"
-        many: "<%= count %> Likes"
-        one: "<%= count %> Like"
         other: "<%= count %> 个赞"
-        two: "<%= count %> Likes"
         zero: "<%= count %> 个赞"
       limited: "限制"
       more_comments:
-        few: "Show <%= count %> more comments"
-        many: "Show <%= count %> more comments"
-        one: "Show <%= count %> more comment"
         other: "显示剩余的 <%= count %> 个评论"
-        two: "Show <%= count %> more comments"
         zero: "显示剩余的 <%= count %> 个评论"
       original_post_deleted: "原内容已被作者删除。"
       public: "公开"
       reshare: "转发"
       reshares:
-        few: "<%= count %> Reshares"
-        many: "<%= count %> Reshares"
-        one: "<%= count %> Reshare"
         other: "<%= count %> 次转发"
-        two: "<%= count %> Reshares"
         zero: "<%= count %> 次转发"
       show_nsfw_post: "显示内容"
       show_nsfw_posts: "全部显示"