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

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

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index ad011c48f6b5846b5585900c73ea4bbb18363285..2cfcff1b9a103a3159cca7f31c1458ce91b7ee3c 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -369,7 +369,6 @@ ia:
         way: Via
         relation: Relation
     containing_relation:
-      entry_html: Relation %{relation_name}
       entry_role_html: Relation %{relation_name} (como %{relation_role})
     not_found:
       title: Non trovate
@@ -1519,7 +1518,6 @@ ia:
         open: Aperte
         resolved: Resolvite
     show:
-      title: '%{status} Problema №%{issue_id}'
       reports:
         one: '%{count} reporto'
         other: '%{count} reportos'
@@ -2602,7 +2600,7 @@ ia:
       upload_trace: Incargar un tracia
       all_traces: Tote le tracias
       my_traces: Mi tracias
-      traces_from: Tracias public de %{user}
+      traces_from_html: Tracias public de %{user}
       remove_tag_filter: Remover filtro de etiquettas
     destroy:
       scheduled_for_deletion: Tracia programmate pro deletion
@@ -2789,6 +2787,7 @@ ia:
       readable_summary: summario legibile per humanos
       informal_translations: traductiones informal
       continue: Continuar
+      cancel: Cancellar
       you need to accept or decline: Per favor lege e postea accepta o declina le
         nove Conditiones del Contributor pro continuar.
       legale_select: 'Per favor selige tu pais de residentia:'
@@ -2869,18 +2868,20 @@ ia:
     go_public:
       flash success: Tote tu modificationes es ora public, e tu ha ora le permission
         de modificar.
-    index:
-      title: Usatores
-      heading: Usatores
-      summary_html: '%{name} create ab %{ip_address} le %{date}'
-      summary_no_ip_html: '%{name} create le %{date}'
-      empty: Nulle usator correspondente trovate
-    page:
-      found_users:
-        one: '%{count} usator trovate'
-        other: '%{count} usatores trovate'
-      confirm: Confirmar usatores seligite
-      hide: Celar usatores seligite
+    lists:
+      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
+      user:
+        summary_html: '%{name} create ab %{ip_address} le %{date}'
+        summary_no_ip_html: '%{name} create le %{date}'
     suspended:
       title: Conto suspendite
       heading: Conto suspendite
@@ -2998,7 +2999,6 @@ ia:
       reason: 'Motivo del blocada:'
       revoker: 'Revocator:'
     block:
-      not_revoked: (non revocate)
       show: Monstrar
       edit: Modificar
     page:
@@ -3006,13 +3006,12 @@ ia:
       creator_name: Creator
       reason: Motivo del blocada
       status: Stato
-      revoker_name: Revocate per
     navigation:
       all_blocks: Tote le blocadas
       blocks_on_me: Blocadas sur me
-      blocks_on_user: Blocadas sur %{user}
+      blocks_on_user_html: Blocadas sur %{user}
       blocks_by_me: Blocadas facite per me
-      blocks_by_user: Blocadas facite per %{user}
+      blocks_by_user_html: Blocadas facite per %{user}
       block: Blocada №%{id}
       new_block: Nove blocada
   user_mutes: