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

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

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 7a1372f73d9893e20a46547e5120352caa044d8d..b0ace2c753223ba3180f3582286355ccbb52101b 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
@@ -274,7 +274,6 @@ diq:
     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
@@ -751,6 +750,8 @@ diq:
     sent_message_summary:
       delete_button: Bestere
   site:
+    index:
+      permalink: Gıreyo daimi
     edit:
       user_page_link: pela karberi
     sidebar:
@@ -940,7 +941,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:
@@ -1045,19 +1045,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,6 +1065,20 @@ diq:
       revoke: Terkne!
       confirm: Vac welay?
       revoker: 'Terkner:'
+  user_blocks:
+    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
   note:
     entry:
       comment: Mışewre