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

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

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 1ff111748957e376558c4ab1dde538709ec5217a..5a4472b60efa1184fce5dce831bda54fdda04dd0 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -415,7 +415,6 @@ sk:
         way: Cesta
         relation: Relácia
     containing_relation:
-      entry_html: Relácia %{relation_name}
       entry_role_html: Relácia %{relation_name} (ako %{relation_role})
     not_found:
       title: Nenájdené
@@ -2473,7 +2472,7 @@ sk:
       upload_trace: Nahrať stopu
       all_traces: Všetky stopy
       my_traces: Moje stopy
-      traces_from: Verejné stopy od %{user}
+      traces_from_html: Verejné stopy od %{user}
       remove_tag_filter: Odstrániť filter značiek
     destroy:
       scheduled_for_deletion: Stopa plánovaná na vymazanie