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

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

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 3e405a58f61e8363940f96a3694389dc75e0a307..e25e6711c3d9044eb73f312d93a50f6c3bca63d9 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -37,10 +37,6 @@ fur:
         create: Cree bloc
         update: Inzorne bloc
   activerecord:
-    errors:
-      messages:
-        invalid_email_address: nol samee jessi une direzion di pueste eletroniche
-          valide
     models:
       acl: Liste di control des jentradis
       changeset: Grup di cambiaments
@@ -363,12 +359,7 @@ fur:
         sorry: Nus displâs, la liste dai coments ai grups di cambiaments che tu âs
           domandât e je stade masse timp a cjamâsi.
   changesets:
-    changeset_paging_nav:
-      showing_page: Pagjine %{page}
-      next: Sucessîf →
-      previous: ← Precedent
     changeset:
-      anonymous: Anonim
       no_edits: (nissun cambiament)
       view_changeset_details: Viôt detais dal grup di cambiaments
     index:
@@ -458,8 +449,6 @@ fur:
       no_entries: Nissune vôs tal diari
     page:
       recent_entries: Ultimis vôs dal diari
-      older_entries: Vôs plui vieris
-      newer_entries: Vôs plui gnovis
     edit:
       title: Cambie vôs dal diari
       marker_text: Lûc de vôs dal diari
@@ -516,8 +505,6 @@ fur:
       post: Messaç
       when: Cuant
       comment: Coment
-      newer_comments: Coments plui gnûfs
-      older_comments: Coments plui vieris
   doorkeeper:
     flash:
       applications:
@@ -906,10 +893,6 @@ fur:
         level7: Confine municipâl
         level8: Confin di citât
         level9: Confin di vilaç
-      types:
-        cities: Citâts
-        towns: Citadinis
-        places: Puescj
     results:
       no_results: Nissun risultât
       more_results: Altris risultâts
@@ -1156,6 +1139,16 @@ fur:
     richtext_field:
       edit: Cambie
       preview: Anteprime
+    pagination:
+      diary_comments:
+        older: Coments plui vieris
+        newer: Coments plui gnûfs
+      diary_entries:
+        older: Vôs plui vieris
+        newer: Vôs plui gnovis
+      traces:
+        older: Percors plui vieris
+        newer: Percors plui gnûfs
   site:
     about:
       local_knowledge_title: Cognossince locâl
@@ -1297,7 +1290,6 @@ fur:
           private: Acès privât
           construction: Stradis in costruzion
           bus_stop: Fermade autobus
-          stop: Fermade
           bicycle_shop: Buteghe di bicicletis
     welcome:
       title: Benvignût!
@@ -1333,8 +1325,6 @@ fur:
       visibility_help: ce vuelial dî?
     update:
       updated: Percors inzornât
-    trace_optionals:
-      tags: Etichetis
     show:
       title: Daûr a viodi il percors %{name}
       heading: Daûr a viodi il percors %{name}
@@ -1380,9 +1370,6 @@ fur:
       all_traces: Ducj i percors
       my_traces: I miei percors
       traces_from: Percors publics di %{user}
-    page:
-      older: Percors plui vieris
-      newer: Percors plui gnûfs
     georss:
       title: Percors GPS di OpenStreetMap
     description:
@@ -1461,7 +1448,6 @@ fur:
         header: Libare e modificabile
       display name description: Il non utent che al vignarà mostrât a ducj. Tu podarâs
         gambiâlu plui tart tes preferencis.
-      external auth: 'Autenticazion vie une tierce part:'
       continue: Regjistriti
       terms accepted: Graziis par vê acetât i gnûfs tiermins par contribuî!
       use external auth: In alternative, dopre une tierce part par jentrâ
@@ -1546,11 +1532,6 @@ fur:
       support: assistence
     auth_failure:
       unknown_error: Autenticazion falide
-  user_role:
-    grant:
-      confirm: Conferme
-    revoke:
-      confirm: Conferme
   user_blocks:
     not_found:
       back: Torne al somari
@@ -1593,7 +1574,7 @@ fur:
       not_revoked: (no revocât)
       show: Mostre
       edit: Cambie
-    blocks:
+    page:
       display_name: Utent blocât
       creator_name: Creadôr
       reason: Reson dal bloc
@@ -1651,6 +1632,8 @@ fur:
         par cui no sta zontâ informazions personâls o di mapis cuviertis dal copyright
         o listis.
       add: Zonte une note
+    notes_paging_nav:
+      showing_page: Pagjine %{page}
   javascripts:
     close: Siere
     share: