Rebase to current master

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

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 63d02781d358ea10c2a7e36b1b40d4f06800e2b9..6d64522a61ac1c8a7c450926566ccdc502977c29 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -682,7 +682,7 @@ diq:
       greeting: Merheba,
     changeset_comment_notification:
       greeting: Merheba,
-  message:
+  messages:
     inbox:
       title: Ameyan
       my_inbox: Amayenê mı
@@ -692,7 +692,7 @@ diq:
       date: Dem
     message_summary:
       reply_button: Cewab bıde
-      delete_button: Bestere
+      destroy_button: Bestere
     new:
       title: Mesac bırışê
       subject: Mewzu
@@ -705,16 +705,16 @@ diq:
       to: Kêrê
       subject: Mewzu
       date: Dem
-    read:
+    show:
       title: Mesaci bıwanê
       subject: Mewzu
       date: Dem
       reply_button: Cewab bıde
-      delete_button: Bestere
+      destroy_button: Bestere
       back: Peyser
       to: Kêrê
     sent_message_summary:
-      delete_button: Bestere
+      destroy_button: Bestere
   site:
     copyright:
       native:
@@ -797,7 +797,12 @@ diq:
       url: GRE
     welcome:
       title: Xeyr amey!
-  trace:
+  traces:
+    create:
+      tags: 'Etiketi:'
+      visibility: Vinayîşî
+      upload_button: Bar ke
+      help: Peşti
     edit:
       filename: 'Namey dosya:'
       download: ron
@@ -809,11 +814,6 @@ diq:
       description: 'Şınasiyen:'
       tags: 'Etiketi:'
       visibility: Vinayîşî
-    trace_form:
-      tags: 'Etiketi:'
-      visibility: Vinayîşî
-      upload_button: Bar ke
-      help: Peşti
     trace_optionals:
       tags: Etiketan
     view: