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

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

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 5a5bb722a37dca3edd7c636db54d3828e0f3ea24..6aace21cd23e46ff6e8a78c1da2ac64ac23ecd7e 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
         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


@@ -2335,27 +2335,27 @@ ia:
           subway: Metro
           ferry: Ferry-boat
           light_rail: Ferrovia legier
           subway: Metro
           ferry: Ferry-boat
           light_rail: Ferrovia legier

-          tram_only: Tram
+          tram: Tram

           trolleybus: Trolleybus
           bus: Autobus
           cable_car: Telepherico
           chair_lift: Telesedia
           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
           admin: Limite administrative

-          orchard_only: Verdiero
-          vineyard: vinia
-          forest_only: Foreste
-          wood: bosco
+          orchard: Verdiero
+          vineyard: Vinia
+          forest: Foreste
+          wood: Bosco

           farmland: Terra agricole
           farmland: Terra agricole

-          grass_only: Herba
-          meadow: prato
+          grass: Herba
+          meadow: Prato

           bare_rock: Rocca nude
           sand: Sablo
           golf: Percurso de golf
           park: Parco
           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
           built_up: Area edificate
           resident: Area residential
           retail: Zona de commercio al detalio


@@ -2363,8 +2363,8 @@ ia:
           commercial: Area commercial
           heathland: Landa
           scrubland: Terreno de brossas
           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
           intermittent_water: Massa de aqua intermittente
           glacier: Glaciero
           reef: Scolio


@@ -2377,13 +2377,13 @@ ia:
           centre: Centro de sport
           reserve: Reserva natural
           military: Area militar
           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
           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
           tunnel: Bordo a lineettas = tunnel
           bridge: Bordo nigre = ponte
           private: Accesso private