translations PR 20180430 (#8696)

1 files changed, 14 insertions, 10 deletions

diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index 5d017b81b..dc0042cbf 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -217,11 +217,11 @@
   },
   {
     "id": "api.channel.convert_channel_to_private.default_channel_error",
-    "translation": "This default channel cannot be converted into a private channel."
+    "translation": "默认频道无法转换成私有频道。"
   },
   {
     "id": "api.channel.convert_channel_to_private.private_channel_error",
-    "translation": "The channel requested to convert is already a private channel."
+    "translation": "请求转换的频道已经是私有频道。"
   },
   {
     "id": "api.channel.create_channel.direct_channel.app_error",
@@ -2435,6 +2435,10 @@
     "translation": "永久删除团队 %v id=%v"
   },
   {
+    "id": "api.team.remove_team_icon.get_team.app_error",
+    "translation": "An error occurred getting the team"
+  },
+  {
     "id": "api.team.remove_user_from_team.missing.app_error",
     "translation": "此用户似乎不属于此团队。"
   },
@@ -2491,6 +2495,10 @@
     "translation": "使用电子邮件注册团队被禁用。"
   },
   {
+    "id": "api.team.team_icon.update.app_error",
+    "translation": "An error occurred updating the team icon"
+  },
+  {
     "id": "api.team.update_member_roles.not_a_member",
     "translation": "指定的用户不属于指定的团队。"
   },
@@ -4691,6 +4699,10 @@
     "translation": "无效用户 id"
   },
   {
+    "id": "model.client.command.parse.app_error",
+    "translation": "无法解析传入数据"
+  },
+  {
     "id": "model.client.connecting.app_error",
     "translation": "在连接到服务器时，我们遇到了一个错误"
   },
@@ -5771,10 +5783,6 @@
     "translation": "关闭 SqlStore"
   },
   {
-    "id": "store.sql.column_exists.critical",
-    "translation": "未能检查列是否存在 %v"
-  },
-  {
     "id": "store.sql.column_exists_missing_driver.critical",
     "translation": "未能检查因为缺少驱动程序列是否存在"
   },
@@ -5863,10 +5871,6 @@
     "translation": "未能获得列的数据类型 %s 从表 %s: %v"
   },
   {
-    "id": "store.sql.table_exists.critical",
-    "translation": "未能检查表是否存在 %v"
-  },
-  {
     "id": "store.sql.too_short_ciphertext",
     "translation": "密文太短"
   },