Merge branch 'master' of github.com:diaspora/diaspora

config/locales/diaspora/da.yml

@@ -68,7 +68,7 @@ da:
       failure: "Fejl under oprettelse af aspektet."
       success: "Klik på plusset i venstre side for at fortælle diaspora, hvem der kan se dit nye aspekt."
     destroy: 
-      failure: "%{name} is not empty and could not be removed."
+      failure: "%{name} er ikke tom, og kan derfor ikke slettes."
       success: "%{name} fjernet."
     edit: 
       add_existing: "Tilføj en eksisterende kontakt "

config/locales/diaspora/de.yml

@@ -68,7 +68,7 @@ de:
       failure: "Erstellen des Aspekts fehlgeschlagen."
       success: "Dein neuer Aspekt %{name} wurde erstellt."
     destroy: 
-      failure: "%{name} is not empty and could not be removed."
+      failure: "%{name} ist nicht leer und konnte nicht entfernt werden."
       success: "%{name} wurde erfolgreich entfernt."
     edit: 
       add_existing: "Ein bereits bestehendes Konto hinzufügen"

config/locales/diaspora/el.yml

@@ -68,7 +68,7 @@ el:
       failure: "Η δημιουργία της πτυχής απέτυχε."
       success: "Η νέα σας πτυχή %{name} δημιουργήθηκε"
     destroy: 
-      failure: "%{name} is not empty and could not be removed."
+      failure: "Το όνομα %{name} δεν είναι άδειο και δεν μπορεί να αφαιρεθεί."
       success: "Ο χρήστης %{name} αφαιρέθηκε επιτυχώς."
     edit: 
       add_existing: "Προσθέστε μια υπάρχουσα επαφή"
@@ -208,8 +208,8 @@ el:
   next: "επόμενο"
   no_new_notifications: "καμία νέα ειδοποίηση"
   notifications: 
-    also_commented: "επίσης σχολίασε στην επαφή σας"
+    also_commented: "επίσης σχολίασε τη %{post_author}"
-    also_commented_deleted: "commented on a deleted post"
+    also_commented_deleted: "σχολιάστηκε σε διαγεγραμμένη δημοσίευση"
     comment_on_post: "σχολίασε τη"
     deleted: "διαγράφηκε"
     index: 
@@ -221,9 +221,9 @@ el:
     request_accepted: "δέχτηκε το αίτημα σας για διαμοιρασμό. "
   notifier: 
     also_commented: 
-      commented: "σχολίασε επίσης τη δημοσίευση του χρήστη %{post_author} :"
+      commented: "σχολίασε επίσης τη %{post_author} :"
       sign_in: "Συνδεθείτε για να το δείτε."
-      subject: "Ο/Η %{name} επίσης σχολίασε στη δημοσίευση της επαφής σας."
+      subject: "Ο/Η %{name} επίσης σχολίασε τη %{post_author}"
     comment_on_post: 
       commented: "έχει σχολιάσει σε δημοσίευση σας:"
       sign_in: "Συνδεθείτε για να το δείτε."

config/locales/diaspora/en_shaw.yml

@@ -68,7 +68,7 @@ en_shaw:
       failure: "𐑨𐑕𐑐𐑧𐑒𐑑 𐑒𐑮𐑦𐑱𐑖𐑩𐑯 𐑓𐑱𐑤𐑛."
       success: "𐑿𐑼 𐑯𐑿 𐑨𐑕𐑐𐑧𐑒𐑑 %{name} 𐑢𐑪𐑟 𐑒𐑮𐑦𐑱𐑑𐑩𐑛"
     destroy: 
-      failure: "%{name} is not empty and could not be removed."
+      failure: "%{name} ez dago hutsik eta ezin izan da ezabatu."
       success: "%{name} 𐑢𐑪𐑟 𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑮𐑦𐑥𐑵𐑝𐑛."
     edit: 
       add_existing: "𐑨𐑛 𐑩𐑯 𐑧𐑜𐑟𐑦𐑕𐑑𐑦𐑙 𐑒𐑪𐑯𐑑𐑨𐑒𐑑"
@@ -208,7 +208,7 @@ en_shaw:
   next: "𐑯𐑧𐑒𐑕𐑑"
   no_new_notifications: "𐑯𐑴 𐑯𐑿 𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟"
   notifications: 
-    also_commented: "𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑿𐑼 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
+    also_commented: "(e)k iruzkindu du %{post_author}(r)en mezuan ere"
     also_commented_deleted: "𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑩 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑"
     comment_on_post: "𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑿𐑼"
     deleted: "𐑛𐑦𐑤𐑰𐑑𐑩𐑛"
@@ -223,7 +223,7 @@ en_shaw:
     also_commented: 
       commented: "𐑣𐑨𐑟 𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 %{post_author}𐑟 𐑐𐑴𐑕𐑑:"
       sign_in: "𐑕𐑲𐑯 𐑦𐑯 𐑑 𐑝𐑿 𐑦𐑑."
-      subject: "%{name} 𐑣𐑨𐑟 𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑿𐑼 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕 𐑐𐑴𐑕𐑑."
+      subject: "%{name}(e)k ere iruzkindu du %{post_author}(r)en mezua."
     comment_on_post: 
       commented: "𐑣𐑨𐑟 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑿𐑼 𐑐𐑴𐑕𐑑:"
       sign_in: "𐑕𐑲𐑯 𐑦𐑯 𐑑 𐑝𐑿 𐑦𐑑."

config/locales/diaspora/es.yml

@@ -38,7 +38,7 @@ es:
               invalid: "no es válido."
             username: 
               taken: "ya está ocupado."
-  ago: "hace %{time} "
+  ago: "%{time} "
   application: 
     helper: 
       aspect_badge: 
@@ -68,7 +68,7 @@ es:
       failure: "Creación de Aspecto fallida."
       success: "Tu nuevo Aspecto %{name} ha sido creado."
     destroy: 
-      failure: "%{name} is not empty and could not be removed."
+      failure: "El aspecto %{name} no está vacío y no pudo ser borrado."
       success: "%{name} fue eliminado correctamente."
     edit: 
       add_existing: "Añadir un contacto existente."
@@ -199,7 +199,7 @@ es:
       logout: "Desconectarse"
       view_profile: "Ver Perfil"
   more: "Más"
-  new_notifications: "%{count} nuevas notificaciones"
+  new_notifications: "%{count} nueva/s notificacion/es"
   new_requests: 
     few: "¡%{count} nuevas notificaciones!"
     one: "¡Nueva solicitud!"
@@ -208,8 +208,8 @@ es:
   next: "Siguiente"
   no_new_notifications: "No hay nuevas notificaciones"
   notifications: 
-    also_commented: "también comentado"
+    also_commented: "también ha comentado en %{post_author}"
-    also_commented_deleted: "commented on a deleted post"
+    also_commented_deleted: "comentó en una publicación eliminada"
     comment_on_post: "escribió en tu"
     deleted: "eliminado"
     index: 
@@ -223,7 +223,7 @@ es:
     also_commented: 
       commented: "también participó en la publicación de %{post_author}:"
       sign_in: "Conéctate para verlo."
-      subject: "%{name} también participó en la publicación de tu contacto."
+      subject: "%{name} también participó en la publicación de %{post_author}."
     comment_on_post: 
       commented: "escribió en tu publicación:"
       sign_in: "Conéctate para verlo."

config/locales/diaspora/eu.yml

@@ -49,9 +49,9 @@ eu:
   are_you_sure: "Ziur al zaude?"
   aspect_memberships: 
     destroy: 
-      failure: "Failed to remove person from aspect"
+      failure: "Akatsa pertsona alderditik ezabatzean"
-      no_membership: "Could not find the selected person in that aspect"
+      no_membership: "Ezin izan da hautatutako pertsona aurkitu alderdian"
-      success: "Successfully removed person from aspect"
+      success: "Pertsona arrakastaz ezabatua alderditik"
   aspects: 
     add_to_aspect: 
       failure: "Akatsa adiskidea alderdira gehitzean."
