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

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

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index cbfb12d700ea0d802a5402cb64896720b95c05aa..cb0df309e1a53cd1fc9d0454bd6e89ace60f6b6e 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -73,8 +73,8 @@ diq:
       report: Rapor kerê
       session: Ronıştış
       trace: Şop
       report: Rapor kerê
       session: Ronıştış
       trace: Şop

-      tracepoint: Dawtey şopi
-      tracetag: Etikete şopi
+      tracepoint: Nuqtaya rêçe
+      tracetag: Etiketê rêçe

       user: Karber
       user_preference: Tercihê Karberi
       user_token: Moriya Karberi
       user: Karber
       user_preference: Tercihê Karberi
       user_token: Moriya Karberi


@@ -294,6 +294,7 @@ diq:
     contact:
       km away: '%{count} km duriyo'
       m away: '%{count} metre nezdiyo'
     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
     popup:
       your location: Heruna mı
       nearby mapper: Xeritoğo emıryan


@@ -826,12 +827,12 @@ diq:
     sent_message_summary:
       destroy_button: Bestere
   passwords:
     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
       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


@@ -911,8 +912,9 @@ diq:
           cycleway: Raya Bisiklet
           apron:
             1: terminal
           cycleway: Raya Bisiklet
           apron:
             1: terminal

-          forest: Mêşe
-          wood: Meşe
+          forest:
+          - Mêşe
+          - Meşe

           golf: Saxay Golfi
           park: Perk
           common:
           golf: Saxay Golfi
           park: Perk
           common:


@@ -1009,7 +1011,6 @@ diq:
       mapper since: 'Demê herdnigarwaniye:'
       ct undecided: Darıdeyo
       ct declined: Red kerd
       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:'
       email address: 'Adresa e-postey:'
       created from: 'Vıraşten ra:'
       status: 'Weziyet:'