From b93084e04f894031bbb591e433525383b5b13228 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Fri, 11 Mar 2011 17:28:14 +0100
Subject: [PATCH] updated locales

---
 config/locales/devise/devise.es.yml |   6 +-
 config/locales/diaspora/ar.yml      |   4 ++
 config/locales/diaspora/cs.yml      |   4 ++
 config/locales/diaspora/cy.yml      |   4 ++
 config/locales/diaspora/da.yml      |   4 ++
 config/locales/diaspora/de.yml      |   4 ++
 config/locales/diaspora/el.yml      |   4 ++
 config/locales/diaspora/en_shaw.yml |   4 ++
 config/locales/diaspora/eo.yml      |   4 ++
 config/locales/diaspora/es-CL.yml   |  16 +++--
 config/locales/diaspora/es.yml      |  14 ++--
 config/locales/diaspora/eu.yml      |  82 +++++++++++----------
 config/locales/diaspora/fi.yml      |  14 ++--
 config/locales/diaspora/fr.yml      |   4 ++
 config/locales/diaspora/ga.yml      |   4 ++
 config/locales/diaspora/gl.yml      |  28 ++++----
 config/locales/diaspora/he.yml      |  58 ++++++++-------
 config/locales/diaspora/hu.yml      |   4 ++
 config/locales/diaspora/id.yml      |   4 ++
 config/locales/diaspora/is.yml      |   4 ++
 config/locales/diaspora/it.yml      |   4 ++
 config/locales/diaspora/lt.yml      |   4 ++
 config/locales/diaspora/mk.yml      |   4 ++
 config/locales/diaspora/nb.yml      |   4 ++
 config/locales/diaspora/nl.yml      |  12 ++--
 config/locales/diaspora/pl.yml      |   4 ++
 config/locales/diaspora/pt-BR.yml   |   4 ++
 config/locales/diaspora/pt-PT.yml   |   4 ++
 config/locales/diaspora/ro.yml      |   4 ++
 config/locales/diaspora/ru.yml      |   4 ++
 config/locales/diaspora/sk.yml      |  80 +++++++++++----------
 config/locales/diaspora/sl.yml      |   4 ++
 config/locales/diaspora/sv.yml      |   4 ++
 config/locales/diaspora/tr.yml      |   4 ++
 config/locales/diaspora/zh-TW.yml   | 108 ++++++++++++++--------------
 config/locales/diaspora/zh.yml      |   4 ++
 36 files changed, 331 insertions(+), 191 deletions(-)

diff --git a/config/locales/devise/devise.es.yml b/config/locales/devise/devise.es.yml
index b899af4e51..38d56a27e1 100644
--- a/config/locales/devise/devise.es.yml
+++ b/config/locales/devise/devise.es.yml
@@ -60,7 +60,7 @@ es:
       updated: "Tu contraseña ha sido modificada. Ya has accedido a tu cuenta."
     registrations: 
       destroyed: "!Adiós! Tu cuenta ha sido cancelada. Esperamos volver a verte pronto."
-      signed_up: "Te has registrado correctamente. Ya puedes consulta en tu correo el email de confirmación."
+      signed_up: "Te has registrado correctamente. Ya puedes consultar en tu correo el email de confirmación."
       updated: "Has actualizado tu cuenta correctamente."
     sessions: 
       new: 
@@ -71,7 +71,7 @@ es:
         modern_browsers: "Sólo es compatible con navegadores modernos."
         password: "Contraseña"
         remember_me: "Recordarme"
-        sign_in: "Ingresar"
+        sign_in: "Acceder"
         username: "Nombre de usuario"
       signed_in: "Has ingresado correctamente."
       signed_out: "Has salido correctamente."
@@ -80,7 +80,7 @@ es:
         forgot_your_password: "¿Olvidaste tu contraseña?"
         receive_confirmation: "No has recibido instrucciones de confirmación?"
         receive_unlock: "No has recibido las instrucciones de desbloqueo?"
-        sign_in: "Ingresar"
+        sign_in: "Acceder"
         sign_up: "Regístrate"
         sign_up_closed: "Los registros están cerrados temporalmente."
       mail_signup_form: 
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index fa9710dfea..3aeba64394 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -354,6 +354,10 @@ ar:
     update: 
       error: "فشل تحرير الصورة."
       notice: "تم تحديث الصورة بنجاح"
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "previous"
   profile: "Perfil"
   profiles: 
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index a06b92da93..e0632841b5 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -354,6 +354,10 @@ cs:
     update: 
       error: "Nepodařilo se upravit fotku."
       notice: "Fotka úspěšně aktualizována."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "předchozí"
   profile: "Profil"
   profiles: 
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index a0bec59a8e..c1664108fa 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -354,6 +354,10 @@ cy:
     update: 
       error: "Failed to edit photo."
       notice: "Photo successfully updated."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "previous"
   profile: "Profile"
   profiles: 
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 8c91f0a925..a0a1d4d822 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -354,6 +354,10 @@ da:
     update: 
       error: "Kunne ikke redigere billede."
       notice: "Billedet blev opdateret."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "Forrige"
   profile: "Profil"
   profiles: 
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 37a86bd0da..1e1e8477d5 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -354,6 +354,10 @@ de:
     update: 
       error: "Bearbeiten des Fotos fehlgeschlagen."
       notice: "Foto erfolgreich aktualisiert."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "Vorherige"
   profile: "Profil"
   profiles: 
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index c324fffe58..a213e939cb 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -354,6 +354,10 @@ el:
     update: 
       error: "Αποτυχία επεξεργασίας φωτογραφίας."
       notice: "Η φωτογραφία ενημερώθηκε επιτυχώς."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "προηγούμενο"
   profile: "Προφίλ"
   profiles: 
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index febfd1ef75..167b0b90c9 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -354,6 +354,10 @@ en_shaw:
     update: 
       error: "𐑓𐑱𐑤𐑛 𐑑 𐑧𐑛𐑦𐑑 𐑓𐑴𐑑𐑴."
       notice: "𐑓𐑴𐑑𐑴 𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑳𐑐𐑛𐑱𐑑𐑩𐑛."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "𐑐𐑮𐑰𐑝𐑾𐑕"
   profile: "𐑐𐑮𐑴𐑓𐑲𐑤"
   profiles: 
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 131f986217..c6d483b314 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -354,6 +354,10 @@ eo:
     update: 
       error: "Failed to edit photo."
       notice: "Photo successfully updated."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "previous"
   profile: "Profile"
   profiles: 
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 92ce6bbf03..d9b7c3e849 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -72,13 +72,13 @@ es-CL:
       success: "%{name} fue correctamente eliminado."
     edit: 
       add_existing: "Agregar un contacto existente"
-      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
-      aspect_list_is_visible: "aspect list is visible to others in aspect"
+      aspect_list_is_not_visible: "Lista de contactos oculta para los demás en el Aspecto"
+      aspect_list_is_visible: "Lista de contactos visible para los demás en el Aspecto"
       confirm_remove_aspect: "¿Estás seguro que quieres eliminar este aspecto?"
-      done: "Done"
+      done: "Listo"
       remove_aspect: "Eliminar este aspecto"
       rename: "renombrar"
-      update: "update"
+      update: "Actualizar"
     helper: 
       are_you_sure: "¿Estás seguro que quieres eliminar este aspecto?"
       aspect_not_empty: "El aspecto no está vacío"
@@ -149,7 +149,7 @@ es-CL:
       subject: "asunto"
       to: "para"
     show: 
