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

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

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index a508bf3980b91b8c6117b8e640947c86358694fc..be475269992ec987492dd003d10179adc240a239 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -23,6 +23,8 @@ diq:
       diary_entry:
         create: Vıla ke
         update: Rocane ke
+      issue_comment:
+        create: Mışewre cı ke
       message:
         create: Bırışe
       client_application:
@@ -30,6 +32,7 @@ diq:
         update: Bıvurne
       trace:
         create: Bar ke
+        update: Vurnayışan qeyd ke
       user_block:
         create: Bloqe vırazê
         update: Bloqi noroc resn
@@ -42,6 +45,7 @@ diq:
       diary_comment: Vatışê Rocan
       diary_entry: Deqewtışê Rocan
       friend: Embaz
+      issue: Mesel
       language: Zıwan
       message: Mesac
       node: Qedyin
@@ -58,6 +62,7 @@ diq:
       relation: Elaqe
       relation_member: Ezayê Têkıliye
       relation_tag: Etiketê Têkıliye
+      report: Rapor kerê
       session: Ronıştış
       trace: Şop
       tracepoint: Dawtey şopi
@@ -115,15 +120,34 @@ diq:
     remote:
       name: Duri da qontrol
       description: Duri ra Qonrtol (JOSM yana  Merkaartor)
+  auth:
+    providers:
+      none: Çıniyo
+      openid: OpenID
+      google: Google
+      facebook: Facebook
+      windowslive: Windows Live
+      github: GitHub
+      wikipedia: Wikipedia
   api:
     notes:
+      comment:
+        opened_at_html: '%{when} de vıraziyayo'
+        opened_at_by_html: Terefê %{user} ra %{when} de vıraziyayo
+        commented_at_html: '%{when} de rocaneyayo'
+        commented_at_by_html: Terefê %{user} ra %{when} de rocaneyayo
       entry:
         comment: Mışewre
   browse:
     created: Vıraziya
     closed: Kerd kip
-    created_html: Verê <abbr title='%{title}'>%{time} de</abbr> vıraziyo
-    closed_html: Verê <abbr title='%{title}'>%{time} de</abbr> kılid biyo
+    created_html: <abbr title='%{title}'>%{time}</abbr> de vıraziyayo
+    closed_html: <abbr title='%{title}'>%{time}</abbr> de kılid biyo
+    created_by_html: <abbr title='%{title}'>%{time}</abbr> de terefê %{user} ra vıraziyayo
+    deleted_by_html: <abbr title='%{title}'>%{time}</abbr> de terefê %{user} ra esteriyayo
+    edited_by_html: <abbr title='%{title}'>%{time}</abbr> de terefê %{user} ra vurniyayo
+    closed_by_html: <abbr title='%{title}'>%{time}</abbr> de terefê %{user} ra kılid
+      biyo
     version: Versiyon
     in_changeset: Qeydê Vurnayışan
     anonymous: anonim
@@ -211,7 +235,7 @@ diq:
   changesets:
     changeset_paging_nav:
       showing_page: Pele %{page}
-      next: Peyên »
+      next: Bahdoyên »
       previous: « Verên
     changeset:
       anonymous: Anonim
@@ -219,16 +243,16 @@ diq:
       view_changeset_details: Teferuatê vurnayışê seti bıvin
     changesets:
       id: ID
-      saved_at: Demê qeydi
+      saved_at: Cayê qeydi
       user: Karber
       comment: Mışewre
-      area: Erz
+      area: Erd
     index:
-      title: Seta vurnayışan
-      title_user: Vurriyayışê setê %{user}
+      title: Qeydê vurnayışan
+      title_user: Vurriyayışê qeydi %{user}
       title_friend: Qeydê vurnayışê embazan
       title_nearby: Nezdıra vurriyayışê setê karberi
-      load_more: Dehana vêşi
+      load_more: Dehana vêşi barkerê
   diary_entries:
     form:
       subject: 'Mewzu:'
@@ -239,7 +263,7 @@ diq:
       longitude: 'Derganiye:'
       use_map_link: xerita bıgurene
     index:
-      user_title: '%{user} (Rocek)'
+      user_title: '%{user} rocek'
     edit:
       marker_text: Lokasyonê rocekê cıkewtışi
     show:
@@ -262,11 +286,11 @@ diq:
       view: Bıvêne
       edit: Bıvurne
     comments:
-      post: Bırışe
+      post: Rışte
       when: Key
       comment: Mışewre
-      newer_comments: Tewr Vatışê Newey
-      older_comments: Vatışo Tewr Kehan
+      newer_comments: Mışewreyê Newey
+      older_comments: Mışewreyê Kehani
   geocoder:
     search:
       title:
@@ -784,7 +808,7 @@ diq:
     search:
       search: Cı geyre
       from: Rıştoğ
-      where_am_i: Edo kotideya?
+      where_am_i: Kani no?
       submit_text: Şo
     key:
       table:
@@ -1065,7 +1089,7 @@ diq:
       revoke: Terkne!
     helper:
       time_future: '%{time} dı bıqediyo'
-      time_past: Verdê %{time} qedya
+      time_past: '%{time} qedya'
       block_duration:
         hours:
           one: 1 seate