From 43483805eabcb36ef9018f12a82a6d3ac055baf5 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Wed, 15 Aug 2018 05:09:26 -0300
Subject: translations PR 20180813 (#9252)

* translations PR 20180813

* Fix french translation
---
 i18n/zh-CN.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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

diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index 1cd8fb9d7..9168481da 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -91,10 +91,6 @@
     "id": "api.channel.add_user.to.channel.failed.deleted.app_error",
     "translation": "无法将用户添加到频道，因为用户已从团队中移除。"
   },
-  {
-    "id": "api.channel.add_user_to_channel.deleted.app_error",
-    "translation": "该频道已归档或者被删除"
-  },
   {
     "id": "api.channel.add_user_to_channel.type.app_error",
     "translation": "不能添加用户到该频道类型"
@@ -163,10 +159,6 @@
     "id": "api.channel.delete_channel.type.invalid",
     "translation": "无法删除私信或组消息频道"
   },
-  {
-    "id": "api.channel.join_channel.already_deleted.app_error",
-    "translation": "频道已被删除"
-  },
   {
     "id": "api.channel.join_channel.permissions.app_error",
     "translation": "您没有对应的权限"
@@ -1444,7 +1436,7 @@
   },
   {
     "id": "api.reaction.town_square_read_only",
-    "translation": "Reacting to posts is not possible in read-only channels."
+    "translation": "只读频道无法发反应。"
   },
   {
     "id": "api.roles.patch_roles.license.error",
@@ -3118,6 +3110,10 @@
     "id": "app.schemes.is_phase_2_migration_completed.not_completed.app_error",
     "translation": "API 无法访问因为需要的数据转移未完成。"
   },
+  {
+    "id": "app.system_install_date.parse_int.app_error",
+    "translation": "解析安装日期失败"
+  },
   {
     "id": "app.team.join_user_to_team.max_accounts.app_error",
     "translation": "这个团队已经达到允许的最大帐号数量。请与系统管理员联系以设置更高的限制。"
@@ -5962,6 +5958,10 @@
     "id": "store.sql_user.get_sysadmin_profiles.app_error",
     "translation": "我们查找用户配置文件遇到了一个错误"
   },
+  {
+    "id": "store.sql_user.get_system_install_date.app_error",
+    "translation": "无法按照首个用户创建日期判断系统日期。"
+  },
   {
     "id": "store.sql_user.get_total_users_count.app_error",
     "translation": "我们无法计算用户数"
-- 
cgit v1.2.3-1-g7c22