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

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

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 5bd3060b123d3816bdf83a82e5369118eb3eec2d..9453636c6dca32908665012eac3a301e6482fb59 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -354,8 +354,6 @@ fur:
     search:
       title:
         latlon: Risultâts cjolts dal <a href="http://openstreetmap.org/">sît interni</a>
-        uk_postcode: Risultâts cjolts di <a href="http://www.npemap.org.uk/">NPEMap
-          / FreeThe Postcode</a>
         ca_postcode: Risultâts cjolts di <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Risultâts di <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
@@ -960,7 +958,6 @@ fur:
     trace_header:
       upload_trace: Cjame un percors
       see_all_traces: Cjale ducj i percors
-      see_your_traces: Cjale ducj i miei percors
     trace_optionals:
       tags: Etichetis
     view:
@@ -1003,7 +1000,6 @@ fur:
       map: mape
     list:
       public_traces: Percors GPS publics
-      your_traces: Percors GPS personâi
       public_traces_from: Percors GPS publics di %{user}
       description: Viôt i percors GPS cjamâts sù tai ultins timps
       tagged_with: ' etichetât cun %{tags}'
@@ -1177,7 +1173,6 @@ fur:
       if set location: Impueste il to lûc iniziâl intes %{settings_link} par viodi
         i utents dongje di te.
       settings_link_text: impostazions
-      your friends: I tiei amîs
       no friends: No tu âs ancjemò nissun amì.
       km away: '%{count}km di distance'
       m away: '%{count}m di distance'
@@ -1332,20 +1327,6 @@ fur:
     period:
       one: 1 ore
       other: '%{count} oris'
-    partial:
-      show: Mostre
-      edit: Cambie
-      revoke: Revoche!
-      confirm: Sêstu sigûr?
-      display_name: Utent blocât
-      creator_name: Creadôr
-      reason: Reson dal bloc
-      status: Stât
-      revoker_name: Revocât di
-      not_revoked: (no revocât)
-      showing_page: Pagjine %{page}
-      next: Sucessîf »
-      previous: « Precedent
     helper:
       time_future: Finìs ca di %{time}.
       time_past: Finît %{time} indaûr.
@@ -1370,6 +1351,21 @@ fur:
       reason: 'Reson dal bloc:'
       back: Cjale ducj i blocs
       revoker: 'Chel che al à revocât:'
+  user_blocks:
+    block:
+      not_revoked: (no revocât)
+      show: Mostre
+      edit: Cambie
+      revoke: Revoche!
+    blocks:
+      display_name: Utent blocât
+      creator_name: Creadôr
+      reason: Reson dal bloc
+      status: Stât
+      revoker_name: Revocât di
+      showing_page: Pagjine %{page}
+      next: Sucessîf »
+      previous: « Precedent
   note:
     description:
       opened_at_html: Creât %{when} indaûr