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

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

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 59e76023ec4db9eb1bb88160a1e65ed844e595bf..636df3fdba5d8a157c266a897cb75f22eb63fea5 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -18,8 +18,21 @@ diq:
       friendly: '%e %B %Y seate %H:%M'
   helpers:
     submit:
+      diary_comment:
+        create: Qeyd ke
       diary_entry:
         create: Vıla ke
+        update: Rocane ke
+      message:
+        create: Bırışe
+      client_application:
+        create: Qeyd Be
+        update: Bıvurne
+      trace:
+        create: Bar ke
+      user_block:
+        create: Bloqe vırazê
+        update: Bloqi noroc resn
   activerecord:
     models:
       acl: Qontrol Listeyê Resayışi
@@ -233,7 +246,6 @@ diq:
       leave_a_comment: Yew mışewre bınuse
       login_to_leave_a_comment: Seba mışewreyi rê %{login_link}
       login: Cıkewtış
-      save_button: Qeyd ke
     no_such_entry:
       title: Rocekê cıkewtışanê wınasiyan çıniyo
     diary_entry:
@@ -714,7 +726,6 @@ diq:
       title: Mesac bırışê
       subject: Mewzu
       body: Vêrey mesaci
-      send_button: Bırışe
     outbox:
       title: Şıyenan
       inbox: Ameyan
@@ -819,7 +830,6 @@ diq:
     new:
       tags: 'Etiketi:'
       visibility: Vinayîşî
-      upload_button: Bar ke
       help: Peşti
     edit:
       filename: 'Namey dosya:'
@@ -872,10 +882,6 @@ diq:
       public_traces_from: '%{user} ra pêron rê akerde rêçê GPS'
       tagged_with: '%{tags} ya etiketyayo'
   oauth_clients:
-    new:
-      submit: Qeyd Be
-    edit:
-      submit: Bıvurne
     show:
       edit: Detaya Timar ke
       confirm: Vac welay?
@@ -1047,12 +1053,10 @@ diq:
     new:
       title: '%{name}i rê blok vırazeno.'
       heading: '%{name}i ro blok vırazeno.'
-      submit: Bloqe vırazê
       back: Bloqan pêron bıvin
     edit:
       title: '%{name} bloqe vurna'
       heading: '%{name} bloqe vurna'
-      submit: Bloqi noroc resn
       show: Nê bloqi bıvin
       back: Bloqan pêron bıvin
     update:
@@ -1061,12 +1065,13 @@ diq:
       title: Bloqeyê karberi
     revoke:
       revoke: Terkne!
-    period:
-      one: 1 seate
-      other: '%{count} seati'
     helper:
       time_future: '%{time} dı bıqediyo'
       time_past: Verdê %{time} qedya
+      block_duration:
+        hours:
+          one: 1 seate
+          other: '%{count} seati'
     blocks_on:
       title: Blokeyê ke %{name} kerdê
       heading: Blokeyê ke %{name} kerdê listey ênan