Merge remote-tracking branch 'upstream/pull/2997' into master

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

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index fb982b0af2e13cc6eb81379707de4ca5b69365e2..e3192c9e94e5312056d4360353baeff6ecb36fd1 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -17,6 +17,8 @@ diq:
     formats:
       friendly: '%e %B %Y seate %H:%M'
   helpers:
+    file:
+      prompt: Dosya weçinê
     submit:
       diary_comment:
         create: Qeyd ke
@@ -30,6 +32,9 @@ diq:
       client_application:
         create: Qeyd Be
         update: Rocane kerê
+      redaction:
+        create: Redaksiyon vırazê
+        update: Redaksiyoni qeyd kerê
       trace:
         create: Bar ke
         update: Vurnayışan qeyd ke
@@ -37,6 +42,10 @@ diq:
         create: Bloqe vırazê
         update: Bloqi noroc resn
   activerecord:
+    errors:
+      messages:
+        invalid_email_address: Ravêrde ze yew adresê eposta nêaseno
+        email_address_not_routable: Tadeyaye niyo
     models:
       acl: Qontrol Listeyê Resayışi
       changeset: Qeydê Vurnayışan
@@ -74,6 +83,13 @@ diq:
       way_node: Ray Qedyin
       way_tag: Etikete ray
     attributes:
+      client_application:
+        name: Name (ganiyo)
+        url: Gıray Esas Aplikasyoni (ganiyo)
+        callback_url: Gırey Peyd Cıgeyrayışi
+        support_url: Gırey Destegi
+        allow_read_prefs: Tercihanê karberi bıwanê
+        allow_write_prefs: Tercihanê karberanê inan bıvurne
       diary_comment:
         body: Metın
       diary_entry:
@@ -92,7 +108,7 @@ diq:
         size: Gırdiye
         latitude: Verıniye
         longitude: Derganiye
-        public: Şar
+        public: Pêroyi
         description: Şınasnayış
         visibility: Asayış
         tagstring: Etiketi
@@ -694,7 +710,6 @@ diq:
           dam: Berac
           lock: İskele
           river: Ro
-    description:
       types:
         cities: Sûki
         towns: Bacari
@@ -721,20 +736,14 @@ diq:
     community_blogs: Blogê Cemaeti
     learn_more: Tayêna bımuse
     more: Zêde
-  notifier:
+  user_mailer:
     diary_comment_notification:
       hi: Merheba %{to_user},
     message_notification:
       hi: Merheba %{to_user},
-    gpx_notification:
-      greeting: Merheba,
-    email_confirm_plain:
-      greeting: Merheba,
-    email_confirm_html:
+    email_confirm:
       greeting: Merheba,
-    lost_password_plain:
-      greeting: Merheba,
-    lost_password_html:
+    lost_password:
       greeting: Merheba,
     note_comment_notification:
       greeting: Merheba,
@@ -1027,7 +1036,7 @@ diq:
       preferred editor: 'Editorê ke tercih kerê:'
       image: 'Resım:'
       new image: Yew resım cı ke
-      home location: 'Herun:'
+      home location: 'Herune:'
       latitude: 'Verıniye:'
       longitude: 'Derganiye:'
       save changes button: Vurnayışan qeyd ke
@@ -1072,8 +1081,8 @@ diq:
     revoke:
       revoke: Terkne!
     helper:
-      time_future: '%{time} dı bıqediyo'
-      time_past: '%{time} qedya'
+      time_future_html: '%{time} dı bıqediyo'
+      time_past_html: '%{time} qedya'
       block_duration:
         hours:
           one: 1 seate