Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/Locale/ja_JP/translations.php

1 files changed, 42 insertions, 0 deletions

diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php
index c2651842..134544a6 100644
--- a/app/Locale/ja_JP/translations.php
+++ b/app/Locale/ja_JP/translations.php
@@ -1299,6 +1299,48 @@ return array(
      'Assign automatically a color when due date is expired' => '期限が切れたら自動的に色を割当て',
      'Total score in this column across all swimlanes' => 'このカラムのすべてのスイムレーンで合計得点',
     // 'HRK - Kuna' => '',
+    // 'ARS - Argentine Peso' => '',
+    // 'COP - Colombian Peso' => '',
+    // '%d groups' => '',
+    // '%d group' => '',
+    // 'Group ID' => '',
+    // 'External ID' => '',
+    // '%d users' => '',
+    // '%d user' => '',
+    // 'Hide subtasks' => '',
+    // 'Show subtasks' => '',
+    // 'Authentication Parameters' => '',
+    // 'API Access' => '',
+    // 'No users found.' => '',
+    // 'User ID' => '',
+    // 'Notifications are activated' => '',
+    // 'Notifications are disabled' => '',
+    // 'User disabled' => '',
+    // '%d notifications' => '',
+    // '%d notification' => '',
+    // 'There is no external integration installed.' => '',
+    // 'You are not allowed to update tasks assigned to someone else.' => '',
+    // 'You are not allowed to change the assignee.' => '',
+    // 'Task suppression is not permitted' => '',
+    // 'Changing assignee is not permitted' => '',
+    // 'Update only assigned tasks is permitted' => '',
+    // 'Only for tasks assigned to the current user' => '',
+    // 'My projects' => '',
+    // 'Your are not member of any project.' => '',
+    // 'My subtasks' => '',
+    // '%d subtasks' => '',
+    // '%d subtask' => '',
+    // 'Only moving task between those columns is permitted for tasks assigned to the current user' => '',
+    // '[DUPLICATE]' => '',
+    // 'DKK - Danish Krona' => '',
+    // 'Remove user from group' => '',
+    // 'Assign the task to its creator' => '',
+    // 'This task was sent by email to "%s" with subject "%s".' => '',
+    // 'Predefined Email Subjects' => '',
+    // 'Write one subject by line.' => '',
+    // 'Create another link' => '',
+    // 'BRL - Brazilian Real' => '',
+    // 'Add a new Kanboard task' => '',
      'ARS - Argentine Peso' => 'ARS - アルゼンチンペソ',
      'COP - Colombian Peso' => 'COP - コロンビアペソ',
      '%d groups' => '%d個のグループ',