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

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

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 1c416e268152b4f97f00207b1a74686d0952ab4d..a48f027ba09e5772b53ba2f2f5ecc19ad2912452 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -163,6 +163,24 @@ diq:
       entry:
         comment: Mışewre
         full: Note pêro
+  accounts:
+    edit:
+      title: Hesabi bıvurne
+      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
   browse:
     created: Vıraziya
     closed: Kerd kip
@@ -288,6 +306,14 @@ diq:
       title_friend: Qeydê vurnayışê embazan
       title_nearby: Nezdıra vurriyayışê setê karberi
       load_more: Tayêna bar ke
+  dashboards:
+    contact:
+      km away: '%{count} km duriyo'
+      m away: '%{count} metre nezdiyo'
+    popup:
+      your location: Heruna mı
+      nearby mapper: Xeritoğo emıryan
+      friend: Embaz
   diary_entries:
     new:
       title: Roceko newe definayış
@@ -565,7 +591,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
@@ -653,7 +678,7 @@ diq:
           mud: Dawte
           peak: Gıl /sersıq
           point: Pırn
-          reef: Resif
+          reef: Kemer
           ridge: Sud
           rock: Qere
           saddle: Cıl
@@ -774,6 +799,7 @@ diq:
     data: Melumati
     tou: Şertê gurenayışi
     help: Peşti
+    about: Heqa
     copyright: Heqa telifi
     community: Cemaet
     community_blogs: Blogê Cemaeti
@@ -921,7 +947,7 @@ diq:
           common:
           - Çimen
           lake:
-          - Dol
+          - Gol
           farm: Cıtinin
           cemetery: Mezlaser
           allotments: Bostan
@@ -964,7 +990,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
@@ -1002,7 +1028,7 @@ diq:
     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ı
@@ -1023,8 +1049,6 @@ diq:
       status: 'Weziyet:'
       description: Şınasnayış
       user location: Heruna karberi
-      km away: '%{count} km duriyo'
-      m away: '%{count} metre nezdiyo'
       role:
         administrator: |-
           Na karber administratora<br>
@@ -1049,27 +1073,6 @@ diq:
       unhide_user: nê karberi menımnê
       delete_user: nê karberi esternê
       confirm: Tesdiq ke
-    popup:
-      your location: Heruna mı
-      nearby mapper: Xeritoğo emıryan
-      friend: Embaz
-    account:
-      title: Hesabi bıvurne
-      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 vırnayış:'
-        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 vurnayış:'
-      contributor terms:
-        link text: no çıko?
-      save changes button: Vurnayışan qeyd ke
     index:
       title: Karberi
       heading: Karberi