Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/Job/NotificationJob.php

1 files changed, 30 insertions, 33 deletions

diff --git a/app/Locale/my_MY/translations.php b/app/Locale/my_MY/translations.php
index ff8960aa..79baadf7 100644
--- a/app/Locale/my_MY/translations.php
+++ b/app/Locale/my_MY/translations.php
@@ -299,7 +299,6 @@ return array(
     'Display another project' => 'Lihat projek lain',
     'Created by %s' => 'Dibuat oleh %s',
     'Tasks Export' => 'Ekspor Tugas',
-    'Tasks exportation for "%s"' => 'Tugas di ekspor untuk « %s »',
     'Start Date' => 'Tanggal Mulai',
     'End Date' => 'Tanggal Berakhir',
     'Execute' => 'Eksekusi',
@@ -322,14 +321,9 @@ return array(
     'New sub-task' => 'Sub-tugas baru',
     'New attachment added "%s"' => 'Lampiran baru ditambahkan « %s »',
     'New comment posted by %s' => 'Komentar baru ditambahkan oleh « %s »',
-    'New attachment' => 'Lampirkan baru',
     'New comment' => 'Komentar baru',
     'Comment updated' => 'Komentar diperbaharui',
     'New subtask' => 'Sub-tugas baru',
-    'Subtask updated' => 'Sub-tugas diperbaharui',
-    'Task updated' => 'Tugas diperbaharui',
-    'Task closed' => 'Tugas ditutup',
-    'Task opened' => 'Tugas dibuka',
     'I want to receive notifications only for those projects:' => 'Saya ingin menerima pemberitahuan hanya untuk projek-projek yang dipilih :',
     'view the task on Kanboard' => 'lihat tugas di Kanboard',
     'Public access' => 'Akses awam',
@@ -386,14 +380,12 @@ return array(
     '%s updated the task #%d' => '%s memperbaharui tugas n°%d',
     '%s created the task #%d' => '%s membuat tugas n°%d',
     '%s closed the task #%d' => '%s menutup tugas n°%d',
-    '%s open the task #%d' => '%s membuka tugas n°%d',
-    '%s moved the task #%d to the column "%s"' => '%s memindahkan tugas n°%d ke kolom « %s »',
-    '%s moved the task #%d to the position %d in the column "%s"' => '%s memindahkan tugas n°%d ke posisi n°%d dalam kolom « %s »',
+    '%s opened the task #%d' => '%s membuka tugas n°%d',
     'Activity' => 'Aktifitas',
     'Default values are "%s"' => 'Standar nilai adalah« %s »',
     'Default columns for new projects (Comma-separated)' => 'Kolom default untuk projek baru (dipisahkan dengan koma)',
     'Task assignee change' => 'Mengubah orang ditugaskan untuk tugas',
-    '%s change the assignee of the task #%d to %s' => '%s rubah orang yang ditugaskan dari tugas n%d ke %s',
+    '%s changed the assignee of the task #%d to %s' => '%s rubah orang yang ditugaskan dari tugas n%d ke %s',
     '%s changed the assignee of the task %s to %s' => '%s mengubah orang yang ditugaskan dari tugas %s ke %s',
     'New password for the user "%s"' => 'Kata laluan baru untuk pengguna « %s »',
     'Choose an event' => 'Pilih sebuah acara',
@@ -442,13 +434,10 @@ return array(
     'Percentage' => 'Persentasi',
     'Number of tasks' => 'Jumlah dari tugas',
     'Task distribution' => 'Pembagian tugas',
-    'Reportings' => 'Pelaporan',
-    'Task repartition for "%s"' => 'Pembagian tugas untuk « %s »',
     'Analytics' => 'Analitis',
     'Subtask' => 'Subtugas',
     'My subtasks' => 'Subtugas saya',
     'User repartition' => 'Partisi ulang pengguna',
-    'User repartition for "%s"' => 'Partisi ulang pengguna untuk « %s »',
     'Clone this project' => 'Gandakan projek ini',
     'Column removed successfully.' => 'Kolom berhasil dihapus.',
     'Not enough data to show the graph.' => 'Tidak cukup data untuk menampilkan grafik.',
@@ -465,10 +454,8 @@ return array(
     'This value must be numeric' => 'Nilai ini harus angka',
     'Unable to create this task.' => 'Tidak dapat membuat tugas ini',
     'Cumulative flow diagram' => 'Diagram alir kumulatif',
-    'Cumulative flow diagram for "%s"' => 'Diagram alir kumulatif untuk « %s »',
     'Daily project summary' => 'Ringkasan projek harian',
     'Daily project summary export' => 'Ekspot ringkasan projek harian',
-    'Daily project summary export for "%s"' => 'Ekspor ringkasan projek harian untuk « %s »',
     'Exports' => 'Ekspor',
     'This export contains the number of tasks per column grouped per day.' => 'Ekspor ini berisi jumlah dari tugas per kolom dikelompokan perhari.',
     'Active swimlanes' => 'Swimlanes aktif',
@@ -494,7 +481,6 @@ return array(
     'Subtask Id' => 'Id Subtugas',
     'Subtasks' => 'Subtugas',
     'Subtasks Export' => 'Ekspot Subtugas',
-    'Subtasks exportation for "%s"' => 'Ekspor subtugas untuk « %s »',
     'Task Title' => 'Judul Tugas',
     'Untitled' => 'Tanpa nama',
     'Application default' => 'Aplikasi Piawaian',
@@ -601,7 +587,7 @@ return array(
     'The currency rate have been added successfully.' => 'Nilai tukar mata uang berhasil ditambahkan.',
     'Unable to add this currency rate.' => 'Tidak dapat menambahkan nilai tukar mata uang',
     'Webhook URL' => 'URL webhook',
-    '%s remove the assignee of the task %s' => '%s menghapus penugasan dari tugas %s',
+    '%s removed the assignee of the task %s' => '%s menghapus penugasan dari tugas %s',
     'Enable Gravatar images' => 'Mengaktifkan gambar Gravatar',
     'Information' => 'Informasi',
     'Check two factor authentication code' => 'Cek dua faktor kode otentifikasi',
@@ -615,7 +601,6 @@ return array(
     'Test your device' => 'Menguji perangkat anda',
     'Assign a color when the task is moved to a specific column' => 'Menetapkan warna ketika tugas tersebut dipindahkan ke kolom tertentu',
     '%s via Kanboard' => '%s via Kanboard',
-    'Burndown chart for "%s"' => 'Grafik Burndown untku « %s »',
     'Burndown chart' => 'Grafik Burndown',
     'This chart show the task complexity over the time (Work Remaining).' => 'Grafik ini menunjukkan kompleksitas tugas dari waktu ke waktu (Sisa Pekerjaan).',
     'Screenshot taken %s' => 'Screenshot diambil %s',
@@ -680,14 +665,8 @@ return array(
     'Move the task to another column when the category is changed' => 'Pindahkan tugas ke kolom lain ketika kategori berubah',
     'Send a task by email to someone' => 'Kirim tugas melalui email ke seseorang',
     'Reopen a task' => 'Membuka kembali tugas',
-    'Column change' => 'Kolom berubah',
-    'Position change' => 'Posisi berubah',
-    'Swimlane change' => 'Swimlane berubah',
-    'Assignee change' => 'Penerima berubah',
-    '[%s] Overdue tasks' => '[%s] Tugas terlambat',
     'Notification' => 'Pemberitahuan',
     '%s moved the task #%d to the first swimlane' => '%s memindahkan tugas n°%d ke swimlane pertama',
-    '%s moved the task #%d to the swimlane "%s"' => '%s memindahkan tugas n°%d ke swimlane « %s »',
     'Swimlane' => 'Swimlane',
     'Gravatar' => 'Gravatar',
     '%s moved the task %s to the first swimlane' => '%s memindahkan tugas %s ke swimlane pertama',
@@ -758,8 +737,6 @@ return array(
     'Search by category: ' => 'Pencarian berdasarkan kategori : ',
     'Search by description: ' => 'Pencarian berdasarkan deskripsi : ',
     'Search by due date: ' => 'Pencarian berdasarkan tanggal jatuh tempo : ',
-    'Lead and Cycle time for "%s"' => 'Memimpin dan Siklus waktu untuk « %s »',
-    'Average time spent into each column for "%s"' => 'Rata-rata waktu yang dihabiskan dalam setiap kolom untuk « %s »',
     'Average time spent into each column' => 'Rata-rata waktu yang dihabiskan dalam setiap kolom',
     'Average time spent' => 'Rata-rata waktu yang dihabiskan',
     'This chart show the average time spent into each column for the last %d tasks.' => 'Grafik ini menunjukkan rata-rata waktu yang dihabiskan dalam setiap kolom untuk %d tugas.',
@@ -800,7 +777,6 @@ return array(
     'License:' => 'Lesen:',
     'License' => 'Lesen',
     'Enter the text below' => 'Masukkan teks di bawah',
-    'Gantt chart for %s' => 'Carta Gantt untuk %s',
     'Sort by position' => 'Urutkan berdasarkan posisi',
     'Sort by date' => 'Urutkan berdasarkan tanggal',
     'Add task' => 'Tambah tugas',
@@ -841,8 +817,6 @@ return array(
     // 'Version' => '',
     // 'Plugins' => '',
     // 'There is no plugin loaded.' => '',
-    // 'Set maximum column height' => '',
-    // 'Remove maximum column height' => '',
     // 'My notifications' => '',
     // 'Custom filters' => '',
     // 'Your custom filter have been created successfully.' => '',
@@ -947,7 +921,6 @@ return array(
     // 'Invalid captcha' => '',
     // 'The name must be unique' => '',
     // 'View all groups' => '',
-    // 'View group members' => '',
     // 'There is no user available.' => '',
     // 'Do you really want to remove the user "%s" from the group "%s"?' => '',
     // 'There is no group.' => '',
@@ -968,13 +941,10 @@ return array(
     // 'Enter group name...' => '',
     'Role:' => 'Peranan',
     'Project members' => 'Anggota projek',
-    // 'Compare hours for "%s"' => '',
     // '%s mentioned you in the task #%d' => '',
     // '%s mentioned you in a comment on the task #%d' => '',
     // 'You were mentioned in the task #%d' => '',
     // 'You were mentioned in a comment on the task #%d' => '',
-    // 'Mentioned' => '',
-    // 'Compare Estimated Time vs Actual Time' => '',
     // 'Estimated hours: ' => '',
     // 'Actual hours: ' => '',
     // 'Hours Spent' => '',
@@ -1216,5 +1186,32 @@ return array(
     // 'Global tags' => '',
     // 'There is no global tag at the moment.' => '',
     // 'This field cannot be empty' => '',
+    // 'Close a task when there is no activity in an specific column' => '',
+    // '%s removed a subtask for the task #%d' => '',
+    // '%s removed a comment on the task #%d' => '',
+    // 'Comment removed on task #%d' => '',
+    // 'Subtask removed on task #%d' => '',
     // 'Hide tasks in this column in the dashboard' => '',
+    // '%s removed a comment on the task %s' => '',
+    // '%s removed a subtask for the task %s' => '',
+    // 'Comment removed' => '',
+    // 'Subtask removed' => '',
+    // '%s set a new internal link for the task #%d' => '',
+    // '%s removed an internal link for the task #%d' => '',
+    // 'A new internal link for the task #%d have been defined' => '',
+    // 'Internal link removed for the task #%d' => '',
+    // '%s set a new internal link for the task %s' => '',
+    // '%s removed an internal link for the task %s' => '',
+    // 'Automatically set the due date on task creation' => '',
+    // 'Move the task to another column when closed' => '',
+    // 'Move the task to another column when not moved during a given period' => '',
+    // 'Dashboard for %s' => '',
+    // 'Tasks overview for %s' => '',
+    // 'Subtasks overview for %s' => '',
+    // 'Projects overview for %s' => '',
+    // 'Activity stream for %s' => '',
+    // 'Calendar for %s' => '',
+    // 'Notifications for %s' => '',
+    // 'Subtasks export' => '',
+    // 'Tasks exportation' => '',
 );