translations PR 20170703 (#6836)

* translations PR 20170703

* Fix bad merge

1 files changed, 161 insertions, 13 deletions

diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index 7665b9734..051cbd2ea 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -429,7 +429,7 @@
   },
   {
     "id": "api.command.execute_command.not_found.app_error",
-    "translation": "触发 '{{.Trigger}}' 没有找到"
+    "translation": "Command with a trigger of '{{.Trigger}}' not found. To send a message beginning with \"/\", try adding an empty space at the beginning of the message."
   },
   {
     "id": "api.command.execute_command.save.app_error",
@@ -460,6 +460,10 @@
     "translation": "[name@domain.com ...]"
   },
   {
+    "id": "api.command.invite_people.invite_off",
+    "translation": "User creation has been disabled on this server, no invite(s) sent"
+  },
+  {
     "id": "api.command.invite_people.name",
     "translation": "invite_people"
   },
@@ -496,6 +500,38 @@
     "translation": "您现在离开了"
   },
   {
+    "id": "api.command_channel_header.channel.app_error",
+    "translation": "Error to retrieve the current channel."
+  },
+  {
+    "id": "api.command_channel_header.desc",
+    "translation": "Edit the channel header"
+  },
+  {
+    "id": "api.command_channel_header.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_channel_header.message.app_error",
+    "translation": "Text must be provided with the /header command."
+  },
+  {
+    "id": "api.command_channel_header.name",
+    "translation": "header"
+  },
+  {
+    "id": "api.command_channel_header.permission.app_error",
+    "translation": "You do not have the appropriate permissions to edit the channel header."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.app_error",
+    "translation": "Error to update the current channel."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.success",
+    "translation": "Channel header successfully updated."
+  },
+  {
     "id": "api.command_collapse.desc",
     "translation": "打开图像预览自动折叠"
   },
@@ -552,6 +588,14 @@
     "translation": "展开预览时发生了错误"
   },
   {
+    "id": "api.command_help.desc",
+    "translation": "Open the Mattermost help page"
+  },
+  {
+    "id": "api.command_help.name",
+    "translation": "帮助"
+  },
+  {
     "id": "api.command_join.desc",
     "translation": "添加到公开频道"
   },
@@ -661,19 +705,19 @@
   },
   {
     "id": "api.command_open.name",
-    "translation": "open"
+    "translation": "打开"
   },
   {
     "id": "api.command_settings.desc",
-    "translation": "Open the Account Settings dialog"
+    "translation": "打开账户设置对话框"
   },
   {
     "id": "api.command_settings.name",
-    "translation": "settings"
+    "translation": "设置"
   },
   {
     "id": "api.command_settings.unsupported.app_error",
-    "translation": "The settings command is not supported on your device"
+    "translation": "您的设备不支持设定命令"
   },
   {
     "id": "api.command_shortcuts.browser.channel_next",
@@ -1648,6 +1692,10 @@
     "translation": " 已上传一个或更多个文件 "
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_image_only_dm",
+    "translation": " Uploaded one or more files in a direct message"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_in",
     "translation": " 在 "
   },
@@ -2004,14 +2052,6 @@
     "translation": "运行中的 goroutine 数量 %v 已经超过健康界限 %v"
   },
   {
-    "id": "api.team.add_user_to_team.invalid_data.app_error",
-    "translation": "无效数据。"
-  },
-  {
-    "id": "api.team.add_user_to_team.invalid_invite_id.app_error",
-    "translation": "无效邀请 id。没有匹配此邀请 id 的团队。"
-  },
-  {
     "id": "api.team.add_user_to_team.missing_parameter.app_error",
     "translation": "添加用户到团队所需的参数。"
   },
@@ -2084,6 +2124,10 @@
     "translation": "此人已经在你的团队中"
   },
   {
+    "id": "api.team.invite_members.invalid_email.app_error",
+    "translation": "The following email addresses do not belong to an accepted domain: {{.Addresses}}. Please contact your System Administrator for details."
+  },
+  {
     "id": "api.team.invite_members.member",
     "translation": "成员"
   },
@@ -2976,10 +3020,50 @@
     "translation": "导入频道失败。团队名 \"{{.TeamName}}\" 无法找到。"
   },
   {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "Failed to get direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "Failed to get direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "Failed to get group channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "Failed to get group channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.member_not_found.error",
+    "translation": "Could not find channel member when importing direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.update_header_failed.error",
+    "translation": "Failed to update direct channel header"
+  },
+  {
+    "id": "app.import.import_direct_post.channel_member_not_found.error",
+    "translation": "Could not find channel member when importing direct channel post"
+  },
+  {
+    "id": "app.import.import_direct_post.user_not_found.error",
+    "translation": "Post user does not exist"
+  },
+  {
     "id": "app.import.import_line.null_channel.error",
     "translation": "导入数据行有类型 \"channel\" 但频道对象是无。"
   },
   {
+    "id": "app.import.import_line.null_direct_channel.error",
+    "translation": "导入数据行有类型 \"channel\" 但频道对象是无。"
+  },
+  {
+    "id": "app.import.import_line.null_direct_post.error",
+    "translation": "导入数据行有类型 \"post\" 但消息对象是无。"
+  },
+  {
     "id": "app.import.import_line.null_post.error",
     "translation": "导入数据行有类型 \"post\" 但消息对象是无。"
   },
@@ -3052,6 +3136,54 @@
     "translation": "缺少频道必须属性：type。"
   },
   {
+    "id": "app.import.validate_direct_channel_import_data.header_length.error",
+    "translation": "Direct channel header is too long"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_required.error",
+    "translation": "缺少频道必须属性：name"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_few.error",
+    "translation": "Direct channel members list contains too few items"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_many.error",
+    "translation": "Direct channel members list contains too many items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
+    "translation": "缺少消息必须属性：create_at。"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_few.error",
+    "translation": "Direct post channel members list contains too few items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_many.error",
+    "translation": "Direct post channel members list contains too many items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_missing.error",
+    "translation": "缺少消息必须属性：create_at。"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_zero.error",
+    "translation": "CreateAt must be greater than 0"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_length.error",
+    "translation": "Message is too long"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_missing.error",
+    "translation": "缺少消息必须属性：Message。"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.user_missing.error",
+    "translation": "缺少消息必须属性：User。"
+  },
+  {
     "id": "app.import.validate_post_import_data.channel_missing.error",
     "translation": "缺少消息必须属性：Channel。"
   },
@@ -3372,6 +3504,14 @@
     "translation": "无法设置 ElasticSearch 索引设定"
   },
   {
+    "id": "ent.elasticsearch.test_config.indexing_disabled.error",
+    "translation": "Elasticsearch is disabled."
+  },
+  {
+    "id": "ent.elasticsearch.test_config.license.error",
+    "translation": "License does not support Elasticsearch."
+  },
+  {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "当前许可证禁用了自定义表情符。请联系您的系统管理员关于升级您的企业许可证。"
   },
@@ -4172,6 +4312,10 @@
     "translation": "无效 SQL 查询超时设定。必须是正整数。"
   },
   {
+    "id": "model.config.is_valid.teammate_name_display.app_error",
+    "translation": "Invalid teammate display.  Must be 'full_name', 'nickname_full_name' or 'username'"
+  },
+  {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "用户键入更新间隔不应设置为小于1000毫秒。"
   },
@@ -5724,6 +5868,10 @@
     "translation": "我们发现多个用户的登陆凭据与你匹配，因此禁用了你的登陆权限。请与管理员联系。"
   },
   {
+    "id": "store.sql_user.get_new_users.app_error",
+    "translation": "我们在查找偏好设置时遇到了一个错误"
+  },
+  {
     "id": "store.sql_user.get_profiles.app_error",
     "translation": "我们查找用户配置文件遇到了一个错误"
   },