translations PR 20170116 (#5086)

11 files changed, 237 insertions, 517 deletions

diff --git a/i18n/de.json b/i18n/de.json
index 311798c74..f2ac5ae77 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -312,8 +312,8 @@
     "translation": "%s hat den Kanal-Anzeigenamen von %s nach %s aktualisiert"
   },
   {
-    "id": "api.channel.post_update_channel_header_message_and_forget.join_leave.error",
-    "translation": "Die Begrüßungs-/Abschiedsnachricht %v konnte nicht gesendet werden"
+    "id": "api.channel.post_update_channel_header_message_and_forget.post.error",
+    "translation": "Failed to post update channel header message"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.removed",
@@ -800,12 +800,16 @@
     "translation": "Ungültiger {{.Name}} Parameter"
   },
   {
+    "id": "api.context.invalid_session.error",
+    "translation": "Invalid session err=%v"
+  },
+  {
     "id": "api.context.invalid_team_url.debug",
     "translation": "Es wurde an einer Stelle auf die Team-URL zugegriffen, an der dies nicht erlaubt ist. Die Team-URL sollte nicht in API- oder in sonstigen Funktionen genutzt werden, die teamunabhängig sind"
   },
   {
     "id": "api.context.invalid_token.error",
-    "translation": "Ungültiger Session token=%v, err=%v"
+    "translation": "Invalid session token={{.Token}}, err={{.Error}}"
   },
   {
     "id": "api.context.invalidate_all_caches",
@@ -1419,7 +1423,7 @@
   },
   {
     "id": "api.post.delete_flagged_post.app_error.warn",
-    "translation": "Konnte markierte Nachrichten Einstellungen beim Entfernen der Nachricht nicht löschen, err=%v"
+    "translation": "Konnte Nachrichten-Markierungseinstellung beim Entfernen der Nachricht nicht löschen, err=%v"
   },
   {
     "id": "api.post.delete_post.permissions.app_error",
@@ -1468,26 +1472,10 @@
     "translation": "Sie haben nicht die erforderlichen Zugriffsrechte"
   },
   {
-    "id": "api.post.handle_post_events_and_forget.channel.error",
-    "translation": "Fehler beim Abruf des Kanals festgestellt, channel_id=%s, err=%v"
-  },
-  {
     "id": "api.post.handle_post_events_and_forget.members.error",
     "translation": "Fehler beim Abruf der Kanalmitglieder, channel_id=%v, err=%v"
   },
   {
-    "id": "api.post.handle_post_events_and_forget.profiles.error",
-    "translation": "Fehler beim Abruf des Benutzer-Profils, team_id=%v, err=%v"
-  },
-  {
-    "id": "api.post.handle_post_events_and_forget.team.error",
-    "translation": "Fehler beim Abruf des Teams, team_id=%s, err=%v"
-  },
-  {
-    "id": "api.post.handle_post_events_and_forget.user.error",
-    "translation": "Fehler beim Abruf des Benutzers, user_id=%s, err=%v"
-  },
-  {
     "id": "api.post.handle_webhook_events_and_forget.create_post.error",
     "translation": "Fehler beim Erstellen der Antwort, Fehler=%v"
   },
@@ -1496,10 +1484,6 @@
     "translation": "Event POST fehlgeschlagen, Fehler=%s"
   },
   {
-    "id": "api.post.handle_webhook_events_and_forget.getting.error",
-    "translation": "Fehler beim Abruf der Webhooks pro Team festgestellt, Fehler=%v"
-  },
-  {
     "id": "api.post.init.debug",
     "translation": "Initialisiere API-Routen für Nachrichten"
   },
@@ -1520,20 +1504,16 @@
     "translation": "Fehler beim Speichern der Direktkanal-Einstellung user_id=%v other_user_id=%v err=%v"
   },
   {
-    "id": "api.post.notification.here.warn",
-    "translation": "Konnte keine Benachrichtigung an Onlinebenutzer senden mit @here, err=%v"
-  },
-  {
     "id": "api.post.notification.member_profile.warn",
     "translation": "Konnte Profil für Kanalmitglied laden, user_id=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
-    "translation": "Leere Push-Mitteilung an %v mit channel_id %v"
+    "id": "api.post.send_notifications.user_id.debug",
+    "translation": "Post creator not in channel for the post, no notification sent post_id=%v channel_id=%v user_id=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.comment_thread.error",
-    "translation": "Fehler beim Abrufen der Nachrichten des Kommentarthreads in Benachrichtigung root_post_id=%v, err=%v"
+    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
+    "translation": "Leere Push-Mitteilung an %v mit channel_id %v"
   },
   {
     "id": "api.post.send_notifications_and_forget.files.error",
@@ -1581,25 +1561,13 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
-    "translation": "Fehler beim Senden der Push-Mitteilung device_id=%v, err=%v"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.send.error",
-    "translation": "Die E-Mail konnte nicht gesendet werden. email=%v err=%v"
+    "translation": "Failed to send push device_id={{.DeviceId}}, err={{.Error}}"
   },
   {
     "id": "api.post.send_notifications_and_forget.sent",
     "translation": "{{.Prefix}} {{.Filenames}} gesendet"
   },
   {
-    "id": "api.post.send_notifications_and_forget.sessions.error",
-    "translation": "Fehler beim Laden der Sitzungen in Benachrichtigungen id=%v, err=%v"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.user_id.error",
-    "translation": "Nachricht user_id nicht wiedergegeben durch GetProfiles user_id=%v"
-  },
-  {
     "id": "api.post.update_mention_count_and_forget.update_error",
     "translation": "Fehler beim Aktualisieren der Erwähnungsanzahl, post_id=%v channel_id=%v err=%v"
   },
@@ -1717,11 +1685,11 @@
   },
   {
     "id": "api.slackimport.slack_add_bot_user.email_pwd",
-    "translation": "Slack Bot/Integration Nachrichten Import Benutzer: E-Mail, Passwort: {{.Email}}, {{.Password}}\r\n"
+    "translation": "Slack-Bot-/Integrationsnachrichten-Importbenutzer: E-Mail, Passwort: {{.Email}}, {{.Password}}\r\n"
   },
   {
     "id": "api.slackimport.slack_add_bot_user.unable_import",
-    "translation": "Konnte Slack Bot/Integration Nachrichten Import Benutzer nicht importieren: {{.Username}}\r\n"
+    "translation": "Konnte Slack-Bot-/Integrationsnachrichten-Importbenutzer nicht importieren: {{.Username}}\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.added",
@@ -2273,7 +2241,7 @@
   },
   {
     "id": "api.user.add_direct_channels_and_forget.failed.error",
-    "translation": "Fehler beim Hinzufügen von Kanaleinstellungen für Benutzer user_id=%s, team_id=%s, err=%v"
+    "translation": "Failed to add direct channel preferences for user user_id={{.UserId}}, team_id={{.TeamId}}, err={{.Error}}"
   },
   {
     "id": "api.user.authorize_oauth_user.bad_response.app_error",
@@ -2776,6 +2744,10 @@
     "translation": "Es trat ein Fehler auf beim Versuch, den WebRTC-Token zu registrieren"
   },
   {
+    "id": "api.websocket.invalid_session.error",
+    "translation": "Invalid session err=%v"
+  },
+  {
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "Ungültiger {{.Name}} Parameter"
   },
diff --git a/i18n/en.json b/i18n/en.json
index cbfe0c807..40d1c78f7 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -820,6 +820,10 @@
     "translation": "Invalid {{.Name}} parameter"
   },
   {
+    "id": "api.context.invalid_session.error",
+    "translation": "Invalid session err=%v"
+  },
+  {
     "id": "api.context.invalid_team_url.debug",
     "translation": "Team URL accessed when not valid. Team URL should not be used in API functions or those that are team independent"
   },
@@ -828,14 +832,6 @@
     "translation": "Invalid session token={{.Token}}, err={{.Error}}"
   },
   {
-    "id": "api.context.invalid_session.error",
-    "translation": "Invalid session err=%v"
-  },
-  {
-    "id": "api.websocket.invalid_session.error",
-    "translation": "Invalid session err=%v"
-  },
-  {
     "id": "api.context.invalidate_all_caches",
     "translation": "Purging all caches"
   },
@@ -1532,6 +1528,10 @@
     "translation": "Unable to get profile for channel member, user_id=%v"
   },
   {
+    "id": "api.post.send_notifications.user_id.debug",
+    "translation": "Post creator not in channel for the post, no notification sent post_id=%v channel_id=%v user_id=%v"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
     "translation": "Clearing push notification to %v with channel_id %v"
   },
@@ -1588,10 +1588,6 @@
     "translation": "{{.Prefix}} {{.Filenames}} sent"
   },
   {
-    "id": "api.post.send_notifications.user_id.debug",
-    "translation": "Post creator not in channel for the post, no notification sent post_id=%v channel_id=%v user_id=%v"
-  },
-  {
     "id": "api.post.update_mention_count_and_forget.update_error",
     "translation": "Failed to update mention count, post_id=%v channel_id=%v err=%v"
   },
@@ -2776,6 +2772,10 @@
     "translation": "We encountered an error trying to register the WebRTC Token"
   },
   {
+    "id": "api.websocket.invalid_session.error",
+    "translation": "Invalid session err=%v"
+  },
+  {
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "Invalid {{.Name}} parameter"
   },
