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

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

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 137b7af4c2e7836b109257b7aa4130038598a6bc..e29af0f601a575d73bf9452461a790f54b92bced 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -196,7 +196,6 @@ fur:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Vichipedie
   api:
@@ -414,6 +413,7 @@ fur:
     contact:
       km away: '%{count}km di distance'
       m away: '%{count}m di distance'
+      latest_edit_html: 'Ultin cambiament (%{ago}):'
     popup:
       your location: La tô posizion
       nearby mapper: Mapadôr dongje
@@ -1124,7 +1124,7 @@ fur:
         facebook:
           title: Jentre cun Facebook
           alt: Jentre cuntun un cont Facebook
-        windowslive:
+        microsoft:
           title: Jentre cun Windows Live
           alt: Jentre cuntun cont di Windows Live
         github:
@@ -1349,7 +1349,6 @@ fur:
       visibility: 'Visibilitât:'
       confirm_delete: Eliminâ chest percors?
     trace_paging_nav:
-      showing_page: Pagjine %{page}
       older: Percors plui vieris
       newer: Percors plui gnûfs
     trace:
@@ -1531,7 +1530,6 @@ fur:
       ct status: 'Tiermins par contribuî:'
       ct undecided: Nol à decidût
       ct declined: Refudâts
-      latest edit: 'Ultin cambiament (%{ago}):'
       email address: 'Direzion di pueste:'
       created from: 'Creât di:'
       status: 'Stât:'
@@ -1591,7 +1589,7 @@ fur:
       heading: Liste dai blocs dal utent
       empty: No son stâts metûts blocs fin cumò.
     revoke:
-      time_future: Chest bloc al finìs ca di %{time}.
+      time_future_html: Chest bloc al finìs ca di %{time}.
       revoke: Revoche!
     helper:
       time_future_html: Finìs ca di %{time}.