Merge remote-tracking branch 'upstream/pull/2937' into master

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

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 0d4333e301fa8dff50b5058349b4916cc9fb7fcf..8cde271f04d54820efe94c80fa2fb8a2094b4e82 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -439,13 +439,13 @@ fy:
       greeting: Hallo,
     note_comment_notification:
       greeting: Hallo,
-  message:
+  messages:
     inbox:
       from: Fan
       subject: Ûnderwerp
       date: Datum
     message_summary:
-      delete_button: Fuortsmite
+      destroy_button: Fuortsmite
     new:
       subject: Ûnderwerp
       body: Tekst
@@ -453,14 +453,14 @@ fy:
       to: Oan
       subject: Ûnderwerp
       date: Datum
-    read:
+    show:
       from: Fan
       subject: Ûnderwerp
       date: Datum
       back: Foarige
       to: Oan
     sent_message_summary:
-      delete_button: Fuortsmite
+      destroy_button: Fuortsmite
   site:
     about:
       next: Folgjende
@@ -522,7 +522,11 @@ fy:
       url: URL
     welcome:
       title: Wolkom!
-  trace:
+  traces:
+    new:
+      description: 'Beskriuwing:'
+      visibility: 'Sichtberheid:'
+      help: Help
     edit:
       filename: 'Triemnamme:'
       map: kaart
@@ -530,10 +534,6 @@ fy:
       owner: 'Eigner:'
       description: 'Beskriuwing:'
       visibility: 'Sichtberheid:'
-    trace_form:
-      description: 'Beskriuwing:'
-      visibility: 'Sichtberheid:'
-      help: Help
     view:
       filename: 'Triemnamme:'
       map: kaart