Merge remote-tracking branch 'upstream/pull/2228'

[rails.git] / config / locales / ia.yml

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index ec3eb052db98c53b9f79e71169b7a77272e6a0d4..914329041058de391ba45b5197d65570ddea066f 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -13,6 +13,10 @@ ia:
   time:
     formats:
       friendly: '%e de %B %Y a %H:%M'
+  helpers:
+    submit:
+      diary_entry:
+        create: Publicar
   activerecord:
     errors:
       messages:
@@ -298,7 +302,14 @@ ia:
   diary_entries:
     new:
       title: Nove entrata de diario
-      publish_button: Publicar
+    form:
+      subject: 'Subjecto:'
+      body: 'Texto:'
+      language: 'Lingua:'
+      location: 'Loco:'
+      latitude: 'Latitude:'
+      longitude: 'Longitude:'
+      use_map_link: usar carta
     index:
       title: Diarios de usatores
       title_friends: Diarios de amicos
@@ -313,14 +324,6 @@ ia:
       newer_entries: Entratas plus recente
     edit:
       title: Modificar entrata de diario
-      subject: 'Subjecto:'
-      body: 'Texto:'
-      language: 'Lingua:'
-      location: 'Loco:'
-      latitude: 'Latitude:'
-      longitude: 'Longitude:'
-      use_map_link: usar carta
-      save_button: Salveguardar
       marker_text: Loco de entrata de diario
     show:
       title: Diario de %{user} | %{title}
@@ -344,11 +347,13 @@ ia:
         other: '%{count} commentos'
       edit_link: Modificar iste entrata
       hide_link: Celar iste entrata
+      unhide_link: Non plus celar iste entrata
       confirm: Confirmar
       report: Signalar iste entrata
     diary_comment:
       comment_from: Commento de %{link_user} a %{comment_created_at}
       hide_link: Celar iste commento
+      unhide_link: Non plus celar iste commento
       confirm: Confirmar
       report: Signalar iste commento
     location:
@@ -2308,15 +2313,16 @@ ia:
       confirm: Es tu secur de voler revocar iste blocada?
       revoke: Revocar!
       flash: Iste blocada ha essite revocate.
-    period:
-      one: 1 hora
-      other: '%{count} horas'
     helper:
       time_future: Expira in %{time}.
       until_login: Active usque le usator aperi un session.
       time_future_and_until_login: Termina in %{time} e post que le usator ha aperite
         session.
       time_past: Expirava %{time} retro.
+      block_duration:
+        hours:
+          one: 1 hora
+          other: '%{count} horas'
     blocks_on:
       title: Blocadas de %{name}
       heading: Lista de blocadas de %{name}