Merge character validators

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

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 5b4b296f691e380ff2abd2f89c5653e5e06977cc..2d29a4cb43a32466349c47305dd4262567e9f394 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -37,9 +37,9 @@ diq:
       old_way_node: Raya Verên Qedyin
       old_way_tag: Etiketê Rayda Verên
       relation: Eleqe
-      relation_member: Ezay ronışey
-      relation_tag: Etikete ronışey
-      session: Ronışey
+      relation_member: Ezayê Têkıliye
+      relation_tag: Etiketê Têkıliye
+      session: Ronıştış
       trace: Şop
       tracepoint: Dawtey şopi
       tracetag: Etikete şopi
@@ -200,7 +200,7 @@ diq:
       user: Karber
       comment: Mışewre
       area: Erz
-    list:
+    index:
       title: Seta vurnayışan
       title_user: Vurriyayışê setê %{user}
       title_friend: Qeydê vurnayışê embazan
@@ -211,7 +211,7 @@ diq:
   diary_entry:
     new:
       publish_button: Vıla ke
-    list:
+    index:
       user_title: '%{user} (Rocek)'
     edit:
       subject: 'Mewzu:'
@@ -221,7 +221,7 @@ diq:
       latitude: 'Verıniye:'
       longitude: 'Derganiye:'
       save_button: Qeyd ke
-    view:
+    show:
       login: Cıkewtış
       save_button: Qeyd ke
     diary_entry:
@@ -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:
@@ -752,7 +752,7 @@ diq:
       output: Vıcyaen
       export_button: Teberdayış
     sidebar:
-      search_results: Neticeyê geyrayışi
+      search_results: Peyniya cıgeyrayışi
       close: Racnê
     search:
       search: Cı geyre
@@ -797,8 +797,8 @@ diq:
       url: GRE
     welcome:
       title: Xeyr amey!
-  trace:
-    create:
+  traces:
+    new:
       tags: 'Etiketi:'
       visibility: Vinayîşî
       upload_button: Bar ke
@@ -816,7 +816,7 @@ diq:
       visibility: Vinayîşî
     trace_optionals:
       tags: Etiketan
-    view:
+    show:
       title: Rêça %{name} mocnêyêna
       heading: Rêça %{name} mocnêyêna
       pending: PAWEDEYO
@@ -849,7 +849,7 @@ diq:
       by: kerden
       in: te de
       map: xerite
-    list:
+    index:
       public_traces: Pêron rê akerde rêçê GPS
       public_traces_from: '%{user} ra pêron rê akerde rêçê GPS'
       tagged_with: '%{tags} ya etiketyayo'
@@ -867,7 +867,7 @@ diq:
     form:
       name: Name
       required: Mecburiyo
-  user:
+  users:
     login:
       title: Cıkewtış
       heading: Cıkewtış
@@ -912,7 +912,7 @@ diq:
     no_such_user:
       title: Karbero do wuna çıniyo
       heading: '%{user} name dı karber çıniyo'
-    view:
+    show:
       my diary: Rocekê mı
       new diary entry: Roceko newe defi
       my edits: Iştirakê mı
@@ -1004,7 +1004,7 @@ diq:
       button: Xo rê embaz ke
     remove_friend:
       button: Embazan ra vec
-    list:
+    index:
       title: Karberi
       heading: Karberi
       showing: