From cc1feddb5f130cf0d766cdde0af98835ce016429 Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Tue, 6 Jun 2017 18:29:23 -0400
Subject: translations PR 20170606 (#6592)

---
 i18n/zh-CN.json | 44 ++++++++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 16 deletions(-)

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

diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index 134ce0a32..41559d814 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -755,6 +755,10 @@
     "id": "api.command_shortcuts.msgs.mark_as_read",
     "translation": "ESC：将当前频道所有消息标为已读\n"
   },
+  {
+    "id": "api.command_shortcuts.msgs.reply",
+    "translation": "SHIFT+UP (in empty input field): Reply to the most recent message in the current channel\n"
+  },
   {
     "id": "api.command_shortcuts.msgs.reprint_next",
     "translation": "{{.CmdOrCtrl}}+向下键 (在空白输入栏)：重显示您输入的下一条消息或斜杠命令\n"
@@ -767,6 +771,10 @@
     "id": "api.command_shortcuts.name",
     "translation": "快捷键"
   },
+  {
+    "id": "api.command_shortcuts.nav.direct_messages_menu",
+    "translation": "{{.CmdOrCtrl}}+SHIFT+K: Open direct messages menu\n"
+  },
   {
     "id": "api.command_shortcuts.nav.header",
     "translation": "#### 导航\n\n"
@@ -791,6 +799,10 @@
     "id": "api.command_shortcuts.nav.switcher",
     "translation": "{{.CmdOrCtrl}}+K：打开频道快速切换对话框\n"
   },
+  {
+    "id": "api.command_shortcuts.nav.switcher_team",
+    "translation": "{{.CmdOrCtrl}}+K：打开频道快速切换对话框\n"
+  },
   {
     "id": "api.command_shortcuts.nav.unread_next",
     "translation": "ALT+SHIFT+向下键：左侧栏中的下一个有未读消息的频道或私信\n"
@@ -1631,10 +1643,6 @@
     "id": "api.post.send_notifications_and_forget.push_non_mention",
     "translation": "发布在"
   },
-  {
-    "id": "api.post.send_notifications_and_forget.push_notification.debug",
-    "translation": "发送拥有信息 '%v' 的推送通知到 %v"
-  },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
     "translation": "发送推送失败 device_id={{.DeviceId}}, err={{.Error}}"
@@ -1971,6 +1979,10 @@
     "id": "api.status.user_not_found.app_error",
     "translation": "未找到用户"
   },
+  {
+    "id": "api.system.go_routines",
+    "translation": "The number of running goroutines is over the health threshold %v of %v"
+  },
   {
     "id": "api.team.add_user_to_team.invalid_data.app_error",
     "translation": "无效数据。"
@@ -2737,7 +2749,7 @@
   },
   {
     "id": "api.user.upload_profile_user.decode_config.app_error",
-    "translation": "无法解码头像设定。"
+    "translation": "Could not save profile image. File does not appear to be a valid image."
   },
   {
     "id": "api.user.upload_profile_user.encode.app_error",
@@ -2977,7 +2989,7 @@
   },
   {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
-    "translation": "如果提供频道 create_at 则不能为 0。"
+    "translation": "如果提供频道 create_at 则不能为零。"
   },
   {
     "id": "app.import.validate_channel_import_data.display_name_length.error",
@@ -3029,7 +3041,7 @@
   },
   {
     "id": "app.import.validate_post_import_data.create_at_zero.error",
-    "translation": "Post CreateAt property must not be zero if provided."
+    "translation": "如果提供消息 CreateAt 属性则不能为零。"
   },
   {
     "id": "app.import.validate_post_import_data.message_length.error",
@@ -3053,7 +3065,7 @@
   },
   {
     "id": "app.import.validate_team_import_data.create_at_zero.error",
-    "translation": "如果提供团队 create_at 则不能为 0。"
+    "translation": "如果提供团队 create_at 则不能为零。"
   },
   {
     "id": "app.import.validate_team_import_data.description_length.error",
@@ -3065,7 +3077,7 @@
   },
   {
     "id": "app.import.validate_team_import_data.display_name_missing.error",
-    "translation": "缺少频道必须属性：display_name"
+    "translation": "缺少团队必须属性：display_name。"
   },
   {
     "id": "app.import.validate_team_import_data.name_characters.error",
@@ -3313,7 +3325,7 @@
   },
   {
     "id": "ent.elasticsearch.search_posts.search_failed",
-    "translation": "Search failed to complete"
+    "translation": "搜索无法完成"
   },
   {
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
@@ -3325,19 +3337,19 @@
   },
   {
     "id": "ent.elasticsearch.start.index_create_failed",
-    "translation": "Failed to create ElasticSearch index"
+    "translation": "创建 ElasticSearch 索引失败"
   },
   {
     "id": "ent.elasticsearch.start.index_exists_failed",
-    "translation": "Failed to establish whether ElasticSearch index exists"
+    "translation": "无法确认 ElasticSearch 索引是否存在"
   },
   {
     "id": "ent.elasticsearch.start.index_mapping_failed",
-    "translation": "Failed to setup ElasticSearch index mapping"
+    "translation": "无法配置 ElasticSearch 索引映像"
   },
   {
     "id": "ent.elasticsearch.start.index_settings_failed",
-    "translation": "Failed to set ElasticSearch index settings"
+    "translation": "无法设置 ElasticSearch 索引设定"
   },
   {
     "id": "ent.emoji.licence_disable.app_error",
@@ -4137,7 +4149,7 @@
   },
   {
     "id": "model.config.is_valid.sql_query_timeout.app_error",
-    "translation": "Invalid query timeout for SQL settings.  Must be a positive number."
+    "translation": "无效 SQL 查询超时设定。必须是正整数。"
   },
   {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
@@ -6005,7 +6017,7 @@
   },
   {
     "id": "utils.mail.new_client.helo.error",
-    "translation": "Failed to to set the HELO to SMTP server %v"
+    "translation": "设置 HELO 给 SMTP 服务器 %v 失败"
   },
   {
     "id": "utils.mail.new_client.open.error",
-- 
cgit v1.2.3-1-g7c22