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

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

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 1b6956281ad0c3b3d7028f062efe73d7af602d61..73bdfb705f3138a39cc6c30134ecd18cb35a25f9 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -48,8 +48,6 @@ diq:
   activerecord:
     errors:
       messages:
-        invalid_email_address: Ravêrde ze yew adresê eposta nêaseno
-        email_address_not_routable: Tadeyaye niyo
         display_name_is_user_n: n, hendık kamiya karkeriya şoma nêbo  user_n nêbeno.
       models:
         user_mute:
@@ -241,7 +239,6 @@ diq:
         way: Ray
         relation: Elaqe
     containing_relation:
-      entry_html: Elaqe %{relation_name}
       entry_role_html: Eleqe %{relation_name} (%{relation_role} deye)
     not_found:
       title: Nêvineya
@@ -277,12 +274,7 @@ diq:
       nearby: Nezdıra xısusiyeti
       enclosing: Muhtewa xısusiyeti
   changesets:
-    changeset_paging_nav:
-      showing_page: Pele %{page}
-      next: Bahdoyên »
-      previous: « Verên
     changeset:
-      anonymous: Anonim
       no_edits: (vırnayış çıniyo)
       view_changeset_details: Teferuatê vurnayışê seti bıvin
     index:
@@ -375,15 +367,11 @@ diq:
       report: Nê mışewreyi rapor ke
     location:
       location: 'Lokasyon:'
-      view: Bıvêne
-      edit: Bıvurne
   diary_comments:
     page:
       post: Rışte
       when: Key
       comment: Mışewre
-      newer_comments: Mışewreyê Newey
-      older_comments: Mışewreyê Kehani
   errors:
     contact:
       contact: irtibat
@@ -813,10 +801,6 @@ diq:
           dam: Berac
           lock: İskele
           river: Ro
-      types:
-        cities: Sûki
-        towns: Bacari
-        places: Cayi
   issues:
     index:
       states:
@@ -850,8 +834,6 @@ diq:
     note_comment_notification:
       anonymous: Yew karbero bêname
       greeting: Merheba,
-    changeset_comment_notification:
-      greeting: Merheba,
   confirmations:
     confirm:
       button: Tesdiq ke
@@ -900,20 +882,23 @@ diq:
       home location: 'Herune:'
   sessions:
     new:
-      title: Cıkewtış
       tab_title: Cıkewtış
       email or username: 'Adresa e-posteyi ya zi nameyê karberi:'
       password: 'Parola:'
       remember: Mı biya xo viri
       lost password link: Şıma parolay xo ke xo vira?
       login_button: Cıkewtış
-      register now: Enewkê qeyd bê
     destroy:
       title: Veciyayış
       heading: OpenStreetMap ra vıcyayış
       logout_button: Veciyayış
     suspended_flash:
       support: peşti
+  shared:
+    pagination:
+      diary_comments:
+        older: Mışewreyê Kehani
+        newer: Mışewreyê Newey
   site:
     copyright:
       native:
@@ -934,7 +919,6 @@ diq:
       export_button: Teberdayış
     sidebar:
       search_results: Peyniya cıgeyrayışi
-      close: Kip ke
     search:
       search: Cı geyre
       from: Rıştoğ
@@ -964,8 +948,6 @@ diq:
   traces:
     new:
       help: Peşti
-    trace_optionals:
-      tags: Etiketi
     show:
       title: Rêça %{name} mocnêyêna
       heading: Rêça %{name} mocnêyêna
@@ -1006,7 +988,6 @@ diq:
       heading: Terimi
       consider_pd_why: no çıko?
       continue: Dewam ke
-      decline: Red kerê
       legale_names:
         france: Fransa
         italy: İtalya
@@ -1064,11 +1045,6 @@ diq:
     suspended:
       title: Hesab Darideyo
       heading: Hesab Darideyo
-  user_role:
-    grant:
-      confirm: Tesdiq ke
-    revoke:
-      confirm: Tesdiq ke
   user_blocks:
     new:
       title: '%{name}i rê blok vırazeno.'
@@ -1097,15 +1073,13 @@ diq:
       title: Karber %{block_by} karber %{block_on} ke bloqe
       heading_html: Karber %{block_by} karber %{block_on} ke bloqe
       status: Weziyet
-      show: Bımocne
       edit: Bıvurne
-      confirm: Şıma bêgumanê?
       revoker: 'Terkner:'
     block:
       not_revoked: (nê terkiyayo)
       show: Bımocne
       edit: Bıvurne
-    blocks:
+    page:
       display_name: Karberê kılitbiyayey
       creator_name: Vıraştoğ
       status: Weziyet
@@ -1121,6 +1095,8 @@ diq:
       comment: Mışewre
     new:
       title: Nota Newi
+    notes_paging_nav:
+      showing_page: Pele %{page}
   javascripts:
     close: Kip ke
     share: