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

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

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 755636e1de7c507158007e8d71863749e92cfe17..a9dd800b2ed14463db51c96d666a04011bfb8eb1 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -294,6 +294,7 @@ diq:
     contact:
       km away: '%{count} km duriyo'
       m away: '%{count} metre nezdiyo'
+      latest_edit_html: 'vurnayışê peyênê %{ago}:'
     popup:
       your location: Heruna mı
       nearby mapper: Xeritoğo emıryan
@@ -804,8 +805,9 @@ diq:
   messages:
     inbox:
       title: Ameyan
-      my_inbox: Amayenê mı
+    messages_table:
       from: Rıştoğ
+      to: Gırewtoğ
       subject: Mewzu
       date: Tarix
     message_summary:
@@ -815,9 +817,6 @@ diq:
       title: Mesac bırışê
     outbox:
       title: Şıyenan
-      to: Gırewtoğ
-      subject: Mewzu
-      date: Tarix
     show:
       title: Mesaci bıwane
       reply_button: Cewab bıde
@@ -825,13 +824,15 @@ diq:
       back: Peyser
     sent_message_summary:
       destroy_button: Bestere
+    heading:
+      my_inbox: Amayenê mı
   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
-    reset_password:
+    edit:
       title: Parola reset ke
       heading: Parolay %{user} reset ke
       reset: Parola reset ke
@@ -909,25 +910,19 @@ diq:
           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
-          common:
-          - Çimen
-          lake:
-          - Gol
+          common_only: Çimen
+          lake_only: Gol
           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:
@@ -1009,7 +1004,6 @@ diq:
       mapper since: 'Demê herdnigarwaniye:'
       ct undecided: Darıdeyo
       ct declined: Red kerd
-      latest edit: 'vurnayışê peyênê %{ago}:'
       email address: 'Adresa e-postey:'
       created from: 'Vıraşten ra:'
       status: 'Weziyet:'