diff --git a/i18n/es.json b/i18n/es.json
index 436788d4f..1198906c8 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -301,19 +301,19 @@
   },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.create_post.error",
-    "translation": "No se pudo publicar el mensaje de actualización del nombre del canal %v"
+    "translation": "No se pudo publicar el mensaje de actualización del nombre del canal"
   },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.retrieve_user.error",
-    "translation": "No se pudo recuperar de usuario al intentar guardar la actualización del nombre del canal %v"
+    "translation": "No se pudo recuperar el usuario al intentar guardar la actualización del nombre del canal"
   },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.updated_from",
     "translation": "%s actualizado el nombre del canal de: %s a: %s"
   },
   {
-    "id": "api.channel.post_update_channel_header_message_and_forget.join_leave.error",
-    "translation": "Fallo al publicar el mensaje de unir/abandonar %v"
+    "id": "api.channel.post_update_channel_header_message_and_forget.post.error",
+    "translation": "Falla al publicar el mensaje de actualización del encabezado del canal"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.removed",
@@ -333,7 +333,7 @@
   },
   {
     "id": "api.channel.post_user_add_remove_message_and_forget.error",
-    "translation": "Fallo al publicar el mensaje de unir/abandonar %v"
+    "translation": "Fallo al publicar el mensaje de unir/abandonar"
   },
   {
     "id": "api.channel.remove.default.app_error",
@@ -800,12 +800,16 @@
     "translation": "Parámetro {{.Name}} inválido"
   },
   {
+    "id": "api.context.invalid_session.error",
+    "translation": "Sesión no válida err=%v"
+  },
+  {
     "id": "api.context.invalid_team_url.debug",
     "translation": "El URL de Equipo fue accesado de forma inválida. El URL del Equipo no debe ser utilizado en funciones del API o aquellas funciones que son independientes del equipo"
   },
   {
     "id": "api.context.invalid_token.error",
-    "translation": "Token=%v de sesión inválido, err=%v"
+    "translation": "Token {{.Token}} de sesión no válido, err={{.Error}}"
   },
   {
     "id": "api.context.invalidate_all_caches",
@@ -1468,26 +1472,10 @@
     "translation": "No tienes los permisos apropiados"
   },
   {
-    "id": "api.post.handle_post_events_and_forget.channel.error",
-    "translation": "Se encontró un error obteniendo el canal, channel_id=%s, err=%v"
-  },
-  {
     "id": "api.post.handle_post_events_and_forget.members.error",
     "translation": "Falla al obtener los miembros del canal channel_id=%v err=%v"
   },
   {
-    "id": "api.post.handle_post_events_and_forget.profiles.error",
-    "translation": "Falla al recuperar los perfiles de usuario team_id=%v, err=%v"
-  },
-  {
-    "id": "api.post.handle_post_events_and_forget.team.error",
-    "translation": "Se encontró un error obteniendo el equipo, team_id=%s, err=%v"
-  },
-  {
-    "id": "api.post.handle_post_events_and_forget.user.error",
-    "translation": "Se encontró un error obteniendo el usuario, user_id=%s, err=%v"
-  },
-  {
     "id": "api.post.handle_webhook_events_and_forget.create_post.error",
     "translation": "Falla al crear la respuesta del mensaje, err=%v"
   },
@@ -1496,16 +1484,12 @@
     "translation": "Fallo el Evento POST, err=%s"
   },
   {
-    "id": "api.post.handle_webhook_events_and_forget.getting.error",
-    "translation": "Se encontró un error obteniendo los webhooks por equipo, err=%v"
-  },
-  {
     "id": "api.post.init.debug",
     "translation": "Inicializando rutas del API para los mensajes"
   },
   {
     "id": "api.post.make_direct_channel_visible.get_2_members.error",
-    "translation": "Falla al obtener 2 miembros para un canal directo channel_id=%v"
+    "translation": "Falla al obtener 2 miembros para un canal directo channel_id={{.ChannelId}}"
   },
   {
     "id": "api.post.make_direct_channel_visible.get_members.error",
@@ -1520,20 +1504,16 @@
     "translation": "Falla al actualizar las preferencias del canal directo user_id=%v other_user_id=%v err=%v"
   },
   {
-    "id": "api.post.notification.here.warn",
-    "translation": "No se pudo enviar notificaciones a los usuarios en línea con @here, err=%v"
-  },
-  {
     "id": "api.post.notification.member_profile.warn",
     "translation": "No se puede obtener el perfil del miembro del canal, user_id=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
-    "translation": "Limpiando notificaciones push a %v con el channel_id '%v'"
+    "id": "api.post.send_notifications.user_id.debug",
+    "translation": "El creador del mensaje no es parte del canal donde se publicó el mensaje, no se envió la notificación post_id=%v channel_id=%v user_id=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.comment_thread.error",
-    "translation": "No se pudo recuperar el hilo de comentarios en las notificaciones root_post_id=%v, err=%v"
+    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
+    "translation": "Limpiando notificaciones push a %v con el channel_id '%v'"
   },
   {
     "id": "api.post.send_notifications_and_forget.files.error",
@@ -1581,25 +1561,13 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
-    "translation": "Falló el envio de la notificación push al device_id=%v, err=%v"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.send.error",
-    "translation": "Falla al enviar el correo con la mención satisfactoriamente email=%v err=%v"
+    "translation": "Error al enviar push device_id={{.DeviceId}}, err={{.Error}}"
   },
   {
     "id": "api.post.send_notifications_and_forget.sent",
     "translation": "{{.Prefix}} {{.Filenames}} enviado"
   },
   {
-    "id": "api.post.send_notifications_and_forget.sessions.error",
-    "translation": "Falla al recuperar las sesiones en las notificaciones id=%v, err=%v"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.user_id.error",
-    "translation": "El user_id del Mensaje no fue retornado por GetProfiles user_id=%v"
-  },
-  {
     "id": "api.post.update_mention_count_and_forget.update_error",
     "translation": "Falla al actualizar el contador de mensiones para post_id=%v channel_id=%v err=%v"
   },
@@ -2273,7 +2241,7 @@
   },
   {
     "id": "api.user.add_direct_channels_and_forget.failed.error",
-    "translation": "Falla al agregar las preferencias del canal directo para el usuario user_id=%s, team_id=%s, err=%v"
+    "translation": "Error al agregar un canal directo a las preferencias del usuario user_id={{.UserId}}, team_id={{.TeamId}}, err={{.Error}}"
   },
   {
     "id": "api.user.authorize_oauth_user.bad_response.app_error",
@@ -2776,6 +2744,10 @@
     "translation": "Hemos encontrado un error al intentar registrar el Token de WebRTC"
   },
   {
+    "id": "api.websocket.invalid_session.error",
+    "translation": "Sesión no válida err=%v"
+  },
+  {
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "Parámetro {{.Name}} inválido"
   },
diff --git a/i18n/fr.json b/i18n/fr.json
index e4b73ca9f..da613d875 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -73,7 +73,7 @@
   },
   {
     "id": "api.admin.init.debug",
-    "translation": "Initialisation du routage des API d'administration"
+    "translation": "Initialisation des routes de l'API administration"
   },
   {
     "id": "api.admin.recycle_db_end.warn",
@@ -269,7 +269,7 @@
   },
   {
     "id": "api.channel.get_channels.error",
-    "translation": "Erreur lors de la récupération du profil pour id=%v déconnexion forcée"
+    "translation": "Erreur lors de la récupération de profil pour id=%v déconnexion forcée"
   },
   {
     "id": "api.channel.init.debug",
@@ -312,8 +312,8 @@
     "translation": "%s a mis à jour l'en-tête du canal de : %s en : %s"
   },
   {
-    "id": "api.channel.post_update_channel_header_message_and_forget.join_leave.error",
-    "translation": "Erreur lors de l'envoi du message joindre/quitter %v"
+    "id": "api.channel.post_update_channel_header_message_and_forget.post.error",
+    "translation": "Failed to post update channel header message"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.removed",
@@ -333,7 +333,7 @@
   },
   {
     "id": "api.channel.post_user_add_remove_message_and_forget.error",
-    "translation": "Impossible d'envoyer le message joindre/quitter %v"
+    "translation": "Erreur lors de l'envoi du message joindre/quitter %v"
   },
   {
     "id": "api.channel.remove.default.app_error",
@@ -800,12 +800,16 @@
     "translation": "Paramètre {{.Name}} invalide"
   },
   {
+    "id": "api.context.invalid_session.error",
+    "translation": "Invalid session err=%v"
+  },
+  {
     "id": "api.context.invalid_team_url.debug",
     "translation": "URL d'équipe utilisée si l'appel est invalide. L'URL d'équipe ne devrait pas être utilisée dans des fonctions d'API ou des fonctions indépendantes d'une équipe"
   },
   {
     "id": "api.context.invalid_token.error",
-    "translation": "Session invalide token=%v, err=%v"
+    "translation": "Invalid session token={{.Token}}, err={{.Error}}"
   },
   {
     "id": "api.context.invalidate_all_caches",
@@ -873,7 +877,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.direct_message",
-    "translation": "Nouveau Message Privé"
+    "translation": "Message privé"
   },
   {
     "id": "api.email_batching.render_batched_post.go_to_post",
@@ -886,8 +890,8 @@
   {
     "id": "api.email_batching.send_batched_email_notification.body_text",
     "translation": {
-      "one": "Vous avez un nouveau message.Vous avez {{.Count}} nouveaux messages.",
-      "other": ""
+      "one": "Vous avez un nouveau message.",
+      "other": "Vous avez {{.Count}} nouveaux messages."
     }
   },
   {
@@ -1419,7 +1423,7 @@
   },
   {
     "id": "api.post.delete_flagged_post.app_error.warn",
-    "translation": "Impossible de supprimer les préférences du message avec indicateur lorsque celui-ci est en train d'être supprimé, err=%v"
+    "translation": "Impossible de supprimer les préférences de marquage de message lorsque celui-ci est en train d'être supprimé, err=%v"
   },
   {
     "id": "api.post.delete_post.permissions.app_error",
@@ -1468,26 +1472,10 @@
     "translation": "Vous n'avez pas les permissions appropriées"
   },
   {
-    "id": "api.post.handle_post_events_and_forget.channel.error",
-    "translation": "Erreur rencontrée lors de la récupération du canal,  channel_id=%s, err=%v"
-  },
-  {
     "id": "api.post.handle_post_events_and_forget.members.error",
     "translation": "Impossible de récupérer les membres du canal channel_id=%v err=%v"
   },
   {
-    "id": "api.post.handle_post_events_and_forget.profiles.error",
-    "translation": "Impossible de récupérer les profils utilisateurs team_id=%v, err=%v"
-  },
-  {
-    "id": "api.post.handle_post_events_and_forget.team.error",
-    "translation": "Erreur rencontrée lors de la récupération de l'équipe, team_id=%s, err=%v"
-  },
-  {
-    "id": "api.post.handle_post_events_and_forget.user.error",
-    "translation": "Erreur rencontrée lors de la récupération de l'utilisateur, user_id=%s, err=%v"
-  },
-  {
     "id": "api.post.handle_webhook_events_and_forget.create_post.error",
     "translation": "Impossible de créer le message de réponse, err=%v"
   },
@@ -1496,10 +1484,6 @@
     "translation": "Échec de l'événement POST, err=%s"
   },
   {
-    "id": "api.post.handle_webhook_events_and_forget.getting.error",
-    "translation": "Erreur rencontrée lors de la récupération des webhooks par l'équipe, err=%v"
-  },
-  {
     "id": "api.post.init.debug",
     "translation": "Initialisation des routes de l'API des messages"
   },
@@ -1520,20 +1504,16 @@
     "translation": "Échec de la mise à jour des préférences du canal direct user_id=%v other_user_id=%v err=%v"
   },
   {
-    "id": "api.post.notification.here.warn",
-    "translation": "Impossible d'envoyer une notification aux utilisateurs connectés avec @here, err=%v"
-  },
-  {
     "id": "api.post.notification.member_profile.warn",
     "translation": "Impossible d'obtenir le profil pour le membre du canal, user_id=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
-    "translation": "Suppression de la notification push pour %v avec channel_id %v"
+    "id": "api.post.send_notifications.user_id.debug",
+    "translation": "Post creator not in channel for the post, no notification sent post_id=%v channel_id=%v user_id=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.comment_thread.error",
-    "translation": "Impossible de récupérer les fils de commentaires dans les notifications root_post_id=%v, err=%v"
+    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
+    "translation": "Suppression de la notification push pour %v avec channel_id %v"
   },
   {
     "id": "api.post.send_notifications_and_forget.files.error",
@@ -1557,7 +1537,7 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.message_subject",
-    "translation": "Nouveau Message Privé"
+    "translation": "Nouveau message privé"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_in",
@@ -1581,25 +1561,13 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
-    "translation": "Echec lors de l'envoi de la notificationid=%v, err=%v"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.send.error",
-    "translation": "Impossible d'envoyer l'e-mail de mention email=%v err=%v"
+    "translation": "Failed to send push device_id={{.DeviceId}}, err={{.Error}}"
   },
   {
     "id": "api.post.send_notifications_and_forget.sent",
     "translation": "{{.Prefix}} {{.Filenames}} envoyé"
   },
   {
-    "id": "api.post.send_notifications_and_forget.sessions.error",
-    "translation": "Impossible de récupérer les sessions dans les notifications id=%v, err=%v"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.user_id.error",
-    "translation": "Message user_id non renvoyé par GetProfiles user_id=%v"
-  },
-  {
     "id": "api.post.update_mention_count_and_forget.update_error",
     "translation": "Impossible de mettre à jour le compteur de mentions pour l'utilisateur user_id=%v sur channel_id=%v err=%v"
   },
@@ -1977,11 +1945,11 @@
   },
   {
     "id": "api.team.invite_members.restricted_system_admin.app_error",
-    "translation": "Seuls les administrateurs système peuvent inviter de nouveaux utilisateurs."
+    "translation": "Seuls les administrateurs système peuvent inviter des nouveaux utilisateurs."
   },
   {
     "id": "api.team.invite_members.restricted_team_admin.app_error",
-    "translation": "Seuls les administrateurs d'équipe et administrateurs système peuvent inviter de nouveaux utilisateurs."
+    "translation": "Seuls les administrateurs d'équipe et les administrateurs système peuvent inviter des nouveaux utilisateurs."
   },
   {
     "id": "api.team.invite_members.send.error",
@@ -2273,7 +2241,7 @@
   },
   {
     "id": "api.user.add_direct_channels_and_forget.failed.error",
-    "translation": "Impossible d'ajouter les préférences pour l'utilisateur user_id=%s, team_id=%s, err=%v"
+    "translation": "Failed to add direct channel preferences for user user_id={{.UserId}}, team_id={{.TeamId}}, err={{.Error}}"
   },
   {
     "id": "api.user.authorize_oauth_user.bad_response.app_error",
@@ -2357,7 +2325,7 @@
   },
   {
     "id": "api.user.create_profile_image.encode.app_error",
-    "translation": "Impossible d'encoder la photo du profil"
+    "translation": "Impossible d'encoder la photo de profil"
   },
   {
     "id": "api.user.create_profile_image.initial.app_error",
@@ -2449,7 +2417,7 @@
   },
   {
     "id": "api.user.login.not_verified.app_error",
-    "translation": "Connexion impossible : l'adresse électronique n'a pas été vérifiée"
+    "translation": "Connexion impossible : l'adresse e-mail n'a pas été vérifiée"
   },
   {
     "id": "api.user.login.revoking.app_error",
@@ -2661,7 +2629,7 @@
   },
   {
     "id": "api.user.verify_email.bad_link.app_error",
-    "translation": "Mauvais lien de vérification de l'adresse électronique."
+    "translation": "Mauvais lien de vérification de l'adresse e-mail."
   },
   {
     "id": "api.web_hub.start.starting.debug",
@@ -2776,6 +2744,10 @@
     "translation": "Une erreur s'est produite lors de l'enregistrement du jeton WebRTC"
   },
   {
+    "id": "api.websocket.invalid_session.error",
+    "translation": "Invalid session err=%v"
+  },
+  {
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "Paramètre {{.Name}} invalide"
   },
