From 18a1599e929a41d2fe07f3962bdd2ab60dfca67c Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Tue, 20 Feb 2018 10:43:01 -0300
Subject: translations PR 20180220 (#8334)

---
 i18n/zh-CN.json | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

(limited to 'i18n/zh-CN.json')

diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index 805670169..f799bba36 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -131,10 +131,6 @@
     "id": "api.admin.upload_brand_image.too_large.app_error",
     "translation": "无法上传文件。文件太大。"
   },
-  {
-    "id": "api.api.init.parsing_templates.debug",
-    "translation": "解析服务模板 %v"
-  },
   {
     "id": "api.api.init.parsing_templates.error",
     "translation": "解析服务模板出错 %v"
@@ -2302,6 +2298,14 @@
     "id": "api.team.leave.left",
     "translation": "%v 离开了团队。"
   },
+  {
+    "id": "api.team.move_channel.post.error",
+    "translation": "发送频道作用消息失败"
+  },
+  {
+    "id": "api.team.move_channel.success",
+    "translation": "This channel has been moved to this team from %v."
+  },
   {
     "id": "api.team.permanent_delete_team.attempting.warn",
     "translation": "试图永久删除团队 %v id=%v"
@@ -3066,6 +3070,10 @@
     "id": "api.webhook.incoming.debug.error",
     "translation": "不能读取传入的webhook的负载。"
   },
+  {
+    "id": "api.webhook.incoming.error",
+    "translation": "Could not decode the multipart payload of incoming webhook."
+  },
   {
     "id": "api.webhook.init.debug",
     "translation": "正在初始化 webhook API 路由"
@@ -4874,6 +4882,10 @@
     "id": "model.config.is_valid.message_export.export_from.app_error",
     "translation": "消息导出任务 ExportFromTimestamp 必须为时间戳 (unix 时间)。只有在此时间后发送的消息会被导出。"
   },
+  {
+    "id": "model.config.is_valid.message_export.export_type.app_error",
+    "translation": "Message export job ExportFormat must be one of either 'actiance' or 'globalrelay'"
+  },
   {
     "id": "model.config.is_valid.message_export.file_location.app_error",
     "translation": "消息导出任务 FileLocation 比如为可写的目录"
@@ -4882,6 +4894,10 @@
     "id": "model.config.is_valid.message_export.file_location.relative",
     "translation": "消息导出任务 FileLocation 必须为 FileSettings.Directory 的子目录"
   },
+  {
+    "id": "model.config.is_valid.message_export.global_relay_email_address.app_error",
+    "translation": "Message export job GlobalRelayEmailAddress must be set to a valid email address"
+  },
   {
     "id": "model.config.is_valid.password_length.app_error",
     "translation": "最短密码长度必须为整数大于或等于 {{.MinLength}} 以及小于或等于 {{.MaxLength}}。"
@@ -7094,6 +7110,10 @@
     "id": "utils.mail.new_client.open.error",
     "translation": "无法打开一个SMTP服务器连接 %v"
   },
+  {
+    "id": "utils.mail.sendMail.attachments.write_error",
+    "translation": "Failed to write attachment to email"
+  },
   {
     "id": "utils.mail.send_mail.close.app_error",
     "translation": "未能关闭连接到SMTP服务器"
@@ -7162,10 +7182,6 @@
     "id": "web.create_dir.error",
     "translation": "创建目录监视器失败 %v"
   },
-  {
-    "id": "web.dir_fail.error",
-    "translation": "目录中的监视器失败 %v"
-  },
   {
     "id": "web.do_load_channel.error",
     "translation": "获取用户配置文件时出错 id=%v 强制注销"
@@ -7270,18 +7286,10 @@
     "id": "web.parsing_templates.debug",
     "translation": "解析模板 %v"
   },
-  {
-    "id": "web.parsing_templates.error",
-    "translation": "解析模板失败 %v"
-  },
   {
     "id": "web.post_permalink.app_error",
     "translation": "无效Post ID"
   },
-  {
-    "id": "web.reparse_templates.info",
-    "translation": "修改文件后重新解析模板 %v"
-  },
   {
     "id": "web.reset_password.expired_link.app_error",
     "translation": "密码重置链接已过期"
-- 
cgit v1.2.3-1-g7c22