-      delete: "delete and block conversation"
+      delete: "Eliminar y bloquear conversación"
       reply: "responder"
   date: 
     formats: 
@@ -203,7 +203,7 @@ es-CL:
     application: 
       have_a_problem: "¿Tienes un problema? Encuentra la respuesta aquí"
       logged_in_as: "Conectado como %{name}"
-      powered_by: "POTENCIADO POR DIASPORA*"
+      powered_by: "POWERED BY DIASPORA*"
       public_feed: "Canal publico de %{name}"
       toggle: "cambiar sitio móvil"
       whats_new: "¿Qué hay de nuevo?"
@@ -354,6 +354,10 @@ es-CL:
     update: 
       error: "Error al editar foto."
       notice: "Foto actualizada correctamente."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "Anterior"
   profile: "Perfil"
   profiles: 
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 40c645c2aa..04db772fbd 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -72,13 +72,13 @@ es:
       success: "%{name} fue eliminado correctamente."
     edit: 
       add_existing: "Añadir un contacto existente."
-      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
-      aspect_list_is_visible: "aspect list is visible to others in aspect"
+      aspect_list_is_not_visible: "Lista de contactos oculta para los demás en el Aspecto"
+      aspect_list_is_visible: "Lista de contactos visible para los demás en el Aspecto"
       confirm_remove_aspect: "¿Seguro que quieres eliminar este Aspecto?"
-      done: "Done"
+      done: "Listo"
       remove_aspect: "Eliminar este Aspecto"
       rename: "renombrar"
-      update: "update"
+      update: "Actualizar"
     helper: 
       are_you_sure: "¿Seguro que quieres eliminar este Aspecto?"
       aspect_not_empty: "El Aspecto no está vacío"
@@ -149,7 +149,7 @@ es:
       subject: "Asunto"
       to: "para"
     show: 
-      delete: "delete and block conversation"
+      delete: "Eliminar y bloquear conversación"
       reply: "Responder"
   date: 
     formats: 
@@ -354,6 +354,10 @@ es:
     update: 
       error: "Falló la edición de la foto."
       notice: "Foto actualizada correctamente."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "Anterior"
   profile: "Perfil"
   profiles: 
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index f93cbee112..51483185cf 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -54,7 +54,7 @@ eu:
       success: "Pertsona arrakastaz ezabatua alderditik"
   aspects: 
     add_to_aspect: 
-      failure: "Akatsa adiskidea alderdira gehitzean."
+      failure: "Huts egin du adiskidea alderdira gehitzeak."
       success: "Adiskidea arrakastaz gehitu da alderdira."
     aspect_contacts: 
       done_editing: "aldaketak gauzatu"
@@ -66,19 +66,19 @@ eu:
     contacts_visible: "Alderdi honetako adiskideak jokingo dute nor dagoen alderdian."
     create: 
       failure: "Akatsa alderdiaren sormenean."
-      success: "Zure alderdia, %{name}, sortua izan da."
+      success: "Zure alderdi berria, %{name}, sortua izan da."
     destroy: 
       failure: "%{name} ez dago hutsik eta ezin izan da ezabatu."
       success: "%{name} arrakastaz ezabatu da."
     edit: 
       add_existing: "Jada adiskide den norbait gehitu"
-      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
-      aspect_list_is_visible: "aspect list is visible to others in aspect"
+      aspect_list_is_not_visible: "alderdiaren zerrenda ezktua da alderdiko besteentzat"
+      aspect_list_is_visible: "alderdiaren zerrenda ikusgarria da aldediko besteengandik"
       confirm_remove_aspect: "Ziur al zaude alderdi hau ezabatu nahi duzunaz?"
-      done: "Done"
+      done: "Egina"
       remove_aspect: "Alderdi hau ezabatu"
       rename: "berrizendatu"
-      update: "update"
+      update: "eguneratu"
     helper: 
       are_you_sure: "Ziur al zaude alderdi hau ezabatu nahi duzunaz?"
       aspect_not_empty: "Alderdi ez hutsa"
@@ -94,8 +94,8 @@ eu:
       no_requests: "Ez duzu eskaera berririk"
       requests: "Eskaerak"
     move_contact: 
-      error: "Akatsa adiskidea mugitzean: %{inspect}"
-      failure: "akatsa izan da %{inspect}"
+      error: "Huts adiskidea mugitzean: %{inspect}"
+      failure: "huts egin du %{inspect}"
       success: "Pertsona alderdi berrira gehitua"
     new_aspect: 
       create: "Sortu"
@@ -149,7 +149,7 @@ eu:
       subject: "igorlea"
       to: "nori:"
     show: 
-      delete: "delete and block conversation"
+      delete: "ezabatu eta giltzapetu elkarrizketa"
       reply: "erantzun"
   date: 
     formats: 
@@ -206,7 +206,7 @@ eu:
       powered_by: "DIASPORAK ESKAINIA"
       public_feed: "%{name}(r)en Diaspora Feed publikoa"
       toggle: "aldatu mugikorreko orrialdera"
-      whats_new: "ezer berririk?"
+      whats_new: "zer berri?"
       your_aspects: "zure alderdiak"
     header: 
       account_settings: "kontuaren lehentasunak"
@@ -222,11 +222,11 @@ eu:
   new_requests: 
     few: "%{count} eskaera berri!"
     one: "eskaera berria!"
-    other: "%{count} esakaera berri!"
+    other: "%{count} eskaera berri!"
     zero: "eskaera berririk ez"
   next: "hurrengoa"
   no_new_messages: "mezu berririk ez"
-  no_new_notifications: "jakinarazpen berririk ez"
+  no_new_notifications: "jakinarazpen berririk ez dago"
   notifications: 
     also_commented: "iruzkindua baita zure kontaktuaren"
     also_commented_deleted: "mezu ezabatu bat iruzkindu du"
@@ -245,7 +245,7 @@ eu:
       sign_in: "Sartu zaitez ikusteko."
       subject: "%{name}(e)k ere iruzkindu du."
     comment_on_post: 
-      commented: "has commented on your post!"
+      commented: "zure mezua iruzkindu du:"
       sign_in: "Sartu zaitez ikusteko."
       subject: "%{name} zure mezua iruzkindu du."
     diaspora: "diasporaren e-posta robota"
@@ -287,7 +287,7 @@ eu:
       people_on_pod_are_aware_of: "zerbitzariko jendeak honen kontziente dira:"
       results_for: " %{params}(r)entzat emaitzak"
     index: 
-      couldnt_find_them_send_invite: "Aurkitu ezini,? Bidali gonbidapen bat!"
+      couldnt_find_them_send_invite: "Aurkitu ezinik? Bidali gonbidapen bat!"
       no_one_found: "... ez da inor aurkitu."
       no_results: "Aizu! Zerbait bilatu behar duzu."
       results_for: "bilaketa emaitzak hontarako:"
@@ -299,7 +299,7 @@ eu:
     profile_sidebar: 
       bio: "niri buruz"
       born: "jaioteguna"
-      cannot_remove: "Ezin izan da %{name} ezabatu azken alderditik. (Pertsona honekin harremanak bukatu nahi badituzu, adiskidea ezabatu egin beharko duzu.)"
+      cannot_remove: "Ezin izan da %{name} ezabatu azken alderditik. (Pertsona honekin harremanak etendu nahi badituzu, adiskidea ezabatu egin beharko duzu.)"
       edit_my_profile: "Nire profila aldatu"
       gender: "sexua"
       in_aspects: "alderdietan"