@@ -3161,11 +3133,11 @@
   },
   {
     "id": "mattermost.entreprise_enabled",
-    "translation": "Entreprise Activé : %v"
+    "translation": "Edition Entreprise Activé : %v"
   },
   {
     "id": "mattermost.load_license.find.warn",
-    "translation": "Un clé de licence de https://mattermost.com est requise pour déverrouiller les fonctionnalités d'entreprises."
+    "translation": "Une clé de licence de https://mattermost.com est requise pour déverrouiller les fonctionnalités d'entreprise."
   },
   {
     "id": "mattermost.security_bulletin.error",
@@ -5121,15 +5093,15 @@
   },
   {
     "id": "store.sql_user.save.email_exists.app_error",
-    "translation": "Un compte avec cette adresse électronique existe déjà."
+    "translation": "Un compte avec cette adresse e-mail existe déjà."
   },
   {
     "id": "store.sql_user.save.email_exists.ldap_app_error",
-    "translation": "Ce compte n'utilise pas l'authentification LDAP. Veuillez vous connecter avec votre adresse électronique et votre mot de passe."
+    "translation": "Ce compte n'utilise pas l'authentification LDAP. Veuillez vous connecter avec votre adresse e-mail et votre mot de passe."
   },
   {
     "id": "store.sql_user.save.email_exists.saml_app_error",
-    "translation": "Ce compte n'utilise pas l'authentification SAML. Veuillez vous connecter avec votre adresse électronique et votre mot de passe."
+    "translation": "Ce compte n'utilise pas l'authentification SAML. Veuillez vous connecter avec votre adresse e-mail et votre mot de passe."
   },
   {
     "id": "store.sql_user.save.existing.app_error",
@@ -5165,7 +5137,7 @@
   },
   {
     "id": "store.sql_user.update.email_taken.app_error",
-    "translation": "Cette adresse électronique est déjà prise. Veuillez en choisir une autre."
+    "translation": "Cette adresse e-mail est déjà utilisée. Veuillez en choisir une autre."
   },
   {
     "id": "store.sql_user.update.find.app_error",
@@ -5189,7 +5161,7 @@
   },
   {
     "id": "store.sql_user.update_auth_data.email_exists.app_error",
-    "translation": "Impossible de convertir le compte à {{.Service}}. Un compte utilisant cette adresse électronique {{.Email}} existe déjà."
+    "translation": "Impossible de convertir le compte à {{.Service}}. Un compte utilisant cette adresse e-mail {{.Email}} existe déjà."
   },
   {
     "id": "store.sql_user.update_failed_pwd_attempts.app_error",
@@ -5221,7 +5193,7 @@
   },
   {
     "id": "store.sql_user.verify_email.app_error",
-    "translation": "Impossible de mettre à jour le champ de vérification de l'adresse électronique"
+    "translation": "Impossible de mettre à jour le champ de vérification de l'adresse e-mail"
   },
   {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
@@ -5373,11 +5345,11 @@
   },
   {
     "id": "utils.mail.send_mail.from_address.app_error",
-    "translation": "Échec d'ajout de l'adresse électronique de l'expéditeur"
+    "translation": "Échec d'ajout de l'adresse e-mail de l'expéditeur"
   },
   {
     "id": "utils.mail.send_mail.msg.app_error",
-    "translation": "Échec d'écriture du message électronique"
+    "translation": "Échec d'écriture de l'e-mail"
   },
   {
     "id": "utils.mail.send_mail.msg_data.app_error",
@@ -5389,7 +5361,7 @@
   },
   {
     "id": "utils.mail.send_mail.to_address.app_error",
-    "translation": "Échec de l'ajout de l'adresse électronique"
+    "translation": "Échec de l'ajout de l'adresse e-mail"
   },
   {
     "id": "utils.mail.test.configured.error",
diff --git a/i18n/ja.json b/i18n/ja.json
index 8dee0b47d..b433df665 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -312,8 +312,8 @@
     "translation": "%sがチャンネル表示名を %s から %s に更新しました"
   },
   {
-    "id": "api.channel.post_update_channel_header_message_and_forget.join_leave.error",
-    "translation": "参加/脱退のメッセージを投稿できませんでした %v"
+    "id": "api.channel.post_update_channel_header_message_and_forget.post.error",
+    "translation": "Failed to post update channel header message"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.removed",
@@ -333,7 +333,7 @@
   },
   {
     "id": "api.channel.post_user_add_remove_message_and_forget.error",
-    "translation": "参加/脱退のメッセージ%vを投稿できませんでした"
+    "translation": "参加/脱退のメッセージを投稿できませんでした %v"
   },
   {
     "id": "api.channel.remove.default.app_error",
@@ -800,12 +800,16 @@
     "translation": "不正な{{.Name}}パラメーターです"
   },
   {
+    "id": "api.context.invalid_session.error",
+    "translation": "Invalid session err=%v"
+  },
+  {
     "id": "api.context.invalid_team_url.debug",
     "translation": "チームURLが不正なタイミングでアクセスされました。チームURLはAPI関数内またはチームと関係のない文脈で使用することはできません"
   },
   {
     "id": "api.context.invalid_token.error",
-    "translation": "不正なセッショントークンです token=%v、err=%v"
+    "translation": "Invalid session token={{.Token}}, err={{.Error}}"
   },
   {
     "id": "api.context.invalidate_all_caches",
@@ -1468,26 +1472,10 @@
     "translation": "あなたには必要な権限が付与されていません"
   },
   {
-    "id": "api.post.handle_post_events_and_forget.channel.error",
-    "translation": "チャンネルを取得できませんでした channel_id=%s, err=%v"
-  },
-  {
     "id": "api.post.handle_post_events_and_forget.members.error",
     "translation": "チャンネルの参加者が取得できませんでした channel_id=%v err=%v"
   },
   {
-    "id": "api.post.handle_post_events_and_forget.profiles.error",
-    "translation": "ユーザーのプロフィールを取得できませんでした team_id=%v, err=%v"
-  },
-  {
-    "id": "api.post.handle_post_events_and_forget.team.error",
-    "translation": "チームが取得できませんでした team_id=%s, err=%v"
-  },
-  {
-    "id": "api.post.handle_post_events_and_forget.user.error",
-    "translation": "ユーザーが取得できませんでした user_id=%s, err=%v"
-  },
-  {
     "id": "api.post.handle_webhook_events_and_forget.create_post.error",
     "translation": "返信の投稿を作成できませんでした err=%v"
   },
@@ -1496,10 +1484,6 @@
     "translation": "POSTイベントが失敗しました err=%s"
   },
   {
-    "id": "api.post.handle_webhook_events_and_forget.getting.error",
-    "translation": "チームによるウェブフックに失敗しました err=%v"
-  },
-  {
     "id": "api.post.init.debug",
     "translation": "投稿APIルートを初期化しています"
   },
@@ -1520,20 +1504,16 @@
     "translation": "ダイレクトチャンネルの設定を更新できませんでした user_id=%v other_user_id=%v err=%v"
   },
   {
-    "id": "api.post.notification.here.warn",
-    "translation": "@here を使って、オンラインのユーザーへ通知を送ることができませんでした。err=%v"
-  },
-  {
     "id": "api.post.notification.member_profile.warn",
     "translation": "チャンネルメンバーのプロフィールを取得できませんでした user_id=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
-    "translation": "%vへのプッシュ通知をクリアーしています(channel_id %v)"
+    "id": "api.post.send_notifications.user_id.debug",
+    "translation": "Post creator not in channel for the post, no notification sent post_id=%v channel_id=%v user_id=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.comment_thread.error",
-    "translation": "通知内のコメントスレッドの投稿を取得できませんでした root_post_id=%v、err=%v"
+    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
+    "translation": "%vへのプッシュ通知をクリアーしています(channel_id %v)"
   },
   {
     "id": "api.post.send_notifications_and_forget.files.error",
@@ -1581,25 +1561,13 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
-    "translation": "プッシュ通知を送れませんでした device_id=%v, err=%v"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.send.error",
-    "translation": "あなたについての投稿を知らせる電子メールの送信できませんでした email=%v err=%v"
+    "translation": "Failed to send push device_id={{.DeviceId}}, err={{.Error}}"
   },
   {
     "id": "api.post.send_notifications_and_forget.sent",
     "translation": "{{.Prefix}} {{.Filenames}}を送信しました"
   },
   {
-    "id": "api.post.send_notifications_and_forget.sessions.error",
-    "translation": "通知でセッションの取得に失敗しました id=%v, err=%v"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.user_id.error",
-    "translation": "GetProfilesで見付けられないuser_idを投稿します user_id=%v"
-  },
-  {
     "id": "api.post.update_mention_count_and_forget.update_error",
     "translation": "あなたについての投稿数を更新できませんでした post_id=%v on channel_id=%v err=%v"
   },
@@ -2273,7 +2241,7 @@
   },
   {
     "id": "api.user.add_direct_channels_and_forget.failed.error",
-    "translation": "ユーザーのダイレクトチャンネルの設定に追加できませんでした user_id=%s, team_id=%s, err=%v"
+    "translation": "Failed to add direct channel preferences for user user_id={{.UserId}}, team_id={{.TeamId}}, err={{.Error}}"
   },
   {
     "id": "api.user.authorize_oauth_user.bad_response.app_error",
@@ -2776,6 +2744,10 @@
     "translation": "WebRTCトークンを登録する際にエラーが発生しました"
   },
   {
+    "id": "api.websocket.invalid_session.error",
+    "translation": "Invalid session err=%v"
+  },
+  {
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "不正な{{.Name}}パラメーターです"
   },
diff --git a/i18n/ko.json b/i18n/ko.json
index 26d164a5a..8228c66a2 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -301,7 +301,7 @@
   },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.create_post.error",
-    "translation": "Failed to post displayname update message %v"
+    "translation": "Failed to post displayname update message"
   },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.retrieve_user.error",
@@ -312,8 +312,8 @@
     "translation": "%s 이(가) 채널 헤더를 %s에서 %s(으)로 갱신했습니다"
   },
   {
-    "id": "api.channel.post_update_channel_header_message_and_forget.join_leave.error",
-    "translation": "메시지 %v 를 포스트 하는 데 실패하였습니다"
+    "id": "api.channel.post_update_channel_header_message_and_forget.post.error",
+    "translation": "Failed to post update channel header message"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.removed",
@@ -800,12 +800,16 @@
     "translation": "적절하지 않은 {{.Name}} 파라미터"
   },
   {
+    "id": "api.context.invalid_session.error",
+    "translation": "Invalid session err=%v"
+  },
+  {
     "id": "api.context.invalid_team_url.debug",
     "translation": "올바르지 않은 상황에서 팀 URL에 접근했습니다. 팀 URL은 API 함수나 팀과 관련이 없는 곳에서 사용되어서는 안 됩니다."
   },
   {
     "id": "api.context.invalid_token.error",
-    "translation": "유효하지않은 세션 토큰=%v, err=%v"
+    "translation": "Invalid session token={{.Token}}, err={{.Error}}"
   },
   {
     "id": "api.context.invalidate_all_caches",
@@ -1468,26 +1472,10 @@
     "translation": "작업을 할 수 있는 권한이 없습니다"
   },
   {
-    "id": "api.post.handle_post_events_and_forget.channel.error",
-    "translation": "채널을 찾을 수 없습니다, channel_id=%s, err=%v"
-  },
-  {
     "id": "api.post.handle_post_events_and_forget.members.error",
     "translation": "채널의 참가자를 얻을 수 없습니다, channel_id=%v err=%v"
   },
   {
-    "id": "api.post.handle_post_events_and_forget.profiles.error",
-    "translation": "사용자 프로필을 가져올 수 없습니다, team_id=%v, err=%v"
-  },
-  {
-    "id": "api.post.handle_post_events_and_forget.team.error",
-    "translation": "팀을 가져올 수 없습니다, team_id=%s, err=%v"
-  },
-  {
-    "id": "api.post.handle_post_events_and_forget.user.error",
-    "translation": "사용자를 가져올 수 없습니다, user_id=%s, err=%v"
-  },
-  {
     "id": "api.post.handle_webhook_events_and_forget.create_post.error",
     "translation": "회신 게시물 생성에 실패했습니다. err=%v"
   },
