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

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

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index f332de1e33a68bdbcf624e1cea9b7ecc37737aff..4083810f1652f82a99cc540e1b9d54f67a510a8f 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


@@ -1354,7 +1353,6 @@ fy:
         other: '%{count} meldings'
       reported_item: Meld elemint
     show:
         other: '%{count} meldings'
       reported_item: Meld elemint
     show:

-      title: '%{status} probleem #%{issue_id}'

       reports:
         one: 1 melding
         other: '%{count} meldings'
       reports:
         one: 1 melding
         other: '%{count} meldings'


@@ -2080,7 +2078,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


@@ -2405,7 +2403,6 @@ fy:
       reason: 'Reden foar útsluting:'
       revoker: 'Ynlûker:'
     block:
       reason: 'Reden foar útsluting:'
       revoker: 'Ynlûker:'
     block:

-      not_revoked: (net ynlutsen)

       show: Werjaan
       edit: Bewurkje
     page:
       show: Werjaan
       edit: Bewurkje
     page:


@@ -2413,7 +2410,6 @@ fy:
       creator_name: Oanmakker
       reason: Reden foar útsluting
       status: Status
       creator_name: Oanmakker
       reason: Reden foar útsluting
       status: Status

-      revoker_name: Ynlutsen troch

   notes:
     index:
       title: Troch %{user} yntsjinne as op reägearre notysjes
   notes:
     index:
       title: Troch %{user} yntsjinne as op reägearre notysjes