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

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

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 8e2be854515f0f7f6bc76b00a2b9b302e15321c7..9b568a32cec70d1d12559d0c6983f0f1180741fb 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


@@ -1758,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'


@@ -1767,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


@@ -1792,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


@@ -1818,6 +1813,9 @@ 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
     mark:
       as_read: Message marcate como legite
       as_unread: Message marcate como non legite


@@ -2340,32 +2338,24 @@ ia:
           tram_only: Tram
           trolleybus: Trolleybus
           bus: Autobus
           tram_only: Tram
           trolleybus: Trolleybus
           bus: Autobus

-          cable:
-          - Telepherico
-          - Telesedia
-          runway:
-          - Pista de aeroporto
-          - via de circulation pro aviones
+          cable_car: Telepherico
+          chair_lift: Telesedia
+          runway_only: Pista de aeroporto
+          taxiway: Via de circulation pro aviones

           apron_only: Platteforma pro aviones
           admin: Limite administrative
           apron_only: Platteforma pro aviones
           admin: Limite administrative

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

           farmland: Terra agricole
           farmland: Terra agricole

-          grass:
-          - Herba
-          - prato
+          grass_only: 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:
-          - Commun
-          - prato
-          - jardin
+          common_only: 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


@@ -2373,9 +2363,8 @@ ia:
           commercial: Area commercial
           heathland: Landa
           scrubland: Terreno de brossas
           commercial: Area commercial
           heathland: Landa
           scrubland: Terreno de brossas

-          lake:
-          - Laco
-          - bassino
+          lake_only: Laco
+          reservoir: Reservoir

           intermittent_water: Massa de aqua intermittente
           glacier: Glaciero
           reef: Scolio
           intermittent_water: Massa de aqua intermittente
           glacier: Glaciero
           reef: Scolio


@@ -2388,15 +2377,13 @@ ia:
           centre: Centro de sport
           reserve: Reserva natural
           military: Area militar
           centre: Centro de sport
           reserve: Reserva natural
           military: Area militar

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

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

-          summit:
-          - Summitate
-          - picco
+          summit_only: 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