translations PR 20180730 (#9191)

* translations PR 20180730

* Fix japanese

1 files changed, 141 insertions, 21 deletions

diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index 652e35d42..f005cdf91 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "actiance.xml.output.formatter.marshalToXml.appError",
+    "id": "actiance.export.marshalToXml.appError",
     "translation": "无法转换导出到 XML。"
   },
   {
@@ -41,7 +41,7 @@
   },
   {
     "id": "api.admin.test_email.body",
-    "translation": "<br/><br/><br/>看来你的Mattermost邮箱设置成功！"
+    "translation": "看来你的 Mattermost 邮箱设置成功了！"
   },
   {
     "id": "api.admin.test_email.missing_server",
@@ -744,7 +744,7 @@
   },
   {
     "id": "api.command_msg.permission.app_error",
-    "translation": "You don't have the appropriate permissions to direct message this user."
+    "translation": "您没有合适的权限直接发消息给该用户。"
   },
   {
     "id": "api.command_mute.desc",
@@ -1736,19 +1736,23 @@
   },
   {
     "id": "api.templates.deactivate_body.info",
-    "translation": "您已注销在 {{ .SiteURL }} 的帐号。<br>如果这不是您的操作或者您想重新激活您的帐号，请联系您的系统管理员。"
+    "translation": "您注销了 {{ .SiteURL }} 上的帐号。"
   },
   {
     "id": "api.templates.deactivate_body.title",
     "translation": "您的帐号已在 {{ .ServerURL }} 注销"
   },
   {
+    "id": "api.templates.deactivate_body.warning",
+    "translation": "If this change was not initiated by you or you want to reactivate your account, contact your system administrator."
+  },
+  {
     "id": "api.templates.deactivate_subject",
     "translation": "[{{ .SiteName }}] 您的帐号已在 {{ .ServerURL }} 注销"
   },
   {
     "id": "api.templates.email_change_body.info",
-    "translation": "您的邮箱地址从 {{.TeamDisplayName}} 修改为 {{.NewEmail}}。<br>如果您没有做过这个修改，请联系系统管理员。"
+    "translation": "您在 {{.TeamDisplayName}} 的邮件地址被更改至 {{.NewEmail}}。"
   },
   {
     "id": "api.templates.email_change_body.title",
@@ -1779,24 +1783,36 @@
     "translation": "要更改您的通知偏好设定，登录到您的团队站点后至帐号设置 > 通知。"
   },
   {
-    "id": "api.templates.email_info",
-    "translation": "有任何问题请随时给我们发送电子邮件: <a href='mailto:{{.SupportEmail}}' style='text-decoration: none; color:#2389D7;'>{{.SupportEmail}}</a>.<br>最美好的祝福,<br> {{.SiteName}} 团队<br>"
+    "id": "api.templates.email_info1",
+    "translation": "Any questions at all, mail us any time: "
+  },
+  {
+    "id": "api.templates.email_info2",
+    "translation": "Best wishes,"
+  },
+  {
+    "id": "api.templates.email_info3",
+    "translation": "{{.SiteName}} 团队"
   },
   {
     "id": "api.templates.email_organization",
     "translation": "发送人 "
   },
   {
+    "id": "api.templates.email_warning",
+    "translation": "如果您没做此更改，请联系系统管理员。"
+  },
+  {
     "id": "api.templates.invite_body.button",
     "translation": "加入团队"
   },
   {
     "id": "api.templates.invite_body.extra_info",
-    "translation": "Mattermost允许您通过电脑、电话分享消息和文件，即时查找和归档. 当你加入 <strong>{{.TeamDisplayName}}</strong>后, 你可以登录到你的新团队，并在任何时候从网络地址访问这些功能:<br/><br/><a href='{{.TeamURL}}'>{{.TeamURL}}</a>"
+    "translation": "Mattermost 允许您通过电脑、电话分享消息和文件，即时查找和归档。当你加入[[{{.TeamDisplayName}}]]后，你可以登录到你的新团队并在任何时候从网络地址访问这些功能："
   },
   {
     "id": "api.templates.invite_body.info",
-    "translation": "团队 {{.SenderStatus}} <strong>{{.SenderName}}</strong>，邀请您加入 <strong>{{.TeamDisplayName}}</strong>。"
+    "translation": "团队 {{.SenderStatus}} [[{{.SenderName}}]] 邀请您加入 [[{{.TeamDisplayName}}]]。"
   },
   {
     "id": "api.templates.invite_body.title",
@@ -1808,7 +1824,7 @@
   },
   {
     "id": "api.templates.mfa_activated_body.info",
-    "translation": "你在 {{ .SiteURL }} 的帐号已添加多重验证。<br>如果此操作不是您操作的，请联系您的系统管理员。"
+    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.mfa_activated_body.title",
@@ -1820,7 +1836,7 @@
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
-    "translation": "你在 {{ .SiteURL }} 的帐号已删除多重验证。<br>如果此操作不是您操作的，请联系您的系统管理员。"
+    "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.mfa_deactivated_body.title",
@@ -1828,7 +1844,7 @@
   },
   {
     "id": "api.templates.password_change_body.info",
-    "translation": "您的密码已经被更新 {{.TeamDisplayName}} 在 {{ .TeamURL }} 通过 {{.Method}}.<br>如果这个变更不是由你发起的，请联系你的系统管理员."
+    "translation": "Your password has been updated for {{.TeamDisplayName}} on {{ .TeamURL }} by {{.Method}}."
   },
   {
     "id": "api.templates.password_change_body.title",
@@ -1847,8 +1863,12 @@
     "translation": "重设密码"
   },
   {
-    "id": "api.templates.reset_body.info",
-    "translation": "修改您的密码, 点击 \"重设密码\" 下面.<br>如果你不打算重置您的密码，请忽略此电子邮件和您的密码将保持不变。密码重置链接在24小时内到期."
+    "id": "api.templates.reset_body.info1",
+    "translation": "如想更改您的密码，点击以下 \"重置密码\"。"
+  },
+  {
+    "id": "api.templates.reset_body.info2",
+    "translation": "如果您不想重置密码，请无视此邮件并且您的密码会不会更改。重置密码链接将在 24 小时后失效。"
   },
   {
     "id": "api.templates.reset_body.title",
@@ -1860,7 +1880,7 @@
   },
   {
     "id": "api.templates.signin_change_email.body.info",
-    "translation": "您在 {{.SiteName}} 更新了登录方式为 {{.Method}}。<br>如果这个变更不是由您发起的，请联系您的系统管理员。"
+    "translation": "你已经更新您在 {{ .SiteName }} 的登录方法到 {{.Method}}。"
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -1876,7 +1896,7 @@
   },
   {
     "id": "api.templates.user_access_token_body.info",
-    "translation": "一个个人访问令牌在 {{ .SiteURL }} 创建到了您的帐号。他们可以以您的帐号访问 {{.SiteName}}。<br>如果此操作非来自您，请联系您的系统管理员。"
+    "translation": "A personal access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account."
   },
   {
     "id": "api.templates.user_access_token_body.title",
@@ -1888,7 +1908,7 @@
   },
   {
     "id": "api.templates.username_change_body.info",
-    "translation": "您在 {{.TeamDisplayName}} 的用户名已更改为 {{.NewUsername}}。<br>如果这个变更不是由您发起的，请联系系统管理员。"
+    "translation": "您在 {{.TeamDisplayName}} 的用户名被更改至 {{.NewUsername}}。"
   },
   {
     "id": "api.templates.username_change_body.title",
@@ -2159,6 +2179,22 @@
     "translation": "不能重置SSO账户密码"
   },
   {
+    "id": "api.user.saml.app_error",
+    "translation": "无法处理 SAML 登入请求。"
+  },
+  {
+    "id": "api.user.saml.extension_id.app_error",
+    "translation": "无效的扩展 id"
+  },
+  {
+    "id": "api.user.saml.extension_unsupported",
+    "translation": "不支持扩展。"
+  },
+  {
+    "id": "api.user.saml.invalid_extension",
+    "translation": "Extension with extension_id={{.ExtensionId}} is not supported."
+  },
+  {
     "id": "api.user.saml.not_available.app_error",
     "translation": "此服务器没有正确配置或者不支持 SAML 2.0。"
   },
@@ -2395,6 +2431,14 @@
     "translation": "未找到机群 API 接口。"
   },
   {
+    "id": "app.import.attachment.bad_file.error",
+    "translation": "读取文件错误：\"{{.FilePath}}\""
+  },
+  {
+    "id": "app.import.attachment.file_upload.error",
+    "translation": "上传文件错误：\"{{.FilePath}}\""
+  },
+  {
     "id": "app.import.bulk_import.file_scan.error",
     "translation": "读取数据导入文件错误。"
   },
@@ -2636,11 +2680,11 @@
   },
   {
     "id": "app.import.validate_emoji_import_data.image_missing.error",
-    "translation": "Import emoji image field missing or blank."
+    "translation": "导入表情符图片栏为空。"
   },
   {
     "id": "app.import.validate_emoji_import_data.name_missing.error",
-    "translation": "Import emoji name field missing or blank."
+    "translation": "导入表情符名栏为空。"
   },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
@@ -2944,7 +2988,11 @@
   },
   {
     "id": "app.notification.body.text.group_message.full",
-    "translation": "频道：{{.ChannelName}}<br>@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+    "translation": "频道：{{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.group_message.full2",
+    "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
     "id": "app.notification.body.text.group_message.generic",
@@ -2952,7 +3000,11 @@
   },
   {
     "id": "app.notification.body.text.notification.full",
-    "translation": "频道：{{.ChannelName}}<br>@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+    "translation": "频道：{{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full2",
+    "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
     "id": "app.notification.body.text.notification.generic",
@@ -3011,6 +3063,10 @@
     "translation": "无法获取已启动的插件"
   },
   {
+    "id": "app.plugin.get_statuses.app_error",
+    "translation": "无法获取插件状态。"
+  },
+  {
     "id": "app.plugin.install.app_error",
     "translation": "无法安装插件。"
   },
@@ -3019,6 +3075,10 @@
     "translation": "无法安装插件。已存在相同 ID 的插件。"
   },
   {
+    "id": "app.plugin.install_id_failed_remove.app_error",
+    "translation": "Unable to install plugin. A plugin with the same ID is already installed and failed to be removed."
+  },
+  {
     "id": "app.plugin.invalid_id.app_error",
     "translation": "插件 Id 必须至少 {{.Min}} 个字符，最多 {{.Max}} 个字符并匹配 {{.Regex}}。"
   },
@@ -3159,6 +3219,10 @@
     "translation": "上传的文件因为过大而从 Global Relay 导出移除。"
   },
   {
+    "id": "ent.compliance.global_relay.open_temporary_file.appError",
+    "translation": "无法打开导出临时文件。"
+  },
+  {
     "id": "ent.compliance.licence_disable.app_error",
     "translation": "当前许可证禁用了合规功能。请联系您的系统管理员关于升级您的企业许可证。"
   },
@@ -3255,6 +3319,10 @@
     "translation": "解码搜索结果失败"
   },
   {
+    "id": "ent.elasticsearch.start.already_started.app_error",
+    "translation": "ElasticSearch 已启动"
+  },
+  {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "创建 Elasticsearch 批量处理器失败"
   },
@@ -3263,6 +3331,10 @@
     "translation": "开始 Elasticsearch 批量处理器失败"
   },
   {
+    "id": "ent.elasticsearch.stop.already_stopped.app_error",
+    "translation": "ElasticSearch 已停止"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "连接 Elasticsearch 服务器失败。"
   },
@@ -3331,6 +3403,46 @@
     "translation": "无效的 AD/LDAP 筛选器"
   },
   {
+    "id": "ent.message_export.global_relay.create_file_in_zip.app_error",
+    "translation": "无法创建 eml 文件。"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.close.app_error",
+    "translation": "无法发送邮件到 Global Relay。"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.from_address.app_error",
+    "translation": "Unable to set the email From address."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg.app_error",
+    "translation": "无法设置邮件消息。"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg_data.app_error",
+    "translation": "无法写入邮件消息。"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.parse_mail.app_error",
+    "translation": "无法读取邮件信息。"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.to_address.app_error",
+    "translation": "Unable to set the email To address."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_get_file_info.app_error",
+    "translation": "无法获取导出临时文件的信息"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_email_file.app_error",
+    "translation": "无法从临时文件获取邮件地址"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_zip_file_data.app_error",
+    "translation": "无法打开导出临时文件"
+  },
+  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "尝试验证多重验证令牌时出现错误"
   },
@@ -4299,6 +4411,10 @@
     "translation": "更新时必须是有效时间"
   },
   {
+    "id": "model.outgoing_hook.icon_url.app_error",
+    "translation": "无效的图标"
+  },
+  {
     "id": "model.outgoing_hook.is_valid.callback.app_error",
     "translation": "无效的回调网址"
   },
@@ -4355,6 +4471,10 @@
     "translation": "无效的触发关键词"
   },
   {
+    "id": "model.outgoing_hook.username.app_error",
+    "translation": "无效的用户名"
+  },
+  {
     "id": "model.plugin_command.error.app_error",
     "translation": "执行此指令时发生了错误。"
   },