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

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

diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index d6968c849abced4a091b8d0002a503adcaef6090..db45ff706d83d942d7cff83904691d58e5a13a62 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -363,7 +363,6 @@ hsb:
         way: Puć
         relation: Relacija
     containing_relation:
         way: Puć
         relation: Relacija
     containing_relation:

-      entry_html: Relacija %{relation_name}

       entry_role_html: Relacija %{relation_name} (jako %{relation_role})
     not_found:
       title: Njenamakane
       entry_role_html: Relacija %{relation_name} (jako %{relation_role})
     not_found:
       title: Njenamakane


@@ -2191,7 +2190,7 @@ hsb:
       upload_trace: Ćěr nahrać
       all_traces: Wšě ćěrje
       my_traces: Moje ćěrje
       upload_trace: Ćěr nahrać
       all_traces: Wšě ćěrje
       my_traces: Moje ćěrje

-      traces_from: Zjawne ćěrje wot %{user}
+      traces_from_html: Zjawne ćěrje wot %{user}

     destroy:
       scheduled_for_deletion: Čara předwidźana za zničenje
     offline_warning:
     destroy:
       scheduled_for_deletion: Čara předwidźana za zničenje
     offline_warning: