Merge pull-request #1838 and solve conflict

app/Locale/zh_CN/translations.php

@@ -1085,40 +1085,37 @@ return array(
     'There is no external link for the moment.' => '当前没有外部关联。',
     'Internal links' => '内部关联',
     'There is no internal link for the moment.' => '当前没有内部关联。',
-    // 'Assign to me' => '',
-    // 'Me' => '',
-    // 'Do not duplicate anything' => '',
-    // 'Projects management' => '',
-    // 'Users management' => '',
-    // 'Groups management' => '',
-    // 'Create from another project' => '',
-    // 'There is no subtask at the moment.' => '',
-    // 'open' => '',
-    // 'closed' => '',
-    // 'Priority:' => '',
-    // 'Reference:' => '',
-    // 'Complexity:' => '',
-    // 'Swimlane:' => '',
-    // 'Column:' => '',
-    // 'Position:' => '',
-    // 'Creator:' => '',
-    // 'Time estimated:' => '',
-    // '%s hours' => '',
-    // 'Time spent:' => '',
-    // 'Created:' => '',
-    // 'Modified:' => '',
-    // 'Completed:' => '',
-    // 'Started:' => '',
-    // 'Moved:' => '',
-    // 'Task #%d' => '',
-    // 'Sub-tasks' => '',
-    // 'Date and time format' => '',
-    // 'Time format' => '',
-    // 'Start date: ' => '',
-    // 'End date: ' => '',
-    // 'New due date: ' => '',
-    // 'Start date changed: ' => '',
-    // 'Disable private projects' => '',
-    // 'Do you really want to remove this custom filter: "%s"?' => '',
-    // 'Remove a custom filter' => '',
+    'Assign to me' => '指派给我',
+    'Me' => '我',
+    'Do not duplicate anything' => '不再重复',
+    'Projects management' => '项目管理',
+    'Users management' => '用户管理',
+    'Groups management' => '用户组管理',
+    'Create from another project' => '从另一个项目中创建',
+    'There is no subtask at the moment.' => '当前没有子任务。',
+    'open' => '打开',
+    'closed' => '已关闭',
+    'Priority:' => '优先级：',
+    'Reference:' => '引用：',
+    'Complexity:' => '复杂度：',
+    'Swimlane:' => '里程碑：',
+    'Column:' => '列：',
+    'Position:' => '位置：',
+    'Creator:' => '创建者：',
+    'Time estimated:' => '时间已过去：',
+    '%s hours' => '%s 小时',
+    'Time spent:' => '时间消耗：',
+    'Created:' => '已创建：',
+    'Modified:' => '已修改：',
+    'Completed:' => '已完成：',
+    'Started:' => '已开始：',
+    'Moved:' => '已移走',
+    'Task #%d' => '任务#%d',
+    'Sub-tasks' => '子任务',
+    'Date and time format' => '时间和日期格式',
+    'Time format' => '时间格式',
+    'Start date: ' => '开始时间：',
+    'End date: ' => '结束时间：',
+    'New due date: ' => '新超期时间：',
+    'Start date changed: ' => '开始时间已改变：',
 );