@@ -59,16 +59,16 @@ eu:
     aspect_contacts: 
       done_editing: "aldaketak gauzatu"
     aspect_stream: 
-      activity: "activity"
+      activity: "jarduera"
-      post_time: "post time"
+      post_time: "mezuaren dataren arabera"
-      sort_by: "sort by:"
+      sort_by: "sailkatu:"
     contacts_not_visible: "Alderdi honetako adiskideak nor dagoen bere alderdian ezingo dute ikusi."
     contacts_visible: "Alderdi honetako adiskideak jokingo dute nor dagoen alderdian."
     create: 
       failure: "Akatsa alderdiaren sormenean."
       success: "Zure alderdia, %{name}, sortua izan da."
     destroy: 
-      failure: "%{name} is not empty and could not be removed."
+      failure: "%{name} ez dago hutsik eta ezin izan da ezabatu."
       success: "%{name} arrakastaz ezabatu da."
     edit: 
       add_existing: "Jada adiskide den norbait gehitu"
@@ -122,17 +122,17 @@ eu:
       commenting: "Iruzkintzen..."
   contacts: 
     create: 
-      failure: "Failed to create contact"
+      failure: "Akatsa adiskide berria sortzean"
     destroy: 
-      failure: "Failed to disconnect from %{name}"
+      failure: "Akatsa %{name} ezabatzean"
-      success: "Successfully disconnected from %{name}"
+      success: "Arrakastaz ezabatu duzu %{name} adiskide zerrendatik"
     few: "%{count} adiskide"
     one: "adiskide 1"
     other: "%{count} adiskide"
     share_with_pane: 
-      accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
+      accepts: "%{name}(e)k onartzen duenean, bakoitzak bestearen mezuak ikusiko ditu Diasporan"
-      add_new_aspect: "add to new aspect"
+      add_new_aspect: "alderdi berrira gehitu"
-      share_with: "Start sharing with %{name}"
+      share_with: "%{name}(r)ekin harremanetan hasi"
     zero: "adiskiderik ez"
   date: 
     formats: 
@@ -209,7 +209,7 @@ eu:
   no_new_notifications: "jakinarazpen berririk ez"
   notifications: 
     also_commented: "iruzkindua baita zure kontaktuaren"
-    also_commented_deleted: "commented on a deleted post"
+    also_commented_deleted: "mezu ezabatu bat iruzkindu du"
     comment_on_post: "iruzkindua zure"
     deleted: "ezabatuta"
     index: 
@@ -332,21 +332,21 @@ eu:
   profile: "Profila"
   profiles: 
     edit: 
-      allow_search: "Allow for people to search for you within Diaspora"
+      allow_search: "Jendea baimendu zu Diasporan bilatzera"
-      edit_profile: "Edit profile"
+      edit_profile: "Profila aldatu"
-      first_name: "First name"
+      first_name: "Izena"
-      info_available_to: "This info will be available to whomever you connect with on Diaspora."
+      info_available_to: "Informazio hau eskuragarri egongo da zure Diasporako harreman guztientzat"
-      last_name: "Last name"
+      last_name: "Abizena"
-      update_profile: "Update Profile"
+      update_profile: "Profila Eguneratu"
-      your_bio: "Your bio"
+      your_bio: "Zuri buruz"
-      your_birthday: "Your birthday"
+      your_birthday: "Zure urtemuga"
-      your_gender: "Your gender"
+      your_gender: "Zure sexua"
-      your_name: "Your name"
+      your_name: "Zure izena"
-      your_photo: "Your photo"
+      your_photo: "Zure argazkia"
-      your_profile: "Your profile"
+      your_profile: "Zure profila"
     update: 
-      failed: "Failed to update profile"
+      failed: "Akatsa profila eguneratzean"
-      updated: "Profile updated"
+      updated: "Profila eguneratu duzu."
   registrations: 
     closed: "Izen emateak itxirik daude Diaspora zerbitzari hontan."
     create: 

