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 b17910f65c1bb47c94bef6e484df92e96eda0898..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:
@@ -1249,13 +1254,16 @@ ia:
         Licentia</a> pro detalios.
       legal_title: Juridic
       legal_html: "Iste sito e multe altere servicios associate es formalmente gerite
-        per le  \n<a href=\"http://osmfoundation.org/\">Fundation OpenStreetMap</a>
+        per le  \n<a href=\"https://osmfoundation.org/\">Fundation OpenStreetMap</a>
         (OSMF) \nin nomine del communitate. Le uso de tote le servicios gerite per
-        OSMF es subjecte a nostre <a href=\"http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\npoliticas
+        OSMF es subjecte a nostre <a href=\"https://wiki.osmfoundation.org/wiki/Terms_of_Use\">conditiones
+        de uso</a>, a nostre <a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\npoliticas
         de uso acceptabile</a> e a nostre <a href=\"http://wiki.osmfoundation.org/wiki/Privacy_Policy\">politica
-        de confidentialitate</a>\n<br> \n<a href=\"http://osmfoundation.org/Contact\">Contacta
+        de confidentialitate</a>.\n<br> \n<a href=\"https://osmfoundation.org/Contact\">Contacta
         OSMF</a> \nsi vos ha questiones sur licentias, derectos de autor o altere
-        themas juridic."
+        themas juridic.\n<br>\nOpenStreetMap, le logotypo de lupa e \"State of the
+        Map\" es <a href=\"https://wiki.osmfoundation.org/wiki/Trademark_Policy\">marcas
+        commercial registrate del OSMF</a>."
       partners_title: Partners
     copyright:
       foreign:
@@ -1985,18 +1993,20 @@ ia:
         de contributor. Pro plus informationes, per favor vide <a href="%{url}">iste
         pagina wiki</a>.
     terms:
-      title: Conditiones de contributor
-      heading: Conditiones de contributor
-      read and accept: Per favor lege le contracto hic infra e preme le button de
-        acceptation pro confirmar que tu accepta le terminos de iste contracto pro
-        tu existente e futur contributiones.
-      consider_pd: In addition al contracto hic supra, io considera mi contributiones
-        como essente in le dominio public
+      title: Conditiones
+      heading: Conditiones
+      heading_ct: Conditiones de contributor
+      read and accept with tou: Per favor, lege le accordo de contributor e le conditiones
+        de uso, marca ambe quadratos quando tu es finite e pois preme le button Continuar.
+      contributor_terms_explain: Iste accordo regula le conditiones de tu contributiones
+        existente e futur.
+      read_ct: Io ha legite e io accepta le precedente terminos de contributor
+      consider_pd: In addition a lo que precede, io considera mi contributiones como
+        essente in le dominio public
       consider_pd_why: que es isto?
       guidance: 'Informationes pro adjutar a comprender iste terminos: a <a href="%{summary}">summario
         facile a comprender</a> e alcun <a href="%{translations}">traductiones non
         official</a>'
-      agree: Acceptar
       decline: Declinar
       you need to accept or decline: Per favor lege e postea accepta o declina le
         nove Conditiones del Contributor pro continuar.
@@ -2303,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}
@@ -2410,6 +2421,8 @@ ia:
         title: Stratos
       copyright: © <a href='%{copyright_url}'>contributores de OpenStreetMap</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Facer un donation</a>
+      terms: <a href='%{terms_url}' target='_blank'>Conditiones del sito web e del
+        API</a>
     site:
       edit_tooltip: Modificar le carta
       edit_disabled_tooltip: Face zoom avante pro modificar le carta