@@ -1496,10 +1484,6 @@
     "translation": "이벤트 POST 실패. err=%s"
   },
   {
-    "id": "api.post.handle_webhook_events_and_forget.getting.error",
-    "translation": "팀의 웹훅을 가져올 수 없습니다. err=%v"
-  },
-  {
     "id": "api.post.init.debug",
     "translation": "post API 경로 초기화 중"
   },
@@ -1520,20 +1504,16 @@
     "translation": "개인 메시지 채널의 속성을 변경하지 못했습니다. user_id=%v other_user_id=%v err=%v"
   },
   {
-    "id": "api.post.notification.here.warn",
-    "translation": "@here (으)로 온라인 사용자에게 알림을 보낼 수 없습니다. err=%v"
-  },
-  {
     "id": "api.post.notification.member_profile.warn",
     "translation": "채널 회원의 프로필 사진을 불러올 수 없습니다. user_id=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
-    "translation": "Clearing push notification to %v with channel_id %v"
+    "id": "api.post.send_notifications.user_id.debug",
+    "translation": "Post creator not in channel for the post, no notification sent post_id=%v channel_id=%v user_id=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.comment_thread.error",
-    "translation": "Failed to retrieve comment thread posts in notifications root_post_id=%v, err=%v"
+    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
+    "translation": "Clearing push notification to %v with channel_id %v"
   },
   {
     "id": "api.post.send_notifications_and_forget.files.error",
@@ -1581,25 +1561,13 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
-    "translation": "푸시 알림 발송 실패 device_id=%v, err=%v"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.send.error",
-    "translation": "발신 실패한 멘션 이메일=%v, err=%v"
+    "translation": "Failed to send push device_id={{.DeviceId}}, err={{.Error}}"
   },
   {
     "id": "api.post.send_notifications_and_forget.sent",
     "translation": "{{.Prefix}} {{.Filenames}} 보냄"
   },
   {
-    "id": "api.post.send_notifications_and_forget.sessions.error",
-    "translation": "Failed to retrieve sessions in notifications id=%v, err=%v"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.user_id.error",
-    "translation": "Post user_id not returned by GetProfiles user_id=%v"
-  },
-  {
     "id": "api.post.update_mention_count_and_forget.update_error",
     "translation": "Failed to update mention count, post_id=%v channel_id=%v err=%v"
   },
@@ -2273,7 +2241,7 @@
   },
   {
     "id": "api.user.add_direct_channels_and_forget.failed.error",
-    "translation": "사용자의 다이렉트 채널 기본 구성을 실패하였습니다. user_id=%s, team_id=%s, err=%v"
+    "translation": "Failed to add direct channel preferences for user user_id={{.UserId}}, team_id={{.TeamId}}, err={{.Error}}"
   },
   {
     "id": "api.user.authorize_oauth_user.bad_response.app_error",
@@ -2776,6 +2744,10 @@
     "translation": "WebRTC 토큰 등록 중에 에러가 발생하였습니다."
   },
   {
+    "id": "api.websocket.invalid_session.error",
+    "translation": "Invalid session err=%v"
+  },
+  {
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "적절하지 않은 {{.Name}} 파라미터"
   },
diff --git a/i18n/nl.json b/i18n/nl.json
index f6193aee8..29b00529c 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -312,8 +312,8 @@
     "translation": "%s heeft de kanaalkoptekst veranderd van: %s naar: %s"
   },
   {
-    "id": "api.channel.post_update_channel_header_message_and_forget.join_leave.error",
-    "translation": "Plaatsen van bericht over binnenkomen/verlaten %v is mislukt"
+    "id": "api.channel.post_update_channel_header_message_and_forget.post.error",
+    "translation": "Failed to post update channel header message"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.removed",
@@ -333,7 +333,7 @@
   },
   {
     "id": "api.channel.post_user_add_remove_message_and_forget.error",
-    "translation": "Het plaatsen van een komen/gaan bericht %v is mislukt"
+    "translation": "Plaatsen van bericht over binnenkomen/verlaten %v is mislukt"
   },
   {
     "id": "api.channel.remove.default.app_error",
@@ -800,12 +800,16 @@
     "translation": "Ongeldig {{.Name}} parameter"
   },
   {
+    "id": "api.context.invalid_session.error",
+    "translation": "Invalid session err=%v"
+  },
+  {
     "id": "api.context.invalid_team_url.debug",
     "translation": "De benaderde Team URL is niet geldig. Team URL moet niet gebruikt worden bij api aanroepen die team onafhankelijk zijn"
   },
   {
     "id": "api.context.invalid_token.error",
-    "translation": "Ongeldig sessie token=%v, fout=%v"
+    "translation": "Invalid session token={{.Token}}, err={{.Error}}"
   },
   {
     "id": "api.context.invalidate_all_caches",
@@ -1468,26 +1472,10 @@
     "translation": "U beschikt niet over de juiste rechten"
   },
   {
-    "id": "api.post.handle_post_events_and_forget.channel.error",
-    "translation": "Er is een probleem opgetreden bij het ophalen van het kanaal. channel_id=%s, fout=%v"
-  },
-  {
     "id": "api.post.handle_post_events_and_forget.members.error",
     "translation": "Ophalen van de deelnemers van het kanaal is mislukt. channel_id=%v, fout=%v"
   },
   {
-    "id": "api.post.handle_post_events_and_forget.profiles.error",
-    "translation": "Ophalen van gebruikers profielen is mislukt. team_id=%v, fout=%v"
-  },
-  {
-    "id": "api.post.handle_post_events_and_forget.team.error",
-    "translation": "Er is een fout opgetreden bij het ophalen van het team. team_id=%s, fout=%v"
-  },
-  {
-    "id": "api.post.handle_post_events_and_forget.user.error",
-    "translation": "Er is een fout opgetreden bij het ophalen van de gebruiker. user_id=%s, fout=%v"
-  },
-  {
     "id": "api.post.handle_webhook_events_and_forget.create_post.error",
     "translation": "Het creeren van een response bericht is mislukt. fout=%v"
   },
@@ -1496,10 +1484,6 @@
     "translation": "Gebeurtenis POST is mislukt, fout=%s"
   },
   {
-    "id": "api.post.handle_webhook_events_and_forget.getting.error",
-    "translation": "Er is een probleem opgetreden bij het ophalen van de webhooks door team. fout=%v"
-  },
-  {
     "id": "api.post.init.debug",
     "translation": "Initialisatie van de berichten API routes"
   },
@@ -1520,20 +1504,16 @@
     "translation": "Het bijwerken van de voorkeuren van een direct kanaal is mislukt. user_id=%v, other_user_id=%v, fout=%v"
   },
   {
-    "id": "api.post.notification.here.warn",
-    "translation": "Kon geen bericht sturen naar online leden met @here, err=%v"
-  },
-  {
     "id": "api.post.notification.member_profile.warn",
     "translation": "Niet mogelijk om profiel voor kanaal lid op te halen, user_id=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
-    "translation": "Verwijderen van push notificatie aan %v met kanaal_id %v"
+    "id": "api.post.send_notifications.user_id.debug",
+    "translation": "Post creator not in channel for the post, no notification sent post_id=%v channel_id=%v user_id=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.comment_thread.error",
-    "translation": "Niet gelukt om commentaar thread berichten op te halen uit notificaties root_post_id=%v, err=%v"
+    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
+    "translation": "Verwijderen van push notificatie aan %v met kanaal_id %v"
   },
   {
     "id": "api.post.send_notifications_and_forget.files.error",
@@ -1581,25 +1561,13 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
-    "translation": "Het versturen van een push bericht is mislukt, device_id=%v, err=%v"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.send.error",
-    "translation": "Het versturen van een notificatie via e-mail is niet gelukt. e-mail=%v, fout=%v"
+    "translation": "Failed to send push device_id={{.DeviceId}}, err={{.Error}}"
   },
   {
     "id": "api.post.send_notifications_and_forget.sent",
     "translation": "{{.Prefix}} {{.Filenames}} verstuurd"
   },
   {
-    "id": "api.post.send_notifications_and_forget.sessions.error",
-    "translation": "Er is een probleem opgetreden bij het ophalen van sessies bij notificaties. id=%v, fout=%v"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.user_id.error",
-    "translation": "Bericht user_id is niet teruggegeven door GetProfiles user_id=%v"
-  },
-  {
     "id": "api.post.update_mention_count_and_forget.update_error",
     "translation": "Kon het aantal vermeldingen niet bijwerken, post_id=%v channel_id=%v err=%v"
   },
@@ -2273,7 +2241,7 @@
   },
   {
     "id": "api.user.add_direct_channels_and_forget.failed.error",
-    "translation": "Er is een fout opgetreden bij het toevoegen van instellingen voor een direct kanaal voor gebruiker, user_id=%s, team_id=%s, fout=%v"
+    "translation": "Failed to add direct channel preferences for user user_id={{.UserId}}, team_id={{.TeamId}}, err={{.Error}}"
   },
   {
     "id": "api.user.authorize_oauth_user.bad_response.app_error",
@@ -2776,6 +2744,10 @@
     "translation": "We encountered an error trying to register the WebRTC Token"
   },
   {
+    "id": "api.websocket.invalid_session.error",
+    "translation": "Invalid session err=%v"
+  },
+  {
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "Ongeldige {{.Name}} parameter"
   },
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index 7c222e978..78e425131 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -312,8 +312,8 @@
     "translation": "%s atualizou o nome de exibição do canal de: %s para: %s"
   },
   {
-    "id": "api.channel.post_update_channel_header_message_and_forget.join_leave.error",
-    "translation": "Não foi possível postar mensagem juntar/deixar %v"
+    "id": "api.channel.post_update_channel_header_message_and_forget.post.error",
+    "translation": "Failed to post update channel header message"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.removed",
@@ -333,7 +333,7 @@
   },
   {
     "id": "api.channel.post_user_add_remove_message_and_forget.error",
-    "translation": "Não foi possível postar mensagem de juntar/deixar %v"
+    "translation": "Não foi possível postar mensagem juntar/deixar %v"
   },
   {
     "id": "api.channel.remove.default.app_error",
@@ -800,12 +800,16 @@
     "translation": "Parâmetro {{.Name}} inválido"
   },
   {
+    "id": "api.context.invalid_session.error",
+    "translation": "Invalid session err=%v"
+  },
+  {
     "id": "api.context.invalid_team_url.debug",
     "translation": "A URL da equipe foi acessada de forma inválida. A URL da equipe não deve ser utilizada em funções de API ou aquelas funções que são independente da equipe."
   },
   {
     "id": "api.context.invalid_token.error",
-    "translation": "Sessão inválida token=%v, err=%v"
+    "translation": "Invalid session token={{.Token}}, err={{.Error}}"
   },
   {
     "id": "api.context.invalidate_all_caches",
@@ -1015,7 +1019,7 @@
   },
   {
     "id": "api.file.get_public_link.no_post.app_error",
-    "translation": "Não foi possível obter o link publico para o arquivo. Arquivo deve ser anexado a um post que pode ser lido pelo usuário atual."
+    "translation": "Não foi possível obter o link público para o arquivo. O arquivo deve ser anexado a um post que pode ser lido pelo usuário atual."
   },
   {
     "id": "api.file.handle_images_forget.decode.error",
@@ -1468,26 +1472,10 @@
     "translation": "Você não tem a permissão apropriada"
   },
   {
-    "id": "api.post.handle_post_events_and_forget.channel.error",
-    "translation": "Encontrado um erro ao obter o canal, channel_id=%s, err=%v"
-  },
-  {
     "id": "api.post.handle_post_events_and_forget.members.error",
     "translation": "Não foi possível obter os membros do channel_id=%v err=%v"
   },
   {
-    "id": "api.post.handle_post_events_and_forget.profiles.error",
-    "translation": "Não foi possível obter perfis de usuário team_id=%v, err=%v"
-  },
-  {
-    "id": "api.post.handle_post_events_and_forget.team.error",
-    "translation": "Encontrado um erro ao obter a equipe, equipe_id=%s, err=%v"
-  },
-  {
-    "id": "api.post.handle_post_events_and_forget.user.error",
-    "translation": "Encontrado um erro ao obter o usuário, user_id=%s, err=%v"
-  },
-  {
     "id": "api.post.handle_webhook_events_and_forget.create_post.error",
     "translation": "Não foi possível criar resposta do post, err=%v"
   },
@@ -1496,10 +1484,6 @@
     "translation": "Falha no Evento POST, err=%s"
   },
   {
-    "id": "api.post.handle_webhook_events_and_forget.getting.error",
-    "translation": "Encontrado um erro ao obter webhooks pela equipe, err=%v"
-  },
-  {
     "id": "api.post.init.debug",
     "translation": "Inicializando as rotas de API post"
   },
@@ -1520,20 +1504,16 @@
     "translation": "Falha ao atualizar as preferencias do canal direto user_id=%v other_user_id=%v err=%v"
   },
   {
-    "id": "api.post.notification.here.warn",
-    "translation": "Não foi possível enviar a notificação para os usuários conectados usando @here, err=%v"
-  },
-  {
     "id": "api.post.notification.member_profile.warn",
     "translation": "Não foi possível obter o perfil do membro do canal, user_id=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
-    "translation": "Limpando notificação push para %v com channel_id %v"
+    "id": "api.post.send_notifications.user_id.debug",
+    "translation": "Post creator not in channel for the post, no notification sent post_id=%v channel_id=%v user_id=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.comment_thread.error",
-    "translation": "Falha ao obter os comentários da mensagem em notificações root_post_id=%v, err=%v"
+    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
+    "translation": "Limpando notificação push para %v com channel_id %v"
   },
   {
     "id": "api.post.send_notifications_and_forget.files.error",
@@ -1581,25 +1561,13 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
-    "translation": "Falha ao enviar notificação push device_id=%v, err=%v"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.send.error",
-    "translation": "Falha ao enviar uma menção por email email=%v err=%v"
+    "translation": "Failed to send push device_id={{.DeviceId}}, err={{.Error}}"
   },
   {
     "id": "api.post.send_notifications_and_forget.sent",
     "translation": "{{.Prefix}} {{.Filenames}} enviado"
   },
   {
-    "id": "api.post.send_notifications_and_forget.sessions.error",
-    "translation": "Falha ao obter as notificações na sessão id=%v, err=%v"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.user_id.error",
-    "translation": "Post user_id not returned by GetProfiles user_id=%v"
-  },
-  {
     "id": "api.post.update_mention_count_and_forget.update_error",
     "translation": "Falha ao atualizar o número de menções, post_id=%v channel_id=%v err=%v"
   },
@@ -2149,7 +2117,7 @@
   },
   {
     "id": "api.templates.post_subject_in_channel",
-    "translation": "{{.SubjectText}} de {{.TeamDisplayName}} ({{.ChannelName}}) em {{.Day}} {{.Month}}, {{.Year}}"
+    "translation": "{{.SubjectText}} em {{.TeamDisplayName}} ({{.ChannelName}}) de {{.Day}} {{.Month}}, {{.Year}}"
   },
   {
     "id": "api.templates.post_subject_in_direct_message",
@@ -2273,7 +2241,7 @@
   },
   {
     "id": "api.user.add_direct_channels_and_forget.failed.error",
-    "translation": "Falha ao adicionar preferencias diretas ao canal para o usuário user_id=%s, team_id=%s, err=%v"
+    "translation": "Failed to add direct channel preferences for user user_id={{.UserId}}, team_id={{.TeamId}}, err={{.Error}}"
   },
   {
     "id": "api.user.authorize_oauth_user.bad_response.app_error",
@@ -2776,6 +2744,10 @@
     "translation": "Encontrado um erro ao tentar registrar o Token WebRTC"
   },
   {
+    "id": "api.websocket.invalid_session.error",
+    "translation": "Invalid session err=%v"
+  },
+  {
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "Parâmetro {{.Name}} inválido"
   },
diff --git a/i18n/ru.json b/i18n/ru.json
index 4a8a74b2c..2830463ba 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -241,11 +241,11 @@
   },
   {
     "id": "api.channel.delete_channel.incoming_webhook.error",
-    "translation": "Обнаружена ошибка при удалении входящего webhook'a, id=%v"
+    "translation": "Обнаружена ошибка при удалении входящего вебхукa, id=%v"
   },
   {
     "id": "api.channel.delete_channel.outgoing_webhook.error",
-    "translation": "Обнаружена ошибка при удалении исходящего webhook'a, id=%v"
+    "translation": "Обнаружена ошибка при удалении исходящего вебхукa, id=%v"
   },
   {
     "id": "api.channel.delete_channel.permissions.app_error",
@@ -312,8 +312,8 @@
     "translation": "%s обновил отображаемое имя канала с: %s на: %s"
   },
   {
-    "id": "api.channel.post_update_channel_header_message_and_forget.join_leave.error",
-    "translation": "Не удалось отправить join/leave сообщение %v"
+    "id": "api.channel.post_update_channel_header_message_and_forget.post.error",
+    "translation": "Failed to post update channel header message"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.removed",
@@ -333,7 +333,7 @@
   },
   {
     "id": "api.channel.post_user_add_remove_message_and_forget.error",
-    "translation": "Не удалось отправить сообщение о присоединении/выходе %v"
+    "translation": "Не удалось отправить join/leave сообщение %v"
   },
   {
     "id": "api.channel.remove.default.app_error",
@@ -453,7 +453,7 @@
   },
   {
     "id": "api.command.regen.app_error",
-    "translation": "Несоответствующие права для генерации нового токена"
+    "translation": "Отсутствуют права на пересоздание токена"
   },
   {
     "id": "api.command.team_mismatch.app_error",
@@ -800,12 +800,16 @@
     "translation": "Неверный параметр {{.Name}}"
   },
   {
+    "id": "api.context.invalid_session.error",
+    "translation": "Invalid session err=%v"
+  },
+  {
     "id": "api.context.invalid_team_url.debug",
     "translation": "Адрес команды доступен, но не корректен. Он не должен использоваться в API или в тех функциях, что независимы от неё."
   },
   {
     "id": "api.context.invalid_token.error",
-    "translation": "Неверный токен сессии %v, ошибка=%v"
+    "translation": "Invalid session token={{.Token}}, err={{.Error}}"
   },
   {
     "id": "api.context.invalidate_all_caches",
@@ -1468,26 +1472,10 @@
     "translation": "У вас нет соответствующих прав"
   },
   {
-    "id": "api.post.handle_post_events_and_forget.channel.error",
-    "translation": "Возникла ошибка получения канала, channel_id=%s, err=%v"
-  },
-  {
     "id": "api.post.handle_post_events_and_forget.members.error",
     "translation": "Не удалось получить членов канала channel_id=%v, err=%v"
   },
   {
-    "id": "api.post.handle_post_events_and_forget.profiles.error",
-    "translation": "Не удалось извлечь профили пользователей team_id=%v, err=%v"
-  },
-  {
-    "id": "api.post.handle_post_events_and_forget.team.error",
-    "translation": "Возникла ошибка получения команды, team_id=%s, err=%v"
-  },
-  {
-    "id": "api.post.handle_post_events_and_forget.user.error",
-    "translation": "Возникла ошибка получения пользователя, user_id=%s, err=%v"
-  },
-  {
     "id": "api.post.handle_webhook_events_and_forget.create_post.error",
     "translation": "Не удалось создать ответ на запись, err=%v"
   },
@@ -1496,10 +1484,6 @@
     "translation": "Ошибка отправки события, err=%s"
   },
   {
-    "id": "api.post.handle_webhook_events_and_forget.getting.error",
-    "translation": "Ошибка получения вебхуков для команды, err=%v"
-  },
-  {
     "id": "api.post.init.debug",
     "translation": "Инициализация API отправки"
   },
@@ -1520,20 +1504,16 @@
     "translation": "Ошибка обновления настроек канала user_id=%v other_user_id=%v err=%v"
   },
   {
-    "id": "api.post.notification.here.warn",
-    "translation": "Невозможно отправить уведомление активным @пользователям, err=%v"
-  },
-  {
     "id": "api.post.notification.member_profile.warn",
     "translation": "Невозможно получить профиль участников канала, user_id=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
-    "translation": "Очистка push-уведомлений для %v в channel_id %v"
+    "id": "api.post.send_notifications.user_id.debug",
+    "translation": "Post creator not in channel for the post, no notification sent post_id=%v channel_id=%v user_id=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.comment_thread.error",
-    "translation": "Ошибка получения уведомлений о комментариях к теме обсуждения root_post_id=%v err=%v"
+    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
+    "translation": "Очистка push-уведомлений для %v в channel_id %v"
   },
   {
     "id": "api.post.send_notifications_and_forget.files.error",
@@ -1581,25 +1561,13 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
-    "translation": "Ошибка отправки push device_id=%v, err=%v"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.send.error",
-    "translation": "Не удалось отправить приглашение по электронной почте email=%v err=%v"
+    "translation": "Failed to send push device_id={{.DeviceId}}, err={{.Error}}"
   },
   {
     "id": "api.post.send_notifications_and_forget.sent",
     "translation": "{{.Prefix}} {{.Filenames}} отправлен"
   },
   {
-    "id": "api.post.send_notifications_and_forget.sessions.error",
-    "translation": "Не удалось получить сеанс в уведомлении id=%v, err=%v"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.user_id.error",
-    "translation": "Пост user_id не возвращён GetProfiles user_id=%v"
-  },
-  {
     "id": "api.post.update_mention_count_and_forget.update_error",
     "translation": "Не удалось обновить количество упоминаний, post_id=%v channel_id=%v err=%v"
   },
@@ -2273,7 +2241,7 @@
   },
   {
     "id": "api.user.add_direct_channels_and_forget.failed.error",
-    "translation": "Не удалось добавить предпочтения прямого канала для пользователя user_id=%s, team_id=%s, err=%v"
+    "translation": "Failed to add direct channel preferences for user user_id={{.UserId}}, team_id={{.TeamId}}, err={{.Error}}"
   },
   {
     "id": "api.user.authorize_oauth_user.bad_response.app_error",
@@ -2697,11 +2665,11 @@
   },
   {
     "id": "api.webhook.create_incoming.disabled.app_errror",
-    "translation": "Команды были отключены системным администратором."
+    "translation": "Входящие вебхуки были отключены системным администратором."
   },
   {
     "id": "api.webhook.create_outgoing.disabled.app_error",
-    "translation": "Команды были отключены системным администратором."
+    "translation": "Исходящие вебхуки были отключены системным администратором."
   },
   {
     "id": "api.webhook.create_outgoing.intersect.app_error",
@@ -2709,7 +2677,7 @@
   },
   {
     "id": "api.webhook.create_outgoing.not_open.app_error",
-    "translation": "Исходящие webhooks могут быть созданы только для общественных каналов."
+    "translation": "Исходящие вебхуки могут быть созданы только для общественных каналов."
   },
   {
     "id": "api.webhook.create_outgoing.permissions.app_error",
@@ -2721,35 +2689,35 @@
   },
   {
     "id": "api.webhook.delete_incoming.disabled.app_errror",
-    "translation": "Входящие webhooks отключены системным администратором."
+    "translation": "Входящие вебхуки отключены системным администратором."
   },
   {
     "id": "api.webhook.delete_incoming.permissions.app_errror",
-    "translation": "Несоответствующие права для удаления входящего вебхука"
+    "translation": "Отсутствуют права на удаление входящего вебхука"
   },
   {
     "id": "api.webhook.delete_outgoing.disabled.app_error",
-    "translation": "Исходящие webhooks отключены системным администратором."
+    "translation": "Исходящие вебхуки отключены системным администратором."
   },
   {
     "id": "api.webhook.delete_outgoing.permissions.app_error",
-    "translation": "Несоответствующие права для удаления исходящего вебхука"
+    "translation": "Отсутствуют права на удаление исходящего вебхука"
   },
   {
     "id": "api.webhook.get_incoming.disabled.app_error",
-    "translation": "Входящие webhooks отключены системным администратором."
+    "translation": "Входящие вебхуки отключены системным администратором."
   },
   {
     "id": "api.webhook.get_outgoing.disabled.app_error",
-    "translation": "Исходящие webhooks отключены системным администратором."
+    "translation": "Исходящие вебхуки отключены системным администратором."
   },
   {
     "id": "api.webhook.incoming.debug",
-    "translation": "Входящий webhook получен. Содержание="
+    "translation": "Входящий вебхук получен. Содержание="
   },
   {
     "id": "api.webhook.incoming.debug.error",
-    "translation": "Не удалось прочитать полезную нагрузку входящего webhook."
+    "translation": "Не удалось прочитать полезную нагрузку входящего вебхука."
   },
   {
     "id": "api.webhook.init.debug",
@@ -2757,11 +2725,11 @@
   },
   {
     "id": "api.webhook.regen_outgoing_token.disabled.app_error",
-    "translation": "Исходящие webhooks отключены системным администратором."
+    "translation": "Исходящие вебхуки отключены системным администратором."
   },
   {
     "id": "api.webhook.regen_outgoing_token.permissions.app_error",
-    "translation": "Несоответствующие права для генерации нового токена исходящего вебхука"
+    "translation": "Отсутствуют права на пересоздание токена для исходящего вебхука"
   },
   {
     "id": "api.webrtc.disabled.app_error",
@@ -2776,6 +2744,10 @@
     "translation": "Мы столкнулись с неожиданной ошибкой при попытке зарегистрировать токен WebRTC"
   },
   {
+    "id": "api.websocket.invalid_session.error",
+    "translation": "Invalid session err=%v"
+  },
+  {
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "Недопустимый параметр {{.Name}}"
   },
diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json
index ef51d7ad7..5225c85f7 100644
--- a/i18n/zh_CN.json
+++ b/i18n/zh_CN.json
@@ -312,8 +312,8 @@
     "translation": "%s 将频道显示名从 %s 更新为 %s"
   },
   {
-    "id": "api.channel.post_update_channel_header_message_and_forget.join_leave.error",
-    "translation": "发布添加/退出消息失败 %v"
+    "id": "api.channel.post_update_channel_header_message_and_forget.post.error",
+    "translation": "Failed to post update channel header message"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.removed",
@@ -333,7 +333,7 @@
   },
   {
     "id": "api.channel.post_user_add_remove_message_and_forget.error",
-    "translation": "发布添加或者退出消息失败 %v"
+    "translation": "发布添加/退出消息失败 %v"
   },
   {
     "id": "api.channel.remove.default.app_error",
@@ -800,12 +800,16 @@
     "translation": "无效 {{.Name}} 参数"
   },
   {
+    "id": "api.context.invalid_session.error",
+    "translation": "Invalid session err=%v"
+  },
+  {
     "id": "api.context.invalid_team_url.debug",
     "translation": "团队URL访问无效。团队URL不能在API函数或者和不相干的团队中使用"
   },
   {
     "id": "api.context.invalid_token.error",
-    "translation": "无效的会话令牌=%v，err=%v"
+    "translation": "Invalid session token={{.Token}}, err={{.Error}}"
   },
   {
     "id": "api.context.invalidate_all_caches",
@@ -1468,26 +1472,10 @@
     "translation": "您没有对应的权限"
   },
   {
-    "id": "api.post.handle_post_events_and_forget.channel.error",
-    "translation": "获取频道时遇到错误, channel_id=%s, err=%v"
-  },
-  {
     "id": "api.post.handle_post_events_and_forget.members.error",
     "translation": "未获取到频道成员 channel_id=%v err=%v"
   },
   {
-    "id": "api.post.handle_post_events_and_forget.profiles.error",
-    "translation": "检索用户配置文件失败 team_id=%v, err=%v"
-  },
-  {
-    "id": "api.post.handle_post_events_and_forget.team.error",
-    "translation": "获取团队时遇到错误, team_id=%s, err=%v"
-  },
-  {
-    "id": "api.post.handle_post_events_and_forget.user.error",
-    "translation": "获取用户时遇到错误, user_id=%s, err=%v"
-  },
-  {
     "id": "api.post.handle_webhook_events_and_forget.create_post.error",
     "translation": "创建响应请求失败, err=%v"
   },
@@ -1496,10 +1484,6 @@
     "translation": "事件发布失败, err=%s"
   },
   {
-    "id": "api.post.handle_webhook_events_and_forget.getting.error",
-    "translation": "通过团队获取webhooks遇到错误, err=%v"
-  },
-  {
     "id": "api.post.init.debug",
     "translation": "正在初始化发文 API 路由"
   },
@@ -1520,20 +1504,16 @@
     "translation": "更新私信频道设置失败 user_id=%v other_user_id=%v err=%v"
   },
   {
-    "id": "api.post.notification.here.warn",
-    "translation": "无法发送通知到的用户在线@here, err=%v"
-  },
-  {
     "id": "api.post.notification.member_profile.warn",
     "translation": "无法获取频道成员个人资料，user_id=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
-    "translation": "清除 %v 拥有 channel_id %v 的通知中"
+    "id": "api.post.send_notifications.user_id.debug",
+    "translation": "Post creator not in channel for the post, no notification sent post_id=%v channel_id=%v user_id=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.comment_thread.error",
-    "translation": "在发送通知时获取注解内容时失败 root_post_id=%v, err=%v"
+    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
+    "translation": "清除 %v 拥有 channel_id %v 的通知中"
   },
   {
     "id": "api.post.send_notifications_and_forget.files.error",
@@ -1581,25 +1561,13 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
-    "translation": "发送推送失败 device_id=%v, err=%v"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.send.error",
-    "translation": "发送电子邮件失败 email=%v err=%v"
+    "translation": "Failed to send push device_id={{.DeviceId}}, err={{.Error}}"
   },
   {
     "id": "api.post.send_notifications_and_forget.sent",
     "translation": "{{.Prefix}} {{.Filenames}} 发送"
   },
   {
-    "id": "api.post.send_notifications_and_forget.sessions.error",
-    "translation": "未能检索通知中的会话 id=%v, err=%v"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.user_id.error",
-    "translation": "通过GetProfiles请求user_id没有返回值 user_id=%v"
-  },
-  {
     "id": "api.post.update_mention_count_and_forget.update_error",
     "translation": "更新提及数失败 user_id=%v channel_id=%v err=%v"
   },
@@ -2273,7 +2241,7 @@
   },
   {
     "id": "api.user.add_direct_channels_and_forget.failed.error",
-    "translation": "添加用户私聊频道偏好设置失败 user_id=%s, team_id=%s, err=%v"
+    "translation": "Failed to add direct channel preferences for user user_id={{.UserId}}, team_id={{.TeamId}}, err={{.Error}}"
   },
   {
     "id": "api.user.authorize_oauth_user.bad_response.app_error",
@@ -2776,6 +2744,10 @@
     "translation": "我们在注册 WebRTC 令牌时遇到个错误"
   },
   {
+    "id": "api.websocket.invalid_session.error",
+    "translation": "Invalid session err=%v"
+  },
+  {
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "无效的参数 {{.Name}}"
   },
diff --git a/i18n/zh_TW.json b/i18n/zh_TW.json
index 1299f2d2b..d606c2cdf 100644
--- a/i18n/zh_TW.json
+++ b/i18n/zh_TW.json
@@ -312,8 +312,8 @@
     "translation": "%s 將原頻道標題由 %s 改為 %s"
   },
   {
-    "id": "api.channel.post_update_channel_header_message_and_forget.join_leave.error",
-    "translation": "張貼 加入/退出 訊息 %v 失敗"
+    "id": "api.channel.post_update_channel_header_message_and_forget.post.error",
+    "translation": "Failed to post update channel header message"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.removed",
@@ -800,12 +800,16 @@
     "translation": "無效的 {{.Name}} 參數"
   },
   {
+    "id": "api.context.invalid_session.error",
+    "translation": "Invalid session err=%v"
+  },
+  {
     "id": "api.context.invalid_team_url.debug",
     "translation": "團隊網址在不正確的時機被存取。團隊網址不應於在 API 函式或與團隊無關的用途中被使用"
   },
   {
     "id": "api.context.invalid_token.error",
-    "translation": "無效的工作階段 token=%v, err=%v"
+    "translation": "Invalid session token={{.Token}}, err={{.Error}}"
   },
   {
     "id": "api.context.invalidate_all_caches",
@@ -1468,26 +1472,10 @@
     "translation": "您沒有適當的權限"
   },
   {
-    "id": "api.post.handle_post_events_and_forget.channel.error",
-    "translation": "取得頻道時遇到錯誤 channel_id=%s, err=%v"
-  },
-  {
     "id": "api.post.handle_post_events_and_forget.members.error",
     "translation": "取得頻道成員失敗 channel_id=%v err=%v"
   },
   {
-    "id": "api.post.handle_post_events_and_forget.profiles.error",
-    "translation": "取得使用者資訊失敗 team_id=%v, err=%v"
-  },
-  {
-    "id": "api.post.handle_post_events_and_forget.team.error",
-    "translation": "取得團隊時遇到錯誤 team_id=%s, err=%v"
-  },
-  {
-    "id": "api.post.handle_post_events_and_forget.user.error",
-    "translation": "取得使用者時遇到錯誤 user_id=%s, err=%v"
-  },
-  {
     "id": "api.post.handle_webhook_events_and_forget.create_post.error",
     "translation": "建立回應貼文失敗 err=%v"
   },
@@ -1496,10 +1484,6 @@
     "translation": "POST 事件失敗 err=%s"
   },
   {
-    "id": "api.post.handle_webhook_events_and_forget.getting.error",
-    "translation": "團隊取得 Webhook 時遇到錯誤 err=%v"
-  },
-  {
     "id": "api.post.init.debug",
     "translation": "正在初始化貼文 API 路徑"
   },
@@ -1520,20 +1504,16 @@
     "translation": "更新直接訊息頻道的偏好設定失敗 user_id=%v other_user_id=%v err=%v"
   },
   {
-    "id": "api.post.notification.here.warn",
-    "translation": "無法寄送 @here 通知給在線使用者 err=%v"
-  },
-  {
     "id": "api.post.notification.member_profile.warn",
     "translation": "無法取得頻道成員資訊 user_id=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
-    "translation": "正在清除至 %v 的推播通知，channel_id %v"
+    "id": "api.post.send_notifications.user_id.debug",
+    "translation": "Post creator not in channel for the post, no notification sent post_id=%v channel_id=%v user_id=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.comment_thread.error",
-    "translation": "在發送通知時取得註解文章失敗 root_post_id=%v err=%v"
+    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
+    "translation": "正在清除至 %v 的推播通知，channel_id %v"
   },
   {
     "id": "api.post.send_notifications_and_forget.files.error",
@@ -1581,25 +1561,13 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
-    "translation": "無法發送推播 device_id=%v, err=%v"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.send.error",
-    "translation": "提及通知電子郵件傳送失敗 email=%v err=%v"
+    "translation": "Failed to send push device_id={{.DeviceId}}, err={{.Error}}"
   },
   {
     "id": "api.post.send_notifications_and_forget.sent",
     "translation": "{{.Prefix}} {{.Filenames}} 已送出"
   },
   {
-    "id": "api.post.send_notifications_and_forget.sessions.error",
-    "translation": "於通知中取得工作階段失敗 id=%v, err=%v"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.user_id.error",
-    "translation": "GetProfiles 找不到資料的 user_id 貼文 user_id=%v"
-  },
-  {
     "id": "api.post.update_mention_count_and_forget.update_error",
     "translation": "更新提及的計數失敗 post_id=%v channel_id=%v err=%v"
   },
@@ -2273,7 +2241,7 @@
   },
   {
     "id": "api.user.add_direct_channels_and_forget.failed.error",
-    "translation": "為使用者新增直接頻道偏好設定失敗 user_id=%s, team_id=%s, err=%v"
+    "translation": "Failed to add direct channel preferences for user user_id={{.UserId}}, team_id={{.TeamId}}, err={{.Error}}"
   },
   {
     "id": "api.user.authorize_oauth_user.bad_response.app_error",
@@ -2776,6 +2744,10 @@
     "translation": "嘗試註冊 WebRTC Token時發生錯誤"
   },
   {
+    "id": "api.websocket.invalid_session.error",
+    "translation": "Invalid session err=%v"
+  },
+  {
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "無效的參數 {{.Name}}"
   },