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

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

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index d36df13d7631391585cffd3848b75d063a69d378..7a1c18359558a55c0a9e469ca5a57da3006b4395 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -5,6 +5,7 @@
 # Author: Asmen
 # Author: Erdemaslancan
 # Author: Gorizon
+# Author: Gravitystorm
 # Author: Gırd
 # Author: Kumkumuk
 # Author: Marmase
@@ -58,7 +59,6 @@ diq:
       message: Mesac
       node: Qedyin
       node_tag: Etiket Qedyin
-      notifier: Xeber ke
       old_node: Verên Qedya
       old_node_tag: Etiletê Qedyina Verên
       old_relation: Eleqeyo Verên
@@ -73,8 +73,8 @@ diq:
       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
@@ -150,7 +150,6 @@ diq:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -174,21 +173,14 @@ diq:
         heading: 'Pêron rê akerde vurnayış:'
         enabled link text: no çıko?
         disabled link text: Ezo çı nêşena bıvurna?
-      public editing note:
-        heading: 'Pêron rê akerde vırnayış:'
       contributor terms:
         link text: no çıko?
       save changes button: Vurnayışan qeyd ke
+    go_public:
+      heading: 'Pêron rê akerde vırnayış:'
   browse:
     created: Vıraziya
     closed: Kerd kip
-    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
@@ -302,6 +294,7 @@ diq:
     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
@@ -355,11 +348,6 @@ diq:
     remove_friend:
       button: Embazan ra vec
   geocoder:
-    search:
-      title:
-        latlon_html: <a href="http://openstreetmap.org/">OSM</a> ra neticey
-        osm_nominatim_html: <a href="http://nominatim.openstreetmap.org/">OSM Nominatim</a>
-          ra neticey
     search_osm_nominatim:
       prefix:
         aerialway:
@@ -817,8 +805,9 @@ diq:
   messages:
     inbox:
       title: Ameyan
-      my_inbox: Amayenê mı
+    messages_table:
       from: Rıştoğ
+      to: Gırewtoğ
       subject: Mewzu
       date: Tarix
     message_summary:
@@ -826,30 +815,24 @@ diq:
       destroy_button: Bestere
     new:
       title: Mesac bırışê
-      subject: Mewzu
-      body: Vêrey mesaci
     outbox:
       title: Şıyenan
-      to: Gırewtoğ
-      subject: Mewzu
-      date: Tarix
     show:
       title: Mesaci bıwane
-      subject: Mewzu
-      date: Tarix
       reply_button: Cewab bıde
       destroy_button: Bestere
       back: Peyser
-      to: Gırewtoğ
     sent_message_summary:
       destroy_button: Bestere
+    heading:
+      my_inbox: Amayenê mı
   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
-    reset_password:
+    edit:
       title: Parola reset ke
       heading: Parolay %{user} reset ke
       reset: Parola reset ke
@@ -900,9 +883,6 @@ diq:
           title: Geyrenıka OSM
         overpass:
           title: Overpass API
-        metro:
-          title: Çap kerdenê Metroy
-          description: Çap kerdenê metroyan u banliyo
         other:
           title: Çemê bini
       options: Weçinegi
@@ -930,25 +910,19 @@ diq:
           track: Raya Herın
           bridleway: Raya Ancınıştan
           cycleway: Raya Bisiklet
-          apron:
-            1: terminal
           forest: Mêşe
           wood: Meşe
           golf: Saxay Golfi
           park: Perk
-          common:
-          - Çimen
-          lake:
-          - Gol
+          common: Çimen
+          lake: Gol
           farm: Cıtinin
           cemetery: Mezlaser
           allotments: Bostan
-          school:
-          - Wendxane
-          - Uniwersita
-          summit:
-          - Sersıq
-          - Ko
+          school: Wendxane
+          university: Uniwersita
+          summit: Sersıq
+          peak: Ko
     welcome:
       title: Xeyr amey!
   traces:
@@ -971,8 +945,6 @@ diq:
       description: 'Şınasnayış:'
       tags: 'Etiketi:'
       none: Çıniyo
-    trace_paging_nav:
-      showing_page: Pele %{page}
     trace:
       pending: PAWEDEYO
       count_points:
@@ -1001,9 +973,6 @@ diq:
       revoke: Terkne!
   users:
     new:
-      email address: 'Adresa e-postey:'
-      confirm email address: 'Adresê E-posta tesdiq ke:'
-      display name: 'Nameyo ke Aseno:'
       continue: Qeyd be
     terms:
       title: Terimi
@@ -1017,9 +986,9 @@ diq:
     no_such_user:
       title: Karbero do wuna çıniyo
       heading: '%{user} name dı karber çıniyo'
+      deleted: esteriya
     show:
       my diary: Rocekê mı
-      new diary entry: Roceko newe defi
       my edits: İştırakê mı
       my traces: GPS rêçê mı
       my settings: Eyarê Mı
@@ -1035,19 +1004,12 @@ diq:
       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:'
-      description: Şınasnayış
-      user location: Heruna karberi
       role:
-        administrator: |-
-          Na karber administratora<br>
-          No karber administratoro
-        moderator: |-
-          Na karber Moderatora<br>
-          No karber Moderatoro
+        administrator: No karber idarekaro
+        moderator: No karber yew moderatoro
         grant:
           administrator: Hesabê adminisrator de gırdi
           moderator: Hesabê moderator de gırdi
@@ -1059,7 +1021,6 @@ diq:
       comments: Mışewreyi
       create_block: nê karberi kılit ke
       activate_user: Nê karberi aktiv ke
-      deactivate_user: Nê karberi aktiv meke
       confirm_user: nê karberi tesdiq ke
       hide_user: nê karberi  bınımnê
       unhide_user: nê karberi menımnê
@@ -1140,7 +1101,6 @@ diq:
     show:
       title: 'Not: %{id}'
       description: Şınasnayış
-      hidden_by_html: '%{user} <abbr title=''%{exact_time}''>%{when}</abbr> bınımnê'
       report: Nê noti rapor ke
       hide: Bınımne
       comment: Mışewre