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

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

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 12e5025452cbced0d835b10faf29d36c254dbbb3..3493cc9b11c9d5ca2353e56b33b459712566d1ab 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.
         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:
         confirm_delete: Es tu secur?
         cancel: Cancellar
   accounts:


@@ -1465,9 +1468,9 @@ ia:
         one: '%{count} reporto'
         other: '%{count} reportos'
       no_reports: Nulle reporto
         one: '%{count} reporto'
         other: '%{count} reportos'
       no_reports: Nulle reporto

-      report_created_at: 'Prime reporto: %{datetime}'
-      last_resolved_at: 'Ultime resolution: %{datetime}'
-      last_updated_at: 'Ultime actualisation: %{datetime} per %{displayname}'
+      report_created_at_html: 'Prime reporto: %{datetime}'
+      last_resolved_at_html: 'Ultime resolution: %{datetime}'
+      last_updated_at_html: 'Ultime actualisation: %{datetime} per %{displayname}'

       resolve: Resolver
       ignore: Ignorar
       reopen: Reaperir
       resolve: Resolver
       ignore: Ignorar
       reopen: Reaperir


@@ -1755,8 +1758,6 @@ ia:
   messages:
     inbox:
       title: Cassa de entrata
   messages:
     inbox:
       title: Cassa de entrata

-      my_inbox: Mi cassa de entrata
-      my_outbox: Mi cassa de exito

       messages: Tu ha %{new_messages} e %{old_messages}
       new_messages:
         one: '%{count} nove message'
       messages: Tu ha %{new_messages} e %{old_messages}
       new_messages:
         one: '%{count} nove message'


@@ -1764,12 +1765,14 @@ ia:
       old_messages:
         one: '%{count} ancian message'
         other: '%{count} ancian messages'
       old_messages:
         one: '%{count} ancian message'
         other: '%{count} ancian messages'

-      from: De
-      subject: Subjecto
-      date: Data

       no_messages_yet_html: Tu non ha ancora messages. Proque non contactar alcun
         %{people_mapping_nearby_link}?
       people_mapping_nearby: cartographos vicin
       no_messages_yet_html: Tu non ha ancora messages. Proque non contactar alcun
         %{people_mapping_nearby_link}?
       people_mapping_nearby: cartographos vicin

+    messages_table:
+      from: De
+      to: A
+      subject: Subjecto
+      date: Data

     message_summary:
       unread_button: Marcar como non legite
       read_button: Marcar como legite
     message_summary:
       unread_button: Marcar como non legite
       read_button: Marcar como legite


@@ -1789,14 +1792,9 @@ ia:
       body: Non existe un message con iste ID.
     outbox:
       title: Cassa de exito
       body: Non existe un message con iste ID.
     outbox:
       title: Cassa de exito

-      my_inbox: Mi cassa de entrata
-      my_outbox: Mi cassa de exito

       messages:
         one: Tu ha %{count} message inviate
         other: Tu ha %{count} messages inviate
       messages:
         one: Tu ha %{count} message inviate
         other: Tu ha %{count} messages inviate

-      to: A
-      subject: Subjecto
-      date: Data

       no_sent_messages_html: Tu non ha ancora inviate alcun message. Proque non contactar
         alcun %{people_mapping_nearby_link}?
       people_mapping_nearby: cartographos vicin
       no_sent_messages_html: Tu non ha ancora inviate alcun message. Proque non contactar
         alcun %{people_mapping_nearby_link}?
       people_mapping_nearby: cartographos vicin


@@ -1815,26 +1813,32 @@ ia:
         le usator correcte pro poter leger lo.
     sent_message_summary:
       destroy_button: Deler
         le usator correcte pro poter leger lo.
     sent_message_summary:
       destroy_button: Deler

+    heading:
+      my_inbox: Mi cassa de entrata
+      my_outbox: Mi cassa de exito

     mark:
       as_read: Message marcate como legite
       as_unread: Message marcate como non legite
     destroy:
       destroyed: Message delite
   passwords:
     mark:
       as_read: Message marcate como legite
       as_unread: Message marcate como non legite
     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.
       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.
       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
       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:
       flash changed: Tu contrasigno ha essite cambiate.
       flash token bad: Token non trovate. Verifica le URL.
   preferences:


@@ -2177,12 +2181,7 @@ ia:
         iste functionalitate.
     export:
       title: Exportar
         iste functionalitate.
     export:
       title: Exportar

-      area_to_export: Area a exportar

       manually_select: Seliger manualmente un altere area
       manually_select: Seliger manualmente un altere area

