From caf9c2409935124db85daf5b04d61b7a663ebfc8 Mon Sep 17 00:00:00 2001
From: Chris <ccbrown112@gmail.com>
Date: Tue, 13 Mar 2018 11:03:12 -0500
Subject: MM-9688: Better error message for plugin enabling in HA mode (#8433)

* better error message for plugin enabling in HA mode

* wording update
---
 i18n/en.json | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'i18n')

diff --git a/i18n/en.json b/i18n/en.json
index ed4d9dcf6..900b55170 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3706,6 +3706,10 @@
     "id": "app.plugin.config.app_error",
     "translation": "Error saving plugin state in config"
   },
+  {
+    "id": "app.plugin.cluster.save_config.app_error",
+    "translation": "The plugin configuration in your config.json file must be updated manually when using ReadOnlyConfig with clustering enabled."
+  },
   {
     "id": "app.plugin.deactivate.app_error",
     "translation": "Unable to deactivate plugin"
-- 
cgit v1.2.3-1-g7c22


From ddc6d49d804505fe8e96e14c7dd00d8964fd726b Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Wed, 14 Mar 2018 20:30:54 +0200
Subject: translations PR 20180314 (#8458)

---
 i18n/de.json    | 34 +++++++++++++++++-----------------
 i18n/it.json    |  2 +-
 i18n/ko.json    | 56 ++++++++++++++++++++++++++++----------------------------
 i18n/nl.json    |  2 +-
 i18n/pt-BR.json | 22 +++++++++++-----------
 i18n/zh-CN.json | 10 +++++-----
 i18n/zh-TW.json | 26 +++++++++++++-------------
 7 files changed, 76 insertions(+), 76 deletions(-)

(limited to 'i18n')

diff --git a/i18n/de.json b/i18n/de.json
index 35355919c..2a7952315 100644
--- a/i18n/de.json
+++ b/i18n/de.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": "Konnte Dateien nicht hochladen. Falsche Anzahl von Dateien spezifiziert."
   },
   {
     "id": "api.file.upload_file.large_image.app_error",
@@ -1618,7 +1618,7 @@
   },
   {
     "id": "api.oauth.singup_with_oauth.expired_link.app_error",
-    "translation": "Der Registrierungs-Link ist abgelaufen"
+    "translation": "Der Registrierungslink ist abgelaufen"
   },
   {
     "id": "api.oauth.singup_with_oauth.invalid_link.app_error",
@@ -1812,15 +1812,15 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " Eine oder mehrere Dateien hochgeladen in "
+    "translation": " hat eine oder mehrere Dateien hochgeladen in "
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only_dm",
-    "translation": " Eine oder mehrere Dateien in einer Direktnachricht hochgeladen"
+    "translation": " hat eine oder mehrere Dateien in einer Direktnachricht hochgeladen"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only_no_channel",
-    "translation": " Eine oder mehrere Dateien hochgeladen in "
+    "translation": " hat eine oder mehrere Dateien hochgeladen"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_in",
@@ -2308,11 +2308,11 @@
   },
   {
     "id": "api.team.move_channel.post.error",
-    "translation": "Fehler beim Senden des Kanalzwecks"
+    "translation": "Fehler beim Senden der Nachricht zur Verschiebung des Kanals."
   },
   {
     "id": "api.team.move_channel.success",
-    "translation": "This channel has been moved to this team from %v."
+    "translation": "Dieser Kanal wurde von %v in dieses Team verschoben."
   },
   {
     "id": "api.team.permanent_delete_team.attempting.warn",
@@ -2720,7 +2720,7 @@
   },
   {
     "id": "api.user.create_user.signup_link_mismatched_invite_id.app_error",
-    "translation": "Der Einladungslink scheint nicht gültig zu sein"
+    "translation": "Der Registrierungslink scheint nicht gültig zu sein"
   },
   {
     "id": "api.user.create_user.team_name.app_error",
@@ -3080,7 +3080,7 @@
   },
   {
     "id": "api.webhook.incoming.error",
-    "translation": "Could not decode the multipart payload of incoming webhook."
+    "translation": "Konnte die Multipart-Daten des eingehenden Webhooks nicht entschlüsseln."
   },
   {
     "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": "Plugins wurden deaktiviert. Bitte prüfen Sie Ihre Logs für Details."
   },
   {
     "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": "E-Mail-Adresse wird bereits von einem anderen SAML-Benutzer verwendet."
   },
   {
     "id": "ent.migration.migratetosaml.user_not_found_in_users_mapping_file",
-    "translation": "User not found in the users file."
+    "translation": "Benutzer nicht in der Benutzerdatei gefunden."
   },
   {
     "id": "ent.migration.migratetosaml.username_already_used_by_other_user",
-    "translation": "Username already used by another Mattermost user."
+    "translation": "Benutzername wird bereits von einem anderen Mattermost-Benutzer verwendet."
   },
   {
     "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' des Nachrichten-Export-Jobs muss 'actiance' oder 'globalrelay' sein."
   },
   {
     "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": "Nachrichten-Export-Job GlobalRelayEmailAddress muss eine gültige E-Mail-Adresse sein."
   },
   {
     "id": "model.config.is_valid.password_length.app_error",
@@ -5048,7 +5048,7 @@
   },
   {
     "id": "model.config.is_valid.websocket_url.app_error",
-    "translation": "Die WebRTC-Gateway-Websocket-URL muss gesetzt und eine gültige URL sein sowie mit ws:// oder wss:// beginnen."
+    "translation": "Websocket-URL muss eine gültige URL sein sowie mit ws:// oder wss:// beginnen."
   },
   {
     "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": "Fehler beim Hinzufügen des Mailanhanges"
   },
   {
     "id": "utils.mail.send_mail.close.app_error",
diff --git a/i18n/it.json b/i18n/it.json
index 0918ececa..5cb1c8a85 100644
--- a/i18n/it.json
+++ b/i18n/it.json
@@ -3636,7 +3636,7 @@
   },
   {
     "id": "app.notification.subject.direct.full",
-    "translation": "[{{.SubjectText}}] Nuovo messaggio diretto da {{.SenderDisplayName}} il {{.Day}}/{{.Month}}/{{.Year}}"
+    "translation": "[{{.SiteName}}] Nuovo messaggio diretto da {{.SenderDisplayName}} il {{.Day}}/{{.Month}}/{{.Year}}"
   },
   {
     "id": "app.notification.subject.notification.full",
diff --git a/i18n/ko.json b/i18n/ko.json
index 79edba95c..13ba19b79 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -101,7 +101,7 @@
   },
   {
     "id": "api.admin.test_email.reenter_password",
-    "translation": "SMTP 서버, 포트, 사용자 정보가 변경되었습니다. SMTP 비밀번호를 다시 입력해주세요."
+    "translation": "SMTP 서버, 포트 또는 사용자이름이 변경되었습니다. SMTP 비밀번호를 다시 입력해주세요."
   },
   {
     "id": "api.admin.test_email.subject",
@@ -141,7 +141,7 @@
   },
   {
     "id": "api.auth.unable_to_get_user.app_error",
-    "translation": "권한을 확인하기 위한 유저 정보를 가져올 수 없습니다."
+    "translation": "권한을 확인하기 위한 사용자 정보를 가져올 수 없습니다."
   },
   {
     "id": "api.brand.init.debug",
@@ -197,11 +197,11 @@
   },
   {
     "id": "api.channel.change_channel_privacy.private_to_public",
-    "translation": "This channel has been converted to a Public Channel and can be joined by any team member."
+    "translation": "이 채널은 공개 채널로 전환되어 모든 팀원이 들어올 수 있습니다."
   },
   {
     "id": "api.channel.change_channel_privacy.public_to_private",
-    "translation": "This channel has been converted to a Private Channel."
+    "translation": "이 채널은 비공개 채널로  변경되었습니다."
   },
   {
     "id": "api.channel.create_channel.direct_channel.app_error",
@@ -433,7 +433,7 @@
   },
   {
     "id": "api.command.execute_command.not_found.app_error",
-    "translation": "Command with a trigger of '{{.Trigger}}' not found. To send a message beginning with \"/\", try adding an empty space at the beginning of the message."
+    "translation": "'{{.Trigger}}' 트리거에 실행되는 커맨드를 찾지 못했습니다. \"/\"로 시작하는 메시지를 보내려면 메시지 시작 부분에 빈 공간을 추가하십시오."
   },
   {
     "id": "api.command.execute_command.save.app_error",
@@ -521,7 +521,7 @@
   },
   {
     "id": "api.command_channel_header.name",
-    "translation": "header"
+    "translation": "머리글"
   },
   {
     "id": "api.command_channel_header.permission.app_error",
@@ -541,11 +541,11 @@
   },
   {
     "id": "api.command_channel_purpose.desc",
-    "translation": "Edit the channel purpose"
+    "translation": "체널 설명 수정하기"
   },
   {
     "id": "api.command_channel_purpose.direct_group.app_error",
-    "translation": "Cannot set purpose for direct message channels. Use /header to set the header instead."
+    "translation": "개인 메시지의 설명은 설정할 수 없습니다. 머리글을 설정하려면 /header 를 사용하세요."
   },
   {
     "id": "api.command_channel_purpose.hint",
@@ -557,11 +557,11 @@
   },
   {
     "id": "api.command_channel_purpose.name",
-    "translation": "purpose"
+    "translation": "설명"
   },
   {
     "id": "api.command_channel_purpose.permission.app_error",
-    "translation": "당신은 채널 머릿말을 수정할 권한을 가지고 있지 않습니다."
+    "translation": "당신은 채널 설명을 수정할 권한을 가지고 있지 않습니다."
   },
   {
     "id": "api.command_channel_purpose.update_channel.app_error",
@@ -573,11 +573,11 @@
   },
   {
     "id": "api.command_channel_rename.desc",
-    "translation": "Rename the channel"
+    "translation": "채널 이름 바꾸기"
   },
   {
     "id": "api.command_channel_rename.direct_group.app_error",
-    "translation": "개인 메시지 채널은 나갈 수 없습니다"
+    "translation": "개인 메시지 채널의 이름은 변경 할 수 없습니다."
   },
   {
     "id": "api.command_channel_rename.hint",
@@ -585,23 +585,23 @@
   },
   {
     "id": "api.command_channel_rename.message.app_error",
-    "translation": "메시지는 /echo 명령어와 함께 제공되어야 합니다."
+    "translation": "메시지는 /rename 명령어와 함께 제공되어야 합니다."
   },
   {
     "id": "api.command_channel_rename.name",
-    "translation": "rename"
+    "translation": "이름변경"
   },
   {
     "id": "api.command_channel_rename.permission.app_error",
-    "translation": "당신은 채널 머릿말을 수정할 권한을 가지고 있지 않습니다."
+    "translation": "당신은 채널 이름을 수정할 권한을 가지고 있지 않습니다."
   },
   {
     "id": "api.command_channel_rename.too_long.app_error",
-    "translation": "Channel name must be {{.Length}} or fewer characters"
+    "translation": "채널 이름은 {{.Length}} 자 이하여야 합니다."
   },
   {
     "id": "api.command_channel_rename.too_short.app_error",
-    "translation": "Channel name must be {{.Length}} or more characters"
+    "translation": "채널 이름은 {{.Length}} 자 이상이여야 합니다."
   },
   {
     "id": "api.command_channel_rename.update_channel.app_error",
@@ -609,11 +609,11 @@
   },
   {
     "id": "api.command_channel_rename.update_channel.success",
-    "translation": "채널 머릿말이 성공적으로 업데이트되었습니다."
+    "translation": "채널이름이 성공적으로 업데이트되었습니다."
   },
   {
     "id": "api.command_code.desc",
-    "translation": "Display text as a code block"
+    "translation": "텍스트를 코드 블록으로 표시합니다."
   },
   {
     "id": "api.command_code.hint",
@@ -621,11 +621,11 @@
   },
   {
     "id": "api.command_code.message.app_error",
-    "translation": "메시지는 /echo 명령어와 함께 제공되어야 합니다."
+    "translation": "메시지는 /code 명령어와 함께 제공되어야 합니다."
   },
   {
     "id": "api.command_code.name",
-    "translation": "code"
+    "translation": "코드"
   },
   {
     "id": "api.command_collapse.desc",
@@ -645,7 +645,7 @@
   },
   {
     "id": "api.command_dnd.disabled",
-    "translation": "Do Not Disturb is disabled."
+    "translation": "방해 금지 모드가 해제되었습니다."
   },
   {
     "id": "api.command_dnd.error",
@@ -705,7 +705,7 @@
   },
   {
     "id": "api.command_groupmsg.desc",
-    "translation": "Sends a Group Message to the specified users"
+    "translation": "지정된 사용자에게 그룹 메시지를 보냅니다."
   },
   {
     "id": "api.command_groupmsg.fail.app_error",
@@ -760,7 +760,7 @@
   },
   {
     "id": "api.command_help.name",
-    "translation": "help"
+    "translation": "도움말"
   },
   {
     "id": "api.command_join.desc",
@@ -816,7 +816,7 @@
   },
   {
     "id": "api.command_leave.success",
-    "translation": "%v 가 채널을 떠났습니다."
+    "translation": "채널을 떠났습니다."
   },
   {
     "id": "api.command_logout.desc",
@@ -1772,7 +1772,7 @@
   },
   {
     "id": "api.post.make_direct_channel_visible.get_2_members.error",
-    "translation": "다이렉트 채널에 2명의 구성원을 가져올 수 없습니다. channel_id={{.ChannelId}}"
+    "translation": "개인 메시지 채널에 2명의 사용자를 가져오는데 실패했습니다. 채널 아이디={{.ChannelId}}"
   },
   {
     "id": "api.post.make_direct_channel_visible.get_members.error",
@@ -3636,7 +3636,7 @@
   },
   {
     "id": "app.notification.subject.direct.full",
-    "translation": "{{.SubjectText}} on {{.TeamDisplayName}} at {{.Month}} {{.Day}}, {{.Year}}"
+    "translation": "[{{.SiteName}}] {{.SenderDisplayName}} (으)로부터 {{.Month}} {{.Day}}, {{.Year}} 에 새로운 개인 메시지가 왔습니다."
   },
   {
     "id": "app.notification.subject.notification.full",
@@ -3712,7 +3712,7 @@
   },
   {
     "id": "app.user_access_token.disabled",
-    "translation": "Personal access tokens are disabled on this server. Please contact your system administrator for details."
+    "translation": "개인 액세스 토큰이 현재 서버에서 활성화 되어있지 않습니다. 시스템 관리자에게 연락하여 자세한 사항을 확인하시길 바랍니다."
   },
   {
     "id": "app.user_access_token.invalid_or_missing",
diff --git a/i18n/nl.json b/i18n/nl.json
index dda0ebab9..1777b59d1 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -3636,7 +3636,7 @@
   },
   {
     "id": "app.notification.subject.direct.full",
-    "translation": "{{.SubjectText}} in {{.TeamDisplayName}} van {{.SenderDisplayName}} op {{.Month}} {{.Day}} {{.Year}}"
+    "translation": "[{{.SiteName}}] Nieuw direct bericht van {{.SenderDisplayName}} op {{.Month}} {{.Day}} {{.Year}}"
   },
   {
     "id": "app.notification.subject.notification.full",
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index 44400b8c0..000d87a0c 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.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": "Não é possível enviar arquivos. Número incorreto de arquivos especificado."
   },
   {
     "id": "api.file.upload_file.large_image.app_error",
@@ -1820,7 +1820,7 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only_no_channel",
-    "translation": " enviado um ou mais arquivos em "
+    "translation": " enviado um ou mais arquivos"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_in",
@@ -3080,7 +3080,7 @@
   },
   {
     "id": "api.webhook.incoming.error",
-    "translation": "Could not decode the multipart payload of incoming webhook."
+    "translation": "Não foi possível decodificar a carga multiparte do webhook de entrada."
   },
   {
     "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": "Os plugins foram desativados. Verifique os seus logs para obter detalhes."
   },
   {
     "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": "Email já usado por outro usuário SAML."
   },
   {
     "id": "ent.migration.migratetosaml.user_not_found_in_users_mapping_file",
-    "translation": "User not found in the users file."
+    "translation": "Usuário não encontrado no arquivo de usuários."
   },
   {
     "id": "ent.migration.migratetosaml.username_already_used_by_other_user",
-    "translation": "Username already used by another Mattermost user."
+    "translation": "Nome de usuário já usado por outro usuário 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": "Na tarefa de exportação de mensagens o ExportFormat deve ser 'actiance' ou '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": "Na tarefa de exportação de mensagens o GlobalRelayEmailAddress deve ser um endereço de email válido"
   },
   {
     "id": "model.config.is_valid.password_length.app_error",
@@ -5048,7 +5048,7 @@
   },
   {
     "id": "model.config.is_valid.websocket_url.app_error",
-    "translation": "A URL Websocket do WebRTC Gateway deve ser uma URL válida e começar com ws:// ou wss://."
+    "translation": "A URL Websocket deve ser uma URL válida e começar com ws:// ou 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": "Falha ao escrever o anexo para o e-mail"
   },
   {
     "id": "utils.mail.send_mail.close.app_error",
diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index f476b48ed..43d3fde87 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -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": "无法解码传入的 webhook 混合数据。"
   },
   {
     "id": "api.webhook.init.debug",
@@ -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 必须为有效的电子邮箱地址"
   },
   {
     "id": "model.config.is_valid.password_length.app_error",
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",
-- 
cgit v1.2.3-1-g7c22