From 09544ba74989fb8af87f98180a968c2dd8a4185f Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Wed, 25 Oct 2017 15:49:00 -0300
Subject: translations PR 20171023 (#7699)

---
 i18n/zh-CN.json | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 58 insertions(+), 2 deletions(-)

(limited to 'i18n/zh-CN.json')

diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index 820e0a1fb..f90d91d0c 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -715,6 +715,10 @@
     "id": "api.command_join.success",
     "translation": "已加入频道。"
   },
+  {
+    "id": "api.command_kick.name",
+    "translation": "kick"
+  },
   {
     "id": "api.command_leave.desc",
     "translation": "离开当前频道"
@@ -823,6 +827,38 @@
     "id": "api.command_open.name",
     "translation": "打开"
   },
+  {
+    "id": "api.command_remove.desc",
+    "translation": "Remove a member from the channel"
+  },
+  {
+    "id": "api.command_remove.direct_group.app_error",
+    "translation": "You can't remove someone from a direct message channel."
+  },
+  {
+    "id": "api.command_remove.hint",
+    "translation": "@[username]"
+  },
+  {
+    "id": "api.command_remove.message.app_error",
+    "translation": "/name 命令必须有消息。"
+  },
+  {
+    "id": "api.command_remove.missing.app_error",
+    "translation": "无法找到用户"
+  },
+  {
+    "id": "api.command_remove.name",
+    "translation": "remove"
+  },
+  {
+    "id": "api.command_remove.permission.app_error",
+    "translation": "您没有权限重命名频道。"
+  },
+  {
+    "id": "api.command_remove.user_not_in_channel",
+    "translation": "{{.Username}} is not a member of this channel."
+  },
   {
     "id": "api.command_search.desc",
     "translation": "在消息中搜索文字"
@@ -1517,13 +1553,21 @@
     "id": "api.plugin.upload.no_file.app_error",
     "translation": "multipart/form 请求缺少文件"
   },
+  {
+    "id": "api.post.check_for_out_of_channel_mentions.link.private",
+    "translation": "add them to this private channel"
+  },
+  {
+    "id": "api.post.check_for_out_of_channel_mentions.link.public",
+    "translation": "add them to the channel"
+  },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
-    "translation": "{{.Usernames}}和{{.LastUsername}}被提到了，但是他们不会收到通知，因为他们不在这个频道。"
+    "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."
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.one",
-    "translation": "{{.Username}}被提到了，但是他因不在此频道而不会收到通知。"
+    "translation": "@{{.Username}} was mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history."
   },
   {
     "id": "api.post.create_post.attach_files.error",
@@ -3771,10 +3815,18 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "解码搜索结果失败"
   },
+  {
+    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
+    "translation": "Failed to create Elasticsearch bulk processor"
+  },
   {
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "无法设置 ElasticSearch 索引设定"
   },
+  {
+    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
+    "translation": "Failed to start Elasticsearch bulk processor"
+  },
   {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "连接 Elasticsearch 服务器失败。"
@@ -4395,6 +4447,10 @@
     "id": "model.config.is_valid.elastic_search.enable_searching.app_error",
     "translation": "当 Elastic Search SearchEnabled 设为是时必须设定 Elastic Search IndexingEnabled 为是。"
   },
+  {
+    "id": "model.config.is_valid.elastic_search.live_indexing_batch_size.app_error",
+    "translation": "Elasticsearch Live Indexing Batch Size must be at least 1"
+  },
   {
     "id": "model.config.is_valid.elastic_search.password.app_error",
     "translation": "当 Elastic Search 索引开启时必须提供 Elastic Search 密码设定。"
-- 
cgit v1.2.3-1-g7c22