daily translations 20160809 (#3772)

1 files changed, 181 insertions, 132 deletions

diff --git a/webapp/i18n/zh_CN.json b/webapp/i18n/zh_CN.json
index 384b8a764..6b0938583 100644
--- a/webapp/i18n/zh_CN.json
+++ b/webapp/i18n/zh_CN.json
@@ -30,21 +30,21 @@
   "activity_log_modal.androidNativeApp": "Android本地App",
   "activity_log_modal.iphoneNativeApp": "iPhone本地App",
   "add_command.autocomplete": "自动完成：",
-  "add_command.autocomplete.help": "(Optional) Show slash command in autocomplete list.",
+  "add_command.autocomplete.help": "(可选) 在自动完成列表显示斜杠命令。",
   "add_command.autocompleteDescription": "自动补全描述",
-  "add_command.autocompleteDescription.help": "对自动补全列表中，斜杠命令的可选简述。",
+  "add_command.autocompleteDescription.help": "(可选) 在自动补全列表中显示斜杠命令的简述。",
   "add_command.autocompleteDescription.placeholder": "例如: 返回关于病人记录的搜索结果",
   "add_command.autocompleteHint": "自动完成提示",
-  "add_command.autocompleteHint.help": "(Optional) Arguments associated with your slash command, displayed as help in the autocomplete list.",
+  "add_command.autocompleteHint.help": "(可选) 你的斜杠命令在自动完成列表中显示的参数。",
   "add_command.autocompleteHint.placeholder": "例如: [患者姓名]",
   "add_command.cancel": "取消",
   "add_command.description": "描述",
-  "add_command.description.help": "Description for your incoming webhook.",
+  "add_command.description.help": "传入webhook的简述。",
   "add_command.displayName": "显示名称",
-  "add_command.displayName.help": "Display name for your slash command made of up to 64 characters.",
+  "add_command.displayName.help": "您的斜杠命令显示名，最多64字。",
   "add_command.header": "添加",
   "add_command.iconUrl": "回复图标",
-  "add_command.iconUrl.help": "选择一个件图片覆盖回复这个斜杠命令。输入的URL.png或.jpg文件至少128像素x128像素。",
+  "add_command.iconUrl.help": "(可选) 选择一个头像覆盖此斜杠命令产生的信息。输入的.png或.jpg文件URL至少128像素x128像素。",
   "add_command.iconUrl.placeholder": "https://www.example.com/myicon.png",
   "add_command.method": "请求方式",
   "add_command.method.get": "GET",
@@ -52,10 +52,10 @@
   "add_command.method.post": "POST",
   "add_command.save": "保存",
   "add_command.trigger": "命令触发词",
-  "add_command.trigger.help": "Trigger word must be unique, and cannot begin with a slash or contain any spaces.",
-  "add_command.trigger.helpExamples": "Examples: client, employee, patient, weather",
-  "add_command.trigger.helpReserved": "Reserved: {link}",
-  "add_command.trigger.helpReservedLinkText": "see list of built-in slash commands",
+  "add_command.trigger.help": "触发关键字必须唯一，且不能以斜杠开头或含空格。",
+  "add_command.trigger.helpExamples": "例：client, employee, patient, weather",
+  "add_command.trigger.helpReserved": "预留：{link}",
+  "add_command.trigger.helpReservedLinkText": "查看内置斜杠指令列表",
   "add_command.trigger.placeholder": "命令触发器。譬如\"hello\"",
   "add_command.triggerInvalidLength": "触发器单词必须包含 {min} 至 {max} 个字符",
   "add_command.triggerInvalidSlash": "触发器单词第一个单词不能为/",
@@ -66,7 +66,7 @@
   "add_command.url.placeholder": "必须以http://或https://开始",
   "add_command.urlRequired": "需要一个请求的URL",
   "add_command.username": "回复用户名",
-  "add_command.username.help": "选择一个用户名用于覆盖这个响应命令。用户名可以包含多达22个小写字母，数字以及符号 \"-\"，\"_\" 和 \".\" 字符。",
+  "add_command.username.help": "(可选) 选择一个用户名用于覆盖这个命令回应。用户名可以包含多达22个小写字母，数字以及符号 \"-\"，\"_\" 和 \".\" 字符。",
   "add_command.username.placeholder": "用户名",
   "add_emoji.cancel": "取消",
   "add_emoji.header": "添加",
@@ -84,39 +84,51 @@
   "add_emoji.save": "保存",
   "add_incoming_webhook.cancel": "取消",
   "add_incoming_webhook.channel": "频道",
-  "add_incoming_webhook.channel.help": "Public channel or private group that receives the webhook payloads. You must belong to the private group when setting up the webhook.",
+  "add_incoming_webhook.channel.help": "接收webhook的公开频道或私有组。您必须属于该私有组才能设定webhook。",
   "add_incoming_webhook.channelRequired": "需要一个合法的频道",
   "add_incoming_webhook.description": "描述",
-  "add_incoming_webhook.description.help": "Description for your incoming webhook.",
+  "add_incoming_webhook.description.help": "传入webhook的简述。",
   "add_incoming_webhook.displayName": "显示名称",
-  "add_incoming_webhook.displayName.help": "Display name for your incoming webhook made of up to 64 characters.",
+  "add_incoming_webhook.displayName.help": "传入webhook的显示名，最多64字。",
   "add_incoming_webhook.header": "添加",
   "add_incoming_webhook.name": "名称",
   "add_incoming_webhook.save": "保存",
+  "add_oauth_app.callbackUrls.help": "用户在接收或拒绝授权您的应用后重转向的网址，同时用来处理授权码或访问令牌。比为以 http:// 或 https:// 开头的有效网址。",
+  "add_oauth_app.callbackUrlsRequired": "需要一个或多个回调URL",
+  "add_oauth_app.description.help": "您的 OAuth 2.0 应用描述。",
+  "add_oauth_app.descriptionRequired": "OAuth 2.0 应用描述为必填。",
+  "add_oauth_app.header": "添加",
+  "add_oauth_app.homepage.help": "OAuth 2.0 应用首页网址。请您确认有根据服务器设置使用 HTTP 或 HTTPS 网址。",
+  "add_oauth_app.homepageRequired": "OAuth 2.0 应用首页网址为必填。",
+  "add_oauth_app.icon.help": "(可选) 指向您的 OAuth 2.0 应用的图片网址。请您确认您的网址使用 HTTP 或 HTTPS。",
+  "add_oauth_app.name.help": "您的 OAuth 2.0 应用显示名，最多64字。",
+  "add_oauth_app.nameRequired": "OAuth 2.0 应用名为必填。",
+  "add_oauth_app.trusted.help": "当设为是时，OAuth 2.0 应用将被 Mattermost 服务器信任且不需用户同意授权。当设为否时，将会弹出新窗口询问用户同意或拒绝授权。",
   "add_outgoing_webhook.callbackUrls": "回调URL（每行一个）",
-  "add_outgoing_webhook.callbackUrls.help": "The URL that messages will be sent to.",
+  "add_outgoing_webhook.callbackUrls.help": "信息传输到的网址。",
   "add_outgoing_webhook.callbackUrlsRequired": "需要一个或多个回调URL",
   "add_outgoing_webhook.cancel": "取消",
   "add_outgoing_webhook.channel": "频道",
-  "add_outgoing_webhook.channel.help": "Public channel to receive webhook payloads. Optional if at least one Trigger Word is specified.",
-  "add_outgoing_webhook.contentType.help1": "Choose the content type by which the response will be sent.",
-  "add_outgoing_webhook.contentType.help2": "If application/x-www-form-urlencoded is chosen, the server assumes you will be encoding the parameters in a URL format.",
-  "add_outgoing_webhook.contentType.help3": "If application/json is chosen, the server assumes you will posting JSON data.",
+  "add_outgoing_webhook.channel.help": "接收webhook的公开频道。如果至少有一个触发关键字设定时此项为可选。",
+  "add_outgoing_webhook.contentType.help1": "选择发送的回复时的内容类型。",
+  "add_outgoing_webhook.contentType.help2": "如果选择了 application/x-www-form-urlencoded，服务器将认为您会将参数以URL格式编码。",
+  "add_outgoing_webhook.contentType.help3": "如果选择了 application/json，服务器将认为您会传送 JSON 数据。",
   "add_outgoing_webhook.content_Type": "内容类型",
   "add_outgoing_webhook.description": "描述",
-  "add_outgoing_webhook.description.help": "Description for your outgoing webhook.",
+  "add_outgoing_webhook.description.help": "您的传出webhook简述。",
   "add_outgoing_webhook.displayName": "显示名称",
-  "add_outgoing_webhook.displayName.help": "Display name for your outgoing webhook made of up to 64 characters.",
+  "add_outgoing_webhook.displayName.help": "传出webhook的显示名，最多64字。",
   "add_outgoing_webhook.header": "添加",
   "add_outgoing_webhook.name": "名称",
   "add_outgoing_webhook.save": "保存",
   "add_outgoing_webhook.triggerWords": "触发词（一行一个）",
-  "add_outgoing_webhook.triggerWords.help": "Messages that start with one of the specified words will trigger the outgoing webhook. Optional if Channel is selected.",
+  "add_outgoing_webhook.triggerWords.help": "以特定关键字的信息将触发传出webhook。如果有选择频道此项则为可选。",
   "add_outgoing_webhook.triggerWordsOrChannelRequired": "需要一个有效的频道或一个触发字列表",
   "add_outgoing_webhook.triggerWordsTriggerWhen": "触发时机",
-  "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Choose when to trigger the outgoing webhook; if the first word of a message matches a Trigger Word exactly, or if it starts with a Trigger Word.",
+  "add_outgoing_webhook.triggerWordsTriggerWhen.help": "选择何时触发传出webhook：信息第一个词符合触发关键字或时以触发关键字开头。",
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "第一个完全符合触发关键字",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "第一字以触发关键字为开头",
+  "admin.advance.cluster": "高可用性 (Beta)",
   "admin.audits.reload": "重新载入用户活动日志",
   "admin.audits.title": "用户活动日志",
   "admin.authentication.email": "邮件验证",
@@ -124,6 +136,24 @@
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML",
   "admin.banner.heading": "注释：",
+  "admin.cluster.enableDescription": "当设为是时，Mattermost将以高可用性模式运行。请参考<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">文档</a>了解Mattermost的高可用性。",
+  "admin.cluster.enableTitle": "开启高可用性模式：",
+  "admin.cluster.interNodeListenAddressDesc": "服务器与其他服务器通讯的监听地址。",
+  "admin.cluster.interNodeListenAddressEx": "例如 \":8065\"",
+  "admin.cluster.interNodeListenAddressTitle": "互连节点监听地址：",
+  "admin.cluster.interNodeUrlsDesc": "所有Mattermost服务器的内部/私有网址用逗号分开",
+  "admin.cluster.interNodeUrlsEx": "例如 \"http://10.10.10.30, http://10.10.10.31\"",
+  "admin.cluster.interNodeUrlsTitle": "互连节点网址：",
+  "admin.cluster.loadedFrom": "此配置文件是从节点ID  {clusterId} 加载的。请见我们的<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">文档</a>中的排错手册如果您在通过负载均衡服务器访问系统控制且遇到问题。",
+  "admin.cluster.noteDescription": "修改此分类中的属性需要重启服务器才能生效。当高可用性模式开启时，系统控制台将设为只读且只能通过修改配置文件进行改动。",
+  "admin.cluster.should_not_change": "警告：这些设定可能不会与其他机群服务器同步。高可用性互连节点通讯只会在您确保所有服务器中的config.json一致并重启Mattermost后开启。请见<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">文档</a>了解如何从机群里添加或删除服务器。如果您在通过负载均衡服务器访问系统控制且遇到问题，请见我们的<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">文档</a>中的排错手册。",
+  "admin.cluster.status_table.config_hash": "配置文件MD5",
+  "admin.cluster.status_table.hostname": "主机名",
+  "admin.cluster.status_table.id": "节点 ID",
+  "admin.cluster.status_table.reload": "重加载机群状态",
+  "admin.cluster.status_table.status": "状态",
+  "admin.cluster.status_table.url": "互连节点网址",
+  "admin.cluster.status_table.version": "版本：",
   "admin.compliance.directoryDescription": "用户保存守规报告。如果为空，将被设置为 ./data/。",
   "admin.compliance.directoryExample": "例如 \"./data/\"",
   "admin.compliance.directoryTitle": "守规报告目录：",
@@ -198,9 +228,9 @@
   "admin.email.emailSuccess": "发送电子邮件时没有错误的报告.  请务必检查您的收件箱.",
   "admin.email.fullPushNotification": "发送完整的消息片段",
   "admin.email.genericPushNotification": "发送包含用户名称和频道名称的一般描述",
-  "admin.email.inviteSaltDescription": "电子邮件邀请加入32字符的盐值加密.安装时随机生成. 点击 \"重新生成\" 生成新的加密.",
+  "admin.email.inviteSaltDescription": "32字符的盐值用于签署电子邮件邀请。安装时随机生成。点击 \"重新生成\" 生成新的盐值。",
   "admin.email.inviteSaltExample": "Ex \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
-  "admin.email.inviteSaltTitle": "电子邮件邀请 Salt：",
+  "admin.email.inviteSaltTitle": "电子邮件邀盐值：",
   "admin.email.mhpns": "使用加密的，产品及质量的HPNS连接到iOS和Android应用程序",
   "admin.email.mhpnsHelp": "从 iTunes下载 <a href=\"https://itunes.apple.com/us/app/mattermost/id984966508?mt=8\" target=\"_blank\">Mattermost iOS app</a>。从 Google Play 下载 <a href=\"https://play.google.com/store/apps/details?id=com.mattermost.mattermost&hl=en\" target=\"_blank\">Mattermost Android app</a>。 了解更多 <a href=\"http://docs.mattermost.com/deployment/push.html#hosted-push-notifications-service-hpns\" target=\"_blank\">HPNS</a>。",
   "admin.email.mtpns": "在iTunes和TPNS的谷歌Play使用iOS和Android应用程序",
@@ -216,9 +246,9 @@
   "admin.email.notificationOrganizationDescription": "从mattermost电子邮件通知显示组织机构名称和地址，如“©ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA\"。如果字段为空，则将不显示该组织的名称和地址。",
   "admin.email.notificationsDescription": "通常在产品中设置为是,Mattermost尝试方式邮件通知. 开发人员可以将此字段设置为假以跳过电子邮件安装程序以加快开发速度.<br />置此为是的删除预览模式横幅 (设置后需要注销和重新登录).",
   "admin.email.notificationsTitle": "启用发送邮件通知：",
-  "admin.email.passwordSaltDescription": "32字盐用来签署重置密码邮件。由安装时随机生成。点击 \"重新生成\" 生成新的盐。",
+  "admin.email.passwordSaltDescription": "32字盐值用来签署重置密码邮件。由安装时随机生成。点击 \"重新生成\" 生成新的盐。",
   "admin.email.passwordSaltExample": "Ex \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
-  "admin.email.passwordSaltTitle": "密码重设盐：",
+  "admin.email.passwordSaltTitle": "密码重设盐值：",
   "admin.email.pushContentDesc": "选择“发送用户名称和频道名称的通用描述”提供通用信息的推送通知，包括用户名称和频道名称但没有来自信息文本的具体细节。<br /><br />选择“发送完整的信息片段”，发送来自消息触发通知的详细摘录，可能包括发送信息中的保密信息。如果您的推送通知服务在您的防火墙之外，强烈建议此选项仅用于“https”协议加密连接。",
   "admin.email.pushContentTitle": "推送通知内容：",
   "admin.email.pushDesc": "通常在正式环境中设置为是。当设为是时，Mattermost尝试给iOS和安卓从推送通知服务器发送通知。",
@@ -252,7 +282,7 @@
   "admin.files.storage": "储存",
   "admin.general.configuration": "配置",
   "admin.general.localization": "本地化",
-  "admin.general.localization.availableLocalesDescription": "设定帐号设定里用户可选的语言。（留空将开启所有支持的语言）",
+  "admin.general.localization.availableLocalesDescription": "设置用户在帐号设定里可用的语言 (留空将所有可用的语言为可用)。<br /><br />想要帮助翻译吗？加入<a href='http://translate.mattermost.com/' target='_blank'>Mattermost 翻译服务器</a>。",
   "admin.general.localization.availableLocalesTitle": "可用的语言：",
   "admin.general.localization.clientLocaleDescription": "新创建的用户以及未登入的用户的默认语言。",
   "admin.general.localization.clientLocaleTitle": "默认客户端语言：",
@@ -263,9 +293,9 @@
   "admin.general.policy.permissionsAdmin": "团队和系统管理员",
   "admin.general.policy.permissionsAll": "所有团队成员",
   "admin.general.policy.permissionsSystemAdmin": "系统管理员",
-  "admin.general.policy.restrictPrivateChannelManagementDescription": "设置谁可以创建，删除，重命名，以及设置标题或私有组作用的策略。",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "设置谁可以创建，删除，重命名，以及设置标语或私有组作用的策略。",
   "admin.general.policy.restrictPrivateChannelManagementTitle": "启用私人群组管理的权限：",
-  "admin.general.policy.restrictPublicChannelManagementDescription": "设置谁可以创建，删除，重命名，以及设置标题或公共频道作用的策略。",
+  "admin.general.policy.restrictPublicChannelManagementDescription": "设置谁可以创建，删除，重命名，以及设置标语或公共频道作用的策略。",
   "admin.general.policy.restrictPublicChannelManagementTitle": "启用公共频道的管理权限：",
   "admin.general.policy.teamInviteDescription": "设置谁可以用<b>邀请新成员</b>发送邮件邀请他人到团队，或用主菜单的<b>获取团队邀请链接</b>的策略。如果使用了<b>获取团队邀请链接</b>，您可以在用户加入到团队后到<b>团队设定</b> > <b>邀请码</b>废除邀请码。",
   "admin.general.policy.teamInviteTitle": "启用发送团队邀请的使用者：",
@@ -290,7 +320,7 @@
   "admin.gitlab.userDescription": "输入 https://<your-gitlab-url>/api/v3/user。根据于您的服务器设定而决定网址中使用HTTP或HTTPS。",
   "admin.gitlab.userExample": "如：\"https://<your-gitlab-url>/api/v3/user\"",
   "admin.gitlab.userTitle": "用户API 端点：",
-  "admin.google.EnableHtmlDesc": "<ol><li><a href='https://accounts.google.com/login'>登入</a>到您的谷歌帐号。</li><li>到<a href='https://console.developers.google.com'>https://console.developers.google.com</a>，在左边导航点击<strong>凭证</strong>后输入<strong>Mattermost - <your-company-name></strong>为项目名。</li><li>点击<strong>OAuth 同意页面</strong>标题并输入<strong>Mattermost</strong>做为<strong>显示给用户的产品名</strong>。点击<strong>保存</strong>。</li><li>在<strong>凭证</strong>标题下，点击<strong>创建凭证</strong>，选择<strong>OAuth客户端ID</strong>并选择<strong>网页应用</strong>。</li><li>在<strong>限制</strong>和<strong>经认可的重指向网址</strong>下输入<strong><your-mattermost-url>/signup/google/complete</strong> (例: http://localhost:8065/signup/google/complete)。点击<strong>创建</strong>。</li><li>保存<strong>客户端ID</strong>和<strong>客户端秘密</strong>以便完整填写以下栏。</li><li>最后，到<a href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a>并点击<strong>启用</strong>。这可能需要几分钟时间让谷歌服务器同步数据。</li><li>完成以下<strong>客户端ID</strong>和<strong>客户端秘密</strong>。</li></ol>",
+  "admin.google.EnableHtmlDesc": "<ol><li><a href='https://accounts.google.com/login'>登入</a>到您的谷歌帐号。</li><li>到<a href='https://console.developers.google.com'>https://console.developers.google.com</a>，在左边导航点击<strong>凭证</strong>后输入\"Mattermost - your-company-name\"为<strong>项目名</strong>，然后点击<strong>创建</strong>。</li><li>点击<strong>OAuth 同意页面</strong>标题并输入\"Mattermost\" 做为<strong>显示给用户的产品名</strong>，然后点击<strong>保存</strong>。</li><li>在<strong>凭证</strong>标题下，点击<strong>创建凭证</strong>，选择<strong>OAuth客户端ID</strong>并选择<strong>网页应用</strong>。</li><li>在<strong>限制</strong>和<strong>经认可的重指向网址</strong>下输入<strong>your-mattermost-url/signup/google/complete</strong> (例: http://localhost:8065/signup/google/complete)。点击<strong>创建</strong>。</li><li>粘贴<strong>客户端ID</strong>和<strong>客户端秘密</strong>到以下栏，然后点击<strong>保存</strong>。</li><li>最后，到<a href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a>并点击<strong>启用</strong>。这可能需要几分钟时间让谷歌服务器同步数据。</li></ol>",
   "admin.google.authTitle": "认证端点：",
   "admin.google.clientIdDescription": "您在谷歌注册您的应用时收到的客户端ID。",
   "admin.google.clientIdExample": "例如 \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
@@ -330,9 +360,9 @@
   "admin.image.profileWidthDescription": "个人头像宽度。",
   "admin.image.profileWidthExample": "例如 \"1024\"",
   "admin.image.profileWidthTitle": "个人头像宽度：",
-  "admin.image.publicLinkDescription": "32字盐用来签署公开的图片链接。由安装时随机生成。点击 \"重新生成\" 生成新的盐。",
+  "admin.image.publicLinkDescription": "32字盐值用来签署公开的图片链接。由安装时随机生成。点击 \"重新生成\" 生成新的盐。",
   "admin.image.publicLinkExample": "例如 \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
-  "admin.image.publicLinkTitle": "公共链接加密: ",
+  "admin.image.publicLinkTitle": "公共链接盐值：",
   "admin.image.shareDescription": "允许用户分享文件和图片的公共链接。",
   "admin.image.shareTitle": "分享公共文件链接：",
   "admin.image.storeAmazonS3": "Amazon S3",
@@ -345,8 +375,8 @@
   "admin.image.thumbWidthDescription": "上传图片时生成缩略图宽度。更新这个值改变之后的缩略图显示，但不改变在过去创建的图片。",
   "admin.image.thumbWidthExample": "例如 \"120\"",
   "admin.image.thumbWidthTitle": "附件缩略图宽度：",
+  "admin.integrations.custom": "自定义集成",
   "admin.integrations.external": "外部服务",
-  "admin.integrations.webhook": "Webhooks和命令",
   "admin.ldap.baseDesc": "BaseDN可以使Mattermost在LADP树中搜索用户时可以按位置区分名称.",
   "admin.ldap.baseEx": "例如：\"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "BaseDN：",
@@ -446,10 +476,12 @@
   "admin.notifications.title": "通知设置",
   "admin.oauth.gitlab": "GitLab",
   "admin.oauth.google": "Google Apps",
-  "admin.oauth.off": "不允许通过OAuth 2.0提供者登入",
+  "admin.oauth.off": "不允许通过 OAuth 2.0 提供商登入",
   "admin.oauth.office365": "Office 365",
-  "admin.oauth.select": "选择OAuth 2.0服务提供者：",
-  "admin.office365.EnableHtmlDesc": "<ol><li><a href='https://login.microsoftonline.com/'>登入</a>到您的微软或Office 365帐号。确定是和您想让用户登入的同一个<a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>租户</a>。</li><li>到<a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>，点击<strong>添加应用</strong>然后用<strong>Mattermost - <your-company-name></strong>做为应用名。</li><li>在<strong>应用秘密</strong>下，点击<strong>生成新密码</strong>后保存以便完整填写以下栏。</li><li>在<strong>平台</strong>下，点击<strong>添加平台</strong>，选择<strong>网页</strong>并在<strong>重指向网址</strong>下输入<strong><your-mattermost-url>/signup/office365/complete</strong> (例: http://localhost:8065/signup/office365/complete)。同时反选择<strong>允许隐含流程</strong>。</li><li>最后，点击<strong>保存</strong>并完成以下栏的<strong>应用ID</strong>以及<strong>应用密码</strong>。</li></ol>",
+  "admin.oauth.providerDescription": "当设为是时，Mattermost 可做为 OAuth 2.0 服务提供商以给予外部应用的API请求授权。",
+  "admin.oauth.providerTitle": "启动 OAuth 2.0 服务提供商：",
+  "admin.oauth.select": "选择 OAuth 2.0 服务提供商：",
+  "admin.office365.EnableHtmlDesc": "<ol><li><a href='https://login.microsoftonline.com/'>登入</a>到您的微软或Office 365帐号。确定是和您想让用户登入的同一个<a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>租户</a>。</li><li>到<a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>，点击<strong>转到应用列表</strong> > <strong>添加应用</strong>然后用\"Mattermost - your-company-name\"做为<strong>应用名</strong>。</li><li>在<strong>应用秘密</strong>下，点击<strong>生成新密码</strong>后粘贴到以下<strong>应用密码</strong>栏。</li><li>在<strong>平台</strong>下，点击<strong>添加平台</strong>，选择<strong>网页</strong>并在<strong>重指向网址</strong>下输入<strong>your-mattermost-url/signup/office365/complete</strong> (例: http://localhost:8065/signup/office365/complete)。同时反选择<strong>允许隐含流程</strong>。</li><li>最后，点击<strong>保存</strong>并粘贴<strong>应用ID</strong>到下方。</li></ol>",
   "admin.office365.authTitle": "认证端点：",
   "admin.office365.clientIdDescription": "您在微软注册您的应用时收到的应用/客户端ID。",
   "admin.office365.clientIdExample": "例如 \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
@@ -471,7 +503,7 @@
   "admin.password.uppercase": "至少有一个大写字母",
   "admin.privacy.showEmailDescription": "当设置为否,在其他用户的用户界面隐藏自己的电子邮件地址, 包括团队拥有者和团队管理员.通常用于当系统为管理团队的一些用户选择保持他们的私人联系信息.",
   "admin.privacy.showEmailTitle": "显示电子邮箱地址：",
-  "admin.privacy.showFullNameDescription": "当设置为否,从其他用户隐藏,包括团队拥有者和团队管理员.用户名是姓名显示显示的是全名.",
+  "admin.privacy.showFullNameDescription": "当设置为否时，用户看不到他人的全名，包括团队拥有者和团队管理员。全名显示的地方将被用户名替代。",
   "admin.privacy.showFullNameTitle": "显示全名：",
   "admin.rate.enableLimiterDescription": "当设置为是时，API使用率被限制到以下值。",
   "admin.rate.enableLimiterTitle": "启用频率限制：",
@@ -506,23 +538,23 @@
   "admin.reset_password.titleSwitch": "切换到电子邮件/密码的账户",
   "admin.saml.assertionConsumerServiceURLDesc": "输入 https://<your-mattermost-url>/login/sso/saml。确保您使用服务器设定的HTTP或HTTPS网址。此栏又名断言消耗服务网址。",
   "admin.saml.assertionConsumerServiceURLEx": "如 \"https://<your-mattermost-url>/login/sso/saml\"",
-  "admin.saml.assertionConsumerServiceURLTitle": "服务提供者登入URL：",
+  "admin.saml.assertionConsumerServiceURLTitle": "服务提供商登入URL：",
   "admin.saml.emailAttrDesc": "使用SAML断言中的属性做为Mattermost中用户的电子邮箱地址。",
   "admin.saml.emailAttrEx": "如 \"Email\" 或 \"PrimaryEmail\"",
   "admin.saml.emailAttrTitle": "邮箱属性：",
   "admin.saml.enableDescription": "当设为是时，Mattermost允许通过SAML登陆。请参考<a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>文档</a>了解Mattermost配置SAML。",
   "admin.saml.enableTitle": "开启SAML登入：",
-  "admin.saml.encryptDescription": "当设置为是时，Mattermost 将会使用您的服务提供者证书来解密SAML断言。",
+  "admin.saml.encryptDescription": "当设置为是时，Mattermost 将会使用您的服务提供商证书来解密SAML断言。",
   "admin.saml.encryptTitle": "开启加密：",
   "admin.saml.firstnameAttrDesc": "使用SAML断言中的属性做为Mattermost中用户的名字。",
   "admin.saml.firstnameAttrEx": "如 \"FirstName\"",
   "admin.saml.firstnameAttrTitle": "名字属性：",
   "admin.saml.idpCertificateFileDesc": "由可信任的身份认证系统提供商所提供的证书公钥",
-  "admin.saml.idpCertificateFileRemoveDesc": "从身份提供者中移除公钥认证信息。",
-  "admin.saml.idpCertificateFileTitle": "身份认证公钥证书",
-  "admin.saml.idpDescriptorUrlDesc": "在使用SAML请求时所访问的身份认证系统的地址",
+  "admin.saml.idpCertificateFileRemoveDesc": "从身份提供商中移除公钥认证信息。",
+  "admin.saml.idpCertificateFileTitle": "身份认证商公钥证书",
+  "admin.saml.idpDescriptorUrlDesc": "在使用SAML请求时所访问的身份提供商的核发者网址。",
   "admin.saml.idpDescriptorUrlEx": "如 \"https://idp.example.org/SAML2/issuer\"",
-  "admin.saml.idpDescriptorUrlTitle": "身份提供者核发地址：",
+  "admin.saml.idpDescriptorUrlTitle": "身份提供商核发地址：",
   "admin.saml.idpUrlDesc": "Mattermost发送SAML登入启动初始网址。",
   "admin.saml.idpUrlEx": "如 \"https://idp.example.org/SAML2/SSO/Login\"",
   "admin.saml.idpUrlTitle": "SAML SSO 网址：",
@@ -538,15 +570,15 @@
   "admin.saml.nicknameAttrDesc": "(可选)使用SAML断言中的属性做为Mattermost中用户的昵称。",
   "admin.saml.nicknameAttrEx": "例如：\"昵称\"",
   "admin.saml.nicknameAttrTitle": "昵称属性：",
-  "admin.saml.privateKeyFileFileDesc": "用于解析从身份认证系统中返回的SAML数据的私钥",
-  "admin.saml.privateKeyFileFileRemoveDesc": "移除用于解析从身份认证系统中返回的SAML数据的私钥.",
-  "admin.saml.privateKeyFileTitle": "服务提供者密钥：",
-  "admin.saml.publicCertificateFileDesc": "当Mattermost是服务提供者时，用来生成从服务提供者到身份提供者产生的SAML请求使用的证书。",
-  "admin.saml.publicCertificateFileRemoveDesc": "当Mattermost是服务提供者时，删除用来生成从服务提供者到身份提供者产生的SAML请求使用的证书。",
-  "admin.saml.publicCertificateFileTitle": "服务提供者公开证书：",
-  "admin.saml.remove.idp_certificate": "删除身份提供者证书",
-  "admin.saml.remove.privKey": "移除服务提供者密钥",
-  "admin.saml.remove.sp_certificate": "删除服务提供者证书",
+  "admin.saml.privateKeyFileFileDesc": "用于解析从身份认证商中返回的SAML数据的私钥",
+  "admin.saml.privateKeyFileFileRemoveDesc": "移除用于解析从身份认证商中返回的SAML数据的私钥.",
+  "admin.saml.privateKeyFileTitle": "服务提供商密钥：",
+  "admin.saml.publicCertificateFileDesc": "当Mattermost是服务提供商时，用来生成从服务提供者到身份提供者产生的SAML请求使用的证书。",
+  "admin.saml.publicCertificateFileRemoveDesc": "当Mattermost是服务提供商时，删除用来生成从服务提供者到身份提供者产生的SAML请求使用的证书。",
+  "admin.saml.publicCertificateFileTitle": "服务提供商公开证书：",
+  "admin.saml.remove.idp_certificate": "删除身份提供商证书",
+  "admin.saml.remove.privKey": "移除服务提供商密钥",
+  "admin.saml.remove.sp_certificate": "删除服务提供商证书",
   "admin.saml.removing.certificate": "删除证书中...",
   "admin.saml.removing.privKey": "删除密钥中...",
   "admin.saml.uploading.certificate": "上传证书中...",
@@ -554,15 +586,15 @@
   "admin.saml.usernameAttrDesc": "使用SAML断言中的属性做为Mattermost中用户的用户名。",
   "admin.saml.usernameAttrEx": "如 \"Username\"",
   "admin.saml.usernameAttrTitle": "用户名：",
-  "admin.saml.verifyDescription": "设为是时，Mattermost会核实SAML回复签字与服务提供者登入网址一致",
+  "admin.saml.verifyDescription": "设为是时，Mattermost会核实SAML回复签字与服务提供商登入网址一致",
   "admin.saml.verifyTitle": "校验签名：",
   "admin.save": "保存",
   "admin.saving": "保存配置中...",
   "admin.security.connection": "连接",
-  "admin.security.inviteSalt.disabled": "邀请盐无法在邮件寄送关闭下修改。",
+  "admin.security.inviteSalt.disabled": "邀请盐值无法在邮件寄送关闭下修改。",
   "admin.security.login": "登录",
   "admin.security.password": "密码",
-  "admin.security.passwordResetSalt.disabled": "重置密码盐无法在邮件寄送关闭下修改。",
+  "admin.security.passwordResetSalt.disabled": "重置密码盐值无法在邮件寄送关闭下修改。",
   "admin.security.public_links": "公开链接",
   "admin.security.requireEmailVerification.disabled": "邮件验证无法在邮件寄送关闭下修改。",
   "admin.security.session": "会话",
@@ -590,12 +622,12 @@
   "admin.service.integrationAdmin": "限制仅团队和系统管理员可以建整合：",
   "admin.service.integrationAdminDesc": "当设为是时，用户创建的集成只能由管理员创建。",
   "admin.service.listenAddress": "监听地址：",
-  "admin.service.listenDescription": "监听和绑定地址.输入\": 8065\"将绑定所有接口或者\"127.0.0.1: 8065\".修改这个设置需要重启服务器才能生效.",
+  "admin.service.listenDescription": "绑定和监听地址。输入 \": 8065\" 将绑定所有接口或者您可以选择 \"127.0.0.1: 8065\" 只监听本地。修改这个设置需要重启服务器才能生效。",
   "admin.service.listenExample": "例如\": 8065\"",
   "admin.service.mfaDesc": "如果正确，用户将被提供对其账户添加多重因素身份验证的选项。他们需要一部智能手机和一个像Google Authenticator一样的身份验证器应用程序。",
   "admin.service.mfaTitle": "启用多因素身份验证：",
-  "admin.service.mobileSessionDays": "移动应用会话市场（天）：",
-  "admin.service.mobileSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. After changing this setting, the new session length will take effect after the next time the user enters their credentials.",
+  "admin.service.mobileSessionDays": "移动应用会话时长 (天)：",
+  "admin.service.mobileSessionDaysDesc": "从用户上一次输入他们的认证到会话过期的天数。修改此设定后，新的会话时常将在用户下一次输入认证后生效。",
   "admin.service.outWebhooksDesc": "当设为是时，允许传出webhooks。详情参见<a href='http://docs.mattermost.com/developer/webhooks-outgoing.html' target='_blank'>文档</a>。",
   "admin.service.outWebhooksTitle": "启用对外Webhooks: ",
   "admin.service.overrideDescription": "当设置为是时，webhooks和斜杠命令将允许改变贴文的用户名。注意：结合允许图标覆盖将可能导致用户受到络钓鱼攻击。",
@@ -608,23 +640,28 @@
   "admin.service.sessionCache": "会话缓存（分钟）：",
   "admin.service.sessionCacheDesc": "会话在内存缓存的分钟数。",
   "admin.service.sessionDaysEx": "Ex\"30\"",
-  "admin.service.ssoSessionDays": "移动应用会话市场（天）：",
-  "admin.service.ssoSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. If the authentication method is SAML or GitLab, the user may automatically be logged back in to Mattermost if they are already logged in to SAML or GitLab. After changing this setting, the setting will take effect after the next time the user enters their credentials.",
+  "admin.service.siteURL": "站点网址：",
+  "admin.service.siteURLDescription": "用户访问Mattermost的包含端口和协议的网址。留空将自动根据访问请求设定。",
+  "admin.service.siteURLExample": "如 \"https://mattermost.example.com:1234\"",
+  "admin.service.ssoSessionDays": "SSO会话时长 (天)：",
+  "admin.service.ssoSessionDaysDesc": "从用户上一次输入他们的认证到会话过期的天数。如果验证方式时SAML或GitLab，用户将会自动登入到Mattermost如果他们已经登入到SAML或GitLab。修改此设定后，新的会话时常将在用户下一次输入认证后生效。",
   "admin.service.testingDescription": "当设为是时，/loadtest 斜杠命令能载入测试账号，数据和文字格式。修改这个设置需要重启服务器才能生效。",
   "admin.service.testingTitle": "启动测试指令：",
-  "admin.service.webSessionDays": "Session length LDAP and email (days):",
-  "admin.service.webSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. After changing this setting, the new session length will take effect after the next time the user enters their credentials.",
+  "admin.service.webSessionDays": "LDAP和电子邮件的会话时长 (天)：",
+  "admin.service.webSessionDaysDesc": "从用户上一次输入他们的认证到会话过期的天数。修改此设定后，新的会话时常将在用户下一次输入认证后生效。",
   "admin.service.webhooksDescription": "设为是时，允许传入webhooks。为了避免钓鱼攻击，所有webhooks的帖文会标上BOT标签。参见 <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>文档</a> 了解详情。",
   "admin.service.webhooksTitle": "启用外部Webhooks: ",
   "admin.sidebar.addTeamSidebar": "从侧边栏菜单添加团队",
   "admin.sidebar.advanced": "高级",
   "admin.sidebar.audits": "合规性与审计",
   "admin.sidebar.authentication": "验证",
+  "admin.sidebar.cluster": "高可用性 (Beta)",
   "admin.sidebar.compliance": "合规",
   "admin.sidebar.configuration": "配置",
   "admin.sidebar.connections": "连接",
   "admin.sidebar.customBrand": "自定义品牌",
   "admin.sidebar.customEmoji": "自定义表情符",
+  "admin.sidebar.customIntegrations": "自定义集成",
   "admin.sidebar.customization": "自定义",
   "admin.sidebar.database": "数据库",
   "admin.sidebar.developer": "开发人员",
@@ -666,11 +703,10 @@
   "admin.sidebar.users": "用户",
   "admin.sidebar.usersAndTeams": "成员和团队",
   "admin.sidebar.view_statistics": "站点统计",
-  "admin.sidebar.webhooks": "Webhooks和命令",
   "admin.sidebarHeader.systemConsole": "系统控制台",
   "admin.sql.dataSource": "数据源：",
   "admin.sql.driverName": "驱动名：",
-  "admin.sql.keyDescription": "32位加密字符可用于加密和解密敏感字段在数据库.",
+  "admin.sql.keyDescription": "32位盐值字符用于加密和解密数据库敏感字段。",
   "admin.sql.keyExample": "例如\"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
   "admin.sql.keyTitle": "静止加密Key: ",
   "admin.sql.maxConnectionsDescription": "最大数量的空闲连接开放数据库.",
@@ -684,7 +720,7 @@
   "admin.sql.replicas": "数据源副本: ",
   "admin.sql.traceDescription": "(开发模式)当设置为是、,SQL语句执行过程会被写入到日志.",
   "admin.sql.traceTitle": "追踪：",
-  "admin.sql.warning": "警告：重新生成盐可能导致一些列在数据库中返回空。",
+  "admin.sql.warning": "警告：重新生成盐值可能导致一些列在数据库中返回空。",
   "admin.support.aboutDesc": "该链接有关于Mattermost部署的很多内容,例如你的组织的内容和受众群体.默认是Mattermost信息页面.",
   "admin.support.aboutTitle": "关于链接：",
   "admin.support.emailHelp": "显示在邮件通知和教学上让最终用户提问支持的电子邮件地址。",
@@ -697,15 +733,15 @@
   "admin.support.privacyTitle": "隐私策略链接：",
   "admin.support.problemDesc": "该链接是团队网站主菜单帮助文档.默认情况下，这个链接到对等的疑难解答论坛，用户可以搜索,求助技术难题.",
   "admin.support.problemTitle": "报告问题链接：",
-  "admin.support.termsDesc": "Link to the terms under which users may use your online service. By default, this includes the \"Mattermost Conditions of Use (End Users)\" explaining the terms under which Mattermost software is provided to end users. If you change the default link to add your own terms for using the service you provide, your new terms must include a link to the default terms so end users are aware of the Mattermost Conditions of Use (End User) for Mattermost software.",
+  "admin.support.termsDesc": "用户使用您的在线服务的条款链接。默认情况下，此链接指向 \"Mattermost 使用条款 (最终用户)\" 解释Mattermost软件提供给最终用户的条款。如果您修改默认链接来添加您自己的服务条款，您的新条款必须包含链接到默认条款让用户知道Mattermost软件的最终用户条款。",
   "admin.support.termsTitle": "服务条款链接：",
   "admin.system_analytics.activeUsers": "有发问的正常用户",
   "admin.system_analytics.title": "系统",
   "admin.system_analytics.totalPosts": "帖子总数",
   "admin.team.brandDesc": "启用自定义形象，以在登录页上显示一张自选图片，以及一些已经设定好的文本。",
-  "admin.team.brandDescriptionExample": "所有团队的通讯一站式解决，随时随地可搜索和访问",
-  "admin.team.brandDescriptionHelp": "登录屏幕和UI所示服务名称.",
-  "admin.team.brandDescriptionTitle": "Site Description",
+  "admin.team.brandDescriptionExample": "所有团队的通讯一站式解决，随时随地可访问和搜索",
+  "admin.team.brandDescriptionHelp": "登录页面和界面所示服务描述。",
+  "admin.team.brandDescriptionTitle": "站点描述",
   "admin.team.brandImageTitle": "自定义形象图片：",
   "admin.team.brandTextDescription": "您希望出现的自定义形象Markdown-formatted文档在您的登录界面自定义形象图片下方。",
   "admin.team.brandTextTitle": "自定义形象文本：",
@@ -728,7 +764,7 @@
   "admin.team.restrictTitle": "只允许特定电子邮件域名创建帐号：",
   "admin.team.restrict_direct_message_any": "在Mattermost服务器上的任何用户",
   "admin.team.restrict_direct_message_team": "任何团队成员",
-  "admin.team.siteNameDescription": "登录屏幕和UI所示服务名称.",
+  "admin.team.siteNameDescription": "登录画面和界面所显示的服务名称。",
   "admin.team.siteNameExample": "例如\"Mattermost\"",
   "admin.team.siteNameTitle": "网站名称：",
   "admin.team.teamCreationDescription": "当设为否，只有系统管理能创建团队。",
@@ -827,7 +863,7 @@
   "audit_table.failedPassword": "修改密码失败-试图通过oauth登录更新用户密码",
   "audit_table.failedWebhookCreate": "创建一个webhook失败-没有频道权限",
   "audit_table.failedWebhookDelete": "删除webhook失败-不合适的条件",
-  "audit_table.headerUpdated": "更新{channelName}频道/组头",
+  "audit_table.headerUpdated": "更新{channelName}频道/组标语",
   "audit_table.ip": "IP地址",
   "audit_table.licenseRemoved": "成功删除许可证",
   "audit_table.loginAttempt": "(登录尝试)",
@@ -861,14 +897,15 @@
   "authorize.allow": "允许",
   "authorize.app": "应用<strong>{appName}</strong>想要能访问和修改您的基本资料。",
   "authorize.deny": "否认",
-  "authorize.title": "一个应用将连接到你的{teamName}账户",
+  "authorize.title": "<strong>{appName}</strong> 想要链接到您的 <strong>Mattermost</strong> 用户帐号",
   "backstage_list.search": "搜索",
   "backstage_navbar.backToMattermost": "返回{siteName}",
   "backstage_sidebar.integrations": "集成",
   "backstage_sidebar.integrations.commands": "斜线命令",
   "backstage_sidebar.integrations.incoming_webhooks": "引入Webhooks",
+  "backstage_sidebar.integrations.oauthApps": "OAuth 2.0 应用",
   "backstage_sidebar.integrations.outgoing_webhooks": "对外Webhooks",
-  "center_panel.recent": "点击这里跳转到最近的消息.",
+  "center_panel.recent": "点击这里跳转到最近的消息。",
   "chanel_header.addMembers": "添加成员",
   "change_url.close": "关闭",
   "change_url.endWithLetter": "必须以字母或数字结束",
@@ -885,7 +922,7 @@
   "channel_flow.invalidName": "无效的频道名称",
   "channel_flow.set_url_title": "设置{term}URL",
   "channel_header.channel": "频道",
-  "channel_header.channelHeader": "设置频道头...",
+  "channel_header.channelHeader": "设置频道标语...",
   "channel_header.delete": "删除{term}...",
   "channel_header.group": "组",
   "channel_header.leave": "离开{term}",
@@ -893,13 +930,13 @@
   "channel_header.notificationPreferences": "消息通知设置",
   "channel_header.recentMentions": "最近提到",
   "channel_header.rename": "重命名{term}...",
-  "channel_header.setHeader": "设置{term}头...",
+  "channel_header.setHeader": "设置{term}标语中...",
   "channel_header.setPurpose": "设置{term}目的...",
   "channel_header.viewInfo": "查看信息",
   "channel_header.viewMembers": "查看成员",
   "channel_info.about": "关于",
   "channel_info.close": "关闭",
-  "channel_info.header": "页眉：",
+  "channel_info.header": "标语：",
   "channel_info.id": "ID：",
   "channel_info.name": "名称",
   "channel_info.notFound": "没有发现频道",
@@ -928,8 +965,8 @@
   "channel_modal.displayNameError": "此栏必须填写",
   "channel_modal.edit": "编辑",
   "channel_modal.group": "组",
-  "channel_modal.header": "头",
-  "channel_modal.headerHelp": "设定在 {term} 标题里在 {term} 旁边的文字。举例，输入常见链接 [链接标题](http://example.com)。",
+  "channel_modal.header": "标语",
+  "channel_modal.headerHelp": "设定在 {term} 标语里在 {term} 旁边的文字。举例，输入常见链接 [链接标题](http://example.com)。",
   "channel_modal.modalTitle": "新",
   "channel_modal.name": "名",
   "channel_modal.nameEx": "如: \"错误\"，\"营销\"，\"客户支持\"",
@@ -1041,11 +1078,11 @@
   "delete_post.question": "您确认要删除{term}？",
   "delete_post.warning": "这个帖子有{count}评论。",
   "edit_channel_header_modal.cancel": "取消",
-  "edit_channel_header_modal.description": "编辑频道头频道名称旁显示的文本。",
-  "edit_channel_header_modal.error": "T这频道标题太长,请输入一个短点儿的",
+  "edit_channel_header_modal.description": "编辑在频道标语里显示在频道名称旁的文本。",
+  "edit_channel_header_modal.error": "这频道标语太长，请输入一个简短的",
   "edit_channel_header_modal.save": "保存",
-  "edit_channel_header_modal.title": "编辑{channel}头",
-  "edit_channel_header_modal.title_dm": "编辑页眉",
+  "edit_channel_header_modal.title": "编辑{channel}的标语",
+  "edit_channel_header_modal.title_dm": "编辑标语",
   "edit_channel_purpose_modal.body": "描述如何使用这个{type}。此文本出现在“更多”菜单频道列表中，帮助他人决定是否加入。",
   "edit_channel_purpose_modal.cancel": "取消",
   "edit_channel_purpose_modal.channel": "频道",
@@ -1111,8 +1148,10 @@
   "find_team.placeholder": "you@domain.com",
   "find_team.send": "发送",
   "find_team.submitError": "请输入一个有效的电子邮件地址",
+  "flag_post.flag": "标志复查",
+  "flag_post.unflag": "取消标志",
   "general_tab.chooseName": "请选择一个新的名称为你的团队",
-  "general_tab.codeDesc": "点击“编辑”重新生成邀请码.",
+  "general_tab.codeDesc": "点击 \"编辑\" 重新生成邀请码。",
   "general_tab.codeLongDesc": "邀请码用来在主菜单里使用<strong>获取团队邀请链接</strong>所产生的团队邀请链接中的一部分。重新生成一个新的团队邀请链接将使之前的链接无效。",
   "general_tab.codeTitle": "邀请码",
   "general_tab.dirDisabled": "团队目录已被禁用.请联系系统管理员,在系统控制台中国的团队设置中启用团队目录.",
@@ -1128,22 +1167,22 @@
   "general_tab.teamNameInfo": "设置出现在您登录界面左侧边栏顶部的团队名称。",
   "general_tab.title": "基本设置",
   "general_tab.yes": "是的",
-  "get_app.alreadyHaveIt": "Already have it?",
-  "get_app.androidAppName": "Mattermost for Android",
-  "get_app.androidHeader": "Mattermost works best if you switch to our Android app",
-  "get_app.continue": "continue",
-  "get_app.continueWithBrowser": "Or {link}",
-  "get_app.continueWithBrowserLink": "continue with browser",
-  "get_app.iosHeader": "Mattermost works best if you switch to our iPhone app",
+  "get_app.alreadyHaveIt": "已经拥有？",
+  "get_app.androidAppName": "安卓版Mattermost",
+  "get_app.androidHeader": "使用安卓应用获得Mattermost最好的表现",
+  "get_app.continue": "继续",
+  "get_app.continueWithBrowser": "或 {link}",
+  "get_app.continueWithBrowserLink": "继续使用浏览器",
+  "get_app.iosHeader": "使用iPhone应用获得Mattermost最好的表现",
   "get_app.mattermostInc": "Mattermost, Inc",
-  "get_app.openMattermost": "Open Mattermost",
+  "get_app.openMattermost": "打开 Mattermost",
   "get_link.clipboard": " 链接复制到剪贴板。",
   "get_link.close": "关闭",
   "get_link.copy": "复制链接",
   "get_post_link_modal.help": "下方的链接允许授权用户查看您的帖子。",
   "get_post_link_modal.title": "复制超链接",
   "get_team_invite_link_modal.help": "向队友发送下方的链接以便其在此团队站点注册。团队邀请链接可以与多个队友分享，因为它不会改变，除非团队管理员在团队设置中重新生成。",
-  "get_team_invite_link_modal.helpDisabled": "创建用户已禁用.详情请您的团队管理员.",
+  "get_team_invite_link_modal.helpDisabled": "创建用户已禁用。详情请联系您的团队管理员。",
   "get_team_invite_link_modal.title": "团队邀请链接",
   "installed_command.header": "斜杠命令",
   "installed_commands.add": "添加斜杠命令",
@@ -1161,14 +1200,35 @@
   "installed_incoming_webhooks.search": "搜索传入Webhooks",
   "installed_incoming_webhooks.unknown_channel": "私有Webhook",
   "installed_integrations.callback_urls": "回调地址：{urls}",
+  "installed_integrations.client_id": "客户端ID：<strong>{clientId}</strong>",
+  "installed_integrations.client_secret": "客户端密码：<strong>{clientSecret}</strong>",
   "installed_integrations.content_type": "Content-Type: {contentType}",
   "installed_integrations.creation": "{creator}在{createAt, date, full}中创建",
   "installed_integrations.delete": "删除",
+  "installed_integrations.hideSecret": "隐藏密码",
   "installed_integrations.regenToken": "重新生成Token",
+  "installed_integrations.showSecret": "显示密码",
   "installed_integrations.token": "令牌：{token}",
   "installed_integrations.triggerWhen": "触发于：{triggerWhen}",
   "installed_integrations.triggerWords": "触发关键词：{triggerWords}",
+  "installed_integrations.unnamed_oauth_app": "未命名 OAuth 2.0 应用",
   "installed_integrations.url": "网址：{url}",
+  "installed_oauth_apps.add": "添加 OAuth 2.0 应用",
+  "installed_oauth_apps.callbackUrls": "回调网址 (每行一个)",
+  "installed_oauth_apps.cancel": "取消",
+  "installed_oauth_apps.description": "描述",
+  "installed_oauth_apps.empty": "没有找到 OAuth 2.0 应用",
+  "installed_oauth_apps.header": "OAuth 2.0 应用",
+  "installed_oauth_apps.help": "OAuth 2.0 应用对您服务器上所有用户开放。",
+  "installed_oauth_apps.homepage": "首頁",
+  "installed_oauth_apps.iconUrl": "图标网址",
+  "installed_oauth_apps.is_trusted": "是受信任的：<strong>{isTrusted}</strong>",
+  "installed_oauth_apps.name": "显示名称",
+  "installed_oauth_apps.save": "保存",
+  "installed_oauth_apps.search": "搜索 OAuth 2.0 应用",
+  "installed_oauth_apps.trusted": "是受信任",
+  "installed_oauth_apps.trusted.no": "不",
+  "installed_oauth_apps.trusted.yes": "是",
   "installed_outgoing_webhooks.add": "添加对外Webhooks",
   "installed_outgoing_webhooks.empty": "没找到传出webhooks",
   "installed_outgoing_webhooks.header": "对外Webhooks",
@@ -1181,21 +1241,23 @@
   "integrations.header": "集成",
   "integrations.incomingWebhook.description": "传入的webhooks允许外部集成发送信息",
   "integrations.incomingWebhook.title": "引入Webhook",
+  "integrations.oauthApps.description": "OAuth 2.0 允许外部引用向 Mattermost API 发出已授权的请求。",
+  "integrations.oauthApps.title": "OAuth 2.0 应用",
   "integrations.outgoingWebhook.description": "传出的网络挂接允许外部集成接收和响应信息",
   "integrations.outgoingWebhook.title": "引出Webhook",
   "intro_messages.DM": "这是您和{teammate}私信记录的开始。<br/>此区域外的人不能看到这里共享的私信和文件。",
   "intro_messages.anyMember": " 任何成员可以加入和查看这个频道。",
   "intro_messages.beginning": "{name}开始",
   "intro_messages.channel": "频道",
-  "intro_messages.creator": "这是<strong>{name}</strong>{type}的开始, <strong>{creator}</strong>在<strong>{date}</strong>创建",
+  "intro_messages.creator": "这是<strong>{name}</strong>{type}的开始，由<strong>{creator}</strong>在<strong>{date}</strong>建立",
   "intro_messages.default": "<h4 class='channel-intro__title'>{display_name}的开始</h4><p class='channel-intro__content'><strong>欢迎进入{display_name}!</strong><br/><br/>这是团队成员登录后看到的第一个频道—使用它来发布每个人需要知道的更新信息。</p>",
   "intro_messages.group": "私密小组",
   "intro_messages.invite": "邀请其他人到{type}",
   "intro_messages.inviteOthers": "邀请其他人入组",
-  "intro_messages.noCreator": "这是{name}{type}的开始,在{date}创建.",
+  "intro_messages.noCreator": "这是{name}{type}的开始，于{date}建立。",
   "intro_messages.offTopic": "<h4 class=\"channel-intro__title\">{display_name}的开始</h4><p class=\"channel-intro__content\">这是{display_name}的开始,一个用于非工作的频道.<br/></p>",
   "intro_messages.onlyInvited": "只有受邀的人才能看到这个私密小组.",
-  "intro_messages.setHeader": "设置标题头",
+  "intro_messages.setHeader": "设置标语",
   "intro_messages.teammate": "这是你与组员私信记录的开始.此区外的人是看不到这里展示的私信和文件.",
   "invite_member.addAnother": "添加另一个",
   "invite_member.autoJoin": "被邀请人将自动加入频道<strong>{channel}</strong>.",
@@ -1208,7 +1270,7 @@
   "invite_member.lastname": "名字",
   "invite_member.modalButton": "是的,抛弃",
   "invite_member.modalMessage": "你有未寄出的邀请函,你确定你想要抛弃他们吗?",
-  "invite_member.modalTitle": "丢弃的邀请?",
+  "invite_member.modalTitle": "丢弃邀请？",
   "invite_member.newMember": "邀请新成员",
   "invite_member.send": "发送邀请",
   "invite_member.send2": "邀请函",
@@ -1232,7 +1294,7 @@
   "login.invalidPassword": "您的密码是错误的。",
   "login.ldapUsername": "LDAP用户名",
   "login.ldapUsernameLower": "LDAP用户名",
-  "login.noAccount": "没有一个帐户吗?",
+  "login.noAccount": "没有帐户吗？",
   "login.noEmail": "请输入您的电子邮件",
   "login.noEmailLdapUsername": "请输入您的电子邮件或 {ldapUsername}",
   "login.noEmailUsername": "请输入您的电子邮件或用户名",
@@ -1258,7 +1320,7 @@
   "login_mfa.tokenReq": "请输入多重验证令牌",
   "member_item.makeAdmin": "Admin",
   "member_item.member": "成员",
-  "member_list.noUsersAdd": "没有用户添加",
+  "member_list.noUsersAdd": "没有用户可添加。",
   "members_popover.msg": "消息",
   "members_popover.title": "成员",
   "more_channels.close": "关闭",
@@ -1278,10 +1340,10 @@
   "navbar.delete": "删除频道...",
   "navbar.leave": "离开频道",
   "navbar.manageMembers": "成员管理",
-  "navbar.noHeader": "没有频道头.{newline}{link}去添加一个.",
+  "navbar.noHeader": "没有频道标语。{newline}{link}去添加。",
   "navbar.preferences": "通知偏好",
   "navbar.rename": "重命名频道...",
-  "navbar.setHeader": "设置频道头...",
+  "navbar.setHeader": "设置频道标语...",
   "navbar.setPurpose": "设置频道的目的...",
   "navbar.toggle1": "切换侧边栏",
   "navbar.toggle2": "切换侧边栏",
@@ -1334,29 +1396,12 @@
   "post_focus_view.beginning": "开始频道归档",
   "post_info.del": "删除",
   "post_info.edit": "编辑",
+  "post_info.mobile.flag": "标志",
+  "post_info.mobile.unflag": "取消标志",
   "post_info.permalink": "超链接",
   "post_info.reply": "回复",
   "posts_view.loadMore": "载入更多的消息",
   "posts_view.newMsg": "新消息",
-  "register_app.callback": "回调URL",
-  "register_app.callbackError": "至少有一个回调URL必须填写。",
-  "register_app.cancel": "取消",
-  "register_app.clientId": "客户端ID",
-  "register_app.clientSecret": "客户端秘密",
-  "register_app.close": "关闭",
-  "register_app.credentialsDescription": "保存这些安全的地方.防止你的客户端ID作为你的应用程序的用户名和你的客户秘密为应用程序的密码.",
-  "register_app.credentialsSave": "我保存了我的客户Id和安全的客户端秘密",
-  "register_app.credentialsTitle": "你的应用程序证书",
-  "register_app.description": "描述",
-  "register_app.dev": "开发者应用程序",
-  "register_app.homepage": "主页URL",
-  "register_app.homepageError": "主页必须填写。",
-  "register_app.name": "应用程序名",
-  "register_app.nameError": "应用程序名称必须填写。",
-  "register_app.optional": "可选的",
-  "register_app.register": "注册",
-  "register_app.required": "必需的",
-  "register_app.title": "注册一个新的应用程序",
   "removed_channel.channelName": "频道",
   "removed_channel.from": "删除从",
   "removed_channel.okay": "Okay",
@@ -1376,7 +1421,10 @@
   "rhs_comment.comment": "评论",
   "rhs_comment.del": "删除",
   "rhs_comment.edit": "编辑",
+  "rhs_comment.mobile.flag": "标志",
+  "rhs_comment.mobile.unflag": "取消标志",
   "rhs_comment.permalink": "永久链接",
+  "rhs_header.backToFlaggedTooltip": "回到已标志的贴",
   "rhs_header.backToResultsTooltip": "回到搜索结果",
   "rhs_header.closeSidebarTooltip": "关闭侧栏",
   "rhs_header.details": "消息详情",
@@ -1385,12 +1433,15 @@
   "rhs_root.del": "删除",
   "rhs_root.direct": "私信",
   "rhs_root.edit": "编辑",
+  "rhs_root.mobile.flag": "标志",
+  "rhs_root.mobile.unflag": "取消标志",
   "rhs_root.permalink": "永久链接",
   "search_bar.cancel": "取消",
   "search_bar.search": "搜索",
   "search_bar.usage": "<h4>搜索选项</h4><ul><li><span>使用</span><b>“引号”</b><span>搜索词组</span></li><li><span>使用</span><b>来自</b>的<span>查找来自特定用户和</span><b>的帖子，</b><span>中的查找特定频道的帖子</span></li></ul>",
   "search_header.results": "搜索结果",
   "search_header.title2": "最近提到",
+  "search_header.title3": "已标志的贴",
   "search_item.direct": "私信",
   "search_item.jump": "跳",
   "search_results.because": "<ul><li>如果您需搜索一个部分词组（例如搜索“rea”，查找“reach”或“reaction”），请在结尾附上 *。</li><li>由于搜索结果的数量限制，双字母和“this”，“a”和“is”等常用词不会出现在搜索结果中。</li></ul>",
@@ -1423,6 +1474,7 @@
   "sidebar_header.tutorial": "<h4>主菜单</h4><p><strong>在主菜单中</strong>您可以<strong>邀请新成员</strong>，访问您的<strong>账户设置</strong>和设置您的<strong>主题颜色</strong>。</p><p>团队管理员也能通过此菜单访问他们的<strong>团队设置</strong>。</p><p>系统管理员将找到一个<strong>系统控制台</strong>选项管理整个系统。</p>",
   "sidebar_right_menu.accountSettings": "账户设置",
   "sidebar_right_menu.console": "系统控制台",
+  "sidebar_right_menu.flagged": "已标志的贴",
   "sidebar_right_menu.help": "帮助",
   "sidebar_right_menu.inviteNew": "邀请新成员",
   "sidebar_right_menu.logout": "注销",
@@ -1573,18 +1625,14 @@
   "user.settings.custom_theme.newMessageSeparator": "新消息分隔符",
   "user.settings.custom_theme.onlineIndicator": "在线显示",
   "user.settings.custom_theme.sidebarBg": "侧边栏BG",
-  "user.settings.custom_theme.sidebarHeaderBg": "侧边栏头BG",
-  "user.settings.custom_theme.sidebarHeaderTextColor": "侧边栏头文本",
+  "user.settings.custom_theme.sidebarHeaderBg": "侧边栏头背景",
+  "user.settings.custom_theme.sidebarHeaderTextColor": "侧边栏头文字",
   "user.settings.custom_theme.sidebarText": "侧边栏文本",
   "user.settings.custom_theme.sidebarTextActiveBorder": "侧边栏文本活动边框",
   "user.settings.custom_theme.sidebarTextActiveColor": "侧边栏文本活跃的颜色”",
   "user.settings.custom_theme.sidebarTextHoverBg": "侧边栏文本HoverBG",
   "user.settings.custom_theme.sidebarTitle": "侧栏风格",
   "user.settings.custom_theme.sidebarUnreadText": "侧边栏未读文本",
-  "user.settings.developer.applicationsPreview": "应用程序(预览)",
-  "user.settings.developer.register": "注册新应用程序",
-  "user.settings.developer.thirdParty": "开放注册一个新的第三方应用程序",
-  "user.settings.developer.title": "开发人员设置",
   "user.settings.display.channelDisplayTitle": "频道显示模式",
   "user.settings.display.channeldisplaymode": "选择中央间频道的宽度。",
   "user.settings.display.clockDisplay": "时钟显示",
@@ -1636,7 +1684,7 @@
   "user.settings.general.emailUnchanged": "您的新电子邮件地址和旧的电子邮件地址一致。",
   "user.settings.general.emptyName": "点击 '编辑' 添加您的全名",
   "user.settings.general.emptyNickname": "点击 '编辑' 添加一个昵称",
-  "user.settings.general.field_handled_externally": "此栏由您的登入提供者决定。如果您想更改，您需要到您的登入提供者改动。",
+  "user.settings.general.field_handled_externally": "此栏由您的登入提供商决定。如果您想更改，您需要到您的登入提供者改动。",
   "user.settings.general.firstName": "姓",
   "user.settings.general.fullName": "全名",
   "user.settings.general.imageTooLarge": "无法上传头像。文件太大。",
@@ -1668,6 +1716,7 @@
   "user.settings.import_theme.submit": "发送",
   "user.settings.import_theme.submitError": "无效格式，请尝试再次复制粘贴。",
   "user.settings.languages.change": "更改界面语言",
+  "user.settings.languages.promote": "选择 Mattermost 界面显示的语言。<br /><br />想要帮助翻译吗？加入<a href='http://translate.mattermost.com/' target='_blank'>Mattermost 翻译服务器</a>。",
   "user.settings.mfa.add": "向您的账户添加多重验证",
   "user.settings.mfa.addHelp": "您需要密码之外用基于智能手机的令牌来登入 Mattermost。<br/><br/>请从 <a target='_blank' href='https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8'>iTunes</a> 或 <a target='_blank' href='https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en'>Google Play</a> 下载Google Authenticator 到您的手机，然后<br/><br/>1. 点击上方<strong>添加多重验证到您的帐号</strong>按钮。<br/>2. 使用Google Authenticator扫描显示的QR码。<br/>3. 输入Google Authenticator生成的令牌并点击<strong>保存</strong>。<br/><br/>登入时，您会被要求额外输入Google Authenticator令牌。",
   "user.settings.mfa.addHelpQr": "请使用您智能手机的Google Authenticator应用扫描二维码并填写一个由应用程序提供的令牌。",
@@ -1675,19 +1724,17 @@
   "user.settings.mfa.qrCode": "条形码",
   "user.settings.mfa.remove": "从您的账户中删除多重验证",
   "user.settings.mfa.removeHelp": "删除多重验证意味着您不再需要基于手机的密码来登入您的帐号。",
+  "user.settings.mfa.title": "启用多重验证：",
   "user.settings.modal.advanced": "高级",
   "user.settings.modal.confirmBtns": "是的,放弃",
   "user.settings.modal.confirmMsg": "您有未保存的更改，您确定你想要放弃他们吗？",
   "user.settings.modal.confirmTitle": "放弃修改？",
-  "user.settings.modal.developer": "开发人员",
   "user.settings.modal.display": "显示",
   "user.settings.modal.general": "基本",
   "user.settings.modal.notifications": "通知",
   "user.settings.modal.security": "安全",
   "user.settings.modal.title": "账户设置",
-  "user.settings.notification.allActivity": "所有活动",
-  "user.settings.notification.push": "手机推送信息提示",
-  "user.settings.notification.soundConfig": "请在您的浏览器中配置消息通知声音设置",
+  "user.settings.notifications.allActivity": "所有活动",
   "user.settings.notifications.channelWide": "频道范围提及 \"@channel\", \"@all\"",
   "user.settings.notifications.close": "关闭",
   "user.settings.notifications.comments": "评论串通知",
@@ -1706,9 +1753,11 @@
   "user.settings.notifications.off": "关",
   "user.settings.notifications.on": "开",
   "user.settings.notifications.onlyMentions": "只在提及和私信中",
+  "user.settings.notifications.push": "手机推送",
   "user.settings.notifications.sensitiveName": "您的敏感姓\"{first_name}\"",
   "user.settings.notifications.sensitiveUsername": "不区分大小写的用户名\"{username}\"",
   "user.settings.notifications.sensitiveWords": "其他不区分大小写的词汇，以逗号分隔：",
+  "user.settings.notifications.soundConfig": "请在您的浏览器中配置消息通知声音设置",
   "user.settings.notifications.sounds_info": "桌面通知声音在Firefox、Safari、Chrome、InternetExplorer和Edge中有效。",
   "user.settings.notifications.teamWide": "团队范围的提及\"@all\"",
   "user.settings.notifications.title": "通知设置",
@@ -1776,6 +1825,6 @@
   "web.footer.privacy": "隐私",
   "web.footer.terms": "条款",
   "web.header.back": "返回",
-  "web.root.signup_info": "所有团队的通讯一站式解决，随时随地可搜索和访问",
+  "web.root.signup_info": "所有团队的通讯一站式解决，随时随地可访问和搜索",
   "youtube_video.notFound": "视频未找到"
 }