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

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

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 2e6c4e48b92a4963594048460cf14314dc55adab..5f5e928097268b8102c06a60269e3335910328a7 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -222,7 +222,7 @@ ia:
       introduction: Clicca sur le carta pro cercar objectos a proximitate.
       nearby: Objectos proxime
       enclosing: Objectos inglobante
-  changeset:
+  changesets:
     changeset_paging_nav:
       showing_page: Pagina %{page}
       next: Sequente »
@@ -252,20 +252,26 @@ ia:
     timeout:
       sorry: Le lista de gruppos de modificationes que tu requestava tardava troppo
         de tempore pro esser recuperate.
-    rss:
-      title_all: Discussion sur le gruppo de modificationes OpenStreetMap
-      title_particular: Discussion sur le gruppo de modificationes OpenStreetMap №
-        %{changeset_id}
+  changeset_comments:
+    comment:
       comment: Nove commento sur le gruppo de modificationes № %{changeset_id} per
         %{author}
-      commented_at_html: Actualisate %{when} retro
       commented_at_by_html: Actualisate %{when} retro per %{user}
-      full: Discussion complete
-  diary_entry:
+    comments:
+      comment: Nove commento sur le gruppo de modificationes № %{changeset_id} per
+        %{author}
+    index:
+      title_all: Discussion sur le gruppo de modificationes OpenStreetMap
+      title_particular: Discussion sur le gruppo de modificationes OpenStreetMap №
+        %{changeset_id}
+    timeout:
+      sorry: Le lista de commentos sur gruppos de modificationes que tu requestava
+        tardava troppo de tempore pro esser recuperate.
+  diary_entries:
     new:
       title: Nove entrata de diario
       publish_button: Publicar
-    list:
+    index:
       title: Diarios de usatores
       title_friends: Diarios de amicos
       title_nearby: Diarios de usatores vicin
@@ -896,10 +902,7 @@ ia:
     intro_text: OpenStreetMap es un carta del mundo, create per gente como tu e libere
       de usar sub un licentia aperte.
     intro_2_create_account: Crea un conto de usator
-    partners_html: Le allogiamento web es supportate per %{ucl}, %{bytemark}, %{ic}
-      e altere %{partners}.
     partners_ucl: UCL
-    partners_ic: Imperial College London
     partners_bytemark: Bytemark Hosting
     partners_partners: partners
     osm_offline: Le base de datos de OpenStreetMap non es disponibile al momento debite
@@ -1207,6 +1210,9 @@ ia:
           <strong>Austria</strong>: Contine datos ab le
              <a href="https://data.wien.gv.at/">Citate de Vienna</a> licentiate sub
              <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>.
+        contributors_au_html: |-
+          <strong>Australia</strong>: Contine datos de suburbios a base
+             de datos del Australian Bureau of Statistics.
         contributors_ca_html: |-
           <strong>Canada</strong>: Contine datos ab
              GeoBase&reg;, GeoGratis (&copy; Department of Natural
@@ -1534,8 +1540,8 @@ ia:
       questions:
         title: Questiones?
         paragraph_1_html: |-
-          OpenStreetMap ha plure ressources pro apprender a cognoscer le projecto, pro poner e responder a questiones e pro discuter e documentar le subjectos de carthographia in collaboration con alteres.
-          <a href='%{help_url}'>Obtene adjuta hic</a>.
+          OpenStreetMap ha plure ressources pro apprender a cognoscer le projecto, pro poner e responder a questiones e pro discuter e documentar le subjectos de cartographia in collaboration con alteres.
+          <a href='%{help_url}'>Obtene adjuta hic</a>. Pertine tu a un organisation que face planos pro OpenStreetMap? <a href='https://welcome.openstreetmap.org/'>Benvenite a nostre "Welcome Mat"</a>.
       start_mapping: comenciar le cartographia
       add_a_note:
         title: Non ha tempore pro modificar? Adde un nota!
@@ -1662,8 +1668,6 @@ ia:
     require_cookies:
       cookies_needed: Tu pare haber disactivate le cookies. Per favor activa le cookies
         in tu navigator ante de continuar.
-    require_moderator:
-      not_a_moderator: Tu debe esser moderator pro executar iste action.
     setup_user_auth:
       blocked_zero_hour: Tu ha un message urgente sur le sito web de OpenStreetMap.
         Tu debe leger le message ante de poter salveguardar tu modificationes.
@@ -1761,7 +1765,7 @@ ia:
       flash: Le information del cliente ha essite actualisate con successo
     destroy:
       flash: Le registration del application cliente ha essite destruite
-  user:
+  users:
     login:
       title: Aperir session
       heading: Aperir session
@@ -2078,7 +2082,7 @@ ia:
       not_a_friend: '%{name} non es un de tu amicos.'
     filter:
       not_an_administrator: Tu debe esser administrator pro executar iste action.
-    list:
+    index:
       title: Usatores
       heading: Usatores
       showing:
@@ -2116,8 +2120,6 @@ ia:
         e contrasigno e postea associar le conto a tu ID in tu preferentias de usator.
   user_role:
     filter:
-      not_an_administrator: Solmente administratores pote gerer le rolos de usator,
-        e tu non es administrator.
       not_a_role: Le catena `%{role}' non es un rolo valide.
       already_has_role: Le usator ha ja le rolo %{role}.
       doesnt_have_role: Le usator non ha le rolo %{role}.