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

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

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index f332de1e33a68bdbcf624e1cea9b7ecc37737aff..825f9a5835ae6a87ca1d1681697099f236831cf0 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -337,7 +337,6 @@ fy:
         way: Line
         relation: Relaasje
     containing_relation:
         way: Line
         relation: Relaasje
     containing_relation:

-      entry_html: Relaasje %{relation_name}

       entry_role_html: Relaasje %{relation_name} (as %{relation_role})
     not_found:
       title: Net fûn
       entry_role_html: Relaasje %{relation_name} (as %{relation_role})
     not_found:
       title: Net fûn


@@ -2080,7 +2079,7 @@ fy:
       upload_trace: Trajekt oplade
       all_traces: Alle trajekten
       my_traces: Myn trajekten
       upload_trace: Trajekt oplade
       all_traces: Alle trajekten
       my_traces: Myn trajekten

-      traces_from: Iepenbiere trajekten fan %{user}
+      traces_from_html: Iepenbiere trajekten fan %{user}

       remove_tag_filter: Lebelfilter weilitte
     destroy:
       scheduled_for_deletion: Trajekt ynplend om te wiskjen
       remove_tag_filter: Lebelfilter weilitte
     destroy:
       scheduled_for_deletion: Trajekt ynplend om te wiskjen