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

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

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 3e405a58f61e8363940f96a3694389dc75e0a307..020c941ee8566c25400292f34ebf2662b6a2bcbd 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -363,10 +363,6 @@ 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)
@@ -458,8 +454,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 +510,6 @@ fur:
       post: Messaç
       when: Cuant
       comment: Coment
-      newer_comments: Coments plui gnûfs
-      older_comments: Coments plui vieris
   doorkeeper:
     flash:
       applications:
@@ -1156,6 +1148,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
@@ -1333,8 +1335,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 +1380,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:
@@ -1546,11 +1543,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 +1585,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 +1643,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: