Merge release-3.10 into master (#6654)

* PLT-6787 Fixed being able to send a post before files finished uploading (#6617)

* Fix quick switcher for channels/users not stored locally (#6610)

* Fix button text on confirm mention modal (#6609)

* fix post delete permission of channel admin (#6608)

* open comment thread for the most recent reply-able message (#6605)

* Use mutex flag with yarn to prevent concurrent builds interfering (#6619)

* Use mutex flag with yarn to prevent concurrent builds interfering

* Remove yarn mutex file with clean

* Minor bug fixes (#6615)

* PLT-6774 - Fixing color for offline icon

* PLT-6784 - Fixing status icon

* Fixing icon margin

* Updating caret position

* PLT-6070 Have ChannelMentionProvider stop searching after a term returns no results (#6620)

* Fixing JS error (#6623)

* Minor bug fixes (#6622)

* PLT-6808 - Updating channel switcher on mobile

* PLT-6743 - Updating scrollbar styling

* Login instead of failing if user exists in OAuth sign-up flow (#6627)

* PLT-6802 Disable team switcher (#6626)

* Disable team switcher

* Fix ESLint errors

* PLT-6807 Ensured select teams page can scroll on iOS (#6630)

* Do not redirect from account switch pages on 401 (#6631)

* Fixing loadtest command and renaming to /test (#6624)

* PLT-6820 Update mattermost-redux dependency (#6632)

* translations PR 20170612 (#6629)

* Bump HTTP client timeout to 30 seconds (#6633)

* For team unreads return empty array instead of null (#6636)

* PLT-6831 Fix status modal localization IDs (#6637)

* Fix status modal localization IDs

* Update test snapshot

1 files changed, 43 insertions, 34 deletions

diff --git a/webapp/i18n/zh-CN.json b/webapp/i18n/zh-CN.json
index 9835e68f7..edec5505f 100644
--- a/webapp/i18n/zh-CN.json
+++ b/webapp/i18n/zh-CN.json
@@ -319,19 +319,19 @@
   "admin.general.localization.serverLocaleTitle": "默认服务器语言：",
   "admin.general.log": "日志",
   "admin.general.policy": "策略",
-  "admin.general.policy.allowBannerDismissalDesc": "When true, users can dismiss the banner until its next update. When false, the banner is permanently visible until it is turned off by the System Admin.",
-  "admin.general.policy.allowBannerDismissalTitle": "Allow Banner Dismissal:",
+  "admin.general.policy.allowBannerDismissalDesc": "当设为是时，用户可以撤掉横幅直到下次更新。当设为否时，横幅将永久显示知道系统管理员关闭。",
+  "admin.general.policy.allowBannerDismissalTitle": "允许撤掉横幅：",
   "admin.general.policy.allowEditPostAlways": "任何时间",
   "admin.general.policy.allowEditPostDescription": "设定作者发布消息后可编辑的时长的策略。",
   "admin.general.policy.allowEditPostNever": "从不",
   "admin.general.policy.allowEditPostTimeLimit": "发布后秒数",
   "admin.general.policy.allowEditPostTitle": "允许用户修改他们的消息：",
-  "admin.general.policy.bannerColorTitle": "Banner Color:",
-  "admin.general.policy.bannerTextColorTitle": "Banner Text Color:",
-  "admin.general.policy.bannerTextDesc": "Text that will appear in the announcement banner.",
-  "admin.general.policy.bannerTextTitle": "Banner Text:",
-  "admin.general.policy.enableBannerDesc": "Enable an announcement banner across all teams.",
-  "admin.general.policy.enableBannerTitle": "Enable Announcement Banner:",
+  "admin.general.policy.bannerColorTitle": "横幅颜色：",
+  "admin.general.policy.bannerTextColorTitle": "横幅文字颜色：",
+  "admin.general.policy.bannerTextDesc": "公告横幅显示的文字。",
+  "admin.general.policy.bannerTextTitle": "横幅文字：",
+  "admin.general.policy.enableBannerDesc": "在所有团队开启公告横幅。",
+  "admin.general.policy.enableBannerTitle": "开启公告横幅：",
   "admin.general.policy.permissionsAdmin": "团队和系统管理员",
   "admin.general.policy.permissionsAll": "所有团队成员",
   "admin.general.policy.permissionsAllChannel": "所有频道成员",
@@ -542,7 +542,7 @@
   "admin.log.locationPlaceholder": "输入你的文件位置",
   "admin.log.locationTitle": "日志文件目录：",
   "admin.log.logSettings": "日志设置",
-  "admin.logs.bannerDesc": "To look up users by User ID, go to Reporting > Users and paste the ID into the search filter.",
+  "admin.logs.bannerDesc": "到 报告 > 用户 并在搜索过滤器输入 ID 以用户 ID 查找用户。",
   "admin.logs.reload": "重载",
   "admin.logs.title": "服务器日志",
   "admin.metrics.enableDescription": "当设置为是时，Mattermost 会启用性能监控收集和分析。请查看<a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>文档</a>了解更多Mattermost 性能监控配置信息。",
@@ -641,7 +641,7 @@
   "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": "When false, Mattermost will not decrypt SAML Assertions encrypted with your Service Provider Public Certificate. Not recommended for production environments. For testing only.",
+  "admin.saml.encryptDescription": "当设为否时，Mattermost 将不会用使用您的服务提供者公开证书解密 SAML 断言。不推荐在正式环境中使用。仅供测试。",
   "admin.saml.encryptTitle": "开启加密：",
   "admin.saml.firstnameAttrDesc": "(可选) 使用SAML断言中的属性做为 Mattermost 中用户的昵称。",
   "admin.saml.firstnameAttrEx": "例如 \"FirstName\"",
@@ -686,7 +686,7 @@
   "admin.saml.usernameAttrDesc": "使用SAML断言中的属性做为Mattermost中用户的用户名。",
   "admin.saml.usernameAttrEx": "例如 \"Username\"",
   "admin.saml.usernameAttrTitle": "用户名：",
-  "admin.saml.verifyDescription": "When false, Mattermost will not verify that the signature sent from a SAML Response matches the Service Provider Login URL. Not recommended for production environments. For testing only.",
+  "admin.saml.verifyDescription": "当设为否时，Mattermost 将不会验证 SAML 回复里的签字是否匹配服务提供商登入网址。不推荐在正式环境中使用。仅供测试。",
   "admin.saml.verifyTitle": "校验签名：",
   "admin.save": "保存",
   "admin.saving": "保存配置中...",
@@ -746,7 +746,7 @@
   "admin.service.sessionCacheDesc": "会话在内存缓存的分钟数。",
   "admin.service.sessionDaysEx": "例如 \"30\"",
   "admin.service.siteURL": "站点网址：",
-  "admin.service.siteURLDescription": "用户用来访问 Mattermost 的网址，包括端口和协议。此设定为必须。",
+  "admin.service.siteURLDescription": "用户访问 Mattermost 的网址。标准端口如 80 和 443 可以省略，但非标准端口不能省略。例如：http://mattermost.example.com:8065。此设定必填。",
   "admin.service.siteURLExample": "例如 \"https://mattermost.example.com:1234\"",
   "admin.service.ssoSessionDays": "SSO会话时长 (天)：",
   "admin.service.ssoSessionDaysDesc": "从用户上一次输入他们的认证到会话过期的天数。如果验证方式时SAML或GitLab，用户将会自动登入到Mattermost如果他们已经登入到SAML或GitLab。修改此设定后，新的会话时常将在用户下一次输入认证后生效。",
@@ -832,24 +832,24 @@
   "admin.sql.maxOpenTitle": "最大的开放连接: ",
   "admin.sql.noteDescription": "修改这段属性需要重启服务器才能生效。",
   "admin.sql.noteTitle": "注释：",
-  "admin.sql.queryTimeoutDescription": "The number of seconds to wait for a response from the database after opening a connection and sending the query. Errors that you see in the UI or in the logs as a result of a query timeout can vary depending on the type of query. This setting has no effect on PostgreSQL databases.",
+  "admin.sql.queryTimeoutDescription": "连接数据库并发送查询后等待的结果秒数。您在 UI 或日志看到的查询超时导致的错误很可能跟不同查询类型有关。此设定不影响 PostgreSQL 数据库。",
   "admin.sql.queryTimeoutExample": "例如：\"30\"",
   "admin.sql.queryTimeoutTitle": "查询超时：",
   "admin.sql.replicas": "数据源副本：",
   "admin.sql.traceDescription": "(开发模式) 当设为是时，SQL 语句会被写入到日志。",
   "admin.sql.traceTitle": "追踪：",
   "admin.sql.warning": "警告：重新生成盐值可能导致一些列在数据库中返回空。",
-  "admin.support.aboutDesc": "The URL for the About link on the Mattermost login and sign-up pages. If this field is empty, the About link is hidden from users.",
+  "admin.support.aboutDesc": "在 Mattermost 登入和注册页面上\"关于\"链接地址。如果此栏留空，该链接将被隐藏。",
   "admin.support.aboutTitle": "关于链接：",
   "admin.support.emailHelp": "显示在邮件通知和教学上让最终用户提问支持的电子邮件地址。",
   "admin.support.emailTitle": "支持邮箱：",
-  "admin.support.helpDesc": "The URL for the Help link on the Mattermost login page, sign-up pages, and Main Menu. If this field is empty, the Help link is hidden from users.",
+  "admin.support.helpDesc": "在 Mattermost 登入页面、注册页面以及主菜单上\"帮助\"链接地址。如果此栏留空，该链接将被隐藏。",
   "admin.support.helpTitle": "帮助链接：",
   "admin.support.noteDescription": "如果连接到一个外部站点，网址应该以 http:// 或https:// 开头。",
   "admin.support.noteTitle": "注释：",
-  "admin.support.privacyDesc": "The URL for the Privacy link on the login and sign-up pages. If this field is empty, the Privacy link is hidden from users.",
+  "admin.support.privacyDesc": "在 Mattermost 登入和注册页面上\"隐私\"链接地址。如果此栏留空，该链接将被隐藏。",
   "admin.support.privacyTitle": "隐私策略链接：",
-  "admin.support.problemDesc": "The URL for the Report a Problem link in the Main Menu. If this field is empty, the link is removed from the Main Menu.",
+  "admin.support.problemDesc": "在 Mattermost 主菜单上\"错误汇报\"链接地址。如果此栏留空，该链接将被隐藏。",
   "admin.support.problemTitle": "报告问题链接：",
   "admin.support.termsDesc": "用户使用您的在线服务的条款链接。默认情况下，此链接指向 \"Mattermost 使用条款 (最终用户)\" 解释Mattermost软件提供给最终用户的条款。如果您修改默认链接来添加您自己的服务条款，您的新条款必须包含链接到默认条款让用户知道Mattermost软件的最终用户条款。",
   "admin.support.termsTitle": "服务条款链接：",
@@ -1248,7 +1248,7 @@
   "custom_emoji.search": "搜索自定义表情符",
   "deactivate_member_modal.cancel": "取消",
   "deactivate_member_modal.deactivate": "停用",
-  "deactivate_member_modal.desc": "This action deactivates {username}. They will be logged out and not have access to any teams or channels on this system. Are you sure you want to deactivate {username}?",
+  "deactivate_member_modal.desc": "此操作将停用 {username}。他们将注销并无法再访问本系统的任何团队或频道。您确定要停用 {username}？",
   "deactivate_member_modal.title": "停用 {username}",
   "default_channel.purpose": "发表您想所有人看到的消息。所有人在加入团队时候自动成员此频道的永久成员。",
   "delete_channel.cancel": "取消",
@@ -1262,7 +1262,7 @@
   "delete_post.post": "发布",
   "delete_post.question": "您确认要删除{term}？",
   "delete_post.warning": "这个信息有{count}条评论。",
-  "edit_channel_header.editHeader": "Edit the Channel Header...",
+  "edit_channel_header.editHeader": "修改频道标题...",
   "edit_channel_header.previewHeader": "编辑标题",
   "edit_channel_header_modal.cancel": "取消",
   "edit_channel_header_modal.description": "编辑在频道标题上显示在名称旁的文本。",
@@ -1684,6 +1684,7 @@
   "mobile.account_notifications.threads_mentions": "串中的提及",
   "mobile.account_notifications.threads_start": "我创建的串",
   "mobile.account_notifications.threads_start_participate": "我创建的或参与的串",
+  "mobile.channel_drawer.search": "移至到会话",
   "mobile.channel_info.alertMessageDeleteChannel": "您确定要删除{term} {name}？",
   "mobile.channel_info.alertMessageLeaveChannel": "您确定要离开{term} {name}？",
   "mobile.channel_info.alertNo": "否",
@@ -1700,6 +1701,7 @@
   "mobile.channel_list.closeGM": "关闭组消息",
   "mobile.channel_list.dm": "私信",
   "mobile.channel_list.gm": "组消息",
+  "mobile.channel_list.not_member": "非成员",
   "mobile.channel_list.open": "打开 {term}",
   "mobile.channel_list.openDM": "打开私信",
   "mobile.channel_list.openGM": "打开组消息",
@@ -1716,6 +1718,7 @@
   "mobile.create_channel.private": "新私有频道",
   "mobile.create_channel.public": "新公共频道",
   "mobile.custom_list.no_results": "无结果",
+  "mobile.drawer.teamsTitle": "团队",
   "mobile.edit_post.title": "编辑消息",
   "mobile.file_upload.camera": "拍照或视频",
   "mobile.file_upload.library": "照片库",
@@ -1729,7 +1732,7 @@
   "mobile.loading_members": "正在加载成员...",
   "mobile.loading_posts": "正在加载消息...",
   "mobile.login_options.choose_title": "选择您的登入方式",
-  "mobile.notification.in": " in ",
+  "mobile.notification.in": " 在 ",
   "mobile.offlineIndicator.connected": "已连接",
   "mobile.offlineIndicator.connecting": "正在连接...",
   "mobile.offlineIndicator.offline": "无网络连接",
@@ -1763,11 +1766,16 @@
   "mobile.routes.user_profile": "个人资料",
   "mobile.routes.user_profile.send_message": "发送消息",
   "mobile.select_team.choose": "您的团队：",
-  "mobile.select_team.join_open": "您可以加入的其他团队。",
+  "mobile.select_team.join_open": "您可以加入的开放团队",
   "mobile.server_ping_failed": "无法连接服务器。请检查您的服务器网址和网络连接。",
   "mobile.server_url.invalid_format": "每个 URL 必须以 http:// 或 https:// 开头",
   "mobile.session_expired": "会话已超时：请登入再继续接收通知。",
   "mobile.settings.team_selection": "团队选择",
+  "modal.manaul_status.ask": "不要再次询问",
+  "modal.manaul_status.button": "是，设置我的状态为 \"在线\"",
+  "modal.manaul_status.cancel": "不，保留为 \"{status}\"",
+  "modal.manaul_status.message": "您想要切换状态为 \"在线\" 吗？",
+  "modal.manaul_status.title": "您的状态已设置为 \"{status}\"",
   "more_channels.close": "关闭",
   "more_channels.create": "创建新频道",
   "more_channels.createClick": "点击'创建新频道'创建一个新的频道",
@@ -1826,9 +1834,9 @@
   "navbar_dropdown.teamSettings": "团队设置",
   "navbar_dropdown.viewMembers": "查看成员",
   "notification.dm": "私信",
-  "notify_all.confirm": "Confirm",
-  "notify_all.question": "By using @all or @channel you are about to send notifications to {totalMembers} people. Are you sure you want to do this?",
-  "notify_all.title.confirm": "Confirm sending notifications to entire channel",
+  "notify_all.confirm": "确认",
+  "notify_all.question": "使用 @all 或 @channel 您将发送通知到 {totalMembers} 人。您确定要这样做？",
+  "notify_all.title.confirm": "确定发送通知到整个频道",
   "passwordRequirements": "密码要求：",
   "password_form.change": "修改我的密码",
   "password_form.click": "点击<a href={url}>这里</a>去登录。",
@@ -1874,13 +1882,13 @@
   "posts_view.newMsg": "新消息",
   "posts_view.newMsgBelow": "以下有 {count} 个新消息",
   "quick_switch_modal.channels": "频道",
-  "quick_switch_modal.channelsShortcut.mac": "(CMD+K)",
-  "quick_switch_modal.channelsShortcut.windows": "(CTRL+K)",
-  "quick_switch_modal.help": "Use TAB to toggle between teams/channels, ↑↓ to browse, ↵ to confirm, ESC to dismiss",
-  "quick_switch_modal.help_no_team": "输入频道名。↑↓浏览，TAB选择，↵确认，ESC取消",
-  "quick_switch_modal.teams": "条款",
-  "quick_switch_modal.teamsShortcut.mac": "(CMD+ALT+K)",
-  "quick_switch_modal.teamsShortcut.windows": "(CTRL+ALT+K)",
+  "quick_switch_modal.channelsShortcut.mac": "- ⌘K",
+  "quick_switch_modal.channelsShortcut.windows": "- CTRL+K",
+  "quick_switch_modal.help": "开始输入后用 TAB 切换频道/团队，↑↓浏览，↵选择，以及 ESC 退出。",
+  "quick_switch_modal.help_no_team": "开始输入后用 ↑↓浏览，↵选择，以及 ESC 退出。",
+  "quick_switch_modal.teams": "团队",
+  "quick_switch_modal.teamsShortcut.mac": "- ⌘⌥K",
+  "quick_switch_modal.teamsShortcut.windows": "- CTRL+ALT+K",
   "reaction.clickToAdd": "(点击添加)",
   "reaction.clickToRemove": "(点击删除)",
   "reaction.othersReacted": "{otherUsers, number} 位用户",
@@ -1971,8 +1979,6 @@
   "sidebar.otherMembers": "此团队之外",
   "sidebar.pg": "私有频道",
   "sidebar.removeList": "从列表删除",
-  "sidebar.switch_channels": "Switch Channels (CTRL + K)",
-  "sidebar.switch_channels.mac": "Switch Channels (CMD + K)",
   "sidebar.tutorialScreen1": "<h4>频道</h4><p><strong>频道</strong>组织不同主题的会话。他们对您所在团队的每一个人开放。针对单人发送私人消息使用<strong>私信</strong>针对多人使用<strong>私有频道</strong>。</p>",
   "sidebar.tutorialScreen2": "<h4>“{townsquare}”和“{offtopic}”频道</h4><p>这里启用了两个公共频道: </p><p><strong>公共频道</strong>是一个团队范围内沟通的地方。团队中的每一个人都是这个频道的一个成员。</p><p><strong>闲聊频道</strong>是一个娱乐幽默与工作无关的频道。您和您的团队可以决定创建其他频道。</p>",
   "sidebar.tutorialScreen3": "<h4>创建和加入频道</h4><p>点击<strong>“更多...”</strong>创建一个新频道或加入一个现有频道。</p><p>您还可以通过点击频道或私有频道旁的<strong>“+”符号</strong>，创建一个新频道或私有频道标题。</p>",
@@ -2044,6 +2050,9 @@
   "sso_signup.length_error": "团队名必须为3-15个字母",
   "sso_signup.teamName": "输入新团队名",
   "sso_signup.team_error": "输入团队名",
+  "status_dropdown.set_away": "离开",
+  "status_dropdown.set_offline": "离线",
+  "status_dropdown.set_online": "在线",
   "suggestion.loading": "加载中...",
   "suggestion.mention.all": "注意：这将提及此频道所有人",
   "suggestion.mention.channel": "通知每个频道",
@@ -2285,7 +2294,7 @@
   "user.settings.modal.security": "安全",
   "user.settings.modal.title": "账户设置",
   "user.settings.notifications.allActivity": "所有活动",
-  "user.settings.notifications.channelWide": "频道范围提及 \"@channel\", \"@all\"",
+  "user.settings.notifications.channelWide": "频道范围提及 \"@channel\", \"@all\", \"@here\"",
   "user.settings.notifications.close": "关闭",
   "user.settings.notifications.comments": "回复通知",
   "user.settings.notifications.commentsAny": "在我开头或回复过的消息串触发通知",