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

1 files changed, 41 insertions, 33 deletions

diff --git a/i18n/zh-TW.json b/i18n/zh-TW.json
index a7387d88f..292b05879 100644
--- a/i18n/zh-TW.json
+++ b/i18n/zh-TW.json
@@ -132,10 +132,6 @@
     "translation": "無法上傳檔案。檔案過大。"
   },
   {
-    "id": "api.api.init.parsing_templates.debug",
-    "translation": "解析伺服器樣版：%v"
-  },
-  {
     "id": "api.api.init.parsing_templates.error",
     "translation": "解析伺服器樣板 %v 失敗"
   },
@@ -2203,10 +2199,6 @@
     "translation": "註冊連結已過期"
   },
   {
-    "id": "api.team.create_team_from_signup.invalid_link.app_error",
-    "translation": "此註冊連結不是有效連結"
-  },
-  {
     "id": "api.team.create_team_from_signup.unavailable.app_error",
     "translation": "這個網址不存在。請嘗試其他的。"
   },
@@ -2307,6 +2299,14 @@
     "translation": "%v 已離開團隊。 "
   },
   {
+    "id": "api.team.move_channel.post.error",
+    "translation": "發送頻道用途訊息失敗"
+  },
+  {
+    "id": "api.team.move_channel.success",
+    "translation": "This channel has been moved to this team from %v."
+  },
+  {
     "id": "api.team.permanent_delete_team.attempting.warn",
     "translation": "正在嘗試永久刪除團隊 %v id=%v"
   },
@@ -2711,6 +2711,10 @@
     "translation": "此註冊連結不是有效連結"
   },
   {
+    "id": "api.user.create_user.signup_link_mismatched_invite_id.app_error",
+    "translation": "此註冊連結不是有效連結"
+  },
+  {
     "id": "api.user.create_user.team_name.app_error",
     "translation": "無效的團隊名稱"
   },
@@ -3067,6 +3071,10 @@
     "translation": "無法讀取傳入的 Webhook 的內容。"
   },
   {
+    "id": "api.webhook.incoming.error",
+    "translation": "Could not decode the multipart payload of incoming webhook."
+  },
+  {
     "id": "api.webhook.init.debug",
     "translation": "正在初始化 Webhook API 路徑"
   },
@@ -3564,7 +3572,7 @@
   },
   {
     "id": "app.import.validate_user_import_data.profile_image.error",
-    "translation": "Invalid profile image."
+    "translation": "無效的個人頭像。"
   },
   {
     "id": "app.import.validate_user_import_data.roles_invalid.error",
@@ -3691,6 +3699,10 @@
     "translation": "模組 跟/或 上傳模組已被停用。"
   },
   {
+    "id": "app.team.join_user_to_team.max_accounts.app_error",
+    "translation": "此團隊已達最大使用者數量上限。請聯絡系統管理員調大數量限制。"
+  },
+  {
     "id": "app.user_access_token.disabled",
     "translation": "個人存取 Token 在此伺服器被停用。詳情請洽管理員。"
   },
@@ -4644,7 +4656,7 @@
   },
   {
     "id": "model.config.is_valid.atmos_camo_image_proxy_options.app_error",
-    "translation": "Invalid atmos/camo image proxy options for service settings. Must be set to your shared key."
+    "translation": "服務設定中的 atmos/camo 圖片代理無效。必須設定為分享金鑰。"
   },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
@@ -4759,8 +4771,12 @@
     "translation": "檔案設定中縮圖寬度無效。必須為正數。"
   },
   {
+    "id": "model.config.is_valid.group_unread_channels.app_error",
+    "translation": "服務設定中的未讀頻道分組無效。必須為 'disabled' 、 'default_on' 或 'default_off'。"
+  },
+  {
     "id": "model.config.is_valid.image_proxy_type.app_error",
-    "translation": "Invalid image proxy type for service settings."
+    "translation": "服務設定中的圖片代理類型無效。"
   },
   {
     "id": "model.config.is_valid.ldap_basedn",
@@ -4867,6 +4883,10 @@
     "translation": "匯出訊息工作 ExportFromTimestamp 設定必須為時間戳記 (以 Unix Epoch 以來的秒數表示)。只有在此時間戳記之後發送的訊息會被匯出。"
   },
   {
+    "id": "model.config.is_valid.message_export.export_type.app_error",
+    "translation": "Message export job ExportFormat must be one of either 'actiance' or 'globalrelay'"
+  },
+  {
     "id": "model.config.is_valid.message_export.file_location.app_error",
     "translation": "匯出訊息工作 FileLocation 設定必須為可寫入的目錄，匯出資料將寫入此處"
   },
@@ -4875,6 +4895,10 @@
     "translation": "匯出訊息工作 FileLocation 設定必須為 FileSettings.Directory 的子目錄"
   },
   {
+    "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"
+  },
+  {
     "id": "model.config.is_valid.password_length.app_error",
     "translation": "密碼最小長度必須是一個整數且大於或等於{{.MinLength}}同時小於或等於{{.MaxLength}}。"
   },
@@ -5404,7 +5428,7 @@
   },
   {
     "id": "model.user.is_valid.position.app_error",
-    "translation": "無效的位置：不能超過35個字元。"
+    "translation": "無效的位置：不能超過128個字元。"
   },
   {
     "id": "model.user.is_valid.pwd.app_error",
@@ -6848,7 +6872,7 @@
   },
   {
     "id": "store.sql_user_access_token.get_all.app_error",
-    "translation": "無法取得個人存取 Token"
+    "translation": "無法取得全部的個人存取 Token"
   },
   {
     "id": "store.sql_user_access_token.get_by_token.app_error",
@@ -7087,6 +7111,10 @@
     "translation": "開啟對 SMTP 伺服器 %v 的連線時失敗"
   },
   {
+    "id": "utils.mail.sendMail.attachments.write_error",
+    "translation": "Failed to write attachment to email"
+  },
+  {
     "id": "utils.mail.send_mail.close.app_error",
     "translation": "關閉對 SMTP 伺服器的連線失敗"
   },
@@ -7155,10 +7183,6 @@
     "translation": "建立目錄監控 %v 失敗"
   },
   {
-    "id": "web.dir_fail.error",
-    "translation": "建立目錄監控 %v 失敗"
-  },
-  {
     "id": "web.do_load_channel.error",
     "translation": "取得使用者 id=%v 資訊時遇到錯誤，強制登出"
   },
@@ -7263,18 +7287,10 @@
     "translation": "於 %v 解析樣板"
   },
   {
-    "id": "web.parsing_templates.error",
-    "translation": "解析樣板 %v 失敗"
-  },
-  {
     "id": "web.post_permalink.app_error",
     "translation": "無效的張貼 ID"
   },
   {
-    "id": "web.reparse_templates.info",
-    "translation": "因檔案 %v 變動因此重新解析樣板"
-  },
-  {
     "id": "web.reset_password.expired_link.app_error",
     "translation": "密碼重設連結已過期"
   },
@@ -7291,10 +7307,6 @@
     "translation": "註冊"
   },
   {
-    "id": "web.signup_team_complete.invalid_link.app_error",
-    "translation": "此註冊連結不是有效連結"
-  },
-  {
     "id": "web.signup_team_complete.link_expired.app_error",
     "translation": "註冊連結已過期"
   },
@@ -7311,10 +7323,6 @@
     "translation": "註冊連結已過期"
   },
   {
-    "id": "web.signup_user_complete.link_invalid.app_error",
-    "translation": "此註冊連結不是有效連結"
-  },
-  {
     "id": "web.signup_user_complete.no_invites.app_error",
     "translation": "此團隊類型不允許自由加入"
   },