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 5a5bb722a37dca3edd7c636db54d3828e0f3ea24..3493cc9b11c9d5ca2353e56b33b459712566d1ab 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -1468,9 +1468,9 @@ ia:
         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
@@ -2181,12 +2181,7 @@ ia:
         iste functionalitate.
     export:
       title: Exportar
-      area_to_export: Area a exportar
       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).
@@ -2212,17 +2207,6 @@ ia:
         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
@@ -2335,27 +2319,27 @@ ia:
           subway: Metro
           ferry: Ferry-boat
           light_rail: Ferrovia legier
-          tram_only: Tram
+          tram: Tram
           trolleybus: Trolleybus
           bus: Autobus
           cable_car: Telepherico
           chair_lift: Telesedia
-          runway_only: Pista de aeroporto
-          taxiway: via de circulation pro aviones
-          apron_only: Platteforma pro aviones
+          runway: Pista de aeroporto
+          taxiway: Via de circulation pro aviones
+          apron: Platteforma pro aviones
           admin: Limite administrative
-          orchard_only: Verdiero
-          vineyard: vinia
-          forest_only: Foreste
-          wood: bosco
+          orchard: Verdiero
+          vineyard: Vinia
+          forest: Foreste
+          wood: Bosco
           farmland: Terra agricole
-          grass_only: Herba
-          meadow: prato
+          grass: Herba
+          meadow: Prato
           bare_rock: Rocca nude
           sand: Sablo
           golf: Percurso de golf
           park: Parco
-          common_only: Commun
+          common: Commun
           built_up: Area edificate
           resident: Area residential
           retail: Zona de commercio al detalio
@@ -2363,8 +2347,8 @@ ia:
           commercial: Area commercial
           heathland: Landa
           scrubland: Terreno de brossas
-          lake_only: Laco
-          reservoir: bassino
+          lake: Laco
+          reservoir: Reservoir
           intermittent_water: Massa de aqua intermittente
           glacier: Glaciero
           reef: Scolio
@@ -2377,13 +2361,13 @@ ia:
           centre: Centro de sport
           reserve: Reserva natural
           military: Area militar
-          school_only: Schola
-          university: universitate
-          hospital: hospital
+          school: Schola
+          university: Universitate
+          hospital: Hospital
           building: Edificio significante
           station: Station ferroviari
-          summit_only: Summitate
-          peak: picco
+          summit: Summitate
+          peak: Picco
           tunnel: Bordo a lineettas = tunnel
           bridge: Bordo nigre = ponte
           private: Accesso private