translations PR 20180220 (#8334)

14 files changed, 345 insertions, 241 deletions

diff --git a/i18n/de.json b/i18n/de.json
index bd722e4b3..b58cd73b1 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -132,10 +132,6 @@
     "translation": "Dateiupload nicht möglich. Datei ist zu groß."
   },
   {
-    "id": "api.api.init.parsing_templates.debug",
-    "translation": "Vorlagen in %v werden verarbeitet"
-  },
-  {
     "id": "api.api.init.parsing_templates.error",
     "translation": "Das Server-Template %v konnte nicht verarbeitet werden"
   },
@@ -2303,6 +2299,14 @@
     "translation": "%v hat das Team verlassen."
   },
   {
+    "id": "api.team.move_channel.post.error",
+    "translation": "Fehler beim Senden des Kanalzwecks"
+  },
+  {
+    "id": "api.team.move_channel.success",
+    "translation": "This channel has been moved to this team from %v."
+  },
+  {
     "id": "api.team.permanent_delete_team.attempting.warn",
     "translation": "Versuche Team permanent zu löschen %v id=%v"
   },
@@ -3067,6 +3071,10 @@
     "translation": "Konnte Payload des eingehenden Webhooks nicht verarbeiten."
   },
   {
+    "id": "api.webhook.incoming.error",
+    "translation": "Could not decode the multipart payload of incoming webhook."
+  },
+  {
     "id": "api.webhook.init.debug",
     "translation": "Initialisiere Webhook-API-Routen"
   },
@@ -4875,6 +4883,10 @@
     "translation": "Nachrichten-Export-Aufgabe \"ExportFromTimestamp\" muss ein Zeitstempel (angegeben in Sekunden seit der Unix-Epoche) sein. Nur Nachrichten nach diesem Zeitpunkt werden exportiert."
   },
   {
+    "id": "model.config.is_valid.message_export.export_type.app_error",
+    "translation": "Message export job ExportFormat must be one of either 'actiance' or 'globalrelay'"
+  },
+  {
     "id": "model.config.is_valid.message_export.file_location.app_error",
     "translation": "Nachrichten-Export-Aufgabe \"FileLocation\" muss ein beschreibbares Verzeichnis sein in welches die Exportdaten geschrieben werden"
   },
@@ -4883,6 +4895,10 @@
     "translation": "Nachrichten-Export-Aufgabe \"FileLocation\" muss ein Unterverzeichnis von \"FileSettings.Directory\" sein"
   },
   {
+    "id": "model.config.is_valid.message_export.global_relay_email_address.app_error",
+    "translation": "Message export job GlobalRelayEmailAddress must be set to a valid email address"
+  },
+  {
     "id": "model.config.is_valid.password_length.app_error",
     "translation": "Minimale Passwortlänge muss eine ganze Zahl größer oder gleich zu {{.MinLength}} und weniger oder gleich zu {{.MaxLength}} sein."
   },
@@ -7095,6 +7111,10 @@
     "translation": "Fehler beim Öffnen einer Verbindung zum SMTP-Server %v"
   },
   {
+    "id": "utils.mail.sendMail.attachments.write_error",
+    "translation": "Failed to write attachment to email"
+  },
+  {
     "id": "utils.mail.send_mail.close.app_error",
     "translation": "Fehler beim Schließen der Verbindung zum SMTP-Server"
   },
@@ -7163,10 +7183,6 @@
     "translation": "Fehler beim Erstellen der Ordner Überwachung %v"
   },
   {
-    "id": "web.dir_fail.error",
-    "translation": "Fehler beim Erstellen der Ordner Überwachung %v"
-  },
-  {
     "id": "web.do_load_channel.error",
     "translation": "Fehler beim Finden des Benutzerprofils mit id=%v erzwinge Abmeldung"
   },
@@ -7271,18 +7287,10 @@
     "translation": "Templates in %v werden geparst"
   },
   {
-    "id": "web.parsing_templates.error",
-    "translation": "Die Templates in %v konnte nicht verarbeitet werden"
-  },
-  {
     "id": "web.post_permalink.app_error",
     "translation": "Ungültige Nachrichten-ID"
   },
   {
-    "id": "web.reparse_templates.info",
-    "translation": "Erneute Analyze des Templates aufgrund veränderter Datei %v"
-  },
-  {
     "id": "web.reset_password.expired_link.app_error",
     "translation": "Der Link zum zurücksetzen des Passwortes ist abgelaufen"
   },
diff --git a/i18n/en.json b/i18n/en.json
index 10e089975..033aa85ea 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2299,6 +2299,14 @@
     "translation": "%v left the team."
   },
   {
+    "id": "api.team.move_channel.post.error",
+    "translation": "Failed to post channel move message."
+  },
+  {
+    "id": "api.team.move_channel.success",
+    "translation": "This channel has been moved to this team from %v."
+  },
+  {
     "id": "api.team.permanent_delete_team.attempting.warn",
     "translation": "Attempting to permanently delete team %v id=%v"
   },
@@ -3135,14 +3143,6 @@
     "translation": "Cannot move a channel unless all its members are already members of the destination team."
   },
   {
-    "id": "api.team.move_channel.success",
-    "translation": "This channel has been moved to this team from %v."
-  },
-  {
-    "id": "api.team.move_channel.post.error",
-    "translation": "Failed to post channel move message."
-  },
-  {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
     "translation": "Failed to post channel purpose message"
   },
@@ -4871,14 +4871,6 @@
     "translation": "Message export job BatchSize must be a positive integer"
   },
   {
-    "id": "model.config.is_valid.message_export.export_type.app_error",
-    "translation": "Message export job ExportFormat must be one of either 'actiance' or 'globalrelay'"
-  },
-  {
-    "id": "model.config.is_valid.message_export.global_relay_email_address.app_error",
-    "translation": "Message export job GlobalRelayEmailAddress must be set to a valid email address"
-  },
-  {
     "id": "model.config.is_valid.message_export.daily_runtime.app_error",
     "translation": "Message export job DailyRuntime must be a 24-hour time stamp in the form HH:MM."
   },
@@ -4891,6 +4883,10 @@
     "translation": "Message export job ExportFromTimestamp must be a timestamp (expressed in seconds since unix epoch). Only messages sent after this timestamp will be exported."
   },
   {
+    "id": "model.config.is_valid.message_export.export_type.app_error",
+    "translation": "Message export job ExportFormat must be one of either 'actiance' or 'globalrelay'"
+  },
+  {
     "id": "model.config.is_valid.message_export.file_location.app_error",
     "translation": "Message export job FileLocation must be a writable directory that export data will be written to"
   },
@@ -4899,6 +4895,10 @@
     "translation": "Message export job FileLocation must be a sub-directory of FileSettings.Directory"
   },
   {
+    "id": "model.config.is_valid.message_export.global_relay_email_address.app_error",
+    "translation": "Message export job GlobalRelayEmailAddress must be set to a valid email address"
+  },
+  {
     "id": "model.config.is_valid.password_length.app_error",
     "translation": "Minimum password length must be a whole number greater than or equal to {{.MinLength}} and less than or equal to {{.MaxLength}}."
   },
@@ -7103,10 +7103,6 @@
     "translation": "Failed to authenticate on SMTP server"
   },
   {
-    "id": "utils.mail.sendMail.attachments.write_error",
-    "translation": "Failed to write attachment to email"
-  },
-  {
     "id": "utils.mail.new_client.helo.error",
     "translation": "Failed to to set the HELO to SMTP server %v"
   },
@@ -7115,6 +7111,10 @@
     "translation": "Failed to open a connection to SMTP server %v"
   },
   {
+    "id": "utils.mail.sendMail.attachments.write_error",
+    "translation": "Failed to write attachment to email"
+  },
+  {
     "id": "utils.mail.send_mail.close.app_error",
     "translation": "Failed to close connection to SMTP server"
   },
diff --git a/i18n/es.json b/i18n/es.json
index b5f6a6489..fbb0c8538 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -132,10 +132,6 @@
     "translation": "No se pudo cargar el archivo. El archivo es muy grande."
   },
   {
-    "id": "api.api.init.parsing_templates.debug",
-    "translation": "Analizando el contenido plantillas del servidor en %v"
-  },
-  {
     "id": "api.api.init.parsing_templates.error",
     "translation": "Falla al analizar el contenido de las plantillas de servidor %v"
   },
@@ -1812,11 +1808,11 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " Cargó uno o más archivos en "
+    "translation": " Subió uno o más archivos en "
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only_dm",
-    "translation": " Cargó uno o más archivos en un mensaje directo"
+    "translation": " subió uno o más archivos en un mensaje directo"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_in",
@@ -2303,6 +2299,14 @@
     "translation": "%v abandonó el equipo."
   },
   {
+    "id": "api.team.move_channel.post.error",
+    "translation": "No pudo publicar el mensaje de que el canal fue movido."
+  },
+  {
+    "id": "api.team.move_channel.success",
+    "translation": "Este canal ha sido movido a este equipo desde %v."
+  },
+  {
     "id": "api.team.permanent_delete_team.attempting.warn",
     "translation": "Intentando eliminar permanentemente al equipo %v id=%v"
   },
@@ -3067,6 +3071,10 @@
     "translation": "No se pudo leer la carga del webhook de entrada."
   },
   {
+    "id": "api.webhook.incoming.error",
+    "translation": "No se pudo codificar la carga del multipart en el webhook entrante."
+  },
+  {
     "id": "api.webhook.init.debug",
     "translation": "Inicializando rutas del API para los webhooks"
   },
@@ -4875,6 +4883,10 @@
     "translation": "El ajuste ExportFromTimestamp para realizar el trabajo de Exportación de Mensajes debe ser una marca de tiempo (expresada en segundos desde la época unix). Sólo los mensajes enviados después de esa fecha serán exportados."
   },
   {
+    "id": "model.config.is_valid.message_export.export_type.app_error",
+    "translation": "El trabajo de exportación de Mensaje ExportFormat debe ser 'actiance' o 'globalrelay'"
+  },
+  {
     "id": "model.config.is_valid.message_export.file_location.app_error",
     "translation": "El ajuste FileLocation para realizar el trabajo de Exportación de Mensajes debe ser un directorio con permiso de escritura donde la data de exportación será almacenada."
   },
@@ -4883,6 +4895,10 @@
     "translation": "El ajuste FileLocation para realizar el trabajo de Exportación de Mensajes debe ser un sub-directorio de FileSettings.Directory"
   },
   {
+    "id": "model.config.is_valid.message_export.global_relay_email_address.app_error",
+    "translation": "El trabajo de exportación de Mensaje GlobalRelayEmailAddress debe estar asignado a una dirección de correo electrónico válido."
+  },
+  {
     "id": "model.config.is_valid.password_length.app_error",
     "translation": "Longitud mínima de la contraseña debe ser un número entero mayor que o igual a {{.MinLength}} y menor o igual que {{.MaxLength}}."
   },
@@ -7095,6 +7111,10 @@
     "translation": "Falla al abrir la conexión al servidor SMTP %v"
   },
   {
+    "id": "utils.mail.sendMail.attachments.write_error",
+    "translation": "Error al escribir el archivo adjunto al correo electrónico"
+  },
+  {
     "id": "utils.mail.send_mail.close.app_error",
     "translation": "Falla al cerrar la conexión al servidor SMTP"
   },
@@ -7163,10 +7183,6 @@
     "translation": "Falla al crear el vigilante de directorio %v"
   },
   {
-    "id": "web.dir_fail.error",
-    "translation": "Falla al vigilar el directorio %v"
-  },
-  {
     "id": "web.do_load_channel.error",
     "translation": "Error obteniendo el pérfil de usuario para id=%v forzando el cierre de sesión"
   },
@@ -7271,18 +7287,10 @@
     "translation": "Analizando el contenido de las plantillas en %v"
   },
   {
-    "id": "web.parsing_templates.error",
-    "translation": "Falla al analizar el contenido de las plantillas %v"
-  },
-  {
     "id": "web.post_permalink.app_error",
     "translation": "El ID del Mensaje es inválido"
   },
   {
-    "id": "web.reparse_templates.info",
-    "translation": "Re-analizando el contenido de las plantillas porque el archivo %v fue modificado"
-  },
-  {
     "id": "web.reset_password.expired_link.app_error",
     "translation": "El enlace de registro ha expirado"
   },
diff --git a/i18n/fr.json b/i18n/fr.json
index 60d17a2a9..6b6071d41 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -132,10 +132,6 @@
     "translation": "Impossible d'envoyer le fichier. Le fichier est trop volumineux."
   },
   {
-    "id": "api.api.init.parsing_templates.debug",
-    "translation": "Analyse des gabarits du serveur %v en cours"
-  },
-  {
     "id": "api.api.init.parsing_templates.error",
     "translation": "Impossible d'analyser les modèles du serveur %v"
   },
@@ -1812,11 +1808,11 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " A envoyé un ou plusieurs fichiers sur "
+    "translation": " a envoyé un ou plusieurs fichiers dans "
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only_dm",
-    "translation": " A envoyé un ou plusieurs fichiers dans un message personnel"
+    "translation": " a envoyé un ou plusieurs fichiers dans un message personnel"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_in",
@@ -2303,6 +2299,14 @@
     "translation": "%v a quitté l'équipe."
   },
   {
+    "id": "api.team.move_channel.post.error",
+    "translation": "Impossible de publier la description du canal"
+  },
+  {
+    "id": "api.team.move_channel.success",
+    "translation": "This channel has been moved to this team from %v."
+  },
+  {
     "id": "api.team.permanent_delete_team.attempting.warn",
     "translation": "Tentative de suppression définitive de l'équipe %v id=%v"
   },
@@ -3067,6 +3071,10 @@
     "translation": "Impossible de lire la charge utile du webhook entrant."
   },
   {
+    "id": "api.webhook.incoming.error",
+    "translation": "Could not decode the multipart payload of incoming webhook."
+  },
+  {
     "id": "api.webhook.init.debug",
     "translation": "Initialisation des routes de l'API webhook"
   },
@@ -4648,7 +4656,7 @@
   },
   {
     "id": "model.config.is_valid.atmos_camo_image_proxy_options.app_error",
-    "translation": "Les paramètres d'options du proxy d'image atmos/camo sont invalides. Votre clé partagée doit être définie comme paramètre."
+    "translation": "Les paramètres d'options du proxy d'images atmos/camo sont invalides. Votre clé partagée doit être définie comme paramètre."
   },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
@@ -4875,6 +4883,10 @@
     "translation": "Le paramètre ExportFromTimestamp de la tâche d'exportation de messages doit être un horodatage (exprimé en secondes depuis l'epoch UNIX). Seuls les messages envoyés après cet horodatage seront exportés."
   },
   {
+    "id": "model.config.is_valid.message_export.export_type.app_error",
+    "translation": "Message export job ExportFormat must be one of either 'actiance' or 'globalrelay'"
+  },
+  {
     "id": "model.config.is_valid.message_export.file_location.app_error",
     "translation": "Le paramètre FileLocation de la tâche d'exportation de messages doit être un dossier avec droits d'écriture. Il s'agit du dossier dans lequel les données seront exportées."
   },
@@ -4883,6 +4895,10 @@
     "translation": "Le paramètre FileLocation de la tâche d'exportation de messages doit être un sous-dossier de FileSettings.Directory."
   },
   {
+    "id": "model.config.is_valid.message_export.global_relay_email_address.app_error",
+    "translation": "Message export job GlobalRelayEmailAddress must be set to a valid email address"
+  },
+  {
     "id": "model.config.is_valid.password_length.app_error",
     "translation": "La taille minimale du mot de passe doit être un nombre entier supérieur ou égal à {{.MinLength}} et inférieur ou égal à {{.MaxLength}}."
   },
@@ -7095,6 +7111,10 @@
     "translation": "Échec de l'ouverture de connexion auprès du serveur SMTP %v"
   },
   {
+    "id": "utils.mail.sendMail.attachments.write_error",
+    "translation": "Failed to write attachment to email"
+  },
+  {
     "id": "utils.mail.send_mail.close.app_error",
     "translation": "Échec de fermeture de connexion auprès du serveur SMTP"
   },
@@ -7163,10 +7183,6 @@
     "translation": "Échec de la création de l'observateur de dossier %v"
   },
   {
-    "id": "web.dir_fail.error",
-    "translation": "Échec de l'observateur de dossier %v"
-  },
-  {
     "id": "web.do_load_channel.error",
     "translation": "Erreur lors de la récupération du profil pour id=%v déconnexion forcée"
   },
@@ -7271,18 +7287,10 @@
     "translation": "Analyse des gabarits sur %v"
   },
   {
-    "id": "web.parsing_templates.error",
-    "translation": "Impossible d'analyser les gabarits %v"
-  },
-  {
     "id": "web.post_permalink.app_error",
     "translation": "ID de message invalide"
   },
   {
-    "id": "web.reparse_templates.info",
-    "translation": "Re-examen des gabarits en raison de la modification du fichier %v"
-  },
-  {
     "id": "web.reset_password.expired_link.app_error",
     "translation": "Le lien de réinitialisation du mot de passe a expiré"
   },
diff --git a/i18n/it.json b/i18n/it.json
index 43a02369d..7b6d3f077 100644
--- a/i18n/it.json
+++ b/i18n/it.json
@@ -132,10 +132,6 @@
     "translation": "Impossibile caricare il file. Il file è troppo grande."
   },
   {
-    "id": "api.api.init.parsing_templates.debug",
-    "translation": "Analisi dei template del server: %v"
-  },
-  {
     "id": "api.api.init.parsing_templates.error",
     "translation": "Impossibile analizzare i modelli del server %v"
   },
@@ -2303,6 +2299,14 @@
     "translation": "%v ha lasciato il gruppo."
   },
   {
+    "id": "api.team.move_channel.post.error",
+    "translation": "Impossibile pubblicare il messaggio di spostamento del canale."
+  },
+  {
+    "id": "api.team.move_channel.success",
+    "translation": "Questo canale è stato spostato in questo gruppo da %v."
+  },
+  {
     "id": "api.team.permanent_delete_team.attempting.warn",
     "translation": "Tentativo di eliminazione permanente del gruppo %v id=%v"
   },
@@ -3067,6 +3071,10 @@
     "translation": "Impossibile leggere il contenuto del webhook in ingresso."
   },
   {
+    "id": "api.webhook.incoming.error",
+    "translation": "Impossibile decodificare la richiesta multipart del webhook in ingresso."
+  },
+  {
     "id": "api.webhook.init.debug",
     "translation": "Inizializzazione API Routes dei webhook"
   },
@@ -4875,6 +4883,10 @@
     "translation": "Lavoro esportazione messaggi il valore ExportFromTimestamp deve essere un timestamp (espresso in secondi dall'epoca unix). Solo i messaggi successivi a questo valore saranno esportati."
   },
   {
+    "id": "model.config.is_valid.message_export.export_type.app_error",
+    "translation": "ExportFormat del lavoro di esportazione messaggi deve essere 'actianve' oppure 'globalrelay'"
+  },
+  {
     "id": "model.config.is_valid.message_export.file_location.app_error",
     "translation": "Lavoro esportazione messaggi il valore FileLocation deve essere una cartella accessibile in scrittura in cui verranno salvati i dati esportati"
   },
@@ -4883,6 +4895,10 @@
     "translation": "Lavoro esportazione messaggi il valore FileLocation deve essere una sottocartella di FileSettings.Directory"
   },
   {
+    "id": "model.config.is_valid.message_export.global_relay_email_address.app_error",
+    "translation": "GlobalRelayEmailAddress del lavoro di esportazione messaggi deve essere un indirizzo email valido"
+  },
+  {
     "id": "model.config.is_valid.password_length.app_error",
     "translation": "Lunghezza minima password deve essere un numero intero maggiore o uguale a {{.MinLength}} e minore o uguale a {{.MaxLength}}."
   },
@@ -7095,6 +7111,10 @@
     "translation": "Impossibile aprire una connessione al server SMTP %v"
   },
   {
+    "id": "utils.mail.sendMail.attachments.write_error",
+    "translation": "Impossibile aggiungere l'allegato all'email"
+  },
+  {
     "id": "utils.mail.send_mail.close.app_error",
     "translation": "Impossibile chiudere la connessione al server SMTP"
   },
@@ -7163,10 +7183,6 @@
     "translation": "Impossibile creare osservatore cartella %v"
   },
   {
-    "id": "web.dir_fail.error",
-    "translation": "Fallito nell'osservatore cartella %v"
-  },
-  {
     "id": "web.do_load_channel.error",
     "translation": "Errore nel caricamento del profilo utente id=%v logout forzato"
   },
@@ -7271,18 +7287,10 @@
     "translation": "Analisi dei template del server: %v"
   },
   {
-    "id": "web.parsing_templates.error",
-    "translation": "Impossibile analizzare i modelli %v"
-  },
-  {
     "id": "web.post_permalink.app_error",
     "translation": "ID pubblicazione non valido"
   },
   {
-    "id": "web.reparse_templates.info",
-    "translation": "Rianalisi dei modelli in corso a causa della modifica al file %v"
-  },
-  {
     "id": "web.reset_password.expired_link.app_error",
     "translation": "Il collegamento per il reset della password è scaduto"
   },
diff --git a/i18n/ja.json b/i18n/ja.json
index ac7ec2705..b8fb048a5 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -132,10 +132,6 @@
     "translation": "画像ファイルをアップロードできません。ファイルが大き過ぎます。"
   },
   {
-    "id": "api.api.init.parsing_templates.debug",
-    "translation": "%vにあるサーバーテンプレートを読み込んでいます"
-  },
-  {
     "id": "api.api.init.parsing_templates.error",
     "translation": "サーバーテンプレート%vを読み込めませんでした"
   },
@@ -1812,11 +1808,11 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " 一つ以上のファイルをアップロードしました "
+    "translation": " ファイルをアップロードしました "
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only_dm",
-    "translation": " 一つ以上のファイルをダイレクトメッセージにアップロードしました"
+    "translation": " ファイルをダイレクトメッセージにアップロードしました"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_in",
@@ -2303,6 +2299,14 @@
     "translation": "%v はチームから脱退しました。"
   },
   {
+    "id": "api.team.move_channel.post.error",
+    "translation": "チャンネル移動メッセージを投稿できませんでした"
+  },
+  {
+    "id": "api.team.move_channel.success",
+    "translation": "このチャンネルは %v からこのチームへ移動されました。"
+  },
+  {
     "id": "api.team.permanent_delete_team.attempting.warn",
     "translation": "チーム%vを完全に削除しようとしています id=%v"
   },
@@ -3067,6 +3071,10 @@
     "translation": "内向きのウェブフックのペイロードを読み込めませんでした。"
   },
   {
+    "id": "api.webhook.incoming.error",
+    "translation": "内向きのウェブフックのマルチパートペイロードをデコードできませんでした。"
+  },
+  {
     "id": "api.webhook.init.debug",
     "translation": "ウェブフックAPIルートを初期化しています"
   },
@@ -4875,6 +4883,10 @@
     "translation": "メッセージエクスポート処理の ExportFromTimestamp は(ユニックス標準時からの秒数で表される)タイムスタンプでなくてはなりません。このタイムスタンプ以降に投稿されたメッセージのみエクスポートされます。"
   },
   {
+    "id": "model.config.is_valid.message_export.export_type.app_error",
+    "translation": "メッセージエクスポート処理の ExportFormat は 'actiance' か 'globalrelay' のいずれかでなくてはなりません"
+  },
+  {
     "id": "model.config.is_valid.message_export.file_location.app_error",
     "translation": "メッセーエクスポート処理の FileLocation はエクスポートデータが書き込まれる書き込み可能なディレクトリでなくてはなりません"
   },
@@ -4883,6 +4895,10 @@
     "translation": "メッセージエクスポート処理の FileLocation は FileSettings.Directory のサブディレクトリでなくてはなりません"
   },
   {
+    "id": "model.config.is_valid.message_export.global_relay_email_address.app_error",
+    "translation": "メッセージエクスポート処理の GlobalRelayEmailAddress には有効な電子メールアドレスが設定されていなくてはなりません"
+  },
+  {
     "id": "model.config.is_valid.password_length.app_error",
     "translation": "最小パスワード長さは、{{.MinLength}}以上、{{.MaxLength}}以下に設定してください。"
   },
@@ -7095,6 +7111,10 @@
     "translation": "SMTPサーバー%vに接続できませんでした"
   },
   {
+    "id": "utils.mail.sendMail.attachments.write_error",
+    "translation": "電子メールへ添付を書き込むことができませんでした"
+  },
+  {
     "id": "utils.mail.send_mail.close.app_error",
     "translation": "SMTPサーバーへの接続を終了できませんでした"
   },
@@ -7163,10 +7183,6 @@
     "translation": "ディレクトリーウォッチャーを作成できませんでした %v"
   },
   {
-    "id": "web.dir_fail.error",
-    "translation": "ディレクトリーウォッチャーで失敗しました %v"
-  },
-  {
     "id": "web.do_load_channel.error",
     "translation": "id=%vのユーザーのプロフィールを取得できません。強制的にログアウトします"
   },
@@ -7271,18 +7287,10 @@
     "translation": "テンプレート%vを読み直しています"
   },
   {
-    "id": "web.parsing_templates.error",
-    "translation": "テンプレート%vの解析に失敗しました"
-  },
-  {
     "id": "web.post_permalink.app_error",
     "translation": "不正な投稿IDです"
   },
   {
-    "id": "web.reparse_templates.info",
-    "translation": "ファイル%vが変更されたためテンプレートを読み直しています"
-  },
-  {
     "id": "web.reset_password.expired_link.app_error",
     "translation": "パスワード初期化リンクの期限が切れています"
   },
diff --git a/i18n/ko.json b/i18n/ko.json
index 78fe29d16..b8eff6bca 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -132,10 +132,6 @@
     "translation": "용량이 커서 파일을 업로드 할 수 없습니다."
   },
   {
-    "id": "api.api.init.parsing_templates.debug",
-    "translation": "서버 템플릿 %v 파싱 중"
-  },
-  {
     "id": "api.api.init.parsing_templates.error",
     "translation": "서버 템플릿 %v 를 파싱하는데 실패하였습니다"
   },
@@ -2303,6 +2299,14 @@
     "translation": "%v left the team."
   },
   {
+    "id": "api.team.move_channel.post.error",
+    "translation": "들어옴/나감 메시지를 등록하는 데 실패함"
+  },
+  {
+    "id": "api.team.move_channel.success",
+    "translation": "This channel has been moved to this team from %v."
+  },
+  {
     "id": "api.team.permanent_delete_team.attempting.warn",
     "translation": "Attempting to permanently delete team %v id=%v"
   },
@@ -3067,6 +3071,10 @@
     "translation": "Incoming webhook의 payload를 읽을 수 없습니다."
   },
   {
+    "id": "api.webhook.incoming.error",
+    "translation": "Could not decode the multipart payload of incoming webhook."
+  },
+  {
     "id": "api.webhook.init.debug",
     "translation": "webhook API 경로 초기화 중"
   },
@@ -4875,6 +4883,10 @@
     "translation": "Message export job ExportFromTimestamp must be a timestamp (expressed in seconds since unix epoch). Only messages sent after this timestamp will be exported."
   },
   {
+    "id": "model.config.is_valid.message_export.export_type.app_error",
+    "translation": "Message export job ExportFormat must be one of either 'actiance' or 'globalrelay'"
+  },
+  {
     "id": "model.config.is_valid.message_export.file_location.app_error",
     "translation": "Message export job FileLocation must be a writable directory that export data will be written to"
   },
@@ -4883,6 +4895,10 @@
     "translation": "Message export job FileLocation must be a sub-directory of FileSettings.Directory"
   },
   {
+    "id": "model.config.is_valid.message_export.global_relay_email_address.app_error",
+    "translation": "Message export job GlobalRelayEmailAddress must be set to a valid email address"
+  },
+  {
     "id": "model.config.is_valid.password_length.app_error",
     "translation": "Minimum password length must be a whole number greater than or equal to {{.MinLength}} and less than or equal to {{.MaxLength}}."
   },
@@ -7095,6 +7111,10 @@
     "translation": "Failed to open a connection to SMTP server %v"
   },
   {
+    "id": "utils.mail.sendMail.attachments.write_error",
+    "translation": "Failed to write attachment to email"
+  },
+  {
     "id": "utils.mail.send_mail.close.app_error",
     "translation": "Failed to close connection to SMTP server"
   },
@@ -7163,10 +7183,6 @@
     "translation": "Failed to create directory watcher %v"
   },
   {
-    "id": "web.dir_fail.error",
-    "translation": "Failed in directory watcher %v"
-  },
-  {
     "id": "web.do_load_channel.error",
     "translation": "강제 로그아웃 중 id=%v 유저 프로필을 가져오는 중 오류가 발생했습니다"
   },
@@ -7271,18 +7287,10 @@
     "translation": "%v에서 서버 템플릿 파싱중"
   },
   {
-    "id": "web.parsing_templates.error",
-    "translation": "서버 템플릿 %v 를 파싱하는데 실패하였습니다"
-  },
-  {
     "id": "web.post_permalink.app_error",
     "translation": "잘못된 글 ID"
   },
   {
-    "id": "web.reparse_templates.info",
-    "translation": "Re-parsing templates because of modified file %v"
-  },
-  {
     "id": "web.reset_password.expired_link.app_error",
     "translation": "비밀번호 재설정 링크가 만료되었습니다."
   },
diff --git a/i18n/nl.json b/i18n/nl.json
index 107434bca..a4ae85069 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -132,10 +132,6 @@
     "translation": "Kan bestand niet uploaden. Bestand is te groot."
   },
   {
-    "id": "api.api.init.parsing_templates.debug",
-    "translation": "Server-templates aan het verwerken voor %v"
-  },
-  {
     "id": "api.api.init.parsing_templates.error",
     "translation": "Verwerken van server-template %v is mislukt"
   },
@@ -2303,6 +2299,14 @@
     "translation": "%v left the team."
   },
   {
+    "id": "api.team.move_channel.post.error",
+    "translation": "Plaatsen van bericht over binnenkomen/verlaten %v is mislukt"
+  },
+  {
+    "id": "api.team.move_channel.success",
+    "translation": "This channel has been moved to this team from %v."
+  },
+  {
     "id": "api.team.permanent_delete_team.attempting.warn",
     "translation": "Poging om team %v permanent te verwijderen, id=%v"
   },
@@ -3067,6 +3071,10 @@
     "translation": "Kan inhoud van inkomende webhook niet lezen."
   },
   {
+    "id": "api.webhook.incoming.error",
+    "translation": "Could not decode the multipart payload of incoming webhook."
+  },
+  {
     "id": "api.webhook.init.debug",
     "translation": "Initialisatie van de webhook api"
   },
@@ -4875,6 +4883,10 @@
     "translation": "Message export job ExportFromTimestamp must be a timestamp (expressed in seconds since unix epoch). Only messages sent after this timestamp will be exported."
   },
   {
+    "id": "model.config.is_valid.message_export.export_type.app_error",
+    "translation": "Message export job ExportFormat must be one of either 'actiance' or 'globalrelay'"
+  },
+  {
     "id": "model.config.is_valid.message_export.file_location.app_error",
     "translation": "Message export job FileLocation must be a writable directory that export data will be written to"
   },
@@ -4883,6 +4895,10 @@
     "translation": "Message export job FileLocation must be a sub-directory of FileSettings.Directory"
   },
   {
+    "id": "model.config.is_valid.message_export.global_relay_email_address.app_error",
+    "translation": "Message export job GlobalRelayEmailAddress must be set to a valid email address"
+  },
+  {
     "id": "model.config.is_valid.password_length.app_error",
     "translation": "Wachtwoord moet een lengte hebben van minimaal {{.MinLength}} en/of maximaal {{.MaxLength}}"
   },
@@ -7095,6 +7111,10 @@
     "translation": "Kan geen verbinding opzetten naa de SMTP server, fout=%v"
   },
   {
+    "id": "utils.mail.sendMail.attachments.write_error",
+    "translation": "Failed to write attachment to email"
+  },
+  {
     "id": "utils.mail.send_mail.close.app_error",
     "translation": "Er is een probleem opgetreden bij het afsluiten van de verbinding naar de SMTP server"
   },
@@ -7163,10 +7183,6 @@
     "translation": "Toevoegen van een directory om te controleren is mislukt %v"
   },
   {
-    "id": "web.dir_fail.error",
-    "translation": "Fout tijdens het bekijken van de directory %v"
-  },
-  {
     "id": "web.do_load_channel.error",
     "translation": "Probleem bij het ophalen van het gebruikersprofiel voor id=%v, uitlog actie geforceerd"
   },
@@ -7271,18 +7287,10 @@
     "translation": "Server template aan het verwerken voor %v"
   },
   {
-    "id": "web.parsing_templates.error",
-    "translation": "Server template %v is niet te verwerken"
-  },
-  {
     "id": "web.post_permalink.app_error",
     "translation": "Ongeldige bericht ID"
   },
   {
-    "id": "web.reparse_templates.info",
-    "translation": "Templates opnieuw verwerken, door aangepast bestand %v"
-  },
-  {
     "id": "web.reset_password.expired_link.app_error",
     "translation": "De wachtwoord reset link is niet meer geldig"
   },
diff --git a/i18n/pl.json b/i18n/pl.json
index d2f26cf56..209c00aeb 100644
--- a/i18n/pl.json
+++ b/i18n/pl.json
@@ -132,10 +132,6 @@
     "translation": "Nie udało się wgrać obrazu. Plik jest zbyt duży."
   },
   {
-    "id": "api.api.init.parsing_templates.debug",
-    "translation": "Przetwarzanie szablonów serwera w %v"
-  },
-  {
     "id": "api.api.init.parsing_templates.error",
     "translation": "Nie udało się przetworzyć szablonów serwera w %v"
   },
@@ -2303,6 +2299,14 @@
     "translation": "%v opuścił zespół."
   },
   {
+    "id": "api.team.move_channel.post.error",
+    "translation": "Nie udało się wysłać celu kanału"
+  },
+  {
+    "id": "api.team.move_channel.success",
+    "translation": "This channel has been moved to this team from %v."
+  },
+  {
     "id": "api.team.permanent_delete_team.attempting.warn",
     "translation": "Próba trwałego usunięcia zespołu %v ID=%v"
   },
@@ -3067,6 +3071,10 @@
     "translation": "Nie można odczytać zawartości przychodzącego webhook."
   },
   {
+    "id": "api.webhook.incoming.error",
+    "translation": "Could not decode the multipart payload of incoming webhook."
+  },
+  {
     "id": "api.webhook.init.debug",
     "translation": "Inicjalizowanie tras API webhooków"
   },
@@ -4875,6 +4883,10 @@
     "translation": "Message export job ExportFromTimestamp must be a timestamp (expressed in seconds since unix epoch). Only messages sent after this timestamp will be exported."
   },
   {
+    "id": "model.config.is_valid.message_export.export_type.app_error",
+    "translation": "Message export job ExportFormat must be one of either 'actiance' or 'globalrelay'"
+  },
+  {
     "id": "model.config.is_valid.message_export.file_location.app_error",
     "translation": "Message export job FileLocation must be a writable directory that export data will be written to"
   },
@@ -4883,6 +4895,10 @@
     "translation": "Message export job FileLocation must be a sub-directory of FileSettings.Directory"
   },
   {
+    "id": "model.config.is_valid.message_export.global_relay_email_address.app_error",
+    "translation": "Message export job GlobalRelayEmailAddress must be set to a valid email address"
+  },
+  {
     "id": "model.config.is_valid.password_length.app_error",
     "translation": "Minimalna długość hasła musi być liczbą całkowitą większą lub równą od {{.MinLength}} i mniejszą lub równą od {{.MaxLength}}."
   },
@@ -7095,6 +7111,10 @@
     "translation": "Failed to open a connection to SMTP server %v"
   },
   {
+    "id": "utils.mail.sendMail.attachments.write_error",
+    "translation": "Failed to write attachment to email"
+  },
+  {
     "id": "utils.mail.send_mail.close.app_error",
     "translation": "Failed to close connection to SMTP server"
   },
