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

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

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 0081b009abf0a2cb306d4c25da02ac42f2126dcf..a9dd800b2ed14463db51c96d666a04011bfb8eb1 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -805,8 +805,9 @@ diq:
   messages:
     inbox:
       title: Ameyan
   messages:
     inbox:
       title: Ameyan

-      my_inbox: Amayenê mı
+    messages_table:

       from: Rıştoğ
       from: Rıştoğ

+      to: Gırewtoğ

       subject: Mewzu
       date: Tarix
     message_summary:
       subject: Mewzu
       date: Tarix
     message_summary:


@@ -816,9 +817,6 @@ diq:
       title: Mesac bırışê
     outbox:
       title: Şıyenan
       title: Mesac bırışê
     outbox:
       title: Şıyenan

-      to: Gırewtoğ
-      subject: Mewzu
-      date: Tarix

     show:
       title: Mesaci bıwane
       reply_button: Cewab bıde
     show:
       title: Mesaci bıwane
       reply_button: Cewab bıde


@@ -826,13 +824,15 @@ diq:
       back: Peyser
     sent_message_summary:
       destroy_button: Bestere
       back: Peyser
     sent_message_summary:
       destroy_button: Bestere

+    heading:
+      my_inbox: Amayenê mı

   passwords:
   passwords:

-    lost_password:
+    new:

       title: Parolaya vınibyayi
       heading: To parola ke xo vira?
       email address: 'Adresa e-postey:'
       new password button: Parola reset ke
       title: Parolaya vınibyayi
       heading: To parola ke xo vira?
       email address: 'Adresa e-postey:'
       new password button: Parola reset ke

-    reset_password:
+    edit:

       title: Parola reset ke
       heading: Parolay %{user} reset ke
       reset: Parola reset ke
       title: Parola reset ke
       heading: Parolay %{user} reset ke
       reset: Parola reset ke


@@ -910,25 +910,19 @@ diq:
           track: Raya Herın
           bridleway: Raya Ancınıştan
           cycleway: Raya Bisiklet
           track: Raya Herın
           bridleway: Raya Ancınıştan
           cycleway: Raya Bisiklet

-          apron:
-            1: terminal
-          forest: Mêşe
+          forest_only: Mêşe

           wood: Meşe
           golf: Saxay Golfi
           park: Perk
           wood: Meşe
           golf: Saxay Golfi
           park: Perk

-          common:
-          - Çimen
-          lake:
-          - Gol
+          common_only: Çimen
+          lake_only: Gol

           farm: Cıtinin
           cemetery: Mezlaser
           allotments: Bostan
           farm: Cıtinin
           cemetery: Mezlaser
           allotments: Bostan

-          school:
-          - Wendxane
-          - Uniwersita
-          summit:
-          - Sersıq
-          - Ko
+          school_only: Wendxane
+          university: Uniwersita
+          summit_only: Sersıq
+          peak: Ko

     welcome:
       title: Xeyr amey!
   traces:
     welcome:
       title: Xeyr amey!
   traces: