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

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

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index c76f0331a986279e87f08b6637984a8fa701a185..a33a87b3527d99b5cec559d102ac59f2f6166512 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -218,7 +218,7 @@ ia:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft
+      microsoft: Microsoft

       github: GitHub
       wikipedia: Wikipedia
   api:
       github: GitHub
       wikipedia: Wikipedia
   api:


@@ -234,6 +234,7 @@ ia:
         reopened_at_by_html: Reactivate %{when} per %{user}
       rss:
         title: Notas de OpenStreetMap
         reopened_at_by_html: Reactivate %{when} per %{user}
       rss:
         title: Notas de OpenStreetMap

+        description_all: Un lista de notas reportate, commentate o claudite

         description_area: Un lista de notas reportate, commentate o claudite in tu
           area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
         description_item: Syndication RSS pro le nota %{id}
         description_area: Un lista de notas reportate, commentate o claudite in tu
           area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
         description_item: Syndication RSS pro le nota %{id}


@@ -281,7 +282,6 @@ ia:
       public editing:
         heading: Modification public
         enabled: Activate. Non anonyme e pote modificar datos.
       public editing:
         heading: Modification public
         enabled: Activate. Non anonyme e pote modificar datos.

-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits

         enabled link text: que es isto?
         disabled: Disactivate e non pote modificar datos, tote le previe modificationes
           es anonyme.
         enabled link text: que es isto?
         disabled: Disactivate e non pote modificar datos, tote le previe modificationes
           es anonyme.


@@ -294,7 +294,6 @@ ia:
           e acceptar le nove Conditiones de Contributor.
         agreed_with_pd: Tu ha anque declarate que tu considera tu modificationes como
           liberate al Dominio Public.
           e acceptar le nove Conditiones de Contributor.
         agreed_with_pd: Tu ha anque declarate que tu considera tu modificationes como
           liberate al Dominio Public.

-        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms

         link text: que es isto?
       save changes button: Salveguardar modificationes
       delete_account: Deler conto…
         link text: que es isto?
       save changes button: Salveguardar modificationes
       delete_account: Deler conto…


@@ -370,7 +369,7 @@ ia:
       history_title_html: 'Historia del via: %{name}'
       nodes: Nodos
       nodes_count:
       history_title_html: 'Historia del via: %{name}'
       nodes: Nodos
       nodes_count:

-        one: 1 nodo
+        one: '%{count} nodo'

         other: '%{count} nodos'
       also_part_of_html:
         one: parte del via %{related_ways}
         other: '%{count} nodos'
       also_part_of_html:
         one: parte del via %{related_ways}


@@ -1842,6 +1841,9 @@ ia:
       no home location: Tu non ha entrate tu position de origine.
       update home location on click: Actualisar le position de origine quando io clicca
         sur le carta?
       no home location: Tu non ha entrate tu position de origine.
       update home location on click: Actualisar le position de origine quando io clicca
         sur le carta?

+      show: Monstrar
+      delete: Deler
+      undelete: Disfacer deletion

     update:
       success: Profilo actualisate.
       failure: Non poteva actualisar le profilo.
     update:
       success: Profilo actualisate.
       failure: Non poteva actualisar le profilo.


@@ -1870,7 +1872,7 @@ ia:
         facebook:
           title: Aperir session con Facebook
           alt: Aperir session con un conto de Facebook
         facebook:
           title: Aperir session con Facebook
           alt: Aperir session con un conto de Facebook

-        windowslive:
+        microsoft:

           title: Aperir session con Microsoft
           alt: Aperir session con un conto Microsoft
         github:
           title: Aperir session con Microsoft
           alt: Aperir session con un conto Microsoft
         github:


@@ -2475,7 +2477,6 @@ ia:
       visibility: 'Visibilitate:'
       confirm_delete: Deler iste tracia?
     trace_paging_nav:
       visibility: 'Visibilitate:'
       confirm_delete: Deler iste tracia?
     trace_paging_nav:

-      showing_page: Pagina %{page}

       older: Tracias plus ancian
       newer: Tracias plus nove
     trace:
       older: Tracias plus ancian
       newer: Tracias plus nove
     trace:


@@ -2950,7 +2951,9 @@ ia:
     index:
       title: Notas submittite o commentate per %{user}
       heading: Notas de %{user}
     index:
       title: Notas submittite o commentate per %{user}
       heading: Notas de %{user}

-      subheading_html: Notas submittite o commentate per %{user}
+      subheading_html: Notas %{submitted} o %{commented} per %{user}
+      subheading_submitted: submittite
+      subheading_commented: commentate

       no_notes: Sin notas
       id: ID
       creator: Creator
       no_notes: Sin notas
       id: ID
       creator: Creator