From 58defb7424773c75718f0173f4ace702cffa4f0e Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Fri, 12 Jan 2018 16:08:34 -0300
Subject: translations PR 20180109 (#8069)

* translations PR 20180109

* Fix french translation
---
 i18n/zh-CN.json | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

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

diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index f772c34d4..dec0da464 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -1421,9 +1421,13 @@
     "translation": "设置电子邮件验证失败 err=%v"
   },
   {
-    "id": "api.incoming_webhook.disabled.app_errror",
+    "id": "api.incoming_webhook.disabled.app_error",
     "translation": "传入的 webhooks 已被系统管理员禁用。"
   },
+  {
+    "id": "api.incoming_webhook.invalid_username.app_error",
+    "translation": "无效用户名。"
+  },
   {
     "id": "api.ldap.init.debug",
     "translation": "正在初始化LDAP API 路由"
@@ -4974,6 +4978,10 @@
     "id": "model.incoming_hook.display_name.app_error",
     "translation": "无效的标题"
   },
+  {
+    "id": "model.incoming_hook.icon_url.app_error",
+    "translation": "无效消息图标"
+  },
   {
     "id": "model.incoming_hook.id.app_error",
     "translation": "无效Id"
@@ -4990,6 +4998,10 @@
     "id": "model.incoming_hook.user_id.app_error",
     "translation": "无效用户id"
   },
+  {
+    "id": "model.incoming_hook.username.app_error",
+    "translation": "无效用户名"
+  },
   {
     "id": "model.job.is_valid.create_at.app_error",
     "translation": "创建于必须为有效时间"
-- 
cgit v1.2.3-1-g7c22