@@ -7163,10 +7183,6 @@
     "translation": "Nie udało się utworzyć stróża katalogu %v"
   },
   {
-    "id": "web.dir_fail.error",
-    "translation": "Nie udało się utworzyć stróża katalogu %v"
-  },
-  {
     "id": "web.do_load_channel.error",
     "translation": "Błąd w trakcie pobierania profilów użytkowników dla id=%v wymuszono wylogowanie"
   },
@@ -7271,18 +7287,10 @@
     "translation": "Przetworzono szablony serwera w %v"
   },
   {
-    "id": "web.parsing_templates.error",
-    "translation": "Nie udało się przetworzyć szablonów %v"
-  },
-  {
     "id": "web.post_permalink.app_error",
     "translation": "Nieprawidłowy ID wiadomości"
   },
   {
-    "id": "web.reparse_templates.info",
-    "translation": "Re-parsing templates because of modified file %v"
-  },
-  {
     "id": "web.reset_password.expired_link.app_error",
     "translation": "Link resetujący hasło wygasł"
   },
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index 072981d1f..314131254 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -132,10 +132,6 @@
     "translation": "Não foi possível enviar o arquivo. Arquivo é muito grande."
   },
   {
-    "id": "api.api.init.parsing_templates.debug",
-    "translation": "Analisando modelos no servidor %v"
-  },
-  {
     "id": "api.api.init.parsing_templates.error",
     "translation": "Falha ao processar os modelos do servidor %v"
   },
@@ -1812,11 +1808,11 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " Enviados um ou mais arquivos em "
+    "translation": " enviado um ou mais arquivos em "
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only_dm",
-    "translation": " Enviado um ou mais arquivos em uma mensagem direta"
+    "translation": " enviado um ou mais arquivos em uma mensagem direta"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_in",
@@ -2303,6 +2299,14 @@
     "translation": "%v deixou a equipe."
   },
   {
+    "id": "api.team.move_channel.post.error",
+    "translation": "Falha ao postar a mensagem de mover o canal."
+  },
+  {
+    "id": "api.team.move_channel.success",
+    "translation": "Este canal foi movido desta equipe para %v."
+  },
+  {
     "id": "api.team.permanent_delete_team.attempting.warn",
     "translation": "Tentando permanentemente deletar a equipe %v id=%v"
   },
@@ -2368,7 +2372,7 @@
   },
   {
     "id": "api.templates.email_info",
-    "translation": "Qualquer dúvida, envie-nos a qualquer momento: <a href='mailto:{{.SupportEmail}}' style='text-decoration: none; color:#2389D7;'>{{.SupportEmail}}</a>.<br>Nossos melhores cumprimentos,<br>Equipe {{.SiteName}}<br>"
+    "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_organization",
@@ -2708,7 +2712,7 @@
   },
   {
     "id": "api.user.create_user.signup_link_mismatched_invite_id.app_error",
-    "translation": "O link de inscrição não parece ser válido"
+    "translation": "O link de inscrição não parece estar válido"
   },
   {
     "id": "api.user.create_user.team_name.app_error",
@@ -3067,6 +3071,10 @@
     "translation": "Não foi possível ler o payload do webhook de entrada."
   },
   {
+    "id": "api.webhook.incoming.error",
+    "translation": "Could not decode the multipart payload of incoming webhook."
+  },
+  {
     "id": "api.webhook.init.debug",
     "translation": "Inicializando as rotas de API webhook"
   },
@@ -4875,6 +4883,10 @@
     "translation": "O trabalho de exportação de mensagens ExportFromTimestamp deve ser data e hora (expresso em segundos unix epoch). Somente mensagens enviadas após está data e hora serão exportadas."
   },
   {
+    "id": "model.config.is_valid.message_export.export_type.app_error",
+    "translation": "Message export job ExportFormat must be one of either 'actiance' or 'globalrelay'"
+  },
+  {
     "id": "model.config.is_valid.message_export.file_location.app_error",
     "translation": "Trabalho de exportação de mensagens FileLocation deve ser um diretório gravável onde os dados de exportação serão gravados"
   },
@@ -4883,6 +4895,10 @@
     "translation": "Trabalho de exportação de mensagens FileLocation deve ser um subdiretório de FileSettings.Directory"
   },
   {
+    "id": "model.config.is_valid.message_export.global_relay_email_address.app_error",
+    "translation": "Message export job GlobalRelayEmailAddress must be set to a valid email address"
+  },
+  {
     "id": "model.config.is_valid.password_length.app_error",
     "translation": "Tamanho mínimo de senha deve ser um número inteiro maior ou igual a {{.MinLength}} e menor ou igual a {{.MaxLength}}."
   },
@@ -7095,6 +7111,10 @@
     "translation": "Falha ao abrir a conexão SMTP para o servidor %v"
   },
   {
+    "id": "utils.mail.sendMail.attachments.write_error",
+    "translation": "Failed to write attachment to email"
+  },
+  {
     "id": "utils.mail.send_mail.close.app_error",
     "translation": "Falha ao fechar a conexão com servidor SMTP"
   },
@@ -7163,10 +7183,6 @@
     "translation": "Falha ao criar o diretório observador %v"
   },
   {
-    "id": "web.dir_fail.error",
-    "translation": "Falha no diretório observador %v"
-  },
-  {
     "id": "web.do_load_channel.error",
     "translation": "Erro na obtenção do perfil dos usuários para id=%v forçando o logout"
   },
@@ -7271,18 +7287,10 @@
     "translation": "Analisando modelos no %v"
   },
   {
-    "id": "web.parsing_templates.error",
-    "translation": "Falha ao processar os modelos %v"
-  },
-  {
     "id": "web.post_permalink.app_error",
     "translation": "Post ID Inválido"
   },
   {
-    "id": "web.reparse_templates.info",
-    "translation": "Re-análise dos modelos por causa da modificação do arquivo %v"
-  },
-  {
     "id": "web.reset_password.expired_link.app_error",
     "translation": "O link de redefinição de senha expirou"
   },
diff --git a/i18n/ru.json b/i18n/ru.json
index b203bc482..5d1b6be49 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -132,10 +132,6 @@
     "translation": "Невозможно загрузить файл. Он слишком большой."
   },
   {
-    "id": "api.api.init.parsing_templates.debug",
-    "translation": "Разбор шаблонов сервера на %v"
-  },
-  {
     "id": "api.api.init.parsing_templates.error",
     "translation": "Не удалось разобрать шаблоны сервера %v"
   },
@@ -2303,6 +2299,14 @@
     "translation": "%v покинул(а) команду."
   },
   {
+    "id": "api.team.move_channel.post.error",
+    "translation": "Не удалось обновить заголовок канала."
+  },
+  {
+    "id": "api.team.move_channel.success",
+    "translation": "Канал перемещен в эту команду из %v."
+  },
+  {
     "id": "api.team.permanent_delete_team.attempting.warn",
     "translation": "Попытка безвозвратно удалить команду %v id=%v"
   },
@@ -3067,6 +3071,10 @@
     "translation": "Не удалось прочитать полезную нагрузку входящего вебхука."
   },
   {
+    "id": "api.webhook.incoming.error",
+    "translation": "Could not decode the multipart payload of incoming webhook."
+  },
+  {
     "id": "api.webhook.init.debug",
     "translation": "Инициализация API вебхуков"
   },
