summaryrefslogtreecommitdiffstats
path: root/i18n/zh-TW.json
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2017-11-09 14:42:26 -0800
committerChristopher Speller <crspeller@gmail.com>2017-11-09 14:42:26 -0800
commit50dc39751358b32837011aa938f481233fd781f4 (patch)
tree9201aab8326329b6f739cb6a66e40ceb3faf28c8 /i18n/zh-TW.json
parent10c5a927cb619f1aa2a599cbe3667820f4766bda (diff)
parent120fbed0f7715506cee8d2ba90f445eefcb072d7 (diff)
downloadchat-50dc39751358b32837011aa938f481233fd781f4.tar.gz
chat-50dc39751358b32837011aa938f481233fd781f4.tar.bz2
chat-50dc39751358b32837011aa938f481233fd781f4.zip
Merge branch 'release-4.4'
Diffstat (limited to 'i18n/zh-TW.json')
-rw-r--r--i18n/zh-TW.json6
1 files changed, 5 insertions, 1 deletions
diff --git a/i18n/zh-TW.json b/i18n/zh-TW.json
index 388323044..c293cc1c9 100644
--- a/i18n/zh-TW.json
+++ b/i18n/zh-TW.json
@@ -2164,6 +2164,10 @@
"translation": "要求中的 'file' 欄位沒有檔案"
},
{
+ "id": "api.team.import_team.no_import_from.app_error",
+ "translation": "要求格式錯誤:沒有檔案大小欄位。"
+ },
+ {
"id": "api.team.import_team.open.app_error",
"translation": "無法開啟檔案"
},
@@ -2800,7 +2804,7 @@
"translation": "歡迎電子郵件傳送失敗"
},
{
- "id": "api.user.update_active.no_deactivate_ldap.app_error",
+ "id": "api.user.update_active.no_deactivate_sso.app_error",
"translation": "不能變更 AD/LDAP 帳號的啟用狀態。請變更 AD/LDAP 伺服器上對應的帳號狀態。"
},
{