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

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

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 8a7ca2acc9a4ab6d564b35e4c0b288d68fe4c57c..88cf6b5b5e890d1d5405fd8d266f88a47ecfb7b7 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -218,7 +218,7 @@ ia:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
+      windowslive: Microsoft
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -281,7 +281,6 @@ ia:
       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.
@@ -294,7 +293,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.
-        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: que es isto?
       save changes button: Salveguardar modificationes
       delete_account: Deler conto…
@@ -545,9 +543,9 @@ ia:
       comment_link: Commentar iste entrata
       reply_link: Inviar un message al autor
       comment_count:
-        one: 1 commento
-        zero: Nulle commento
+        one: '%{count} commento'
         other: '%{count} commentos'
+      no_comments: Nulle commento
       edit_link: Modificar iste entrata
       hide_link: Celar iste entrata
       unhide_link: Non plus celar iste entrata
@@ -1433,8 +1431,9 @@ ia:
     show:
       title: '%{status} Problema №%{issue_id}'
       reports:
-        one: 1 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}'
@@ -1870,8 +1869,8 @@ ia:
           title: Aperir session con Facebook
           alt: Aperir session con un conto de Facebook
         windowslive:
-          title: Aperir session con Windows Live
-          alt: Aperir session con un conto de Windows Live
+          title: Aperir session con Microsoft
+          alt: Aperir session con un conto Microsoft
         github:
           title: Aperir session con GitHub
           alt: Aperir session con un conto de GitHub
@@ -2066,6 +2065,12 @@ ia:
         contributors_nz_new_zealand: Nove Zelanda
         contributors_nz_linz_data_service: Servicio de datos de LINZ
         contributors_nz_cc_by: CC BY 4.0
+        contributors_rs_credit_html: |-
+          %{serbia}: Contine datos del %{rgz_link} e %{open_data_portal}
+          (information public de Serbia), 2018.
+        contributors_rs_serbia: Serbia
+        contributors_rs_rgz: Autoritate geodetic serbe
+        contributors_rs_open_data_portal: Portal national de datos aperte
         contributors_si_credit_html: |-
           %{slovenia}: Contine datos del %{gu_link} e del %{mkgp_link}
           (information public de Slovenia).