@@ -307,23 +307,23 @@ eu:
       remove_from: "%{name} ezabatu %{aspect} alderditik?"
     show: 
       does_not_exist: "Pertsona hau ez dago!"
-      incoming_request: "Adiskide eskaera bat bidali dizu pertsona honek."
+      incoming_request: "%{name}(e)k zure adiskidea izan nahi du"
       message: "Mezua"
       no_posts: "erakusteko sarrerarik ez dago!"
       not_connected: "Ez zaude partekatzen %{name}(r)ekin"
-      recent_posts: "Post berrienak"
+      recent_posts: "Mezu Berrienak"
       recent_public_posts: "Azken berri publikoak"
       return_to_aspects: "Zure alderdi orrialdera itzuli"
       similar_contacts: "antzeko adiskideak"
       start_sharing: "harremanetan hasi"
-      to_accept_or_ignore: "onartu edo utzi"
+      to_accept_or_ignore: "onartu edo utzi."
     webfinger: 
       fail: "%{handle} ezin izan dugu aurkitu."
   photos: 
     create: 
-      integrity_error: "Argazki igoera akasduna. Ziur al zaude irudi bat zela?"
-      runtime_error: "Argazki igoera akasduna. Ziur zure uhala azkarra dela?"
-      type_error: "Argazki igoera akasduna- Ziur al zaude irudia gehitu duzunaz?"
+      integrity_error: "Argazki igoerak huts egin du. Ziur al zaude irudi bat zela?"
+      runtime_error: "Argazki igoerak huts egin du. Ziur zaude zure uhala azkarra dela?"
+      type_error: "Argazki igoerak huts egin du. Ziur al zaude irudia gehitu duzunaz?"
     destroy: 
       notice: "Argazkia ezabatu duzu."
     edit: 
@@ -333,11 +333,11 @@ eu:
       new_photo: "Argazki Berria"
       post_it: "partekatu ezazu!"
     new_photo: 
-      empty: "{file} hutsik dago, mesedez aukera itzazu fitxategiak hura gabe."
+      empty: "{file} hutsik dago, mesedez aukera itzazu fitxategiak hura kenduta."
       invalid_ext: "{file}(r)en luzapena ez da onartu. {extensions} dira onartuak soilik."
       size_error: "{file} pisutsuegia da, fitxategi baten gehiengo pisua {sizeLimit} da."
     new_profile_photo: 
-      or_select_one: "edo aukeratu dagoeneko eginda dagoen bat"
+      or_select_one: "edo aukeratu dagoeneko badagoen bat"
       upload: "Igo ezazu profil argazki berri bat!"
     photo: 
       view_all: "%{aspect}(r)en argazki guztiak ikusi"
@@ -349,11 +349,15 @@ eu:
       make_profile_photo: "profileko argazki bihurtu"
       original_post: "Jatorrizko mezua"
       permalink: "permalink"
-      update_photo: "Argazkia Igo"
+      update_photo: "Argazkia Eguneratu"
       view: "ikusi"
     update: 
-      error: "Akatsa argazkia aldatzean."
+      error: "Huts argazkia aldatzean."
       notice: "Argazkia arrakastaz eguneratua."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "aurrekoa"
   profile: "Profila"
   profiles: 
@@ -394,7 +398,7 @@ eu:
   requests: 
     create: 
       sending: "Bidaltzen"
-      sent: "%{name}(r)ekin partekatzea eskatu duzu. Diasporara sartzen diren hurrengo aldian ikusiko dute."
+      sent: "%{name}(r)ekin partekatzea eskatu duzu. Diasporara sartzen diren hurrengo aldian ikusiko dute eskaera."
     destroy: 
       error: "Alderdi bat aukeratu, mesedez!"
       ignore: "Adiskide eskaera baztertua."
@@ -411,7 +415,7 @@ eu:
     destroy: 
       success: "Egiaztapena arrakastaz ezabatua."
     failure: 
-      error: "akatsa zerbitzu hori konektatzean"
+      error: "huts zerbitzu hori konektatzean"
     finder: 
       friends: 
         few: "%{count} adiskide"
@@ -438,7 +442,7 @@ eu:
     add_contact: 
       create_request: "Diaspora helbide arabera bilatu"
       diaspora_handle: "diaspora@helbidea.org"
-      enter_a_diaspora_username: "Diaspora erabiltzaile izena sartu:"
+      enter_a_diaspora_username: "Diaspora erabiltzaile izena idatzi:"
       know_email: "Badakizu beraien e-posta? Gonbida itzazu!"
       your_diaspora_username_is: "Zure Diaspora erabiltzailea honakoa da: %{diaspora_handle}"
     contact_list: 
@@ -446,7 +450,7 @@ eu:
       cannot_remove: "Ezin izan da pertsona azken alderditik ezabatu. (Pertsona honekin harremanak nahi ez badituzu, adiskidea ezabatu behar duzu.)"
     invitations: 
       by_email: "e-posta bidez"
-      dont_have_now: "Bat ere ez duzu, baina gonbidapen gehiago iritsiko dira laister!"
+      dont_have_now: "Bukatu egin zaizkizu, baina gonbidapen gehiago iritsiko dira laister!"
       from_facebook: "Facebooketik"
       invitations_left: "(%{count} geratzen zai(zki)zu)"
       invite_someone: "Norbait gonbidatu"
@@ -458,7 +462,7 @@ eu:
     public_explain: 
       logged_in: "%{service}(e)n sartuta"
       manage: "kudeatu lotutako zerbitzuak"
-      outside: "Mezu publikoak edozeinek irakurtzeko ahalmena izango du, Diaspora kontua ez badu ere."
+      outside: "Mezu publikoak edozeinek irakurtzeko ahalmena izango ditu, Diaspora kontua ez badu ere."
       title: "Mezu publiko bat partekatzear zaude!"
     publisher: 
       add_photos: "argazkiak gehitu"
@@ -469,7 +473,7 @@ eu:
       post_a_message_to: "%{aspect}(e)n mezu bat partekatu"
       posting: "Partekatzen..."
       share: "Partekatu"
-      share_with: "%{aspect}(r)ekin partekatu"
+      share_with: "honekin partekatu:"
       whats_on_your_mind: "zer berri?"
     reshare: 
       reshare: "Berriz partekatu"
@@ -493,9 +497,9 @@ eu:
     destroy: "Kontua arrakastaz ezabatua."
     edit: 
       change: "Aldatu"
-      change_language: "Hizkuntza aldatu"
+      change_language: "Hizkuntza Aldatu"
       change_password: "Pasahitza aldatu"
-      close_account: "Kontua ezabatu"
+      close_account: "Kontua Ezabatu"
       current_password: "Oraingo pasahitza"
       download_photos: "nire argazkiak jaitsi"
       download_xml: "nire xml jaitsi"
@@ -510,7 +514,7 @@ eu:
       connect_on_diaspora: "Konektatu Diasporan"
       connect_services: "Beste zerbitzu batzuekin lotu"
       edit_profile: "Zure profila aldatu"
-      finished: "Bukatuta!"
+      finished: "Bukatua!"
       save_and_continue: "Gorde eta jarraitu"
       signup_steps: "Zure izen ematea bukatu ezazu hiru pauso hauek emanez:"
       skip: "jauzi hastapenak"
@@ -522,13 +526,13 @@ eu:
         people_already_on_diaspora: "Diasporako jendea"
       welcome: "Ongi Etorri Diasporara!"
     public: 
-      does_not_exist: "%{username}(r)ik ez dago!"
+      does_not_exist: "%{username} erabiltzailerik ez dago!"
     update: 
-      email_notifications_changed: "Hizkuntza aldaketa akasduna"
-      language_changed: "Hizkuntza aldatua"
-      language_not_changed: "Hizkuntza aldaketa akatsduna"
+      email_notifications_changed: "E-posta janirazpenak aldatu dituzu"
+      language_changed: "Hizkuntza Aldatua"
+      language_not_changed: "Hizkuntza aldaketak huts egin du"
       password_changed: "Pasahitza aldatu duzu"
-      password_not_changed: "Pasahitz Aldaketa Akatsduna"
+      password_not_changed: "Pasahitz Aldaketak Huts egin du"
   webfinger: 
     fetch_failed: "ezin izan da webfinger profila hartu %{profile_url} webgunetik"
     hcard_fetch_failed: "%{account} kontutik ezin izan da hcard sortu"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index f88f9f5b00..192cc31087 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -72,13 +72,13 @@ fi:
       success: "%{name} poistettiin onnistuneesti."
     edit: 
       add_existing: "Lisää olemassa oleva kontakti"
-      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
-      aspect_list_is_visible: "aspect list is visible to others in aspect"
+      aspect_list_is_not_visible: "näkymälista on piilotettu muilta näkymässä olevilta"
+      aspect_list_is_visible: "näkymälista näkyy muille näkymässä oleville"
       confirm_remove_aspect: "Oletko varma että haluat poistaa tämän näkymän?"
-      done: "Done"
+      done: "Valmis"
       remove_aspect: "Poista näkymä"
       rename: "nimeä uudelleen"
-      update: "update"
+      update: "päivitä"
     helper: 
       are_you_sure: "Haluatko varmasti poistaa tämän näkymän?"
       aspect_not_empty: "Näkymä ei ole tyhjä"
@@ -149,7 +149,7 @@ fi:
       subject: "aihe"
       to: "vastaanottaja"
     show: 
-      delete: "delete and block conversation"
+      delete: "poista ja estä tämä keskustelu"
       reply: "vastaa"
   date: 
     formats: 
@@ -354,6 +354,10 @@ fi:
     update: 
       error: "Kuvan muokkaus epäonnistui."
       notice: "Kuva päivitettiin onnistuneesti."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "edellinen"
   profile: "Profiili"
   profiles: 
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 03b91bbb4b..5f4290912a 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -354,6 +354,10 @@ fr:
     update: 
       error: "La modification de la photo a échoué."
       notice: "La photo a été mise à jour avec succès."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "précédent"
   profile: "Profil"
   profiles: 
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index c0d0d66b7d..e835752974 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -354,6 +354,10 @@ ga:
     update: 
       error: "Níor d'éirigh le aithrú an pictiúr."
       notice: "Pictiure Uaslódaithe."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "roimhhe"
   profile: "Próifíl"
   profiles: 
diff --git a/config/locales/diaspora/gl.yml b/config/locales/diaspora/gl.yml
index 10b213e1b3..b8a0c87131 100644
--- a/config/locales/diaspora/gl.yml
+++ b/config/locales/diaspora/gl.yml
@@ -72,19 +72,19 @@ gl:
       success: "%{name} foi eliminado correctamente."
     edit: 
       add_existing: "Engadir un contacto existente"
-      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
-      aspect_list_is_visible: "aspect list is visible to others in aspect"
+      aspect_list_is_not_visible: "a lista do aspecto está agochada para outros contactos neste aspecto"
+      aspect_list_is_visible: "a lista do aspecto está visible para outros contactos neste aspecto"
       confirm_remove_aspect: "Estás seguro de querer eliminar este aspecto?"
-      done: "Done"
+      done: "Feito"
       remove_aspect: "Borrar este aspecto"
       rename: "renomear"
-      update: "update"
+      update: "actualizar"
     helper: 
       are_you_sure: "Estás seguro de querer borrar este aspecto?"
       aspect_not_empty: "O aspecto non esta baleiro"
       remove: "eliminar"
     index: 
-      handle_explanation: "Esta é a súa tarxeta de diaspora. Coma un enderezo electrónico, podes darllo ás persoas para que te localicen."
+      handle_explanation: "Esta é o seu ederezo de Diaspora. Coma un enderezo electrónico, podes darllo ás persoas para que te localicen."
       no_contacts: "sen contactos"
     manage: 
       add_a_new_aspect: "Engadir un novo aspecto"
@@ -149,7 +149,7 @@ gl:
       subject: "asunto"
       to: "para"
     show: 
-      delete: "delete and block conversation"
+      delete: "borrar e bloquear conversación"
       reply: "responder"
   date: 
     formats: 
@@ -204,7 +204,7 @@ gl:
       have_a_problem: "Tes problemas? Atopa aquí a resposta"
       logged_in_as: "conectado como %{name}"
       powered_by: "FORNECIDO POR DIASPORA*"
-      public_feed: "Public Diaspora Feed for %{name}"
+      public_feed: "Comentarios públicos de %{name}"
       toggle: "cambiar a web móbil"
       whats_new: "que hai de novo?"
       your_aspects: "os teus aspectos"
@@ -228,8 +228,8 @@ gl:
   no_new_messages: "non hai novas mensaxes"
   no_new_notifications: "non hai novas peticións"
   notifications: 
-    also_commented: "tamén comentou nos do teu contacto"
-    also_commented_deleted: "comentou nun post eliminado"
+    also_commented: "tamén comentou nos de %{post_author}"
+    also_commented_deleted: "comentou nunha publicación eliminada"
     comment_on_post: "comentou no teu"
     deleted: "borrado"
     index: 
@@ -243,7 +243,7 @@ gl:
     also_commented: 
       commented: "tamén comentou na publicación de %{post_author}:"
       sign_in: "Identificarse para velo."
-      subject: "%{name} tamén comentou."
+      subject: "%{name} tamén comentou na publicación de %{post_author}"
     comment_on_post: 
       commented: "comentou na túa publicación!"
       sign_in: "Entrar para velo."
@@ -354,6 +354,10 @@ gl:
     update: 
       error: "Erro ao editar a foto."
       notice: "Foto actualizada correctamente."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "anterior"
   profile: "Perfil"
   profiles: 
@@ -436,7 +440,7 @@ gl:
   settings: "Axustes"
   shared: 
     add_contact: 
-      create_request: "Pescudar por tarxeta Diaspora"
+      create_request: "Pescudar por enderezo Diaspora"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "Introduza un nome de usuario de Diaspora:"
       know_email: "Sabes os seus enderezos electrónicos? Deberías invitalos"
@@ -505,7 +509,7 @@ gl:
       new_password: "Novo contrasinal"
       receive_email_notifications: "Recibir notificacións por correo?"
       your_email: "O teu correo"
-      your_handle: "A túa tarxeta diaspora"
+      your_handle: "O teu enderezo Diaspora"
     getting_started: 
       connect_on_diaspora: "Conectar a Diaspora"
       connect_services: "Conectar a outros servizos"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 1fed486aa6..5f0e7d6425 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -68,17 +68,17 @@ he:
       failure: "יצירת ההיבט נכשלה."
       success: "ההיבט החדש שלך %{name} נוצר"
     destroy: 
-      failure: "%{name} is not empty and could not be removed."
+      failure: "ההיבט %{name} אינו ריק ולא ניתן להסירו."
       success: "%{name} הוסר בהצלחה."
     edit: 
       add_existing: "הוספת איש קשר קיים"
-      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
-      aspect_list_is_visible: "aspect list is visible to others in aspect"
+      aspect_list_is_not_visible: "רשימת ההיבטים מוסתרת בפני אחרים בהיבט"
+      aspect_list_is_visible: "רשימת ההיבטים גלויה לאחרים בהיבט"
       confirm_remove_aspect: "האם אכן ברצונך למחוק את ההיבט?"
-      done: "Done"
+      done: "בוצע"
       remove_aspect: "מחיקת היבט זה"
       rename: "שינוי שם"
-      update: "update"
+      update: "עדכון"
     helper: 
       are_you_sure: "האם אכן ברצונך למחוק היבט זה?"
       aspect_not_empty: "ההיבט אינו ריק"
@@ -138,19 +138,19 @@ he:
     zero: "אין אנשי קשר"
   conversations: 
     index: 
-      create_a_new_message: "create a new message"
-      message_inbox: "Message Inbox"
-      new_message: "New Message"
-      no_conversation_selected: "no conversation selected"
-      no_messages: "no messages"
+      create_a_new_message: "כתיבת הודעה חדשה"
+      message_inbox: "תיבת הודעות נכנסות"
+      new_message: "הודעה חדשה"
+      no_conversation_selected: "לא נבחר דיון"
+      no_messages: "אין הודעות"
     new: 
-      no_results: "No Results Found"
-      send: "Send"
-      subject: "subject"
-      to: "to"
+      no_results: "לא נמצאו תוצאות"
+      send: "שליחה"
+      subject: "נושא"
+      to: "אל"
     show: 
-      delete: "delete and block conversation"
-      reply: "reply"
+      delete: "מחיקה וחסימת הדיון"
+      reply: "תגובה"
   date: 
     formats: 
       birthday: "ה־%d ב%B"
@@ -204,7 +204,7 @@ he:
       have_a_problem: "נתקלת בבעיות? ניתן למצוא את התשובה להלן"
       logged_in_as: "נכנסת בשם %{name}"
       powered_by: "מופעל על גבי דיאספורה*"
-      public_feed: "Public Diaspora Feed for %{name}"
+      public_feed: "הזנת דיאספורה ציבורית עבור %{name}"
       toggle: "הפעלה/נטרול האתר לניידים"
       whats_new: "מה חדש?"
       your_aspects: "ההיבטים שלך"
@@ -217,7 +217,7 @@ he:
       logout: "יציאה"
       view_profile: "צפייה בפרופיל"
   more: "המשך"
-  new_messages: "%{count} new messages"
+  new_messages: "%{count} הודעות חדשות"
   new_notifications: "%{count} התרעות חדשות"
   new_requests: 
     few: "%{count} בקשות חדשות!"
@@ -225,11 +225,11 @@ he:
     other: "%{count} בקשות חדשות!"
     zero: "אין בקשות חדשות"
   next: "הבאה"
-  no_new_messages: "no new messages"
+  no_new_messages: "אין הודעות חדשות"
   no_new_notifications: "אין התרעות חדשות"
   notifications: 
-    also_commented: "גם כן הגיב/ה על הפריט של איש הקשר שלך"
-    also_commented_deleted: "commented on a deleted post"
+    also_commented: "גם כן הגיב/ה על הפריט של %{post_author}"
+    also_commented_deleted: "הגיב/ה על רשומה שנמחקה"
     comment_on_post: "הגיב/ה על ה"
     deleted: "נמחקה"
     index: 
@@ -243,7 +243,7 @@ he:
     also_commented: 
       commented: "גם כן הגיב/ה על הרשומה של %{post_author}:"
       sign_in: "יש להיכנס כדי לצפות בזה."
-      subject: "%{name} גם כן הגיב/ה על הרשומה של איש הקשר שלך."
+      subject: "%{name} גם כן הגיב/ה על הרשומה של %{post_author}."
     comment_on_post: 
       commented: "הגיב/ה על הרשומה שלך:"
       sign_in: "יש להיכנס כדי לצפות בזה."
@@ -261,10 +261,10 @@ he:
       subject: "בקשת התקשרות חדשה בדיאספורה* מאת %{from}"
       try_it_out: "מאוד כדאי לבדוק זאת."
     private_message: 
-      message_subject: "Subject: %{subject}"
-      private_message: "has sent you a private message:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      message_subject: "נושא: %{subject}"
+      private_message: "שלח/ה לך הודעה פרטית:"
+      sign_in: "יש להיכנס כדי לצפות בזה."
+      subject: "נשלחה אליך הודעה פרטית מאת %{name} דרך דיאספורה*"
     request_accepted: 
       accepted: "קיבל/ה את בקשת ההתקשרות שלך!"
       sign_in: "כניסה מכאן"
@@ -308,7 +308,7 @@ he:
     show: 
       does_not_exist: "אדם זה אינו קיים!"
       incoming_request: "ברצונו/ה של %{name} לשתף אתך"
-      message: "Message"
+      message: "הודעה"
       no_posts: "אין רשומות להצגה!"
       not_connected: "אין לך שיתוף עם %{name}"
       recent_posts: "רשומות אחרונות"
@@ -354,6 +354,10 @@ he:
     update: 
       error: "אירע כשל בעריכת התמונה."
       notice: "התמונה עודכנה בהצלחה."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "הקודמת"
   profile: "פרופיל"
   profiles: 
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 4d61540bad..65f3ae051e 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -354,6 +354,10 @@ hu:
     update: 
       error: "Nem sikerült szerkeszteni a képet."
       notice: "Kép szerkesztése sikerült."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "előző"
   profile: "Profil"
   profiles: 
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 857d83c8f2..affb1e604f 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -354,6 +354,10 @@ id:
     update: 
       error: "Gagal mengubah foto."
       notice: "Foto berhasil diperbarui."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "previous"
   profile: "Profile"
   profiles: 
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index f64ae0a994..062580476d 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -354,6 +354,10 @@ is:
     update: 
       error: "Ekki tókst að breyta mynd."
       notice: "Velheppnuð uppfærsla á mynd. "
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "fyrra"
   profile: "Síðan mín"
   profiles: 
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 702ca028a4..399052e5a9 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -354,6 +354,10 @@ it:
     update: 
       error: "Modifica della foto fallita."
       notice: "Foto aggiornata con successo."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "precedente"
   profile: "Profilo"
   profiles: 
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 03f8cd7983..05195a8f5e 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -354,6 +354,10 @@ lt:
     update: 
       error: "Nuotraukos atnaujinti nepavyko."
       notice: "Nuotrauka atnaujinta sÄ—kmingai."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "previous"
   profile: "Profilis"
   profiles: 
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 208660edf1..9780b35e1a 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -354,6 +354,10 @@ mk:
     update: 
       error: "Неуспешно уредување на слика."
       notice: "Ажурирањето на сликата е успешно."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "previous"
   profile: "Профил"
   profiles: 
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index f9f7c2b5f7..3b18df4cb6 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -354,6 +354,10 @@ nb:
     update: 
       error: "Greide ikke å endre bildet."
       notice: "Bildet er oppdatert."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "previous"
   profile: "Profile"
   profiles: 
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index b008956bcf..ca6aba1c86 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -72,10 +72,10 @@ nl:
       success: "%{name} is met succes verwijderd."
     edit: 
       add_existing: "Voeg een bestaand contact toe"
-      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
-      aspect_list_is_visible: "aspect list is visible to others in aspect"
+      aspect_list_is_not_visible: "contactlijst van aspect is verborgen voor anderen in aspect"
+      aspect_list_is_visible: "contactlijst van aspect is zichtbaar voor anderen in aspect"
       confirm_remove_aspect: "Weet je zeker dat je dit aspect wilt verwijderen?"
-      done: "Done"
+      done: "Klaar"
       remove_aspect: "Verwijder dit aspect"
       rename: "hernoem"
       update: "update"
@@ -149,7 +149,7 @@ nl:
       subject: "onderwerp"
       to: "aan"
     show: 
-      delete: "delete and block conversation"
+      delete: "verwijder en blokkeer conversatie"
       reply: "beantwoord"
   date: 
     formats: 
@@ -354,6 +354,10 @@ nl:
     update: 
       error: "Foto veranderen niet gelukt."
       notice: "Foto succesvol veranderd."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "vorige"
   profile: "Profiel"
   profiles: 
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 8e717c5d31..912702d0ad 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -354,6 +354,10 @@ pl:
     update: 
       error: "Błąd podczas edycji zdjęcia."
       notice: "Pomyślnie zaktualizowano zdjęcie."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "previous"
   profile: "Profil"
   profiles: 
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 38e419aa9e..c46a02d6f8 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -354,6 +354,10 @@ pt-BR:
     update: 
       error: "Falha ao editar foto."
       notice: "Foto enviada com sucesso."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "Anterior"
   profile: "Perfil"
   profiles: 
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 901f54b518..86e72a14b3 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -354,6 +354,10 @@ pt-PT:
     update: 
       error: "Falha ao editar a fotografia"
       notice: "Fotografia adicionada com sucesso."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "previous"
   profile: "Perfil"
   profiles: 
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index ad4273c7d5..01f6b51a79 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -354,6 +354,10 @@ ro:
     update: 
       error: "Nu s-a reuÅŸit editarea fotografiii."
       notice: "Fotografia a fost actualizată cu succes."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "anterioare"
   profile: "Profil"
   profiles: 
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 9c52425b94..727ac3f376 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -354,6 +354,10 @@ ru:
     update: 
       error: "Не удалось изменить фотографию."
       notice: "Фотография загружена."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "предыдущая"
   profile: "Профиль"
   profiles: 
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 1ffd59a786..a28900eac9 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -21,23 +21,23 @@ sk:
         contact: 
           attributes: 
             person_id: 
-              taken: "must be unique among this user's contacts."
+              taken: "musí byť výnimočný medzi kontaktmi tohto užívateľa."
         person: 
           attributes: 
             diaspora_handle: 
-              taken: "is already taken."
+              taken: "je už obsadený."
         request: 
           attributes: 
             from_id: 
-              taken: "is a duplicate of a pre-existing request."
+              taken: "je duplikát už existujúcej požiadavky."
         user: 
           attributes: 
             email: 
-              taken: "is already taken."
+              taken: "je už obsadený."
             person: 
-              invalid: "is invalid."
+              invalid: "je neplatný."
             username: 
-              taken: "is already taken."
+              taken: "je už obsadený."
   ago: "%{time} dozadu"
   application: 
     helper: 
@@ -49,7 +49,7 @@ sk:
   are_you_sure: "Ste si istý?"
   aspect_memberships: 
     destroy: 
-      failure: "Failed to remove person from aspect"
+      failure: "Nepodarilo sa odstrániť osobu z hľadiska"
       no_membership: "Could not find the selected person in that aspect"
       success: "Successfully removed person from aspect"
   aspects: 
@@ -59,9 +59,9 @@ sk:
     aspect_contacts: 
       done_editing: "úprava dokončená"
     aspect_stream: 
-      activity: "activity"
-      post_time: "post time"
-      sort_by: "sort by:"
+      activity: "aktivita"
+      post_time: "čas pridania"
+      sort_by: "zoradiť podľa:"
     contacts_not_visible: "Kontakty v tomto aspekte sa nebudú môcť navzájom vidieť."
     contacts_visible: "Kontakty v tomto aspekte sa budú môcť navzájom vidieť."
     create: 
@@ -133,16 +133,16 @@ sk:
     other: "kontakty (%{count})"
     share_with_pane: 
       accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
-      add_new_aspect: "add to new aspect"
+      add_new_aspect: "pridať k novému aspektu"
       share_with: "Start sharing with %{name}"
     zero: "žiadne kontakty"
   conversations: 
     index: 
-      create_a_new_message: "create a new message"
+      create_a_new_message: "vytvoriť novú správu"
       message_inbox: "Message Inbox"
-      new_message: "New Message"
+      new_message: "Nová správa"
       no_conversation_selected: "no conversation selected"
-      no_messages: "no messages"
+      no_messages: "žiadne správy"
     new: 
       no_results: "No Results Found"
       send: "Send"
@@ -195,7 +195,7 @@ sk:
       if_they_accept_info: "Po odsúhlasení budú pozvaní užívatelia pridaný do aspektu."
       invite_someone_to_join: "Pozvite niekoho do Diaspory*!"
       personal_message: "Súkromná správa"
-      resend: "Resend"
+      resend: "Preposlať"
       send_an_invitation: "Send an invitation"
       send_invitation: "Poslať pozvánku"
       to: "Komu"
@@ -235,7 +235,7 @@ sk:
     index: 
       mark_all_as_read: "Všetko označiť ako prečítané"
       notifications: "Notifikácie"
-    mentioned: "has mentioned you in their"
+    mentioned: "Å¥a spomenuli v ich"
     new_request: "offered to share with you."
     post: "príspevok"
     request_accepted: "Vaša požiadavka bola akceptovaná."
@@ -252,9 +252,9 @@ sk:
     hello: "Ahoj %{name}!"
     love: "miluje,"
     mentioned: 
-      mentioned: "mentioned you in a post:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has mentioned you on Diaspora*"
+      mentioned: "ťa spomenul v príspevku:"
+      sign_in: "K prezeraniu sa prihlás."
+      subject: "%{name} ťa spomenul na Diaspore*"
     new_request: 
       just_sent_you: "Vám zaslal žiadosť v Diaspore*"
       sign_in: "Prihláste sa"
@@ -347,32 +347,36 @@ sk:
       edit: "upraviť"
       edit_delete_photo: "Upraviť popis fotky / zmazať fotku"
       make_profile_photo: "Zhotoviť profilovú fotku"
-      original_post: "Original Post"
+      original_post: "Pôvodný príspevok"
       permalink: "permalink"
       update_photo: "Aktualizovať fotku"
       view: "Pozrieť"
     update: 
       error: "Úprava fotky zlyhala."
       notice: "Fotka bola úspešne aktualizovaná."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "Predchádzajúce"
   profile: "Profil"
   profiles: 
     edit: 
       allow_search: "Allow for people to search for you within Diaspora"
-      edit_profile: "Edit profile"
-      first_name: "First name"
+      edit_profile: "Upraviť profil"
+      first_name: "Meno"
       info_available_to: "This info will be available to whomever you connect with on Diaspora."
-      last_name: "Last name"
-      update_profile: "Update Profile"
-      your_bio: "Your bio"
-      your_birthday: "Your birthday"
-      your_gender: "Your gender"
-      your_name: "Your name"
-      your_photo: "Your photo"
-      your_profile: "Your profile"
+      last_name: "Priezvisko"
+      update_profile: "Aktualizovať profil"
+      your_bio: "Niečo o mne"
+      your_birthday: "Dátum narodenia"
+      your_gender: "Pohlavie"
+      your_name: "Meno"
+      your_photo: "Tvoja fotka"
+      your_profile: "Profil"
     update: 
-      failed: "Failed to update profile"
-      updated: "Profile updated"
+      failed: "Aktualizovanie profilu zlyhalo"
+      updated: "Profil aktualizovaný"
   registrations: 
     closed: "Registrácie sú zatvorené"
     create: 
@@ -465,7 +469,7 @@ sk:
       all: "všetko"
       all_contacts: "VÅ¡etky kontakty"
       make_public: "Zverejniť"
-      mention_helper_text: "to mention someone, press '@' and start typing their name"
+      mention_helper_text: "spomenúť niekoho, stlač '@' a začni písať jeho meno"
       post_a_message_to: "Poslať správu na aspekt %{aspect}"
       posting: "Posielam..."
       share: "Zdieľať"
@@ -475,7 +479,7 @@ sk:
       reshare: "Znovu zdieľať"
   status_messages: 
     destroy: 
-      failure: "Failed to delete post"
+      failure: "Odstránenie príspevku zlyhalo"
     helper: 
       no_message_to_display: "Žiadne správy k zobrazeniu."
     new_status_message: 
@@ -515,11 +519,11 @@ sk:
       signup_steps: "Dokončite svoju registráciu týmito troma krokmi:"
       skip: "Preskočiť"
       step_2: 
-        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
-        skip: "Skip"
+        find_your_friends_on_diaspora: "Chceš nájsť svojich priateľov z Facebooku na Diaspore?"
+        skip: "Preskočiť"
       step_3: 
-        finish: "Finish"
-        people_already_on_diaspora: "People already on Diaspora"
+        finish: "Dokončiť"
+        people_already_on_diaspora: "Ľudia už na Diaspore"
       welcome: "Vitajte v Diaspore!"
     public: 
       does_not_exist: "Užívateľ %{username} neexistuje!"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 93d536d166..4fc81ccd08 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -354,6 +354,10 @@ sl:
     update: 
       error: "Urejanje slike ni uspelo."
       notice: "Slika uspešno posodobljena."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "prejšnja"
   profile: "Profil"
   profiles: 
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index cda24037a2..50192f6a59 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -354,6 +354,10 @@ sv:
     update: 
       error: "Misslyckades med att ändra fotot."
       notice: "Fotot är nu uppdaterat."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "föregående"
   profile: "Profil"
   profiles: 
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index deb5249318..8625587d16 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -354,6 +354,10 @@ tr:
     update: 
       error: "Fotoyu düzeltme basarısız oldu."
       notice: "Resim başarıyla eklendi."
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "previous"
   profile: "Profil"
   profiles: 
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 86e55bf56e..6f45252a37 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -4,14 +4,14 @@
 
 
 zh-TW: 
-  _aspect: "面向"
-  _aspects: "面向"
+  _aspect: "個面向"
+  _aspects: "個面向"
   _comment: "意見"
   _comments: "意見"
   _contact: "聯繫"
   _contacts: "聯繫"
   _home: "首頁"
-  _more: "More"
+  _more: "更多"
   _photos: "相片"
   _services: "服務"
   account: "帳號"
@@ -72,13 +72,13 @@ zh-TW:
       success: "成功刪除 %{name} 了."
     edit: 
       add_existing: "加入既有聯繫"
-      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
-      aspect_list_is_visible: "aspect list is visible to others in aspect"
+      aspect_list_is_not_visible: "面向中的其他人看不到他/她被加入"
+      aspect_list_is_visible: "面向中的其他人可看到他/她被加入"
       confirm_remove_aspect: "你確定要刪除這個面向?"
-      done: "Done"
+      done: "完成"
       remove_aspect: "刪除這個面向"
       rename: "改名"
-      update: "update"
+      update: "æ›´æ–°"
     helper: 
       are_you_sure: "你確定要刪除這個面向?"
       aspect_not_empty: "面向不是空的"
@@ -149,12 +149,12 @@ zh-TW:
       subject: "主旨"
       to: "收件人"
     show: 
-      delete: "delete and block conversation"
+      delete: "刪除並中止對話"
       reply: "回覆"
   date: 
     formats: 
       birthday: "%B %d"
-      birthday_with_year: "%B %d %Y"
+      birthday_with_year: "%Y %B %d"
       fullmonth_day: "%B %d"
   delete: "刪除"
   email: "電子郵件"
@@ -172,11 +172,11 @@ zh-TW:
       login_here: "從這裡登入"
       ownership: "所有權"
       ownership_explanation: "你擁有你的圖片, 且不該因為分享出去就失去它. 在 Diaspora, 所有你分享出去的東西, 你都仍有所有權, 你可以控制它們如何散布."
-      share_what_you_want: "跟你想要的人, 分享你想要的東西."
+      share_what_you_want: "分享你想分享的東西, 給你想分享的人."
       simplicity: "ç°¡å–®"
       simplicity_explanation: "Diaspora 讓分享變得單純且簡單, 而隱私也是一樣. 以隱私為出發點, Diaspora 讓你不用必須千辛萬苦的調整設定, 才能保護你的個人檔案安全."
-      tagline_first_half: "Share what you want,"
-      tagline_second_half: "with whom you want."
+      tagline_first_half: "分享你想分享的東西,"
+      tagline_second_half: "給你想分享的人."
   invitations: 
     check_token: 
       not_found: "找不到該邀請信物"
@@ -195,8 +195,8 @@ zh-TW:
       if_they_accept_info: "如果他們接受, 就會被加入至你所邀請的面向中."
       invite_someone_to_join: "邀請某人來加入 Diaspora!"
       personal_message: "個人訊息"
-      resend: "重送"
-      send_an_invitation: "送出邀請函"
+      resend: "重寄"
+      send_an_invitation: "寄出邀請函"
       send_invitation: "寄送邀請函"
       to: "收件人"
   layouts: 
@@ -224,46 +224,46 @@ zh-TW:
     one: "新的請求!"
     other: "%{count} 個新請求!"
     zero: "沒有新請求"
-  next: "next"
+  next: "後面"
   no_new_messages: "沒有新訊息"
   no_new_notifications: "沒有新消息"
   notifications: 
-    also_commented: "also commented on %{post_author}'s"
+    also_commented: "也在別處發表了意見, 在 %{post_author} 的"
     also_commented_deleted: "對一則已刪除的貼文發表意見"
-    comment_on_post: "commented on your"
+    comment_on_post: "發表了意見, 在你的"
     deleted: "已刪除"
     index: 
       mark_all_as_read: "全部標示為已讀"
       notifications: "消息"
-    mentioned: "has mentioned you in their"
+    mentioned: "提到了你, 在他們的"
     new_request: "想要跟你分享."
     post: "貼文"
     request_accepted: "已同意和你分享."
   notifier: 
     also_commented: 
-      commented: "也對 %{post_author} 的以下貼文發表意見:"
-      sign_in: "登入後才能觀看."
+      commented: "也對 %{post_author} 的貼文發表意見:"
+      sign_in: "登入來看看."
       subject: "%{name} 也對 %{post_author} 的貼文發表意見."
     comment_on_post: 
-      commented: "對你以下貼文發表意見:"
-      sign_in: "登入後才能觀看."
+      commented: "對你的貼文發表意見:"
+      sign_in: "登入來看看."
       subject: "%{name} 對你的貼文發表意見."
