From 445a356d0dc958a8fb72fd9835816302260595a2 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Mon, 12 Feb 2018 23:08:38 +0000
Subject: translations PR 20180212

---
 i18n/zh-CN.json | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

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

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
@@ -2202,10 +2202,6 @@
     "id": "api.team.create_team_from_signup.expired_link.app_error",
     "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无效。请尝试其他。"
@@ -2710,6 +2706,10 @@
     "id": "api.user.create_user.signup_link_invalid.app_error",
     "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": "无效团队名称"
@@ -4758,6 +4758,10 @@
     "id": "model.config.is_valid.file_thumb_width.app_error",
     "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": "无效的图片代理类型服务设定。"
@@ -7290,10 +7294,6 @@
     "id": "web.root.singup_title",
     "translation": "注册"
   },
-  {
-    "id": "web.signup_team_complete.invalid_link.app_error",
-    "translation": "注册链接无效"
-  },
   {
     "id": "web.signup_team_complete.link_expired.app_error",
     "translation": "注册链接已过期"
@@ -7310,10 +7310,6 @@
     "id": "web.signup_user_complete.link_expired.app_error",
     "translation": "注册链接已过期"
   },
-  {
-    "id": "web.signup_user_complete.link_invalid.app_error",
-    "translation": "注册链接无效"
-  },
   {
     "id": "web.signup_user_complete.no_invites.app_error",
     "translation": "团队类型不允许公开邀请"
-- 
cgit v1.2.3-1-g7c22