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

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

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index e1f9da2e250a842d11aefb2dd5dff6bbaf6dfbd6..27c20f748ac0c4926270b5fd1a5df5abbe279d0d 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -352,7 +352,6 @@ oc:
         way: Linha
         relation: Relacion
     containing_relation:
         way: Linha
         relation: Relacion
     containing_relation:

-      entry_html: Relacion %{relation_name}

       entry_role_html: Relacion %{relation_name} (per %{relation_role})
     not_found:
       title: S'es pas trobat
       entry_role_html: Relacion %{relation_name} (per %{relation_role})
     not_found:
       title: S'es pas trobat


@@ -2069,7 +2068,7 @@ oc:
       upload_trace: Mandar una traça
       all_traces: Totei lei traças
       my_traces: Mei traças GPS
       upload_trace: Mandar una traça
       all_traces: Totei lei traças
       my_traces: Mei traças GPS

-      traces_from: Traças GPS publicas de %{user}
+      traces_from_html: Traças GPS publicas de %{user}

       remove_tag_filter: Elimina lo filtre d'etiquetas
     destroy:
       scheduled_for_deletion: Pista prevista per la supression
       remove_tag_filter: Elimina lo filtre d'etiquetas
     destroy:
       scheduled_for_deletion: Pista prevista per la supression