translations PR 20180730 (#9191)

* translations PR 20180730

* Fix japanese

14 files changed, 1902 insertions, 341 deletions

diff --git a/i18n/de.json b/i18n/de.json
index f8ad1a9c9..fbaa816a6 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "actiance.xml.output.formatter.marshalToXml.appError",
+    "id": "actiance.export.marshalToXml.appError",
     "translation": "Konnte Export nicht in XML konvertieren."
   },
   {
@@ -41,7 +41,7 @@
   },
   {
     "id": "api.admin.test_email.body",
-    "translation": "<br/><br/><br/>Ihre Mattermost E-Mail-Einrichtung scheint korrekt zu sein!"
+    "translation": "Ihre Mattermost E-Mail-Einrichtung scheint korrekt zu sein!"
   },
   {
     "id": "api.admin.test_email.missing_server",
@@ -1736,19 +1736,23 @@
   },
   {
     "id": "api.templates.deactivate_body.info",
-    "translation": "Sie haben ihr Konto auf {{ .SiteURL }} deaktiviert.<br>Falls diese Änderung nicht durch Sie durchgeführt wurde oder Sie ihr Konto reaktivieren möchten, kontaktieren Sie bitte ihren Systemadministrator."
+    "translation": "You deactivated your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.deactivate_body.title",
     "translation": "Ihr Konto auf {{ .ServerURL }} wurde deaktiviert"
   },
   {
+    "id": "api.templates.deactivate_body.warning",
+    "translation": "If this change was not initiated by you or you want to reactivate your account, contact your system administrator."
+  },
+  {
     "id": "api.templates.deactivate_subject",
     "translation": "[{{ .SiteName }}] Ihr Konto auf {{ .ServerURL }} wurde deaktiviert"
   },
   {
     "id": "api.templates.email_change_body.info",
-    "translation": "Ihre E-Mail-Adresse für {{.TeamDisplayName}} wurde in {{.NewEmail}} geändert.<br>Wenn Sie diese Änderungen nicht durchgeführt haben, kontaktieren Sie bitte den Systemadministrator."
+    "translation": "Your email address for {{.TeamDisplayName}} has been changed to {{.NewEmail}}."
   },
   {
     "id": "api.templates.email_change_body.title",
@@ -1779,24 +1783,36 @@
     "translation": "Um Ihre Benachrichtigungseinstellungen zu ändern, melden Sie sich an Ihrer Team-Site an und wählen dann Kontoeinstellungen > Benachrichtigungen."
   },
   {
-    "id": "api.templates.email_info",
-    "translation": "Bei Fragen senden Sie uns jederzeit eine E-Mail an <a href='mailto:{{.SupportEmail}}' style='text-decoration: none; color:#2389D7;'>{{.SupportEmail}}</a>.<br>Beste Grüße<br> Das {{.SiteName}} Team<br>"
+    "id": "api.templates.email_info1",
+    "translation": "Any questions at all, mail us any time: "
+  },
+  {
+    "id": "api.templates.email_info2",
+    "translation": "Best wishes,"
+  },
+  {
+    "id": "api.templates.email_info3",
+    "translation": "The {{.SiteName}} Team"
   },
   {
     "id": "api.templates.email_organization",
     "translation": "Versandt durch "
   },
   {
+    "id": "api.templates.email_warning",
+    "translation": "If you did not make this change, please contact the system administrator."
+  },
+  {
     "id": "api.templates.invite_body.button",
     "translation": "Team beitreten"
   },
   {
     "id": "api.templates.invite_body.extra_info",
-    "translation": "Mattermost lässt Sie Nachrichten und Dateien von Ihrem PC oder Smartphone teilen, mit Sofortsuche und Archivierung. Nachdem Sie <strong>{{.TeamDisplayName}}</strong> beigetreten sind, können Sie sich bei Ihrem neuen Team anmelden und auf all diese Funktionen von folgender Webadresse aus zugreifen:<br/><br/><a href='{{.TeamURL}}'>{{.TeamURL}}</a>"
+    "translation": "Mattermost lässt Sie Nachrichten und Dateien von Ihrem PC oder Smartphone teilen, mit Sofortsuche und Archivierung. Nachdem Sie [[{{.TeamDisplayName}}]] beigetreten sind, können Sie sich bei Ihrem neuen Team anmelden und auf all diese Funktionen von folgender Webadresse aus zugreifen:"
   },
   {
     "id": "api.templates.invite_body.info",
-    "translation": "Das Team {{.SenderStatus}} <strong>{{.SenderName}}</strong> hat Sie eingeladen, dem Team <strong>{{.TeamDisplayName}}</strong> beizutreten."
+    "translation": "The team {{.SenderStatus}} [[{{.SenderName}}]], has invited you to join [[{{.TeamDisplayName}}]]."
   },
   {
     "id": "api.templates.invite_body.title",
@@ -1808,7 +1824,7 @@
   },
   {
     "id": "api.templates.mfa_activated_body.info",
-    "translation": "Multi-Faktor-Authentifizierung wurde Ihrem Zugang auf {{ .SiteURL }} hinzugefügt.<br>Wenn diese Änderung nicht durch Sie initiiert wurde, kontaktieren Sie bitte Ihren Systemadministrator."
+    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.mfa_activated_body.title",
@@ -1820,7 +1836,7 @@
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
-    "translation": "Multi-Faktor-Authentifizierung wurde aus Ihrem Zugang auf {{ .SiteURL }} entfernt.<br>Wenn diese Änderung nicht durch Sie initiiert wurde kontaktieren Sie bitte Ihren Systemadministrator."
+    "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.mfa_deactivated_body.title",
@@ -1828,7 +1844,7 @@
   },
   {
     "id": "api.templates.password_change_body.info",
-    "translation": "Ihr Passwort wurde aktualisiert für {{.TeamDisplayName}} bei {{ .TeamURL }} durch {{.Method}}.<br>Falls Sie diese Änderung nicht veranlasst haben, wenden Sie sich bitte an den Systemadministrator."
+    "translation": "Your password has been updated for {{.TeamDisplayName}} on {{ .TeamURL }} by {{.Method}}."
   },
   {
     "id": "api.templates.password_change_body.title",
@@ -1847,8 +1863,12 @@
     "translation": "Passwort zurücksetzen"
   },
   {
-    "id": "api.templates.reset_body.info",
-    "translation": "Um Ihr Passwort zu ändern, klicken Sie unten auf \"Passwort zurücksetzen\".<br>Wenn Sie Ihr Passwort nicht zurücksetzen möchten, ignorieren Sie bitte diese E-Mail und das Passwort wird gleich bleiben. Der Passwortzurücksetzenlink wird in 24 Stunden ablaufen."
+    "id": "api.templates.reset_body.info1",
+    "translation": "To change your password, click \"Reset Password\" below."
+  },
+  {
+    "id": "api.templates.reset_body.info2",
+    "translation": "If you did not mean to reset your password, please ignore this email and your password will remain the same. The password reset link expires in 24 hours."
   },
   {
     "id": "api.templates.reset_body.title",
@@ -1860,7 +1880,7 @@
   },
   {
     "id": "api.templates.signin_change_email.body.info",
-    "translation": "Sie haben Ihre Anmeldemethode für {{ .SiteName }} auf {{.Method}} geändert.<br>Falls Sie diese Änderung nicht veranlasst haben, wenden Sie sich bitte an den Systemadministrator."
+    "translation": "Ihre Anmeldemethode wurde aktualisiert bei {{ .SiteName }}"
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -1876,7 +1896,7 @@
   },
   {
     "id": "api.templates.user_access_token_body.info",
-    "translation": "Ein Benutzer-Zugriffs-Token wurde Ihrem Konto auf {{ .SiteURL }} hinzugefügt. Es kann für den Zugang zu {{.SiteName}} mit Ihrem Konto verwendet werden.<br>Wenn diese Änderung nicht durch Sie ausgeführt wurde, wenden Sie sich bitte bei Ihrem Systemadministrator."
+    "translation": "A personal access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account."
   },
   {
     "id": "api.templates.user_access_token_body.title",
@@ -1888,7 +1908,7 @@
   },
   {
     "id": "api.templates.username_change_body.info",
-    "translation": "Ihr Benutzername für {{.TeamDisplayName}} wurde in {{.NewUsername}} geändert.<br>Wenn Sie diese Änderungen nicht durchgeführt haben, kontaktieren Sie bitte den Systemadministrator."
+    "translation": "Your username for {{.TeamDisplayName}} has been changed to {{.NewUsername}}."
   },
   {
     "id": "api.templates.username_change_body.title",
@@ -2159,6 +2179,22 @@
     "translation": "Kann Passwort für SSO-Konten nicht zurücksetzen"
   },
   {
+    "id": "api.user.saml.app_error",
+    "translation": "Unable to process SAML login request."
+  },
+  {
+    "id": "api.user.saml.extension_id.app_error",
+    "translation": "Ungültige Action-ID"
+  },
+  {
+    "id": "api.user.saml.extension_unsupported",
+    "translation": "Extensions are not supported."
+  },
+  {
+    "id": "api.user.saml.invalid_extension",
+    "translation": "Extension with extension_id={{.ExtensionId}} is not supported."
+  },
+  {
     "id": "api.user.saml.not_available.app_error",
     "translation": "SAML 2.0 ist auf diesem Server nicht konfiguriert oder wird nicht unterstützt."
   },
@@ -2395,6 +2431,14 @@
     "translation": "Cluster-API-Endpunkt nicht gefunden."
   },
   {
+    "id": "app.import.attachment.bad_file.error",
+    "translation": "Error reading the file at: \"{{.FilePath}}\""
+  },
+  {
+    "id": "app.import.attachment.file_upload.error",
+    "translation": "Error uploading the file: \"{{.FilePath}}\""
+  },
+  {
     "id": "app.import.bulk_import.file_scan.error",
     "translation": "Fehler beim Lesen der Importdatei."
   },
@@ -2944,7 +2988,11 @@
   },
   {
     "id": "app.notification.body.text.group_message.full",
-    "translation": "Kanal: {{.ChannelName}}<br>@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Day}}.{{.Month}}"
+    "translation": "Channel: {{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.group_message.full2",
+    "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}}. {{.Month}}"
   },
   {
     "id": "app.notification.body.text.group_message.generic",
@@ -2952,7 +3000,11 @@
   },
   {
     "id": "app.notification.body.text.notification.full",
-    "translation": "Kanal: {{.ChannelName}}<br>@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Day}}.{{.Month}}"
+    "translation": "Channel: {{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full2",
+    "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}}. {{.Month}}"
   },
   {
     "id": "app.notification.body.text.notification.generic",
@@ -3011,6 +3063,10 @@
     "translation": "Konnte aktive Plugins nicht abrufen."
   },
   {
+    "id": "app.plugin.get_statuses.app_error",
+    "translation": "Konnte Plugin-Status-Zustand nicht setzen"
+  },
+  {
     "id": "app.plugin.install.app_error",
     "translation": "Konnte Plugin nicht installieren."
   },
@@ -3019,6 +3075,10 @@
     "translation": "Konnte Plugin nicht installieren. Ein Plugin mit der selben ID ist bereits installiert."
   },
   {
+    "id": "app.plugin.install_id_failed_remove.app_error",
+    "translation": "Unable to install plugin. A plugin with the same ID is already installed and failed to be removed."
+  },
+  {
     "id": "app.plugin.invalid_id.app_error",
     "translation": "Plugin-Id muss aus mindestens {{.Min}} und maximal {{.Max}} Zeichen bestehen und zu {{.Regex}} passen."
   },
@@ -3159,6 +3219,10 @@
     "translation": "Hochgeladene Datei wurde aus dem Global-Relay-Export entfernt, das sie zu groß zum Versenden war."
   },
   {
+    "id": "ent.compliance.global_relay.open_temporary_file.appError",
+    "translation": "Konnte temporäre CSV-Exportdatei nicht erstellen."
+  },
+  {
     "id": "ent.compliance.licence_disable.app_error",
     "translation": "Compliance Funktionalität durch die aktuelle Lizenz deaktiviert. Bitte kontaktieren Sie Ihren Systemadministrator wegen eines Enterprise Lizenzupgrades."
   },
@@ -3255,6 +3319,10 @@
     "translation": "Konnte Suchergebnisse nicht dekodieren"
   },
   {
+    "id": "ent.elasticsearch.start.already_started.app_error",
+    "translation": "Elasticsearch ist nicht gestartet"
+  },
+  {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Fehler beim Erstellen der Elasticsearch-Massenverarbeitung"
   },
@@ -3263,6 +3331,10 @@
     "translation": "Fehler beim Starten der Elasticsearch-Massenverarbeitung"
   },
   {
+    "id": "ent.elasticsearch.stop.already_stopped.app_error",
+    "translation": "Elasticsearch ist nicht gestartet"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "Verbindung zum Elasticsearch-Server fehlgeschlagen."
   },
@@ -3331,6 +3403,46 @@
     "translation": "Ungültiger AD/LDAP-Filter"
   },
   {
+    "id": "ent.message_export.global_relay.create_file_in_zip.app_error",
+    "translation": "Konnte die ZIP-Exportdatei nicht erstellen."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.close.app_error",
+    "translation": "Unable to deliver the email to Global Relay."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.from_address.app_error",
+    "translation": "Unable to set the email From address."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg.app_error",
+    "translation": "Unable to set the email message."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg_data.app_error",
+    "translation": "Unable to write the email message."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.parse_mail.app_error",
+    "translation": "Unable to read the email information."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.to_address.app_error",
+    "translation": "Unable to set the email To address."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_get_file_info.app_error",
+    "translation": "Unable to get the information of the export temporary file"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_email_file.app_error",
+    "translation": "Unable to get the an email from the temporary file"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_zip_file_data.app_error",
+    "translation": "Unable to open the export temporary file"
+  },
+  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "Fehler bei Authentifizierung des MFA Tokens"
   },
@@ -4299,6 +4411,10 @@
     "translation": "Aktualisiert am muss eine gültige Zeit sein"
   },
   {
+    "id": "model.outgoing_hook.icon_url.app_error",
+    "translation": "Ungültiger scope"
+  },
+  {
     "id": "model.outgoing_hook.is_valid.callback.app_error",
     "translation": "Ungültige Callback-URLs"
   },
@@ -4355,6 +4471,10 @@
     "translation": "Ungültige Auslösewörter"
   },
   {
+    "id": "model.outgoing_hook.username.app_error",
+    "translation": "Ungültiger Benutzername"
+  },
+  {
     "id": "model.plugin_command.error.app_error",
     "translation": "Es ist ein Fehler beim Versuch diesen Befehl auszuführen aufgetreten."
   },
diff --git a/i18n/en.json b/i18n/en.json
index 9ed77b07d..6ea979932 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -168,14 +168,6 @@
     "translation": "Channel is already deleted"
   },
   {
-    "id": "ent.elasticsearch.start.already_started.app_error",
-    "translation": "Elasticsearch is already started"
-  },
-  {
-    "id": "ent.elasticsearch.stop.already_stopped.app_error",
-    "translation": "Elasticsearch is already stopped"
-  },
-  {
     "id": "api.channel.join_channel.permissions.app_error",
     "translation": "You do not have the appropriate permissions"
   },
@@ -1747,14 +1739,14 @@
     "translation": "You deactivated your account on {{ .SiteURL }}."
   },
   {
-    "id": "api.templates.deactivate_body.warning",
-    "translation": "If this change was not initiated by you or you want to reactivate your account, contact your system administrator."
-  },
-  {
     "id": "api.templates.deactivate_body.title",
     "translation": "Your account has been deactivated at {{ .ServerURL }}"
   },
   {
+    "id": "api.templates.deactivate_body.warning",
+    "translation": "If this change was not initiated by you or you want to reactivate your account, contact your system administrator."
+  },
+  {
     "id": "api.templates.deactivate_subject",
     "translation": "[{{ .SiteName }}] Your account at {{ .ServerURL }} has been deactivated"
   },
@@ -2187,30 +2179,30 @@
     "translation": "Cannot reset password for SSO accounts"
   },
   {
-    "id": "api.user.saml.not_available.app_error",
-    "translation": "SAML 2.0 is not configured or supported on this server."
-  },
-  {
-    "id": "api.user.send_deactivate_email_and_forget.failed.error",
-    "translation": "Failed to send the deactivate account email successfully"
-  },
-  {
     "id": "api.user.saml.app_error",
     "translation": "Unable to process SAML login request."
   },
   {
-    "id": "api.user.saml.extension_unsupported",
-    "translation": "Extensions are not supported."
-  },
-  {
     "id": "api.user.saml.extension_id.app_error",
     "translation": "Invalid extension id"
   },
   {
+    "id": "api.user.saml.extension_unsupported",
+    "translation": "Extensions are not supported."
+  },
+  {
     "id": "api.user.saml.invalid_extension",
     "translation": "Extension with extension_id={{.ExtensionId}} is not supported."
   },
   {
+    "id": "api.user.saml.not_available.app_error",
+    "translation": "SAML 2.0 is not configured or supported on this server."
+  },
+  {
+    "id": "api.user.send_deactivate_email_and_forget.failed.error",
+    "translation": "Failed to send the deactivate account email successfully"
+  },
+  {
     "id": "api.user.send_email_change_email_and_forget.error",
     "translation": "Failed to send email change notification email successfully"
   },
@@ -2439,6 +2431,14 @@
     "translation": "Cluster API endpoint not found."
   },
   {
+    "id": "app.import.attachment.bad_file.error",
+    "translation": "Error reading the file at: \"{{.FilePath}}\""
+  },
+  {
+    "id": "app.import.attachment.file_upload.error",
+    "translation": "Error uploading the file: \"{{.FilePath}}\""
+  },
+  {
     "id": "app.import.bulk_import.file_scan.error",
     "translation": "Error reading import data file."
   },
@@ -2955,14 +2955,6 @@
     "translation": "Team name missing from User's Team Membership."
   },
   {
-    "id": "app.import.attachment.bad_file.error",
-    "translation": "Error reading the file at: \"{{.FilePath}}\""
-  },
-  {
-    "id": "app.import.attachment.file_upload.error",
-    "translation": "Error uploading the file: \"{{.FilePath}}\""
-  },
-  {
     "id": "app.notification.body.intro.direct.full",
     "translation": "You have a new Direct Message."
   },
@@ -3227,6 +3219,10 @@
     "translation": "Uploaded file was removed from Global Relay export because it was too large to send."
   },
   {
+    "id": "ent.compliance.global_relay.open_temporary_file.appError",
+    "translation": "Unable to open the temporary export file."
+  },
+  {
     "id": "ent.compliance.licence_disable.app_error",
     "translation": "Compliance functionality disabled by current license. Please contact your system administrator about upgrading your enterprise license."
   },
@@ -3323,6 +3319,10 @@
     "translation": "Failed to decode search results"
   },
   {
+    "id": "ent.elasticsearch.start.already_started.app_error",
+    "translation": "Elasticsearch is already started"
+  },
+  {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Failed to create Elasticsearch bulk processor"
   },
@@ -3331,6 +3331,10 @@
     "translation": "Failed to start Elasticsearch bulk processor"
   },
   {
+    "id": "ent.elasticsearch.stop.already_stopped.app_error",
+    "translation": "Elasticsearch is already stopped"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "Connecting to Elasticsearch server failed."
   },
@@ -3399,10 +3403,6 @@
     "translation": "Invalid AD/LDAP Filter"
   },
   {
-    "id": "ent.compliance.global_relay.open_temporary_file.appError",
-    "translation": "Unable to open the temporary export file."
-  },
-  {
     "id": "ent.message_export.global_relay.create_file_in_zip.app_error",
     "translation": "Unable to create the eml file."
   },
@@ -4411,6 +4411,10 @@
     "translation": "Update at must be a valid time"
   },
   {
+    "id": "model.outgoing_hook.icon_url.app_error",
+    "translation": "Invalid icon"
+  },
+  {
     "id": "model.outgoing_hook.is_valid.callback.app_error",
     "translation": "Invalid callback URLs"
   },
@@ -4469,9 +4473,6 @@
   {
     "id": "model.outgoing_hook.username.app_error",
     "translation": "Invalid username"
-  },{
-    "id": "model.outgoing_hook.icon_url.app_error",
-    "translation": "Invalid icon"
   },
   {
     "id": "model.plugin_command.error.app_error",
diff --git a/i18n/es.json b/i18n/es.json
index f491be5ef..99235c240 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "actiance.xml.output.formatter.marshalToXml.appError",
+    "id": "actiance.export.marshalToXml.appError",
     "translation": "No se puede convertir la exportación a XML."
   },
   {
@@ -41,7 +41,7 @@
   },
   {
     "id": "api.admin.test_email.body",
-    "translation": "<br/><br/><br/>Parece que tu correo electrónico para Mattermost fue configurado correctamente!"
+    "translation": "¡Parece que tu correo electrónico para Mattermost fue configurado correctamente!"
   },
   {
     "id": "api.admin.test_email.missing_server",
@@ -1736,19 +1736,23 @@
   },
   {
     "id": "api.templates.deactivate_body.info",
-    "translation": "Desactivaste tu cuenta en {{ .SiteURL }}.<br>Si este cambio no fue originado por ti o sí quieres reactivar tu cuenta, contacta a tu administrador de sistema."
+    "translation": "Haz desactivado tu cuenta en {{ .SiteURL }}."
   },
   {
     "id": "api.templates.deactivate_body.title",
     "translation": "Tu cuenta ha sido desactivada en {{ .ServerURL }}"
   },
   {
+    "id": "api.templates.deactivate_body.warning",
+    "translation": "Si este cambio no fue iniciado por ti o si quieres reactivar tu cuenta, contacta al administrador del sistema."
+  },
+  {
     "id": "api.templates.deactivate_subject",
     "translation": "[{{ .SiteName }}] Tu cuenta en {{ .ServerURL }} ha sido desactivada"
   },
   {
     "id": "api.templates.email_change_body.info",
-    "translation": "Tu dirección de correo electrónico para {{.TeamDisplayName}} ha sido cambiada por {{.NewEmail}}.<br>Si este cambio no fue realizado por ti, por favor contacta un administrador de sistema."
+    "translation": "Tu dirección de correo electrónico para {{.TeamDisplayName}} fue cambiado por {{.NewEmail}}."
   },
   {
     "id": "api.templates.email_change_body.title",
@@ -1779,24 +1783,36 @@
     "translation": "Para cambiar tus preferencias de notificaciones, inicia sesión en tu equipo y dirigete a Configurar Cuenta > Notificaciones."
   },
   {
-    "id": "api.templates.email_info",
-    "translation": "Si tienes alguna pregunta, escribenos en cualquier momento a: <a href=\"mailto:{{.SupportEmail}}\" style=\"text-decoration: none; color:#2389D7;\">{{.SupportEmail}}</a>.<br>Los mejores deseos,<br>El Equipo {{.SiteName}}<br>"
+    "id": "api.templates.email_info1",
+    "translation": "Cualquier duda, contáctanos en cualquier momento a través de: "
+  },
+  {
+    "id": "api.templates.email_info2",
+    "translation": "Los mejores deseos,"
+  },
+  {
+    "id": "api.templates.email_info3",
+    "translation": "El Equipo {{.SiteName}}"
   },
   {
     "id": "api.templates.email_organization",
     "translation": "Enviado por "
   },
   {
+    "id": "api.templates.email_warning",
+    "translation": "Si no realizaste este cambio, por favor contacta al administrador de sistema."
+  },
+  {
     "id": "api.templates.invite_body.button",
     "translation": "Unirme al Equipo"
   },
   {
     "id": "api.templates.invite_body.extra_info",
-    "translation": "Mattermost te permite compartir mensajes y archivos de tu Computador o teléfono, incluyendo busquedas instantáneas. Una vez que te hayas unido a <strong>{{.TeamDisplayName}}</strong>, Podrás iniciar sesión en tu nuevo equipo y utilizar todas las características en cualquier momento desde la dirección web:<br/><br/><a href=\"{{.TeamURL}}\">{{.TeamURL}}</a>"
+    "translation": "Mattermost te permite compartir mensajes y archivos de tu Computador o teléfono, incluyendo búsquedas instantáneas. Una vez que te hayas unido a [[{{.TeamDisplayName}}]], Podrás iniciar sesión en tu nuevo equipo y utilizar todas las características en cualquier momento desde la dirección web:"
   },
   {
     "id": "api.templates.invite_body.info",
-    "translation": "<strong>{{.SenderName}}</strong> {{.SenderStatus}} del equipo <strong>{{.TeamDisplayName}}</strong>, te ha invitado a unirte."
+    "translation": "The team {{.SenderStatus}} [[{{.SenderName}}]], has invited you to join [[{{.TeamDisplayName}}]]."
   },
   {
     "id": "api.templates.invite_body.title",
@@ -1808,7 +1824,7 @@
   },
   {
     "id": "api.templates.mfa_activated_body.info",
-    "translation": "La autenticación de múltiples factores ha sido añadida a ti cuenta en {{ .SiteURL }}.<br>Si este cambio no ha sido iniciado por ti, por favor contacta a un administrador del sistema."
+    "translation": "La autenticación de factor multiple ha sido agregada a tu cuenta en {{ .SireURL }}."
   },
   {
     "id": "api.templates.mfa_activated_body.title",
@@ -1820,7 +1836,7 @@
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
-    "translation": "La autenticación de múltiples factores ha sido removida de tu cuenta en {{ .SiteURL }}.<br>Si este cambio no ha sido iniciado por ti, por favor contacta a un administrador del sistema."
+    "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.mfa_deactivated_body.title",
@@ -1828,7 +1844,7 @@
   },
   {
     "id": "api.templates.password_change_body.info",
-    "translation": "Tu contraseña ha sido cambiada para {{.TeamDisplayName}} en {{ .TeamURL }} por el método de {{.Method}}.<br>Si este cambio no fue realizado por ti, por favor contacta a un administrador del sistema."
+    "translation": "Your password has been updated for {{.TeamDisplayName}} on {{ .TeamURL }} by {{.Method}}."
   },
   {
     "id": "api.templates.password_change_body.title",
@@ -1847,8 +1863,12 @@
     "translation": "Restablecer Contraseña"
   },
   {
-    "id": "api.templates.reset_body.info",
-    "translation": "Para cambiar tu contraseña, haz clic el botón \"Restablecer Contraseña\" que se encuentra abajo.<br>Si no fue tu intención restablecer tu contraseña, por favor ignora este correo y tu contraseña seguirá siendo la misma."
+    "id": "api.templates.reset_body.info1",
+    "translation": "To change your password, click \"Reset Password\" below."
+  },
+  {
+    "id": "api.templates.reset_body.info2",
+    "translation": "If you did not mean to reset your password, please ignore this email and your password will remain the same. The password reset link expires in 24 hours."
   },
   {
     "id": "api.templates.reset_body.title",
@@ -1860,7 +1880,7 @@
   },
   {
     "id": "api.templates.signin_change_email.body.info",
-    "translation": "Haz actualizado tu método de inicio de sesión en {{ .SiteName }} a {{.Method}}.<br>Sí este cambio no fue realizado por ti, por favor contacta a tu administrador de sistema."
+    "translation": "Haz actualizado el método de inicio de sesión en {{ .SiteName }}"
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -1876,7 +1896,7 @@
   },
   {
     "id": "api.templates.user_access_token_body.info",
-    "translation": "Un token de acceso personal ha sido agregado a tu cuenta en {{ .SiteURL }}. El token puede ser utilizado para accesar {{.SiteName}} con tu cuenta.<br>Si este cambió no fue realizado por ti, por favor contacta a tu administrador del sistema."
+    "translation": "A personal access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account."
   },
   {
     "id": "api.templates.user_access_token_body.title",
@@ -1888,7 +1908,7 @@
   },
   {
     "id": "api.templates.username_change_body.info",
-    "translation": "Tu nombre de usuario en {{.TeamDisplayName}} ha sido cambiado por {{.NewUsername}}.<br>Si este cambio no fue realizado por ti, por favor contacta un administrador de sistema."
+    "translation": "Your username for {{.TeamDisplayName}} has been changed to {{.NewUsername}}."
   },
   {
     "id": "api.templates.username_change_body.title",
@@ -2159,6 +2179,22 @@
     "translation": "No se puede restablecer la contraseña para cuentas SSO"
   },
   {
+    "id": "api.user.saml.app_error",
+    "translation": "Unable to process SAML login request."
+  },
+  {
+    "id": "api.user.saml.extension_id.app_error",
+    "translation": "Id de acción no válida"
+  },
+  {
+    "id": "api.user.saml.extension_unsupported",
+    "translation": "Extensions are not supported."
+  },
+  {
+    "id": "api.user.saml.invalid_extension",
+    "translation": "Extension with extension_id={{.ExtensionId}} is not supported."
+  },
+  {
     "id": "api.user.saml.not_available.app_error",
     "translation": "SAML 2.0 no está configurado o no es soportado en este servidor"
   },
@@ -2395,6 +2431,14 @@
     "translation": "No se encontró el endpoint del API para el agrupamiento de servidores."
   },
   {
+    "id": "app.import.attachment.bad_file.error",
+    "translation": "Error reading the file at: \"{{.FilePath}}\""
+  },
+  {
+    "id": "app.import.attachment.file_upload.error",
+    "translation": "Error uploading the file: \"{{.FilePath}}\""
+  },
+  {
     "id": "app.import.bulk_import.file_scan.error",
     "translation": "Error al leer el archivo de importación de datos."
   },
@@ -2404,7 +2448,7 @@
   },
   {
     "id": "app.import.bulk_import.unsupported_version.error",
-    "translation": "Versión incorrecta o faltante en el archivo de importación de datos. Asegura que la versión sea el primer objeto en el archivo de importación e intenta nuevamente."
+    "translation": "Versión incorrecta o ausente en el archivo de importación de datos. Asegura que la versión sea el primer objeto en el archivo de importación e intenta nuevamente."
   },
   {
     "id": "app.import.emoji.bad_file.error",
@@ -2636,11 +2680,11 @@
   },
   {
     "id": "app.import.validate_emoji_import_data.image_missing.error",
-    "translation": "El campo de imagén del emoticon en la importación está faltante o vacío."
+    "translation": "El campo de imagén del emoticon en la importación está ausente o vacío."
   },
   {
     "id": "app.import.validate_emoji_import_data.name_missing.error",
-    "translation": "El campo del nombre del emoticon en la importación está faltante o vacío."
+    "translation": "El campo del nombre del emoticon en la importación está ausente o vacío."
   },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
@@ -2944,7 +2988,11 @@
   },
   {
     "id": "app.notification.body.text.group_message.full",
-    "translation": "Canal: {{.ChannelName}}<br>@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Day}} {{.Month}}"
+    "translation": "Channel: {{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.group_message.full2",
+    "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}} {{.Month}}"
   },
   {
     "id": "app.notification.body.text.group_message.generic",
@@ -2952,7 +3000,11 @@
   },
   {
     "id": "app.notification.body.text.notification.full",
-    "translation": "Canal: {{.ChannelName}}<br>@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Day}} {{.Month}}"
+    "translation": "Channel: {{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full2",
+    "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}} {{.Month}}"
   },
   {
     "id": "app.notification.body.text.notification.generic",
@@ -3011,6 +3063,10 @@
     "translation": "No se puede obtener los complementos activos"
   },
   {
+    "id": "app.plugin.get_statuses.app_error",
+    "translation": "No se pudo configurar el complemento de estado."
+  },
+  {
     "id": "app.plugin.install.app_error",
     "translation": "No se puede instalar el plugin."
   },
@@ -3019,6 +3075,10 @@
     "translation": "No se puede instalar el plugin. Un plugin con el mismo ID ya está instalado."
   },
   {
+    "id": "app.plugin.install_id_failed_remove.app_error",
+    "translation": "Unable to install plugin. A plugin with the same ID is already installed and failed to be removed."
+  },
+  {
     "id": "app.plugin.invalid_id.app_error",
     "translation": "El Id del complemento debe tener al menos {{.Min}} caracteres y un máximo de {{.Max}} caracteres que coincidan con {{.Regex}}."
   },
@@ -3159,6 +3219,10 @@
     "translation": "El archivo cargado fue eliminado de la exportación Global Relay, ya que era demasiado grande para ser enviado."
   },
   {
+    "id": "ent.compliance.global_relay.open_temporary_file.appError",
+    "translation": "No se puede crear un archivo temporal de exportación a CSV."
+  },
+  {
     "id": "ent.compliance.licence_disable.app_error",
     "translation": "La característica de Conformidad está inhabilitada para tu licencia actual. Por favor contacta a un administrador del sistema sobre como actualizar a una licencia empresarial."
   },
@@ -3255,6 +3319,10 @@
     "translation": "No pudo decodificar los resultados de búsqueda"
   },
   {
+    "id": "ent.elasticsearch.start.already_started.app_error",
+    "translation": "Elasticsearch ya fue iniciado"
+  },
+  {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "No se pudo crear el procesador a granel de Elasticsearch"
   },
@@ -3263,6 +3331,10 @@
     "translation": "No se pudo iniciar procesador a granel de Elasticsearch"
   },
   {
+    "id": "ent.elasticsearch.stop.already_stopped.app_error",
+    "translation": "Elasticsearch ya fue detenido"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "La conexión al servidor Elasticsearch no pudo establecer."
   },
@@ -3331,6 +3403,46 @@
     "translation": "Filtro de AD/LDAP inválido"
   },
   {
+    "id": "ent.message_export.global_relay.create_file_in_zip.app_error",
+    "translation": "No se puede crear el archivo de exportación zip."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.close.app_error",
+    "translation": "Unable to deliver the email to Global Relay."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.from_address.app_error",
+    "translation": "Unable to set the email From address."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg.app_error",
+    "translation": "Unable to set the email message."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg_data.app_error",
+    "translation": "Unable to write the email message."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.parse_mail.app_error",
+    "translation": "Unable to read the email information."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.to_address.app_error",
+    "translation": "Unable to set the email To address."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_get_file_info.app_error",
+    "translation": "Unable to get the information of the export temporary file"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_email_file.app_error",
+    "translation": "Unable to get the an email from the temporary file"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_zip_file_data.app_error",
+    "translation": "Unable to open the export temporary file"
+  },
+  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "Error intentando autenticar el token MFA"
   },
@@ -4299,6 +4411,10 @@
     "translation": "Update debe ser un tiempo válido"
   },
   {
+    "id": "model.outgoing_hook.icon_url.app_error",
+    "translation": "Alcance inválido"
+  },
+  {
     "id": "model.outgoing_hook.is_valid.callback.app_error",
     "translation": "Callback URLs no válido"
   },
@@ -4355,6 +4471,10 @@
     "translation": "Palabras que desencadenan acciones no válidas"
   },
   {
+    "id": "model.outgoing_hook.username.app_error",
+    "translation": "Nombre de usuario no válido"
+  },
+  {
     "id": "model.plugin_command.error.app_error",
     "translation": "Ocurrió un error mientras se intentaba ejecutar este comando."
   },
diff --git a/i18n/fr.json b/i18n/fr.json
index b97f32cb4..ecc6e6e70 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "actiance.xml.output.formatter.marshalToXml.appError",
+    "id": "actiance.export.marshalToXml.appError",
     "translation": "Impossible de convertir l'export en XML."
   },
   {
@@ -1736,19 +1736,23 @@
   },
   {
     "id": "api.templates.deactivate_body.info",
-    "translation": "Vous avez désactivé votre compte sur {{ .SiteURL }}.<br>Si vous n'êtes pas à l'origine de ce changement ou vous souhaitez réactiver votre compte, contactez votre administrateur système."
+    "translation": "You deactivated your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.deactivate_body.title",
     "translation": "Votre compte a été désactivé sur {{ .ServerURL }}"
   },
   {
+    "id": "api.templates.deactivate_body.warning",
+    "translation": "If this change was not initiated by you or you want to reactivate your account, contact your system administrator."
+  },
+  {
     "id": "api.templates.deactivate_subject",
     "translation": "[{{ .SiteName }}] Votre compte sur {{ .ServerURL }} a été désactivé"
   },
   {
     "id": "api.templates.email_change_body.info",
-    "translation": "Votre adresse e-mail pour {{.TeamDisplayName}} a été remplacée par {{.NewEmail}}.<br>Si vous n'êtes pas à l'origine de cette action, veuillez contacter votre administrateur système."
+    "translation": "Your email address for {{.TeamDisplayName}} has been changed to {{.NewEmail}}."
   },
   {
     "id": "api.templates.email_change_body.title",
@@ -1779,14 +1783,26 @@
     "translation": "Pour modifier vos préférences de notifications, connectez-vous à votre équipe et allez dans Paramètres du compte > Notifications."
   },
   {
-    "id": "api.templates.email_info",
-    "translation": "Pour toutes questions, contactez-nous par e-mail : <a href='mailto:{{.SupportEmail}}' style='text-decoration: none; color:#2389D7;'>{{.SupportEmail}}</a>.<br>Cordialement,<br>L'équipe {{.SiteName}}<br>"
+    "id": "api.templates.email_info1",
+    "translation": "Any questions at all, mail us any time: "
+  },
+  {
+    "id": "api.templates.email_info2",
+    "translation": "Best wishes,"
+  },
+  {
+    "id": "api.templates.email_info3",
+    "translation": "The {{.SiteName}} Team"
   },
   {
     "id": "api.templates.email_organization",
     "translation": "Envoyée par "
   },
   {
+    "id": "api.templates.email_warning",
+    "translation": "If you did not make this change, please contact the system administrator."
+  },
+  {
     "id": "api.templates.invite_body.button",
     "translation": "Rejoindre l'équipe"
   },
@@ -1796,7 +1812,7 @@
   },
   {
     "id": "api.templates.invite_body.info",
-    "translation": "<strong>{{.SenderName}}</strong>, {{.SenderStatus}} de l'équipe, vous invite à rejoindre <strong>{{.TeamDisplayName}}</strong>."
+    "translation": "The team {{.SenderStatus}} [[{{.SenderName}}]], has invited you to join [[{{.TeamDisplayName}}]]."
   },
   {
     "id": "api.templates.invite_body.title",
@@ -1808,7 +1824,7 @@
   },
   {
     "id": "api.templates.mfa_activated_body.info",
-    "translation": "L'authentification multi-facteurs a été ajoutée à votre compte sur {{ .SiteURL }}.<br>Si vous n'êtes pas à l'origine de ce changement, veuillez contacter votre administrateur système."
+    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.mfa_activated_body.title",
@@ -1820,7 +1836,7 @@
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
-    "translation": "L'authentification multi-facteurs a été supprimée de votre compte sur {{ .SiteURL }}.<br>Si vous n'êtes pas à l'origine de ce changement, veuillez contacter votre administrateur système."
+    "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.mfa_deactivated_body.title",
@@ -1828,7 +1844,7 @@
   },
   {
     "id": "api.templates.password_change_body.info",
-    "translation": "Vous avez mis à jour votre mot de passe pour {{.TeamDisplayName}} sur {{.TeamURL}} pour {{.Method}}.<br>Si vous n'êtes pas à l'origine de ce changement, veuillez prendre contact avec votre administrateur système."
+    "translation": "Your password has been updated for {{.TeamDisplayName}} on {{ .TeamURL }} by {{.Method}}."
   },
   {
     "id": "api.templates.password_change_body.title",
@@ -1847,8 +1863,12 @@
     "translation": "Réinitialiser le mot de passe"
   },
   {
-    "id": "api.templates.reset_body.info",
-    "translation": "Pour modifier votre mot de passe, cliquez sur « Réinitialiser le mot de passe » ci-dessous.<br>Si vous ne souhaitiez pas réinitialiser votre mot de passe, ignorez ce message et votre mot de passe restera inchangé. Le lien de réinitialisation de votre mot de passe expirera dans 24 heures."
+    "id": "api.templates.reset_body.info1",
+    "translation": "To change your password, click \"Reset Password\" below."
+  },
+  {
+    "id": "api.templates.reset_body.info2",
+    "translation": "If you did not mean to reset your password, please ignore this email and your password will remain the same. The password reset link expires in 24 hours."
   },
   {
     "id": "api.templates.reset_body.title",
@@ -1860,7 +1880,7 @@
   },
   {
     "id": "api.templates.signin_change_email.body.info",
-    "translation": "Vous avez mis à jour votre méthode de connexion en {{.Method}} pour {{ .SiteName }}.<br>Si vous n'êtes pas à l'origine de ce changement, veuillez contacter votre administrateur système."
+    "translation": "You updated your sign-in method on {{ .SiteName }} to {{.Method}}."
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -1876,7 +1896,7 @@
   },
   {
     "id": "api.templates.user_access_token_body.info",
-    "translation": "Un jeton d'accès utilisateur a été ajouté à votre compte sur {{.SiteURL}}. Il peut être utilisé pour accéder à {{.SiteName}} avec votre compte.<br>Si vous n'êtes pas à l'origine de cette demande, veuillez contacter votre administrateur système."
+    "translation": "A personal access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account."
   },
   {
     "id": "api.templates.user_access_token_body.title",
@@ -1888,7 +1908,7 @@
   },
   {
     "id": "api.templates.username_change_body.info",
-    "translation": "Votre nom d'utilisateur pour {{.TeamDisplayName}} a été modifiée en {{.NewUsername}}.<br>Si vous n'êtes pas à l'origine de cette action, veuillez contacter votre administrateur système."
+    "translation": "Your username for {{.TeamDisplayName}} has been changed to {{.NewUsername}}."
   },
   {
     "id": "api.templates.username_change_body.title",
@@ -2159,6 +2179,22 @@
     "translation": "Impossible de réinitialiser le mot de passe pour les comptes à authentification unique (SSO)"
   },
   {
+    "id": "api.user.saml.app_error",
+    "translation": "Unable to process SAML login request."
+  },
+  {
+    "id": "api.user.saml.extension_id.app_error",
+    "translation": "Id d'action invalide"
+  },
+  {
+    "id": "api.user.saml.extension_unsupported",
+    "translation": "Extensions are not supported."
+  },
+  {
+    "id": "api.user.saml.invalid_extension",
+    "translation": "Extension with extension_id={{.ExtensionId}} is not supported."
+  },
+  {
     "id": "api.user.saml.not_available.app_error",
     "translation": "SAML 2.0 n'est pas configuré ou supporté sur ce serveur."
   },
@@ -2395,6 +2431,14 @@
     "translation": "Le nœud d'API cluster est introuvable."
   },
   {
+    "id": "app.import.attachment.bad_file.error",
+    "translation": "Error reading the file at: \"{{.FilePath}}\""
+  },
+  {
+    "id": "app.import.attachment.file_upload.error",
+    "translation": "Error uploading the file: \"{{.FilePath}}\""
+  },
+  {
     "id": "app.import.bulk_import.file_scan.error",
     "translation": "Erreur lors de la lecture du fichier d'importation de données"
   },
@@ -2944,7 +2988,11 @@
   },
   {
     "id": "app.notification.body.text.group_message.full",
-    "translation": "Canal : {{.ChannelName}}<br>@{{.SenderName}} - {{.Day}}/{{.Month}}, {{.Hour}}:{{.Minute}} {{.TimeZone}}"
+    "translation": "Channel: {{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.group_message.full2",
+    "translation": "@{{.SenderName}} - {{.Day}}/{{.Month}}, {{.Hour}}:{{.Minute}} {{.Timezone}}"
   },
   {
     "id": "app.notification.body.text.group_message.generic",
@@ -2952,7 +3000,11 @@
   },
   {
     "id": "app.notification.body.text.notification.full",
-    "translation": "Canal : {{.ChannelName}}<br>@{{.SenderName}} - {{.Day}}/{{.Month}}, {{.Hour}}:{{.Minute}} {{.TimeZone}}"
+    "translation": "Channel: {{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full2",
+    "translation": "@{{.SenderName}} - {{.Day}}/{{.Month}}, {{.Hour}}:{{.Minute}} {{.Timezone}}"
   },
   {
     "id": "app.notification.body.text.notification.generic",
@@ -3011,6 +3063,10 @@
     "translation": "Impossible de récupérer les plugins actifs"
   },
   {
+    "id": "app.plugin.get_statuses.app_error",
+    "translation": "Impossible de récupérer le statut d'état du plugin."
+  },
+  {
     "id": "app.plugin.install.app_error",
     "translation": "Impossible d'installer le plugin."
   },
@@ -3019,6 +3075,10 @@
     "translation": "Impossible d'installer le plugin. Un plugin avec le même ID est déjà installé."
   },
   {
+    "id": "app.plugin.install_id_failed_remove.app_error",
+    "translation": "Unable to install plugin. A plugin with the same ID is already installed and failed to be removed."
+  },
+  {
     "id": "app.plugin.invalid_id.app_error",
     "translation": "L'identifiant du plugin doit contenir au moins {{.Min}} caractères, au plus {{.Max}} caractères et correspondre à la {{.Regex}}."
   },
@@ -3159,6 +3219,10 @@
     "translation": "Le fichier envoyé a été supprimé de l'export Global Relay, car il était trop lourd à envoyer."
   },
   {
+    "id": "ent.compliance.global_relay.open_temporary_file.appError",
+    "translation": "Impossible de créer un fichier d'export CSV temporaire."
+  },
+  {
     "id": "ent.compliance.licence_disable.app_error",
     "translation": "Fonctionnalité de conformité désactivée par la licence courante. Veuillez contacter votre administrateur système concernant la mise à niveau de votre licence entreprise."
   },
@@ -3255,6 +3319,10 @@
     "translation": "Impossible de décoder les résultats de recherche"
   },
   {
+    "id": "ent.elasticsearch.start.already_started.app_error",
+    "translation": "Elasticsearch n'est pas démarré"
+  },
+  {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Impossible de créer le processeur d'opérations en masse d'Elasticsearch (Elasticsearch bulk processor)"
   },
@@ -3263,6 +3331,10 @@
     "translation": "Impossible de démarrer le processeur d'opérations en masse d'Elasticsearch (Elasticsearch bulk processor)"
   },
   {
+    "id": "ent.elasticsearch.stop.already_stopped.app_error",
+    "translation": "Elasticsearch n'est pas démarré"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "Impossible de se connecter au serveur Elasticsearch."
   },
@@ -3331,6 +3403,46 @@
     "translation": "Filtre AD/LDAP Invalide"
   },
   {
+    "id": "ent.message_export.global_relay.create_file_in_zip.app_error",
+    "translation": "Impossible de créer le fichier d'export zip."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.close.app_error",
+    "translation": "Unable to deliver the email to Global Relay."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.from_address.app_error",
+    "translation": "Unable to set the email From address."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg.app_error",
+    "translation": "Unable to set the email message."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg_data.app_error",
+    "translation": "Unable to write the email message."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.parse_mail.app_error",
+    "translation": "Unable to read the email information."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.to_address.app_error",
+    "translation": "Unable to set the email To address."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_get_file_info.app_error",
+    "translation": "Unable to get the information of the export temporary file"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_email_file.app_error",
+    "translation": "Unable to get the an email from the temporary file"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_zip_file_data.app_error",
+    "translation": "Unable to open the export temporary file"
+  },
+  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "Une erreur s'est produite lors de l'authentification du jeton MFA"
   },
@@ -4299,6 +4411,10 @@
     "translation": "La date de mise à jour doit être une date valide"
   },
   {
+    "id": "model.outgoing_hook.icon_url.app_error",
+    "translation": "Portée invalide"
+  },
+  {
     "id": "model.outgoing_hook.is_valid.callback.app_error",
     "translation": "URLs de callback invalides"
   },
@@ -4355,6 +4471,10 @@
     "translation": "Mots déclencheurs invalides"
   },
   {
+    "id": "model.outgoing_hook.username.app_error",
+    "translation": "Nom d'utilisateur invalide"
+  },
+  {
     "id": "model.plugin_command.error.app_error",
     "translation": "Une erreur s'est produite lors de l'exécution de cette commande."
   },
diff --git a/i18n/it.json b/i18n/it.json
index 98935b84f..f0f484366 100644
--- a/i18n/it.json
+++ b/i18n/it.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "actiance.xml.output.formatter.marshalToXml.appError",
+    "id": "actiance.export.marshalToXml.appError",
     "translation": "Impossibile convertire l'esportazione in XML."
   },
   {
@@ -41,7 +41,7 @@
   },
   {
     "id": "api.admin.test_email.body",
-    "translation": "<br/><br/><br/>La configurazione email di Mattermost è corretta!"
+    "translation": "La configurazione email di Mattermost è corretta!"
   },
   {
     "id": "api.admin.test_email.missing_server",
@@ -1444,7 +1444,7 @@
   },
   {
     "id": "api.reaction.town_square_read_only",
-    "translation": "Reacting to posts is not possible in read-only channels."
+    "translation": "Non è possibile reagire alle pubblicazioni nei canali in sola lettura."
   },
   {
     "id": "api.roles.patch_roles.license.error",
@@ -1736,19 +1736,23 @@
   },
   {
     "id": "api.templates.deactivate_body.info",
-    "translation": "Hai disattivato il tuo account in {{ .SiteURL }}.<br>Se questa operazione non è stata fatta da te o desideri riattivare il tuo account, contatta l'amministratore di sistema."
+    "translation": "Hai disattivato il tuo account su {{ .SiteURL }}."
   },
   {
     "id": "api.templates.deactivate_body.title",
     "translation": "Il tuo account è stato disattivato in  {{ .ServerURL }}"
   },
   {
+    "id": "api.templates.deactivate_body.warning",
+    "translation": "Se questa modifica non è stata voluta da te oppure desideri riattivare il tuo account, contatta il tuo amministratore di sistema."
+  },
+  {
     "id": "api.templates.deactivate_subject",
     "translation": "[{{ .SiteName }}] Il tuo account in {{ .ServerURL }} è stato disattivato"
   },
   {
     "id": "api.templates.email_change_body.info",
-    "translation": "Il tuo indirizzo email per {{.TeamDisplayName}} è stato cambiato in {{.NewEmail}}.<br>Se non vuoi questo cambiamento, contatta il tuo amministratore di sistema."
+    "translation": "Il tuo indirizzo email per {{.TeamDisplayName}} è stato cambiato in {{.NewEmail}}."
   },
   {
     "id": "api.templates.email_change_body.title",
@@ -1779,24 +1783,36 @@
     "translation": "Per modificare le tue preferenze di notifica, accedi al gruppo e vai su Impostazioni Account > Notifiche."
   },
   {
-    "id": "api.templates.email_info",
-    "translation": "Qualsiasi domanda, mandaci una mail: <a href='mailto:{{.SupportEmail}}' style='text-decoration: none; color:#2389D7;'>{{.SupportEmail}}</a>.<br>Cordiali Saluti,<br>Il Team {{.SiteName}}<br>"
+    "id": "api.templates.email_info1",
+    "translation": "Per qualsiasi necessità, scrivete a: "
+  },
+  {
+    "id": "api.templates.email_info2",
+    "translation": "Cordiali saluti,"
+  },
+  {
+    "id": "api.templates.email_info3",
+    "translation": "Il gruppo {{.SiteName}}"
   },
   {
     "id": "api.templates.email_organization",
     "translation": "Spedito da "
   },
   {
+    "id": "api.templates.email_warning",
+    "translation": "Se non ha deciso tu questa modifica contatta l'amministratore di sistema."
+  },
+  {
     "id": "api.templates.invite_body.button",
     "translation": "Entra nel gruppo"
   },
   {
     "id": "api.templates.invite_body.extra_info",
-    "translation": "Mattermost permette di condividere messaggi e file da PC o telefono, con ricerche e archiviazione. Dopo essere entrato in <strong>{{.TeamDisplayName}}</strong>, potrai iscriverti al tuo nuovo team e accedere a queste funzioni dall indirizzo web:<br/><br/><a href='{{.TeamURL}}'>{{.TeamURL}}</a>"
+    "translation": "Mattermost permette di condividere messaggi e file da PC o telefono, con ricerche e archiviazione. Dopo essere entrato in [[{{.TeamDisplayName}}]], potrai iscriverti al tuo nuovo team e accedere a queste funzioni dall'indirizzo web:"
   },
   {
     "id": "api.templates.invite_body.info",
-    "translation": "<strong>{{.SenderName}}</strong> ti ha invitato a entrare in <strong>{{.TeamDisplayName}}</strong>."
+    "translation": "Il gruppo {{.SenderStatus}} [[{{.SenderName}}]], ti ha invitato ad unirti a [[{{.TeamDisplayName}}]]."
   },
   {
     "id": "api.templates.invite_body.title",
@@ -1808,7 +1824,7 @@
   },
   {
     "id": "api.templates.mfa_activated_body.info",
-    "translation": "L'autenticazione multi-fattore è stata aggiunta al tuo account su {{ .SiteURL }}.<br>Se questa modifica non è stata richiesta da te, contatta l'amministratore di sistema."
+    "translation": "L'autenticazione multifattore è stata aggiunta al tuo account su {{ .SiteURL }}."
   },
   {
     "id": "api.templates.mfa_activated_body.title",
@@ -1820,7 +1836,7 @@
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
-    "translation": "L'autenticazione multi-fattore è stata rimossa dal tuo account su {{ .SiteURL }}.<br>Se questa modifica non è stata richiesta da te, contatta l'amministratore di sistema."
+    "translation": "L'autenticazione multifattore è stata rimossa dal tuo account su {{ .SiteURL }}."
   },
   {
     "id": "api.templates.mfa_deactivated_body.title",
@@ -1828,7 +1844,7 @@
   },
   {
     "id": "api.templates.password_change_body.info",
-    "translation": "La tua password per {{.TeamDisplayName}} su {{ .TeamURL }} è stata aggiornata da {{.Method}}.<br> Se questo cambiamento non è stato fatto da te, contatta il tuo amministratore di sistema."
+    "translation": "La tua password è stata aggiornata per {{.TeamDisplayName}} su {{ .TeamURL }} da {{.Method}}."
   },
   {
     "id": "api.templates.password_change_body.title",
@@ -1847,8 +1863,12 @@
     "translation": "Reimposta password"
   },
   {
-    "id": "api.templates.reset_body.info",
-    "translation": "Per cambiare la tua password, clicca su \"Resetta Password\" qui sotto.<br>Se non vuoi resettare la tua password, ignora questo messaggio e la tua password rimarrà la stessa. Il collegamento di reset scadrà in 24 ore."
+    "id": "api.templates.reset_body.info1",
+    "translation": "Per modificare la password, cliccare \"Reset Password\"."
+  },
+  {
+    "id": "api.templates.reset_body.info2",
+    "translation": "Se non intendi modificare la tua password ignora questa email e la password rimarrà invariata. Il link per il reset della password scade tra 24 ore."
   },
   {
     "id": "api.templates.reset_body.title",
@@ -1860,7 +1880,7 @@
   },
   {
     "id": "api.templates.signin_change_email.body.info",
-    "translation": "Hai aggiornato il metodo di accesso per {{ .SiteName }} a {{.Method}}.<br>Se non hai richiesto questa modifica contatta l'amministratore di sistema."
+    "translation": "Hai aggiornato il tuo metodo di accesso su {{ .SiteName }} a {{.Method}}."
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -1876,7 +1896,7 @@
   },
   {
     "id": "api.templates.user_access_token_body.info",
-    "translation": "Un token di accesso è stato aggiunto al tuo account su {{ .SiteURL }}. Può essere utilizzato per accedere a {{.SiteName}} con il tuo account.<br>Se questa operazione non l'hai fatta tu, contatta l'amministratore di sistema."
+    "translation": "Un token di accesso personale è stato aggiunto al tuo account su {{ .SiteURL }}. Può essere utilizzato per accedere a {{.SiteName}} con il tuo account."
   },
   {
     "id": "api.templates.user_access_token_body.title",
@@ -1888,7 +1908,7 @@
   },
   {
     "id": "api.templates.username_change_body.info",
-    "translation": "Il tuo username per {{.TeamDisplayName}} è stato cambiato in {{.NewUsername}}.<br>Se non vuoi questo cambiamento, contatta il tuo amministratore di sistema."
+    "translation": "Il nome utente per {{.TeamDisplayName}} è stato cambiato a {{.NewUsername}}."
   },
   {
     "id": "api.templates.username_change_body.title",
@@ -2159,6 +2179,22 @@
     "translation": "Non è possibile cambiare la password per account SSO (Single Sign-On)"
   },
   {
+    "id": "api.user.saml.app_error",
+    "translation": "Impossibile processare la richiesta di accesso SAML."
+  },
+  {
+    "id": "api.user.saml.extension_id.app_error",
+    "translation": "Id estensione non valido"
+  },
+  {
+    "id": "api.user.saml.extension_unsupported",
+    "translation": "Le estensioni non sono supportate."
+  },
+  {
+    "id": "api.user.saml.invalid_extension",
+    "translation": "L'estensione con extension_id={{.ExtensionID}} non è supportata."
+  },
+  {
     "id": "api.user.saml.not_available.app_error",
     "translation": "SAML 2.0 non configurato o non supportato su questo server."
   },
@@ -2395,6 +2431,14 @@
     "translation": "Cluster API non trovate."
   },
   {
+    "id": "app.import.attachment.bad_file.error",
+    "translation": "Errore durante la lettura del file: \"{{.FilePath}}\""
+  },
+  {
+    "id": "app.import.attachment.file_upload.error",
+    "translation": "Errore durante il caricamento del file: \"{{.FilePath}}\""
+  },
+  {
     "id": "app.import.bulk_import.file_scan.error",
     "translation": "Errore di lettura del file dati di importazione."
   },
@@ -2408,7 +2452,7 @@
   },
   {
     "id": "app.import.emoji.bad_file.error",
-    "translation": "Error reading import emoji image file. Emoji with name: \"{{.EmojiName}}\""
+    "translation": "Errore durante la lettura del file di importazione dell'emoji. Nome Emoji: \"{{.EmojiName}}\""
   },
   {
     "id": "app.import.import_channel.scheme_deleted.error",
@@ -2632,15 +2676,15 @@
   },
   {
     "id": "app.import.validate_emoji_import_data.empty.error",
-    "translation": "Import emoji data empty."
+    "translation": "Nessun dato d'importazione emoji."
   },
   {
     "id": "app.import.validate_emoji_import_data.image_missing.error",
-    "translation": "Import emoji image field missing or blank."
+    "translation": "Il campo immagine emoji manca o è vuoto."
   },
   {
     "id": "app.import.validate_emoji_import_data.name_missing.error",
-    "translation": "Import emoji name field missing or blank."
+    "translation": "Il campo nome emoji manca o è vuoto."
   },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
@@ -2944,7 +2988,11 @@
   },
   {
     "id": "app.notification.body.text.group_message.full",
-    "translation": "Canale: {{.ChannelName}}<br>@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+    "translation": "Canale: {{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.group_message.full2",
+    "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
   },
   {
     "id": "app.notification.body.text.group_message.generic",
@@ -2952,7 +3000,11 @@
   },
   {
     "id": "app.notification.body.text.notification.full",
-    "translation": "Canale: {{.ChannelName}}<br>@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+    "translation": "Canale: {{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full2",
+    "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
   },
   {
     "id": "app.notification.body.text.notification.generic",
@@ -3011,6 +3063,10 @@
     "translation": "Impossibile trovare i plugin attivi"
   },
   {
+    "id": "app.plugin.get_statuses.app_error",
+    "translation": "Impossibile recuperare lo stato del plugin"
+  },
+  {
     "id": "app.plugin.install.app_error",
     "translation": "Impossibile installare il plugin."
   },
@@ -3019,6 +3075,10 @@
     "translation": "Impossibile installare il plugin. Un plugin con lo stesso ID è già installato."
   },
   {
+    "id": "app.plugin.install_id_failed_remove.app_error",
+    "translation": "Impossibile installare il plugin. Un plugin con lo stesso ID è già installato sul sistema e non è stato possibile rimuoverlo."
+  },
+  {
     "id": "app.plugin.invalid_id.app_error",
     "translation": "L'id del plugin deve essere lungo almeno {{.Min}} caratteri, al massimo {{.Max}} caratteri e corrispondere a {{.Regex}}."
   },
@@ -3159,6 +3219,10 @@
     "translation": "Il file caricato è stato rimosso dall'esportazione Global Relay perché troppo grande per essere inviato."
   },
   {
+    "id": "ent.compliance.global_relay.open_temporary_file.appError",
+    "translation": "Impossibile aprire il file di esportazione temporaneo."
+  },
+  {
     "id": "ent.compliance.licence_disable.app_error",
     "translation": "Funzionalità non conforme alla licenza disponibile. Per favore contatta il tuo amministratore di sistema informandolo di aggiornare la licenza enterprise."
   },
@@ -3255,6 +3319,10 @@
     "translation": "Impossibile decodificare i risultati della ricerca"
   },
   {
+    "id": "ent.elasticsearch.start.already_started.app_error",
+    "translation": "Elasticsearch è già in esecuzione"
+  },
+  {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Impossibile creare il processore massivo Elasticsearch"
   },
@@ -3263,6 +3331,10 @@
     "translation": "Impossibile avviare il processore massivo Elasticsearch"
   },
   {
+    "id": "ent.elasticsearch.stop.already_stopped.app_error",
+    "translation": "Elasticsearch è già fermo"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "Connessione al server Elasticsearch fallita."
   },
@@ -3331,6 +3403,46 @@
     "translation": "Filtro AD/LDAP non valido"
   },
   {
+    "id": "ent.message_export.global_relay.create_file_in_zip.app_error",
+    "translation": "Impossibile creare il file eml."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.close.app_error",
+    "translation": "Impossibile consegnare l'email a Global Relay."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.from_address.app_error",
+    "translation": "Impossibile impostare l'indirizzo From dell'email."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg.app_error",
+    "translation": "Impossibile impostare il testo dell'email."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg_data.app_error",
+    "translation": "Impossibile scrivere il testo dell'email."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.parse_mail.app_error",
+    "translation": "Impossibile leggere le informazioni dell'email."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.to_address.app_error",
+    "translation": "Impossibile impostare l'indirizzo To dell'email."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_get_file_info.app_error",
+    "translation": "Impossibile recuperare le informazioni sul file di esportazione temporaneo"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_email_file.app_error",
+    "translation": "Impossibile recuperare l'email dal file temporaneo"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_zip_file_data.app_error",
+    "translation": "Impossibile aprire il file di esportazione temporaneo"
+  },
+  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "Errore cercando di autenticare il token MFA"
   },
@@ -3464,7 +3576,7 @@
   },
   {
     "id": "jobs.start_synchronize_job.timeout",
-    "translation": "Timeout di sincronizzazione AD/LDAP."
+    "translation": "Raggiunto timeout nel lavoro di sincronizzazione AD/LDAP."
   },
   {
     "id": "manaultesting.manual_test.parse.app_error",
@@ -4299,6 +4411,10 @@
     "translation": "Aggiorna alle deve essere un tempo valido"
   },
   {
+    "id": "model.outgoing_hook.icon_url.app_error",
+    "translation": "Icona non valida"
+  },
+  {
     "id": "model.outgoing_hook.is_valid.callback.app_error",
     "translation": "URL callback non validi"
   },
@@ -4355,6 +4471,10 @@
     "translation": "Parola di innesco non valida"
   },
   {
+    "id": "model.outgoing_hook.username.app_error",
+    "translation": "Nome utente non valido"
+  },
+  {
     "id": "model.plugin_command.error.app_error",
     "translation": "Si è verificato un errore durante l'esecuzione di questo comando."
   },
diff --git a/i18n/ja.json b/i18n/ja.json
index 459b2994c..3dc93d0bf 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "actiance.xml.output.formatter.marshalToXml.appError",
+    "id": "actiance.export.marshalToXml.appError",
     "translation": "エクスポート情報をXMLへ変換できませんでした。"
   },
   {
@@ -41,7 +41,7 @@
   },
   {
     "id": "api.admin.test_email.body",
-    "translation": "<br/><br/><br/>あなたのMattermostの電子メールアドレスは正しく設定されています!"
+    "translation": "あなたの電子メールアドレスが正しく設定されました!"
   },
   {
     "id": "api.admin.test_email.missing_server",
@@ -193,7 +193,7 @@
   },
   {
     "id": "api.channel.patch_update_channel.forbidden.app_error",
-    "translation": "チャンネルメンバーを更新できませんでした"
+    "translation": "チャンネルを更新できませんでした"
   },
   {
     "id": "api.channel.post_channel_privacy_message.error",
@@ -313,7 +313,7 @@
   },
   {
     "id": "api.command.invite_people.email_invitations_off",
-    "translation": "Email invitations are disabled, no invite(s) sent"
+    "translation": "招待メールが無効化されているため、招待メールは送信されませんでした。"
   },
   {
     "id": "api.command.invite_people.email_off",
@@ -584,7 +584,7 @@
   },
   {
     "id": "api.command_groupmsg.permission.app_error",
-    "translation": "You don't have the appropriate permissions to create a new group message."
+    "translation": "新しいグループメッセージを作成する権限がありません。"
   },
   {
     "id": "api.command_help.desc",
@@ -648,7 +648,7 @@
   },
   {
     "id": "api.command_invite_people.permission.app_error",
-    "translation": "You don't have permission to invite new users to this server."
+    "translation": "新しいユーザーをこのサーバーに招待する権限がありません。"
   },
   {
     "id": "api.command_join.desc",
@@ -744,7 +744,7 @@
   },
   {
     "id": "api.command_msg.permission.app_error",
-    "translation": "You don't have the appropriate permissions to direct message this user."
+    "translation": "このユーザーへのダイレクトメッセージを送信する権限がありません。"
   },
   {
     "id": "api.command_mute.desc",
@@ -1444,7 +1444,7 @@
   },
   {
     "id": "api.reaction.town_square_read_only",
-    "translation": "Reacting to posts is not possible in read-only channels."
+    "translation": "読み取り専用チャンネルで投稿へリアクションすることはできません。"
   },
   {
     "id": "api.roles.patch_roles.license.error",
@@ -1624,7 +1624,7 @@
   },
   {
     "id": "api.team.invite_members.disabled.app_error",
-    "translation": "Email invitations are disabled."
+    "translation": "招待メールは無効化されています。"
   },
   {
     "id": "api.team.invite_members.invalid_email.app_error",
@@ -1736,19 +1736,23 @@
   },
   {
     "id": "api.templates.deactivate_body.info",
-    "translation": "{{ .SiteURL }}のアカウントを無効化しました。<br>あなたが変更したのでなければ、システム管理者に問い合わせてください。"
+    "translation": "{{ .SiteURL }}で、あなたのアカウントは無効化されました。"
   },
   {
     "id": "api.templates.deactivate_body.title",
     "translation": "{{ .ServerURL }} のあなたのアカウントは無効化されています"
   },
   {
+    "id": "api.templates.deactivate_body.warning",
+    "translation": "この変更があなたによって行われていない場合、もしくはあなたのアカウントを再度有効化したい場合はシステム管理者に連絡してください。"
+  },
+  {
     "id": "api.templates.deactivate_subject",
     "translation": "[{{ .SiteName }}] {{ .ServerURL }} のあなたのアカウントは無効化されています"
   },
   {
     "id": "api.templates.email_change_body.info",
-    "translation": "あなたの{{.TeamDisplayName}}用の電子メールアドレスが{{.NewEmail}}に変更されました。<br>あなたが変更したのでなければ、システム管理者に問い合わせてください。"
+    "translation": "{{.TeamDisplayName}} であなたの電子メールアドレスが {{.NewEmail}} に変更されました。"
   },
   {
     "id": "api.templates.email_change_body.title",
@@ -1779,24 +1783,36 @@
     "translation": "通知設定を変更するには、チームにログインしアカウント設定から通知を選択してください。"
   },
   {
-    "id": "api.templates.email_info",
-    "translation": "何か質問があったら、いつでも私たちに問い合わせてください: <a href='mailto:{{.SupportEmail}}' style='text-decoration: none; color:#2389D7;'>{{.SupportEmail}}</a>.<br>よろしくお願いします。<br>{{.SiteName}}チームより<br>"
+    "id": "api.templates.email_info1",
+    "translation": "質問がある場合は私たちに連絡してください: "
+  },
+  {
+    "id": "api.templates.email_info2",
+    "translation": "よろしくお願いします。"
+  },
+  {
+    "id": "api.templates.email_info3",
+    "translation": "{{.SiteName}} チーム"
   },
   {
     "id": "api.templates.email_organization",
     "translation": "送信者: "
   },
   {
+    "id": "api.templates.email_warning",
+    "translation": "この変更があなたによって行われてものでない場合、システム管理者に連絡してください。"
+  },
+  {
     "id": "api.templates.invite_body.button",
     "translation": "チームに参加する"
   },
   {
     "id": "api.templates.invite_body.extra_info",
-    "translation": "Mattermostにより、メッセージやファイルをPCやスマートフォンから共有することができます。検索やアーカイブもできます。<strong>{{.TeamDisplayName}}</strong>に参加すると、新しいチームにサインインし、以下のアドレスからいつでもこの機能にアクセスできます。: <br/><br/><a href='{{.TeamURL}}'>{{.TeamURL}}</a>"
+    "translation": "Mattermostにより、メッセージやファイルをPCやスマートフォンから共有することができます。検索やアーカイブもできます。[[{{.TeamDisplayName}}]]に参加すると、新しいチームにサインインし、以下のアドレスからいつでもこの機能にアクセスできます。:"
   },
   {
     "id": "api.templates.invite_body.info",
-    "translation": "チーム {{.SenderStatus}} <strong>{{.SenderName}}</strong>は、あなたを<strong>{{.TeamDisplayName}}</strong>に招待しました。"
+    "translation": "チーム {{.SenderStatus}} [[{{.SenderName}}]] は、あなたを [[{{.TeamDisplayName}}]] に招待しました。"
   },
   {
     "id": "api.templates.invite_body.title",
@@ -1808,7 +1824,7 @@
   },
   {
     "id": "api.templates.mfa_activated_body.info",
-    "translation": "{{ .SiteURL }}のあなたのアカウントに多要素認証が追加されました。<br>あなたが変更したのでなければ、システム管理者に問い合わせてください。"
+    "translation": "多要素認証が {{ .SiteURL }} のあなたのアカウントに追加されました。"
   },
   {
     "id": "api.templates.mfa_activated_body.title",
@@ -1820,7 +1836,7 @@
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
-    "translation": "{{ .SiteURL }}のあなたのアカウントから多要素認証が削除されました。<br>あなたが変更したのでなければ、システム管理者に問い合わせてください。"
+    "translation": "多要素認証が {{ .SiteURL }} のあなたのアカウントから削除されました。"
   },
   {
     "id": "api.templates.mfa_deactivated_body.title",
@@ -1828,7 +1844,7 @@
   },
   {
     "id": "api.templates.password_change_body.info",
-    "translation": "{{.Method}}によって{{ .TeamURL }}の{{.TeamDisplayName}}のパスワードが更新されました。<br>あなたが変更したのでなければ、システム管理者へ問い合わせてください。"
+    "translation": "{{.Method}} によって {{ .TeamURL }} の {{.TeamDisplayName}} のあなたのパスワードが更新されました。"
   },
   {
     "id": "api.templates.password_change_body.title",
@@ -1847,8 +1863,12 @@
     "translation": "パスワードの初期化"
   },
   {
-    "id": "api.templates.reset_body.info",
-    "translation": "パスワードを変更するには以下の「パスワードの初期化」をクリックしてください。<br>パスワードを変更しない場合には、この電子メールは無視してかまいません。パスワードは変更されないままになります。パスワード初期化リンクは24時間で無効になります。"
+    "id": "api.templates.reset_body.info1",
+    "translation": "パスワードを変更するには、\"パスワードの初期化\" をクリックしてください。"
+  },
+  {
+    "id": "api.templates.reset_body.info2",
+    "translation": "パスワードを初期化したくない場合、このメールを無視することでパスワードは変更されません。パスワード初期化リンクは24時間後に無効となります。"
   },
   {
     "id": "api.templates.reset_body.title",
@@ -1860,7 +1880,7 @@
   },
   {
     "id": "api.templates.signin_change_email.body.info",
-    "translation": "{{ .SiteName }}のサインイン方法を{{.Method}}に更新しました。<br>あなたが変更したのでなければ、システム管理者へ問い合わせてください。"
+    "translation": "{{ .SiteName }}の {{.Method}} へのサインイン方法を更新しました。"
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -1876,7 +1896,7 @@
   },
   {
     "id": "api.templates.user_access_token_body.info",
-    "translation": "パーソナルアクセストークンが {{ .SiteURL }} のあなたのアカウントに追加されました。あなたのアカウントで {{.SiteName}} へアクセスするために利用することができます。<br>この変更があなたによって行われたものでない場合、システム管理者に連絡してください。"
+    "translation": "{{ .SiteURL }}のあなたのアカウントにパーソナルアクセストークンが追加されました。 {{.SiteName}}へあなたのアカウントでアクセスするために利用できます。"
   },
   {
     "id": "api.templates.user_access_token_body.title",
@@ -1888,7 +1908,7 @@
   },
   {
     "id": "api.templates.username_change_body.info",
-    "translation": "あなたの{{.TeamDisplayName}}用のユーザー名が{{.NewUsernamel}}に変更されました。<br>あなたがこの変更をしていない場合には、システム管理者に問い合わせてください。"
+    "translation": "{{.TeamDisplayName}} のあなたのユーザー名は {{.NewUsername}} に変更されました。"
   },
   {
     "id": "api.templates.username_change_body.title",
@@ -2159,6 +2179,22 @@
     "translation": "シングルサインオンのパスワードを初期化することはできません"
   },
   {
+    "id": "api.user.saml.app_error",
+    "translation": "SAMLログインリクエストを処理できません。"
+  },
+  {
+    "id": "api.user.saml.extension_id.app_error",
+    "translation": "不正な拡張IDです"
+  },
+  {
+    "id": "api.user.saml.extension_unsupported",
+    "translation": "拡張はサポートされていません。"
+  },
+  {
+    "id": "api.user.saml.invalid_extension",
+    "translation": "extension_id={{.ExtensionId}} の拡張はサポートされていません。"
+  },
+  {
     "id": "api.user.saml.not_available.app_error",
     "translation": "SAML 2.0 は、このサーバーでは設定されていないかサポートされていません。"
   },
@@ -2395,6 +2431,14 @@
     "translation": "クラスターAPIエンドポイントが見つかりませんでした。"
   },
   {
+    "id": "app.import.attachment.bad_file.error",
+    "translation": "ファイル読み込みエラー: \"{{.FilePath}}\""
+  },
+  {
+    "id": "app.import.attachment.file_upload.error",
+    "translation": "ファイルアップロードエラー: \"{{.FilePath}}\""
+  },
+  {
     "id": "app.import.bulk_import.file_scan.error",
     "translation": "インポートデータファイルの読み込み中にエラーが発生しました。"
   },
@@ -2408,7 +2452,7 @@
   },
   {
     "id": "app.import.emoji.bad_file.error",
-    "translation": "Error reading import emoji image file. Emoji with name: \"{{.EmojiName}}\""
+    "translation": "インポートする絵文字画像ファイルを読み込む際にエラーが発生しました。絵文字名: \"{{.EmojiName}}\""
   },
   {
     "id": "app.import.import_channel.scheme_deleted.error",
@@ -2632,15 +2676,15 @@
   },
   {
     "id": "app.import.validate_emoji_import_data.empty.error",
-    "translation": "Import emoji data empty."
+    "translation": "インポートする絵文字データが空です。"
   },
   {
     "id": "app.import.validate_emoji_import_data.image_missing.error",
-    "translation": "Import emoji image field missing or blank."
+    "translation": "インポートする絵文字画像の項目が無いか空欄です。"
   },
   {
     "id": "app.import.validate_emoji_import_data.name_missing.error",
-    "translation": "Import emoji name field missing or blank."
+    "translation": "インポートする絵文字名の項目が無いか空欄です。"
   },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
@@ -2944,7 +2988,11 @@
   },
   {
     "id": "app.notification.body.text.group_message.full",
-    "translation": "チャンネル: {{.ChannelName}}<br>@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+    "translation": "チャンネル: {{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.group_message.full2",
+    "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
   },
   {
     "id": "app.notification.body.text.group_message.generic",
@@ -2952,7 +3000,11 @@
   },
   {
     "id": "app.notification.body.text.notification.full",
-    "translation": "チャンネル: {{.ChannelName}}<br>@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+    "translation": "チャンネル: {{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full2",
+    "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
   },
   {
     "id": "app.notification.body.text.notification.generic",
@@ -3011,6 +3063,10 @@
     "translation": "有効なプラグインを取得できませんでした"
   },
   {
+    "id": "app.plugin.get_statuses.app_error",
+    "translation": "プラグインの状態を取得できません"
+  },
+  {
     "id": "app.plugin.install.app_error",
     "translation": "プラグインをインストールできません。"
   },
@@ -3019,6 +3075,10 @@
     "translation": "プラグインをインストールできません。同じIDを持つプラグインがすでにインストールされています。"
   },
   {
+    "id": "app.plugin.install_id_failed_remove.app_error",
+    "translation": "プラグインをインストールできません。同じIDのプラグインが既にインストールされており、削除できませんでした。"
+  },
+  {
     "id": "app.plugin.invalid_id.app_error",
     "translation": "プラグインIDは {{.Min}} 文字以上 {{.Max}} 文字以下で、{{.Regex}}にマッチしなければなりません。"
   },
@@ -3159,6 +3219,10 @@
     "translation": "アップロードされたファイルが大きすぎるため、Global Relayエクスポートから除去されました。"
   },
   {
+    "id": "ent.compliance.global_relay.open_temporary_file.appError",
+    "translation": "一時的なエクスポートファイルを作成できません。"
+  },
+  {
     "id": "ent.compliance.licence_disable.app_error",
     "translation": "コンプライアンス機能が現在のライセンスでは無効になっています。システム管理者にエンタープライズライセンスをアップグレードするように連絡してください。"
   },
@@ -3255,6 +3319,10 @@
     "translation": "検索結果をデコードできませんでした"
   },
   {
+    "id": "ent.elasticsearch.start.already_started.app_error",
+    "translation": "Elasticsearchは既に起動しています"
+  },
+  {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Elasticsearch Bulk Processorを生成することが出来ませんでした"
   },
@@ -3263,6 +3331,10 @@
     "translation": "Elasticsearch Bulk Processorを開始することが出来ませんでした"
   },
   {
+    "id": "ent.elasticsearch.stop.already_stopped.app_error",
+    "translation": "Elasticsearchは既に停止されています"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "Elasticsearchサーバーへ接続できませんでした"
   },
@@ -3331,6 +3403,46 @@
     "translation": "不正なAD/LDAPフィルターです"
   },
   {
+    "id": "ent.message_export.global_relay.create_file_in_zip.app_error",
+    "translation": "emlファイルを作成できません。"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.close.app_error",
+    "translation": "Global Relayへの電子メールを送信できません。"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.from_address.app_error",
+    "translation": "電子メールの送信元アドレスをを設定できません。"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg.app_error",
+    "translation": "電子メールメッセージを設定できません。"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg_data.app_error",
+    "translation": "電子メールメッセージを書き込めません。"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.parse_mail.app_error",
+    "translation": "電子メール情報を読み込めません。"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.to_address.app_error",
+    "translation": "電子メールの送信先アドレスを設定できません。"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_get_file_info.app_error",
+    "translation": "一時エクスポートファイルの情報を取得できません"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_email_file.app_error",
+    "translation": "一時ファイルから電子メールを取得できません"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_zip_file_data.app_error",
+    "translation": "一時エクスポートファイルを開けません"
+  },
+  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "多要素認証トークンを認証できません"
   },
@@ -3828,7 +3940,7 @@
   },
   {
     "id": "model.config.is_valid.display.custom_url_schemes.app_error",
-    "translation": "カスタムURLスキーム {{.Scheme}} は無効です。カスタムURLスキームは文字で始まり、文字、数字、プラス(+)、ピリオド(.)、ハイフン(-)のみが使用できます。"
+    "translation": "カスタムURLスキーム {{.Scheme}} は無効です。カスタムURLスキームは文字で始まり、文字、数字、ハイフン(-)のみが使用できます。"
   },
   {
     "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
@@ -4299,6 +4411,10 @@
     "translation": "更新日時は有効な時刻にしてください"
   },
   {
+    "id": "model.outgoing_hook.icon_url.app_error",
+    "translation": "不正なアイコンです"
+  },
+  {
     "id": "model.outgoing_hook.is_valid.callback.app_error",
     "translation": "不正なコールバックURLです"
   },
@@ -4355,6 +4471,10 @@
     "translation": "不正なトリガーワードです"
   },
   {
+    "id": "model.outgoing_hook.username.app_error",
+    "translation": "不正なユーザー名です。"
+  },
+  {
     "id": "model.plugin_command.error.app_error",
     "translation": "このコマンドを実行中にエラーが発生しました。"
   },
diff --git a/i18n/ko.json b/i18n/ko.json
index 9fd11117c..3c94a2aa7 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "actiance.xml.output.formatter.marshalToXml.appError",
+    "id": "actiance.export.marshalToXml.appError",
     "translation": "XML형식으로 변환하여 내보낼 수 없습니다."
   },
   {
@@ -41,7 +41,7 @@
   },
   {
     "id": "api.admin.test_email.body",
-    "translation": "<br/><br/><br/> Mattermost 이메일이 잘 설정된 것 같군요!"
+    "translation": "사용자의 Mattermost 이메일이 잘 설정되었습니다!"
   },
   {
     "id": "api.admin.test_email.missing_server",
@@ -193,7 +193,7 @@
   },
   {
     "id": "api.channel.patch_update_channel.forbidden.app_error",
-    "translation": "Failed to update the channel"
+    "translation": "채널 업데이트에 실패하였습니다"
   },
   {
     "id": "api.channel.post_channel_privacy_message.error",
@@ -313,7 +313,7 @@
   },
   {
     "id": "api.command.invite_people.email_invitations_off",
-    "translation": "Email invitations are disabled, no invite(s) sent"
+    "translation": "이메일 초대가 막혀있습니다, 초대가 보내지지 않았습니다."
   },
   {
     "id": "api.command.invite_people.email_off",
@@ -584,7 +584,7 @@
   },
   {
     "id": "api.command_groupmsg.permission.app_error",
-    "translation": "You don't have the appropriate permissions to create a new group message."
+    "translation": "사용자는 새로운 그룹 메시지를 만들 적절한 권한이 없습니다."
   },
   {
     "id": "api.command_help.desc",
@@ -648,7 +648,7 @@
   },
   {
     "id": "api.command_invite_people.permission.app_error",
-    "translation": "You don't have permission to invite new users to this server."
+    "translation": "이 서버로 새로운 사용자를 초대할 권한이 없습니다."
   },
   {
     "id": "api.command_join.desc",
@@ -744,7 +744,7 @@
   },
   {
     "id": "api.command_msg.permission.app_error",
-    "translation": "You don't have the appropriate permissions to direct message this user."
+    "translation": "해당 사용자에게 개인 메시지를 보낼 권한이 없습니다."
   },
   {
     "id": "api.command_mute.desc",
@@ -948,7 +948,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.date",
-    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}일"
   },
   {
     "id": "api.email_batching.render_batched_post.direct_message",
@@ -976,7 +976,7 @@
   {
     "id": "api.email_batching.send_batched_email_notification.subject",
     "translation": {
-      "one": "[{{.SiteName}}] 새 알림 {{.Month}} {{.Day}}, {{.Year}}",
+      "one": "[{{.SiteName}}] (으)로부터 {{.Month}} {{.Day}}, {{.Year}} 에 새 알림이 왔습니다[{{.SiteName}}] (으)로부터 {{.Month}} {{.Day}}, {{.Year}} 에 새 알림들이 왔습니다",
       "other": ""
     }
   },
@@ -1444,7 +1444,7 @@
   },
   {
     "id": "api.reaction.town_square_read_only",
-    "translation": "Reacting to posts is not possible in read-only channels."
+    "translation": "읽기 전용 채널에서는 메시지에 응답할 수 없습니다."
   },
   {
     "id": "api.roles.patch_roles.license.error",
@@ -1624,7 +1624,7 @@
   },
   {
     "id": "api.team.invite_members.disabled.app_error",
-    "translation": "Email invitations are disabled."
+    "translation": "이메일 초대가 막혀있습니다."
   },
   {
     "id": "api.team.invite_members.invalid_email.app_error",
@@ -1716,11 +1716,11 @@
   },
   {
     "id": "api.team.set_team_icon.write_file.app_error",
-    "translation": "팀 아이콘을 decode할 수 없습니다."
+    "translation": "팀 아이콘을 저장할 수 없습니다."
   },
   {
     "id": "api.team.team_icon.update.app_error",
-    "translation": "팀을 받아오는 도중에 문제가 발생했습니다."
+    "translation": "팀 아이콘을 업데이트 하는 도중 문제가 발생했습니다."
   },
   {
     "id": "api.team.update_member_roles.not_a_member",
@@ -1728,27 +1728,31 @@
   },
   {
     "id": "api.team.update_team_scheme.license.error",
-    "translation": "지금 라이선스는 고급 퍼미션을 지원하지 않습니다."
+    "translation": "사용자의 라이센스는 팀 스키마의 업데이트를 지원하지 않습니다."
   },
   {
     "id": "api.team.update_team_scheme.scheme_scope.error",
-    "translation": "제공된 스키마는 채널의 스키마가 아니기 때문에 채널에 적용시킬 수 없습니다."
+    "translation": "제공된 스키마가 팀 스키마가 아니기 때문에 해당 스키마를 적용할 수 없습니다."
   },
   {
     "id": "api.templates.deactivate_body.info",
-    "translation": "You deactivated your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you or you want to reactivate your account, contact your system administrator."
+    "translation": "사용자 본인이 {{ .SiteURL }}에서 계정을 정지했습니다."
   },
   {
     "id": "api.templates.deactivate_body.title",
     "translation": "Your account has been deactivated at {{ .ServerURL }}"
   },
   {
+    "id": "api.templates.deactivate_body.warning",
+    "translation": "If this change was not initiated by you or you want to reactivate your account, contact your system administrator."
+  },
+  {
     "id": "api.templates.deactivate_subject",
     "translation": "[{{ .SiteName }}] Your account at {{ .ServerURL }} has been deactivated"
   },
   {
     "id": "api.templates.email_change_body.info",
-    "translation": "{{.TeamDisplayName}} 이메일이 {{.NewEmail}}(으)로 변경되었습니다.<br> 잘못 변경된 경우, 시스템 관리자에게 문의하세요."
+    "translation": "Your email address for {{.TeamDisplayName}} has been changed to {{.NewEmail}}."
   },
   {
     "id": "api.templates.email_change_body.title",
@@ -1779,14 +1783,26 @@
     "translation": "알림 설정을 변경하려면, 팀 사이트에 로그인 후 계정 설정> 알림 메뉴를 확인하세요."
   },
   {
-    "id": "api.templates.email_info",
-    "translation": "Any questions at all, mail us any time: <a href='mailto:{{.SupportEmail}}' style='text-decoration: none; color:#2389D7;'>{{.SupportEmail}}</a>.<br>Best wishes,<br>The {{.SiteName}} Team<br>"
+    "id": "api.templates.email_info1",
+    "translation": "Any questions at all, mail us any time: "
+  },
+  {
+    "id": "api.templates.email_info2",
+    "translation": "Best wishes,"
+  },
+  {
+    "id": "api.templates.email_info3",
+    "translation": "The {{.SiteName}} Team"
   },
   {
     "id": "api.templates.email_organization",
     "translation": "발신: "
   },
   {
+    "id": "api.templates.email_warning",
+    "translation": "If you did not make this change, please contact the system administrator."
+  },
+  {
     "id": "api.templates.invite_body.button",
     "translation": "팀 참여하기"
   },
@@ -1796,7 +1812,7 @@
   },
   {
     "id": "api.templates.invite_body.info",
-    "translation": "The team {{.SenderStatus}} <strong>{{.SenderName}}</strong>, has invited you to join <strong>{{.TeamDisplayName}}</strong>."
+    "translation": "The team {{.SenderStatus}} [[{{.SenderName}}]], has invited you to join [[{{.TeamDisplayName}}]]."
   },
   {
     "id": "api.templates.invite_body.title",
@@ -1808,7 +1824,7 @@
   },
   {
     "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."
+    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.mfa_activated_body.title",
@@ -1820,7 +1836,7 @@
   },
   {
     "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."
+    "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.mfa_deactivated_body.title",
@@ -1828,7 +1844,7 @@
   },
   {
     "id": "api.templates.password_change_body.info",
-    "translation": "{{.TeamDisplayName}}의 비밀번호가 변경되었습니다. {{.TeamURL}} {{.Method}}<br>의도하지 않은 변경인 경우, 시스템 관리자에게 문의해보세요."
+    "translation": "Your password has been updated for {{.TeamDisplayName}} on {{ .TeamURL }} by {{.Method}}."
   },
   {
     "id": "api.templates.password_change_body.title",
@@ -1847,8 +1863,12 @@
     "translation": "비밀번호 재설정"
   },
   {
-    "id": "api.templates.reset_body.info",
-    "translation": "비밀번호를 변경하려면, \"비밀번호 재설정\"을 누르세요.<br>이 이메일을 무시하면, 기존 비밀번호가 유지됩니다. 비밀번호 재설정 링크는 24시간 후에 만료됩니다."
+    "id": "api.templates.reset_body.info1",
+    "translation": "To change your password, click \"Reset Password\" below."
+  },
+  {
+    "id": "api.templates.reset_body.info2",
+    "translation": "If you did not mean to reset your password, please ignore this email and your password will remain the same. The password reset link expires in 24 hours."
   },
   {
     "id": "api.templates.reset_body.title",
@@ -1860,7 +1880,7 @@
   },
   {
     "id": "api.templates.signin_change_email.body.info",
-    "translation": "You updated your sign-in method for on {{ .SiteName }} to {{.Method}}.<br>If this change wasn't initiated by you, please contact your system administrator."
+    "translation": "You updated your sign-in method on {{ .SiteName }}"
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -1876,7 +1896,7 @@
   },
   {
     "id": "api.templates.user_access_token_body.info",
-    "translation": "A personal access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account.<br>If this change wasn't initiated by you, please contact your system administrator."
+    "translation": "A personal access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account."
   },
   {
     "id": "api.templates.user_access_token_body.title",
@@ -1888,7 +1908,7 @@
   },
   {
     "id": "api.templates.username_change_body.info",
-    "translation": "{{.TeamDisplayName}} 사용자명이 {{.NewUsername}}(으)로 변경되었습니다.<br> 잘못 변경된 경우, 시스템 관리자에게 문의하세요."
+    "translation": "Your username for {{.TeamDisplayName}} has been changed to {{.NewUsername}}."
   },
   {
     "id": "api.templates.username_change_body.title",
@@ -2159,6 +2179,22 @@
     "translation": "SSO 계정의 비밀번호를 재설정 할 수 없습니다."
   },
   {
+    "id": "api.user.saml.app_error",
+    "translation": "Unable to process SAML login request."
+  },
+  {
+    "id": "api.user.saml.extension_id.app_error",
+    "translation": "유효하지 않은 액션 ID"
+  },
+  {
+    "id": "api.user.saml.extension_unsupported",
+    "translation": "Extensions are not supported."
+  },
+  {
+    "id": "api.user.saml.invalid_extension",
+    "translation": "Extension with extension_id={{.ExtensionId}} is not supported."
+  },
+  {
     "id": "api.user.saml.not_available.app_error",
     "translation": "SAML이 설정되지 않았거나 서버에서 지원하지 않습니다"
   },
@@ -2395,6 +2431,14 @@
     "translation": "Cluster API endpoint not found."
   },
   {
+    "id": "app.import.attachment.bad_file.error",
+    "translation": "Error reading the file at: \"{{.FilePath}}\""
+  },
+  {
+    "id": "app.import.attachment.file_upload.error",
+    "translation": "Error uploading the file: \"{{.FilePath}}\""
+  },
+  {
     "id": "app.import.bulk_import.file_scan.error",
     "translation": "Error reading import data file."
   },
@@ -2436,7 +2480,7 @@
   },
   {
     "id": "app.import.import_direct_channel.update_header_failed.error",
-    "translation": "Failed to update direct channel header"
+    "translation": "채널 업데이트에 실패하였습니다"
   },
   {
     "id": "app.import.import_direct_post.channel_member_not_found.error",
@@ -2936,43 +2980,51 @@
   },
   {
     "id": "app.notification.body.text.direct.full",
-    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+    "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}일"
   },
   {
     "id": "app.notification.body.text.direct.generic",
-    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}일"
   },
   {
     "id": "app.notification.body.text.group_message.full",
-    "translation": "채널: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+    "translation": "Channel: {{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.group_message.full2",
+    "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}일"
   },
   {
     "id": "app.notification.body.text.group_message.generic",
-    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}일"
   },
   {
     "id": "app.notification.body.text.notification.full",
-    "translation": "채널: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+    "translation": "Channel: {{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full2",
+    "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}일"
   },
   {
     "id": "app.notification.body.text.notification.generic",
-    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}일"
   },
   {
     "id": "app.notification.subject.direct.full",
-    "translation": "[{{.SiteName}}] {{.SenderDisplayName}} (으)로부터 {{.Month}} {{.Day}}, {{.Year}} 에 새로운 개인 메시지가 왔습니다."
+    "translation": "[{{.SiteName}}] {{.SenderDisplayName}} (으)로부터 {{.Month}} {{.Day}}일, {{.Year}} 에 새로운 개인 메시지가 왔습니다."
   },
   {
     "id": "app.notification.subject.group_message.full",
-    "translation": "[{{.SiteName}}] {{.SenderDisplayName}} (으)로부터 {{.Month}} {{.Day}}, {{.Year}} 에 새로운 개인 메시지가 왔습니다."
+    "translation": "[{{.SiteName}}] {{.SenderDisplayName}} (으)로부터 {{.Month}} {{.Day}}일, {{.Year}} 에 새로운 그룹 메시지가 왔습니다."
   },
   {
     "id": "app.notification.subject.group_message.generic",
-    "translation": "[{{.SiteName}}] 새 알림 {{.Month}} {{.Day}}, {{.Year}}"
+    "translation": "[{{.SiteName}}] (으)로부터 {{.Month}} {{.Day}}일, {{.Year}}에 새로운 그룹 메시지가 왔습니다."
   },
   {
     "id": "app.notification.subject.notification.full",
-    "translation": "[{{.SiteName}}] {{.SenderDisplayName}} (으)로부터 {{.Month}} {{.Day}}, {{.Year}} 에 새로운 개인 메시지가 왔습니다."
+    "translation": "[{{.SiteName}}] {{.TeamName}} (으)로부터 {{.Month}} {{.Day}}, {{.Year}} 에 알림이 왔습니다."
   },
   {
     "id": "app.plugin.activate.app_error",
@@ -3011,6 +3063,10 @@
     "translation": "Unable to get active plugins"
   },
   {
+    "id": "app.plugin.get_statuses.app_error",
+    "translation": "Unable to get plugin statuses"
+  },
+  {
     "id": "app.plugin.install.app_error",
     "translation": "Unable to install plugin."
   },
@@ -3019,6 +3075,10 @@
     "translation": "Unable to install plugin. A plugin with the same ID is already installed."
   },
   {
+    "id": "app.plugin.install_id_failed_remove.app_error",
+    "translation": "Unable to install plugin. A plugin with the same ID is already installed and failed to be removed."
+  },
+  {
     "id": "app.plugin.invalid_id.app_error",
     "translation": "Plugin Id must be at least {{.Min}} characters, at most {{.Max}} characters and match {{.Regex}}."
   },
@@ -3159,6 +3219,10 @@
     "translation": "Uploaded file was removed from Global Relay export because it was too large to send."
   },
   {
+    "id": "ent.compliance.global_relay.open_temporary_file.appError",
+    "translation": "Unable to open the temporary export file."
+  },
+  {
     "id": "ent.compliance.licence_disable.app_error",
     "translation": "Compliance 기능을 활성화 하려면 엔터프라이즈 라이센스가 필요합니다. 시스템 관리자에게 업그레이드를 문의해보세요."
   },
@@ -3255,6 +3319,10 @@
     "translation": "Failed to decode search results"
   },
   {
+    "id": "ent.elasticsearch.start.already_started.app_error",
+    "translation": "Elasticsearch is already started"
+  },
+  {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Failed to create Elasticsearch bulk processor"
   },
@@ -3263,6 +3331,10 @@
     "translation": "Failed to start Elasticsearch bulk processor"
   },
   {
+    "id": "ent.elasticsearch.stop.already_stopped.app_error",
+    "translation": "Elasticsearch is already stopped"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "Connecting to Elasticsearch server failed."
   },
@@ -3331,6 +3403,46 @@
     "translation": "잘못된 AD/LDAP 필터"
   },
   {
+    "id": "ent.message_export.global_relay.create_file_in_zip.app_error",
+    "translation": "Unable to create the eml file."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.close.app_error",
+    "translation": "Unable to deliver the email to Global Relay."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.from_address.app_error",
+    "translation": "Unable to set the email From address."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg.app_error",
+    "translation": "Unable to set the email message."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg_data.app_error",
+    "translation": "Unable to write the email message."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.parse_mail.app_error",
+    "translation": "Unable to read the email information."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.to_address.app_error",
+    "translation": "Unable to set the email To address."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_get_file_info.app_error",
+    "translation": "Unable to get the information of the export temporary file"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_email_file.app_error",
+    "translation": "Unable to get the an email from the temporary file"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_zip_file_data.app_error",
+    "translation": "Unable to open the export temporary file"
+  },
+  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "Error attempting to authenticate MFA token"
   },
@@ -3464,7 +3576,7 @@
   },
   {
     "id": "jobs.start_synchronize_job.timeout",
-    "translation": "Reached AD/LDAP sychronization job timeout."
+    "translation": "Reached AD/LDAP synchronization job timeout."
   },
   {
     "id": "manaultesting.manual_test.parse.app_error",
@@ -4299,6 +4411,10 @@
     "translation": "Update at must be a valid time"
   },
   {
+    "id": "model.outgoing_hook.icon_url.app_error",
+    "translation": "잘못된 범위"
+  },
+  {
     "id": "model.outgoing_hook.is_valid.callback.app_error",
     "translation": "Invalid callback urls"
   },
@@ -4355,6 +4471,10 @@
     "translation": "Invalid trigger words"
   },
   {
+    "id": "model.outgoing_hook.username.app_error",
+    "translation": "잘못된 유저이름입니다."
+  },
+  {
     "id": "model.plugin_command.error.app_error",
     "translation": "An error occurred while trying to execute this command."
   },
@@ -4616,11 +4736,11 @@
   },
   {
     "id": "store.sql_channel.clear_all_custom_role_assignments.select.app_error",
-    "translation": "Failed to retrieve the channel members"
+    "translation": "채널 업데이트에 실패하였습니다"
   },
   {
     "id": "store.sql_channel.clear_all_custom_role_assignments.update.app_error",
-    "translation": "Failed to update the channel member"
+    "translation": "채널 업데이트에 실패하였습니다"
   },
   {
     "id": "store.sql_channel.delete.channel.app_error",
@@ -4748,7 +4868,7 @@
   },
   {
     "id": "store.sql_channel.migrate_channel_members.update.app_error",
-    "translation": "Failed to update the channel member"
+    "translation": "채널 업데이트에 실패하였습니다"
   },
   {
     "id": "store.sql_channel.permanent_delete.app_error",
@@ -5620,11 +5740,11 @@
   },
   {
     "id": "store.sql_team.clear_all_custom_role_assignments.select.app_error",
-    "translation": "Failed to retrieve the team members"
+    "translation": "채널 업데이트에 실패하였습니다"
   },
   {
     "id": "store.sql_team.clear_all_custom_role_assignments.update.app_error",
-    "translation": "Failed to update the team member"
+    "translation": "채널 업데이트에 실패하였습니다"
   },
   {
     "id": "store.sql_team.get.find.app_error",
@@ -5700,7 +5820,7 @@
   },
   {
     "id": "store.sql_team.migrate_team_members.update.app_error",
-    "translation": "Failed to update the team member"
+    "translation": "채널 업데이트에 실패하였습니다"
   },
   {
     "id": "store.sql_team.permanent_delete.app_error",
@@ -5800,7 +5920,7 @@
   },
   {
     "id": "store.sql_user.clear_all_custom_role_assignments.update.app_error",
-    "translation": "Failed to update the user"
+    "translation": "채널 업데이트에 실패하였습니다"
   },
   {
     "id": "store.sql_user.get.app_error",
diff --git a/i18n/nl.json b/i18n/nl.json
index d0735b9c2..79ae4386d 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "actiance.xml.output.formatter.marshalToXml.appError",
+    "id": "actiance.export.marshalToXml.appError",
     "translation": "Unable to convert export to XML."
   },
   {
@@ -1736,19 +1736,23 @@
   },
   {
     "id": "api.templates.deactivate_body.info",
-    "translation": "You deactivated your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you or you want to reactivate your account, contact your system administrator."
+    "translation": "You deactivated your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.deactivate_body.title",
     "translation": "Your account has been deactivated at {{ .ServerURL }}"
   },
   {
+    "id": "api.templates.deactivate_body.warning",
+    "translation": "If this change was not initiated by you or you want to reactivate your account, contact your system administrator."
+  },
+  {
     "id": "api.templates.deactivate_subject",
     "translation": "[{{ .SiteName }}] Your account at {{ .ServerURL }} has been deactivated"
   },
   {
     "id": "api.templates.email_change_body.info",
-    "translation": "Uw e-mailadres voor {{.TeamDisplayName}} is veranderd naar {{.NewEmail}}.<br>Als u deze wijziging niet zelf gemaakt hebt, neem kontakt op met de systeembeheerder."
+    "translation": "Your email address for {{.TeamDisplayName}} has been changed to {{.NewEmail}}."
   },
   {
     "id": "api.templates.email_change_body.title",
@@ -1779,14 +1783,26 @@
     "translation": "Om je notificatie instellingen te wijzigen moet je inloggen op je team site en ga naar Account Instellingen > Notificaties."
   },
   {
-    "id": "api.templates.email_info",
-    "translation": "Alle vragen kan je altijd mailen naar: <a href='mailto:{{.SupportEmail}}' style='text-decoration: none; color:#2389D7;'>{{.SupportEmail}}</a>.<br>Groeten,<br>Het {{.SiteName}} team<br>"
+    "id": "api.templates.email_info1",
+    "translation": "Any questions at all, mail us any time: "
+  },
+  {
+    "id": "api.templates.email_info2",
+    "translation": "Best wishes,"
+  },
+  {
+    "id": "api.templates.email_info3",
+    "translation": "The {{.SiteName}} Team"
   },
   {
     "id": "api.templates.email_organization",
     "translation": "Verzonden door "
   },
   {
+    "id": "api.templates.email_warning",
+    "translation": "If you did not make this change, please contact the system administrator."
+  },
+  {
     "id": "api.templates.invite_body.button",
     "translation": "Lid worden van team"
   },
@@ -1796,7 +1812,7 @@
   },
   {
     "id": "api.templates.invite_body.info",
-    "translation": "Het team {{.SenderStatus}} <strong>{{.SenderName}}</strong>, heeft u uitgenodigt om lid te worden van <strong>{{.TeamDisplayName}}</strong>."
+    "translation": "The team {{.SenderStatus}} [[{{.SenderName}}]], has invited you to join [[{{.TeamDisplayName}}]]."
   },
   {
     "id": "api.templates.invite_body.title",
@@ -1808,7 +1824,7 @@
   },
   {
     "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."
+    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.mfa_activated_body.title",
@@ -1820,7 +1836,7 @@
   },
   {
     "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."
+    "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.mfa_deactivated_body.title",
@@ -1828,7 +1844,7 @@
   },
   {
     "id": "api.templates.password_change_body.info",
-    "translation": "Uw wachtwoord is bijgewerkt voor {{.TeamDisplayName}} op {{.teamURL}} via {{.Method}}.<br>Als deze aanpassing niet door U uitgevoerd was, neem contact op met uw systeembeheerder."
+    "translation": "Your password has been updated for {{.TeamDisplayName}} on {{ .TeamURL }} by {{.Method}}."
   },
   {
     "id": "api.templates.password_change_body.title",
@@ -1847,8 +1863,12 @@
     "translation": "Wachtwoord opnieuw instellen"
   },
   {
-    "id": "api.templates.reset_body.info",
-    "translation": "Om uw wachtwoord aan te passen, klik hieronder op \"Reset Wachtwoord\".<br>Als het niet de bedoeling was om het wachtwoord aan te passen, negeer deze mail en het wachtwoord blijft onveranderd. De link verloopt automatisch na 24 uur."
+    "id": "api.templates.reset_body.info1",
+    "translation": "To change your password, click \"Reset Password\" below."
+  },
+  {
+    "id": "api.templates.reset_body.info2",
+    "translation": "If you did not mean to reset your password, please ignore this email and your password will remain the same. The password reset link expires in 24 hours."
   },
   {
     "id": "api.templates.reset_body.title",
@@ -1860,7 +1880,7 @@
   },
   {
     "id": "api.templates.signin_change_email.body.info",
-    "translation": "Uw inlog methode is bijgewerkt voor {{.SiteName}} naar {{.Method}}.<br>Als deze aanpassing niet door U gedaan is, neem dan contact op met uw systeembeheerder."
+    "translation": "U heeft uw inlog methode op {{ .SiteName }} bijgewerkt"
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -1876,7 +1896,7 @@
   },
   {
     "id": "api.templates.user_access_token_body.info",
-    "translation": "A personal access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account.<br>If this change wasn't initiated by you, please contact your system administrator."
+    "translation": "A personal access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account."
   },
   {
     "id": "api.templates.user_access_token_body.title",
@@ -1888,7 +1908,7 @@
   },
   {
     "id": "api.templates.username_change_body.info",
-    "translation": "Uw e-mailadres voor {{.TeamDisplayName}} is veranderd naar {{.NewEmail}}.<br>Als u deze wijziging niet zelf gemaakt hebt, neem kontakt op met de systeembeheerder."
+    "translation": "Your username for {{.TeamDisplayName}} has been changed to {{.NewUsername}}."
   },
   {
     "id": "api.templates.username_change_body.title",
@@ -2159,6 +2179,22 @@
     "translation": "Kan het wachtwoord niet resetten voor SSO accounts"
   },
   {
+    "id": "api.user.saml.app_error",
+    "translation": "Unable to process SAML login request."
+  },
+  {
+    "id": "api.user.saml.extension_id.app_error",
+    "translation": "Ongeldig client id "
+  },
+  {
+    "id": "api.user.saml.extension_unsupported",
+    "translation": "Extensions are not supported."
+  },
+  {
+    "id": "api.user.saml.invalid_extension",
+    "translation": "Extension with extension_id={{.ExtensionId}} is not supported."
+  },
+  {
     "id": "api.user.saml.not_available.app_error",
     "translation": "SAML wordt niet ondersteund, of is niet geconfigureerd op deze server."
   },
@@ -2395,6 +2431,14 @@
     "translation": "Cluster API endpoint not found."
   },
   {
+    "id": "app.import.attachment.bad_file.error",
+    "translation": "Error reading the file at: \"{{.FilePath}}\""
+  },
+  {
+    "id": "app.import.attachment.file_upload.error",
+    "translation": "Error uploading the file: \"{{.FilePath}}\""
+  },
+  {
     "id": "app.import.bulk_import.file_scan.error",
     "translation": "Error reading import data file."
   },
@@ -2944,7 +2988,11 @@
   },
   {
     "id": "app.notification.body.text.group_message.full",
-    "translation": "KANAAL: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+    "translation": "Channel: {{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.group_message.full2",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
   },
   {
     "id": "app.notification.body.text.group_message.generic",
@@ -2952,7 +3000,11 @@
   },
   {
     "id": "app.notification.body.text.notification.full",
-    "translation": "KANAAL: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+    "translation": "Channel: {{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full2",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
   },
   {
     "id": "app.notification.body.text.notification.generic",
@@ -3011,6 +3063,10 @@
     "translation": "Unable to get active plugins"
   },
   {
+    "id": "app.plugin.get_statuses.app_error",
+    "translation": "Unable to get plugin statuses"
+  },
+  {
     "id": "app.plugin.install.app_error",
     "translation": "Unable to install plugin."
   },
@@ -3019,6 +3075,10 @@
     "translation": "Unable to install plugin. A plugin with the same ID is already installed."
   },
   {
+    "id": "app.plugin.install_id_failed_remove.app_error",
+    "translation": "Unable to install plugin. A plugin with the same ID is already installed and failed to be removed."
+  },
+  {
     "id": "app.plugin.invalid_id.app_error",
     "translation": "Plugin Id must be at least {{.Min}} characters, at most {{.Max}} characters and match {{.Regex}}."
   },
@@ -3159,6 +3219,10 @@
     "translation": "Uploaded file was removed from Global Relay export because it was too large to send."
   },
   {
+    "id": "ent.compliance.global_relay.open_temporary_file.appError",
+    "translation": "Unable to open the temporary export file."
+  },
+  {
     "id": "ent.compliance.licence_disable.app_error",
     "translation": "Compliance functionaliteit is uitgeschakeld met de huidige licentie. Neem contact op met de beheerder voor een upgrade van de licentie."
   },
@@ -3255,6 +3319,10 @@
     "translation": "Failed to decode search results"
   },
   {
+    "id": "ent.elasticsearch.start.already_started.app_error",
+    "translation": "Elasticsearch is already started"
+  },
+  {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Failed to create Elasticsearch bulk processor"
   },
@@ -3263,6 +3331,10 @@
     "translation": "Failed to start Elasticsearch bulk processor"
   },
   {
+    "id": "ent.elasticsearch.stop.already_stopped.app_error",
+    "translation": "Elasticsearch is already stopped"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "Connectie naar Elasticsearch server is mislukt."
   },
@@ -3331,6 +3403,46 @@
     "translation": "Ongeldig AD/LDAP filter"
   },
   {
+    "id": "ent.message_export.global_relay.create_file_in_zip.app_error",
+    "translation": "Unable to create the eml file."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.close.app_error",
+    "translation": "Unable to deliver the email to Global Relay."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.from_address.app_error",
+    "translation": "Unable to set the email From address."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg.app_error",
+    "translation": "Unable to set the email message."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg_data.app_error",
+    "translation": "Unable to write the email message."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.parse_mail.app_error",
+    "translation": "Unable to read the email information."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.to_address.app_error",
+    "translation": "Unable to set the email To address."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_get_file_info.app_error",
+    "translation": "Unable to get the information of the export temporary file"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_email_file.app_error",
+    "translation": "Unable to get the an email from the temporary file"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_zip_file_data.app_error",
+    "translation": "Unable to open the export temporary file"
+  },
+  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "Probleem bij het authenticeren met een MFA token"
   },
@@ -3464,7 +3576,7 @@
   },
   {
     "id": "jobs.start_synchronize_job.timeout",
-    "translation": "Reached AD/LDAP sychronization job timeout."
+    "translation": "Reached AD/LDAP synchronization job timeout."
   },
   {
     "id": "manaultesting.manual_test.parse.app_error",
@@ -4299,6 +4411,10 @@
     "translation": "Het veld 'bijgewerkt op' moet een geldige tijd zijn"
   },
   {
+    "id": "model.outgoing_hook.icon_url.app_error",
+    "translation": "Ongeldige omgeving"
+  },
+  {
     "id": "model.outgoing_hook.is_valid.callback.app_error",
     "translation": "Ongeldige 'callback' urls"
   },
@@ -4355,6 +4471,10 @@
     "translation": "Ongeldige trigger-woorden"
   },
   {
+    "id": "model.outgoing_hook.username.app_error",
+    "translation": "Ongeldige gebruikersnaam"
+  },
+  {
     "id": "model.plugin_command.error.app_error",
     "translation": "An error occurred while trying to execute this command."
   },
diff --git a/i18n/pl.json b/i18n/pl.json
index ccc699364..95a58e346 100644
--- a/i18n/pl.json
+++ b/i18n/pl.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "actiance.xml.output.formatter.marshalToXml.appError",
+    "id": "actiance.export.marshalToXml.appError",
     "translation": "Unable to convert export to XML."
   },
   {
@@ -1736,19 +1736,23 @@
   },
   {
     "id": "api.templates.deactivate_body.info",
-    "translation": "You deactivated your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you or you want to reactivate your account, contact your system administrator."
+    "translation": "You deactivated your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.deactivate_body.title",
     "translation": "Your account has been deactivated at {{ .ServerURL }}"
   },
   {
+    "id": "api.templates.deactivate_body.warning",
+    "translation": "If this change was not initiated by you or you want to reactivate your account, contact your system administrator."
+  },
+  {
     "id": "api.templates.deactivate_subject",
     "translation": "[{{ .SiteName }}] Your account at {{ .ServerURL }} has been deactivated"
   },
   {
     "id": "api.templates.email_change_body.info",
-    "translation": "Twój adres e-mail na {{.TeamDisplayName}} został zmieniony na {{.NewEmail}}.<br>Jeśli to nie ty dokonałeś tej zmiany, skontaktuj się z administratorem systemu."
+    "translation": "Your email address for {{.TeamDisplayName}} has been changed to {{.NewEmail}}."
   },
   {
     "id": "api.templates.email_change_body.title",
@@ -1779,14 +1783,26 @@
     "translation": "Aby zmienić ustawienia powiadomień, zaloguj się na stronę zespołu i przejdź w Ustawienia konta > powiadomienia."
   },
   {
-    "id": "api.templates.email_info",
-    "translation": "Jeśli masz jakiekolwiek pytania, napisz do nas : <a href='mailto:{{.SupportEmail}}' style='text-decoration: none; color:#2389D7;'>{{.SupportEmail}}</a>.<br>Pozdrawiamy<br>Zespół {{.SiteName}}<br>"
+    "id": "api.templates.email_info1",
+    "translation": "Any questions at all, mail us any time: "
+  },
+  {
+    "id": "api.templates.email_info2",
+    "translation": "Best wishes,"
+  },
+  {
+    "id": "api.templates.email_info3",
+    "translation": "The {{.SiteName}} Team"
   },
   {
     "id": "api.templates.email_organization",
     "translation": "Wysłane przez"
   },
   {
+    "id": "api.templates.email_warning",
+    "translation": "If you did not make this change, please contact the system administrator."
+  },
+  {
     "id": "api.templates.invite_body.button",
     "translation": "Dołącz zespół"
   },
@@ -1796,7 +1812,7 @@
   },
   {
     "id": "api.templates.invite_body.info",
-    "translation": "Zespół {{.SenderStatus}} <strong>{{.SenderName}}</strong>, zaprasza Cię do przyłączenia się do <strong>{{.TeamDisplayName}}</strong>."
+    "translation": "The team {{.SenderStatus}} [[{{.SenderName}}]], has invited you to join [[{{.TeamDisplayName}}]]."
   },
   {
     "id": "api.templates.invite_body.title",
@@ -1808,7 +1824,7 @@
   },
   {
     "id": "api.templates.mfa_activated_body.info",
-    "translation": "Weryfikacja wieloetapowa została dodana do Twojego konta na {{ .SiteURL }}.<br>Jeżeli ta zmiana nie została zainicjowana przez Ciebie, skontaktuj się z administratorem systemu."
+    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.mfa_activated_body.title",
@@ -1820,7 +1836,7 @@
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
-    "translation": "Weryfikacja wieloetapowa została wyłączona na Twoim koncie na {{ .SiteURL }}.<br>Jeżeli ta zmiana nie została zainicjowana przez Ciebie, skontaktuj się z administratorem systemu."
+    "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.mfa_deactivated_body.title",
@@ -1828,7 +1844,7 @@
   },
   {
     "id": "api.templates.password_change_body.info",
-    "translation": "Twoje hasło dla {{.TeamDisplayName}} na {{ .TeamURL }} zostało zmienione poprzez {{.Method}}.<br>Jeśli ta zmiana nie została zainicjowana przez Ciebie, skontaktuj się z administratorem systemu."
+    "translation": "Your password has been updated for {{.TeamDisplayName}} on {{ .TeamURL }} by {{.Method}}."
   },
   {
     "id": "api.templates.password_change_body.title",
@@ -1847,8 +1863,12 @@
     "translation": "Zresetuj hasło"
   },
   {
-    "id": "api.templates.reset_body.info",
-    "translation": "Aby zmienić hasło, kliknij poniższy przycisk \"resetuj hasło\".<br>Jeśli zmiana hasła nie została zainicjowana przez Ciebie, zignoruj tą wiadomość a Twoje hasło nie ulegnie zmianie. Link do resetowania hasła wygasa w ciągu 24 godzin."
+    "id": "api.templates.reset_body.info1",
+    "translation": "To change your password, click \"Reset Password\" below."
+  },
+  {
+    "id": "api.templates.reset_body.info2",
+    "translation": "If you did not mean to reset your password, please ignore this email and your password will remain the same. The password reset link expires in 24 hours."
   },
   {
     "id": "api.templates.reset_body.title",
@@ -1860,7 +1880,7 @@
   },
   {
     "id": "api.templates.signin_change_email.body.info",
-    "translation": "Zmieniono metodę logowania do {{ .SiteName }} na {{.Method}}.<br>Jeśli zmiana nie została zainicjowana przez ciebie, skontaktuj się z administratorem systemu."
+    "translation": "Zmieniono metodę logowania dla {{ .SiteName }}"
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -1876,7 +1896,7 @@
   },
   {
     "id": "api.templates.user_access_token_body.info",
-    "translation": "Osobisty token dostępu został dodany do twojego konta na {{ .SiteURL }}. Można ich użyć by logować się na {{.SiteName}} przy użyciu twojego konta.<br>Jeżeli ta zmiana nie została dokonana przez ciebie, skontaktuj się z administratorem systemu."
+    "translation": "A personal access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account."
   },
   {
     "id": "api.templates.user_access_token_body.title",
@@ -1888,7 +1908,7 @@
   },
   {
     "id": "api.templates.username_change_body.info",
-    "translation": "Twój login {{.TeamDisplayName}} został zmieniony na {{.NewUsername}}.<br>Jeśli nie to zmień, proszę, skontaktuj się z administratorem systemu."
+    "translation": "Your username for {{.TeamDisplayName}} has been changed to {{.NewUsername}}."
   },
   {
     "id": "api.templates.username_change_body.title",
@@ -2159,6 +2179,22 @@
     "translation": "Nie można zrestartować hasła dla konta SSO"
   },
   {
+    "id": "api.user.saml.app_error",
+    "translation": "Unable to process SAML login request."
+  },
+  {
+    "id": "api.user.saml.extension_id.app_error",
+    "translation": "Nieprawidłowe id akcji"
+  },
+  {
+    "id": "api.user.saml.extension_unsupported",
+    "translation": "Extensions are not supported."
+  },
+  {
+    "id": "api.user.saml.invalid_extension",
+    "translation": "Extension with extension_id={{.ExtensionId}} is not supported."
+  },
+  {
     "id": "api.user.saml.not_available.app_error",
     "translation": "Użycie SAML 2.0 nie zostało skonfigurowane lub nie jest wspierane na tym serwerze."
   },
@@ -2395,6 +2431,14 @@
     "translation": "Cluster API endpoint not found."
   },
   {
+    "id": "app.import.attachment.bad_file.error",
+    "translation": "Error reading the file at: \"{{.FilePath}}\""
+  },
+  {
+    "id": "app.import.attachment.file_upload.error",
+    "translation": "Error uploading the file: \"{{.FilePath}}\""
+  },
+  {
     "id": "app.import.bulk_import.file_scan.error",
     "translation": "Błąd podczas odczytywania danych z zaimportowanego pliku."
   },
@@ -2944,7 +2988,11 @@
   },
   {
     "id": "app.notification.body.text.group_message.full",
-    "translation": "KANAŁ: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+    "translation": "Channel: {{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.group_message.full2",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
   },
   {
     "id": "app.notification.body.text.group_message.generic",
@@ -2952,7 +3000,11 @@
   },
   {
     "id": "app.notification.body.text.notification.full",
-    "translation": "KANAŁ: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+    "translation": "Channel: {{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full2",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
   },
   {
     "id": "app.notification.body.text.notification.generic",
@@ -3011,6 +3063,10 @@
     "translation": "Nie udało się skasować reakcji"
   },
   {
+    "id": "app.plugin.get_statuses.app_error",
+    "translation": "Unable to get plugin statuses"
+  },
+  {
     "id": "app.plugin.install.app_error",
     "translation": "Unable to install plugin."
   },
@@ -3019,6 +3075,10 @@
     "translation": "Unable to install plugin. A plugin with the same ID is already installed."
   },
   {
+    "id": "app.plugin.install_id_failed_remove.app_error",
+    "translation": "Unable to install plugin. A plugin with the same ID is already installed and failed to be removed."
+  },
+  {
     "id": "app.plugin.invalid_id.app_error",
     "translation": "Plugin Id must be at least {{.Min}} characters, at most {{.Max}} characters and match {{.Regex}}."
   },
@@ -3159,6 +3219,10 @@
     "translation": "Uploaded file was removed from Global Relay export because it was too large to send."
   },
   {
+    "id": "ent.compliance.global_relay.open_temporary_file.appError",
+    "translation": "Unable to open the temporary export file."
+  },
+  {
     "id": "ent.compliance.licence_disable.app_error",
     "translation": "Funkcjonalność zgodności wymaga licencji typu enterprise. Skontaktuj się z administratorem systemu odnośnie uzyskania licencji typu enterprise."
   },
@@ -3255,6 +3319,10 @@
     "translation": "Błąd w dekodowaniu wyników wyszukiwania."
   },
   {
+    "id": "ent.elasticsearch.start.already_started.app_error",
+    "translation": "Elasticsearch is already started"
+  },
+  {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Failed to create Elasticsearch bulk processor"
   },
@@ -3263,6 +3331,10 @@
     "translation": "Failed to start Elasticsearch bulk processor"
   },
   {
+    "id": "ent.elasticsearch.stop.already_stopped.app_error",
+    "translation": "Elasticsearch is already stopped"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "Connecting to Elasticsearch server failed."
   },
@@ -3331,6 +3403,46 @@
     "translation": "Nieprawidłowy filtr AD/LDAP"
   },
   {
+    "id": "ent.message_export.global_relay.create_file_in_zip.app_error",
+    "translation": "Unable to create the eml file."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.close.app_error",
+    "translation": "Unable to deliver the email to Global Relay."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.from_address.app_error",
+    "translation": "Unable to set the email From address."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg.app_error",
+    "translation": "Unable to set the email message."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg_data.app_error",
+    "translation": "Unable to write the email message."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.parse_mail.app_error",
+    "translation": "Unable to read the email information."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.to_address.app_error",
+    "translation": "Unable to set the email To address."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_get_file_info.app_error",
+    "translation": "Unable to get the information of the export temporary file"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_email_file.app_error",
+    "translation": "Unable to get the an email from the temporary file"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_zip_file_data.app_error",
+    "translation": "Unable to open the export temporary file"
+  },
+  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "Błąd przy próbie uwierzytelnienia tokena MFA"
   },
@@ -3464,7 +3576,7 @@
   },
   {
     "id": "jobs.start_synchronize_job.timeout",
-    "translation": "Reached AD/LDAP sychronization job timeout."
+    "translation": "Reached AD/LDAP synchronization job timeout."
   },
   {
     "id": "manaultesting.manual_test.parse.app_error",
@@ -4299,6 +4411,10 @@
     "translation": "Zaktualizowano dnia musi być poprawnym czasem"
   },
   {
+    "id": "model.outgoing_hook.icon_url.app_error",
+    "translation": "Nieprawidłowy zakres"
+  },
+  {
     "id": "model.outgoing_hook.is_valid.callback.app_error",
     "translation": "Nieprawidłowy URL zwrotny"
   },
@@ -4355,6 +4471,10 @@
     "translation": "Nieprawidłowe wyrazy wyzwalajace"
   },
   {
+    "id": "model.outgoing_hook.username.app_error",
+    "translation": "Niepoprawna nazwa uzytkownika"
+  },
+  {
     "id": "model.plugin_command.error.app_error",
     "translation": "An error occurred while trying to execute this command."
   },
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index c38aa4293..8f0c4b810 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "actiance.xml.output.formatter.marshalToXml.appError",
+    "id": "actiance.export.marshalToXml.appError",
     "translation": "Não foi possível converter a exportação para XML."
   },
   {
@@ -41,7 +41,7 @@
   },
   {
     "id": "api.admin.test_email.body",
-    "translation": "<br/><br/><br/>Parece que o seu email do Mattermost está configurado corretamente!"
+    "translation": "Parece que o seu email do Mattermost está configurado corretamente!"
   },
   {
     "id": "api.admin.test_email.missing_server",
@@ -1444,7 +1444,7 @@
   },
   {
     "id": "api.reaction.town_square_read_only",
-    "translation": "Reacting to posts is not possible in read-only channels."
+    "translation": "Não é possível reagir a publicações em canais somente leitura."
   },
   {
     "id": "api.roles.patch_roles.license.error",
@@ -1736,19 +1736,23 @@
   },
   {
     "id": "api.templates.deactivate_body.info",
-    "translation": "Você desativou a sua conta em {{ .SiteURL }}.<br>Se esta mudança não foi iniciada por você ou deseja reativar a conta, entre em contato com o administrador."
+    "translation": "Você desativou sua conta em {{ .SiteURL }}."
   },
   {
     "id": "api.templates.deactivate_body.title",
     "translation": "Sua conta foi desativada em {{ .ServerURL }}"
   },
   {
+    "id": "api.templates.deactivate_body.warning",
+    "translation": "Se esta mudança não foi iniciada por você ou você quer reativar sua conta, entre em contato com o administrador do sistema."
+  },
+  {
     "id": "api.templates.deactivate_subject",
     "translation": "[{{ .SiteName }}] A sua conta em {{ .ServerURL }} foi desativada"
   },
   {
     "id": "api.templates.email_change_body.info",
-    "translation": "Seu endereço de email para {{.TeamDisplayName}} foi alterado para {{.NewEmail}}.<br>Se você não fez está mudança, por favor contate o administrador do sistema."
+    "translation": "Seu endereço de email para {{.TeamDisplayName}} foi alterado para {{.NewEmail}}."
   },
   {
     "id": "api.templates.email_change_body.title",
@@ -1779,24 +1783,36 @@
     "translation": "Para alterar suas preferencias de notificação, faça login no site da sua equipe e vá para Configurações de Conta > Notificações."
   },
   {
-    "id": "api.templates.email_info",
-    "translation": "Se tiver qualquer dúvida, envie-nos um e-mail a qualquer momento: <a href='mailto:{{.SupportEmail}}' style='text-decoration: none; color:#2389D7;'>{{.SupportEmail}}</a>.<br>Nossos melhores cumprimentos,<br>Equipe {{.SiteName}}<br>"
+    "id": "api.templates.email_info1",
+    "translation": "Qualquer dúvida, envie-nos a qualquer momento: "
+  },
+  {
+    "id": "api.templates.email_info2",
+    "translation": "Melhores cumprimentos,"
+  },
+  {
+    "id": "api.templates.email_info3",
+    "translation": "A Equipe {{.SiteName}}"
   },
   {
     "id": "api.templates.email_organization",
     "translation": "Enviado por "
   },
   {
+    "id": "api.templates.email_warning",
+    "translation": "Se você não fez essa alteração, entre em contato com o administrador do sistema."
+  },
+  {
     "id": "api.templates.invite_body.button",
     "translation": "Participar da Equipe"
   },
   {
     "id": "api.templates.invite_body.extra_info",
-    "translation": "Mattermost permite compartilhar mensagens e arquivos do seu PC ou telefone, com pesquisa instantânea e arquivamento. Depois que você estiver participando a <strong>{{.TeamDisplayName}}</strong>, você pode fazer login na sua nova equipe e ter acesso a esses recursos a qualquer momento a partir do endereço web:<br/><br/><a href='{{.TeamURL}}'>{{.TeamURL}}</a>"
+    "translation": "Mattermost permite compartilhar mensagens e arquivos do seu PC ou telefone, com pesquisa instantânea e arquivamento. Depois que você estiver participando de [[{{.TeamDisplayName}}]], você pode fazer login na sua nova equipe e ter acesso a esses recursos a qualquer momento a partir do endereço web:"
   },
   {
     "id": "api.templates.invite_body.info",
-    "translation": "O {{.SenderStatus}} de equipe <strong>{{.SenderName}}</strong>, convidou você para participar <strong>{{.TeamDisplayName}}</strong>."
+    "translation": "O {{.SenderStatus}} da equipe [[{{.SenderName}}]], convidou você para participar de [[{{.TeamDisplayName}}]]."
   },
   {
     "id": "api.templates.invite_body.title",
@@ -1808,7 +1824,7 @@
   },
   {
     "id": "api.templates.mfa_activated_body.info",
-    "translation": "Autenticação multi-fator foi adicionada a sua conta em {{ .SiteURL }}.<br>Se está mudança não foi iniciada por você, por favor entre em contato com o administrador do sistema."
+    "translation": "Autenticação multi-fator foi adicionada a sua conta em {{ .SiteURL }}."
   },
   {
     "id": "api.templates.mfa_activated_body.title",
@@ -1820,7 +1836,7 @@
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
-    "translation": "Autenticação multi-fator foi removida da sua conta em {{ .SiteURL }}.<br>Se está mudança não foi iniciada por você, por favor entre em contato com o administrador do sistema."
+    "translation": "Autenticação multi-fator foi removida da sua conta em {{ .SiteURL }}."
   },
   {
     "id": "api.templates.mfa_deactivated_body.title",
@@ -1828,7 +1844,7 @@
   },
   {
     "id": "api.templates.password_change_body.info",
-    "translation": "Sua senha foi atualizada para {{.TeamDisplayName}} no {{ .TeamURL }} pelo {{.Method}}.<br>Se está mudança não foi iniciada por você, por favor entre em contato com o seu administrado do sistema."
+    "translation": "Sua senha foi atualizada por {{.TeamDisplayName}} em {{ .TeamURL }} para {{.Method}}."
   },
   {
     "id": "api.templates.password_change_body.title",
@@ -1847,8 +1863,12 @@
     "translation": "Redefinir senha"
   },
   {
-    "id": "api.templates.reset_body.info",
-    "translation": "Para alterar a sua senha, clique abaixo \"Redefinir Senha\".<br>Se você não pretende redefinir sua senha, por favor ignore este email e sua senha irá permanecer a mesma. O link de redefinição de senha expira em 24 horas."
+    "id": "api.templates.reset_body.info1",
+    "translation": "Para alterar sua senha, clique \"Redefinir Senha\" abaixo."
+  },
+  {
+    "id": "api.templates.reset_body.info2",
+    "translation": "Se você não quiser redefinir sua senha, ignore este email e sua senha permanecerá a mesma. O link de redefinição de senha expira em 24 horas."
   },
   {
     "id": "api.templates.reset_body.title",
@@ -1860,7 +1880,7 @@
   },
   {
     "id": "api.templates.signin_change_email.body.info",
-    "translation": "Você atualizou seu método de login para {{.Method}} em {{ .SiteName }}.<br>Se esta mudança não foi iniciada por você, por favor entre em contato com o administrador do sistema."
+    "translation": "Você atualizou seu método de login em {{ .SiteName }} para {{.Method}}."
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -1876,7 +1896,7 @@
   },
   {
     "id": "api.templates.user_access_token_body.info",
-    "translation": "Um token de acesso de usuário foi adicionado à sua conta em {{ .SiteURL }}. Eles podem ser usados ​​para acessar {{ .SiteName }} com sua conta.<br>Se essa mudança não foi iniciada por você, entre em contato com o administrador do sistema."
+    "translation": "Um token de acesso pessoal foi adicionado a sua conta em {{ .SiteURL }}. Ele pode ser usado para acessar {{.SiteName}} com sua conta."
   },
   {
     "id": "api.templates.user_access_token_body.title",
@@ -1888,7 +1908,7 @@
   },
   {
     "id": "api.templates.username_change_body.info",
-    "translation": "Seu nome de usuário para {{.TeamDisplayName}} foi alterado para {{.NewEmail}}.<br>Se você não fez está mudança, por favor contate o administrador do sistema."
+    "translation": "Seu usuário para {{.TeamDisplayName}} foi alterado para {{.NewUsername}}."
   },
   {
     "id": "api.templates.username_change_body.title",
@@ -2159,6 +2179,22 @@
     "translation": "Não foi possível redefinir a senha para conta SSO"
   },
   {
+    "id": "api.user.saml.app_error",
+    "translation": "Não foi possível processar o pedido de login SAML."
+  },
+  {
+    "id": "api.user.saml.extension_id.app_error",
+    "translation": "Id da extensão inválida"
+  },
+  {
+    "id": "api.user.saml.extension_unsupported",
+    "translation": "Extensões não são suportadas."
+  },
+  {
+    "id": "api.user.saml.invalid_extension",
+    "translation": "Extensão com extension_id={{.ExtensionId}} não é suportada."
+  },
+  {
     "id": "api.user.saml.not_available.app_error",
     "translation": "SAML 2.0 não está configurado ou disponível neste servidor."
   },
@@ -2395,6 +2431,14 @@
     "translation": "Endpoint Cluster API não encontrado."
   },
   {
+    "id": "app.import.attachment.bad_file.error",
+    "translation": "Erro ao ler o arquivo em: \"{{.FilePath}}\""
+  },
+  {
+    "id": "app.import.attachment.file_upload.error",
+    "translation": "Erro ao atualizar o arquivo: \"{{.FilePath}}\""
+  },
+  {
     "id": "app.import.bulk_import.file_scan.error",
     "translation": "Erro ao ler arquivo de importação."
   },
@@ -2944,7 +2988,11 @@
   },
   {
     "id": "app.notification.body.text.group_message.full",
-    "translation": "Canal: {{.ChannelName}}<br>@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Day}} {{.Month}}"
+    "translation": "Canal: {{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.group_message.full2",
+    "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Day}} {{.Month}}"
   },
   {
     "id": "app.notification.body.text.group_message.generic",
@@ -2952,7 +3000,11 @@
   },
   {
     "id": "app.notification.body.text.notification.full",
-    "translation": "Canal: {{.ChannelName}}<br>@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Day}} {{.Month}}"
+    "translation": "Canal: {{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full2",
+    "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Day}} {{.Month}}"
   },
   {
     "id": "app.notification.body.text.notification.generic",
@@ -3011,6 +3063,10 @@
     "translation": "Não é possível obter os plugins ativos"
   },
   {
+    "id": "app.plugin.get_statuses.app_error",
+    "translation": "Não foi possível obter os status dos plugins."
+  },
+  {
     "id": "app.plugin.install.app_error",
     "translation": "Não foi possível instalar o plugin."
   },
@@ -3019,6 +3075,10 @@
     "translation": "Não foi possível instalar o plugin. Um plugin como o mesmo ID já está instalado."
   },
   {
+    "id": "app.plugin.install_id_failed_remove.app_error",
+    "translation": "Não foi possível instalar o plugin. Um plugin com o mesmo ID já foi instalado e falhou ao ser removido."
+  },
+  {
     "id": "app.plugin.invalid_id.app_error",
     "translation": "O Id do Plugin deve ter pelo menos {{.Min}} caracteres, e no máximo {{.Max}} caracteres e ser válido com {{.Regex}}."
   },
@@ -3159,6 +3219,10 @@
     "translation": "O arquivo enviado foi removido da exportação do Global Relay porque era muito grande para ser enviado."
   },
   {
+    "id": "ent.compliance.global_relay.open_temporary_file.appError",
+    "translation": "Não é possível abrir o arquivo temporário de exportação."
+  },
+  {
     "id": "ent.compliance.licence_disable.app_error",
     "translation": "Funcionalidade Conformidade desabilitada pela licença atual. Entre em contato com o administrador do sistema sobre como atualizar sua licença enterprise."
   },
@@ -3255,6 +3319,10 @@
     "translation": "Falha ao decodificar os resultados da pesquisa"
   },
   {
+    "id": "ent.elasticsearch.start.already_started.app_error",
+    "translation": "Elasticsearch já está iniciado"
+  },
+  {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Erro ao criar o bulk processor do Elastisearch"
   },
@@ -3263,6 +3331,10 @@
     "translation": "Erro ao iniciar o bulk processor do Elasticsearch"
   },
   {
+    "id": "ent.elasticsearch.stop.already_stopped.app_error",
+    "translation": "Elasticsearch já está parado"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "Falha na conexão com o Elasticsearch."
   },
@@ -3331,6 +3403,46 @@
     "translation": "Filtro AD/LDAP Inválido"
   },
   {
+    "id": "ent.message_export.global_relay.create_file_in_zip.app_error",
+    "translation": "Não é possível criar o arquivo eml."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.close.app_error",
+    "translation": "Não foi possível entregar o email para Global Relay."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.from_address.app_error",
+    "translation": "Não foi possível definir o Remetente do email."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg.app_error",
+    "translation": "Não foi possível definir a mensagem do email."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg_data.app_error",
+    "translation": "Não foi possível escrever a mensagem de email."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.parse_mail.app_error",
+    "translation": "Não foi possível ler a informação do email."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.to_address.app_error",
+    "translation": "Não foi possível definir o Destinatário do email."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_get_file_info.app_error",
+    "translation": "Não foi possível obter a informação do arquivo temporário de exportação."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_email_file.app_error",
+    "translation": "Não foi possível obter um remetente de email do arquivo temporário"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_zip_file_data.app_error",
+    "translation": "Não foi possível abrir o arquivo temporário de exportação"
+  },
+  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "Erro ao tentar autenticar o token MFA"
   },
@@ -3464,7 +3576,7 @@
   },
   {
     "id": "jobs.start_synchronize_job.timeout",
-    "translation": "Sincronização do AD/LDAP alcançou o limite de tempo."
+    "translation": "Tarefa de sincronização do AD/LDAP alcançou o limite de tempo."
   },
   {
     "id": "manaultesting.manual_test.parse.app_error",
@@ -4299,6 +4411,10 @@
     "translation": "Update deve ser um tempo válido"
   },
   {
+    "id": "model.outgoing_hook.icon_url.app_error",
+    "translation": "Ícone inválido"
+  },
+  {
     "id": "model.outgoing_hook.is_valid.callback.app_error",
     "translation": "URLs de retorno de chamada inválidas"
   },
@@ -4355,6 +4471,10 @@
     "translation": "Palavras gatilho inválida"
   },
   {
+    "id": "model.outgoing_hook.username.app_error",
+    "translation": "Usuário inválido"
+  },
+  {
     "id": "model.plugin_command.error.app_error",
     "translation": "Um erro aconteceu enquanto tentava executar este comando."
   },
diff --git a/i18n/ru.json b/i18n/ru.json
index d6747e710..132d5283c 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "actiance.xml.output.formatter.marshalToXml.appError",
+    "id": "actiance.export.marshalToXml.appError",
     "translation": "Не удалось преобразовать экспорт в XML."
   },
   {
@@ -41,7 +41,7 @@
   },
   {
     "id": "api.admin.test_email.body",
-    "translation": "<br/><br/><br/>Кажется, ваша электронная почта Mattermost установлена верно!"
+    "translation": "Кажется, ваша электронная почта Mattermost установлена верно!"
   },
   {
     "id": "api.admin.test_email.missing_server",
@@ -173,7 +173,7 @@
   },
   {
     "id": "api.channel.join_channel.post_and_forget",
-    "translation": "%v присоединился(ась) к каналу."
+    "translation": "%v присоединяется к каналу."
   },
   {
     "id": "api.channel.leave.default.app_error",
@@ -193,7 +193,7 @@
   },
   {
     "id": "api.channel.patch_update_channel.forbidden.app_error",
-    "translation": "Не удалось обновить заголовок канала"
+    "translation": "Не удалось обновить канал"
   },
   {
     "id": "api.channel.post_channel_privacy_message.error",
@@ -1054,7 +1054,7 @@
   },
   {
     "id": "api.file.get_public_link.disabled.app_error",
-    "translation": "Публичные ссылки были отключены"
+    "translation": "Публичные ссылки отключены"
   },
   {
     "id": "api.file.get_public_link.no_post.app_error",
@@ -1142,7 +1142,7 @@
   },
   {
     "id": "api.incoming_webhook.disabled.app_error",
-    "translation": "Входящие вебхуки были отключены системным администратором."
+    "translation": "Входящие вебхуки отключены системным администратором."
   },
   {
     "id": "api.incoming_webhook.invalid_username.app_error",
@@ -1290,7 +1290,7 @@
   },
   {
     "id": "api.outgoing_webhook.disabled.app_error",
-    "translation": "Исходящие вебхуки были отключены системным администратором."
+    "translation": "Исходящие вебхуки отключены системным администратором."
   },
   {
     "id": "api.plugin.upload.array.app_error",
@@ -1736,19 +1736,23 @@
   },
   {
     "id": "api.templates.deactivate_body.info",
-    "translation": "Вы деактивировали свой аккаунт на {{ .SiteURL }}.<br>Если это изменение было произведено не вами или вы желаете восстановить ваш аккаунт, свяжитесь с вашим системным администратором."
+    "translation": "You deactivated your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.deactivate_body.title",
     "translation": "Ваш аккаунт был деактивирован на {{ .ServerURL }}"
   },
   {
+    "id": "api.templates.deactivate_body.warning",
+    "translation": "If this change was not initiated by you or you want to reactivate your account, contact your system administrator."
+  },
+  {
     "id": "api.templates.deactivate_subject",
     "translation": "[{{ .SiteName }}] Ваш аккаунт на {{ .ServerURL }} был деактивирован"
   },
   {
     "id": "api.templates.email_change_body.info",
-    "translation": "Ваш адрес электронной почты для {{.TeamDisplayName}} изменен на {{.NewEmail}}. <br> Если Вы не делали это изменение, пожалуйста, обратитесь к системному администратору."
+    "translation": "Your email address for {{.TeamDisplayName}} has been changed to {{.NewEmail}}."
   },
   {
     "id": "api.templates.email_change_body.title",
@@ -1779,24 +1783,36 @@
     "translation": "Чтобы изменить настройки уведомлений, войдите в свою команду и перейдите в Настройки учетной записи > Уведомления."
   },
   {
-    "id": "api.templates.email_info",
-    "translation": "По любым вопросам Вы можете написать на: <a href='mailto:{{.SupportEmail}}' style='text-decoration: none; color:#2389D7;'>{{.SupportEmail}}</a>.<br>С наилучшими пожеланиями,<br>Ваша команда {{.SiteName}}<br>"
+    "id": "api.templates.email_info1",
+    "translation": "Any questions at all, mail us any time: "
+  },
+  {
+    "id": "api.templates.email_info2",
+    "translation": "Best wishes,"
+  },
+  {
+    "id": "api.templates.email_info3",
+    "translation": "The {{.SiteName}} Team"
   },
   {
     "id": "api.templates.email_organization",
     "translation": "Прислал"
   },
   {
+    "id": "api.templates.email_warning",
+    "translation": "If you did not make this change, please contact the system administrator."
+  },
+  {
     "id": "api.templates.invite_body.button",
     "translation": "Присоединиться к команде"
   },
   {
     "id": "api.templates.invite_body.extra_info",
-    "translation": "Mattermost позволяет обмениваться сообщениями и файлами с компьютера или телефона с возможностью моментального поиска и архивирования. После того, как Вы присоединитесь к команде <strong>{{.TeamDisplayName}}</strong>, Вы сможете получить доступ к этим функциям в любое время через Веб-сайт:<br/><br/><a href='{{.TeamURL}}'>{{.TeamURL}}</a>"
+    "translation": "Mattermost позволяет обмениваться сообщениями и файлами с компьютера или телефона с возможностью моментального поиска и архивирования. После того, как Вы присоединитесь к команде {{.TeamDisplayName}}, Вы сможете получить доступ к этим функциям в любое время через Веб-сайт:"
   },
   {
     "id": "api.templates.invite_body.info",
-    "translation": "Команда {{.SenderStatus}} <strong>{{.SenderName}}</strong>, пригласила вас присоединиться к <strong>{{.TeamDisplayName}}</strong>."
+    "translation": "The team {{.SenderStatus}} [[{{.SenderName}}]], has invited you to join [[{{.TeamDisplayName}}]]."
   },
   {
     "id": "api.templates.invite_body.title",
@@ -1808,7 +1824,7 @@
   },
   {
     "id": "api.templates.mfa_activated_body.info",
-    "translation": "Многофакторная проверка подлинности была активирована для вашего аккаунта на {{ .SiteURL }}.<br>Если данное изменение сделано не вами, пожалуйста, обратитесь к администратору системы."
+    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.mfa_activated_body.title",
@@ -1820,7 +1836,7 @@
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
-    "translation": "Многофакторная проверка подлинности отключена для вашего аккаунта на {{ .SiteURL }}.<br>Если данное изменение сделано не вами, пожалуйста, обратитесь к администратору системы."
+    "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.mfa_deactivated_body.title",
@@ -1828,7 +1844,7 @@
   },
   {
     "id": "api.templates.password_change_body.info",
-    "translation": "Ваш пароль был обновлен для команды {{.TeamDisplayName}} на {{ .TeamURL }} через {{.Method}}.<br>Если это изменение не было сделано Вами, пожалуйста, обратитесь к системному администратору."
+    "translation": "Your password has been updated for {{.TeamDisplayName}} on {{ .TeamURL }} by {{.Method}}."
   },
   {
     "id": "api.templates.password_change_body.title",
@@ -1847,8 +1863,12 @@
     "translation": "Сброс пароля"
   },
   {
-    "id": "api.templates.reset_body.info",
-    "translation": "Чтобы изменить Ваш пароль, нажмите на ссылке \"Сброс пароля\" ниже.<br>Если Вы не хотели сбросить пароль, пожалуйста, проигнорируйте это письмо и Ваш пароль останется прежним. Ссылка для сброса пароля будет недействительна через 24 часа."
+    "id": "api.templates.reset_body.info1",
+    "translation": "To change your password, click \"Reset Password\" below."
+  },
+  {
+    "id": "api.templates.reset_body.info2",
+    "translation": "If you did not mean to reset your password, please ignore this email and your password will remain the same. The password reset link expires in 24 hours."
   },
   {
     "id": "api.templates.reset_body.title",
@@ -1860,7 +1880,7 @@
   },
   {
     "id": "api.templates.signin_change_email.body.info",
-    "translation": "Вы обновили свой метод входа для {{ .SiteName }} на {{.Method}}.<br>Если это изменение было сделано не Вами, пожалуйста, обратитесь к системному администратору."
+    "translation": "Вы обновили свой метод входа для {{ .SiteName }}"
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -1876,7 +1896,7 @@
   },
   {
     "id": "api.templates.user_access_token_body.info",
-    "translation": "В ваш аккаунт добавлен токен доступа. {{.SiteURL}}. Они могут использоваться для доступа к {{.SiteName}} в вашей учетной записи. <br> Если это изменение не было инициировано вами, обратитесь к системному администратору."
+    "translation": "A personal access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account."
   },
   {
     "id": "api.templates.user_access_token_body.title",
@@ -1888,7 +1908,7 @@
   },
   {
     "id": "api.templates.username_change_body.info",
-    "translation": "Ваше имя пользователя для {{.TeamDisplayName}} изменено на {{.NewUsername}}.<br>Если Вы не делали эти изменения, пожалуйста, обратитесь к системному администратору."
+    "translation": "Your username for {{.TeamDisplayName}} has been changed to {{.NewUsername}}."
   },
   {
     "id": "api.templates.username_change_body.title",
@@ -2159,6 +2179,22 @@
     "translation": "Невозможно сбросить пароль для учетной записи SSO"
   },
   {
+    "id": "api.user.saml.app_error",
+    "translation": "Unable to process SAML login request."
+  },
+  {
+    "id": "api.user.saml.extension_id.app_error",
+    "translation": "Неверный action id"
+  },
+  {
+    "id": "api.user.saml.extension_unsupported",
+    "translation": "Extensions are not supported."
+  },
+  {
+    "id": "api.user.saml.invalid_extension",
+    "translation": "Extension with extension_id={{.ExtensionId}} is not supported."
+  },
+  {
     "id": "api.user.saml.not_available.app_error",
     "translation": "SAML 2.0 не настроен или не поддерживается на этом сервере."
   },
