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

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

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 23dc03efe594a16d51e37c0665b6043683b863d2..a1f90c6bcac1393f753c3b3259630b55fa796b72 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -37,7 +37,7 @@ diq:
       old_way: Raya Verên
       old_way_node: Raya Verên Qedyin
       old_way_tag: Etiketê Rayda Verên
-      relation: Eleqe
+      relation: Elaqe
       relation_member: Ezayê Têkıliye
       relation_tag: Etiketê Têkıliye
       session: Ronıştış
@@ -77,7 +77,7 @@ diq:
         body: Metın
         recipient: Grotker
       user:
-        email: E-posta
+        email: E-poste
         active: Aktiv
         display_name: Nameyo ke Aseno
         description: Şınasnayış
@@ -97,9 +97,13 @@ diq:
     remote:
       name: Duri da qontrol
       description: Duri ra Qonrtol (JOSM yana  Merkaartor)
+  api:
+    notes:
+      entry:
+        comment: Mışewre
   browse:
     created: Vıraziya
-    closed: Racneya
+    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
     version: Versiyon
@@ -118,8 +122,8 @@ diq:
       node_paginated: pero piya (%{x}-%{y} - %{count}) noqtey
       way: '%{count} ray'
       way_paginated: Ray (%{x}-%{y} - pêro piya  %{count})
-      relation: Eleqey %{count}
-      relation_paginated: Eleqey %{x}-%{y} pêro piya %{count}
+      relation: Elaqeyi %{count}
+      relation_paginated: Elaqeyi %{x}-%{y} pêro piya %{count}
       comment: Mışewreyi (%{count})
       changesetxml: Vurnayışê peyênê XML
       osmchangexml: OsmVurnayışê XML
@@ -138,7 +142,7 @@ diq:
         one: letey ray %{related_ways}
         other: letey rayer %{related_ways}
     relation:
-      title: Eleqe:%{name}
+      title: 'Elaqe: %{name}'
       history_title: 'Verorê eleqey: %{name}'
       members: Ezay
     relation_member:
@@ -146,23 +150,23 @@ diq:
       type:
         node: Qedyin
         way: Ray
-        relation: Eleqe
+        relation: Elaqe
     containing_relation:
-      entry: Eleqe %{relation_name}
+      entry: Elaqe %{relation_name}
       entry_role: Eleqe %{relation_name} (%{relation_role} deye)
     not_found:
       sorry: 'Qısur mewni,  #%{id} numreya %{type} nêvine yê.'
       type:
         node: qedyin
         way: ray
-        relation: eleqe
+        relation: elaqe
         changeset: Qeydê Vurnayışan
         note: Not
     timeout:
       type:
         node: qedyin
         way: ray
-        relation: eleqe
+        relation: elaqe
         changeset: Qeydê Vurnayışan
         note: Not
     redacted:
@@ -170,7 +174,7 @@ diq:
       type:
         node: qedyin
         way: ray
-        relation: eleqe
+        relation: elaqe
     start_rjs:
       load_data: Malumat Barke
       loading: Bar beno...
@@ -584,7 +588,7 @@ diq:
           "yes": Ofis
         place:
           allotments: Bostan
-          city: Suk
+          city: Sûke
           country: Dewlete
           county: Welat
           farm: Erdo Bec
@@ -656,19 +660,20 @@ diq:
           river: Ro
     description:
       types:
-        cities: Suki
+        cities: Sûki
         towns: Bacari
         places: Cayi
   layouts:
-    logout: veciyayış
-    log_in: cı kewe
-    sign_up: qeyd be
+    logout: Bıveciye
+    log_in: Cı kewe
+    sign_up: Qeyd be
     edit: Bıvurne
     history: Tarix
     export: Teberdayış
     data: Melumati
+    tou: Şertê gurenayışi
     help: Peşti
-    copyright: Heqa telıfi
+    copyright: Heqa telifi
     community: Cemaet
     community_blogs: Blogê Cemaeti
     learn_more: Tayêna bımuse
@@ -762,7 +767,7 @@ diq:
       export_button: Teberdayış
     sidebar:
       search_results: Peyniya cıgeyrayışi
-      close: Racnê
+      close: Kip ke
     search:
       search: Cı geyre
       from: Rıştoğ
@@ -913,8 +918,10 @@ diq:
       confirm password: 'Parolay tesdiq ke:'
       continue: Qeyd be
     terms:
+      title: Terimi
+      heading: Terimi
       consider_pd_why: no çıko?
-      agree: Qebul kena
+      continue: Dewam ke
       decline: Red kerê
       legale_names:
         france: Fransa
@@ -1088,14 +1095,15 @@ diq:
       next: Peyên »
       previous: « Verên
   notes:
-    entry:
-      comment: Mışewre
     mine:
       description: Şınasnayış
   javascripts:
+    close: Kip ke
     share:
+      title: Vıla ke
       cancel: Bıtexelne
       image: Resım
+      format: 'Format:'
       download: Biya war
     map:
       zoom:
@@ -1121,6 +1129,8 @@ diq:
         fossgis_osrm_bike: Bisiklet (OSRM)
         fossgis_osrm_foot: Lınge (OSRM)
       time: Zeman
+    query:
+      relation: Elaqe
   redactions:
     edit:
       description: Şınasnayış