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

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

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 536f07727fe20f766a4e328f5a56c2f6b3f066c6..c322855f7f45536a502aa2908536ded185e7d5e2 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -237,7 +237,7 @@ ia:
       user: Usator
       comment: Commento
       area: Area
-    list:
+    index:
       title: Gruppos de modificationes
       title_user: Gruppos de modificationes per %{user}
       title_friend: Gruppos de modificationes facite per mi amicos
@@ -265,7 +265,7 @@ ia:
     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
@@ -288,7 +288,7 @@ ia:
       use_map_link: usar carta
       save_button: Salveguardar
       marker_text: Loco de entrata de diario
-    view:
+    show:
       title: Diario de %{user} | %{title}
       user_title: Diario de %{user}
       leave_a_comment: Lassar un commento
@@ -896,10 +896,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 +1204,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
@@ -1761,7 +1761,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
@@ -1900,7 +1900,7 @@ ia:
       body: Non existe un usator con le nomine %{user}. Per favor verifica le orthographia,
         o pote esser que le ligamine que tu sequeva es incorrecte.
       deleted: delite
-    view:
+    show:
       my diary: Mi diario
       new diary entry: nove entrata de diario
       my edits: Mi modificationes
@@ -2078,7 +2078,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: