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

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

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 6664d4f10953aff07ee99ac71a34cb341535f84d..79ccc5be6f52a0f4709166f02c3b5f7bc817d73e 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -29,7 +29,7 @@ diq:
         create: Bırışe
       client_application:
         create: Qeyd Be
-        update: Bıvurne
+        update: Rocane kerê
       trace:
         create: Bar ke
         update: Vurnayışan qeyd ke
@@ -88,14 +88,14 @@ diq:
       trace:
         user: Karber
         visible: Aseno
-        name: Name
+        name: Namedosya
         size: Gırdiye
         latitude: Verıniye
         longitude: Derganiye
         public: Şar
         description: Şınasnayış
-        visibility: Vinayîşî
-        tagstring: 'Etiketi:'
+        visibility: Asayış
+        tagstring: Etiketi
       message:
         sender: Rıster
         title: Mewzu
@@ -694,7 +694,6 @@ diq:
           dam: Berac
           lock: İskele
           river: Ro
-    description:
       types:
         cities: Sûki
         towns: Bacari
@@ -721,7 +720,7 @@ 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:
@@ -930,8 +929,6 @@ diq:
     reset_password:
       title: Parola reset ke
       heading: Parolay %{user} reset ke
-      password: 'Parola:'
-      confirm password: 'Parola tesdiq ke:'
       reset: Parola reset ke
     new:
       email address: 'Adresa e-postey:'
@@ -1029,7 +1026,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
@@ -1074,8 +1071,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
@@ -1117,6 +1114,8 @@ diq:
       title: Vıla ke
       cancel: Bıtexelne
       image: Resım
+      link: Gıre ya zi HTML
+      long_link: Gıre
       format: 'Format:'
       download: Biya war
     map: