summaryrefslogtreecommitdiffstats
path: root/i18n/zh-CN.json
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2018-01-23 15:07:31 -0500
committerHarrison Healey <harrisonmhealey@gmail.com>2018-01-23 15:07:31 -0500
commit195ad5620402f1a3239e75ef140e64c3731abf29 (patch)
tree611c43ec55391747333c0bf62e67090861f2a183 /i18n/zh-CN.json
parent3dad6320432c1cbeb032b57619ba78f29433dce3 (diff)
parent2bdd44cce9dc922959dcf51d329a0039eba8debd (diff)
downloadchat-195ad5620402f1a3239e75ef140e64c3731abf29.tar.gz
chat-195ad5620402f1a3239e75ef140e64c3731abf29.tar.bz2
chat-195ad5620402f1a3239e75ef140e64c3731abf29.zip
Merge branch 'release-4.6'
Diffstat (limited to 'i18n/zh-CN.json')
-rw-r--r--i18n/zh-CN.json14
1 files changed, 13 insertions, 1 deletions
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,10 +1421,14 @@
"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 路由"
},
@@ -4975,6 +4979,10 @@
"translation": "无效的标题"
},
{
+ "id": "model.incoming_hook.icon_url.app_error",
+ "translation": "无效消息图标"
+ },
+ {
"id": "model.incoming_hook.id.app_error",
"translation": "无效Id"
},
@@ -4991,6 +4999,10 @@
"translation": "无效用户id"
},
{
+ "id": "model.incoming_hook.username.app_error",
+ "translation": "无效用户名"
+ },
+ {
"id": "model.job.is_valid.create_at.app_error",
"translation": "创建于必须为有效时间"
},