-      format_to_export: Formato de exportation
-      osm_xml_data: Datos XML de OpenStreetMap
-      map_image: Imagine de carta (monstra le strato standard)
-      embeddable_html: HTML incorporabile

       licence: Licentia
       licence_details_html: Le datos de OpenStreetMap data es sub licentia %{odbl_link}
         (ODbL).
       licence: Licentia
       licence_details_html: Le datos de OpenStreetMap data es sub licentia %{odbl_link}
         (ODbL).


@@ -2208,17 +2207,6 @@ ia:
         other:
           title: Altere fontes
           description: Fontes additional listate in le wiki de OpenStreetMap
         other:
           title: Altere fontes
           description: Fontes additional listate in le wiki de OpenStreetMap

-      options: Optiones
-      format: 'Formato:'
-      scale: Scala
-      max: max
-      image_size: 'Dimension del imagine:'
-      zoom: Zoom
-      add_marker: Adder un marcator al carta
-      latitude: 'Lat:'
-      longitude: 'Lon:'
-      output: Resultato
-      paste_html: Colla HTML pro incorporar in sito web

       export_button: Exportar
     fixthemap:
       title: Reportar un problema / Corriger le carta
       export_button: Exportar
     fixthemap:
       title: Reportar un problema / Corriger le carta


@@ -2327,36 +2315,44 @@ ia:
           cycleway_local: Pista cyclabile local
           footway: Sentiero pro pedones
           rail: Ferrovia
           cycleway_local: Pista cyclabile local
           footway: Sentiero pro pedones
           rail: Ferrovia

+          train: Traino

           subway: Metro
           subway: Metro

-          tram:
-          - Ferrovia legier
-          - tram
-          cable:
-          - Telepherico
-          - Telesedia
-          runway:
-          - Pista de aeroporto
-          - via de circulation pro aviones
-          apron:
-          - Platteforma pro aviones
-          - terminal
+          ferry: Ferry-boat
+          light_rail: Ferrovia legier
+          tram: Tram
+          trolleybus: Trolleybus
+          bus: Autobus
+          cable_car: Telepherico
+          chair_lift: Telesedia
+          runway: Pista de aeroporto
+          taxiway: Via de circulation pro aviones
+          apron: Platteforma pro aviones

           admin: Limite administrative
           admin: Limite administrative

+          orchard: Verdiero
+          vineyard: Vinia

           forest: Foreste
           wood: Bosco
           forest: Foreste
           wood: Bosco

+          farmland: Terra agricole
+          grass: Herba
+          meadow: Prato
+          bare_rock: Rocca nude
+          sand: Sablo

           golf: Percurso de golf
           park: Parco
           golf: Percurso de golf
           park: Parco

+          common: Commun
+          built_up: Area edificate

           resident: Area residential
           resident: Area residential

-          common:
-          - Commun
-          - prato
-          - jardin

           retail: Zona de commercio al detalio
           industrial: Area industrial
           commercial: Area commercial
           heathland: Landa
           retail: Zona de commercio al detalio
           industrial: Area industrial
           commercial: Area commercial
           heathland: Landa

-          lake:
-          - Laco
-          - bassino
+          scrubland: Terreno de brossas
+          lake: Laco
+          reservoir: Reservoir
+          intermittent_water: Massa de aqua intermittente
+          glacier: Glaciero
+          reef: Scolio
+          wetland: Terra humide

           farm: Ferma
           brownfield: Terra in reposo
           cemetery: Cemeterio
           farm: Ferma
           brownfield: Terra in reposo
           cemetery: Cemeterio


@@ -2365,19 +2361,20 @@ ia:
           centre: Centro de sport
           reserve: Reserva natural
           military: Area militar
           centre: Centro de sport
           reserve: Reserva natural
           military: Area militar

-          school:
-          - Schola
-          - universitate
+          school: Schola
+          university: Universitate
+          hospital: Hospital

           building: Edificio significante
           station: Station ferroviari
           building: Edificio significante
           station: Station ferroviari

-          summit:
-          - Summitate
-          - picco
+          summit: Summitate
+          peak: Picco

           tunnel: Bordo a lineettas = tunnel
           bridge: Bordo nigre = ponte
           private: Accesso private
           destination: Traffico local
           construction: Vias in construction
           tunnel: Bordo a lineettas = tunnel
           bridge: Bordo nigre = ponte
           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
           bicycle_shop: Magazin de bicyclettas
           bicycle_parking: Parcamento de bicyclettas
           toilets: Toilettes


@@ -2421,6 +2418,7 @@ ia:
         imports: Importationes
         automated_edits: Modificationes automatisate
       start_mapping: comenciar le cartographia
         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
       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 +3112,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
       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
     changesets:
       show:
         comment: Commento