translations PR 20170320 (#5819)

1 files changed, 17 insertions, 3 deletions

diff --git a/webapp/i18n/zh-CN.json b/webapp/i18n/zh-CN.json
index 9212c9e7c..d5482fc10 100644
--- a/webapp/i18n/zh-CN.json
+++ b/webapp/i18n/zh-CN.json
@@ -1118,7 +1118,7 @@
   "channel_modal.channel": "频道",
   "channel_modal.createNew": "创建新",
   "channel_modal.descriptionHelp": "描述{term}如何被使用。",
-  "channel_modal.displayNameError": "此栏必须填写",
+  "channel_modal.displayNameError": "Channel name must be 2 or more characters",
   "channel_modal.edit": "编辑",
   "channel_modal.group": "群组",
   "channel_modal.header": "标题",
@@ -1208,7 +1208,6 @@
   "create_post.tutorialTip": "<h4>发送信息</h4><p>在这输入信息并按<strong>回车</strong>发送。</p><p>点击<strong>附件</strong>按钮上传图片或文件。</p>",
   "create_post.write": "写一个消息...",
   "create_team.agreement": "如果继续创建您的帐户和使用{siteName}，您需要同意<a href={TermsOfServiceLink}>服务条款</a>和<a href={PrivacyPolicyLink}>隐私政策</a>。如果不同意，您将不能使用{siteName}。",
-  "create_team.display_name.back": "返回上一步",
   "create_team.display_name.charLength": "名称必须在 {min} 于 {max} 个字符之间。您可以之后添加更长的团队描述。",
   "create_team.display_name.nameHelp": "您可以使用任何语言命名您的团队。您的团队名称将显示在菜单和标题栏上。",
   "create_team.display_name.next": "下一步",
@@ -1276,6 +1275,9 @@
   "emoji_list.add": "添加自定义表情符",
   "emoji_list.creator": "创建者",
   "emoji_list.delete": "删除",
+  "emoji_list.delete.confirm.button": "删除",
+  "emoji_list.delete.confirm.msg": "This action permanently deletes the custom emoji. Are you sure you want to delete it?",
+  "emoji_list.delete.confirm.title": "Delete Custom Emoji",
   "emoji_list.empty": "未找到自定义表情符",
   "emoji_list.header": "自定义表情",
   "emoji_list.help": "自定义表情符对所有在您服务器上的用户开放。在信息框输入 ':' 会显示表情符选择菜单。其他用户可能需要刷新页面才能看见新的表情符。",
@@ -1324,7 +1326,6 @@
   "flag_post.flag": "标记以跟进",
   "flag_post.unflag": "取消标记",
   "general_tab.chooseDescription": "请为您的团队选个新的描述",
-  "general_tab.chooseName": "请选择一个新的名称为你的团队",
   "general_tab.codeDesc": "点击 \"编辑\" 重新生成邀请码。",
   "general_tab.codeLongDesc": "作为团队邀请链接中URL的一部分，邀请码在主菜单中由 {getTeamInviteLink} 创建。重新生成创建一个新的团队邀请链接将使之前的链接无效。",
   "general_tab.codeTitle": "邀请码",
@@ -1665,6 +1666,7 @@
   "navbar.toggle1": "切换侧边栏",
   "navbar.toggle2": "切换侧边栏",
   "navbar.viewInfo": "查看信息",
+  "navbar.viewPinnedPosts": "View Pinned Posts",
   "navbar_dropdown.about": "关于Mattermost",
   "navbar_dropdown.accountSettings": "账户设置",
   "navbar_dropdown.console": "系统控制台",
@@ -1719,8 +1721,11 @@
   "post_info.mobile.flag": "标记",
   "post_info.mobile.unflag": "取消标记",
   "post_info.permalink": "永久链接",
+  "post_info.pin": "Pin to channel",
+  "post_info.pinned": "Pinned",
   "post_info.reply": "回复",
   "post_info.system": "系统",
+  "post_info.unpin": "Un-pin from channel",
   "post_message_view.edited": "(已编辑)",
   "posts_view.loadMore": "载入更多消息",
   "posts_view.newMsg": "新消息",
@@ -1773,11 +1778,14 @@
   "rhs_root.mobile.flag": "标记",
   "rhs_root.mobile.unflag": "取消标记",
   "rhs_root.permalink": "永久链接",
+  "rhs_root.pin": "Pin to channel",
+  "rhs_root.unpin": "Un-pin from channel",
   "search_bar.search": "搜索",
   "search_bar.usage": "<h4>搜索选项</h4><ul><li><span>使用</span><b>\"双引号\"</b><span>搜索词组</span></li><li><span>使用</span><b>from:</b><span>查找来自特定用户的信息，使用</span><b>in:</b><span>查找特定频道的信息</span></li></ul>",
   "search_header.results": "搜索结果",
   "search_header.title2": "最近提及",
   "search_header.title3": "已标记的信息",
+  "search_header.title4": "Pinned posts in {channelDisplayName}",
   "search_item.direct": "私信 (与 {username})",
   "search_item.jump": "跳转",
   "search_results.because": "<ul><li>如果您需搜索一个部分词组（例如搜索 \"rea\"，查找 \"reach\" 或 \"reaction\"），请在结尾附上 *。</li><li>由于搜索结果的数量限制，双字母的搜索和 \"this\"，\"a\" 及 \"is\" 等常用词不会出现在搜索结果中。</li></ul>",
@@ -1787,6 +1795,10 @@
   "search_results.usageFlag2": "您可以点击时间戳旁的",
   "search_results.usageFlag3": "图标来标记信息和评论。",
   "search_results.usageFlag4": "标记信息以便之后更进。您的标记是个人的，不会被他人看到。",
+  "search_results.usagePin1": "There are no pinned messages yet.",
+  "search_results.usagePin2": "All members of this channel can pin important or useful messages.",
+  "search_results.usagePin3": "Pinned messages are visible to all channel members.",
+  "search_results.usagePin4": "To pin a message: Go to the message that you want to pin and click [...] > \"Pin to channel\".",
   "setting_item_max.cancel": "取消",
   "setting_item_max.save": "保存",
   "setting_item_min.edit": "编辑",
@@ -2181,6 +2193,7 @@
   "user.settings.push_notification.send": "发送手机推送",
   "user.settings.push_notification.status": "触发推送通知当",
   "user.settings.push_notification.status_info": "通知只有在您的在线状态符合以上选择时才发送推送。",
+  "user.settings.security.active": "Active",
   "user.settings.security.close": "关闭",
   "user.settings.security.currentPassword": "当前密码",
   "user.settings.security.currentPasswordError": "请输入您当前密码。",
@@ -2188,6 +2201,7 @@
   "user.settings.security.emailPwd": "邮箱和密码",
   "user.settings.security.gitlab": "GitLab",
   "user.settings.security.google": "谷歌",
+  "user.settings.security.inactive": "停用",
   "user.settings.security.lastUpdated": "上次更新时间{date}{time}",
   "user.settings.security.ldap": "AD/LDAP",
   "user.settings.security.loginGitlab": "用 GitLab 登录",