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

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

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 52d7fc9510b17d7b75e5b59f6733671090bf566f..89c3643b1b5ca8507d11a41cf307b2688bbd78ea 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -245,9 +245,8 @@ ia:
         comment: Commento
         full: Nota complete
   accounts:
-    edit:
+    show:
       title: Modificar conto
-      my settings: Mi parametros
       current email address: Adresse de e-mail actual
       external auth: Authentication externe
       openid:
@@ -325,10 +324,6 @@ ia:
           fornite per OSMF. Per favor, clicca sur le ligamine, lege le texto, e declara
           te de accordo.
         read_tou: Io ha legite e io accepta le Conditiones de uso
-        consider_pd: In addition a lo que precede, io considera mi contributiones
-          como essente in le dominio public
-        consider_pd_why: que es isto?
-        consider_pd_why_url: https://osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
         guidance_info_html: 'Information pro adjutar a comprender iste terminos: un
           %{readable_summary_link} e qualque %{informal_translations_link}'
         readable_summary: summario legibile per humanos
@@ -349,6 +344,9 @@ ia:
           Conditiones de contributor. Pro plus informationes, per favor vide %{terms_declined_link}.
         terms_declined_link: iste pagina wiki
         terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
+    pd_declarations:
+      show:
+        consider_pd_why_url: https://osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
   browse:
     deleted_ago_by_html: Delite %{time_ago} per %{user}
     edited_ago_by_html: Modificate %{time_ago} per %{user}
@@ -1664,10 +1662,6 @@ ia:
     partners_corpmembers: Membros corporative de OSMF
     partners_partners: partners
     tou: Conditiones de uso
-    osm_offline: Le base de datos de OpenStreetMap non es disponibile al momento debite
-      a operationes de mantenentia essential.
-    osm_read_only: Le base de datos de OpenStreetMap es al momento in modo de solmente
-      lectura durante le execution de mantenentia essential.
     nothing_to_preview: Nihil a previsualisar.
     help: Adjuta
     about: A proposito
@@ -2260,12 +2254,13 @@ ia:
         copyright: Copyright OpenStreetMap e contributores, sub licentia aperte
       remote_failed: Modification fallite - assecura te que JOSM o Merkaartor es cargate
         e que le plug-in de controlo remote es activate
-    edit:
+    not_public_flash:
       not_public: Tu non ha configurate tu modificationes pro esser public.
       not_public_description_html: Tu non potera plus modificar le carta si tu non
         lo face. Tu pote configurar tu modificationes como public a partir de tu %{user_page}.
       user_page_link: pagina de usator
       anon_edits_link_text: Lege proque isto es le caso.
+    edit:
       id_not_configured: iD non ha essite configurate
     export:
       title: Exportar
@@ -2789,8 +2784,6 @@ ia:
           sur adresses de e-mail
         html: Tu adresse non es monstrate publicamente. Consulta nostre %{privacy_policy_link}
           pro plus information.
-      consider_pd_html: Io considera que mi contributiones es in le %{consider_pd_link}.
-      consider_pd: dominio public
       or: o
       use external auth: o usa un tertio pro aperir session
     no_such_user:
@@ -2806,7 +2799,6 @@ ia:
       my notes: Mi notas
       my messages: Mi messages
       my profile: Mi profilo
-      my settings: Mi parametros
       my comments: Mi commentos
       my_preferences: Mi preferentias
       my_dashboard: Mi pannello
@@ -2885,13 +2877,13 @@ ia:
       show:
         title: Usatores
         heading: Usatores
-        empty: Nulle usator correspondente trovate
       page:
         found_users:
           one: '%{count} usator trovate'
           other: '%{count} usatores trovate'
         confirm: Confirmar usatores seligite
         hide: Celar usatores seligite
+        empty: Nulle usator correspondente trovate
       user:
         summary_html: '%{name} create ab %{ip_address} le %{date}'
         summary_no_ip_html: '%{name} create le %{date}'