Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/Job/NotificationJob.php

1 files changed, 30 insertions, 33 deletions

diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php
index 0ef01ef7..a4adece7 100644
--- a/app/Locale/zh_CN/translations.php
+++ b/app/Locale/zh_CN/translations.php
@@ -299,7 +299,6 @@ return array(
     'Display another project' => '显示其它项目',
     'Created by %s' => '创建者：%s',
     'Tasks Export' => '任务导出',
-    'Tasks exportation for "%s"' => '导出"%s"的任务',
     'Start Date' => '开始时间',
     'End Date' => '结束时间',
     'Execute' => '执行',
@@ -322,14 +321,9 @@ return array(
     'New sub-task' => '新建子任务',
     'New attachment added "%s"' => '新附件已添加"%s"',
     'New comment posted by %s' => '%s 的新评论',
-    'New attachment' => '新建附件',
     'New comment' => '新建评论',
     'Comment updated' => '更新了评论',
     'New subtask' => '新建子任务',
-    'Subtask updated' => '子任务更新',
-    'Task updated' => '任务更新',
-    'Task closed' => '任务关闭',
-    'Task opened' => '任务开启',
     'I want to receive notifications only for those projects:' => '我仅需要收到下面项目的通知：',
     'view the task on Kanboard' => '在看板中查看此任务',
     'Public access' => '公开访问',
@@ -386,14 +380,12 @@ return array(
     '%s updated the task #%d' => '%s 更新了任务 #%d',
     '%s created the task #%d' => '%s 创建了任务 #%d',
     '%s closed the task #%d' => '%s 关闭了任务 #%d',
-    '%s open the task #%d' => '%s 开启了任务 #%d',
-    '%s moved the task #%d to the column "%s"' => '%s 将任务 #%d 移动到栏目 "%s"',
-    '%s moved the task #%d to the position %d in the column "%s"' => '%s将任务#%d移动到"%s"的第 %d 列',
+    '%s opened the task #%d' => '%s 开启了任务 #%d',
     'Activity' => '动态',
     'Default values are "%s"' => '默认值为 "%s"',
     'Default columns for new projects (Comma-separated)' => '新建项目的默认栏目(用逗号分开)',
     'Task assignee change' => '任务分配变更',
-    '%s change the assignee of the task #%d to %s' => '%s 将任务 #%d 分配给了 %s',
+    '%s changed the assignee of the task #%d to %s' => '%s 将任务 #%d 分配给了 %s',
     '%s changed the assignee of the task %s to %s' => '%s 将任务 %s 分配给 %s',
     'New password for the user "%s"' => '用户"%s"的新密码',
     'Choose an event' => '选择一个事件',
@@ -442,13 +434,10 @@ return array(
     'Percentage' => '百分比',
     'Number of tasks' => '任务数',
     'Task distribution' => '任务分布',
-    'Reportings' => '报告',
-    'Task repartition for "%s"' => '"%s"的任务分析',
     'Analytics' => '分析',
     'Subtask' => '子任务',
     'My subtasks' => '我的子任务',
     'User repartition' => '用户分析',
-    'User repartition for "%s"' => '"%s"的用户分析',
     'Clone this project' => '复制此项目',
     'Column removed successfully.' => '成功删除了栏目。',
     'Not enough data to show the graph.' => '数据不足，无法绘图。',
@@ -465,10 +454,8 @@ return array(
     'This value must be numeric' => '这个值必须为数字',
     'Unable to create this task.' => '无法创建此任务。',
     'Cumulative flow diagram' => '累积流图表',
-    'Cumulative flow diagram for "%s"' => '"%s"的累积流图表',
     'Daily project summary' => '每日项目汇总',
     'Daily project summary export' => '导出每日项目汇总',
-    'Daily project summary export for "%s"' => '导出项目"%s"的每日汇总',
     'Exports' => '导出',
     'This export contains the number of tasks per column grouped per day.' => '此导出包含每列的任务数，按天分组',
     'Active swimlanes' => '活动里程碑',
@@ -494,7 +481,6 @@ return array(
     'Subtask Id' => '子任务 Id',
     'Subtasks' => '子任务',
     'Subtasks Export' => '子任务导出',
-    'Subtasks exportation for "%s"' => '导出"%s"的子任务',
     'Task Title' => '任务标题',
     'Untitled' => '无标题',
     'Application default' => '程序默认',
@@ -601,7 +587,7 @@ return array(
     'The currency rate have been added successfully.' => '成功添加汇率。',
     'Unable to add this currency rate.' => '无法添加此汇率',
     'Webhook URL' => '网络钩子 URL',
-    '%s remove the assignee of the task %s' => '%s删除了任务%s的负责人',
+    '%s removed the assignee of the task %s' => '%s删除了任务%s的负责人',
     'Enable Gravatar images' => '启用 Gravatar 图像',
     'Information' => '信息',
     'Check two factor authentication code' => '检查双重认证码',
@@ -615,7 +601,6 @@ return array(
     'Test your device' => '测试设备',
     'Assign a color when the task is moved to a specific column' => '任务移动到指定栏目时设置颜色',
     '%s via Kanboard' => '%s 通过KanBoard',
-    'Burndown chart for "%s"' => '燃尽图:"%s"',
     'Burndown chart' => '燃尽图',
     'This chart show the task complexity over the time (Work Remaining).' => '图表显示任务随时间(剩余时间)的复杂度',
     'Screenshot taken %s' => '已截图 %s',
@@ -680,14 +665,8 @@ return array(
     'Move the task to another column when the category is changed' => '当任务分类改变时移动到任务栏',
     'Send a task by email to someone' => '发送任务邮件到用户',
     'Reopen a task' => '重新开始一个任务',
-    'Column change' => '任务栏改变',
-    'Position change' => '位置改变',
-    'Swimlane change' => '里程碑改变',
-    'Assignee change' => '指派人改变',
-    '[%s] Overdue tasks' => '[%s] 超期任务',
     'Notification' => '通知',
     '%s moved the task #%d to the first swimlane' => '%s将任务#%d移动到了首个里程碑',
-    '%s moved the task #%d to the swimlane "%s"' => '%s将任务#%d移动到了里程碑"%s"下',
     'Swimlane' => '里程碑',
     'Gravatar' => 'Gravatar头像',
     '%s moved the task %s to the first swimlane' => '%s将任务%s移动到了首个里程碑',
@@ -758,8 +737,6 @@ return array(
     'Search by category: ' => '按分类：',
     'Search by description: ' => '按描述：',
     'Search by due date: ' => '按超期时间：',
-    // 'Lead and Cycle time for "%s"' => '',
-    'Average time spent into each column for "%s"' => '"%s"在每个任务栏下平均花费时间',
     'Average time spent into each column' => '每个任务栏平均花费时间',
     'Average time spent' => '平均花费时间',
     'This chart show the average time spent into each column for the last %d tasks.' => '当前柱状图表示最新%d条任务在每个任务栏下的平均花费时间',
@@ -800,7 +777,6 @@ return array(
     'License:' => '授权许可:',
     'License' => '授权许可',
     'Enter the text below' => '输入下方的文本',
-    'Gantt chart for %s' => '%s的甘特图',
     'Sort by position' => '按位置排序',
     'Sort by date' => '按日期排序',
     'Add task' => '添加任务',
@@ -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"?' => '你确定把用户"%s"从"%s"中移除？',
     'There is no group.' => '当前没有用户组',
@@ -968,13 +941,10 @@ return array(
     'Enter group name...' => '输入用户组名称...',
     'Role:' => '角色:',
     'Project members' => '项目成员',
-    'Compare hours for "%s"' => '比较"%s"的时间',
     '%s mentioned you in the task #%d' => '%s在任务#%d里提及你',
     '%s mentioned you in a comment on the task #%d' => '%s在任务#%d的评论里提及你',
     'You were mentioned in the task #%d' => '你在任务#%d里被提及',
     'You were mentioned in a comment on the task #%d' => '你在任务#%d的评论里被提及',
-    'Mentioned' => '被提及',
-    'Compare Estimated Time vs Actual Time' => '对比预估时间VS实际时间',
     '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' => '',
 );