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

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

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 76980234003e6d785f34ea05569c31eb728fe48e..e635fa0f615363fc898608c0242d24d02e4d9dc1 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -378,7 +378,6 @@ eu:
         way: Bide
         relation: Erlazio
     containing_relation:
-      entry_html: '%{relation_name} erlazioa'
       entry_role_html: '%{relation_name} erlazioa (%{relation_role} rolean)'
     not_found:
       title: Ez da aurkitu
@@ -2383,7 +2382,7 @@ eu:
       upload_trace: Aztarna bat igo
       all_traces: Aztarna guztiak
       my_traces: Nire aztarnak
-      traces_from: '%{user} erabiltzailearen GPS aztarna publikoak'
+      traces_from_html: '%{user} erabiltzailearen GPS aztarna publikoak'
       remove_tag_filter: Kendu etiketa-iragazkia
     destroy:
       scheduled_for_deletion: Ezabatzear dauden aztarnak