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

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

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 70710b569e90b49e15d32194261e041ca7b7b137..db1a42bbe0e0a96925bfc5cf08eb3b0ab5ef04d0 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -691,7 +691,7 @@ fur:
         il cambiament.
     note_comment_notification:
       anonymous: Un utent anonim
-  message:
+  messages:
     inbox:
       title: In jentrade
       my_inbox: I miei messaçs in jentrade
@@ -713,7 +713,7 @@ fur:
       unread_button: Segne come no let
       read_button: Segne come let
       reply_button: Rispuint
-      delete_button: Elimine
+      destroy_button: Elimine
     new:
       title: Mande messaç
       send_message_to: Mande un gnûf messaç a %{name}
@@ -739,7 +739,7 @@ fur:
       no_sent_messages: No tu âs ancjemò mandât nissun messaç. Parcè no tu contatis
         cualchidun de %{people_mapping_nearby_link}?
       people_mapping_nearby: int che e je daûr a mapâ dongje di te
-    read:
+    show:
       title: Leture messaç
       from: Di
       subject: Sogjet
@@ -749,12 +749,12 @@ fur:
       back: Indaûr
       to: A
     sent_message_summary:
-      delete_button: Elimine
+      destroy_button: Elimine
     mark:
       as_read: Messaç segnât come za let
       as_unread: Messaç segnât come di lei
-    delete:
-      deleted: Messaç eliminât
+    destroy:
+      destroyed: Messaç eliminât
   site:
     about:
       next: Prossim
@@ -922,7 +922,16 @@ fur:
       start_mapping: Scomence a mapâ
       add_a_note:
         title: No tu âs timp par fâ i cambiaments? Zonte une note!
-  trace:
+  traces:
+    new:
+      upload_gpx: 'Cjame file GPX:'
+      description: 'Descrizion:'
+      tags: 'Etichetis:'
+      tags_help: separâts di virgulis
+      visibility: 'Visibilitât:'
+      visibility_help: ce vuelial dî?
+      upload_button: Cjame
+      help: Jutori
     create:
       upload_trace: Cjame percors GPS
       trace_uploaded: Il to file GPX al è stât cjamât e al è cumò daûr a spietâ di
@@ -945,18 +954,6 @@ fur:
       save_button: Salve cambiaments
       visibility: 'Visibilitât:'
       visibility_help: ce vuelial dî?
-    trace_form:
-      upload_gpx: 'Cjame file GPX:'
-      description: 'Descrizion:'
-      tags: 'Etichetis:'
-      tags_help: separâts di virgulis
-      visibility: 'Visibilitât:'
-      visibility_help: ce vuelial dî?
-      upload_button: Cjame
-      help: Jutori
-    trace_header:
-      upload_trace: Cjame un percors
-      see_all_traces: Cjale ducj i percors
     trace_optionals:
       tags: Etichetis
     view:
@@ -1002,6 +999,8 @@ fur:
       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}'
+      upload_trace: Cjame un percors
+      see_all_traces: Cjale ducj i percors
     georss:
       title: Percors GPS di OpenStreetMap
     description: