Merge branch 'master' into advanced-permissions-phase-1

1 files changed, 13 insertions, 13 deletions

diff --git a/i18n/zh-TW.json b/i18n/zh-TW.json
index b9edc5edf..0700a15a5 100644
--- a/i18n/zh-TW.json
+++ b/i18n/zh-TW.json
@@ -1370,7 +1370,7 @@
   },
   {
     "id": "api.file.upload_file.incorrect_number_of_files.app_error",
-    "translation": "Unable to upload files. Incorrect number of files specified."
+    "translation": "無法上傳檔案。檔案數量不對。"
   },
   {
     "id": "api.file.upload_file.large_image.app_error",
@@ -1812,7 +1812,7 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": "已上傳一個或更多檔案"
+    "translation": "已上傳一個或更多檔案至"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only_dm",
@@ -2308,11 +2308,11 @@
   },
   {
     "id": "api.team.move_channel.post.error",
-    "translation": "發送頻道用途訊息失敗"
+    "translation": "發送頻道移動訊息失敗"
   },
   {
     "id": "api.team.move_channel.success",
-    "translation": "This channel has been moved to this team from %v."
+    "translation": "此頻道已從 %v 移動至此團隊。"
   },
   {
     "id": "api.team.permanent_delete_team.attempting.warn",
@@ -3080,7 +3080,7 @@
   },
   {
     "id": "api.webhook.incoming.error",
-    "translation": "Could not decode the multipart payload of incoming webhook."
+    "translation": "無法解碼 Incoming Webhook 的 multipart 內容。"
   },
   {
     "id": "api.webhook.init.debug",
@@ -3656,7 +3656,7 @@
   },
   {
     "id": "app.plugin.disabled.app_error",
-    "translation": "Plugins have been disabled. Please check your logs for details."
+    "translation": "模組已被停用。詳情請看系統紀錄。"
   },
   {
     "id": "app.plugin.extract.app_error",
@@ -4192,15 +4192,15 @@
   },
   {
     "id": "ent.migration.migratetosaml.email_already_used_by_other_user",
-    "translation": "Email already used by another SAML user."
+    "translation": "電子郵件已被其他 SAML 使用者使用。"
   },
   {
     "id": "ent.migration.migratetosaml.user_not_found_in_users_mapping_file",
-    "translation": "User not found in the users file."
+    "translation": "在使用者檔案中找不到使用者。"
   },
   {
     "id": "ent.migration.migratetosaml.username_already_used_by_other_user",
-    "translation": "Username already used by another Mattermost user."
+    "translation": "使用者名稱已被其他 Mattermost 使用者使用。 "
   },
   {
     "id": "ent.saml.attribute.app_error",
@@ -4904,7 +4904,7 @@
   },
   {
     "id": "model.config.is_valid.message_export.export_type.app_error",
-    "translation": "Message export job ExportFormat must be one of either 'actiance' or 'globalrelay'"
+    "translation": "訊息匯出工作的 ExportFormat 必須為 'actiance' 或 'globalrelay'"
   },
   {
     "id": "model.config.is_valid.message_export.file_location.app_error",
@@ -4916,7 +4916,7 @@
   },
   {
     "id": "model.config.is_valid.message_export.global_relay_email_address.app_error",
-    "translation": "Message export job GlobalRelayEmailAddress must be set to a valid email address"
+    "translation": "訊息匯出工作的 GlobalRelayEmailAddress 必須為 'actiance' 或 'globalrelay'"
   },
   {
     "id": "model.config.is_valid.password_length.app_error",
@@ -5048,7 +5048,7 @@
   },
   {
     "id": "model.config.is_valid.websocket_url.app_error",
-    "translation": "WebRTC 閘道 Websocket 網址必須是以 ws:// 或 wss:// 起始的有效網址。"
+    "translation": "Websocket 網址必須是以 ws:// 或 wss:// 起始的有效網址。"
   },
   {
     "id": "model.config.is_valid.write_timeout.app_error",
@@ -7136,7 +7136,7 @@
   },
   {
     "id": "utils.mail.sendMail.attachments.write_error",
-    "translation": "Failed to write attachment to email"
+    "translation": "無法寫入附加檔案到電子郵件"
   },
   {
     "id": "utils.mail.send_mail.close.app_error",