@@ -4875,6 +4883,10 @@
     "translation": "Message export job ExportFromTimestamp must be a timestamp (expressed in seconds since unix epoch). Only messages sent after this timestamp will be exported."
   },
   {
+    "id": "model.config.is_valid.message_export.export_type.app_error",
+    "translation": "Message export job ExportFormat must be one of either 'actiance' or 'globalrelay'"
+  },
+  {
     "id": "model.config.is_valid.message_export.file_location.app_error",
     "translation": "Message export job FileLocation must be a writable directory that export data will be written to"
   },
@@ -4883,6 +4895,10 @@
     "translation": "Message export job FileLocation must be a sub-directory of FileSettings.Directory"
   },
   {
+    "id": "model.config.is_valid.message_export.global_relay_email_address.app_error",
+    "translation": "Message export job GlobalRelayEmailAddress must be set to a valid email address"
+  },
+  {
     "id": "model.config.is_valid.password_length.app_error",
     "translation": "Минимальная длина пароля должна быть целым числом большим или равным {{.MinLength}}, а также меньшим или равным {{.MaxLength}}."
   },
@@ -7095,6 +7111,10 @@
     "translation": "Не удалось установить соединение с SMTP сервером %v"
   },
   {
+    "id": "utils.mail.sendMail.attachments.write_error",
+    "translation": "Failed to write attachment to email"
+  },
+  {
     "id": "utils.mail.send_mail.close.app_error",
     "translation": "Не удалось закрыть соединение с SMTP сервером"
   },
@@ -7163,10 +7183,6 @@
     "translation": "Не удалось создать наблюдатель каталога %v"
   },
   {
-    "id": "web.dir_fail.error",
-    "translation": "Сбой в наблюдателе каталога %v"
-  },
-  {
     "id": "web.do_load_channel.error",
     "translation": "Ошибка при получении профиля пользователя для id=%v, принудительный выход"
   },
@@ -7271,18 +7287,10 @@
     "translation": "Разбор шаблонов на %v"
   },
   {
-    "id": "web.parsing_templates.error",
-    "translation": "Не удалось разобрать шаблоны %v"
-  },
-  {
     "id": "web.post_permalink.app_error",
     "translation": "Неверный идентификатор поста"
   },
   {
-    "id": "web.reparse_templates.info",
-    "translation": "Повторный разбор шаблонов из-за модификации файла %v"
-  },
-  {
     "id": "web.reset_password.expired_link.app_error",
     "translation": "Ссылка для сброса пароля просрочена"
   },
diff --git a/i18n/tr.json b/i18n/tr.json
index 2e159e1e8..d33570001 100644
--- a/i18n/tr.json
+++ b/i18n/tr.json
@@ -132,10 +132,6 @@
     "translation": "Dosya yüklenemedi. Dosya çok büyük."
   },
   {
-    "id": "api.api.init.parsing_templates.debug",
-    "translation": "%v üzerindeki sunucu kalıpları işleniyor"
-  },
-  {
     "id": "api.api.init.parsing_templates.error",
     "translation": "%v üzerindeki sunucu kalıpları işlenemedi"
   },
@@ -1812,11 +1808,11 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " Şunun içine bir ya da bir kaç dosya yüklendi "
+    "translation": " şunun içine bir ya da bir kaç dosya yükledi "
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only_dm",
-    "translation": " Bir doğrudan ileti içine bir ya da bir kaç dosya yüklendi"
+    "translation": " bir doğrudan ileti içine bir ya da bir kaç dosya yükledi"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_in",
@@ -2303,6 +2299,14 @@
     "translation": "%v takımdan ayrıldı."
   },
   {
+    "id": "api.team.move_channel.post.error",
+    "translation": "Kanal amacı iletisi gönderilemedi"
+  },
+  {
+    "id": "api.team.move_channel.success",
+    "translation": "This channel has been moved to this team from %v."
+  },
+  {
     "id": "api.team.permanent_delete_team.attempting.warn",
     "translation": "%v takımı kalıcı olarak silinmeye çalışılıyor. Kod: %v"
   },
@@ -3067,6 +3071,10 @@
     "translation": "Gelen web bağlantısının yükü okunamadı."
   },
   {
+    "id": "api.webhook.incoming.error",
+    "translation": "Could not decode the multipart payload of incoming webhook."
+  },
+  {
     "id": "api.webhook.init.debug",
     "translation": "Web bağlantısı API rotaları hazırlanıyor"
   },
@@ -4875,6 +4883,10 @@
     "translation": "İleti dışa aktarma görevi DışaAktarmaZamanıBaşlangıcı değeri bir zaman damgası olmalıdır (Unix Epoch başlangıcından itibaren saniye olarak). Yalnız bu zaman damgasından sonra gönderilmiş iletiler dışa aktarılır."
   },
   {
+    "id": "model.config.is_valid.message_export.export_type.app_error",
+    "translation": "Message export job ExportFormat must be one of either 'actiance' or 'globalrelay'"
+  },
+  {
     "id": "model.config.is_valid.message_export.file_location.app_error",
     "translation": "İleti dışa aktarma görevi DosyaKonumu değeri dışa aktarılacak verilerin kaydedilebilmesi için yazılabilen bir klasör olmalıdır"
   },
@@ -4883,6 +4895,10 @@
     "translation": "İleti dışa aktarma görevi DosyaKonumu DosyaAyarları.Klasör değerinin bir alt klasörü olmalıdır"
   },
   {
+    "id": "model.config.is_valid.message_export.global_relay_email_address.app_error",
+    "translation": "Message export job GlobalRelayEmailAddress must be set to a valid email address"
+  },
+  {
     "id": "model.config.is_valid.password_length.app_error",
     "translation": "En kısa parola uzunluğu {{.MinLength}} ile {{.MaxLength}} arasında bir tamsayı olmalıdır."
   },
@@ -7095,6 +7111,10 @@
     "translation": "%v SMTP sunucusu üzerinde bağlantı açılamadı"
   },
   {
+    "id": "utils.mail.sendMail.attachments.write_error",
+    "translation": "Failed to write attachment to email"
+  },
+  {
     "id": "utils.mail.send_mail.close.app_error",
     "translation": "SMTP sunucu bağlantısı kapatılamadı"
   },
@@ -7163,10 +7183,6 @@
     "translation": "Klasör izleyici eklenemedi %v"
   },
   {
-    "id": "web.dir_fail.error",
-    "translation": "Klasör izleyicide sorun çıktı %v"
-  },
-  {
     "id": "web.do_load_channel.error",
     "translation": "%v kodlu kullanıcı profili alınırken sorun çıktı, oturum kapatılıyor"
   },
@@ -7271,18 +7287,10 @@
     "translation": "%v üzerindeki kalıplar işleniyor"
   },
   {
-    "id": "web.parsing_templates.error",
-    "translation": "%v üzerindeki kalıplar işlenemedi"
-  },
-  {
     "id": "web.post_permalink.app_error",
     "translation": "İleti kodu geçersiz"
   },
   {
-    "id": "web.reparse_templates.info",
-    "translation": "%v dosyası değiştirildiğinden kalıplar yeniden işleniyor"
-  },
-  {
     "id": "web.reset_password.expired_link.app_error",
     "translation": "Parola sıfırlama bağlantısının süresi geçmiş"
   },
diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index 805670169..f799bba36 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -132,10 +132,6 @@
     "translation": "无法上传文件。文件太大。"
   },
   {
-    "id": "api.api.init.parsing_templates.debug",
-    "translation": "解析服务模板 %v"
-  },
-  {
     "id": "api.api.init.parsing_templates.error",
     "translation": "解析服务模板出错 %v"
   },
@@ -2303,6 +2299,14 @@
     "translation": "%v 离开了团队。"
   },
   {
+    "id": "api.team.move_channel.post.error",
+    "translation": "发送频道作用消息失败"
+  },
+  {
+    "id": "api.team.move_channel.success",
+    "translation": "This channel has been moved to this team from %v."
+  },
+  {
     "id": "api.team.permanent_delete_team.attempting.warn",
     "translation": "试图永久删除团队 %v id=%v"
   },
@@ -3067,6 +3071,10 @@
     "translation": "不能读取传入的webhook的负载。"
   },
   {
+    "id": "api.webhook.incoming.error",
+    "translation": "Could not decode the multipart payload of incoming webhook."
+  },
+  {
     "id": "api.webhook.init.debug",
     "translation": "正在初始化 webhook API 路由"
   },
@@ -4875,6 +4883,10 @@
     "translation": "消息导出任务 ExportFromTimestamp 必须为时间戳 (unix 时间)。只有在此时间后发送的消息会被导出。"
   },
   {
+    "id": "model.config.is_valid.message_export.export_type.app_error",
+    "translation": "Message export job ExportFormat must be one of either 'actiance' or 'globalrelay'"
+  },
+  {
     "id": "model.config.is_valid.message_export.file_location.app_error",
     "translation": "消息导出任务 FileLocation 比如为可写的目录"
   },
@@ -4883,6 +4895,10 @@
     "translation": "消息导出任务 FileLocation 必须为 FileSettings.Directory 的子目录"
   },
   {
+    "id": "model.config.is_valid.message_export.global_relay_email_address.app_error",
+    "translation": "Message export job GlobalRelayEmailAddress must be set to a valid email address"
+  },
+  {
     "id": "model.config.is_valid.password_length.app_error",
     "translation": "最短密码长度必须为整数大于或等于 {{.MinLength}} 以及小于或等于 {{.MaxLength}}。"
   },
@@ -7095,6 +7111,10 @@
     "translation": "无法打开一个SMTP服务器连接 %v"
   },
   {
+    "id": "utils.mail.sendMail.attachments.write_error",
+    "translation": "Failed to write attachment to email"
+  },
+  {
     "id": "utils.mail.send_mail.close.app_error",
     "translation": "未能关闭连接到SMTP服务器"
   },
@@ -7163,10 +7183,6 @@
     "translation": "创建目录监视器失败 %v"
   },
   {
-    "id": "web.dir_fail.error",
-    "translation": "目录中的监视器失败 %v"
-  },
-  {
     "id": "web.do_load_channel.error",
     "translation": "获取用户配置文件时出错 id=%v 强制注销"
   },
@@ -7271,18 +7287,10 @@
     "translation": "解析模板 %v"
   },
   {
-    "id": "web.parsing_templates.error",
-    "translation": "解析模板失败 %v"
-  },
-  {
     "id": "web.post_permalink.app_error",
     "translation": "无效Post ID"
   },
   {
-    "id": "web.reparse_templates.info",
-    "translation": "修改文件后重新解析模板 %v"
-  },
-  {
     "id": "web.reset_password.expired_link.app_error",
     "translation": "密码重置链接已过期"
   },
diff --git a/i18n/zh-TW.json b/i18n/zh-TW.json
index eccb6138f..292b05879 100644
--- a/i18n/zh-TW.json
+++ b/i18n/zh-TW.json
@@ -132,10 +132,6 @@
     "translation": "無法上傳檔案。檔案過大。"
   },
   {
-    "id": "api.api.init.parsing_templates.debug",
-    "translation": "解析伺服器樣版：%v"
-  },
-  {
     "id": "api.api.init.parsing_templates.error",
     "translation": "解析伺服器樣板 %v 失敗"
   },
@@ -2303,6 +2299,14 @@
     "translation": "%v 已離開團隊。 "
   },
   {
+    "id": "api.team.move_channel.post.error",
+    "translation": "發送頻道用途訊息失敗"
+  },
+  {
+    "id": "api.team.move_channel.success",
+    "translation": "This channel has been moved to this team from %v."
+  },
+  {
     "id": "api.team.permanent_delete_team.attempting.warn",
     "translation": "正在嘗試永久刪除團隊 %v id=%v"
   },
@@ -3067,6 +3071,10 @@
     "translation": "無法讀取傳入的 Webhook 的內容。"
   },
   {
+    "id": "api.webhook.incoming.error",
+    "translation": "Could not decode the multipart payload of incoming webhook."
+  },
+  {
     "id": "api.webhook.init.debug",
     "translation": "正在初始化 Webhook API 路徑"
   },
@@ -4875,6 +4883,10 @@
     "translation": "匯出訊息工作 ExportFromTimestamp 設定必須為時間戳記 (以 Unix Epoch 以來的秒數表示)。只有在此時間戳記之後發送的訊息會被匯出。"
   },
   {
+    "id": "model.config.is_valid.message_export.export_type.app_error",
+    "translation": "Message export job ExportFormat must be one of either 'actiance' or 'globalrelay'"
+  },
+  {
     "id": "model.config.is_valid.message_export.file_location.app_error",
     "translation": "匯出訊息工作 FileLocation 設定必須為可寫入的目錄，匯出資料將寫入此處"
   },
@@ -4883,6 +4895,10 @@
     "translation": "匯出訊息工作 FileLocation 設定必須為 FileSettings.Directory 的子目錄"
   },
   {
+    "id": "model.config.is_valid.message_export.global_relay_email_address.app_error",
+    "translation": "Message export job GlobalRelayEmailAddress must be set to a valid email address"
+  },
+  {
     "id": "model.config.is_valid.password_length.app_error",
     "translation": "密碼最小長度必須是一個整數且大於或等於{{.MinLength}}同時小於或等於{{.MaxLength}}。"
   },
@@ -7095,6 +7111,10 @@
     "translation": "開啟對 SMTP 伺服器 %v 的連線時失敗"
   },
   {
+    "id": "utils.mail.sendMail.attachments.write_error",
+    "translation": "Failed to write attachment to email"
+  },
+  {
     "id": "utils.mail.send_mail.close.app_error",
     "translation": "關閉對 SMTP 伺服器的連線失敗"
   },
@@ -7163,10 +7183,6 @@
     "translation": "建立目錄監控 %v 失敗"
   },
   {
-    "id": "web.dir_fail.error",
-    "translation": "建立目錄監控 %v 失敗"
-  },
-  {
     "id": "web.do_load_channel.error",
     "translation": "取得使用者 id=%v 資訊時遇到錯誤，強制登出"
   },
@@ -7271,18 +7287,10 @@
     "translation": "於 %v 解析樣板"
   },
   {
-    "id": "web.parsing_templates.error",
-    "translation": "解析樣板 %v 失敗"
-  },
-  {
     "id": "web.post_permalink.app_error",
     "translation": "無效的張貼 ID"
   },
   {
-    "id": "web.reparse_templates.info",
-    "translation": "因檔案 %v 變動因此重新解析樣板"
-  },
-  {
     "id": "web.reset_password.expired_link.app_error",
     "translation": "密碼重設連結已過期"
   },