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

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

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 12e5025452cbced0d835b10faf29d36c254dbbb3..23b7aedc209c1e1f32d609ec56a9dd379a5de3fa 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -269,6 +269,9 @@ ia:
         retain_changeset_discussions: Tu discussiones sur gruppos de modificationes,
           si existe, essera retenite.
         retain_email: Tu adresse de e-mail essera retenite.
+        recent_editing_html: Post que tu ha recentemente apportate modificationes,
+          tu conto non pote esser delite al momento. Le deletion essera possibile
+          in %{time}.
         confirm_delete: Es tu secur?
         cancel: Cancellar
   accounts:
@@ -1821,20 +1824,23 @@ ia:
     destroy:
       destroyed: Message delite
   passwords:
-    lost_password:
+    new:
       title: Contrasigno perdite
       heading: Contrasigno oblidate?
       email address: 'Adresse de e-mail:'
       new password button: Reinitialisar contrasigno
       help_text: Entra le adresse de e-mail que tu usava pro inscriber te, e nos te
         inviara un ligamine que tu pote usar pro reinitialisar tu contrasigno.
+    create:
       notice email on way: Es infortunate que tu lo perdeva :-( ma nos te ha inviate
         un e-mail que te permittera de reinitialisar lo.
       notice email cannot find: Non poteva trovar iste adresse de e-mail, pardono.
-    reset_password:
+    edit:
       title: Reinitialisar contrasigno
       heading: Reinitialisar le contrasigno de %{user}
       reset: Reinitialisar contrasigno
+      flash token bad: Token non trovate. Verifica le URL.
+    update:
       flash changed: Tu contrasigno ha essite cambiate.
       flash token bad: Token non trovate. Verifica le URL.
   preferences:
@@ -2327,10 +2333,13 @@ ia:
           cycleway_local: Pista cyclabile local
           footway: Sentiero pro pedones
           rail: Ferrovia
+          train: Traino
           subway: Metro
-          tram:
-          - Ferrovia legier
-          - tram
+          ferry: Ferry-boat
+          light_rail: Ferrovia legier
+          tram_only: Tram
+          trolleybus: Trolleybus
+          bus: Autobus
           cable:
           - Telepherico
           - Telesedia
@@ -2341,22 +2350,38 @@ ia:
           - Platteforma pro aviones
           - terminal
           admin: Limite administrative
-          forest: Foreste
-          wood: Bosco
+          orchard:
+          - Verdiero
+          - vinia
+          forest:
+          - Foreste
+          - bosco
+          farmland: Terra agricole
+          grass:
+          - Herba
+          - prato
+          bare_rock: Rocca nude
+          sand: Sablo
           golf: Percurso de golf
           park: Parco
-          resident: Area residential
           common:
           - Commun
           - prato
           - jardin
+          built_up: Area edificate
+          resident: Area residential
           retail: Zona de commercio al detalio
           industrial: Area industrial
           commercial: Area commercial
           heathland: Landa
+          scrubland: Terreno de brossas
           lake:
           - Laco
           - bassino
+          intermittent_water: Massa de aqua intermittente
+          glacier: Glaciero
+          reef: Scolio
+          wetland: Terra humide
           farm: Ferma
           brownfield: Terra in reposo
           cemetery: Cemeterio
@@ -2368,6 +2393,7 @@ ia:
           school:
           - Schola
           - universitate
+          - hospital
           building: Edificio significante
           station: Station ferroviari
           summit:
@@ -2378,6 +2404,8 @@ ia:
           private: Accesso private
           destination: Traffico local
           construction: Vias in construction
+          bus_stop: Halto de autobus
+          stop: Halto
           bicycle_shop: Magazin de bicyclettas
           bicycle_parking: Parcamento de bicyclettas
           toilets: Toilettes
@@ -2421,6 +2449,7 @@ ia:
         imports: Importationes
         automated_edits: Modificationes automatisate
       start_mapping: comenciar le cartographia
+      continue_authorization: Continuar autorisation
       add_a_note:
         title: Non ha tempore pro modificar? Adde un nota!
         para_1: Si tu vole meliorar un micre cosa e non ha le tempore pro crear un
@@ -3114,6 +3143,8 @@ ia:
       map_data_zoom_in_tooltip: Face zoom avante pro vider le datos del carta
       queryfeature_tooltip: Cercar objectos
       queryfeature_disabled_tooltip: Face zoom avante pro cercar objectos
+      embed_html_disabled: Le incastration de HTML non es disponibile pro iste strato
+        cartographic
     changesets:
       show:
         comment: Commento