-    diaspora: "diaspora 電子郵件機器人"
-    hello: "%{name}, 你好!"
-    love: "love,"
+    diaspora: "diaspora 電郵機器人"
+    hello: "%{name}你好!"
+    love: "衷心祝福,"
     mentioned: 
-      mentioned: "mentioned you in a post:"
-      sign_in: "登入後才能觀看."
+      mentioned: "在貼文中提到你:"
+      sign_in: "登入來看看."
       subject: "%{name} 在 Diaspora* 提到你"
     new_request: 
       just_sent_you: "剛剛向你要求在 Diaspora* 上建立聯繫"
       sign_in: "由此登入"
       subject: "%{from} 想跟你在 Diaspora* 上建立聯繫的新請求"
-      try_it_out: "你應該考慮看一看."
+      try_it_out: "你應該考慮來看一看."
     private_message: 
       message_subject: "主旨: %{subject}"
       private_message: "已傳送私人訊息給你:"
-      sign_in: "登入後才能觀看."
+      sign_in: "登入來看看."
       subject: "%{name} 已在 Diaspora* 傳送私人訊息給你"
     request_accepted: 
       accepted: "已接受了跟你聯繫的請求!"
@@ -272,9 +272,9 @@ zh-TW:
     single_admin: 
       admin: "為您服務的 Diaspora 管理員"
       subject: "關於你的 Diaspora 帳號的訊息:"
-    thanks: "Thanks,"
-  ok: "OK"
-  or: "or"
+    thanks: "謝謝,"
+  ok: "好了"
+  or: "或是"
   pagination: 
     next: "下一頁"
     previous: "上一頁"
@@ -282,15 +282,15 @@ zh-TW:
   password_confirmation: "密碼確認"
   people: 
     aspect_list: 
-      edit_membership: "編輯面向成員"
+      edit_membership: "編輯所屬面向"
     helper: 
-      people_on_pod_are_aware_of: " people on pod are aware of"
-      results_for: " results for %{params}"
+      people_on_pod_are_aware_of: "Pod 上已知的人"
+      results_for: "%{params} 的搜尋結果"
     index: 
-      couldnt_find_them_send_invite: "找不到他們? 寄一張邀請函吧!"
+      couldnt_find_them_send_invite: "找不到他們? 寄一封邀請函吧!"
       no_one_found: "...找不到任何東西."
       no_results: "嘿! 搜尋要有目標."
-      results_for: "search results for"
+      results_for: "搜尋結果:"
     person: 
       add_contact: "加入聯繫"
       already_connected: "已建立連結"
@@ -302,7 +302,7 @@ zh-TW:
       cannot_remove: "無法將聯絡人從他/她最後一個面向中移除. (如果你想跟這個人斷絕連結, 你必須刪除他/她的聯繫.)"
       edit_my_profile: "編輯我的個人檔案"
       gender: "性別"
-      in_aspects: "in aspects"
+      in_aspects: "所屬面向"
       remove_contact: "刪除聯繫"
       remove_from: "要從 %{aspect} 刪除 %{name} 嗎?"
     show: 
@@ -316,7 +316,7 @@ zh-TW:
       return_to_aspects: "回你的面向主頁"
       similar_contacts: "相似的聯繫"
       start_sharing: "開始分享"
-      to_accept_or_ignore: "to accept or ignore it."
+      to_accept_or_ignore: "接受或不管它."
     webfinger: 
       fail: "抱歉, 找不到 %{handle}."
   photos: 
@@ -354,7 +354,11 @@ zh-TW:
     update: 
       error: "相片編輯失敗."
       notice: "相片更新成功."
-  previous: "previous"
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
+  previous: "前面"
   profile: "個人檔案"
   profiles: 
     edit: 
@@ -401,7 +405,7 @@ zh-TW:
       success: "你們現在是朋友了."
     manage_aspect_contacts: 
       existing: "聯繫編輯"
-      manage_within: "Manage contacts within"
+      manage_within: "管理聯繫:"
     new_request_to_person: 
       sent: "已送出!"
   search: "搜尋"
@@ -425,7 +429,7 @@ zh-TW:
       connect_to_twitter: "與 twitter 連結"
       disconnect: "切斷連結"
       edit_services: "編輯服務"
-      logged_in_as: "logged in as"
+      logged_in_as: "登入為"
       really_disconnect: "切斷與 %{service} 的連結?"
     inviter: 
       click_link_to_accept_invitation: "按一下這個連結來接受邀請"
@@ -469,7 +473,7 @@ zh-TW:
       post_a_message_to: "在 %{aspect} 發表訊息"
       posting: "發表中..."
       share: "分享"
-      share_with: "share with"
+      share_with: "與他/她分享:"
       whats_on_your_mind: "在想什麼?"
     reshare: 
       reshare: "重新分享"
@@ -480,14 +484,14 @@ zh-TW:
       no_message_to_display: "沒有訊息可顯示."
     new_status_message: 
       oh_yeah: "oh yeah!"
-      tell_me_something_good: "tell me something good"
+      tell_me_something_good: "報好康的給我"
     show: 
       destroy: "刪除"
       permalink: "靜態連結"
   stream_helper: 
     hide_comments: "隱藏意見"
     show_comments: "顯示所有意見"
-  the_world: "the world"
+  the_world: "全世界"
   username: "用戶名稱"
   users: 
     destroy: "帳號關閉成功."
@@ -500,7 +504,7 @@ zh-TW:
       download_photos: "下載我的相片"
       download_xml: "下載我的 xml"
       edit_account: "編輯帳號"
-      email_notifications: "電子郵件消息"
+      email_notifications: "電郵通知"
       export_data: "資料匯出"
       new_password: "新的密碼"
       receive_email_notifications: "要透過電子郵件接收消息?"
@@ -524,14 +528,14 @@ zh-TW:
     public: 
       does_not_exist: "不存在 %{username} 這個用戶!"
     update: 
-      email_notifications_changed: "電子郵件消息已更改"
+      email_notifications_changed: "電郵通知已更改"
       language_changed: "語言已更改"
       language_not_changed: "語言更改失敗"
       password_changed: "密碼已更改"
       password_not_changed: "密碼更改失敗"
   webfinger: 
-    fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
-    hcard_fetch_failed: "there was a problem fetching the hcard for %{account}"
-    no_person_constructed: "No person could be constructed from this hcard."
-    not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
-    xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
+    fetch_failed: "擷取 %{profile_url} 的 webfinger 個人檔案失敗"
+    hcard_fetch_failed: "擷取 %{account} 的 hcard 資料時發生錯誤"
+    no_person_constructed: "從這份 hcard 資料無法組出聯絡人."
+    not_enabled: "%{account} 的主機似乎沒有啟用 webfinger"
+    xrd_fetch_failed: "從 %{account} 這個帳號取得 xrd 時發生錯誤"
diff --git a/config/locales/diaspora/zh.yml b/config/locales/diaspora/zh.yml
index 46741659c8..4cc30d54dc 100644
--- a/config/locales/diaspora/zh.yml
+++ b/config/locales/diaspora/zh.yml
@@ -354,6 +354,10 @@ zh:
     update: 
       error: "照片编辑失败。"
       notice: "头像更新成功。"
+  posts: 
+    index: 
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      whatup: "What's happening on %{pod}"
   previous: "后退"
   profile: "个人资料"
   profiles: 
-- 
GitLab