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

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

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index ad011c48f6b5846b5585900c73ea4bbb18363285..63c8fb7a24c1e30737ad91a743b4988e80032c32 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -369,7 +369,6 @@ ia:
         way: Via
         relation: Relation
     containing_relation:
         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
       entry_role_html: Relation %{relation_name} (como %{relation_role})
     not_found:
       title: Non trovate


@@ -1519,7 +1518,6 @@ ia:
         open: Aperte
         resolved: Resolvite
     show:
         open: Aperte
         resolved: Resolvite
     show:

-      title: '%{status} Problema №%{issue_id}'

       reports:
         one: '%{count} reporto'
         other: '%{count} reportos'
       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
       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
       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
       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:'
       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:'


@@ -2998,7 +2997,6 @@ ia:
       reason: 'Motivo del blocada:'
       revoker: 'Revocator:'
     block:
       reason: 'Motivo del blocada:'
       revoker: 'Revocator:'
     block:

-      not_revoked: (non revocate)

       show: Monstrar
       edit: Modificar
     page:
       show: Monstrar
       edit: Modificar
     page:


@@ -3006,13 +3004,12 @@ ia:
       creator_name: Creator
       reason: Motivo del blocada
       status: Stato
       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
     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_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:
       block: Blocada №%{id}
       new_block: Nove blocada
   user_mutes: