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

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

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 7a1372f73d9893e20a46547e5120352caa044d8d..63d02781d358ea10c2a7e36b1b40d4f06800e2b9 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -207,7 +207,7 @@ diq:
       title_nearby: Nezdıra vurriyayışê setê karberi
       load_more: Dehana vêşi
     rss:
-      full: Vaten pêro
+      full: Heme werênayış
   diary_entry:
     new:
       publish_button: Vıla ke
@@ -241,40 +241,10 @@ diq:
       ago: Verdê %{ago}
       newer_comments: Tewr Vatışê Newey
       older_comments: Vatışo Tewr Kehan
-  export:
-    title: Teberdayış
-    start:
-      area_to_export: Cayo ke cıra bıvciyo
-      manually_select: Be desti ra yew cayo bin weçıne
-      format_to_export: Formatê teberi ra eştışi
-      osm_xml_data: OpenStreetMap XML Data
-      licence: Lisans
-      too_large:
-        planet:
-          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
-      format: Format
-      scale: Sence
-      max: maks
-      image_size: Gırdiya Resimi
-      zoom: Nezdı fi
-      add_marker: Xeriter rê yew nışan berz
-      latitude: 'Verıniye:'
-      longitude: 'Derganiye:'
-      output: Vıcyaen
-      export_button: Teberdayış
   geocoder:
     search:
       title:
         latlon: <a href="http://openstreetmap.org/">OSM</a> ra neticey
-        uk_postcode: <a href="http://www.npemap.org.uk/">FreeThe Postcode</a> ra neticey
         ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a> ra neticey
         osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OSM Nominatim</a>
           ra neticey
@@ -693,11 +663,6 @@ diq:
     copyright: Heqa telıfi
     community: Cemaet
     community_blogs: Blogê Cemaeti
-  license_page:
-    native:
-      title: Heqa na pele de
-  welcome_page:
-    title: Xeyr amey!
   notifier:
     diary_comment_notification:
       hi: Merheba %{to_user},
@@ -751,8 +716,41 @@ diq:
     sent_message_summary:
       delete_button: Bestere
   site:
+    copyright:
+      native:
+        title: Heqa na pele de
+    index:
+      permalink: Gıreyo daimi
     edit:
       user_page_link: pela karberi
+    export:
+      title: Teberdayış
+      area_to_export: Cayo ke cıra bıvciyo
+      manually_select: Be desti ra yew cayo bin weçıne
+      format_to_export: Formatê teberi ra eştışi
+      osm_xml_data: OpenStreetMap XML Data
+      licence: Lisans
+      too_large:
+        planet:
+          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
+      format: Format
+      scale: Sence
+      max: maks
+      image_size: Gırdiya Resimi
+      zoom: Nezdı fi
+      add_marker: Xeriter rê yew nışan berz
+      latitude: 'Verıniye:'
+      longitude: 'Derganiye:'
+      output: Vıcyaen
+      export_button: Teberdayış
     sidebar:
       search_results: Neticeyê geyrayışi
       close: Racnê
@@ -797,6 +795,8 @@ diq:
       text: Metın
       image: Resım
       url: GRE
+    welcome:
+      title: Xeyr amey!
   trace:
     edit:
       filename: 'Namey dosya:'
@@ -940,7 +940,6 @@ diq:
       description: Şınasnayış
       user location: Heruna karberi
       settings_link_text: eyari
-      your friends: Embazê to
       km away: '%{count} km duriyo'
       m away: '%{count} metre nezdiyo'
       role:
@@ -1024,7 +1023,7 @@ diq:
       confirm: Tesdiq ke
     revoke:
       confirm: Tesdiq ke
-  user_block:
+  user_blocks:
     new:
       title: '%{name}i rê blok vırazeno.'
       heading: '%{name}i ro blok vırazeno.'
@@ -1045,19 +1044,6 @@ diq:
     period:
       one: 1 seate
       other: '%{count} seati'
-    partial:
-      show: Bımocne
-      edit: Bıvırne
-      revoke: Terkne!
-      confirm: Vac welay?
-      display_name: Karberê kılitbiyayey
-      creator_name: Vıraştoğ
-      status: Weziyet
-      revoker_name: Terknoğ
-      not_revoked: (nê terkiyayo)
-      showing_page: Pele %{page}
-      next: Peyên »
-      previous: « Verên
     helper:
       time_future: '%{time} dı bıqediyo'
       time_past: Verdê %{time} qedya
@@ -1078,7 +1064,20 @@ diq:
       revoke: Terkne!
       confirm: Vac welay?
       revoker: 'Terkner:'
-  note:
+    block:
+      not_revoked: (nê terkiyayo)
+      show: Bımocne
+      edit: Bıvırne
+      revoke: Terkne!
+    blocks:
+      display_name: Karberê kılitbiyayey
+      creator_name: Vıraştoğ
+      status: Weziyet
+      revoker_name: Terknoğ
+      showing_page: Pele %{page}
+      next: Peyên »
+      previous: « Verên
+  notes:
     entry:
       comment: Mışewre
   javascripts:
@@ -1101,7 +1100,7 @@ diq:
         comment: Mışewre
     directions:
       time: Zeman
-  redaction:
+  redactions:
     edit:
       description: Şınasnayış
     new: