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

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

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 60d2efa81a8158250642544e2c5264708339185f..00a26d0db6a477e9189aebcd55d7845877f4a37e 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -458,6 +458,7 @@ fy:
     contact:
       km away: '%{count}km fuort'
       m away: '%{count}m fuort'
     contact:
       km away: '%{count}km fuort'
       m away: '%{count}m fuort'

+      latest_edit_html: 'Lêste bewurking (%{ago}):'

     popup:
       your location: Jo lokaasje
       nearby mapper: Kaartmakker fuortby
     popup:
       your location: Jo lokaasje
       nearby mapper: Kaartmakker fuortby


@@ -2431,7 +2432,6 @@ fy:
       ct status: 'Bydragersbetingsten:'
       ct undecided: neat besletten
       ct declined: ôfwiisd
       ct status: 'Bydragersbetingsten:'
       ct undecided: neat besletten
       ct declined: ôfwiisd

-      latest edit: 'Lêste bewurking (%{ago}):'

       email address: 'E-mailadres:'
       created from: 'Oanmakke fan:'
       status: 'Status:'
       email address: 'E-mailadres:'
       created from: 'Oanmakke fan:'
       status: 'Status:'


@@ -2550,8 +2550,8 @@ fy:
     revoke:
       title: Utsluting foar %{block_on} ynlûke
       heading_html: Utsluting foar %{block_on} troch %{block_by} ynlûke
     revoke:
       title: Utsluting foar %{block_on} ynlûke
       heading_html: Utsluting foar %{block_on} troch %{block_by} ynlûke

-      time_future: Dizze útsluting ferfalt oer %{time}.
-      past: Dizze útsluting is %{time} ferfallen en kin net mear ynlutsen wurde.
+      time_future_html: Dizze útsluting ferfalt oer %{time}.
+      past_html: Dizze útsluting is %{time} ferfallen en kin net mear ynlutsen wurde.

       confirm: Witte jo seker dat jo dizze útsluting ynlûke wolle?
       revoke: Ynlûke!
       flash: Dizze útsluting is ynlutsen.
       confirm: Witte jo seker dat jo dizze útsluting ynlûke wolle?
       revoke: Ynlûke!
       flash: Dizze útsluting is ynlutsen.