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

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

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 8196a1cfcd33527e7c161bb1627c845752b79f9c..023695a8abe78f2c0c03703e61c442de5bf7cbd5 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -100,7 +100,7 @@ diq:
         title: Mewzu
         latitude: Verıniye
         longitude: Derganiye
-        language: Zıwan
+        language_code: Zıwan
       friend:
         user: Karber
         friend: Embaz
@@ -169,18 +169,16 @@ diq:
       my settings: Eyarê mı
       current email address: 'E-postay şımaya newki:'
       openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
         link text: no çıko?
       public editing:
         heading: 'Pêron rê akerde vurnayış:'
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
         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
@@ -274,12 +272,6 @@ diq:
     tag_details:
       tags: 'Etiketi:'
       telephone_link: Veynd %{phone_number}
-    note:
-      title: 'Not: %{id}'
-      new_note: Nota Newi
-      description: Şınasnayış
-      hidden_by_html: '%{user} <abbr title=''%{exact_time}''>%{when}</abbr> bınımnê'
-      report: Nê noti rapor ke
     query:
       title: Xısusiyetan bıasne
       introduction: Xısusiyetanê nezdiyan vinayışi rê xeriter sero bıploğnê
@@ -366,10 +358,8 @@ diq:
     search:
       title:
         latlon_html: <a href="http://openstreetmap.org/">OSM</a> ra neticey
-        ca_postcode_html: <a href="http://geocoder.ca/">Geocoder.CA</a> ra neticey
         osm_nominatim_html: <a href="http://nominatim.openstreetmap.org/">OSM Nominatim</a>
           ra neticey
-        geonames_html: <a href="http://www.geonames.org/">GeoNames.org</a> ra neticey
     search_osm_nominatim:
       prefix:
         aerialway:
@@ -591,7 +581,6 @@ diq:
           commercial: Cayê Ticareti u Xızmeti
           conservation: Qısekerdış
           construction: İnşaat
-          farm: Cıtinin
           farmland: Erdê Ziraati
           farmyard: İsiga çıfligi
           forest: Mêşe
@@ -679,7 +668,7 @@ diq:
           mud: Dawte
           peak: Gıl /sersıq
           point: Pırn
-          reef: Resif
+          reef: Kemer
           ridge: Sud
           rock: Qere
           saddle: Cıl
@@ -800,6 +789,7 @@ diq:
     data: Melumati
     tou: Şertê gurenayışi
     help: Peşti
+    about: Heqa
     copyright: Heqa telifi
     community: Cemaet
     community_blogs: Blogê Cemaeti
@@ -888,6 +878,8 @@ diq:
       title: Veciyayış
       heading: OpenStreetMap ra vıcyayış
       logout_button: Veciyayış
+    suspended_flash:
+      support: peşti
   site:
     copyright:
       native:
@@ -973,7 +965,7 @@ diq:
       uploaded: 'Bar biyo:'
       points: 'Dawte:'
       start_coordinates: 'Pêkerden koordinat:'
-      map: xerite
+      map: xerita
       edit: bıvırne
       owner: 'Wayir:'
       description: 'Şınasnayış:'
@@ -990,7 +982,7 @@ diq:
       trace_details: Teferruatanê rêça bıvin
       view_map: Xeriti Bımocnê
       edit_map: Xeriti Timar ke
-      public: ŞARE
+      public: PÊROYİ
       identifiable: ŞINASKERDENEN
       private: XAS
       trackable: SEYRKERDENEN
@@ -1025,10 +1017,11 @@ 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: Iştirakê mı
+      my edits: İştırakê mı
       my traces: GPS rêçê mı
       my settings: Eyarê Mı
       my comments: Mışewrey mı
@@ -1145,6 +1138,15 @@ diq:
   notes:
     index:
       description: Şınasnayış
+    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
+    new:
+      title: Nota Newi
   javascripts:
     close: Kip ke
     share:
@@ -1168,12 +1170,10 @@ diq:
     changesets:
       show:
         comment: Mışewre
+        subscribe: Abone be
+        unsubscribe: Aboneyiye ra veciye
         hide_comment: bınımne
         unhide_comment: menımne
-    notes:
-      show:
-        hide: Bınımne
-        comment: Mışewre
     directions:
       engines:
         fossgis_osrm_bike: Bisiklet (OSRM)