From c952985ffd035f95e82fef2fbc2e8bd48ab9ec3b Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Fri, 2 Dec 2016 10:43:14 -0300
Subject: translations PR 20161128 (#4666)

---
 i18n/zh_CN.json | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

(limited to 'i18n/zh_CN.json')

diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json
index 0a40d528e..29d6596bc 100644
--- a/i18n/zh_CN.json
+++ b/i18n/zh_CN.json
@@ -822,8 +822,20 @@
     "translation": "无法创建表情符号。文件类型必须是PNG，JPEG，或GIF。"
   },
   {
-    "id": "api.emoji.upload.large_image.app_error",
-    "translation": "无法创建表情符。图片长宽不能超过128像素。"
+    "id": "api.emoji.upload.large_image.decode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to decode the image."
+  },
+  {
+    "id": "api.emoji.upload.large_image.encode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to encode the image."
+  },
+  {
+    "id": "api.emoji.upload.large_image.gif_decode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to decode the GIF image."
+  },
+  {
+    "id": "api.emoji.upload.large_image.gif_encode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to encode the GIF image."
   },
   {
     "id": "api.file.get_file.public_disabled.app_error",
@@ -1273,6 +1285,18 @@
     "id": "api.post.delete_post_files.app_error.warn",
     "translation": "删除信息的文件时遇到错误, post_id=%v, err=%v"
   },
+  {
+    "id": "api.post.disabled_all",
+    "translation": "@all has been disabled because the channel has more than {{.Users}} users."
+  },
+  {
+    "id": "api.post.disabled_channel",
+    "translation": "@channel has been disabled because the channel has more than {{.Users}} users."
+  },
+  {
+    "id": "api.post.disabled_here",
+    "translation": "@here has been disabled because the channel has more than {{.Users}} users."
+  },
   {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
@@ -1619,6 +1643,10 @@
     "id": "api.slackimport.slack_add_users.merge_existing",
     "translation": "合并用户到现有帐号：{{.Email}}, {{.Username}}\r\n"
   },
+  {
+    "id": "api.slackimport.slack_add_users.merge_existing_failed",
+    "translation": "Tried to merge user with existing account: {{.Email}}, {{.Username}}, but failed to add the user to this team.\r\n"
+  },
   {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "不能导入用户: {{.Username}}\r\n"
@@ -2739,6 +2767,14 @@
     "id": "ent.ldap.validate_filter.app_error",
     "translation": "无效的 AD/LDAP 筛选器"
   },
+  {
+    "id": "ent.metrics.starting.info",
+    "translation": "Metrics and profiling server is listening on %v"
+  },
+  {
+    "id": "ent.metrics.stopping.info",
+    "translation": "Metrics and profiling server is stopping on %v"
+  },
   {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "尝试验证多重验证令牌时出现错误"
@@ -3315,6 +3351,10 @@
     "id": "model.config.is_valid.max_file_size.app_error",
     "translation": "文件设置中最大大小无效。必须是0或者正整数。"
   },
+  {
+    "id": "model.config.is_valid.max_notify_per_channel.app_error",
+    "translation": "团队设置中频道最大用户数无效，必须是正整数。"
+  },
   {
     "id": "model.config.is_valid.max_users.app_error",
     "translation": "团队设置中每团队的最大用户数无效。必须是正整数。"
@@ -4167,6 +4207,10 @@
     "id": "store.sql_channel.save_member.save.app_error",
     "translation": "我们无法保存这个频道成员"
   },
+  {
+    "id": "store.sql_channel.search.app_error",
+    "translation": "我们无法更新这个频道"
+  },
   {
     "id": "store.sql_channel.set_last_viewed_at.app_error",
     "translation": "我们不能更新最后查看时间"
-- 
cgit v1.2.3-1-g7c22