From f1be975d7ab17a7da89ddb3cf6fea2c1b282a89e Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Thu, 20 Sep 2018 11:53:10 -0300
Subject: translations PR 20180917 (#9428)

---
 i18n/zh-CN.json | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)

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

diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index d824538cf..4df8354ea 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -1024,6 +1024,10 @@
     "id": "api.emoji.upload.large_image.gif_encode_error",
     "translation": "无法创建表情符。编码 GIF 图片时遇到错误。"
   },
+  {
+    "id": "api.emoji.upload.large_image.too_large.app_error",
+    "translation": "Unable to create emoji. Image must be smaller than {{.MaxWidth}} by {{.MaxHeight}}."
+  },
   {
     "id": "api.emoji.upload.open.app_error",
     "translation": "无法创建表情符。尝试打开图片时遇到错误。"
@@ -2446,6 +2450,14 @@
     "id": "app.cluster.404.app_error",
     "translation": "未找到机群 API 接口。"
   },
+  {
+    "id": "app.export.export_write_line.io_writer.error",
+    "translation": "An error occurred writing the export data."
+  },
+  {
+    "id": "app.export.export_write_line.json_marshall.error",
+    "translation": "An error occured marshalling the JSON data for export."
+  },
   {
     "id": "app.import.attachment.bad_file.error",
     "translation": "读取文件错误：\"{{.FilePath}}\""
@@ -4902,10 +4914,34 @@
     "id": "store.sql_channel.permanent_delete.app_error",
     "translation": "我们无法删除这个频道"
   },
+  {
+    "id": "store.sql_channel.permanent_delete.commit_transaction.app_error",
+    "translation": "Unable to commit transaction"
+  },
+  {
+    "id": "store.sql_channel.permanent_delete.delete_public_channel.app_error",
+    "translation": "Unable to delete materialized public channel"
+  },
+  {
+    "id": "store.sql_channel.permanent_delete.open_transaction.app_error",
+    "translation": "Unable to open transaction"
+  },
   {
     "id": "store.sql_channel.permanent_delete_by_team.app_error",
     "translation": "我们无法删除频道"
   },
+  {
+    "id": "store.sql_channel.permanent_delete_by_team.commit_transaction.app_error",
+    "translation": "Unable to commit transaction"
+  },
+  {
+    "id": "store.sql_channel.permanent_delete_by_team.delete_public_channels.app_error",
+    "translation": "Unable to delete materialized public channels"
+  },
+  {
+    "id": "store.sql_channel.permanent_delete_by_team.open_transaction.app_error",
+    "translation": "Unable to open transaction"
+  },
   {
     "id": "store.sql_channel.permanent_delete_members_by_user.app_error",
     "translation": "我们无法删除频道成员"
@@ -4922,10 +4958,26 @@
     "id": "store.sql_channel.reset_all_channel_schemes.app_error",
     "translation": "我们无法重置频道方案"
   },
+  {
+    "id": "store.sql_channel.reset_all_channel_schemes.commit_transaction.app_error",
+    "translation": "Unable to commit transaction"
+  },
+  {
+    "id": "store.sql_channel.reset_all_channel_schemes.open_transaction.app_error",
+    "translation": "Unable to open transaction"
+  },
   {
     "id": "store.sql_channel.reset_last_post_at.app_error",
     "translation": "我们无法重置频道最近消息日期"
   },
+  {
+    "id": "store.sql_channel.reset_last_post_at.commit_transaction.app_error",
+    "translation": "Unable to commit transaction"
+  },
+  {
+    "id": "store.sql_channel.reset_last_post_at.open_transaction.app_error",
+    "translation": "Unable to open transaction"
+  },
   {
     "id": "store.sql_channel.save.archived_channel.app_error",
     "translation": "您不能更改已归档的频道"
@@ -4942,6 +4994,10 @@
     "id": "store.sql_channel.save.open_transaction.app_error",
     "translation": "不能打开事务"
   },
+  {
+    "id": "store.sql_channel.save.upsert_public_channel.app_error",
+    "translation": "Unable to upsert materialized public channel"
+  },
   {
     "id": "store.sql_channel.save_channel.current_count.app_error",
     "translation": "获取当前频道数失败"
@@ -5002,6 +5058,18 @@
     "id": "store.sql_channel.search.app_error",
     "translation": "我们搜索频道时遇到错误"
   },
+  {
+    "id": "store.sql_channel.set_delete_at.commit_transaction.app_error",
+    "translation": "Unable to commit transaction"
+  },
+  {
+    "id": "store.sql_channel.set_delete_at.open_transaction.app_error",
+    "translation": "Unable to open transaction"
+  },
+  {
+    "id": "store.sql_channel.set_delete_at.update_public_channel.app_error",
+    "translation": "Unable to update the materialized public channel"
+  },
   {
     "id": "store.sql_channel.update.app_error",
     "translation": "我们无法更新这个频道"
@@ -5010,10 +5078,18 @@
     "id": "store.sql_channel.update.archived_channel.app_error",
     "translation": "您不能更改已归档的频道"
   },
+  {
+    "id": "store.sql_channel.update.commit_transaction.app_error",
+    "translation": "Unable to commit transaction"
+  },
   {
     "id": "store.sql_channel.update.exists.app_error",
     "translation": "已存在使用该识别名的频道"
   },
+  {
+    "id": "store.sql_channel.update.open_transaction.app_error",
+    "translation": "Unable to open transaction"
+  },
   {
     "id": "store.sql_channel.update.previously.app_error",
     "translation": "先前已创建过使用该识别名的频道"
@@ -5022,6 +5098,10 @@
     "id": "store.sql_channel.update.updating.app_error",
     "translation": "我们无法更新这个频道"
   },
+  {
+    "id": "store.sql_channel.update.upsert_public_channel.app_error",
+    "translation": "Unable to upsert materialized public channel"
+  },
   {
     "id": "store.sql_channel.update_last_viewed_at.app_error",
     "translation": "我们不能更新最后查看时间"
-- 
cgit v1.2.3-1-g7c22