diff options
| author | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-14 00:50:23 -0500 |
|---|---|---|
| committer | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-14 00:50:23 -0500 |
| commit | 2fa49a41f7d1dfb8cb7a45ff1a48fdd350e9e158 (patch) | |
| tree | 50ac47b0fd1343f86a3d6f7d170a78bf2bc6bd8c /i18n/zh-CN.json | |
| parent | 50b648156c22e00e994976fb0d7a31428e36189e (diff) | |
| parent | 445a356d0dc958a8fb72fd9835816302260595a2 (diff) | |
| download | chat-2fa49a41f7d1dfb8cb7a45ff1a48fdd350e9e158.tar.gz chat-2fa49a41f7d1dfb8cb7a45ff1a48fdd350e9e158.tar.bz2 chat-2fa49a41f7d1dfb8cb7a45ff1a48fdd350e9e158.zip | |
Merge branch 'translations-20180212' into release-4.7
Diffstat (limited to 'i18n/zh-CN.json')
| -rw-r--r-- | i18n/zh-CN.json | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json index fb484b50d..9186f936e 100644 --- a/i18n/zh-CN.json +++ b/i18n/zh-CN.json @@ -2203,10 +2203,6 @@ "translation": "注册链接已过期" }, { - "id": "api.team.create_team_from_signup.invalid_link.app_error", - "translation": "注册链接无效" - }, - { "id": "api.team.create_team_from_signup.unavailable.app_error", "translation": "该URL无效。请尝试其他。" }, @@ -2711,6 +2707,10 @@ "translation": "注册链接无效" }, { + "id": "api.user.create_user.signup_link_mismatched_invite_id.app_error", + "translation": "The signup link does not appear to be valid" + }, + { "id": "api.user.create_user.team_name.app_error", "translation": "无效团队名称" }, @@ -4759,6 +4759,10 @@ "translation": "文件设置时缩略图宽度无效。必须是正数。" }, { + "id": "model.config.is_valid.group_unread_channels.app_error", + "translation": "Invalid group unread channels for service settings. Must be 'disabled', 'default_on', or 'default_off'." + }, + { "id": "model.config.is_valid.image_proxy_type.app_error", "translation": "无效的图片代理类型服务设定。" }, @@ -7291,10 +7295,6 @@ "translation": "注册" }, { - "id": "web.signup_team_complete.invalid_link.app_error", - "translation": "注册链接无效" - }, - { "id": "web.signup_team_complete.link_expired.app_error", "translation": "注册链接已过期" }, @@ -7311,10 +7311,6 @@ "translation": "注册链接已过期" }, { - "id": "web.signup_user_complete.link_invalid.app_error", - "translation": "注册链接无效" - }, - { "id": "web.signup_user_complete.no_invites.app_error", "translation": "团队类型不允许公开邀请" }, |