translations PR 20170626 (#6756)

* translations PR 20170626

* Include italian as UI option

1 files changed, 18 insertions, 20 deletions

diff --git a/webapp/i18n/zh-CN.json b/webapp/i18n/zh-CN.json
index a56d4c442..83c0ab577 100644
--- a/webapp/i18n/zh-CN.json
+++ b/webapp/i18n/zh-CN.json
@@ -164,7 +164,7 @@
   "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.url": "Gossip 地址",
   "admin.cluster.status_table.version": "版本：",
   "admin.cluster.unknown": "未知",
   "admin.compliance.directoryDescription": "用户保存守规报告。如果为空，将被设置为 ./data/。",
@@ -750,7 +750,7 @@
   "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.testingDescription": "当设为是时，/test 斜杠命令能载入测试账号，数据和文字格式。修改这个设置需要重启服务器才能生效。",
   "admin.service.testingTitle": "启动测试指令：",
   "admin.service.tlsCertFile": "TLS 证书文件：",
   "admin.service.tlsCertFileDescription": "使用的证书文件。",
@@ -1261,7 +1261,7 @@
   "delete_post.del": "删除",
   "delete_post.post": "发布",
   "delete_post.question": "您确认要删除{term}？",
-  "delete_post.warning": "这个信息有{count}条评论。",
+  "delete_post.warning": "This post has {count, number} {count, plural, one {comment} other {comments}} on it.",
   "edit_channel_header.editHeader": "修改频道标题...",
   "edit_channel_header.previewHeader": "编辑标题",
   "edit_channel_header_modal.cancel": "取消",
@@ -1344,14 +1344,11 @@
   "file_upload.filesAbove": "文件超过{max}MB不能被上传：{filenames}",
   "file_upload.limited": "最大上传文件数限制为 {count}。请使用新信息来上传更多文件。",
   "file_upload.pasted": "图片已粘贴至",
-  "filtered_channels_list.count": "{count} 个频道",
-  "filtered_channels_list.countTotal": "{count} 个频道，共 {total} 个频道",
   "filtered_channels_list.search": "搜索频道",
   "filtered_user_list.any_team": "所有用户",
-  "filtered_user_list.count": "{count} 位成员",
-  "filtered_user_list.countPage": "{startCount, number} - {endCount, number} {count} 位成员，共 {total} 位",
-  "filtered_user_list.countTotal": "{count} 位，共 {total} 位成员",
-  "filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count} 位成员，共 {total} 位",
+  "filtered_user_list.count": "{count, number} 位用户",
+  "filtered_user_list.countTotal": "{count, number} 位用户，共 {total}",
+  "filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count} 位用户，共 {total} 位",
   "filtered_user_list.member": "成员",
   "filtered_user_list.next": "下一页",
   "filtered_user_list.prev": "上一页",
@@ -1691,6 +1688,7 @@
   "mobile.channel_info.alertTitleDeleteChannel": "删除 {term}",
   "mobile.channel_info.alertTitleLeaveChannel": "离开 {term}",
   "mobile.channel_info.alertYes": "是",
+  "mobile.channel_info.delete_failed": "We couldn't delete the channel {displayName}. Please check your connection and try again.",
   "mobile.channel_info.privateChannel": "私有频道",
   "mobile.channel_info.publicChannel": "公共频道",
   "mobile.channel_list.alertMessageLeaveChannel": "您确定要离开{term} {name}？",
@@ -1728,6 +1726,7 @@
   "mobile.intro_messages.DM": "这是您和{teammate}私信记录的开端。此区域外的人不能看到这里共享的私信和文件。",
   "mobile.intro_messages.default_message": "这是团队成员注册后第一个看到的频道 - 使用它发布所有人需要知道的消息。",
   "mobile.intro_messages.default_welcome": "欢迎来到 {name}！",
+  "mobile.join_channel.error": "We couldn't join the channel {displayName}. Please check your connection and try again.",
   "mobile.loading_channels": "正在加载频道...",
   "mobile.loading_members": "正在加载成员...",
   "mobile.loading_posts": "正在加载消息...",
@@ -1736,6 +1735,7 @@
   "mobile.offlineIndicator.connected": "已连接",
   "mobile.offlineIndicator.connecting": "正在连接...",
   "mobile.offlineIndicator.offline": "无网络连接",
+  "mobile.open_dm.error": "We couldn't open a direct message with {displayName}. Please check your connection and try again.",
   "mobile.post.cancel": "取消",
   "mobile.post.delete_question": "您确认要删除此消息？",
   "mobile.post.delete_title": "删除消息",
@@ -1795,8 +1795,7 @@
   "msg_typing.someone": "有人",
   "multiselect.add": "添加",
   "multiselect.go": "转到",
-  "multiselect.instructions": "使用上/下键选择并用回车做选择",
-  "multiselect.numPeopleRemaining": "您还可以添加 {num, number} 位用户。",
+  "multiselect.numPeopleRemaining": "Use ↑↓ to browse, ↵ to select. You can add {num, number} more {num, plural, one {person} other {people}}. ",
   "multiselect.numRemaining": "您还可以添加 {num, number} 位",
   "multiselect.placeholder": "搜索并添加成员",
   "navbar.addMembers": "添加成员",
@@ -1862,8 +1861,7 @@
   "post_attachment.more": "展开...",
   "post_body.commentedOn": "对 {name}{apostrophe} 的信息评论：",
   "post_body.deleted": "(消息被删除)",
-  "post_body.plusMore": "添加{count}文件",
-  "post_body.plusOne": "添加1个文件",
+  "post_body.plusMore": " plus {count, number} other {count, plural, one {file} other {files}}",
   "post_delete.notPosted": "无法发布评论",
   "post_delete.okay": "确定",
   "post_delete.someone": "有人删除了你想评论的信息。",
@@ -1880,7 +1878,7 @@
   "post_info.unpin": "从频道取消置顶",
   "post_message_view.edited": "(已编辑)",
   "posts_view.loadMore": "载入更多消息",
-  "posts_view.loadingMore": "载入更多消息",
+  "posts_view.loadingMore": "载入更多消息中...",
   "posts_view.newMsg": "新消息",
   "posts_view.newMsgBelow": "以下有 {count} 个新消息",
   "quick_switch_modal.channels": "频道",
@@ -2119,7 +2117,7 @@
   "textbox.quote": ">引用",
   "textbox.strike": "删除线",
   "tutorial_intro.allSet": "您已经创建好了",
-  "tutorial_intro.end": "点击“Next”进入{channel}。这是团队成员登录后看到的第一个频道。使用它来发布每个人需要知道的更新信息。",
+  "tutorial_intro.end": "点击“下一步”进入{channel}。这是团队成员注册后看到的第一个频道。使用它来发布每个人需要知道的更新信息。",
   "tutorial_intro.invite": "邀请团队成员",
   "tutorial_intro.mobileApps": "安装 {link} 上的应用以便随时访问和获得通知。",
   "tutorial_intro.mobileAppsLinkText": "PC, Mac, iOS 以及安卓",
@@ -2251,10 +2249,10 @@
   "user.settings.general.loginLdap": "通过 AD/LDAP ({email}) 登录",
   "user.settings.general.loginOffice365": "通过Office 365({email})登录",
   "user.settings.general.loginSaml": "通过SAML ({email}) 登录",
-  "user.settings.general.mobile.emptyName": "Click to add your full name",
-  "user.settings.general.mobile.emptyNickname": "Click to add a nickname",
-  "user.settings.general.mobile.emptyPosition": "Click to add your job title / position",
-  "user.settings.general.mobile.uploadImage": "Click to upload an image.",
+  "user.settings.general.mobile.emptyName": "点击添加您的全名",
+  "user.settings.general.mobile.emptyNickname": "点击添加一个昵称",
+  "user.settings.general.mobile.emptyPosition": "点击添加您的工作标题/职位",
+  "user.settings.general.mobile.uploadImage": "点击上传图片。",
   "user.settings.general.newAddress": "新地址：{email}<br/>查看您的邮箱来验证上面的地址。",
   "user.settings.general.newEmail": "新建邮箱地址",
   "user.settings.general.nickname": "昵称",
@@ -2439,7 +2437,7 @@
   "user_profile.webrtc.unavailable": "不能在结束当前通话前开新通话",
   "view_image.loading": "加载中 ",
   "view_image_popover.download": "下载",
-  "view_image_popover.file": "文件 {total}/{count}",
+  "view_image_popover.file": "File {count, number} of {total, number}",
   "view_image_popover.publicLink": "获取公开链接",
   "web.footer.about": "关于",
   "web.footer.help": "帮助",