config/locales/diaspora/fi.yml

@@ -208,7 +208,7 @@ fi:
   next: "seuraava"
   no_new_notifications: "ei uusia ilmoituksia"
   notifications: 
-    also_commented: "kommentoi myös kontaktisi"
+    also_commented: "kommentoi myös %{post_author}:n"
     also_commented_deleted: "commented on a deleted post"
     comment_on_post: "kommentoi sinun"
     deleted: "poistetut"
@@ -223,7 +223,7 @@ fi:
     also_commented: 
       commented: "kommentoi myös käyttäjän %{post_author} viestiin:"
       sign_in: "Kirjaudu sisään nähdäksesi."
-      subject: "%{name} on myös kommentoinut kontaktisi viestiin."
+      subject: "%{name} on myös kommentoinut %{post_author}:n viestiin."
     comment_on_post: 
       commented: "on kommentoinut viestiisi:"
       sign_in: "Kirjaudu sisään nähdäksesi."

config/locales/diaspora/gl.yml

@@ -68,7 +68,7 @@ gl:
       failure: "Fallou a creación do aspecto."
       success: "O aspecto %{name} foi creado"
     destroy: 
-      failure: "%{name} is not empty and could not be removed."
+      failure: "%{name} non está baleiro, polo tanto non pode ser borrado."
       success: "%{name} foi eliminado correctamente."
     edit: 
       add_existing: "Engadir un contacto existente"

config/locales/diaspora/hu.yml

@@ -68,7 +68,7 @@ hu:
       failure: "Csoport létrehozása sikertelen."
       success: "Új csoport létrehozva: %{name}"
     destroy: 
-      failure: "%{name} is not empty and could not be removed."
+      failure: "%{name} nem üres, így nem lehet törölni."
       success: "%{name} csoport sikeresen törölve."
     edit: 
       add_existing: "Létező kapcsolat hozzáadása"

config/locales/diaspora/nl.yml

@@ -68,7 +68,7 @@ nl:
       failure: "Aanmaken van aspect is mislukt."
       success: "Je nieuwe aspect %{name} is aangemaakt"
     destroy: 
-      failure: "%{name} is not empty and could not be removed."
+      failure: "%{name} is niet leeg en kan niet verwijderd worden."
       success: "%{name} is met succes verwijderd."
     edit: 
       add_existing: "Voeg een bestaand contact toe"
@@ -189,7 +189,7 @@ nl:
       powered_by: "POWERED BY DIASPORA*"
       toggle: "switch mobiele versie"
       whats_new: "wat is nieuw op Diaspora?"
-      your_aspects: "jou aspecten"
+      your_aspects: "jouw aspecten"
     header: 
       account_settings: "account instellingen"
       blog: "blog"
@@ -223,11 +223,11 @@ nl:
     also_commented: 
       commented: "heeft ook op %{post_author}'s post gereageerd:"
       sign_in: "Log in om het te zien."
-      subject: "%{name} heeft ook gereageerd %{post_author}'s post."
+      subject: "%{name} heeft ook gereageerd op %{post_author}'s post."
     comment_on_post: 
-      commented: "heeft gereageerd op jou post:"
+      commented: "heeft gereageerd op jouw post:"
       sign_in: "Log in om het te zien."
-      subject: "%{name} heeft op jou post gereageerd."
+      subject: "%{name} heeft op jouw post gereageerd."
     diaspora: "de diaspora email robot"
     hello: "Hoi %{name}!"
     love: "liefs,"
@@ -489,7 +489,7 @@ nl:
       signup_steps: "Voltooi je aanmelding door middel van de volgende drie stappen:"
       skip: "sla 'getting started' over"
       step_2: 
-        find_your_friends_on_diaspora: "Wil je jou Facebook-vrienden vinden op Diaspora?"
+        find_your_friends_on_diaspora: "Wil je jouw Facebook-vrienden vinden op Diaspora?"
         skip: "Overslaan"
       step_3: 
         finish: "Voltooien"