Merge pull-request #481 (zh_CN translation)

1 files changed, 33 insertions, 33 deletions

diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php
index ce8767d4..d610f8ee 100644
--- a/app/Locale/zh_CN/translations.php
+++ b/app/Locale/zh_CN/translations.php
@@ -24,7 +24,7 @@ return array(
     'Unassigned' => '未指定',
     'View this task' => '查看该任务',
     'Remove user' => '移除用户',
-    'Do you really want to remove this user: "%s"?' => '你确定要移除这个用户吗："%s"？',
+    'Do you really want to remove this user: "%s"?' => '确定要删除用户"%s"吗？',
     'New user' => '新建用户',
     'All users' => '所有用户',
     'Username' => '用户名',
@@ -63,7 +63,7 @@ return array(
     'Disable' => '停用',
     'Enable' => '启用',
     'New project' => '新建项目',
-    'Do you really want to remove this project: "%s"?' => '你确定要移除该项目吗："%s"？',
+    'Do you really want to remove this project: "%s"?' => '确定要移除项目"%s"吗？',
     'Remove project' => '移除项目',
     'Boards' => '看板',
     'Edit the board for "%s"' => '为"%s"修改看板',
@@ -78,7 +78,7 @@ return array(
     'Remove a column' => '移除一个栏目',
     'Remove a column from a board' => '从看板移除一个栏目',
     'Unable to remove this column.' => '无法移除该栏目。',
-    'Do you really want to remove this column: "%s"?' => '你确定要移除该栏目："%s"吗？',
+    'Do you really want to remove this column: "%s"?' => '确定要移除栏目"%s"吗？',
     'This action will REMOVE ALL TASKS associated to this column!' => '该动作将移除与该栏目相关的所有项目！',
     'Settings' => '设置',
     'Application settings' => '应用设置',
@@ -187,7 +187,7 @@ return array(
     'Complexity' => '复杂度',
     'limit' => '限制',
     'Task limit' => '任务限制',
-    // 'Task count' => '',
+    'Task count' => '任务数',
     'This value must be greater than %d' => '该数值必须大于%d',
     'Edit project access list' => '编辑项目存取列表',
     'Edit users access' => '编辑用户存取权限',
@@ -232,7 +232,7 @@ return array(
     'Next step' => '下一步',
     'Define action parameters' => '定义动作参数',
     'Save this action' => '保存该动作',
-    'Do you really want to remove this action: "%s"?' => '确定要移除该动作"%s"吗？',
+    'Do you really want to remove this action: "%s"?' => '确定要移除动作"%s"吗？',
     'Remove an automatic action' => '移除一个自动动作',
     'Close the task' => '关闭任务',
     'Assign the task to a specific user' => '将该任务指派给一个用户',
@@ -286,7 +286,7 @@ return array(
     'Nothing found.' => '没找到。',
     'Search in the project "%s"' => '在项目"%s"中查找',
     'Due date' => '到期时间',
-    'Others formats accepted: %s and %s' => '允许其他格式：%s 和 %s',
+    'Others formats accepted: %s and %s' => '可以使用的其它格式：%s 和 %s',
     'Description' => '描述',
     '%d comments' => '%d个评论',
     '%d comment' => '%d个评论',
@@ -324,7 +324,7 @@ return array(
     'Category Name' => '分类名称',
     'Categories for the project "%s"' => '项目"%s"的分类',
     'Add a new category' => '加入新分类',
-    'Do you really want to remove this category: "%s"?' => '您确定要移除分类"%s"吗？',
+    'Do you really want to remove this category: "%s"?' => '确定要移除分类"%s"吗？',
     'Filter by category' => '按分类过滤',
     'All categories' => '所有分类',
     'No category' => '无分类',
@@ -333,7 +333,7 @@ return array(
     'Unable to remove this file.' => '无法移除该文件。',
     'File removed successfully.' => '文件成功移除。',
     'Attach a document' => '附加文档',
-    'Do you really want to remove this file: "%s"?' => '您确定要移除文件"%s"吗？',
+    'Do you really want to remove this file: "%s"?' => '确定要移除文件"%s"吗？',
     'open' => '打开',
     'Attachments' => '附件',
     'Edit the task' => '修改任务',
@@ -481,8 +481,8 @@ return array(
     'Not assigned, estimate of %sh' => '未分配，预估需要 %s 小时',
     '%s updated a comment on the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>' => '%s 更新了任务 <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>的评论',
     '%s commented the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>' => '%s 评论了任务 <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>',
-    '%s\'s activity' => '%s的活动',
-    'No activity.' => '无活动',
+    '%s\'s activity' => '%s的动态',
+    'No activity.' => '无动态',
     'RSS feed' => 'RSS 链接',
     '%s updated a comment on the task #%d' => '%s 更新了任务 #%d 的评论',
     '%s commented on the task #%d' => '%s 评论了任务 #%d',
@@ -494,7 +494,7 @@ return array(
     '%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 列',
-    'Activity' => '活动',
+    'Activity' => '动态',
     'Default values are "%s"' => '默认值为 "%s"',
     'Default columns for new projects (Comma-separated)' => '新建项目的默认栏目(用逗号分开)',
     'Task assignee change' => '任务分配变更',
@@ -548,7 +548,7 @@ return array(
     'Time estimated' => '预计时间',
     'There is nothing assigned to you.' => '无任务指派给你。',
     'My tasks' => '我的任务',
-    'Activity stream' => '活动流',
+    'Activity stream' => '动态记录',
     'Dashboard' => '面板',
     'Confirmation' => '确认',
     'Allow everybody to access to this project' => '允许所有人访问此项目',
@@ -603,25 +603,25 @@ return array(
     'Nothing to preview...' => '没有需要预览的内容',
     'Preview' => '预览',
     'Write' => '书写',
-    // 'Active swimlanes' => '',
-    // 'Add a new swimlane' => '',
-    // 'Change default swimlane' => '',
-    // 'Default swimlane' => '',
-    // 'Do you really want to remove this swimlane: "%s"?' => '',
-    // 'Inactive swimlanes' => '',
-    // 'set manager' => '',
-    // 'set user' => '',
-    // 'Remove a swimlane' => '',
-    // 'Rename' => '',
-    // 'Show default swimlane' => '',
-    // 'Swimlane modification for the project "%s"' => '',
-    // 'Swimlane not found.' => '',
-    // 'Swimlane removed successfully.' => '',
-    // 'Swimlanes' => '',
-    // 'Swimlane updated successfully.' => '',
-    // 'The default swimlane have been updated successfully.' => '',
-    // 'Unable to create your swimlane.' => '',
-    // 'Unable to remove this swimlane.' => '',
-    // 'Unable to update this swimlane.' => '',
-    // 'Your swimlane have been created successfully.' => '',
+    'Active swimlanes' => '活动泳道',
+    'Add a new swimlane' => '添加新泳道',
+    'Change default swimlane' => '修改默认泳道',
+    'Default swimlane' => '默认泳道',
+    'Do you really want to remove this swimlane: "%s"?' => '确定要删除泳道："%s"?',
+    'Inactive swimlanes' => '非活动泳道',
+    'set manager' => '设为管理员',
+    'set user' => '设为用户',
+    'Remove a swimlane' => '删除泳道',
+    'Rename' => '重命名',
+    'Show default swimlane' => '显示默认泳道',
+    'Swimlane modification for the project "%s"' => '项目"%s"的泳道变更',
+    'Swimlane not found.' => '未找到泳道。',
+    'Swimlane removed successfully.' => '成功删除泳道',
+    'Swimlanes' => '泳道',
+    'Swimlane updated successfully.' => '成功更新了泳道。',
+    'The default swimlane have been updated successfully.' => '成功更新了默认泳道。',
+    'Unable to create your swimlane.' => '无法创建泳道。',
+    'Unable to remove this swimlane.' => '无法删除此泳道',
+    'Unable to update this swimlane.' => '无法更新此泳道',
+    'Your swimlane have been created successfully.' => '已经成功创建泳道。',
 );