translations PR 20171106 (#7795)

1 files changed, 29 insertions, 25 deletions

diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index fef4935e8..f8e65303e 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -637,15 +637,15 @@
   },
   {
     "id": "api.command_dnd.desc",
-    "translation": "Do not disturb disables desktop and mobile push notifications."
+    "translation": "请勿打扰将关闭桌面和移动设备推送通知。"
   },
   {
     "id": "api.command_dnd.disabled",
-    "translation": "Do Not Disturb is disabled."
+    "translation": "请勿打扰已禁用。"
   },
   {
     "id": "api.command_dnd.error",
-    "translation": "Error to retrieve the user status."
+    "translation": "获取用户状态错误。"
   },
   {
     "id": "api.command_dnd.name",
@@ -653,7 +653,7 @@
   },
   {
     "id": "api.command_dnd.success",
-    "translation": "Do Not Disturb is enabled. You will not receive desktop or mobile push notifications until Do Not Disturb is turned off."
+    "translation": "请勿打扰已启用。您不会在桌面或移动设备收到推送通知直到请勿打扰关闭。"
   },
   {
     "id": "api.command_echo.create.app_error",
@@ -737,7 +737,7 @@
   },
   {
     "id": "api.command_kick.name",
-    "translation": "kick"
+    "translation": "踢出"
   },
   {
     "id": "api.command_leave.desc",
@@ -849,19 +849,19 @@
   },
   {
     "id": "api.command_remove.desc",
-    "translation": "Remove a member from the channel"
+    "translation": "从频道移除位成员"
   },
   {
     "id": "api.command_remove.direct_group.app_error",
-    "translation": "You can't remove someone from a direct message channel."
+    "translation": "您不能从私信频道移出成员。"
   },
   {
     "id": "api.command_remove.hint",
-    "translation": "@[username]"
+    "translation": "@[用户名]"
   },
   {
     "id": "api.command_remove.message.app_error",
-    "translation": "/name 命令必须有消息。"
+    "translation": "/name 或 /kick 命令必须有消息。"
   },
   {
     "id": "api.command_remove.missing.app_error",
@@ -869,15 +869,15 @@
   },
   {
     "id": "api.command_remove.name",
-    "translation": "remove"
+    "translation": "删除"
   },
   {
     "id": "api.command_remove.permission.app_error",
-    "translation": "您没有权限重命名频道。"
+    "translation": "您没有权限移除成员。"
   },
   {
     "id": "api.command_remove.user_not_in_channel",
-    "translation": "{{.Username}} is not a member of this channel."
+    "translation": "{{.Username}} 不是此频道的成员。"
   },
   {
     "id": "api.command_search.desc",
@@ -1575,19 +1575,19 @@
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.link.private",
-    "translation": "add them to this private channel"
+    "translation": "添加他们到此私有频道"
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.link.public",
-    "translation": "add them to the channel"
+    "translation": "添加他们到频道"
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
-    "translation": "@{{.Usernames}} and @{{.LastUsername}} were mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history."
+    "translation": "@{{.Usernames}} 以及 @{{.LastUsername}} 被提及到但他们并不在频道里。您想要{{.Phrase}}吗？他们将可以访问所有消息历史。"
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.one",
-    "translation": "@{{.Username}} was mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history."
+    "translation": "@{{.Usernames}} 被提及到但他们并不在频道里。您想要{{.Phrase}}吗？他们将可以访问所有消息历史。"
   },
   {
     "id": "api.post.create_post.attach_files.error",
@@ -2164,6 +2164,10 @@
     "translation": "请求中‘file’，文件不存在"
   },
   {
+    "id": "api.team.import_team.no_import_from.app_error",
+    "translation": "错误请求：缺少 filesize 字段。"
+  },
+  {
     "id": "api.team.import_team.open.app_error",
     "translation": "不能打开文件"
   },
@@ -2800,8 +2804,8 @@
     "translation": "未能成功发送欢迎电子邮件"
   },
   {
-    "id": "api.user.update_active.no_deactivate_ldap.app_error",
-    "translation": "您无法修改 AD/LDAP 帐号的激活状态。请到 AD/LDAP 服务器上修改。"
+    "id": "api.user.update_active.no_deactivate_sso.app_error",
+    "translation": "您无法修改 SSO 帐号的激活状态。请到 SSO 服务器上修改。"
   },
   {
     "id": "api.user.update_active.permissions.app_error",
@@ -3493,7 +3497,7 @@
   },
   {
     "id": "app.plugin.config.app_error",
-    "translation": "Error saving plugin state in config"
+    "translation": "保存插件状态到配置出错"
   },
   {
     "id": "app.plugin.deactivate.app_error",
@@ -3501,7 +3505,7 @@
   },
   {
     "id": "app.plugin.disabled.app_error",
-    "translation": "Plugins have been disabled."
+    "translation": "插件已禁用。"
   },
   {
     "id": "app.plugin.extract.app_error",
@@ -3529,7 +3533,7 @@
   },
   {
     "id": "app.plugin.not_installed.app_error",
-    "translation": "Plugin is not installed"
+    "translation": "插件未安装"
   },
   {
     "id": "app.plugin.remove.app_error",
@@ -3537,7 +3541,7 @@
   },
   {
     "id": "app.plugin.upload_disabled.app_error",
-    "translation": "Plugins and/or plugin uploads have been disabled."
+    "translation": "插件上传已禁用。"
   },
   {
     "id": "app.user_access_token.disabled",
@@ -3825,7 +3829,7 @@
   },
   {
     "id": "ent.elasticsearch.indexer.do_job.get_oldest_post.error",
-    "translation": "The oldest post could not be retrieved from the database."
+    "translation": "无法从数据库获取最旧的消息。"
   },
   {
     "id": "ent.elasticsearch.indexer.do_job.parse_end_time.error",
@@ -3857,7 +3861,7 @@
   },
   {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
-    "translation": "Failed to create Elasticsearch bulk processor"
+    "translation": "创建 Elasticsearch 批量处理器失败"
   },
   {
     "id": "ent.elasticsearch.start.index_settings_failed",
@@ -3865,7 +3869,7 @@
   },
   {
     "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
-    "translation": "Failed to start Elasticsearch bulk processor"
+    "translation": "开始 Elasticsearch 批量处理器失败"
   },
   {
     "id": "ent.elasticsearch.test_config.connect_failed",