@@ -2395,6 +2431,14 @@
     "translation": "Не найдена конечная точка API кластера."
   },
   {
+    "id": "app.import.attachment.bad_file.error",
+    "translation": "Error reading the file at: \"{{.FilePath}}\""
+  },
+  {
+    "id": "app.import.attachment.file_upload.error",
+    "translation": "Error uploading the file: \"{{.FilePath}}\""
+  },
+  {
     "id": "app.import.bulk_import.file_scan.error",
     "translation": "Ошибка чтения файла импорта."
   },
@@ -2944,7 +2988,11 @@
   },
   {
     "id": "app.notification.body.text.group_message.full",
-    "translation": "КАНАЛ: {{.ChannelName}}<br>@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+    "translation": "Channel: {{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.group_message.full2",
+    "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
     "id": "app.notification.body.text.group_message.generic",
@@ -2952,7 +3000,11 @@
   },
   {
     "id": "app.notification.body.text.notification.full",
-    "translation": "КАНАЛ: {{.ChannelName}}<br>@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+    "translation": "Channel: {{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full2",
+    "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
     "id": "app.notification.body.text.notification.generic",
@@ -3011,6 +3063,10 @@
     "translation": "Не удалось получить активные плагины"
   },
   {
+    "id": "app.plugin.get_statuses.app_error",
+    "translation": "Unable to get plugin statuses"
+  },
+  {
     "id": "app.plugin.install.app_error",
     "translation": "Unable to install plugin."
   },
@@ -3019,6 +3075,10 @@
     "translation": "Unable to install plugin. A plugin with the same ID is already installed."
   },
   {
+    "id": "app.plugin.install_id_failed_remove.app_error",
+    "translation": "Unable to install plugin. A plugin with the same ID is already installed and failed to be removed."
+  },
+  {
     "id": "app.plugin.invalid_id.app_error",
     "translation": "Plugin Id must be at least {{.Min}} characters, at most {{.Max}} characters and match {{.Regex}}."
   },
@@ -3159,6 +3219,10 @@
     "translation": "Uploaded file was removed from Global Relay export because it was too large to send."
   },
   {
+    "id": "ent.compliance.global_relay.open_temporary_file.appError",
+    "translation": "Unable to open the temporary export file."
+  },
+  {
     "id": "ent.compliance.licence_disable.app_error",
     "translation": "Функция комплаенса недоступна при текущей лицензии. Пожалуйста, свяжитесь с системным администратором по поводу улучшения вашей корпоративной лицензии."
   },
@@ -3255,6 +3319,10 @@
     "translation": "Failed to decode search results"
   },
   {
+    "id": "ent.elasticsearch.start.already_started.app_error",
+    "translation": "Elasticsearch is already started"
+  },
+  {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Failed to create Elasticsearch bulk processor"
   },
@@ -3263,6 +3331,10 @@
     "translation": "Failed to start Elasticsearch bulk processor"
   },
   {
+    "id": "ent.elasticsearch.stop.already_stopped.app_error",
+    "translation": "Elasticsearch is already stopped"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "Connecting to Elasticsearch server failed."
   },
@@ -3331,6 +3403,46 @@
     "translation": "Неверный фильтр AD/LDAP"
   },
   {
+    "id": "ent.message_export.global_relay.create_file_in_zip.app_error",
+    "translation": "Unable to create the eml file."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.close.app_error",
+    "translation": "Unable to deliver the email to Global Relay."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.from_address.app_error",
+    "translation": "Unable to set the email From address."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg.app_error",
+    "translation": "Unable to set the email message."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg_data.app_error",
+    "translation": "Unable to write the email message."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.parse_mail.app_error",
+    "translation": "Unable to read the email information."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.to_address.app_error",
+    "translation": "Unable to set the email To address."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_get_file_info.app_error",
+    "translation": "Unable to get the information of the export temporary file"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_email_file.app_error",
+    "translation": "Unable to get the an email from the temporary file"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_zip_file_data.app_error",
+    "translation": "Unable to open the export temporary file"
+  },
+  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "Ошибка при попытке аутентификации маркера MFA"
   },
@@ -3464,7 +3576,7 @@
   },
   {
     "id": "jobs.start_synchronize_job.timeout",
-    "translation": "Reached AD/LDAP sychronization job timeout."
+    "translation": "Reached AD/LDAP synchronization job timeout."
   },
   {
     "id": "manaultesting.manual_test.parse.app_error",
@@ -4299,6 +4411,10 @@
     "translation": "\"Обновлено в\" должно быть корректным временем"
   },
   {
+    "id": "model.outgoing_hook.icon_url.app_error",
+    "translation": "Недопустимая область"
+  },
+  {
     "id": "model.outgoing_hook.is_valid.callback.app_error",
     "translation": "Неверный адрес колбэка"
   },
@@ -4355,6 +4471,10 @@
     "translation": "Некорректный триггер слов"
   },
   {
+    "id": "model.outgoing_hook.username.app_error",
+    "translation": "Неверное имя пользователя"
+  },
+  {
     "id": "model.plugin_command.error.app_error",
     "translation": "An error occurred while trying to execute this command."
   },
diff --git a/i18n/tr.json b/i18n/tr.json
index e75dc5bf5..13f213ca8 100644
--- a/i18n/tr.json
+++ b/i18n/tr.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "actiance.xml.output.formatter.marshalToXml.appError",
+    "id": "actiance.export.marshalToXml.appError",
     "translation": "Dışa aktarılan veriler XML biçimine dönüştürülemedi."
   },
   {
@@ -41,7 +41,7 @@
   },
   {
     "id": "api.admin.test_email.body",
-    "translation": "<br/><br/><br/>Mattermost e-posta ayarları doğru görünüyor!"
+    "translation": "Mattermost e-posta ayarları doğru görünüyor!"
   },
   {
     "id": "api.admin.test_email.missing_server",
@@ -161,7 +161,7 @@
   },
   {
     "id": "api.channel.delete_channel.type.invalid",
-    "translation": "Cannot delete direct or group message channels"
+    "translation": "Doğrudan ya da grup ileti kanalları silinemez"
   },
   {
     "id": "api.channel.join_channel.already_deleted.app_error",
@@ -193,7 +193,7 @@
   },
   {
     "id": "api.channel.patch_update_channel.forbidden.app_error",
-    "translation": "Kanal üyesi güncellenemedi"
+    "translation": "Kanal güncellenemedi"
   },
   {
     "id": "api.channel.post_channel_privacy_message.error",
@@ -313,7 +313,7 @@
   },
   {
     "id": "api.command.invite_people.email_invitations_off",
-    "translation": "Email invitations are disabled, no invite(s) sent"
+    "translation": "E-posta çağrıları devre dışı bırakılmış. Herhangi bir çağrı gönderilmedi"
   },
   {
     "id": "api.command.invite_people.email_off",
@@ -584,7 +584,7 @@
   },
   {
     "id": "api.command_groupmsg.permission.app_error",
-    "translation": "You don't have the appropriate permissions to create a new group message."
+    "translation": "Yeni bir grup iletisi oluşturma izniniz yok."
   },
   {
     "id": "api.command_help.desc",
@@ -648,7 +648,7 @@
   },
   {
     "id": "api.command_invite_people.permission.app_error",
-    "translation": "You don't have permission to invite new users to this server."
+    "translation": "Bu sunucuya yeni kullanıcılar çağırma izniniz yok."
   },
   {
     "id": "api.command_join.desc",
@@ -744,7 +744,7 @@
   },
   {
     "id": "api.command_msg.permission.app_error",
-    "translation": "You don't have the appropriate permissions to direct message this user."
+    "translation": "Bu kullanıcıya doğrudan ileti gönderme izniniz yok."
   },
   {
     "id": "api.command_mute.desc",
@@ -1444,7 +1444,7 @@
   },
   {
     "id": "api.reaction.town_square_read_only",
-    "translation": "Reacting to posts is not possible in read-only channels."
+    "translation": "Salt okunur kanallarda iletilere tepki verilemez."
   },
   {
     "id": "api.roles.patch_roles.license.error",
@@ -1624,7 +1624,7 @@
   },
   {
     "id": "api.team.invite_members.disabled.app_error",
-    "translation": "Email invitations are disabled."
+    "translation": "E-posta çağrıları devre dışı bırakılmış."
   },
   {
     "id": "api.team.invite_members.invalid_email.app_error",
@@ -1736,19 +1736,23 @@
   },
   {
     "id": "api.templates.deactivate_body.info",
-    "translation": "{{ .SiteURL }} üzerindeki hesabınızı devre dışı bıraktınız.<br>Bu işlemi siz yapmadıysanız ya da hesabınızı yeniden etkinleştirmek istiyorsanız, sistem yöneticisi ile görüşün."
+    "translation": "{{ .SiteURL }} sitesindeki hesabınızı devre dışı bıraktınız."
   },
   {
     "id": "api.templates.deactivate_body.title",
     "translation": "{{ .ServerURL }} üzerindeki hesabınız devre dışı bırakıldı"
   },
   {
+    "id": "api.templates.deactivate_body.warning",
+    "translation": "Bu işlemi siz yapmadıysanız ya da hesabınızı yeniden etkinleştirmek istiyorsanız sistem yöneticisi ile görüşün."
+  },
+  {
     "id": "api.templates.deactivate_subject",
     "translation": "[{{ .SiteName }}] {{ .ServerURL }} üzerindeki hesabınız devre dışı bırakıldı"
   },
   {
     "id": "api.templates.email_change_body.info",
-    "translation": "{{.TeamDisplayName}} takımındaki e-posta adresiniz {{.NewEmail}} olarak değiştirildi.<br>Bu değişikliği siz yapmadıysanız sistem yöneticisi ile görüşün."
+    "translation": "{{.TeamDisplayName}} takımındaki e-posta adresiniz {{.NewEmail}} olarak değiştirildi."
   },
   {
     "id": "api.templates.email_change_body.title",
@@ -1779,24 +1783,36 @@
     "translation": "Bildirim ayarlarınızı değiştirmek için, takım sitenizde oturum açarak Hesap Ayarları > Bildirimler bölümüne gidin."
   },
   {
-    "id": "api.templates.email_info",
-    "translation": "Tüm sorularınız için bize e-posta gönderebilirsiniz: <a href='mailto:{{.SupportEmail}}' style='text-decoration: none; color:#2389D7;'>{{.SupportEmail}}</a>.<br>İyi günler,<br>{{.SiteName}} Takımı<br>"
+    "id": "api.templates.email_info1",
+    "translation": "Tüm sorularınız için bize istediğiniz zaman e-posta gönderebilirsiniz: "
+  },
+  {
+    "id": "api.templates.email_info2",
+    "translation": "İyi günler,"
+  },
+  {
+    "id": "api.templates.email_info3",
+    "translation": "{{.SiteName}} Takımı"
   },
   {
     "id": "api.templates.email_organization",
     "translation": "Gönderen "
   },
   {
+    "id": "api.templates.email_warning",
+    "translation": "Bu işlemi siz yapmadıysanız lütfen sistem yöneticisi ile görüşün."
+  },
+  {
     "id": "api.templates.invite_body.button",
     "translation": "Takıma Katıl"
   },
   {
     "id": "api.templates.invite_body.extra_info",
-    "translation": "Mattermost kullanarak ileti ve dosyaları Bilgisayarınız ya da telefonunuz üzerinden paylaşabilir ve anında arama ve arşivleme özelliklerine sahip olabilirsiniz. <strong>{{.TeamDisplayName}}</strong> takımına katıldıktan sonra takımınızda oturum açmak ve bu özelliklere istediğiniz zaman ulaşmak için şu adresi kullanın:<br/><br/><a href='{{.TeamURL}}'>{{.TeamURL}}</a>"
+    "translation": "Mattermost kullanarak ileti ve dosyaları Bilgisayarınız ya da telefonunuz üzerinden paylaşabilir ve anında arama ve arşivleme özelliklerine sahip olabilirsiniz. [[{{.TeamDisplayName}}]] takımına katıldıktan sonra takımınızda oturum açmak ve bu özelliklere istediğiniz zaman ulaşmak için şu adresi kullanın:"
   },
   {
     "id": "api.templates.invite_body.info",
-    "translation": "{{.SenderStatus}} <strong>{{.SenderName}}</strong> takımı sizi <strong>{{.TeamDisplayName}}</strong> takımına katılmanız için çağırdı."
+    "translation": "{{.SenderStatus}} [[{{.SenderName}}]] takımı, sizi [[{{.TeamDisplayName}}]] takımına katılmaya çağırdı."
   },
   {
     "id": "api.templates.invite_body.title",
@@ -1808,7 +1824,7 @@
   },
   {
     "id": "api.templates.mfa_activated_body.info",
-    "translation": "{{ .SiteURL }} üzerindeki hesabınıza çok aşamalı kimlik doğrulaması eklendi.<br>Bu değişikliği siz yapmadıysanız lütfen sistem yöneticiniz ile görüşün."
+    "translation": "{{ .SiteURL }} sitesindeki hesabınıza çok aşamalı kimlik doğrulaması eklendi."
   },
   {
     "id": "api.templates.mfa_activated_body.title",
@@ -1820,7 +1836,7 @@
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
-    "translation": "{{ .SiteURL }} üzerindeki hesabınızdan çok aşamalı kimlik doğrulaması kaldırıldı.<br>Bu değişikliği siz yapmadıysanız lütfen sistem yöneticiniz ile görüşün."
+    "translation": "{{ .SiteURL }} sitesindeki hesabınızdan çok aşamalı kimlik doğrulaması kaldırıldı."
   },
   {
     "id": "api.templates.mfa_deactivated_body.title",
@@ -1828,7 +1844,7 @@
   },
   {
     "id": "api.templates.password_change_body.info",
-    "translation": "{{ .TeamURL }} adresindeki {{.TeamDisplayName}} takımı için parolanız {{.Method}} yöntemiyle değiştirildi.<br>Bu değişikliği siz yapmadıysanız lütfen sistem yöneticiniz ile görüşün."
+    "translation": "{{.TeamDisplayName}} takımının {{ .TeamURL }} adresindeki parolası {{.Method}} ile güncellendi."
   },
   {
     "id": "api.templates.password_change_body.title",
@@ -1847,8 +1863,12 @@
     "translation": "Parolayı Sıfırla"
   },
   {
-    "id": "api.templates.reset_body.info",
-    "translation": "Parolanızı sıfırlamak için aşağıdaki \"Parolayı Sıfırla\" üzerine tıklayın.<br>Parola sıfırlama isteğinde bulunmadıysanız bu e-posta yok sayın böylece parolanız değiştirilmez. Parola sıfırlama bağlantısı 24 saat sonra geçersiz olur."
+    "id": "api.templates.reset_body.info1",
+    "translation": "Parolanızı değiştirmek için aşağıdan \"Parolayı Sıfırla\" üzerine tıklayın."
+  },
+  {
+    "id": "api.templates.reset_body.info2",
+    "translation": "Parolanızın sıfırlanmasını istemediyseniz, bu e-postayı yok sayın. Böylece parolanız değiştirilmez. Parola sıfırlama bağlantısı 24 saat sonra geçersiz olur."
   },
   {
     "id": "api.templates.reset_body.title",
@@ -1860,7 +1880,7 @@
   },
   {
     "id": "api.templates.signin_change_email.body.info",
-    "translation": "{{ .SiteName }} sitesindeki oturum açma yönteminizi {{.Method}} olarak güncellediniz.<br>Bu değişikliği siz yapmadıysanız lütfen sistem yöneticiniz ile görüşün."
+    "translation": "{{ .SiteName }} sitesindeki oturum açma yönteminizi {{.Method}} olarak değiştirdiniz."
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -1876,7 +1896,7 @@
   },
   {
     "id": "api.templates.user_access_token_body.info",
-    "translation": "{{ .SiteURL }} sitesindeki hesabınıza bir kişisel erişim kodu eklendi. Bu kod hesabınızı kullanarak {{.SiteName}} sitesine erişmek için kullanılabilir.<br>Bu değişikliği siz yapmadıysanız lütfen sistem yöneticiniz ile görüşün."
+    "translation": "{{ .SiteURL }}. sitesindeki hesabınıza bir kişisel erişim kodu eklendi. Bu kod kullanılarak {{.SiteName}} sitesindeki hesabınıza erişilebilir."
   },
   {
     "id": "api.templates.user_access_token_body.title",
@@ -1888,7 +1908,7 @@
   },
   {
     "id": "api.templates.username_change_body.info",
-    "translation": "{{.TeamDisplayName}} takımındaki kullanıcı adınız {{.NewUsername}} olarak değiştirildi.<br>Bu değişikliği siz yapmadıysanız sistem yöneticisi ile görüşün."
+    "translation": "{{.TeamDisplayName}} takımındaki kullanıcı adınız {{.NewUsername}} olarak değiştirildi."
   },
   {
     "id": "api.templates.username_change_body.title",
@@ -2159,6 +2179,22 @@
     "translation": "SSO hesaplarının parolası sıfırlanamaz"
   },
   {
+    "id": "api.user.saml.app_error",
+    "translation": "SAML oturum açma isteği işlenemedi."
+  },
+  {
+    "id": "api.user.saml.extension_id.app_error",
+    "translation": "Eklenti kodu geçersiz"
+  },
+  {
+    "id": "api.user.saml.extension_unsupported",
+    "translation": "Eklentiler desteklenmiyor."
+  },
+  {
+    "id": "api.user.saml.invalid_extension",
+    "translation": "extension_id değeri {{.ExtensionId}} olan eklenti desteklenmiyor."
+  },
+  {
     "id": "api.user.saml.not_available.app_error",
     "translation": "SAML 2.0 ayarları yapılmamış ya da bu sunucu tarafından desteklenmiyor."
   },
@@ -2395,6 +2431,14 @@
     "translation": "Küme API uç noktası bulunamadı."
   },
   {
+    "id": "app.import.attachment.bad_file.error",
+    "translation": "Şu dosya okunamadı: \"{{.FilePath}}\""
+  },
+  {
+    "id": "app.import.attachment.file_upload.error",
+    "translation": "Şu dosya yüklenemedi: \"{{.FilePath}}\""
+  },
+  {
     "id": "app.import.bulk_import.file_scan.error",
     "translation": "İçe aktarılacak veri dosyası okunamadı."
   },
@@ -2408,7 +2452,7 @@
   },
   {
     "id": "app.import.emoji.bad_file.error",
-    "translation": "Error reading import emoji image file. Emoji with name: \"{{.EmojiName}}\""
+    "translation": "\"{{.EmojiName}}\" duygu ifadesi için duygu ifadeleri görsel dosyası okunurken sorun çıktı"
   },
   {
     "id": "app.import.import_channel.scheme_deleted.error",
@@ -2632,15 +2676,15 @@
   },
   {
     "id": "app.import.validate_emoji_import_data.empty.error",
-    "translation": "Import emoji data empty."
+    "translation": "İçe aktarılan duygu ifadesi verileri boş."
   },
   {
     "id": "app.import.validate_emoji_import_data.image_missing.error",
-    "translation": "Import emoji image field missing or blank."
+    "translation": "İçe aktarılan duygu ifadesi alanı eksik ya da boş."
   },
   {
     "id": "app.import.validate_emoji_import_data.name_missing.error",
-    "translation": "Import emoji name field missing or blank."
+    "translation": "İçe aktarılan duygu ifadesi adı alanı eksik ya da boş."
   },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
@@ -2944,7 +2988,11 @@
   },
   {
     "id": "app.notification.body.text.group_message.full",
-    "translation": "Kanal: {{.ChannelName}}<br>@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+    "translation": "Kanal: {{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.group_message.full2",
+    "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
     "id": "app.notification.body.text.group_message.generic",
@@ -2952,7 +3000,11 @@
   },
   {
     "id": "app.notification.body.text.notification.full",
-    "translation": "Kanal: {{.ChannelName}}<br>@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+    "translation": "Kanal: {{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full2",
+    "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
     "id": "app.notification.body.text.notification.generic",
@@ -3011,6 +3063,10 @@
     "translation": "Etkin uygulama ekleri alınamadı"
   },
   {
+    "id": "app.plugin.get_statuses.app_error",
+    "translation": "Uygulama eki durumları alınamadı"
+  },
+  {
     "id": "app.plugin.install.app_error",
     "translation": "Uygulama eki kurulamadı."
   },
@@ -3019,6 +3075,10 @@
     "translation": "Uygulama eki kurulamadı. Aynı kodu taşıyan bir uygulama eki zaten var."
   },
   {
+    "id": "app.plugin.install_id_failed_remove.app_error",
+    "translation": "Uygulama eki kurulamadı. Aynı koda sahip bir uygulama eki zaten kurulmuş ve kaldırılamadı."
+  },
+  {
     "id": "app.plugin.invalid_id.app_error",
     "translation": "Uygulama eki kodu {{.Min}} ile {{.Max}} karakter arasında olmalı ve {{.Regex}}. ile uyumlu olmalıdır."
   },
@@ -3159,6 +3219,10 @@
     "translation": "Yüklenen dosya gönderilmek için çok büyük olduğundan Genel Aktarıcı dışa aktarma sırasından çıkarıldı."
   },
   {
+    "id": "ent.compliance.global_relay.open_temporary_file.appError",
+    "translation": "Geçici dışa aktarma dosyası açılamadı."
+  },
+  {
     "id": "ent.compliance.licence_disable.app_error",
     "translation": "Geçerli lisansta uygunluk özelliğini bulunmuyor. Lütfen lisansın Enterprise sürümüne yükseltilmesi için sistem yöneticisi ile görüşün."
   },
@@ -3255,6 +3319,10 @@
     "translation": "Failed to decode search results"
   },
   {
+    "id": "ent.elasticsearch.start.already_started.app_error",
+    "translation": "Elasticsearch zaten başlatılmış"
+  },
+  {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Elasticsearch toplu işlemi oluşturulamadı"
   },
@@ -3263,6 +3331,10 @@
     "translation": "Elasticsearch toplu işlemi başlatılamadı"
   },
   {
+    "id": "ent.elasticsearch.stop.already_stopped.app_error",
+    "translation": "Elasticsearch zaten durdurulmuş"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "Elasticsearch sunucusuna bağlanılamadı."
   },
@@ -3331,6 +3403,46 @@
     "translation": "AD/LDAP süzgeci geçersiz"
   },
   {
+    "id": "ent.message_export.global_relay.create_file_in_zip.app_error",
+    "translation": "eml dosyası oluşturulamadı."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.close.app_error",
+    "translation": "E-posta Genel Aktarıcı üzerine aktarılamadı."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.from_address.app_error",
+    "translation": "E-posta Kimden adresi ayarlanamadı."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg.app_error",
+    "translation": "E-posta iletisi ayarlanamadı."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg_data.app_error",
+    "translation": "E-posta iletisi yazılamadı."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.parse_mail.app_error",
+    "translation": "E-posta bilgileri okunamadı."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.to_address.app_error",
+    "translation": "E-posta Kime adresi ayarlanamadı."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_get_file_info.app_error",
+    "translation": "Geçici dışa aktarma dosyasının bilgileri alınamadı"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_email_file.app_error",
+    "translation": "Geçici dosyadan bir e-posta alınamadı"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_zip_file_data.app_error",
+    "translation": "Geçici dışa aktarma dosyası açılamadı"
+  },
+  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "MFA kodu ile kimlik doğrulanırken sorun çıktı"
   },
@@ -3828,7 +3940,7 @@
   },
   {
     "id": "model.config.is_valid.display.custom_url_schemes.app_error",
-    "translation": "{{.Scheme}} özel adres biçimi geçersiz. Özel adres biçimleri bir harf ile başlamalı ve yalnız harf, rakam artı (+), nokta (.) ve tire (-) karakterlerini içermelidir."
+    "translation": "{{.Scheme}} özel adres biçimi geçersiz. Özel adres biçimleri bir harf ile başlamalı ve yalnız harf, rakam ve tire (-) karakterlerini içermelidir."
   },
   {
     "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
@@ -4299,6 +4411,10 @@
     "translation": "Güncelleme zamanı geçerli bir zaman olmalıdır"
   },
   {
+    "id": "model.outgoing_hook.icon_url.app_error",
+    "translation": "Simge geçersiz"
+  },
+  {
     "id": "model.outgoing_hook.is_valid.callback.app_error",
     "translation": "Geri çağırma adresleri geçersiz"
   },
@@ -4355,6 +4471,10 @@
     "translation": "Tetikleyici sözcükler geçersiz"
   },
   {
+    "id": "model.outgoing_hook.username.app_error",
+    "translation": "Kullanıcı adı geçersiz"
+  },
+  {
     "id": "model.plugin_command.error.app_error",
     "translation": "Bu komut yürütülürken bir sorun çıktı."
   },
diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index 652e35d42..f005cdf91 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "actiance.xml.output.formatter.marshalToXml.appError",
+    "id": "actiance.export.marshalToXml.appError",
     "translation": "无法转换导出到 XML。"
   },
   {
@@ -41,7 +41,7 @@
   },
   {
     "id": "api.admin.test_email.body",
-    "translation": "<br/><br/><br/>看来你的Mattermost邮箱设置成功！"
+    "translation": "看来你的 Mattermost 邮箱设置成功了！"
   },
   {
     "id": "api.admin.test_email.missing_server",
@@ -744,7 +744,7 @@
   },
   {
     "id": "api.command_msg.permission.app_error",
-    "translation": "You don't have the appropriate permissions to direct message this user."
+    "translation": "您没有合适的权限直接发消息给该用户。"
   },
   {
     "id": "api.command_mute.desc",
@@ -1736,19 +1736,23 @@
   },
   {
     "id": "api.templates.deactivate_body.info",
-    "translation": "您已注销在 {{ .SiteURL }} 的帐号。<br>如果这不是您的操作或者您想重新激活您的帐号，请联系您的系统管理员。"
+    "translation": "您注销了 {{ .SiteURL }} 上的帐号。"
   },
   {
     "id": "api.templates.deactivate_body.title",
     "translation": "您的帐号已在 {{ .ServerURL }} 注销"
   },
   {
+    "id": "api.templates.deactivate_body.warning",
+    "translation": "If this change was not initiated by you or you want to reactivate your account, contact your system administrator."
+  },
+  {
     "id": "api.templates.deactivate_subject",
     "translation": "[{{ .SiteName }}] 您的帐号已在 {{ .ServerURL }} 注销"
   },
   {
     "id": "api.templates.email_change_body.info",
-    "translation": "您的邮箱地址从 {{.TeamDisplayName}} 修改为 {{.NewEmail}}。<br>如果您没有做过这个修改，请联系系统管理员。"
+    "translation": "您在 {{.TeamDisplayName}} 的邮件地址被更改至 {{.NewEmail}}。"
   },
   {
     "id": "api.templates.email_change_body.title",
@@ -1779,24 +1783,36 @@
     "translation": "要更改您的通知偏好设定，登录到您的团队站点后至帐号设置 > 通知。"
   },
   {
-    "id": "api.templates.email_info",
-    "translation": "有任何问题请随时给我们发送电子邮件: <a href='mailto:{{.SupportEmail}}' style='text-decoration: none; color:#2389D7;'>{{.SupportEmail}}</a>.<br>最美好的祝福,<br> {{.SiteName}} 团队<br>"
+    "id": "api.templates.email_info1",
+    "translation": "Any questions at all, mail us any time: "
+  },
+  {
+    "id": "api.templates.email_info2",
+    "translation": "Best wishes,"
+  },
+  {
+    "id": "api.templates.email_info3",
+    "translation": "{{.SiteName}} 团队"
   },
   {
     "id": "api.templates.email_organization",
     "translation": "发送人 "
   },
   {
+    "id": "api.templates.email_warning",
+    "translation": "如果您没做此更改，请联系系统管理员。"
+  },
+  {
     "id": "api.templates.invite_body.button",
     "translation": "加入团队"
   },
   {
     "id": "api.templates.invite_body.extra_info",
-    "translation": "Mattermost允许您通过电脑、电话分享消息和文件，即时查找和归档. 当你加入 <strong>{{.TeamDisplayName}}</strong>后, 你可以登录到你的新团队，并在任何时候从网络地址访问这些功能:<br/><br/><a href='{{.TeamURL}}'>{{.TeamURL}}</a>"
+    "translation": "Mattermost 允许您通过电脑、电话分享消息和文件，即时查找和归档。当你加入[[{{.TeamDisplayName}}]]后，你可以登录到你的新团队并在任何时候从网络地址访问这些功能："
   },
   {
     "id": "api.templates.invite_body.info",
-    "translation": "团队 {{.SenderStatus}} <strong>{{.SenderName}}</strong>，邀请您加入 <strong>{{.TeamDisplayName}}</strong>。"
+    "translation": "团队 {{.SenderStatus}} [[{{.SenderName}}]] 邀请您加入 [[{{.TeamDisplayName}}]]。"
   },
   {
     "id": "api.templates.invite_body.title",
@@ -1808,7 +1824,7 @@
   },
   {
     "id": "api.templates.mfa_activated_body.info",
-    "translation": "你在 {{ .SiteURL }} 的帐号已添加多重验证。<br>如果此操作不是您操作的，请联系您的系统管理员。"
+    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.mfa_activated_body.title",
@@ -1820,7 +1836,7 @@
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
-    "translation": "你在 {{ .SiteURL }} 的帐号已删除多重验证。<br>如果此操作不是您操作的，请联系您的系统管理员。"
+    "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.mfa_deactivated_body.title",
@@ -1828,7 +1844,7 @@
   },
   {
     "id": "api.templates.password_change_body.info",
-    "translation": "您的密码已经被更新 {{.TeamDisplayName}} 在 {{ .TeamURL }} 通过 {{.Method}}.<br>如果这个变更不是由你发起的，请联系你的系统管理员."
+    "translation": "Your password has been updated for {{.TeamDisplayName}} on {{ .TeamURL }} by {{.Method}}."
   },
   {
     "id": "api.templates.password_change_body.title",
@@ -1847,8 +1863,12 @@
     "translation": "重设密码"
   },
   {
-    "id": "api.templates.reset_body.info",
-    "translation": "修改您的密码, 点击 \"重设密码\" 下面.<br>如果你不打算重置您的密码，请忽略此电子邮件和您的密码将保持不变。密码重置链接在24小时内到期."
+    "id": "api.templates.reset_body.info1",
+    "translation": "如想更改您的密码，点击以下 \"重置密码\"。"
+  },
+  {
+    "id": "api.templates.reset_body.info2",
+    "translation": "如果您不想重置密码，请无视此邮件并且您的密码会不会更改。重置密码链接将在 24 小时后失效。"
   },
   {
     "id": "api.templates.reset_body.title",
@@ -1860,7 +1880,7 @@
   },
   {
     "id": "api.templates.signin_change_email.body.info",
-    "translation": "您在 {{.SiteName}} 更新了登录方式为 {{.Method}}。<br>如果这个变更不是由您发起的，请联系您的系统管理员。"
+    "translation": "你已经更新您在 {{ .SiteName }} 的登录方法到 {{.Method}}。"
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -1876,7 +1896,7 @@
   },
   {
     "id": "api.templates.user_access_token_body.info",
-    "translation": "一个个人访问令牌在 {{ .SiteURL }} 创建到了您的帐号。他们可以以您的帐号访问 {{.SiteName}}。<br>如果此操作非来自您，请联系您的系统管理员。"
+    "translation": "A personal access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account."
   },
   {
     "id": "api.templates.user_access_token_body.title",
@@ -1888,7 +1908,7 @@
   },
   {
     "id": "api.templates.username_change_body.info",
-    "translation": "您在 {{.TeamDisplayName}} 的用户名已更改为 {{.NewUsername}}。<br>如果这个变更不是由您发起的，请联系系统管理员。"
+    "translation": "您在 {{.TeamDisplayName}} 的用户名被更改至 {{.NewUsername}}。"
   },
   {
     "id": "api.templates.username_change_body.title",
@@ -2159,6 +2179,22 @@
     "translation": "不能重置SSO账户密码"
   },
   {
+    "id": "api.user.saml.app_error",
+    "translation": "无法处理 SAML 登入请求。"
+  },
+  {
+    "id": "api.user.saml.extension_id.app_error",
+    "translation": "无效的扩展 id"
+  },
+  {
+    "id": "api.user.saml.extension_unsupported",
+    "translation": "不支持扩展。"
+  },
+  {
+    "id": "api.user.saml.invalid_extension",
+    "translation": "Extension with extension_id={{.ExtensionId}} is not supported."
+  },
+  {
     "id": "api.user.saml.not_available.app_error",
     "translation": "此服务器没有正确配置或者不支持 SAML 2.0。"
   },
@@ -2395,6 +2431,14 @@
     "translation": "未找到机群 API 接口。"
   },
   {
+    "id": "app.import.attachment.bad_file.error",
+    "translation": "读取文件错误：\"{{.FilePath}}\""
+  },
+  {
+    "id": "app.import.attachment.file_upload.error",
+    "translation": "上传文件错误：\"{{.FilePath}}\""
+  },
+  {
     "id": "app.import.bulk_import.file_scan.error",
     "translation": "读取数据导入文件错误。"
   },
@@ -2636,11 +2680,11 @@
   },
   {
     "id": "app.import.validate_emoji_import_data.image_missing.error",
-    "translation": "Import emoji image field missing or blank."
+    "translation": "导入表情符图片栏为空。"
   },
   {
     "id": "app.import.validate_emoji_import_data.name_missing.error",
-    "translation": "Import emoji name field missing or blank."
+    "translation": "导入表情符名栏为空。"
   },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
@@ -2944,7 +2988,11 @@
   },
   {
     "id": "app.notification.body.text.group_message.full",
-    "translation": "频道：{{.ChannelName}}<br>@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+    "translation": "频道：{{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.group_message.full2",
+    "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
     "id": "app.notification.body.text.group_message.generic",
@@ -2952,7 +3000,11 @@
   },
   {
     "id": "app.notification.body.text.notification.full",
-    "translation": "频道：{{.ChannelName}}<br>@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+    "translation": "频道：{{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full2",
+    "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
     "id": "app.notification.body.text.notification.generic",
@@ -3011,6 +3063,10 @@
     "translation": "无法获取已启动的插件"
   },
   {
+    "id": "app.plugin.get_statuses.app_error",
+    "translation": "无法获取插件状态。"
+  },
+  {
     "id": "app.plugin.install.app_error",
     "translation": "无法安装插件。"
   },
@@ -3019,6 +3075,10 @@
     "translation": "无法安装插件。已存在相同 ID 的插件。"
   },
   {
+    "id": "app.plugin.install_id_failed_remove.app_error",
+    "translation": "Unable to install plugin. A plugin with the same ID is already installed and failed to be removed."
+  },
+  {
     "id": "app.plugin.invalid_id.app_error",
     "translation": "插件 Id 必须至少 {{.Min}} 个字符，最多 {{.Max}} 个字符并匹配 {{.Regex}}。"
   },
@@ -3159,6 +3219,10 @@
     "translation": "上传的文件因为过大而从 Global Relay 导出移除。"
   },
   {
+    "id": "ent.compliance.global_relay.open_temporary_file.appError",
+    "translation": "无法打开导出临时文件。"
+  },
+  {
     "id": "ent.compliance.licence_disable.app_error",
     "translation": "当前许可证禁用了合规功能。请联系您的系统管理员关于升级您的企业许可证。"
   },
@@ -3255,6 +3319,10 @@
     "translation": "解码搜索结果失败"
   },
   {
+    "id": "ent.elasticsearch.start.already_started.app_error",
+    "translation": "ElasticSearch 已启动"
+  },
+  {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "创建 Elasticsearch 批量处理器失败"
   },
@@ -3263,6 +3331,10 @@
     "translation": "开始 Elasticsearch 批量处理器失败"
   },
   {
+    "id": "ent.elasticsearch.stop.already_stopped.app_error",
+    "translation": "ElasticSearch 已停止"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "连接 Elasticsearch 服务器失败。"
   },
@@ -3331,6 +3403,46 @@
     "translation": "无效的 AD/LDAP 筛选器"
   },
   {
+    "id": "ent.message_export.global_relay.create_file_in_zip.app_error",
+    "translation": "无法创建 eml 文件。"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.close.app_error",
+    "translation": "无法发送邮件到 Global Relay。"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.from_address.app_error",
+    "translation": "Unable to set the email From address."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg.app_error",
+    "translation": "无法设置邮件消息。"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg_data.app_error",
+    "translation": "无法写入邮件消息。"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.parse_mail.app_error",
+    "translation": "无法读取邮件信息。"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.to_address.app_error",
+    "translation": "Unable to set the email To address."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_get_file_info.app_error",
+    "translation": "无法获取导出临时文件的信息"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_email_file.app_error",
+    "translation": "无法从临时文件获取邮件地址"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_zip_file_data.app_error",
+    "translation": "无法打开导出临时文件"
+  },
+  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "尝试验证多重验证令牌时出现错误"
   },
@@ -4299,6 +4411,10 @@
     "translation": "更新时必须是有效时间"
   },
   {
+    "id": "model.outgoing_hook.icon_url.app_error",
+    "translation": "无效的图标"
+  },
+  {
     "id": "model.outgoing_hook.is_valid.callback.app_error",
     "translation": "无效的回调网址"
   },
@@ -4355,6 +4471,10 @@
     "translation": "无效的触发关键词"
   },
   {
+    "id": "model.outgoing_hook.username.app_error",
+    "translation": "无效的用户名"
+  },
+  {
     "id": "model.plugin_command.error.app_error",
     "translation": "执行此指令时发生了错误。"
   },
diff --git a/i18n/zh-TW.json b/i18n/zh-TW.json
index be6a7def2..f571d21e1 100644
--- a/i18n/zh-TW.json
+++ b/i18n/zh-TW.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "actiance.xml.output.formatter.marshalToXml.appError",
+    "id": "actiance.export.marshalToXml.appError",
     "translation": "無法轉換匯出至 XML"
   },
   {
@@ -1736,19 +1736,23 @@
   },
   {
     "id": "api.templates.deactivate_body.info",
-    "translation": "您在 {{.SiteURL}} 的帳號已被您所停用。<br>如果此變更不是由您所發起或是想要重新啟用帳號，請聯絡系統管理員。"
+    "translation": "You deactivated your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.deactivate_body.title",
     "translation": "您在 {{.ServerURL }} 的帳號已被停用"
   },
   {
+    "id": "api.templates.deactivate_body.warning",
+    "translation": "If this change was not initiated by you or you want to reactivate your account, contact your system administrator."
+  },
+  {
     "id": "api.templates.deactivate_subject",
     "translation": "[{{ .SiteName }}] 您在 {{.ServerURL }} 的帳號已被停用"
   },
   {
     "id": "api.templates.email_change_body.info",
-    "translation": "您在 {{.TeamDisplayName}} 上的電子郵件地址已經變更為 {{.NewEmail}}。<br>如果這不是您所變更的，請聯繫系統管理員。"
+    "translation": "Your email address for {{.TeamDisplayName}} has been changed to {{.NewEmail}}."
   },
   {
     "id": "api.templates.email_change_body.title",
@@ -1779,14 +1783,26 @@
     "translation": "要更改通知偏好設定，請登入團隊網站並且至 帳號設定 > 通知。"
   },
   {
-    "id": "api.templates.email_info",
-    "translation": "不論有任何問題，請隨時寫信給我們：<a href='mailto:{{.SupportEmail}}' style='text-decoration: none; color:#2389D7;'>{{.SupportEmail}}</a>。<br>祝您萬事如意，<br> {{.SiteName}} 團隊<br>"
+    "id": "api.templates.email_info1",
+    "translation": "Any questions at all, mail us any time: "
+  },
+  {
+    "id": "api.templates.email_info2",
+    "translation": "Best wishes,"
+  },
+  {
+    "id": "api.templates.email_info3",
+    "translation": "The {{.SiteName}} Team"
   },
   {
     "id": "api.templates.email_organization",
     "translation": "寄件者："
   },
   {
+    "id": "api.templates.email_warning",
+    "translation": "If you did not make this change, please contact the system administrator."
+  },
+  {
     "id": "api.templates.invite_body.button",
     "translation": "加入團隊"
   },
@@ -1796,7 +1812,7 @@
   },
   {
     "id": "api.templates.invite_body.info",
-    "translation": "團隊 {{.SenderStatus}} <strong>{{.SenderName}}</strong>，已經邀請您加入 <strong>{{.TeamDisplayName}}</strong>。"
+    "translation": "The team {{.SenderStatus}} [[{{.SenderName}}]], has invited you to join [[{{.TeamDisplayName}}]]."
   },
   {
     "id": "api.templates.invite_body.title",
@@ -1808,7 +1824,7 @@
   },
   {
     "id": "api.templates.mfa_activated_body.info",
-    "translation": "您的{{ .SiteURL }}帳號已增加多重要素驗證。<br>如果此項變更不是由您改動的，請聯絡系統管理員。"
+    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.mfa_activated_body.title",
@@ -1820,7 +1836,7 @@
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
-    "translation": "您的{{ .SiteURL }}帳號已移除多重要素驗證。<br>如果此項變更不是由您改動的，請聯絡系統管理員。"
+    "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.mfa_deactivated_body.title",
@@ -1828,7 +1844,7 @@
   },
   {
     "id": "api.templates.password_change_body.info",
-    "translation": "您在 {{ .TeamURL }} 上的 {{.TeamDisplayName}} 密碼已經由  {{.Method}} 更新。<br>如果這不是您所變更的，請聯繫系統管理員。"
+    "translation": "Your password has been updated for {{.TeamDisplayName}} on {{ .TeamURL }} by {{.Method}}."
   },
   {
     "id": "api.templates.password_change_body.title",
@@ -1847,8 +1863,12 @@
     "translation": "重設密碼"
   },
   {
-    "id": "api.templates.reset_body.info",
-    "translation": "按下方的 \"重設密碼\"來更改您的密碼。<br>如果您並沒有想要重設密碼，請不要理會這封郵件，密碼依然維持不變。密碼重設的連結將在 24 小時之後過期。"
+    "id": "api.templates.reset_body.info1",
+    "translation": "To change your password, click \"Reset Password\" below."
+  },
+  {
+    "id": "api.templates.reset_body.info2",
+    "translation": "If you did not mean to reset your password, please ignore this email and your password will remain the same. The password reset link expires in 24 hours."
   },
   {
     "id": "api.templates.reset_body.title",
@@ -1860,7 +1880,7 @@
   },
   {
     "id": "api.templates.signin_change_email.body.info",
-    "translation": "您已經將 {{ .SiteName }} 上的登入方式變更為 {{.Method}}。<br>如果這項變更不是您做的，請聯繫系統管理員。"
+    "translation": "您已經變更了 {{ .SiteName }} 上 {{.TeamDisplayName}} 的登入方式"
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -1876,7 +1896,7 @@
   },
   {
     "id": "api.templates.user_access_token_body.info",
-    "translation": "{{ .SiteURL }} 已新增個人存取 Token 至帳號。Token 可用於以您的帳號存取 {{.SiteName}}。<br>如果此變更並非來自您，請聯絡系統管理員。"
+    "translation": "A personal access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account."
   },
   {
     "id": "api.templates.user_access_token_body.title",
@@ -1888,7 +1908,7 @@
   },
   {
     "id": "api.templates.username_change_body.info",
-    "translation": "您在{{.TeamDisplayName}}的使用者名稱已變更為{{.NewUsername}}。<br>如果您未進行此變更，請速聯繫系統管理員。"
+    "translation": "Your username for {{.TeamDisplayName}} has been changed to {{.NewUsername}}."
   },
   {
     "id": "api.templates.username_change_body.title",
@@ -2159,6 +2179,22 @@
     "translation": "SSO 帳號無法重設密碼"
   },
   {
+    "id": "api.user.saml.app_error",
+    "translation": "Unable to process SAML login request."
+  },
+  {
+    "id": "api.user.saml.extension_id.app_error",
+    "translation": "無效的操作 ID"
+  },
+  {
+    "id": "api.user.saml.extension_unsupported",
+    "translation": "Extensions are not supported."
+  },
+  {
+    "id": "api.user.saml.invalid_extension",
+    "translation": "Extension with extension_id={{.ExtensionId}} is not supported."
+  },
+  {
     "id": "api.user.saml.not_available.app_error",
     "translation": "本機不支援或未設定 SAML 2.0。"
   },
@@ -2395,6 +2431,14 @@
     "translation": "找不到叢集 API 端點。"
   },
   {
+    "id": "app.import.attachment.bad_file.error",
+    "translation": "Error reading the file at: \"{{.FilePath}}\""
+  },
+  {
+    "id": "app.import.attachment.file_upload.error",
+    "translation": "Error uploading the file: \"{{.FilePath}}\""
+  },
+  {
     "id": "app.import.bulk_import.file_scan.error",
     "translation": "讀取匯入資料檔失敗。"
   },
@@ -2944,7 +2988,11 @@
   },
   {
     "id": "app.notification.body.text.group_message.full",
-    "translation": "頻道：{{.ChannelName}}<br>@{{.SenderName}} - {{.Month}} {{.Day}}，{{.Hour}}:{{.Minute}} {{.Timezone}}"
+    "translation": "Channel: {{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.group_message.full2",
+    "translation": "@{{.SenderName}} - {{.Month}} {{.Day}}，{{.Hour}}:{{.Minute}} {{.Timezone}}"
   },
   {
     "id": "app.notification.body.text.group_message.generic",
@@ -2952,7 +3000,11 @@
   },
   {
     "id": "app.notification.body.text.notification.full",
-    "translation": "頻道：{{.ChannelName}}<br>@{{.SenderName}} - {{.Month}} {{.Day}}，{{.Hour}}:{{.Minute}} {{.Timezone}}"
+    "translation": "Channel: {{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full2",
+    "translation": "@{{.SenderName}} - {{.Month}} {{.Day}}，{{.Hour}}:{{.Minute}} {{.Timezone}}"
   },
   {
     "id": "app.notification.body.text.notification.generic",
@@ -3011,6 +3063,10 @@
     "translation": "無法取得啟用的模組"
   },
   {
+    "id": "app.plugin.get_statuses.app_error",
+    "translation": "無法設定模組狀態。"
+  },
+  {
     "id": "app.plugin.install.app_error",
     "translation": "無法安裝模組。"
   },
@@ -3019,6 +3075,10 @@
     "translation": "無法安裝模組。已安裝了相同 ID 的模組。"
   },
   {
+    "id": "app.plugin.install_id_failed_remove.app_error",
+    "translation": "Unable to install plugin. A plugin with the same ID is already installed and failed to be removed."
+  },
+  {
     "id": "app.plugin.invalid_id.app_error",
     "translation": "模組 ID 至少需 {{.Min}} 字元，最多可為 {{.Max}} 且符合 {{.Regex}}。"
   },
@@ -3159,6 +3219,10 @@
     "translation": "由於大小過大，上傳檔案已從 Global Relay 匯出檔案中被移除。"
   },
   {
+    "id": "ent.compliance.global_relay.open_temporary_file.appError",
+    "translation": "無法建立暫存的 CSV 匯出檔案。"
+  },
+  {
     "id": "ent.compliance.licence_disable.app_error",
     "translation": "目前授權不提供規範功能，請聯繫系統管理員將系統升級為企業版授權。"
   },
@@ -3255,6 +3319,10 @@
     "translation": "無法解碼搜尋結果"
   },
   {
+    "id": "ent.elasticsearch.start.already_started.app_error",
+    "translation": "Elasticsearch 沒有啟動"
+  },
+  {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "建立 Elasticsearch 批次處理器時失敗"
   },
@@ -3263,6 +3331,10 @@
     "translation": "啟動 Elasticsearch 批次處理器時失敗"
   },
   {
+    "id": "ent.elasticsearch.stop.already_stopped.app_error",
+    "translation": "Elasticsearch 沒有啟動"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "連線至 Elasticsearch 伺服器失敗。"
   },
@@ -3331,6 +3403,46 @@
     "translation": "無效的 AD/LDAP Filter"
   },
   {
+    "id": "ent.message_export.global_relay.create_file_in_zip.app_error",
+    "translation": "無法建立 zip 匯出檔案。"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.close.app_error",
+    "translation": "Unable to deliver the email to Global Relay."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.from_address.app_error",
+    "translation": "Unable to set the email From address."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg.app_error",
+    "translation": "Unable to set the email message."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg_data.app_error",
+    "translation": "Unable to write the email message."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.parse_mail.app_error",
+    "translation": "Unable to read the email information."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.to_address.app_error",
+    "translation": "Unable to set the email To address."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_get_file_info.app_error",
+    "translation": "Unable to get the information of the export temporary file"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_email_file.app_error",
+    "translation": "Unable to get the an email from the temporary file"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_zip_file_data.app_error",
+    "translation": "Unable to open the export temporary file"
+  },
+  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "嘗試認證多重要素驗證 Token 時遇到錯誤"
   },
@@ -4299,6 +4411,10 @@
     "translation": "\"更新時間\"必須是一個有效的時間"
   },
   {
+    "id": "model.outgoing_hook.icon_url.app_error",
+    "translation": "無效的範圍"
+  },
+  {
     "id": "model.outgoing_hook.is_valid.callback.app_error",
     "translation": "無效的回呼網址"
   },
@@ -4355,6 +4471,10 @@
     "translation": "無效的觸發關鍵字"
   },
   {
+    "id": "model.outgoing_hook.username.app_error",
+    "translation": "無效的使用者名稱"
+  },
+  {
     "id": "model.plugin_command.error.app_error",
     "translation": "執行此指令時發生錯誤。"
   },