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

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

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 0d7d34d95ea28cfbed04773035511ca233dc5a52..00a26d0db6a477e9189aebcd55d7845877f4a37e 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -213,7 +213,6 @@ fy:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipedy
   api:
@@ -459,6 +458,7 @@ fy:
     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
@@ -1762,7 +1762,6 @@ fy:
       image: Ofbylding
       gravatar:
         gravatar: Gravatar brûke
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
         what_is_gravatar: Wat is Gravatar?
         disabled: Gravatar is útskeakele.
         enabled: Werjefte fan jo Gravatar is ynskeakele.
@@ -1802,7 +1801,7 @@ fy:
         facebook:
           title: Oanmelde mei Facebook
           alt: Meld jo oan mei in Facebook-akkount
-        windowslive:
+        microsoft:
           title: Oanmelde mei Windows Live
           alt: Meld jo oan mei in Windows Live-akkount
         github:
@@ -2165,7 +2164,6 @@ fy:
       visibility: 'Sichtberens:'
       confirm_delete: Dit trajekt fuortsmite?
     trace_paging_nav:
-      showing_page: Side %{page}
       older: Aldere trajekten
       newer: Nijere trajekten
     trace:
@@ -2434,7 +2432,6 @@ fy:
       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:'
@@ -2553,8 +2550,8 @@ fy:
     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.