From 7da4b402df79c32bcfdc8fe0264e4a406d1ad8fa Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Fri, 16 Dec 2016 17:40:22 -0300
Subject: translations PR 20161212 (#4774)

---
 i18n/zh_CN.json | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to 'i18n/zh_CN.json')

diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json
index b3e5d1310..53c382836 100644
--- a/i18n/zh_CN.json
+++ b/i18n/zh_CN.json
@@ -467,6 +467,10 @@
     "id": "api.command_collapse.name",
     "translation": "折叠"
   },
+  {
+    "id": "api.command_collapse.success",
+    "translation": "Image links now collapse by default"
+  },
   {
     "id": "api.command_echo.create.app_error",
     "translation": "不能创建 /echo 帖文，err=%v"
@@ -499,6 +503,10 @@
     "id": "api.command_expand.name",
     "translation": "展开"
   },
+  {
+    "id": "api.command_expand.success",
+    "translation": "Image links now expand by default"
+  },
   {
     "id": "api.command_expand_collapse.fail.app_error",
     "translation": "放大预览时发生了错误"
@@ -685,7 +693,7 @@
   },
   {
     "id": "api.context.invalidate_all_caches",
-    "translation": "Purging all caches"
+    "translation": "清除所有缓存"
   },
   {
     "id": "api.context.last_activity_at.error",
@@ -695,6 +703,10 @@
     "id": "api.context.log.error",
     "translation": "%v:%v code=%v rid=%v uid=%v ip=%v %v [详情: %v]"
   },
+  {
+    "id": "api.context.mfa_required.app_error",
+    "translation": "Multi-factor authentication is required on this server."
+  },
   {
     "id": "api.context.permissions.app_error",
     "translation": "您没有对应的权限"
@@ -1967,6 +1979,26 @@
     "id": "api.templates.invite_subject",
     "translation": "{{ .SenderName }} 邀请您加入 {{ .TeamDisplayName }} 团队在 {{.SiteName}}"
   },
+  {
+    "id": "api.templates.mfa_activated_body.info",
+    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.mfa_activated_body.title",
+    "translation": "Multi-factor authentication was added"
+  },
+  {
+    "id": "api.templates.mfa_change_subject",
+    "translation": "Your MFA has been updated on {{ .SiteName }}"
+  },
+  {
+    "id": "api.templates.mfa_deactivated_body.info",
+    "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.mfa_deactivated_body.title",
+    "translation": "Multi-factor authentication was removed"
+  },
   {
     "id": "api.templates.password_change_body.info",
     "translation": "您的密码已经被更新 {{.TeamDisplayName}} 在 {{ .TeamURL }} 通过 {{.Method}}.<br>如果这个变更不是由你发起的，请联系你的系统管理员."
-- 
cgit v1.2.3-1-g7c22