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

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

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 755636e1de7c507158007e8d71863749e92cfe17..1cc685d29d73a23dec8f8a30335933bdc0be107d 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
@@ -826,12 +827,12 @@ diq:
     sent_message_summary:
       destroy_button: Bestere
   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,10 +910,9 @@ diq:
           track: Raya Herın
           bridleway: Raya Ancınıştan
           cycleway: Raya Bisiklet
-          apron:
-            1: terminal
-          forest: Mêşe
-          wood: Meşe
+          forest:
+          - Mêşe
+          - Meşe
           golf: Saxay Golfi
           park: Perk
           common:
@@ -1009,7 +1009,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:'