diff --git a/i18n/de.json b/i18n/de.json
index 33517c2f2b..d7d9f85285 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -429,7 +429,7 @@
   },
   {
     "id": "api.command.execute_command.not_found.app_error",
-    "translation": "Befehl mit dem Auslöser '{{.Trigger}}' konnte nicht gefunden werden"
+    "translation": "Command with a trigger of '{{.Trigger}}' not found. To send a message beginning with \"/\", try adding an empty space at the beginning of the message."
   },
   {
     "id": "api.command.execute_command.save.app_error",
@@ -459,6 +459,10 @@
     "id": "api.command.invite_people.hint",
     "translation": "[name@domain.com ...]"
   },
+  {
+    "id": "api.command.invite_people.invite_off",
+    "translation": "User creation has been disabled on this server, no invite(s) sent"
+  },
   {
     "id": "api.command.invite_people.name",
     "translation": "leute_einladen"
@@ -495,6 +499,38 @@
     "id": "api.command_away.success",
     "translation": "Sie sind nun abwesend"
   },
+  {
+    "id": "api.command_channel_header.channel.app_error",
+    "translation": "Error to retrieve the current channel."
+  },
+  {
+    "id": "api.command_channel_header.desc",
+    "translation": "Edit the channel header"
+  },
+  {
+    "id": "api.command_channel_header.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_channel_header.message.app_error",
+    "translation": "Text must be provided with the /header command."
+  },
+  {
+    "id": "api.command_channel_header.name",
+    "translation": "header"
+  },
+  {
+    "id": "api.command_channel_header.permission.app_error",
+    "translation": "You do not have the appropriate permissions to edit the channel header."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.app_error",
+    "translation": "Error to update the current channel."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.success",
+    "translation": "Channel header successfully updated."
+  },
   {
     "id": "api.command_collapse.desc",
     "translation": "Automatisches Einklappen von Bildervorschauen einschalten"
@@ -551,6 +587,14 @@
     "id": "api.command_expand_collapse.fail.app_error",
     "translation": "Es trat ein Fehler beim Erweitern der Vorschauen auf"
   },
+  {
+    "id": "api.command_help.desc",
+    "translation": "Open the Mattermost help page"
+  },
+  {
+    "id": "api.command_help.name",
+    "translation": "help"
+  },
   {
     "id": "api.command_join.desc",
     "translation": "Öffentlichen Kanal beitreten"
@@ -1647,6 +1691,10 @@
     "id": "api.post.send_notifications_and_forget.push_image_only",
     "translation": " Eine oder mehrere Dateien hochgeladen "
   },
+  {
+    "id": "api.post.send_notifications_and_forget.push_image_only_dm",
+    "translation": " Eine oder mehrere Dateien in einer Direktnachricht hochgeladen"
+  },
   {
     "id": "api.post.send_notifications_and_forget.push_in",
     "translation": " in "
@@ -2003,14 +2051,6 @@
     "id": "api.system.go_routines",
     "translation": "Die Anzahl von laufenden Go-Routinen ist oberhalb des Gesundheits-Schwellenwerts %v von %v"
   },
-  {
-    "id": "api.team.add_user_to_team.invalid_data.app_error",
-    "translation": "Ungültige Daten."
-  },
-  {
-    "id": "api.team.add_user_to_team.invalid_invite_id.app_error",
-    "translation": "Ungültige Einladungs-ID. Kein Team entspricht dieser Einladungs-ID."
-  },
   {
     "id": "api.team.add_user_to_team.missing_parameter.app_error",
     "translation": "Parameter um Benutzer zu Team hinzuzufügen erforderlich."
@@ -2083,6 +2123,10 @@
     "id": "api.team.invite_members.already.app_error",
     "translation": "Diese Person ist schon in Ihrem Team"
   },
+  {
+    "id": "api.team.invite_members.invalid_email.app_error",
+    "translation": "Die folgenden E-Mail-Adressen gehören nicht zu einer akzeptierten Domäne: {{.Addresses}}. Bitte kontaktieren Sie ihren Systemadministrator für Details."
+  },
   {
     "id": "api.team.invite_members.member",
     "translation": "Mitglied"
@@ -2975,10 +3019,50 @@
     "id": "app.import.import_channel.team_not_found.error",
     "translation": "Fehler beim Importieren des Kanals. Team mit dem Namen \"{{.TeamName}}\" konnte nicht gefunden werden."
   },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "Failed to get direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "Failed to get direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "Failed to get group channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "Failed to get group channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.member_not_found.error",
+    "translation": "Konnte Kanalmitglied beim Import des Direktnachrichtenkanals nicht finden"
+  },
+  {
+    "id": "app.import.import_direct_channel.update_header_failed.error",
+    "translation": "Failed to update direct channel header"
+  },
+  {
+    "id": "app.import.import_direct_post.channel_member_not_found.error",
+    "translation": "Konnte Kanalmitglied beim Import des Direktnachrichtenkanals nicht finden"
+  },
+  {
+    "id": "app.import.import_direct_post.user_not_found.error",
+    "translation": "Post user does not exist"
+  },
   {
     "id": "app.import.import_line.null_channel.error",
     "translation": "Importdatenzeile hat den Typ \"channel\", aber das Kanalobjekt ist null."
   },
+  {
+    "id": "app.import.import_line.null_direct_channel.error",
+    "translation": "Importdatenzeile hat den Typ \"channel\", aber das Kanalobjekt ist null."
+  },
+  {
+    "id": "app.import.import_line.null_direct_post.error",
+    "translation": "Importdatenzeile hat den Typ \"post\", aber das Nachrichtenobjekt ist null."
+  },
   {
     "id": "app.import.import_line.null_post.error",
     "translation": "Importdatenzeile hat den Typ \"post\", aber das Nachrichtenobjekt ist null."
@@ -3051,6 +3135,54 @@
     "id": "app.import.validate_channel_import_data.type_missing.error",
     "translation": "Fehlende erforderliche Kanaleigenschaft: type."
   },
+  {
+    "id": "app.import.validate_direct_channel_import_data.header_length.error",
+    "translation": "Direct channel header is too long"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_required.error",
+    "translation": "Fehlende erforderliche Kanaleigenschaft: name"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_few.error",
+    "translation": "Direct channel members list contains too few items"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_many.error",
+    "translation": "Direct channel members list contains too many items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
+    "translation": "Fehlende erforderliche Nachrichteigenschaft: create_at."
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_few.error",
+    "translation": "Direct post channel members list contains too few items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_many.error",
+    "translation": "Direct post channel members list contains too many items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_missing.error",
+    "translation": "Fehlende erforderliche Nachrichteigenschaft: create_at."
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_zero.error",
+    "translation": "CreateAt must be greater than 0"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_length.error",
+    "translation": "Message is too long"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_missing.error",
+    "translation": "Fehlende erforderliche Nachrichteigenschaft: Message."
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.user_missing.error",
+    "translation": "Fehlende erforderliche Nachrichteigenschaft: User."
+  },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
     "translation": "Fehlende erforderliche Nachrichteigenschaft: Channel."
@@ -3371,6 +3503,14 @@
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "Konnte ElasticSearch-Index-Einstellungen nicht setzen"
   },
+  {
+    "id": "ent.elasticsearch.test_config.indexing_disabled.error",
+    "translation": "Elasticsearch ist deaktiviert."
+  },
+  {
+    "id": "ent.elasticsearch.test_config.license.error",
+    "translation": "Lizenz unterstützt Elasticsearch nicht."
+  },
   {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "Benutzerdefinierte Emojireaktionen durch die aktuelle Lizenz deaktiviert. Bitte kontaktieren Sie Ihren Systemadministrator wegen eines Enterprise Lizenzupgrades."
@@ -4171,6 +4311,10 @@
     "id": "model.config.is_valid.sql_query_timeout.app_error",
     "translation": "Ungültige Abfrage-Zeitüberschreitung für SQL-Einstellungen.  Muss eine positive Zahl sein."
   },
+  {
+    "id": "model.config.is_valid.teammate_name_display.app_error",
+    "translation": "Invalid teammate display.  Must be 'full_name', 'nickname_full_name' or 'username'"
+  },
   {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "Zeit zwischen Benutzereingabenaktualisierung sollte nicht weniger als 1000 Millisekunden betragen."
@@ -5723,6 +5867,10 @@
     "id": "store.sql_user.get_for_login.multiple_users",
     "translation": "Es wurden mehrere Benutzer entsprechend Ihrer Zugangsdaten gefunden und Sie konnten nicht angemeldet werden. Bitte kontaktieren Sie einen Administrator."
   },
+  {
+    "id": "store.sql_user.get_new_users.app_error",
+    "translation": "Es trat ein Fehler beim Sichen der Einstellungen auf"
+  },
   {
     "id": "store.sql_user.get_profiles.app_error",
     "translation": "Es trat ein Fehler beim Finden der Benutzerprofile auf"
diff --git a/i18n/en.json b/i18n/en.json
index 95fab33e26..7d23a13c1a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -451,10 +451,6 @@
     "id": "api.command.invite_people.email_off",
     "translation": "Email has not been configured, no invite(s) sent"
   },
-  {
-    "id": "api.command.invite_people.invite_off",
-    "translation": "User creation has been disabled on this server, no invite(s) sent"
-  },
   {
     "id": "api.command.invite_people.fail",
     "translation": "Encountered an error sending email invite(s)"
@@ -463,6 +459,10 @@
     "id": "api.command.invite_people.hint",
     "translation": "[name@domain.com ...]"
   },
+  {
+    "id": "api.command.invite_people.invite_off",
+    "translation": "User creation has been disabled on this server, no invite(s) sent"
+  },
   {
     "id": "api.command.invite_people.name",
     "translation": "invite_people"
@@ -499,6 +499,38 @@
     "id": "api.command_away.success",
     "translation": "You are now away"
   },
+  {
+    "id": "api.command_channel_header.channel.app_error",
+    "translation": "Error to retrieve the current channel."
+  },
+  {
+    "id": "api.command_channel_header.desc",
+    "translation": "Edit the channel header"
+  },
+  {
+    "id": "api.command_channel_header.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_channel_header.message.app_error",
+    "translation": "Text must be provided with the /header command."
+  },
+  {
+    "id": "api.command_channel_header.name",
+    "translation": "header"
+  },
+  {
+    "id": "api.command_channel_header.permission.app_error",
+    "translation": "You do not have the appropriate permissions to edit the channel header."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.app_error",
+    "translation": "Error to update the current channel."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.success",
+    "translation": "Channel header successfully updated."
+  },
   {
     "id": "api.command_collapse.desc",
     "translation": "Turn on auto-collapsing of image previews"
@@ -539,38 +571,6 @@
     "id": "api.command_echo.name",
     "translation": "echo"
   },
-  {
-    "id": "api.command_channel_header.desc",
-    "translation": "Edit the channel header"
-  },
-  {
-    "id": "api.command_channel_header.hint",
-    "translation": "[text]"
-  },
-  {
-    "id": "api.command_channel_header.name",
-    "translation": "header"
-  },
-  {
-    "id": "api.command_channel_header.message.app_error",
-    "translation": "Text must be provided with the /header command."
-  },
-  {
-    "id": "api.command_channel_header.channel.app_error",
-    "translation": "Error to retrieve the current channel."
-  },
-  {
-    "id": "api.command_channel_header.permission.app_error",
-    "translation": "You do not have the appropriate permissions to edit the channel header."
-  },
-  {
-    "id": "api.command_channel_header.update_channel.app_error",
-    "translation": "Error to update the current channel."
-  },
-  {
-    "id": "api.command_channel_header.update_channel.success",
-    "translation": "Channel header successfully updated."
-  },
   {
     "id": "api.command_expand.desc",
     "translation": "Turn off auto-collapsing of image previews"
@@ -587,6 +587,14 @@
     "id": "api.command_expand_collapse.fail.app_error",
     "translation": "An error occurred while expanding previews"
   },
+  {
+    "id": "api.command_help.desc",
+    "translation": "Open the Mattermost help page"
+  },
+  {
+    "id": "api.command_help.name",
+    "translation": "help"
+  },
   {
     "id": "api.command_join.desc",
     "translation": "Join the open channel"
@@ -891,14 +899,6 @@
     "id": "api.command_shrug.name",
     "translation": "shrug"
   },
-  {
-    "id": "api.command_help.desc",
-    "translation": "Open the Mattermost help page"
-  },
-  {
-    "id": "api.command_help.name",
-    "translation": "help"
-  },
   {
     "id": "api.compliance.init.debug",
     "translation": "Initializing compliance API routes"
@@ -2143,6 +2143,10 @@
     "id": "api.team.invite_members.already.app_error",
     "translation": "This person is already on your team"
   },
+  {
+    "id": "api.team.invite_members.invalid_email.app_error",
+    "translation": "The following email addresses do not belong to an accepted domain: {{.Addresses}}. Please contact your System Administrator for details."
+  },
   {
     "id": "api.team.invite_members.member",
     "translation": "member"
@@ -2163,10 +2167,6 @@
     "id": "api.team.invite_members.send.error",
     "translation": "Failed to send invite email successfully err=%v"
   },
-  {
-    "id": "api.team.invite_members.invalid_email.app_error",
-    "translation": "The following email addresses do not belong to an accepted domain: {{.Addresses}}. Please contact your System Administrator for details."
-  },
   {
     "id": "api.team.invite_members.sending.info",
     "translation": "sending invitation to %v %v"
@@ -3039,10 +3039,6 @@
     "id": "app.import.import_channel.team_not_found.error",
     "translation": "Error importing channel. Team with name \"{{.TeamName}}\" could not be found."
   },
-  {
-    "id": "app.import.import_direct_channel.member_not_found.error",
-    "translation": "Could not find channel member when importing direct channel"
-  },
   {
     "id": "app.import.import_direct_channel.create_direct_channel.error",
     "translation": "Failed to create direct channel"
@@ -3051,6 +3047,10 @@
     "id": "app.import.import_direct_channel.create_group_channel.error",
     "translation": "Failed to create group channel"
   },
+  {
+    "id": "app.import.import_direct_channel.member_not_found.error",
+    "translation": "Could not find channel member when importing direct channel"
+  },
   {
     "id": "app.import.import_direct_channel.update_header_failed.error",
     "translation": "Failed to update direct channel header"
@@ -3155,6 +3155,10 @@
     "id": "app.import.validate_channel_import_data.type_missing.error",
     "translation": "Missing required channel property: type."
   },
+  {
+    "id": "app.import.validate_direct_channel_import_data.header_length.error",
+    "translation": "Direct channel header is too long"
+  },
   {
     "id": "app.import.validate_direct_channel_import_data.members_required.error",
     "translation": "Missing required direct channel property: members"
@@ -3167,10 +3171,6 @@
     "id": "app.import.validate_direct_channel_import_data.members_too_many.error",
     "translation": "Direct channel members list contains too many items"
   },
-  {
-    "id": "app.import.validate_direct_channel_import_data.header_length.error",
-    "translation": "Direct channel header is too long"
-  },
   {
     "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
     "translation": "Missing required direct post property: channel_members"
@@ -3183,18 +3183,6 @@
     "id": "app.import.validate_direct_post_import_data.channel_members_too_many.error",
     "translation": "Direct post channel members list contains too many items"
   },
-  {
-    "id": "app.import.validate_direct_post_import_data.user_missing.error",
-    "translation": "Missing required direct post property: user"
-  },
-  {
-    "id": "app.import.validate_direct_post_import_data.message_missing.error",
-    "translation": "Missing required direct post property: message"
-  },
-  {
-    "id": "app.import.validate_direct_post_import_data.message_length.error",
-    "translation": "Message is too long"
-  },
   {
     "id": "app.import.validate_direct_post_import_data.create_at_missing.error",
     "translation": "Missing required direct post property: create_at"
@@ -3203,6 +3191,18 @@
     "id": "app.import.validate_direct_post_import_data.create_at_zero.error",
     "translation": "CreateAt must be greater than 0"
   },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_length.error",
+    "translation": "Message is too long"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_missing.error",
+    "translation": "Missing required direct post property: message"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.user_missing.error",
+    "translation": "Missing required direct post property: user"
+  },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
     "translation": "Missing required Post property: Channel."
@@ -5887,6 +5887,10 @@
     "id": "store.sql_user.get_for_login.multiple_users",
     "translation": "We found multiple users matching your credentials and were unable to log you in. Please contact an administrator."
   },
+  {
+    "id": "store.sql_user.get_new_users.app_error",
+    "translation": "We encountered an error while finding the new users"
+  },
   {
     "id": "store.sql_user.get_profiles.app_error",
     "translation": "We encountered an error while finding user profiles"
@@ -5895,10 +5899,6 @@
     "id": "store.sql_user.get_recently_active_users.app_error",
     "translation": "We encountered an error while finding the recently active users"
   },
-  {
-    "id": "store.sql_user.get_new_users.app_error",
-    "translation": "We encountered an error while finding the new users"
-  },
   {
     "id": "store.sql_user.get_sysadmin_profiles.app_error",
     "translation": "We encountered an error while finding user profiles"
diff --git a/i18n/es.json b/i18n/es.json
index bd2cd611e1..801565c52d 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -429,7 +429,7 @@
   },
   {
     "id": "api.command.execute_command.not_found.app_error",
-    "translation": "No se encontró el Comando con la palabra '{{.Trigger}}' que desencadena la acción"
+    "translation": "Comando con el gatillador '{{.Trigger}}' no fue encontrado. Para enviar un mensaje que comience con \"/\", trata de añadir un espacio vacío en el inicio del mensaje."
   },
   {
     "id": "api.command.execute_command.save.app_error",
@@ -459,6 +459,10 @@
     "id": "api.command.invite_people.hint",
     "translation": "[nombre@dominio.com ...]"
   },
+  {
+    "id": "api.command.invite_people.invite_off",
+    "translation": "La creación de usuario ha sido desactivada en este servidor, la invitación no se envió"
+  },
   {
     "id": "api.command.invite_people.name",
     "translation": "invitar"
@@ -495,6 +499,38 @@
     "id": "api.command_away.success",
     "translation": "Ahora estás ausente"
   },
+  {
+    "id": "api.command_channel_header.channel.app_error",
+    "translation": "Error al recuperar el canal actual."
+  },
+  {
+    "id": "api.command_channel_header.desc",
+    "translation": "Editar el encabezado del canal"
+  },
+  {
+    "id": "api.command_channel_header.hint",
+    "translation": "[texto]"
+  },
+  {
+    "id": "api.command_channel_header.message.app_error",
+    "translation": "El texto debe ser proporcionado con el comando /header."
+  },
+  {
+    "id": "api.command_channel_header.name",
+    "translation": "encabezado"
+  },
+  {
+    "id": "api.command_channel_header.permission.app_error",
+    "translation": "No tienes los permisos adecuados para modificar el encabezado del canal."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.app_error",
+    "translation": "Error al actualizar el canal actual."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.success",
+    "translation": "El encabezado del canal fue actualizado correctamente."
+  },
   {
     "id": "api.command_collapse.desc",
     "translation": "Activar auto-colapso de previsualizaciones de imagen"
@@ -551,6 +587,14 @@
     "id": "api.command_expand_collapse.fail.app_error",
     "translation": "Se ha producido un error durante la expansión de las previsualizaciones"
   },
+  {
+    "id": "api.command_help.desc",
+    "translation": "Abrir la página de ayuda de Mattermost"
+  },
+  {
+    "id": "api.command_help.name",
+    "translation": "help"
+  },
   {
     "id": "api.command_join.desc",
     "translation": "Unirte a un canal público"
@@ -1645,7 +1689,11 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " Subió uno o más archivos "
+    "translation": " Cargó 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"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_in",
@@ -2003,14 +2051,6 @@
     "id": "api.system.go_routines",
     "translation": "El número de goroutines supera umbral recomendado %v %v"
   },
-  {
-    "id": "api.team.add_user_to_team.invalid_data.app_error",
-    "translation": "datos inválidos."
-  },
-  {
-    "id": "api.team.add_user_to_team.invalid_invite_id.app_error",
-    "translation": "ID de invitación no válido. No hay un equipo que coincida con el id de invitación."
-  },
   {
     "id": "api.team.add_user_to_team.missing_parameter.app_error",
     "translation": "Parámetro requerido para agregar un usuario al equipo."
@@ -2083,6 +2123,10 @@
     "id": "api.team.invite_members.already.app_error",
     "translation": "Esta persona ya se encuentra en tu equipo"
   },
+  {
+    "id": "api.team.invite_members.invalid_email.app_error",
+    "translation": "Las siguientes direcciones de correo electrónico no pertenecen a un dominio aceptado: {{.Addresses}}. Por favor, ponte en contacto con tu Administrador del Sistema para obtener más detalles."
+  },
   {
     "id": "api.team.invite_members.member",
     "translation": "miembro"
@@ -2975,10 +3019,50 @@
     "id": "app.import.import_channel.team_not_found.error",
     "translation": "Error al importar el canal. El equipo con el nombre \"{{.TeamName}}\" no pudo ser encontrado."
   },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "No se pudo obtener el canal directo"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "No se pudo obtener el canal directo"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "No se pudo obtener el canal de grupo"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "No se pudo obtener el canal de grupo"
+  },
+  {
+    "id": "app.import.import_direct_channel.member_not_found.error",
+    "translation": "No se pudo encontrar a los miembros del canal al realizar la importación del canal directo"
+  },
+  {
+    "id": "app.import.import_direct_channel.update_header_failed.error",
+    "translation": "Error al actualizar el encabezado del canal directo"
+  },
+  {
+    "id": "app.import.import_direct_post.channel_member_not_found.error",
+    "translation": "No se pudo encontrar a los miembros del canal, al importar un mensaje en el canal directo"
+  },
+  {
+    "id": "app.import.import_direct_post.user_not_found.error",
+    "translation": "El usuario que publicó el mensaje no existe"
+  },
   {
     "id": "app.import.import_line.null_channel.error",
     "translation": "La linea a importar tiene un tipo de \"canal\" pero el objeto del canal es null."
   },
+  {
+    "id": "app.import.import_line.null_direct_channel.error",
+    "translation": "La linea a importar tiene un tipo de \"direct_channel\" pero el objeto de direct_channel es null."
+  },
+  {
+    "id": "app.import.import_line.null_direct_post.error",
+    "translation": "La linea a importar tiene un tipo de \"direct_post\" pero el objeto del direct_post es null."
+  },
   {
     "id": "app.import.import_line.null_post.error",
     "translation": "La linea a importar tiene un tipo de \"mensaje\" pero el objeto del mensaje es null."
@@ -3051,6 +3135,54 @@
     "id": "app.import.validate_channel_import_data.type_missing.error",
     "translation": "Falta la propiedad obligatoria del canal: type"
   },
+  {
+    "id": "app.import.validate_direct_channel_import_data.header_length.error",
+    "translation": "El encabezado del canal directo es muy largo"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_required.error",
+    "translation": "Falta la propiedad obligatoria del canal: members"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_few.error",
+    "translation": "La lista de miembros del canal directo contiene muy pocos elementos"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_many.error",
+    "translation": "La lista de miembros del canal directo contiene demasiados elementos"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
+    "translation": "Falta la propiedad del mensaje: channel_members."
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_few.error",
+    "translation": "La lista de miembros del mensaje para el canal directo contiene muy pocos elementos"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_many.error",
+    "translation": "La lista de miembros del mensaje para el canal directo contiene demasiados elementos"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_missing.error",
+    "translation": "Falta la propiedad del mensaje del canal directo: create_at"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_zero.error",
+    "translation": "CreateAt debe ser mayor que 0"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_length.error",
+    "translation": "Mensaje demasiado largo"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_missing.error",
+    "translation": "Falta la propiedad obligatoria del mensaje del canal directo: message"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.user_missing.error",
+    "translation": "Falta la propiedad obligatoria del mensaje del canal directo: user"
+  },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
     "translation": "Falta la propiedad obligatoria del mensaje: Channel."
@@ -3371,6 +3503,14 @@
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "No se pudo establecer el índice de configuración de ElasticSearch"
   },
+  {
+    "id": "ent.elasticsearch.test_config.indexing_disabled.error",
+    "translation": "Elasticsearch está deshabilitado."
+  },
+  {
+    "id": "ent.elasticsearch.test_config.license.error",
+    "translation": "La licencia no admite Elasticsearch."
+  },
   {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "Las restricciones de los Emoticones Personalizados están desactivadas por la licencia actual. Por favor contacta a un Administrador del Sistema sobre como actualizar a una licencia empresarial."
@@ -4171,6 +4311,10 @@
     "id": "model.config.is_valid.sql_query_timeout.app_error",
     "translation": "Tiempo de espera para las consultas en la configuración de SQL no es válido.  Debe ser un número positivo."
   },
+  {
+    "id": "model.config.is_valid.teammate_name_display.app_error",
+    "translation": "Tipo de visualización compañero de equipo no es válido. Debe ser 'full_name', 'nickname_full_name' o 'username'"
+  },
   {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "El tiempo transcurrido para actualizar que el usuario está escribiendo no debe ser menor a 1000 milisegundos."
@@ -5723,6 +5867,10 @@
     "id": "store.sql_user.get_for_login.multiple_users",
     "translation": "Encontramos múltiples usuarios que tienen tus credenciales y no pudimos iniciar tu sesión. Por favor contacta a un administrador."
   },
+  {
+    "id": "store.sql_user.get_new_users.app_error",
+    "translation": "Encontramos un error mientras buscamos los usuario nuevos"
+  },
   {
     "id": "store.sql_user.get_profiles.app_error",
     "translation": "Encontramos un error mientras buscamos los perfiles de usuario"
diff --git a/i18n/fr.json b/i18n/fr.json
index 0baecb2fe9..c4fcf4a51c 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -429,7 +429,7 @@
   },
   {
     "id": "api.command.execute_command.not_found.app_error",
-    "translation": "La commande avec le déclencheur '{{.Trigger}}' n'a pas pu être trouvée"
+    "translation": "Command with a trigger of '{{.Trigger}}' not found. To send a message beginning with \"/\", try adding an empty space at the beginning of the message."
   },
   {
     "id": "api.command.execute_command.save.app_error",
@@ -459,6 +459,10 @@
     "id": "api.command.invite_people.hint",
     "translation": "[Nom@domaine.com ...]"
   },
+  {
+    "id": "api.command.invite_people.invite_off",
+    "translation": "User creation has been disabled on this server, no invite(s) sent"
+  },
   {
     "id": "api.command.invite_people.name",
     "translation": "inviter_personne"
@@ -495,6 +499,38 @@
     "id": "api.command_away.success",
     "translation": "Vous êtes maintenant absent(e)"
   },
+  {
+    "id": "api.command_channel_header.channel.app_error",
+    "translation": "Error to retrieve the current channel."
+  },
+  {
+    "id": "api.command_channel_header.desc",
+    "translation": "Edit the channel header"
+  },
+  {
+    "id": "api.command_channel_header.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_channel_header.message.app_error",
+    "translation": "Text must be provided with the /header command."
+  },
+  {
+    "id": "api.command_channel_header.name",
+    "translation": "header"
+  },
+  {
+    "id": "api.command_channel_header.permission.app_error",
+    "translation": "You do not have the appropriate permissions to edit the channel header."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.app_error",
+    "translation": "Error to update the current channel."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.success",
+    "translation": "Channel header successfully updated."
+  },
   {
     "id": "api.command_collapse.desc",
     "translation": "Activer la réduction automatique des aperçus d'images"
@@ -551,6 +587,14 @@
     "id": "api.command_expand_collapse.fail.app_error",
     "translation": "Une erreur est survenue lors de l'expansion des aperçus"
   },
+  {
+    "id": "api.command_help.desc",
+    "translation": "Open the Mattermost help page"
+  },
+  {
+    "id": "api.command_help.name",
+    "translation": "help"
+  },
   {
     "id": "api.command_join.desc",
     "translation": "Rejoint un canal ouvert"
@@ -1647,6 +1691,10 @@
     "id": "api.post.send_notifications_and_forget.push_image_only",
     "translation": " Un ou plusieurs fichiers envoyés "
   },
+  {
+    "id": "api.post.send_notifications_and_forget.push_image_only_dm",
+    "translation": " Uploaded one or more files in a direct message"
+  },
   {
     "id": "api.post.send_notifications_and_forget.push_in",
     "translation": " dans "
@@ -2003,14 +2051,6 @@
     "id": "api.system.go_routines",
     "translation": "Le nombre de routines Go en fonctionnement est supérieur à la limite de %v / %v"
   },
-  {
-    "id": "api.team.add_user_to_team.invalid_data.app_error",
-    "translation": "Donnée invalide."
-  },
-  {
-    "id": "api.team.add_user_to_team.invalid_invite_id.app_error",
-    "translation": "ID d'invitation invalide. Aucune équipe ne correspond à cet ID d'invitation."
-  },
   {
     "id": "api.team.add_user_to_team.missing_parameter.app_error",
     "translation": "Paramètre requis pour ajouter l'utilisateur à une équipe."
@@ -2083,6 +2123,10 @@
     "id": "api.team.invite_members.already.app_error",
     "translation": "Cette personne est déjà dans votre équipe"
   },
+  {
+    "id": "api.team.invite_members.invalid_email.app_error",
+    "translation": "The following email addresses do not belong to an accepted domain: {{.Addresses}}. Please contact your System Administrator for details."
+  },
   {
     "id": "api.team.invite_members.member",
     "translation": "membre"
@@ -2975,10 +3019,50 @@
     "id": "app.import.import_channel.team_not_found.error",
     "translation": "Erreur lors de l'importation du canal. L'équipe portant le nom \"{{.TeamName}}\" n'a pas pu être trouvée."
   },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "Failed to get direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "Failed to get direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "Failed to get group channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "Failed to get group channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.member_not_found.error",
+    "translation": "Could not find channel member when importing direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.update_header_failed.error",
+    "translation": "Failed to update direct channel header"
+  },
+  {
+    "id": "app.import.import_direct_post.channel_member_not_found.error",
+    "translation": "Could not find channel member when importing direct channel post"
+  },
+  {
+    "id": "app.import.import_direct_post.user_not_found.error",
+    "translation": "Post user does not exist"
+  },
   {
     "id": "app.import.import_line.null_channel.error",
     "translation": "La ligne de données importée dispose d'un type \"channel\", mais l'objet channel est null."
   },
+  {
+    "id": "app.import.import_line.null_direct_channel.error",
+    "translation": "La ligne de données importée dispose d'un type \"channel\", mais l'objet channel est null."
+  },
+  {
+    "id": "app.import.import_line.null_direct_post.error",
+    "translation": "La ligne de données importée dispose d'un type \"post\", mais l'objet post est null."
+  },
   {
     "id": "app.import.import_line.null_post.error",
     "translation": "La ligne de données importée dispose d'un type \"post\", mais l'objet post est null."
@@ -3051,6 +3135,54 @@
     "id": "app.import.validate_channel_import_data.type_missing.error",
     "translation": "La propriété de canal requise est manquante : type."
   },
+  {
+    "id": "app.import.validate_direct_channel_import_data.header_length.error",
+    "translation": "Direct channel header is too long"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_required.error",
+    "translation": "La propriété de canal requise est manquante : name"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_few.error",
+    "translation": "Direct channel members list contains too few items"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_many.error",
+    "translation": "Direct channel members list contains too many items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
+    "translation": "La propriété de message requise est manquante : create_at."
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_few.error",
+    "translation": "Direct post channel members list contains too few items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_many.error",
+    "translation": "Direct post channel members list contains too many items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_missing.error",
+    "translation": "La propriété de message requise est manquante : create_at."
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_zero.error",
+    "translation": "CreateAt must be greater than 0"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_length.error",
+    "translation": "Message is too long"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_missing.error",
+    "translation": "La propriété de message requise est manquante : Message."
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.user_missing.error",
+    "translation": "La propriété de message requise est manquante : User."
+  },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
     "translation": "La propriété de message requise est manquante : Channel."
@@ -3371,6 +3503,14 @@
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "Impossible de définir les paramètres de l'index d'ElasticSearch"
   },
+  {
+    "id": "ent.elasticsearch.test_config.indexing_disabled.error",
+    "translation": "Elasticsearch is disabled."
+  },
+  {
+    "id": "ent.elasticsearch.test_config.license.error",
+    "translation": "License does not support Elasticsearch."
+  },
   {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "Les émoticônes personnalisées sont désactivées par la licence actuellement utilisée. Veuillez contacter votre administrateur système à propos d'une mise à niveau vers la licence entreprise."
@@ -4171,6 +4311,10 @@
     "id": "model.config.is_valid.sql_query_timeout.app_error",
     "translation": "Temps d'attente pour la requête SQL invalide. Doit être un entier positif."
   },
+  {
+    "id": "model.config.is_valid.teammate_name_display.app_error",
+    "translation": "Invalid teammate display.  Must be 'full_name', 'nickname_full_name' or 'username'"
+  },
   {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "Le temps entre chaque utilisateur tapant une mise à jour ne doit pas être inférieur à 1000 millisecondes."
@@ -5723,6 +5867,10 @@
     "id": "store.sql_user.get_for_login.multiple_users",
     "translation": "Nous avons trouvé plusieurs utilisateurs correspondant à vos informations d'identification et nous avons été incapables de vous connecter. Veuillez contacter un administrateur."
   },
+  {
+    "id": "store.sql_user.get_new_users.app_error",
+    "translation": "Nous avons rencontré une erreur durant la recherche des préférences"
+  },
   {
     "id": "store.sql_user.get_profiles.app_error",
     "translation": "Nous avons rencontré une erreur lors de la recherche des profils utilisateurs"
diff --git a/i18n/it.json b/i18n/it.json
index 428198a345..0adf4b0363 100644
--- a/i18n/it.json
+++ b/i18n/it.json
@@ -429,7 +429,7 @@
   },
   {
     "id": "api.command.execute_command.not_found.app_error",
-    "translation": "Il comando per '{{.Trigger}}' non è stato trovato"
+    "translation": "Il comando per '{{.Trigger}}' non è stato trovato. Per inviare un messaggio iniziante per \"/\" occorre aggiungere uno spazio all'inizio del messaggio."
   },
   {
     "id": "api.command.execute_command.save.app_error",
@@ -459,6 +459,10 @@
     "id": "api.command.invite_people.hint",
     "translation": "[nome@dominio.com ...]"
   },
+  {
+    "id": "api.command.invite_people.invite_off",
+    "translation": "La creazione di utenti è stata disattivata per questo server, nessun invito inviato"
+  },
   {
     "id": "api.command.invite_people.name",
     "translation": "invita_perona"
@@ -495,6 +499,38 @@
     "id": "api.command_away.success",
     "translation": "Ora sei \"Assente\""
   },
+  {
+    "id": "api.command_channel_header.channel.app_error",
+    "translation": "Errore nel caricamento del canale."
+  },
+  {
+    "id": "api.command_channel_header.desc",
+    "translation": "Modifica l'intestazione del canale"
+  },
+  {
+    "id": "api.command_channel_header.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_channel_header.message.app_error",
+    "translation": "Il testo deve essere specificato per il comando /header."
+  },
+  {
+    "id": "api.command_channel_header.name",
+    "translation": "intestazione"
+  },
+  {
+    "id": "api.command_channel_header.permission.app_error",
+    "translation": "Non si dispone dei permessi necessari per modificare l'intestazione del canale."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.app_error",
+    "translation": "Errore nell'aggiornamento del canale."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.success",
+    "translation": "Intestazione del canale aggiornata."
+  },
   {
     "id": "api.command_collapse.desc",
     "translation": "Abilita auto-compressione delle immagini di anteprima"
@@ -551,6 +587,14 @@
     "id": "api.command_expand_collapse.fail.app_error",
     "translation": "Errore durante l' espansione delle anteprime"
   },
+  {
+    "id": "api.command_help.desc",
+    "translation": "Vai alla pagina di aiuto di Mattermost"
+  },
+  {
+    "id": "api.command_help.name",
+    "translation": "aiuto"
+  },
   {
     "id": "api.command_join.desc",
     "translation": "Entra nel canale aperto"
@@ -661,7 +705,7 @@
   },
   {
     "id": "api.command_open.name",
-    "translation": "open"
+    "translation": "Apri"
   },
   {
     "id": "api.command_settings.desc",
@@ -1645,7 +1689,11 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " Caricati uno o più file "
+    "translation": " ha caricato uno o più file in "
+  },
+  {
+    "id": "api.post.send_notifications_and_forget.push_image_only_dm",
+    "translation": " ha caricato uno o più file in un messaggio diretto"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_in",
@@ -2003,14 +2051,6 @@
     "id": "api.system.go_routines",
     "translation": "Il numero di goroutines è oltre la soglia ottimale %v di %v"
   },
-  {
-    "id": "api.team.add_user_to_team.invalid_data.app_error",
-    "translation": "Informazione non valida."
-  },
-  {
-    "id": "api.team.add_user_to_team.invalid_invite_id.app_error",
-    "translation": "Id invito non valido. Nessun gruppo corrispondente a questo id invito."
-  },
   {
     "id": "api.team.add_user_to_team.missing_parameter.app_error",
     "translation": "Parametro necessario per aggiungere l'utente al gruppo."
@@ -2083,6 +2123,10 @@
     "id": "api.team.invite_members.already.app_error",
     "translation": "Questa persona è già nel tuo gruppo"
   },
+  {
+    "id": "api.team.invite_members.invalid_email.app_error",
+    "translation": "I seguenti indirizzi eMail non appartengono ad un dominio accettato: {{.Addresses}}. Contattare l'amministratore del sistema per maggiori dettagli."
+  },
   {
     "id": "api.team.invite_members.member",
     "translation": "membro"
@@ -2975,10 +3019,50 @@
     "id": "app.import.import_channel.team_not_found.error",
     "translation": "Errore di importazione del canale. Il gruppo di nome \"{{.TeamName}}\" non è stato trovato."
   },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "Errore durante la ricerca del canale diretto"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "Errore durante la ricerca del canale diretto"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "Errore durante la ricerca del canale di gruppo"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "Errore durante la ricerca del canale di gruppo"
+  },
+  {
+    "id": "app.import.import_direct_channel.member_not_found.error",
+    "translation": "Errore nella ricerca del membro del canale durante l'importazione del canale diretto"
+  },
+  {
+    "id": "app.import.import_direct_channel.update_header_failed.error",
+    "translation": "Errore durante l'aggiornamento del titolo del canale diretto"
+  },
+  {
+    "id": "app.import.import_direct_post.channel_member_not_found.error",
+    "translation": "Errore nella ricerca del membro del canale durante l'importazione della pubblicazione sul canale diretto"
+  },
+  {
+    "id": "app.import.import_direct_post.user_not_found.error",
+    "translation": "L'utente della pubblicazione non esiste"
+  },
   {
     "id": "app.import.import_line.null_channel.error",
     "translation": "La riga di dati da importare è di tipo \"channel\" ma l'oggetto channel è nullo."
   },
+  {
+    "id": "app.import.import_line.null_direct_channel.error",
+    "translation": "La riga di dati da importare è di tipo \"canale_diretto\" ma l'oggetto canale_diretto è nullo."
+  },
+  {
+    "id": "app.import.import_line.null_direct_post.error",
+    "translation": "La riga di dati da importare è di tipo \"pubblicazione_diretta\" ma l'oggetto pubblicazione_diretta è nullo."
+  },
   {
     "id": "app.import.import_line.null_post.error",
     "translation": "La riga di dati da importare è di tipo \"post\" ma l'oggetto post è nullo."
@@ -3051,6 +3135,54 @@
     "id": "app.import.validate_channel_import_data.type_missing.error",
     "translation": "Manca una proprietà richiesta del canale: tipo"
   },
+  {
+    "id": "app.import.validate_direct_channel_import_data.header_length.error",
+    "translation": "Il titolo del canale diretto è troppo lungo"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_required.error",
+    "translation": "Manca una proprietà richiesta del canale diretto: membri"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_few.error",
+    "translation": "La lista dei membri del canale diretto contiene pochi elementi"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_many.error",
+    "translation": "La lista dei membri del canale diretto contiene troppi elementi"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
+    "translation": "Manca una proprietà richiesta nella pubblicazione diretta: membri del canale"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_few.error",
+    "translation": "La lista dei membri del canale della pubblicazione diretta contiene pochi elementi"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_many.error",
+    "translation": "La lista dei membri del canale della pubblicazione diretta contiene troppi elementi"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_missing.error",
+    "translation": "Manca una proprietà richiesta nella pubblicazione diretta: creato il"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_zero.error",
+    "translation": "CreateAt deve essere maggiore di 0"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_length.error",
+    "translation": "Il messaggio è troppo lungo"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_missing.error",
+    "translation": "Manca una proprietà richiesta nella pubblicazione diretta: messaggio"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.user_missing.error",
+    "translation": "Manca una proprietà richiesta nella pubblicazione diretta: utente"
+  },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
     "translation": "Proprietà della pubblicazione mancante: Canale."
@@ -3371,6 +3503,14 @@
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "Impossibile salvare le impostazioni dell'index ElasticSearch"
   },
+  {
+    "id": "ent.elasticsearch.test_config.indexing_disabled.error",
+    "translation": "Elasticsearch non è attivo."
+  },
+  {
+    "id": "ent.elasticsearch.test_config.license.error",
+    "translation": "La licenza non supporta l'uso di Elasticsearch."
+  },
   {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "Le limitazioni sugli emoji personalizzati non sono abilitate per la licenza attuale. Contattare l'amministratore di sistema chiedendo di aggiornare la licenza enterprise."
@@ -4171,6 +4311,10 @@
     "id": "model.config.is_valid.sql_query_timeout.app_error",
     "translation": "Timeout query SQL non valido.  Deve essere un numero positivo."
   },
+  {
+    "id": "model.config.is_valid.teammate_name_display.app_error",
+    "translation": "Invalid teammate display.  Must be 'full_name', 'nickname_full_name' or 'username'"
+  },
   {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "Il periodo di tempo tra gli aggiornamenti scrittura utente non dovrebbe essere settato a meno di 1000 millisecondi."
@@ -5723,6 +5867,10 @@
     "id": "store.sql_user.get_for_login.multiple_users",
     "translation": "Sono stati trovati diversi utenti con le credenziali fornite ed è stato impossibile effettuare l'accesso. Per favore contatta un amministratore."
   },
+  {
+    "id": "store.sql_user.get_new_users.app_error",
+    "translation": "Errore riscontrato durante la ricerca delle preferenze"
+  },
   {
     "id": "store.sql_user.get_profiles.app_error",
     "translation": "Errore riscontrato durante la ricerca dei profili utente"
diff --git a/i18n/ja.json b/i18n/ja.json
index 6283ec61cb..d5584ee3a5 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -429,7 +429,7 @@
   },
   {
     "id": "api.command.execute_command.not_found.app_error",
-    "translation": "トリガー'{{.Trigger}}'によるコマンドは見付かりませんでした"
+    "translation": "'{{.Trigger}}'がトリガーのコマンドが見つかりませんでした。\"/\"で始まるメッセージを送信するには、メッセージの最初にスペースを加えてみてください。"
   },
   {
     "id": "api.command.execute_command.save.app_error",
@@ -459,6 +459,10 @@
     "id": "api.command.invite_people.hint",
     "translation": "[name@domain.com ...]"
   },
+  {
+    "id": "api.command.invite_people.invite_off",
+    "translation": "このサーバーではユーザー作成が無効化されており、招待は送信されません。"
+  },
   {
     "id": "api.command.invite_people.name",
     "translation": "招待した人々"
@@ -495,6 +499,38 @@
     "id": "api.command_away.success",
     "translation": "あなたは離席中です"
   },
+  {
+    "id": "api.command_channel_header.channel.app_error",
+    "translation": "現在のチャンネルを取得する際にエラーが発生しました。"
+  },
+  {
+    "id": "api.command_channel_header.desc",
+    "translation": "チャンネルヘッダーを編集する"
+  },
+  {
+    "id": "api.command_channel_header.hint",
+    "translation": "[テキスト]"
+  },
+  {
+    "id": "api.command_channel_header.message.app_error",
+    "translation": "/headerコマンドはテキストを指定しなくてはいけません。"
+  },
+  {
+    "id": "api.command_channel_header.name",
+    "translation": "ヘッダー"
+  },
+  {
+    "id": "api.command_channel_header.permission.app_error",
+    "translation": "あなたにはチャンネルヘッダーを編集するのに必要な権限が付与されていません。"
+  },
+  {
+    "id": "api.command_channel_header.update_channel.app_error",
+    "translation": "現在のチャンネルを更新する際にエラーが発生しました。"
+  },
+  {
+    "id": "api.command_channel_header.update_channel.success",
+    "translation": "チャンネルヘッダーは正常に更新されました。"
+  },
   {
     "id": "api.command_collapse.desc",
     "translation": "画像プレビューの自動折りたたみをオンにします"
@@ -551,6 +587,14 @@
     "id": "api.command_expand_collapse.fail.app_error",
     "translation": "プレビューの展開中にエラーが発生しました"
   },
+  {
+    "id": "api.command_help.desc",
+    "translation": "Mattermostヘルプページを開く"
+  },
+  {
+    "id": "api.command_help.name",
+    "translation": "ヘルプ"
+  },
   {
     "id": "api.command_join.desc",
     "translation": "公開されているチャンネルに参加する"
@@ -661,7 +705,7 @@
   },
   {
     "id": "api.command_open.name",
-    "translation": "open"
+    "translation": "開く"
   },
   {
     "id": "api.command_settings.desc",
@@ -1647,6 +1691,10 @@
     "id": "api.post.send_notifications_and_forget.push_image_only",
     "translation": " 一つ以上のファイルをアップロードしました "
   },
+  {
+    "id": "api.post.send_notifications_and_forget.push_image_only_dm",
+    "translation": " 一つ以上のファイルをダイレクトメッセージにアップロードしました"
+  },
   {
     "id": "api.post.send_notifications_and_forget.push_in",
     "translation": " in "
@@ -2003,14 +2051,6 @@
     "id": "api.system.go_routines",
     "translation": "動作中のgoroutineの数が正常動作の上限を超えています %v / %v"
   },
-  {
-    "id": "api.team.add_user_to_team.invalid_data.app_error",
-    "translation": "不正なデータです。"
-  },
-  {
-    "id": "api.team.add_user_to_team.invalid_invite_id.app_error",
-    "translation": "不正な招待IDです。この招待IDに一致するチームはありません。"
-  },
   {
     "id": "api.team.add_user_to_team.missing_parameter.app_error",
     "translation": "チームにユーザーを追加するにはパラメーターが必要です。"
@@ -2083,6 +2123,10 @@
     "id": "api.team.invite_members.already.app_error",
     "translation": "この人は既にあなたのチームのメンバーです"
   },
+  {
+    "id": "api.team.invite_members.invalid_email.app_error",
+    "translation": "以下の電子メールアドレスのドメインは許可されていません: {{.Addresses}}。詳細についてはシステム管理者に問い合わせてください。"
+  },
   {
     "id": "api.team.invite_members.member",
     "translation": "メンバー"
@@ -2975,10 +3019,50 @@
     "id": "app.import.import_channel.team_not_found.error",
     "translation": "チャンネルのインポート中にエラーが発生しました。 名前 \"{{.TeamName}}\" のチームが見つかりません。"
   },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "ダイレクトチャンネルを取得できませんでした"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "ダイレクトチャンネルを取得できませんでした"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "グループチャンネルを取得できませんでした"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "グループチャンネルを取得できませんでした"
+  },
+  {
+    "id": "app.import.import_direct_channel.member_not_found.error",
+    "translation": "ダイレクトチャンネルをインポートする際にチャンネルメンバーが見つかりませんでした"
+  },
+  {
+    "id": "app.import.import_direct_channel.update_header_failed.error",
+    "translation": "ダイレクトチャンネルのヘッダーを更新できませんでした"
+  },
+  {
+    "id": "app.import.import_direct_post.channel_member_not_found.error",
+    "translation": "ダイレクトチャンネルの投稿をインポートする際にチャンネルメンバーが見つかりませんでした"
+  },
+  {
+    "id": "app.import.import_direct_post.user_not_found.error",
+    "translation": "投稿ユーザーが存在しません"
+  },
   {
     "id": "app.import.import_line.null_channel.error",
     "translation": "インポートデータに \"channel\" という型がありましたが、そのチャンネルのオブジェクトがnullでした。"
   },
+  {
+    "id": "app.import.import_line.null_direct_channel.error",
+    "translation": "インポートデータに \"direct_channel\" という型がありましたが、そのダイレクトチャンネルのオブジェクトがnullでした。"
+  },
+  {
+    "id": "app.import.import_line.null_direct_post.error",
+    "translation": "インポートデータに \"direct_post\" という型がありましたが、そのダイレクト投稿のオブジェクトがnullでした。"
+  },
   {
     "id": "app.import.import_line.null_post.error",
     "translation": "インポートデータに \"post\" という型がありましたが、その投稿のオブジェクトがnullでした。"
@@ -3051,6 +3135,54 @@
     "id": "app.import.validate_channel_import_data.type_missing.error",
     "translation": "必須のチャンネル設定値 type が存在しません。"
   },
+  {
+    "id": "app.import.validate_direct_channel_import_data.header_length.error",
+    "translation": "ダイレクトチャンネルのヘッダーが長すぎます"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_required.error",
+    "translation": "必須のダイレクトチャンネル設定値 members が存在しません。"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_few.error",
+    "translation": "ダイレクトチャンネルのメンバーリストに含まれる項目が少なすぎます"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_many.error",
+    "translation": "ダイレクトチャンネルのメンバーリストに含まれる項目が多すぎます"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
+    "translation": "必須の投稿設定値 channel_members が存在しません。"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_few.error",
+    "translation": "ダイレクト投稿チャンネルのメンバーリストに含まれる項目が少なすぎます"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_many.error",
+    "translation": "ダイレクト投稿チャンネルのメンバーリストに含まれる項目が多すぎます"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_missing.error",
+    "translation": "必須のダイレクト投稿設定値 create_at が存在しません。"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_zero.error",
+    "translation": "CreateAtは0より大きい数値にしてください"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_length.error",
+    "translation": "メッセージが長すぎます"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_missing.error",
+    "translation": "必須のダイレクト投稿設定値 message が存在しません。"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.user_missing.error",
+    "translation": "必須のダイレクト投稿設定値 user が存在しません。"
+  },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
     "translation": "必須の投稿設定値 Channel が存在しません。"
@@ -3165,7 +3297,7 @@
   },
   {
     "id": "app.import.validate_user_import_data.last_name_length.error",
-    "translation": "ユーザーの姓（ラストネーム）が長すぎます。"
+    "translation": "ユーザーの苗字（ラストネーム）が長すぎます。"
   },
   {
     "id": "app.import.validate_user_import_data.nickname_length.error",
@@ -3371,6 +3503,14 @@
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "ElasticSearchインデックス設定を設定できませんでした"
   },
+  {
+    "id": "ent.elasticsearch.test_config.indexing_disabled.error",
+    "translation": "Elasticsearchは無効です。"
+  },
+  {
+    "id": "ent.elasticsearch.test_config.license.error",
+    "translation": "ライセンスはElasticsearchをサポートしていません。"
+  },
   {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "カスタム絵文字の制限機能が現在のライセンスでは無効になっています。システム管理者にエンタープライズライセンスをアップグレードするように連絡してください。"
@@ -4171,6 +4311,10 @@
     "id": "model.config.is_valid.sql_query_timeout.app_error",
     "translation": "SQL設定の問い合わせタイムアウトが不正です。  ゼロ以上の数を指定してください。"
   },
+  {
+    "id": "model.config.is_valid.teammate_name_display.app_error",
+    "translation": "無効なチームメイト表示です。  'フルネーム'、'ニックネーム_フルネーム'、'ユーザー名'のいずれかにしてください。"
+  },
   {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "ユーザー入力の更新間隔は1000ミリ秒未満に設定しないでください。"
@@ -4553,7 +4697,7 @@
   },
   {
     "id": "model.user.is_valid.last_name.app_error",
-    "translation": "不正な名前です"
+    "translation": "不正な苗字です"
   },
   {
     "id": "model.user.is_valid.nickname.app_error",
@@ -5723,6 +5867,10 @@
     "id": "store.sql_user.get_for_login.multiple_users",
     "translation": "あなたの認証情報に合致する複数のユーザーが見付かり、ログインできません。システム管理者に連絡してください。"
   },
+  {
+    "id": "store.sql_user.get_new_users.app_error",
+    "translation": "新しいユーザーを探す際にエラーが発生しました"
+  },
   {
     "id": "store.sql_user.get_profiles.app_error",
     "translation": "ユーザーのプロフィールを探す際にエラーが発生しました"
diff --git a/i18n/ko.json b/i18n/ko.json
index 810f4ac655..c550f632c4 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -429,7 +429,7 @@
   },
   {
     "id": "api.command.execute_command.not_found.app_error",
-    "translation": "트리거 '{{.Trigger}}'에 의한 명령어를 찾을 수 없습니다"
+    "translation": "Command with a trigger of '{{.Trigger}}' not found. To send a message beginning with \"/\", try adding an empty space at the beginning of the message."
   },
   {
     "id": "api.command.execute_command.save.app_error",
@@ -459,6 +459,10 @@
     "id": "api.command.invite_people.hint",
     "translation": "[name@domain.com ...]"
   },
+  {
+    "id": "api.command.invite_people.invite_off",
+    "translation": "User creation has been disabled on this server, no invite(s) sent"
+  },
   {
     "id": "api.command.invite_people.name",
     "translation": "초대하기"
@@ -495,6 +499,38 @@
     "id": "api.command_away.success",
     "translation": "이제 자리비움 상태입니다."
   },
+  {
+    "id": "api.command_channel_header.channel.app_error",
+    "translation": "Error to retrieve the current channel."
+  },
+  {
+    "id": "api.command_channel_header.desc",
+    "translation": "Edit the channel header"
+  },
+  {
+    "id": "api.command_channel_header.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_channel_header.message.app_error",
+    "translation": "Text must be provided with the /header command."
+  },
+  {
+    "id": "api.command_channel_header.name",
+    "translation": "header"
+  },
+  {
+    "id": "api.command_channel_header.permission.app_error",
+    "translation": "You do not have the appropriate permissions to edit the channel header."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.app_error",
+    "translation": "Error to update the current channel."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.success",
+    "translation": "Channel header successfully updated."
+  },
   {
     "id": "api.command_collapse.desc",
     "translation": "이미지 미리보기를 자동으로 접습니다"
@@ -551,6 +587,14 @@
     "id": "api.command_expand_collapse.fail.app_error",
     "translation": "미리보기를 펼치는 중 오류가 발생하였습니다."
   },
+  {
+    "id": "api.command_help.desc",
+    "translation": "Open the Mattermost help page"
+  },
+  {
+    "id": "api.command_help.name",
+    "translation": "help"
+  },
   {
     "id": "api.command_join.desc",
     "translation": "열린 채널에 참가"
@@ -1645,7 +1689,11 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " Uploaded one or more files "
+    "translation": " Uploaded one or more files in "
+  },
+  {
+    "id": "api.post.send_notifications_and_forget.push_image_only_dm",
+    "translation": " Uploaded one or more files in a direct message"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_in",
@@ -2003,14 +2051,6 @@
     "id": "api.system.go_routines",
     "translation": "The number of running goroutines is over the health threshold %v of %v"
   },
-  {
-    "id": "api.team.add_user_to_team.invalid_data.app_error",
-    "translation": "Invalid data."
-  },
-  {
-    "id": "api.team.add_user_to_team.invalid_invite_id.app_error",
-    "translation": "Invalid invite id. No team matches with this invite id."
-  },
   {
     "id": "api.team.add_user_to_team.missing_parameter.app_error",
     "translation": "Parameter required to add user to team."
@@ -2083,6 +2123,10 @@
     "id": "api.team.invite_members.already.app_error",
     "translation": "이미 팀에 가입되어 있는 사용자입니다."
   },
+  {
+    "id": "api.team.invite_members.invalid_email.app_error",
+    "translation": "The following email addresses do not belong to an accepted domain: {{.Addresses}}. Please contact your System Administrator for details."
+  },
   {
     "id": "api.team.invite_members.member",
     "translation": "멤버"
@@ -2975,10 +3019,50 @@
     "id": "app.import.import_channel.team_not_found.error",
     "translation": "Error importing channel. Team with name \"{{.TeamName}}\" could not be found."
   },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "Failed to get direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "Failed to get direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "Failed to get group channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "Failed to get group channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.member_not_found.error",
+    "translation": "Could not find channel member when importing direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.update_header_failed.error",
+    "translation": "Failed to update direct channel header"
+  },
+  {
+    "id": "app.import.import_direct_post.channel_member_not_found.error",
+    "translation": "Could not find channel member when importing direct channel post"
+  },
+  {
+    "id": "app.import.import_direct_post.user_not_found.error",
+    "translation": "Post user does not exist"
+  },
   {
     "id": "app.import.import_line.null_channel.error",
     "translation": "Import data line has type \"channel\" but the channel object is null."
   },
+  {
+    "id": "app.import.import_line.null_direct_channel.error",
+    "translation": "Import data line has type \"direct_channel\" but the direct_channel object is null."
+  },
+  {
+    "id": "app.import.import_line.null_direct_post.error",
+    "translation": "Import data line has type \"direct_post\" but the direct_post object is null."
+  },
   {
     "id": "app.import.import_line.null_post.error",
     "translation": "Import data line has type \"post\" but the post object is null."
@@ -3051,6 +3135,54 @@
     "id": "app.import.validate_channel_import_data.type_missing.error",
     "translation": "Missing required channel property: type."
   },
+  {
+    "id": "app.import.validate_direct_channel_import_data.header_length.error",
+    "translation": "Direct channel header is too long"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_required.error",
+    "translation": "Missing required direct channel property: members"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_few.error",
+    "translation": "Direct channel members list contains too few items"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_many.error",
+    "translation": "Direct channel members list contains too many items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
+    "translation": "Missing required direct post property: channel_members"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_few.error",
+    "translation": "Direct post channel members list contains too few items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_many.error",
+    "translation": "Direct post channel members list contains too many items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_missing.error",
+    "translation": "Missing required direct post property: create_at"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_zero.error",
+    "translation": "CreateAt must be greater than 0"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_length.error",
+    "translation": "Message is too long"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_missing.error",
+    "translation": "Missing required direct post property: message"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.user_missing.error",
+    "translation": "Missing required direct post property: user"
+  },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
     "translation": "Missing required Post property: Channel."
@@ -3371,6 +3503,14 @@
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "Failed to set ElasticSearch index settings"
   },
+  {
+    "id": "ent.elasticsearch.test_config.indexing_disabled.error",
+    "translation": "Elasticsearch is disabled."
+  },
+  {
+    "id": "ent.elasticsearch.test_config.license.error",
+    "translation": "License does not support Elasticsearch."
+  },
   {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "사용자 정의 이모티콘 제한을 활성화 하려면 엔터프라이즈 라이센스가 필요합니다. 시스템 관리자에게 업그레이드를 문의해보세요."
@@ -4171,6 +4311,10 @@
     "id": "model.config.is_valid.sql_query_timeout.app_error",
     "translation": "파일 세팅에 대해 잘못된 프로파일 높이 값입니다. 0보다 큰 값이여야 합니다."
   },
+  {
+    "id": "model.config.is_valid.teammate_name_display.app_error",
+    "translation": "Invalid teammate display.  Must be 'full_name', 'nickname_full_name' or 'username'"
+  },
   {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "Time between user typing updates should not be set to less than 1000 milliseconds."
@@ -5723,13 +5867,17 @@
     "id": "store.sql_user.get_for_login.multiple_users",
     "translation": "We found multiple users matching your credentials and were unable to log you in. Please contact an administrator."
   },
+  {
+    "id": "store.sql_user.get_new_users.app_error",
+    "translation": "We encountered an error while finding preferences"
+  },
   {
     "id": "store.sql_user.get_profiles.app_error",
     "translation": "We encountered an error while finding user profiles"
   },
   {
     "id": "store.sql_user.get_recently_active_users.app_error",
-    "translation": "We encountered an error while finding the recently active users"
+    "translation": "We encountered an error while finding preferences"
   },
   {
     "id": "store.sql_user.get_sysadmin_profiles.app_error",
diff --git a/i18n/nl.json b/i18n/nl.json
index cc5b0c660a..3d47011ba7 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -429,7 +429,7 @@
   },
   {
     "id": "api.command.execute_command.not_found.app_error",
-    "translation": "Opdracht met activeer-woord '{{.Trigger}}' is niet gevonden"
+    "translation": "Command with a trigger of '{{.Trigger}}' not found. To send a message beginning with \"/\", try adding an empty space at the beginning of the message."
   },
   {
     "id": "api.command.execute_command.save.app_error",
@@ -459,6 +459,10 @@
     "id": "api.command.invite_people.hint",
     "translation": "[naam@domein.com ...]"
   },
+  {
+    "id": "api.command.invite_people.invite_off",
+    "translation": "User creation has been disabled on this server, no invite(s) sent"
+  },
   {
     "id": "api.command.invite_people.name",
     "translation": "invite_people"
@@ -495,6 +499,38 @@
     "id": "api.command_away.success",
     "translation": "Je bent nu afwezig"
   },
+  {
+    "id": "api.command_channel_header.channel.app_error",
+    "translation": "Error to retrieve the current channel."
+  },
+  {
+    "id": "api.command_channel_header.desc",
+    "translation": "Edit the channel header"
+  },
+  {
+    "id": "api.command_channel_header.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_channel_header.message.app_error",
+    "translation": "Text must be provided with the /header command."
+  },
+  {
+    "id": "api.command_channel_header.name",
+    "translation": "header"
+  },
+  {
+    "id": "api.command_channel_header.permission.app_error",
+    "translation": "You do not have the appropriate permissions to edit the channel header."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.app_error",
+    "translation": "Error to update the current channel."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.success",
+    "translation": "Channel header successfully updated."
+  },
   {
     "id": "api.command_collapse.desc",
     "translation": "Automatisch inklappen van afbeelding voorbeeldweergave aanzetten"
@@ -551,6 +587,14 @@
     "id": "api.command_expand_collapse.fail.app_error",
     "translation": "Er is een fout opgetreden tijdens het vergroten van de voorbeelden"
   },
+  {
+    "id": "api.command_help.desc",
+    "translation": "Open the Mattermost help page"
+  },
+  {
+    "id": "api.command_help.name",
+    "translation": "help"
+  },
   {
     "id": "api.command_join.desc",
     "translation": "Neem deel aan het open kanaal"
@@ -1645,7 +1689,11 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " Uploaded one or more files "
+    "translation": " Uploaded one or more files in "
+  },
+  {
+    "id": "api.post.send_notifications_and_forget.push_image_only_dm",
+    "translation": " Uploaded one or more files in a direct message"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_in",
@@ -2003,14 +2051,6 @@
     "id": "api.system.go_routines",
     "translation": "The number of running goroutines is over the health threshold %v of %v"
   },
-  {
-    "id": "api.team.add_user_to_team.invalid_data.app_error",
-    "translation": "Invalid data."
-  },
-  {
-    "id": "api.team.add_user_to_team.invalid_invite_id.app_error",
-    "translation": "Invalid invite id. No team matches with this invite id."
-  },
   {
     "id": "api.team.add_user_to_team.missing_parameter.app_error",
     "translation": "Parameter required to add user to team."
@@ -2083,6 +2123,10 @@
     "id": "api.team.invite_members.already.app_error",
     "translation": "Deze persoon zit al in het team"
   },
+  {
+    "id": "api.team.invite_members.invalid_email.app_error",
+    "translation": "The following email addresses do not belong to an accepted domain: {{.Addresses}}. Please contact your System Administrator for details."
+  },
   {
     "id": "api.team.invite_members.member",
     "translation": "lid"
@@ -2975,10 +3019,50 @@
     "id": "app.import.import_channel.team_not_found.error",
     "translation": "Error importing channel. Team with name \"{{.TeamName}}\" could not be found."
   },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "Failed to get direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "Failed to get direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "Failed to get group channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "Failed to get group channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.member_not_found.error",
+    "translation": "Could not find channel member when importing direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.update_header_failed.error",
+    "translation": "Failed to update direct channel header"
+  },
+  {
+    "id": "app.import.import_direct_post.channel_member_not_found.error",
+    "translation": "Could not find channel member when importing direct channel post"
+  },
+  {
+    "id": "app.import.import_direct_post.user_not_found.error",
+    "translation": "Post user does not exist"
+  },
   {
     "id": "app.import.import_line.null_channel.error",
     "translation": "Import data line has type \"channel\" but the channel object is null."
   },
+  {
+    "id": "app.import.import_line.null_direct_channel.error",
+    "translation": "Import data line has type \"direct_channel\" but the direct_channel object is null."
+  },
+  {
+    "id": "app.import.import_line.null_direct_post.error",
+    "translation": "Import data line has type \"direct_post\" but the direct_post object is null."
+  },
   {
     "id": "app.import.import_line.null_post.error",
     "translation": "Import data line has type \"post\" but the post object is null."
@@ -3051,6 +3135,54 @@
     "id": "app.import.validate_channel_import_data.type_missing.error",
     "translation": "Missing required channel property: type."
   },
+  {
+    "id": "app.import.validate_direct_channel_import_data.header_length.error",
+    "translation": "Direct channel header is too long"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_required.error",
+    "translation": "Missing required direct channel property: members"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_few.error",
+    "translation": "Direct channel members list contains too few items"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_many.error",
+    "translation": "Direct channel members list contains too many items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
+    "translation": "Missing required direct post property: channel_members"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_few.error",
+    "translation": "Direct post channel members list contains too few items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_many.error",
+    "translation": "Direct post channel members list contains too many items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_missing.error",
+    "translation": "Missing required direct post property: create_at"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_zero.error",
+    "translation": "CreateAt must be greater than 0"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_length.error",
+    "translation": "Message is too long"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_missing.error",
+    "translation": "Missing required direct post property: message"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.user_missing.error",
+    "translation": "Missing required direct post property: user"
+  },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
     "translation": "Missing required Post property: Channel."
@@ -3371,6 +3503,14 @@
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "Failed to set ElasticSearch index settings"
   },
+  {
+    "id": "ent.elasticsearch.test_config.indexing_disabled.error",
+    "translation": "Elasticsearch is disabled."
+  },
+  {
+    "id": "ent.elasticsearch.test_config.license.error",
+    "translation": "License does not support Elasticsearch."
+  },
   {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "Aangepaste emoji restricties is uitgeschakeld vanwege de huidige licentie. Neem contact op met de beheerder voor een upgrade van de licentie."
@@ -4171,6 +4311,10 @@
     "id": "model.config.is_valid.sql_query_timeout.app_error",
     "translation": "Ongeldige profiel hoogte bij bestands instellingen. Moet groter dan 0 zijn."
   },
+  {
+    "id": "model.config.is_valid.teammate_name_display.app_error",
+    "translation": "Invalid teammate display.  Must be 'full_name', 'nickname_full_name' or 'username'"
+  },
   {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "Time between user typing updates should not be set to less than 1000 milliseconds."
@@ -5723,13 +5867,17 @@
     "id": "store.sql_user.get_for_login.multiple_users",
     "translation": "We vonden meerdere gebruikers die overeenkomen met uw referenties en waren niet in staat om u te laten inloggen. Neem contact op met een systeembeheerder."
   },
+  {
+    "id": "store.sql_user.get_new_users.app_error",
+    "translation": "Er is een probleem opgestreden tijdens het opzoeken van voorkeuren"
+  },
   {
     "id": "store.sql_user.get_profiles.app_error",
     "translation": "Er is een probleem opgestreden tijdens het opzoeken van het gebruikersprofiel"
   },
   {
     "id": "store.sql_user.get_recently_active_users.app_error",
-    "translation": "We encountered an error while finding the recently active users"
+    "translation": "Er is een probleem opgestreden tijdens het opzoeken van voorkeuren"
   },
   {
     "id": "store.sql_user.get_sysadmin_profiles.app_error",
diff --git a/i18n/pl.json b/i18n/pl.json
index 6f7c6c96db..dadd736b34 100644
--- a/i18n/pl.json
+++ b/i18n/pl.json
@@ -77,11 +77,11 @@
   },
   {
     "id": "api.admin.recycle_db_end.warn",
-    "translation": "Ukończono wznawianie połączenia do bazy danych"
+    "translation": "Ukończono wznawianie połączenia do bazy danych."
   },
   {
     "id": "api.admin.recycle_db_start.warn",
-    "translation": "Próba wznowienia połączenia do bazy danych"
+    "translation": "Próba wznowienia połączenia do bazy danych."
   },
   {
     "id": "api.admin.remove_certificate.delete.app_error",
@@ -89,7 +89,7 @@
   },
   {
     "id": "api.admin.saml.metadata.app_error",
-    "translation": "Podczas budowania metadanych dostawcy usługi (Service Provider Metadata) wystąpił błąd."
+    "translation": "Wystąpił błąd podczas budowania metadanych dostawcy usługi (Service Provider Metadata)."
   },
   {
     "id": "api.admin.test_email.body",
@@ -429,7 +429,7 @@
   },
   {
     "id": "api.command.execute_command.not_found.app_error",
-    "translation": "Polecenie z wyzwalaczem '{{.Trigger}}' nie odnalezione"
+    "translation": "Command with a trigger of '{{.Trigger}}' not found. To send a message beginning with \"/\", try adding an empty space at the beginning of the message."
   },
   {
     "id": "api.command.execute_command.save.app_error",
@@ -459,6 +459,10 @@
     "id": "api.command.invite_people.hint",
     "translation": "[nazwa@domena.com ...]"
   },
+  {
+    "id": "api.command.invite_people.invite_off",
+    "translation": "User creation has been disabled on this server, no invite(s) sent"
+  },
   {
     "id": "api.command.invite_people.name",
     "translation": "invite_people"
@@ -495,6 +499,38 @@
     "id": "api.command_away.success",
     "translation": "Jesteś teraz nieobecny"
   },
+  {
+    "id": "api.command_channel_header.channel.app_error",
+    "translation": "Error to retrieve the current channel."
+  },
+  {
+    "id": "api.command_channel_header.desc",
+    "translation": "Edit the channel header"
+  },
+  {
+    "id": "api.command_channel_header.hint",
+    "translation": "[tekst]"
+  },
+  {
+    "id": "api.command_channel_header.message.app_error",
+    "translation": "Text must be provided with the /header command."
+  },
+  {
+    "id": "api.command_channel_header.name",
+    "translation": "nagłówek"
+  },
+  {
+    "id": "api.command_channel_header.permission.app_error",
+    "translation": "You do not have the appropriate permissions to edit the channel header."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.app_error",
+    "translation": "Error to update the current channel."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.success",
+    "translation": "Nagłówek kanału zaktualizowany poprawnie"
+  },
   {
     "id": "api.command_collapse.desc",
     "translation": "Włącz automatyczne zwijanie podglądu obrazków"
@@ -551,6 +587,14 @@
     "id": "api.command_expand_collapse.fail.app_error",
     "translation": "Wystąpił błąd podczas rozwijania podglądów"
   },
+  {
+    "id": "api.command_help.desc",
+    "translation": "Open the Mattermost help page"
+  },
+  {
+    "id": "api.command_help.name",
+    "translation": "help"
+  },
   {
     "id": "api.command_join.desc",
     "translation": "Dołącz do otwartego kanału"
@@ -661,19 +705,19 @@
   },
   {
     "id": "api.command_open.name",
-    "translation": "open"
+    "translation": "otwórz"
   },
   {
     "id": "api.command_settings.desc",
-    "translation": "Open the Account Settings dialog"
+    "translation": "Otwórz dialog ustawień konta"
   },
   {
     "id": "api.command_settings.name",
-    "translation": "settings"
+    "translation": "ustawienia"
   },
   {
     "id": "api.command_settings.unsupported.app_error",
-    "translation": "The settings command is not supported on your device"
+    "translation": "Komenda ustawień nie jest wspierana na Twoim urządzeniu"
   },
   {
     "id": "api.command_shortcuts.browser.channel_next",
@@ -1479,7 +1523,7 @@
   },
   {
     "id": "api.opengraph.init.debug",
-    "translation": "Initializing open graph protocol api routes"
+    "translation": "Inicjalizacja tras protokołów otwartego grafu API"
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
@@ -1645,7 +1689,11 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " Uploaded one or more files "
+    "translation": "Wysłał jeden albo więcej plików"
+  },
+  {
+    "id": "api.post.send_notifications_and_forget.push_image_only_dm",
+    "translation": " Uploaded one or more files in a direct message"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_in",
@@ -1653,11 +1701,11 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_mention",
-    "translation": "wspomniał o Tobie w"
+    "translation": " wspomniał o Tobie w "
   },
   {
     "id": "api.post.send_notifications_and_forget.push_message",
-    "translation": "wysłał Ci bezpośrednią wiadomość"
+    "translation": "  wysłał Ci bezpośrednią wiadomość"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_non_mention",
@@ -2001,15 +2049,7 @@
   },
   {
     "id": "api.system.go_routines",
-    "translation": "The number of running goroutines is over the health threshold %v of %v"
-  },
-  {
-    "id": "api.team.add_user_to_team.invalid_data.app_error",
-    "translation": "Nieprawidłowe dane."
-  },
-  {
-    "id": "api.team.add_user_to_team.invalid_invite_id.app_error",
-    "translation": "Nieprawidłowe id zaproszenia. Żaden zespół nie pasuje to tego id zaproszenia."
+    "translation": "Numer działających procesów go jest powyżej zdrowego poziomu %v z %v"
   },
   {
     "id": "api.team.add_user_to_team.missing_parameter.app_error",
@@ -2083,6 +2123,10 @@
     "id": "api.team.invite_members.already.app_error",
     "translation": "Ta osoba jest już w twoim zespole"
   },
+  {
+    "id": "api.team.invite_members.invalid_email.app_error",
+    "translation": "The following email addresses do not belong to an accepted domain: {{.Addresses}}. Please contact your System Administrator for details."
+  },
   {
     "id": "api.team.invite_members.member",
     "translation": "użytkownik"
@@ -2501,7 +2545,7 @@
   },
   {
     "id": "api.user.create_user.missing_hash_or_data.app_error",
-    "translation": "Missing Hash or URL query data."
+    "translation": "Brakujące zapytanie Hash albo URL."
   },
   {
     "id": "api.user.create_user.missing_invite_id.app_error",
@@ -2975,10 +3019,50 @@
     "id": "app.import.import_channel.team_not_found.error",
     "translation": "Błąd podczas importowania kanału. Zespół o nazwie \"{{.TeamName}}\" nie został odnaleziony."
   },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "Failed to get direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "Failed to get direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "Failed to get group channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "Failed to get group channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.member_not_found.error",
+    "translation": "Could not find channel member when importing direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.update_header_failed.error",
+    "translation": "Failed to update direct channel header"
+  },
+  {
+    "id": "app.import.import_direct_post.channel_member_not_found.error",
+    "translation": "Could not find channel member when importing direct channel post"
+  },
+  {
+    "id": "app.import.import_direct_post.user_not_found.error",
+    "translation": "Post user does not exist"
+  },
   {
     "id": "app.import.import_line.null_channel.error",
     "translation": "Dane wejściowe mają typ \"channel\", ale obiekt channel jest null."
   },
+  {
+    "id": "app.import.import_line.null_direct_channel.error",
+    "translation": "Dane wejściowe mają typ \"channel\", ale obiekt channel jest null."
+  },
+  {
+    "id": "app.import.import_line.null_direct_post.error",
+    "translation": "Dane wejściowe mają typ \"post\" ale obiekt post jest null."
+  },
   {
     "id": "app.import.import_line.null_post.error",
     "translation": "Dane wejściowe mają typ \"post\" ale obiekt post jest null."
@@ -3009,7 +3093,7 @@
   },
   {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
-    "translation": "Kanał create_at nie może być 0 jeśli podany."
+    "translation": "Kanał create_at nie może być zero jeśli podany."
   },
   {
     "id": "app.import.validate_channel_import_data.display_name_length.error",
@@ -3051,6 +3135,54 @@
     "id": "app.import.validate_channel_import_data.type_missing.error",
     "translation": "Brak wymaganej właściwości kanału: type."
   },
+  {
+    "id": "app.import.validate_direct_channel_import_data.header_length.error",
+    "translation": "Direct channel header is too long"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_required.error",
+    "translation": "Brak wymaganej właściwości kanału: name"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_few.error",
+    "translation": "Direct channel members list contains too few items"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_many.error",
+    "translation": "Direct channel members list contains too many items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
+    "translation": "Brak wymaganej właściwości Post: create_at."
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_few.error",
+    "translation": "Direct post channel members list contains too few items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_many.error",
+    "translation": "Direct post channel members list contains too many items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_missing.error",
+    "translation": "Brak wymaganej właściwości Post: create_at."
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_zero.error",
+    "translation": "CreateAt must be greater than 0"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_length.error",
+    "translation": "Message is too long"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_missing.error",
+    "translation": "Brak wymaganej właściwości Post: Message."
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.user_missing.error",
+    "translation": "Brak wymaganej właściwości Post: User."
+  },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
     "translation": "Brak wymaganej właściwości Post: Channel. "
@@ -3061,7 +3193,7 @@
   },
   {
     "id": "app.import.validate_post_import_data.create_at_zero.error",
-    "translation": "Post CreateAt property must not be zero if provided."
+    "translation": "Właściwość Post CreateAt nie może być zero jeśli podany."
   },
   {
     "id": "app.import.validate_post_import_data.message_length.error",
@@ -3085,7 +3217,7 @@
   },
   {
     "id": "app.import.validate_team_import_data.create_at_zero.error",
-    "translation": "Drużyna create_at nie może być 0 jeśli jest podana."
+    "translation": "Drużyna create_at nie może być zero jeśli jest podana."
   },
   {
     "id": "app.import.validate_team_import_data.description_length.error",
@@ -3097,7 +3229,7 @@
   },
   {
     "id": "app.import.validate_team_import_data.display_name_missing.error",
-    "translation": "Brak wymaganej właściwości drużyny: display_name"
+    "translation": "Brak wymaganej właściwości drużyny: display_name."
   },
   {
     "id": "app.import.validate_team_import_data.name_characters.error",
@@ -3121,7 +3253,7 @@
   },
   {
     "id": "app.import.validate_team_import_data.type_missing.error",
-    "translation": "Brak wymaganej właściwości drużyny: type"
+    "translation": "Brak wymaganej właściwości drużyny: type."
   },
   {
     "id": "app.import.validate_user_channels_import_data.channel_name_missing.error",
@@ -3371,6 +3503,14 @@
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "Failed to set ElasticSearch index settings"
   },
+  {
+    "id": "ent.elasticsearch.test_config.indexing_disabled.error",
+    "translation": "Elasticsearch is disabled."
+  },
+  {
+    "id": "ent.elasticsearch.test_config.license.error",
+    "translation": "License does not support Elasticsearch."
+  },
   {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "Ograniczenia emoji użytkownika niedostępne przy aktualnej licencji. Skontaktuj się z administratorem systemu odnośnie uzyskania licencji typu enterprise."
@@ -4171,6 +4311,10 @@
     "id": "model.config.is_valid.sql_query_timeout.app_error",
     "translation": "Nieprawidłowa wysokość profilu dla ustawień plików. Musi być liczbą większą od 0."
   },
+  {
+    "id": "model.config.is_valid.teammate_name_display.app_error",
+    "translation": "Invalid teammate display.  Must be 'full_name', 'nickname_full_name' or 'username'"
+  },
   {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "Czas pomiędzy aktualizacjami podczas wprowadzania tekstu przez użytkownika nie może być mniejszy niż 1000 milisekund."
@@ -5723,13 +5867,17 @@
     "id": "store.sql_user.get_for_login.multiple_users",
     "translation": "We found multiple users matching your credentials and were unable to log you in. Please contact an administrator."
   },
+  {
+    "id": "store.sql_user.get_new_users.app_error",
+    "translation": "Wystąpił błąd w trakcie pobierania ustawień"
+  },
   {
     "id": "store.sql_user.get_profiles.app_error",
     "translation": "Napotkaliśmy błąd podczas odczytu pliku"
   },
   {
     "id": "store.sql_user.get_recently_active_users.app_error",
-    "translation": "We encountered an error while finding the recently active users"
+    "translation": "Wystąpił błąd w trakcie pobierania ustawień"
   },
   {
     "id": "store.sql_user.get_sysadmin_profiles.app_error",
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index 463675d11f..ad52b377d0 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -429,7 +429,7 @@
   },
   {
     "id": "api.command.execute_command.not_found.app_error",
-    "translation": "Comando com um gatilho de '{{.Trigger}}' não encotrado"
+    "translation": "Comando com um gatilho '{{.Trigger}}' não encontrado. Para enviar uma mensagem começando com \"/\", tente adiciona um espaço no começo da mensagem."
   },
   {
     "id": "api.command.execute_command.save.app_error",
@@ -459,6 +459,10 @@
     "id": "api.command.invite_people.hint",
     "translation": "[nome@dominio.com ...]"
   },
+  {
+    "id": "api.command.invite_people.invite_off",
+    "translation": "Criação de usuários foi desativada neste servidor, nenhum convite enviado"
+  },
   {
     "id": "api.command.invite_people.name",
     "translation": "invite_people"
@@ -495,6 +499,38 @@
     "id": "api.command_away.success",
     "translation": "Você está agora ausente"
   },
+  {
+    "id": "api.command_channel_header.channel.app_error",
+    "translation": "Error ao obter o canal atual."
+  },
+  {
+    "id": "api.command_channel_header.desc",
+    "translation": "Editar o cabeçalho do canal"
+  },
+  {
+    "id": "api.command_channel_header.hint",
+    "translation": "[texto]"
+  },
+  {
+    "id": "api.command_channel_header.message.app_error",
+    "translation": "O texto deve ser fornecido com o comando /header."
+  },
+  {
+    "id": "api.command_channel_header.name",
+    "translation": "cabeçalho"
+  },
+  {
+    "id": "api.command_channel_header.permission.app_error",
+    "translation": "Você não tem a permissão apropriada para editar o cabeçalho do canal."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.app_error",
+    "translation": "Erro ao atualizar o canal atual."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.success",
+    "translation": "Cabeçalho do canal atualizado com sucesso."
+  },
   {
     "id": "api.command_collapse.desc",
     "translation": "Ativar auto-recolher preview de imagens"
@@ -551,6 +587,14 @@
     "id": "api.command_expand_collapse.fail.app_error",
     "translation": "Um erro ocorreu ao expandir as visualizações"
   },
+  {
+    "id": "api.command_help.desc",
+    "translation": "Abrir a página de ajuda do Mattermost"
+  },
+  {
+    "id": "api.command_help.name",
+    "translation": "ajuda"
+  },
   {
     "id": "api.command_join.desc",
     "translation": "Junte-se ao canal aberto"
@@ -661,7 +705,7 @@
   },
   {
     "id": "api.command_open.name",
-    "translation": "open"
+    "translation": "abrir"
   },
   {
     "id": "api.command_settings.desc",
@@ -1645,7 +1689,11 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " Enviados um ou mais arquivos "
+    "translation": " Enviados 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"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_in",
@@ -2003,14 +2051,6 @@
     "id": "api.system.go_routines",
     "translation": "O número de goroutines rodando é maior que o limite configurado %v de %v"
   },
-  {
-    "id": "api.team.add_user_to_team.invalid_data.app_error",
-    "translation": "Dado inválido."
-  },
-  {
-    "id": "api.team.add_user_to_team.invalid_invite_id.app_error",
-    "translation": "Id do convite inválido. Nenhum time possui este id."
-  },
   {
     "id": "api.team.add_user_to_team.missing_parameter.app_error",
     "translation": "Parâmetro requerido para adicionar o usuário ao time."
@@ -2083,6 +2123,10 @@
     "id": "api.team.invite_members.already.app_error",
     "translation": "Essa pessoa já está em sua equipe"
   },
+  {
+    "id": "api.team.invite_members.invalid_email.app_error",
+    "translation": "O seguinte endereço de email não pertence a um dominio aceito: {{.Addresses}}. Por favor contate o Administrador do Sistema para detalhes."
+  },
   {
     "id": "api.team.invite_members.member",
     "translation": "membro"
@@ -2975,10 +3019,50 @@
     "id": "app.import.import_channel.team_not_found.error",
     "translation": "Erro ao importar canal. A equipe com o nome \"{{.TeamName}}\" não foi encontrado."
   },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "Falha ao buscar o canal direto"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "Falha ao buscar o canal direto"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "Falha ao buscar o canal de grupo"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "Falha ao buscar o canal de grupo"
+  },
+  {
+    "id": "app.import.import_direct_channel.member_not_found.error",
+    "translation": "Não foi possível achar o membro do canal enquanto importava o canal direto"
+  },
+  {
+    "id": "app.import.import_direct_channel.update_header_failed.error",
+    "translation": "Falha ao atualizar o cabeçalho do canal direto"
+  },
+  {
+    "id": "app.import.import_direct_post.channel_member_not_found.error",
+    "translation": "Não foi possível achar o membro do canal enquanto importava os posts do canal direto"
+  },
+  {
+    "id": "app.import.import_direct_post.user_not_found.error",
+    "translation": "Usuário do post não existe"
+  },
   {
     "id": "app.import.import_line.null_channel.error",
     "translation": "A linha de dados de importação é do tipo \"channel\" mas o objeto channel é nulo."
   },
+  {
+    "id": "app.import.import_line.null_direct_channel.error",
+    "translation": "A linha de dados de importação é do tipo \"direct_channel\" mas o objeto channel é nulo."
+  },
+  {
+    "id": "app.import.import_line.null_direct_post.error",
+    "translation": "A linha de dados de importação é do tipo \"direct_post\" mas o objeto post é nulo."
+  },
   {
     "id": "app.import.import_line.null_post.error",
     "translation": "A linha de dados de importação é do tipo \"post\" mas o objeto post é nulo."
@@ -3051,6 +3135,54 @@
     "id": "app.import.validate_channel_import_data.type_missing.error",
     "translation": "Faltando a propriedade obrigatória do canal: type."
   },
+  {
+    "id": "app.import.validate_direct_channel_import_data.header_length.error",
+    "translation": "Cabeçalho do canal direto é muito longo"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_required.error",
+    "translation": "Faltando a propriedade obrigatória do canal: members"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_few.error",
+    "translation": "A lista de membros do canal direto tem muito poucos itens"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_many.error",
+    "translation": "A lista de membros do canal direto tem muitos itens"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
+    "translation": "Propriedade obrigatória do post direto não foi informada: channel_members"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_few.error",
+    "translation": "A lista de membros do canal direto tem muito poucos itens"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_many.error",
+    "translation": "A lista de membros do canal direto tem muitos itens"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_missing.error",
+    "translation": "Propriedade obrigatória do Post não foi informada: create_at"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_zero.error",
+    "translation": "CreateAt deve ser maior do que 0"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_length.error",
+    "translation": "Mensagem muito longa"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_missing.error",
+    "translation": "Propriedade obrigatória do Post não foi informada: message"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.user_missing.error",
+    "translation": "Propriedade obrigatória do Post não foi informada: user"
+  },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
     "translation": "Propriedade obrigatória do Post não foi informada: Channel."
@@ -3371,6 +3503,14 @@
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "Não foi possível configurar as opções do ElasticSearch index"
   },
+  {
+    "id": "ent.elasticsearch.test_config.indexing_disabled.error",
+    "translation": "Elasticsearch está desativado."
+  },
+  {
+    "id": "ent.elasticsearch.test_config.license.error",
+    "translation": "Licença não suporta Elasticsearch."
+  },
   {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "Emoji personalizado desabilitado pela licença atual. Entre em contato com o administrador do sistema sobre como atualizar sua licença enterprise."
@@ -4171,6 +4311,10 @@
     "id": "model.config.is_valid.sql_query_timeout.app_error",
     "translation": "Configuração do tempo de execução da consulta de SQL inválida.  Deve ser um número positivo."
   },
+  {
+    "id": "model.config.is_valid.teammate_name_display.app_error",
+    "translation": "Nome do colega inválido.  Deve ser 'full_name', 'nickname_full_name' ou 'username'"
+  },
   {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "O tempo de atualização de digitação do usuário não deve ser definido para menos de 1000 milissegundos."
@@ -5723,6 +5867,10 @@
     "id": "store.sql_user.get_for_login.multiple_users",
     "translation": "Encontramos vários usuários correspondentes as suas credenciais e não conseguimos fazer seu login. Por favor, entre em contato com um administrador."
   },
+  {
+    "id": "store.sql_user.get_new_users.app_error",
+    "translation": "Encontramos um erro ao encontrar os novos usuários"
+  },
   {
     "id": "store.sql_user.get_profiles.app_error",
     "translation": "Encontramos um erro enquanto procurava os perfis de usuários"
diff --git a/i18n/ru.json b/i18n/ru.json
index 2ae051d920..42bb6ae508 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -429,7 +429,7 @@
   },
   {
     "id": "api.command.execute_command.not_found.app_error",
-    "translation": "Команда с триггером '{{.Trigger}}' не найдена"
+    "translation": "Command with a trigger of '{{.Trigger}}' not found. To send a message beginning with \"/\", try adding an empty space at the beginning of the message."
   },
   {
     "id": "api.command.execute_command.save.app_error",
@@ -459,6 +459,10 @@
     "id": "api.command.invite_people.hint",
     "translation": "[name@domain.com ...]"
   },
+  {
+    "id": "api.command.invite_people.invite_off",
+    "translation": "User creation has been disabled on this server, no invite(s) sent"
+  },
   {
     "id": "api.command.invite_people.name",
     "translation": "пригласить людей"
@@ -495,6 +499,38 @@
     "id": "api.command_away.success",
     "translation": "Сейчас ваше состояние \"Нет на месте\""
   },
+  {
+    "id": "api.command_channel_header.channel.app_error",
+    "translation": "Error to retrieve the current channel."
+  },
+  {
+    "id": "api.command_channel_header.desc",
+    "translation": "Edit the channel header"
+  },
+  {
+    "id": "api.command_channel_header.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_channel_header.message.app_error",
+    "translation": "Text must be provided with the /header command."
+  },
+  {
+    "id": "api.command_channel_header.name",
+    "translation": "header"
+  },
+  {
+    "id": "api.command_channel_header.permission.app_error",
+    "translation": "You do not have the appropriate permissions to edit the channel header."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.app_error",
+    "translation": "Error to update the current channel."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.success",
+    "translation": "Channel header successfully updated."
+  },
   {
     "id": "api.command_collapse.desc",
     "translation": "Включить сворачивание миниатюр изображений"
@@ -551,6 +587,14 @@
     "id": "api.command_expand_collapse.fail.app_error",
     "translation": "Произошла ошибка при открытии превью"
   },
+  {
+    "id": "api.command_help.desc",
+    "translation": "Open the Mattermost help page"
+  },
+  {
+    "id": "api.command_help.name",
+    "translation": "Помощь"
+  },
   {
     "id": "api.command_join.desc",
     "translation": "Присоединиться к отрытому каналу"
@@ -1645,7 +1689,11 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " Uploaded one or more files "
+    "translation": " Uploaded one or more files in "
+  },
+  {
+    "id": "api.post.send_notifications_and_forget.push_image_only_dm",
+    "translation": " Uploaded one or more files in a direct message"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_in",
@@ -2003,14 +2051,6 @@
     "id": "api.system.go_routines",
     "translation": "The number of running goroutines is over the health threshold %v of %v"
   },
-  {
-    "id": "api.team.add_user_to_team.invalid_data.app_error",
-    "translation": "Неверные данные."
-  },
-  {
-    "id": "api.team.add_user_to_team.invalid_invite_id.app_error",
-    "translation": "Неверный идентификатор приглашения. Не найдено команд с таким идентификатором."
-  },
   {
     "id": "api.team.add_user_to_team.missing_parameter.app_error",
     "translation": "Для добавления пользователя в команду требуется указать параметр."
@@ -2083,6 +2123,10 @@
     "id": "api.team.invite_members.already.app_error",
     "translation": "Этот человек уже есть в вашей команде"
   },
+  {
+    "id": "api.team.invite_members.invalid_email.app_error",
+    "translation": "The following email addresses do not belong to an accepted domain: {{.Addresses}}. Please contact your System Administrator for details."
+  },
   {
     "id": "api.team.invite_members.member",
     "translation": "участник"
@@ -2975,10 +3019,50 @@
     "id": "app.import.import_channel.team_not_found.error",
     "translation": "Ошибка импорта канала. Команда с именем \"{{.TeamName}}\" не найдена."
   },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "Failed to get direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "Failed to get direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "Failed to get group channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "Failed to get group channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.member_not_found.error",
+    "translation": "Could not find channel member when importing direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.update_header_failed.error",
+    "translation": "Failed to update direct channel header"
+  },
+  {
+    "id": "app.import.import_direct_post.channel_member_not_found.error",
+    "translation": "Could not find channel member when importing direct channel post"
+  },
+  {
+    "id": "app.import.import_direct_post.user_not_found.error",
+    "translation": "Post user does not exist"
+  },
   {
     "id": "app.import.import_line.null_channel.error",
     "translation": "Строка импорта данных содержит тип \"channel\", но объект channel равен null."
   },
+  {
+    "id": "app.import.import_line.null_direct_channel.error",
+    "translation": "Строка импорта данных содержит тип \"channel\", но объект channel равен null."
+  },
+  {
+    "id": "app.import.import_line.null_direct_post.error",
+    "translation": "Строка импорта данных содержит тип \"post\", но объект post равен null."
+  },
   {
     "id": "app.import.import_line.null_post.error",
     "translation": "Строка импорта данных содержит тип \"post\", но объект post равен null."
@@ -3051,6 +3135,54 @@
     "id": "app.import.validate_channel_import_data.type_missing.error",
     "translation": "Пропущено обязательное свойство channel: type."
   },
+  {
+    "id": "app.import.validate_direct_channel_import_data.header_length.error",
+    "translation": "Direct channel header is too long"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_required.error",
+    "translation": "Пропущено обязательное свойство channel: name"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_few.error",
+    "translation": "Direct channel members list contains too few items"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_many.error",
+    "translation": "Direct channel members list contains too many items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
+    "translation": "Отсутствует необходимое поле для Post: create_at."
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_few.error",
+    "translation": "Direct post channel members list contains too few items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_many.error",
+    "translation": "Direct post channel members list contains too many items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_missing.error",
+    "translation": "Отсутствует необходимое поле для Post: create_at."
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_zero.error",
+    "translation": "CreateAt must be greater than 0"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_length.error",
+    "translation": "Message is too long"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_missing.error",
+    "translation": "Отсутствует необходимое поле для Post: Message."
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.user_missing.error",
+    "translation": "Отсутствует необходимое поле для Post: User."
+  },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
     "translation": "Отсутствует необходимое поле для Post: Channel."
@@ -3371,6 +3503,14 @@
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "Failed to set ElasticSearch index settings"
   },
+  {
+    "id": "ent.elasticsearch.test_config.indexing_disabled.error",
+    "translation": "Elasticsearch is disabled."
+  },
+  {
+    "id": "ent.elasticsearch.test_config.license.error",
+    "translation": "License does not support Elasticsearch."
+  },
   {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "Ограничения на дополнительные эмодзи недоступны при текущей лицензии. Пожалуйста, свяжитесь с системным администратором по поводу улучшения вашей корпоративной лицензии."
@@ -4171,6 +4311,10 @@
     "id": "model.config.is_valid.sql_query_timeout.app_error",
     "translation": "Неверная высота профиля в настройках файлов. Число должно быть положительным."
   },
+  {
+    "id": "model.config.is_valid.teammate_name_display.app_error",
+    "translation": "Invalid teammate display.  Must be 'full_name', 'nickname_full_name' or 'username'"
+  },
   {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "Обновления статуса набора текста пользователем не могут быть чаще, чем раз в 1000 миллисекунд."
@@ -5723,6 +5867,10 @@
     "id": "store.sql_user.get_for_login.multiple_users",
     "translation": "Обнаружен ряд пользователей с соответствующими учетными данными, вход невозможен. Пожалуйста, свяжитесь с администратором."
   },
+  {
+    "id": "store.sql_user.get_new_users.app_error",
+    "translation": "Возникла ошибка при поиске настроек"
+  },
   {
     "id": "store.sql_user.get_profiles.app_error",
     "translation": "Возникла ошибка при поиске пользовательских профилей"
diff --git a/i18n/tr.json b/i18n/tr.json
index 4597742bfd..cd6233f7e6 100644
--- a/i18n/tr.json
+++ b/i18n/tr.json
@@ -429,7 +429,7 @@
   },
   {
     "id": "api.command.execute_command.not_found.app_error",
-    "translation": "'{{.Trigger}}' tetikleyicisinin komutu bulunamadı"
+    "translation": "'{{.Trigger}}' tetikleyici komutu bulunamadı. \"/\" ile başlayan bir ileti göndermek için iletinin başına bir boşluk eklemeyi deneyin."
   },
   {
     "id": "api.command.execute_command.save.app_error",
@@ -459,6 +459,10 @@
     "id": "api.command.invite_people.hint",
     "translation": "[ad@etkialani.com ...]"
   },
+  {
+    "id": "api.command.invite_people.invite_off",
+    "translation": "Bu sunucu üzerine kullanıcı eklemek devre dışı bırakılmış olduğundan çağrı gönderilmedi"
+  },
   {
     "id": "api.command.invite_people.name",
     "translation": "kisileri_cagir"
@@ -495,6 +499,38 @@
     "id": "api.command_away.success",
     "translation": "Durumunuz: uzakta"
   },
+  {
+    "id": "api.command_channel_header.channel.app_error",
+    "translation": "Geçerli kanal alınırken sorun çıktı."
+  },
+  {
+    "id": "api.command_channel_header.desc",
+    "translation": "Kanal başlığını düzenle"
+  },
+  {
+    "id": "api.command_channel_header.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_channel_header.message.app_error",
+    "translation": "/header komutunun yanında metin de yazılmalıdır"
+  },
+  {
+    "id": "api.command_channel_header.name",
+    "translation": "başlık"
+  },
+  {
+    "id": "api.command_channel_header.permission.app_error",
+    "translation": "Kanal başlığını düzenleme izniniz yok."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.app_error",
+    "translation": "Geçerli kanal güncellenirken sorun çıktı."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.success",
+    "translation": "Kanal başlığı güncellendi."
+  },
   {
     "id": "api.command_collapse.desc",
     "translation": "Görsel önizlemeleri otomatik daraltılsın"
@@ -551,6 +587,14 @@
     "id": "api.command_expand_collapse.fail.app_error",
     "translation": "Önizlemeler genişletilirken bir sorun çıktı"
   },
+  {
+    "id": "api.command_help.desc",
+    "translation": "Mattermost yardım sayfasını aç"
+  },
+  {
+    "id": "api.command_help.name",
+    "translation": "yardım"
+  },
   {
     "id": "api.command_join.desc",
     "translation": "Açık kanala katılın"
@@ -661,7 +705,7 @@
   },
   {
     "id": "api.command_open.name",
-    "translation": "open"
+    "translation": "açık"
   },
   {
     "id": "api.command_settings.desc",
@@ -1271,7 +1315,7 @@
   },
   {
     "id": "api.import.import_user.join_team.error",
-    "translation": "Alınırken takıma katılınamadı. Hata: %v"
+    "translation": "İçe aktarılırken takıma katılınamadı. Hata: %v"
   },
   {
     "id": "api.import.import_user.joining_default.error",
@@ -1645,7 +1689,11 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": "Bir ya da bir kaç dosya yüklendi"
+    "translation": " Şunun içine bir ya da bir kaç dosya yüklendi "
+  },
+  {
+    "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"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_in",
@@ -1801,11 +1849,11 @@
   },
   {
     "id": "api.slackimport.slack_add_bot_user.email_pwd",
-    "translation": "Slack Bot/Bütünleştirme İleti Alma Kullanıcısı: E-posta, Parola: {{.Email}}, {{.Password}}\r\n"
+    "translation": "Slack Bot/Bütünleştirme İleti İçe Aktarma Kullanıcısı: E-posta, Parola: {{.Email}}, {{.Password}}\r\n"
   },
   {
     "id": "api.slackimport.slack_add_bot_user.unable_import",
-    "translation": "Slack Bot/Bütünleştirme İleti Alma Kullanıcısı alınamadı: {{.Username}}\r\n"
+    "translation": "Slack Bot/Bütünleştirme İleti İçe Aktarma Kullanıcısı alınamadı: {{.Username}}\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.added",
@@ -1817,11 +1865,11 @@
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed",
-    "translation": "Alınamadı: {{.DisplayName}}\r\n"
+    "translation": "İçe Aktarılamadı: {{.DisplayName}}\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed.warn",
-    "translation": "Slack Alıcı: Kanal alınamadı: %s"
+    "translation": "Slack Alıcı: Kanal içe aktarılamadı: %s"
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
@@ -1833,11 +1881,11 @@
   },
   {
     "id": "api.slackimport.slack_add_posts.bot.warn",
-    "translation": "Slack bot iletileri henüz alınmamış"
+    "translation": "Slack bot iletileri henüz içe aktarılmamış"
   },
   {
     "id": "api.slackimport.slack_add_posts.bot_user_no_exists.warn",
-    "translation": "Slack Alıcı: Bot alma kullanıcısı bulunamadığından bot iletileri alınamıyor."
+    "translation": "Slack İçe Aktarıcı: Bot içe aktarma kullanıcısı bulunamadığından bot iletileri içe aktarılamıyor."
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_comment.debug",
@@ -1849,7 +1897,7 @@
   },
   {
     "id": "api.slackimport.slack_add_posts.no_bot_id.warn",
-    "translation": "Slack Alıcı: BotId alanı eksik olduğundan bot iletisi alınamadı."
+    "translation": "Slack İçe Aktarıcı: BotId alanı eksik olduğundan bot iletisi içe aktarılamadı."
   },
   {
     "id": "api.slackimport.slack_add_posts.unsupported.warn",
@@ -1857,15 +1905,15 @@
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_found.warn",
-    "translation": "Slack verme için dosya yükleme iletisinde {{.FileId}} kodlu dosya bulunamadı"
+    "translation": "Slack dışa aktarması için dosya yükleme iletisinde {{.FileId}} kodlu dosya bulunamadı"
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_in_json.warn",
-    "translation": "Verilmiş verilerde bir \"file\" bölümü bulunmadığından yüklenen ileti için dosya alınamadı."
+    "translation": "Dışa aktarılmış verilerde bir \"file\" bölümü bulunmadığından yüklenen iletideki dosya içe aktarılamaz."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_open_failed.warn",
-    "translation": "Verilmiş veri arşivinden {{.FileId}} koduyla yüklenen dosya açılamadı. Hata: {{.Error}}"
+    "translation": "Dışa aktarılmış veri arşivinden {{.FileId}} koduyla yüklenen dosya açılamadı. Hata: {{.Error}}"
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_upload_failed.warn",
@@ -1897,15 +1945,15 @@
   },
   {
     "id": "api.slackimport.slack_add_users.missing_email_address",
-    "translation": "{{.Username}} kullanıcısının verilen Slack bilgileri içinde bir e-posta adresi yok. Yerine {{.Email}} kullanılıyor. Kullanıcıların sistemde oturum açtıktan sonra e-posta adreslerini güncellemeleri gerekir.\r\n"
+    "translation": "Dışa aktarılan Slack verileri içinde {{.Username}} kullanıcısının e-posta adresi yok. Yerine {{.Email}} kullanılıyor. Kullanıcının sistemde oturum açtıktan sonra e-posta adresini güncellemesi gerekir.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.missing_email_address.warn",
-    "translation": "{{.Username}} kullanıcısının verilen Slack bilgileri içinde bir e-posta adresi yok. Yerine {{.Email}} kullanılıyor. Kullanıcıların sistemde oturum açtıktan sonra e-posta adreslerini güncellemeleri gerekir."
+    "translation": "Dışa aktarılan Slack verileri içinde {{.Username}} kullanıcısının e-posta adresi yok. Yerine {{.Email}} kullanılıyor. Kullanıcının sistemde oturum açtıktan sonra e-posta adresini güncellemesi gerekir."
   },
   {
     "id": "api.slackimport.slack_add_users.unable_import",
-    "translation": "{{.Username}} kullanıcısı alınamadı\r\n"
+    "translation": "{{.Username}} kullanıcısı içe aktarılamadı\r\n"
   },
   {
     "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
@@ -1921,15 +1969,15 @@
   },
   {
     "id": "api.slackimport.slack_deactivate_bot_user.failed_to_deactivate",
-    "translation": "Slack Alıcı: bot alma kullanıcısı devre dışı bırakılamadı."
+    "translation": "Slack İçe Aktarıcı: Bot içe aktarma kullanıcısı devre dışı bırakılamadı."
   },
   {
     "id": "api.slackimport.slack_import.log",
-    "translation": "Mattermost Slack Alma Günlüğü\r\n"
+    "translation": "Mattermost Slack İçe Aktarma Günlüğü\r\n"
   },
   {
     "id": "api.slackimport.slack_import.note1",
-    "translation": "- Alıcı tarafından desteklenmediğinden bazı iletiler alınamayabilir.\r\n"
+    "translation": "- Alıcı tarafından desteklenmediğinden bazı iletiler içe aktarılmayabilir.\r\n"
   },
   {
     "id": "api.slackimport.slack_import.note2",
@@ -1949,7 +1997,7 @@
   },
   {
     "id": "api.slackimport.slack_import.team_fail",
-    "translation": "Takım alma bilgileri alınamadı.\r\n"
+    "translation": "Takım içe aktarma bilgileri alınamadı.\r\n"
   },
   {
     "id": "api.slackimport.slack_import.zip.app_error",
@@ -1957,27 +2005,27 @@
   },
   {
     "id": "api.slackimport.slack_parse_channels.error",
-    "translation": "Slack kanalları işlenirken sorun çıktı. Gene de alma işlemi tamamlanabilir."
+    "translation": "Slack kanalları işlenirken sorun çıktı. Gene de içe aktarma işlemi tamamlanabilir."
   },
   {
     "id": "api.slackimport.slack_parse_posts.error",
-    "translation": "Bazı slack iletileri işlenirken sorun çıktı. Gene de alma işlemi tamamlanabilir."
+    "translation": "Bazı slack iletileri işlenirken sorun çıktı. Gene de içe aktarma işlemi tamamlanabilir."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
-    "translation": "Slack Alıcı: {{.ChannelName}} kanalının görüntülenecek adı çok uzun. Alınırken budanacak."
+    "translation": "Slack İçe Aktarıcı: {{.ChannelName}} kanalının görüntülenecek adı çok uzun. İçe aktarılırken budanarak kısaltılacak."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
-    "translation": "Slack Alıcı: {{.ChannelName}} kanalının başlığı çok uzun. Alınırken budanacak."
+    "translation": "Slack İçe Aktarıcı: {{.ChannelName}} kanalının başlığı çok uzun. İçe aktarılırken budanarak kısaltılacak."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
-    "translation": "Slack Alıcı: {{.ChannelName}} kanalının adı çok uzun. Alınırken budanacak."
+    "translation": "Slack İçe Aktarıcı: {{.ChannelName}} kanalının adı çok uzun. İçe aktarılırken budanarak kısaltılacak."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
-    "translation": "Slack Alıcı: {{.ChannelName}} kanalının amacı çok uzun. Alınırken budanacak."
+    "translation": "Slack İçe Aktarıcı: {{.ChannelName}} kanalının amacı çok uzun. İçe aktarılırken budanarak kısaltılacak."
   },
   {
     "id": "api.status.init.debug",
@@ -2003,14 +2051,6 @@
     "id": "api.system.go_routines",
     "translation": "Çalışan yordamlar %v/%v sağlıklı eşiğin üzerinde "
   },
-  {
-    "id": "api.team.add_user_to_team.invalid_data.app_error",
-    "translation": "Veri geçersiz."
-  },
-  {
-    "id": "api.team.add_user_to_team.invalid_invite_id.app_error",
-    "translation": "Çağrı kodu geçersiz. Bu çağrı kodunu kullanan bir takım bulunamadı."
-  },
   {
     "id": "api.team.add_user_to_team.missing_parameter.app_error",
     "translation": "Takıma kullanıcı eklemek için parametre gerekli."
@@ -2045,7 +2085,7 @@
   },
   {
     "id": "api.team.import_team.admin.app_error",
-    "translation": "Yalnız bir takım yöneticisi veri alabilir."
+    "translation": "Yalnız bir takım yöneticisi verileri içe aktarabilir."
   },
   {
     "id": "api.team.import_team.array.app_error",
@@ -2083,6 +2123,10 @@
     "id": "api.team.invite_members.already.app_error",
     "translation": "Bu kişi zaten takımınızda bulunuyor"
   },
+  {
+    "id": "api.team.invite_members.invalid_email.app_error",
+    "translation": "Şu e-posta adresleri onaylanmış etki alanına ait değil: {{.Addresses}}. Ayrıntılar için sistem yöneticiniz ile görüşün."
+  },
   {
     "id": "api.team.invite_members.member",
     "translation": "üye"
@@ -2965,7 +3009,7 @@
   },
   {
     "id": "app.import.bulk_import.file_scan.error",
-    "translation": "Alınacak veri dosyası okunamadı."
+    "translation": "İçe aktarılacak veri dosyası okunamadı."
   },
   {
     "id": "app.import.bulk_import.json_decode.error",
@@ -2973,39 +3017,79 @@
   },
   {
     "id": "app.import.import_channel.team_not_found.error",
-    "translation": "Kanal alınırken sorun çıktı. \"{{.TeamName}}\" takımı bulunamadı."
+    "translation": "Kanal içe aktarılırken sorun çıktı. \"{{.TeamName}}\" takımı bulunamadı."
+  },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "Doğrudan kanal alınamadı"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "Doğrudan kanal alınamadı"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "Grup kanalı alınamadı"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "Grup kanalı alınamadı"
+  },
+  {
+    "id": "app.import.import_direct_channel.member_not_found.error",
+    "translation": "Doğrudan kanal içe aktarılırken kanal üyesi bulunamadı"
+  },
+  {
+    "id": "app.import.import_direct_channel.update_header_failed.error",
+    "translation": "Doğrudan kanal başlığı güncellenemedi"
+  },
+  {
+    "id": "app.import.import_direct_post.channel_member_not_found.error",
+    "translation": "Doğrudan kanal iletisi içe aktarılırken kanal üyesi bulunamadı"
+  },
+  {
+    "id": "app.import.import_direct_post.user_not_found.error",
+    "translation": "İleti kullanıcısı bulunamadı"
   },
   {
     "id": "app.import.import_line.null_channel.error",
-    "translation": "Alınan veri satırı \"channel\" türünde ancak kanal nesnesi null."
+    "translation": "İçe aktarılan veri satırı \"channel\" türünde ancak kanal nesnesi null."
+  },
+  {
+    "id": "app.import.import_line.null_direct_channel.error",
+    "translation": "İçe aktarılan veri satırı \"channel\" türünde ancak kanal nesnesi null."
+  },
+  {
+    "id": "app.import.import_line.null_direct_post.error",
+    "translation": "İçe aktarılan veri satırı \"post\" türünde ancak ileti nesnesi null."
   },
   {
     "id": "app.import.import_line.null_post.error",
-    "translation": "Alınan veri satırı \"post\" türünde ancak ileti nesnesi null."
+    "translation": "İçe aktarılan veri satırı \"post\" türünde ancak ileti nesnesi null."
   },
   {
     "id": "app.import.import_line.null_team.error",
-    "translation": "Alınan veri satırı \"team\" türünde ancak takım nesnesi null."
+    "translation": "İçe aktarılan veri satırı \"team\" türünde ancak takım nesnesi null."
   },
   {
     "id": "app.import.import_line.null_user.error",
-    "translation": "Alınan veri satırı \"user\" türünde ancak kullanıcı nesnesi null."
+    "translation": "İçe aktarılan veri satırı \"user\" türünde ancak kullanıcı nesnesi null."
   },
   {
     "id": "app.import.import_line.unknown_line_type.error",
-    "translation": "Alınan veri satırı türü \"{{.Type}}\" bilinmiyor."
+    "translation": "İçe aktarılan veri satırı türü \"{{.Type}}\" bilinmiyor."
   },
   {
     "id": "app.import.import_post.channel_not_found.error",
-    "translation": "İleti alınırken sorun çıktı. \"{{.ChannelName}}\" kanalı bulunamadı."
+    "translation": "İleti içe aktarılırken sorun çıktı. \"{{.ChannelName}}\" kanalı bulunamadı."
   },
   {
     "id": "app.import.import_post.team_not_found.error",
-    "translation": "İleti alınırken sorun çıktı. \"{{.TeamName}}\" takımı bulunamadı."
+    "translation": "İleti içe aktarılırken sorun çıktı. \"{{.TeamName}}\" takımı bulunamadı."
   },
   {
     "id": "app.import.import_post.user_not_found.error",
-    "translation": "İleti alınırken sorun çıktı. \"{{.Username}}\" kullanıcı adına sahip kullanıcı bulunamadı."
+    "translation": "İleti içe aktarılırken sorun çıktı. \"{{.Username}}\" kullanıcı adına sahip kullanıcı bulunamadı."
   },
   {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
@@ -3051,6 +3135,54 @@
     "id": "app.import.validate_channel_import_data.type_missing.error",
     "translation": "Zorunlu kanal özelliği eksik: Tür."
   },
+  {
+    "id": "app.import.validate_direct_channel_import_data.header_length.error",
+    "translation": "Doğrudan kanal başlığı çok uzun"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_required.error",
+    "translation": "Zorunlu doğrudan kanal özelliği eksik: Üyeler"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_few.error",
+    "translation": "Doğrudan kanal üye listesinde çok az sayıda öge var"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_many.error",
+    "translation": "Doğrudan kanal üye listesinde çok fazla sayıda öge var"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
+    "translation": "Zorunlu doğrudan kanal özelliği eksik: kanal_uyeleri"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_few.error",
+    "translation": "Doğrudan ileti kanalı üye listesinde çok az sayıda öge var"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_many.error",
+    "translation": "Doğrudan ileti kanalı üye listesinde çok fazla sayıda öge var"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_missing.error",
+    "translation": "Zorunlu doğrudan kanal özelliği eksik: olusturulma_zamani"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_zero.error",
+    "translation": "OlusturulmaZamani 0 değerinden büyük olmalıdır"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_length.error",
+    "translation": "İleti çok uzun"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_missing.error",
+    "translation": "Zorunlu doğrudan ileti özelliği eksik: ileti"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.user_missing.error",
+    "translation": "Zorunlu doğrudan ileti özelliği eksik: kullanıcı"
+  },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
     "translation": "Zorunlu kanal özelliği eksik: Kanal."
@@ -3325,19 +3457,19 @@
   },
   {
     "id": "ent.compliance.run_failed.error",
-    "translation": "'{{.JobName}}' görevi için '{{.FilePath}}' konumuna uygunluk verme işlemi tamamlanamadı"
+    "translation": "'{{.JobName}}' görevi için '{{.FilePath}}' konumuna uygunluk dışa aktarma işlemi tamamlanamadı"
   },
   {
     "id": "ent.compliance.run_finished.info",
-    "translation": "'{{.JobName}}' görevi için {{.Count}} kayıt '{{.FilePath}}' konumuna uygunluk verme işlemi tamamlandı"
+    "translation": "'{{.JobName}}' görevi için {{.Count}} kayıt '{{.FilePath}}' konumuna uygunluk dışa aktarma işlemi tamamlandı"
   },
   {
     "id": "ent.compliance.run_limit.warning",
-    "translation": "'{{.JobName}}' görevi için uygunluk verme işleminde çok fazla sayıda satır alındı ve '{{.FilePath}}' konumuna ilk 30,000 tanesi budanarak eklendi"
+    "translation": "'{{.JobName}}' görevi için uygunluk dışa aktarma işleminde çok fazla sayıda satır alındı ve ilk 30,000 tanesi budanarak '{{.FilePath}}' konumuna eklendi"
   },
   {
     "id": "ent.compliance.run_started.info",
-    "translation": "'{{.JobName}}' görevi için '{{.FilePath}}' konumuna uygunluk verme işlemi başlatıldı"
+    "translation": "'{{.JobName}}' görevi için '{{.FilePath}}' konumuna uygunluk dışa aktarma işlemi başlatıldı"
   },
   {
     "id": "ent.elasticsearch.search_posts.disabled",
@@ -3371,6 +3503,14 @@
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "Failed to set ElasticSearch index settings"
   },
+  {
+    "id": "ent.elasticsearch.test_config.indexing_disabled.error",
+    "translation": "Elasticsearch devre dışı."
+  },
+  {
+    "id": "ent.elasticsearch.test_config.license.error",
+    "translation": "Lisansta Elasticsearch desteklenmiyor."
+  },
   {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "Geçerli lisans özel emoji özelliğini desteklemiyor. Lütfen Enterprise sürümüne yükseltmek için sistem yöneticisi ile görüşün."
@@ -3841,7 +3981,7 @@
   },
   {
     "id": "model.client.upload_post_attachment.import_from.app_error",
-    "translation": "Alınacak konum çok parçalı forma yazılırken sorun çıktı"
+    "translation": "İçeri aktarılacak konum çok parçalı forma yazılırken sorun çıktı"
   },
   {
     "id": "model.client.upload_post_attachment.writer.app_error",
@@ -4171,6 +4311,10 @@
     "id": "model.config.is_valid.sql_query_timeout.app_error",
     "translation": "SQL ayarlarında sorgu zaman aşımı değeri geçersiz. Sıfır ya da pozitif bir sayı olmalı."
   },
+  {
+    "id": "model.config.is_valid.teammate_name_display.app_error",
+    "translation": "Takım arkadaşı görünümü geçersiz.  'tam_ad', 'takmaad_tam_ad' ya da 'kullaniciadi' olmalıdır"
+  },
   {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "Kullanıcının yazma aralıkları süresi 1000 milisaniyeden küçük olmamalıdır."
@@ -5723,6 +5867,10 @@
     "id": "store.sql_user.get_for_login.multiple_users",
     "translation": "Kimlik doğrulama bilgileriniz ile eşleşen birden çok kullanıcı olduğundan oturumunuz açılamadı. Lütfen bir yönetici ile görüşün."
   },
+  {
+    "id": "store.sql_user.get_new_users.app_error",
+    "translation": "Yeni kullanıcılar bulunurken bir sorun çıktı"
+  },
   {
     "id": "store.sql_user.get_profiles.app_error",
     "translation": "Kullanıcı profilleri bulunurken bir sorun çıktı"
diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index 7665b97343..051cbd2eae 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -429,7 +429,7 @@
   },
   {
     "id": "api.command.execute_command.not_found.app_error",
-    "translation": "触发 '{{.Trigger}}' 没有找到"
+    "translation": "Command with a trigger of '{{.Trigger}}' not found. To send a message beginning with \"/\", try adding an empty space at the beginning of the message."
   },
   {
     "id": "api.command.execute_command.save.app_error",
@@ -459,6 +459,10 @@
     "id": "api.command.invite_people.hint",
     "translation": "[name@domain.com ...]"
   },
+  {
+    "id": "api.command.invite_people.invite_off",
+    "translation": "User creation has been disabled on this server, no invite(s) sent"
+  },
   {
     "id": "api.command.invite_people.name",
     "translation": "invite_people"
@@ -495,6 +499,38 @@
     "id": "api.command_away.success",
     "translation": "您现在离开了"
   },
+  {
+    "id": "api.command_channel_header.channel.app_error",
+    "translation": "Error to retrieve the current channel."
+  },
+  {
+    "id": "api.command_channel_header.desc",
+    "translation": "Edit the channel header"
+  },
+  {
+    "id": "api.command_channel_header.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_channel_header.message.app_error",
+    "translation": "Text must be provided with the /header command."
+  },
+  {
+    "id": "api.command_channel_header.name",
+    "translation": "header"
+  },
+  {
+    "id": "api.command_channel_header.permission.app_error",
+    "translation": "You do not have the appropriate permissions to edit the channel header."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.app_error",
+    "translation": "Error to update the current channel."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.success",
+    "translation": "Channel header successfully updated."
+  },
   {
     "id": "api.command_collapse.desc",
     "translation": "打开图像预览自动折叠"
@@ -551,6 +587,14 @@
     "id": "api.command_expand_collapse.fail.app_error",
     "translation": "展开预览时发生了错误"
   },
+  {
+    "id": "api.command_help.desc",
+    "translation": "Open the Mattermost help page"
+  },
+  {
+    "id": "api.command_help.name",
+    "translation": "帮助"
+  },
   {
     "id": "api.command_join.desc",
     "translation": "添加到公开频道"
@@ -661,19 +705,19 @@
   },
   {
     "id": "api.command_open.name",
-    "translation": "open"
+    "translation": "打开"
   },
   {
     "id": "api.command_settings.desc",
-    "translation": "Open the Account Settings dialog"
+    "translation": "打开账户设置对话框"
   },
   {
     "id": "api.command_settings.name",
-    "translation": "settings"
+    "translation": "设置"
   },
   {
     "id": "api.command_settings.unsupported.app_error",
-    "translation": "The settings command is not supported on your device"
+    "translation": "您的设备不支持设定命令"
   },
   {
     "id": "api.command_shortcuts.browser.channel_next",
@@ -1647,6 +1691,10 @@
     "id": "api.post.send_notifications_and_forget.push_image_only",
     "translation": " 已上传一个或更多个文件 "
   },
+  {
+    "id": "api.post.send_notifications_and_forget.push_image_only_dm",
+    "translation": " Uploaded one or more files in a direct message"
+  },
   {
     "id": "api.post.send_notifications_and_forget.push_in",
     "translation": " 在 "
@@ -2003,14 +2051,6 @@
     "id": "api.system.go_routines",
     "translation": "运行中的 goroutine 数量 %v 已经超过健康界限 %v"
   },
-  {
-    "id": "api.team.add_user_to_team.invalid_data.app_error",
-    "translation": "无效数据。"
-  },
-  {
-    "id": "api.team.add_user_to_team.invalid_invite_id.app_error",
-    "translation": "无效邀请 id。没有匹配此邀请 id 的团队。"
-  },
   {
     "id": "api.team.add_user_to_team.missing_parameter.app_error",
     "translation": "添加用户到团队所需的参数。"
@@ -2083,6 +2123,10 @@
     "id": "api.team.invite_members.already.app_error",
     "translation": "此人已经在你的团队中"
   },
+  {
+    "id": "api.team.invite_members.invalid_email.app_error",
+    "translation": "The following email addresses do not belong to an accepted domain: {{.Addresses}}. Please contact your System Administrator for details."
+  },
   {
     "id": "api.team.invite_members.member",
     "translation": "成员"
@@ -2975,10 +3019,50 @@
     "id": "app.import.import_channel.team_not_found.error",
     "translation": "导入频道失败。团队名 \"{{.TeamName}}\" 无法找到。"
   },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "Failed to get direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "Failed to get direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "Failed to get group channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "Failed to get group channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.member_not_found.error",
+    "translation": "Could not find channel member when importing direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.update_header_failed.error",
+    "translation": "Failed to update direct channel header"
+  },
+  {
+    "id": "app.import.import_direct_post.channel_member_not_found.error",
+    "translation": "Could not find channel member when importing direct channel post"
+  },
+  {
+    "id": "app.import.import_direct_post.user_not_found.error",
+    "translation": "Post user does not exist"
+  },
   {
     "id": "app.import.import_line.null_channel.error",
     "translation": "导入数据行有类型 \"channel\" 但频道对象是无。"
   },
+  {
+    "id": "app.import.import_line.null_direct_channel.error",
+    "translation": "导入数据行有类型 \"channel\" 但频道对象是无。"
+  },
+  {
+    "id": "app.import.import_line.null_direct_post.error",
+    "translation": "导入数据行有类型 \"post\" 但消息对象是无。"
+  },
   {
     "id": "app.import.import_line.null_post.error",
     "translation": "导入数据行有类型 \"post\" 但消息对象是无。"
@@ -3051,6 +3135,54 @@
     "id": "app.import.validate_channel_import_data.type_missing.error",
     "translation": "缺少频道必须属性：type。"
   },
+  {
+    "id": "app.import.validate_direct_channel_import_data.header_length.error",
+    "translation": "Direct channel header is too long"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_required.error",
+    "translation": "缺少频道必须属性：name"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_few.error",
+    "translation": "Direct channel members list contains too few items"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_many.error",
+    "translation": "Direct channel members list contains too many items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
+    "translation": "缺少消息必须属性：create_at。"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_few.error",
+    "translation": "Direct post channel members list contains too few items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_many.error",
+    "translation": "Direct post channel members list contains too many items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_missing.error",
+    "translation": "缺少消息必须属性：create_at。"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_zero.error",
+    "translation": "CreateAt must be greater than 0"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_length.error",
+    "translation": "Message is too long"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_missing.error",
+    "translation": "缺少消息必须属性：Message。"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.user_missing.error",
+    "translation": "缺少消息必须属性：User。"
+  },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
     "translation": "缺少消息必须属性：Channel。"
@@ -3371,6 +3503,14 @@
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "无法设置 ElasticSearch 索引设定"
   },
+  {
+    "id": "ent.elasticsearch.test_config.indexing_disabled.error",
+    "translation": "Elasticsearch is disabled."
+  },
+  {
+    "id": "ent.elasticsearch.test_config.license.error",
+    "translation": "License does not support Elasticsearch."
+  },
   {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "当前许可证禁用了自定义表情符。请联系您的系统管理员关于升级您的企业许可证。"
@@ -4171,6 +4311,10 @@
     "id": "model.config.is_valid.sql_query_timeout.app_error",
     "translation": "无效 SQL 查询超时设定。必须是正整数。"
   },
+  {
+    "id": "model.config.is_valid.teammate_name_display.app_error",
+    "translation": "Invalid teammate display.  Must be 'full_name', 'nickname_full_name' or 'username'"
+  },
   {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "用户键入更新间隔不应设置为小于1000毫秒。"
@@ -5723,6 +5867,10 @@
     "id": "store.sql_user.get_for_login.multiple_users",
     "translation": "我们发现多个用户的登陆凭据与你匹配，因此禁用了你的登陆权限。请与管理员联系。"
   },
+  {
+    "id": "store.sql_user.get_new_users.app_error",
+    "translation": "我们在查找偏好设置时遇到了一个错误"
+  },
   {
     "id": "store.sql_user.get_profiles.app_error",
     "translation": "我们查找用户配置文件遇到了一个错误"
diff --git a/i18n/zh-TW.json b/i18n/zh-TW.json
index ec9bc4307b..55e0968a53 100644
--- a/i18n/zh-TW.json
+++ b/i18n/zh-TW.json
@@ -429,7 +429,7 @@
   },
   {
     "id": "api.command.execute_command.not_found.app_error",
-    "translation": "找不到附帶觸發器 '{{.Trigger}}' 的命令"
+    "translation": "Command with a trigger of '{{.Trigger}}' not found. To send a message beginning with \"/\", try adding an empty space at the beginning of the message."
   },
   {
     "id": "api.command.execute_command.save.app_error",
@@ -459,6 +459,10 @@
     "id": "api.command.invite_people.hint",
     "translation": "[name@domain.com ...]"
   },
+  {
+    "id": "api.command.invite_people.invite_off",
+    "translation": "User creation has been disabled on this server, no invite(s) sent"
+  },
   {
     "id": "api.command.invite_people.name",
     "translation": "invite_people"
@@ -495,6 +499,38 @@
     "id": "api.command_away.success",
     "translation": "現在狀態為「離開」"
   },
+  {
+    "id": "api.command_channel_header.channel.app_error",
+    "translation": "Error to retrieve the current channel."
+  },
+  {
+    "id": "api.command_channel_header.desc",
+    "translation": "Edit the channel header"
+  },
+  {
+    "id": "api.command_channel_header.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_channel_header.message.app_error",
+    "translation": "Text must be provided with the /header command."
+  },
+  {
+    "id": "api.command_channel_header.name",
+    "translation": "header"
+  },
+  {
+    "id": "api.command_channel_header.permission.app_error",
+    "translation": "You do not have the appropriate permissions to edit the channel header."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.app_error",
+    "translation": "Error to update the current channel."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.success",
+    "translation": "Channel header successfully updated."
+  },
   {
     "id": "api.command_collapse.desc",
     "translation": "開啟圖片預覽的自動折疊功能"
@@ -551,6 +587,14 @@
     "id": "api.command_expand_collapse.fail.app_error",
     "translation": "展開預覽時發生錯誤"
   },
+  {
+    "id": "api.command_help.desc",
+    "translation": "Open the Mattermost help page"
+  },
+  {
+    "id": "api.command_help.name",
+    "translation": "help"
+  },
   {
     "id": "api.command_join.desc",
     "translation": "加入公開頻道"
@@ -1645,7 +1689,11 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " Uploaded one or more files "
+    "translation": " Uploaded one or more files in "
+  },
+  {
+    "id": "api.post.send_notifications_and_forget.push_image_only_dm",
+    "translation": " Uploaded one or more files in a direct message"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_in",
@@ -2003,14 +2051,6 @@
     "id": "api.system.go_routines",
     "translation": "執行中的 Goroutine 數量超過健康界線 %v (%v)"
   },
-  {
-    "id": "api.team.add_user_to_team.invalid_data.app_error",
-    "translation": "無效的資料。"
-  },
-  {
-    "id": "api.team.add_user_to_team.invalid_invite_id.app_error",
-    "translation": "無效的邀請ID。沒有團隊符合此ID。"
-  },
   {
     "id": "api.team.add_user_to_team.missing_parameter.app_error",
     "translation": "需要參數以新增團隊成員。"
@@ -2083,6 +2123,10 @@
     "id": "api.team.invite_members.already.app_error",
     "translation": "此人已在您的團隊中"
   },
+  {
+    "id": "api.team.invite_members.invalid_email.app_error",
+    "translation": "The following email addresses do not belong to an accepted domain: {{.Addresses}}. Please contact your System Administrator for details."
+  },
   {
     "id": "api.team.invite_members.member",
     "translation": "成員"
@@ -2975,10 +3019,50 @@
     "id": "app.import.import_channel.team_not_found.error",
     "translation": "匯入頻道失敗。不存在名字為 \"{{.TeamName}}\" 的團隊。"
   },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "Failed to get direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "Failed to get direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "Failed to get group channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "Failed to get group channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.member_not_found.error",
+    "translation": "Could not find channel member when importing direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.update_header_failed.error",
+    "translation": "Failed to update direct channel header"
+  },
+  {
+    "id": "app.import.import_direct_post.channel_member_not_found.error",
+    "translation": "Could not find channel member when importing direct channel post"
+  },
+  {
+    "id": "app.import.import_direct_post.user_not_found.error",
+    "translation": "Post user does not exist"
+  },
   {
     "id": "app.import.import_line.null_channel.error",
     "translation": "匯入資料行資料型別為\"頻道\"但頻道物件為 null"
   },
+  {
+    "id": "app.import.import_line.null_direct_channel.error",
+    "translation": "匯入資料行資料型別為\"頻道\"但頻道物件為 null"
+  },
+  {
+    "id": "app.import.import_line.null_direct_post.error",
+    "translation": "匯入資料行資料型別為\"訊息\"但訊息物件為 null"
+  },
   {
     "id": "app.import.import_line.null_post.error",
     "translation": "匯入資料行資料型別為\"訊息\"但訊息物件為 null"
@@ -3051,6 +3135,54 @@
     "id": "app.import.validate_channel_import_data.type_missing.error",
     "translation": "缺少必要的頻道屬性：類型。"
   },
+  {
+    "id": "app.import.validate_direct_channel_import_data.header_length.error",
+    "translation": "Direct channel header is too long"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_required.error",
+    "translation": "缺少必要的頻道屬性：名字。"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_few.error",
+    "translation": "Direct channel members list contains too few items"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_many.error",
+    "translation": "Direct channel members list contains too many items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
+    "translation": "缺少必要的訊息屬性：建立日期。"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_few.error",
+    "translation": "Direct post channel members list contains too few items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_many.error",
+    "translation": "Direct post channel members list contains too many items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_missing.error",
+    "translation": "缺少必要的訊息屬性：建立日期。"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_zero.error",
+    "translation": "CreateAt must be greater than 0"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_length.error",
+    "translation": "Message is too long"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_missing.error",
+    "translation": "缺少必要的訊息屬性：訊息。"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.user_missing.error",
+    "translation": "缺少必要的訊息屬性：使用者。"
+  },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
     "translation": "缺少必要的訊息屬性：頻道。"
@@ -3371,6 +3503,14 @@
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "設定 ElasticSearch 索引設定時失敗"
   },
+  {
+    "id": "ent.elasticsearch.test_config.indexing_disabled.error",
+    "translation": "Elasticsearch is disabled."
+  },
+  {
+    "id": "ent.elasticsearch.test_config.license.error",
+    "translation": "License does not support Elasticsearch."
+  },
   {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "目前授權不提供限制自訂繪文字，請聯繫系統管理員將系統升級為企業版授權。"
@@ -4171,6 +4311,10 @@
     "id": "model.config.is_valid.sql_query_timeout.app_error",
     "translation": "SQL 設定中的查詢時限無效。必須為正數。"
   },
+  {
+    "id": "model.config.is_valid.teammate_name_display.app_error",
+    "translation": "Invalid teammate display.  Must be 'full_name', 'nickname_full_name' or 'username'"
+  },
   {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "使用者輸入更新間隔不應該設定為低於 1000 毫秒。"
@@ -5723,6 +5867,10 @@
     "id": "store.sql_user.get_for_login.multiple_users",
     "translation": "找到數個相符於您的認證之帳號，所以無法讓您登入，請聯繫系統管理員。"
   },
+  {
+    "id": "store.sql_user.get_new_users.app_error",
+    "translation": "尋找偏好設定時遇到錯誤"
+  },
   {
     "id": "store.sql_user.get_profiles.app_error",
     "translation": "尋找使用者資訊時遇到錯誤"
diff --git a/webapp/i18n/de.json b/webapp/i18n/de.json
index 3899bb9b62..7f0f7188f1 100644
--- a/webapp/i18n/de.json
+++ b/webapp/i18n/de.json
@@ -415,18 +415,6 @@
   "admin.image.maxFileSizeDescription": "Maximale Dateigröße für Anhänge in MB. Achtung: Stelle sicher, dass der Server die gewählte Größe unterstützt. Große Dateien erhöhen das Risiko eines Servercrashes und von abgebrochenen Uploads bei Netzwerkstörungen.",
   "admin.image.maxFileSizeExample": "50",
   "admin.image.maxFileSizeTitle": "Maximale Dateigröße:",
-  "admin.image.previewHeightDescription": "Maximale Höhe des Vorschaubildes (\"0\": Automatische Berechnung). Änderungen dieses Wertes wirken sich auf die zukünftige Darstellung der Vorschaubilder aus, aber nicht auf bereits bestehende Bilder.",
-  "admin.image.previewHeightExample": "Z.B.: \"0\"",
-  "admin.image.previewHeightTitle": "Vorschau der Bildhöhe:",
-  "admin.image.previewWidthDescription": "Maximale Breite des Vorschaubildes. Änderungen dieses Wertes wirken sich auf die zukünftige Darstellung der Vorschaubilder aus, aber nicht auf bereits bestehende Bilder.",
-  "admin.image.previewWidthExample": "Z.B.: \"1024\"",
-  "admin.image.previewWidthTitle": "Breite der Vorschau:",
-  "admin.image.profileHeightDescription": "Höhe des Profilbildes.",
-  "admin.image.profileHeightExample": "Z.B.: \"0\"",
-  "admin.image.profileHeightTitle": "Profilbild Höhe:",
-  "admin.image.profileWidthDescription": "Breite des Profilbildes.",
-  "admin.image.profileWidthExample": "Z.B.: \"1024\"",
-  "admin.image.profileWidthTitle": "Profilbild Breite:",
   "admin.image.publicLinkDescription": "32-Zeichen Salt um die öffentlich Links von Bildern zu signieren. Wird bei der Installation zufällig generiert. Klicken Sie \"Neu generieren\" um einen neuen Salt zu erstellen.",
   "admin.image.publicLinkExample": "Z.B.: \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
   "admin.image.publicLinkTitle": "Salt für öffentlichen Links:",
@@ -436,12 +424,6 @@
   "admin.image.storeDescription": "Dateisystem, in dem Dateien und Bilder gespeichert werden.<br /><br />Die Auswahl von \"Amazon S3\" aktiviert die Felder zur Eingabe des Amazonzuganges.<br /><br />Die Auswahl von \"lokalem Speicher\" aktiviert das Feld um einen lokalen Dateipfad auszuwählen.",
   "admin.image.storeLocal": "Lokales Dateisystem",
   "admin.image.storeTitle": "Dateisystem:",
-  "admin.image.thumbHeightDescription": "Höhe der Vorschaubilder welche beim Hochladen von Bildern generiert werden. Änderungen dieses Wertes wirken sich auf die zukünftige Darstellung der Vorschaubilder aus, aber nicht auf bereits bestehende Bilder.",
-  "admin.image.thumbHeightExample": "Z.B.: \"100\"",
-  "admin.image.thumbHeightTitle": "Höhe des Vorschaubildes:",
-  "admin.image.thumbWidthDescription": "Breite der Vorschaubilder welche beim Hochladen von Bildern generiert werden. Änderungen dieses Wertes wirken sich auf die zukünftige Darstellung der Vorschaubilder aus, aber nicht auf bereits bestehende Bilder.",
-  "admin.image.thumbWidthExample": "Z.B.: \"120\"",
-  "admin.image.thumbWidthTitle": "Breite des Vorschaubildes:",
   "admin.integrations.custom": "Benutzerdefinierte Integrationen",
   "admin.integrations.external": "Externe Dienste",
   "admin.integrations.webrtc": "Mattermost WebRTC",
@@ -782,7 +764,6 @@
   "admin.sidebar.files": "Dateien",
   "admin.sidebar.general": "Allgemein",
   "admin.sidebar.gitlab": "GitLab",
-  "admin.sidebar.images": "Bilder",
   "admin.sidebar.integrations": "Integrationen",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "Rechtsabteilung und Support",
@@ -891,11 +872,16 @@
   "admin.team.restrictTitle": "Begrenze Kontoerstellung auf spezifizierte E-Mail-Domains:",
   "admin.team.restrict_direct_message_any": "Jeder Nutzer auf dem Mattermost Server",
   "admin.team.restrict_direct_message_team": "Jedes Mitglied des Teams",
+  "admin.team.showFullname": "Show first and last name (default)",
+  "admin.team.showNickname": "Zeige Spitzname wenn verfügbar, sonst zeige Vor- und Nachname",
+  "admin.team.showUsername": "Show username",
   "admin.team.siteNameDescription": "Name des Dienstes, der auf der Anmeldeseite und der Seiten angezeigt wird.",
   "admin.team.siteNameExample": "Z.B.: \"Mattermost\"",
   "admin.team.siteNameTitle": "Seitenname:",
   "admin.team.teamCreationDescription": "Wenn falsch können nur Systemadministratoren Teams erstellen.",
   "admin.team.teamCreationTitle": "Aktiviere Team Erstellung: ",
+  "admin.team.teammateNameDisplay": "Namensdarstellung der Teammitglider",
+  "admin.team.teammateNameDisplayDesc": "Wählen Sie, wie die Namen anderer Benutzer in Direktnachrichten angezeigt werden sollen.",
   "admin.team.upload": "Hochladen",
   "admin.team.uploadDesc": "Individualisieren Sie ihre Nutzererfahrung durch das Hinzufügen eines Bildes zu ihrem Anmeldebildschirm. Die empfohlene maximale Bildgröße beträgt unter 2MB.",
   "admin.team.uploaded": "Hochgeladen!",
@@ -1121,7 +1107,8 @@
   "channel_invite.close": "Schließen",
   "channel_loader.connection_error": "Es scheint ein Problem mit Ihrer Internetverbindung zu geben.",
   "channel_loader.posted": "Verschickt",
-  "channel_loader.socketError": "Bitte überprüfen Sie die Verbindung, Mattermost ist nicht erreichbar. Wenn das Problem bestehen bitten Sie Ihren Administrator den WebSocket Port zu überprüfen.",
+  "channel_loader.postedImage": " hat ein Bild hochgeladen",
+  "channel_loader.socketError": "Please check connection, Mattermost unreachable. If issue persists, ask administrator to <a href=\"https://about.mattermost.com/default-websocket-port-help\" target=\"_blank\">check WebSocket port</a>.",
   "channel_loader.someone": "Jemand",
   "channel_loader.something": " hat etwas neues gemacht",
   "channel_loader.unknown_error": "Es wurde ein unerwarteter Statuscode vom Server empfangen.",
@@ -1718,6 +1705,9 @@
   "mobile.custom_list.no_results": "Keine Ergebnisse",
   "mobile.drawer.teamsTitle": "Teams",
   "mobile.edit_post.title": "Nachricht bearbeiten",
+  "mobile.error_handler.button": "Relaunch",
+  "mobile.error_handler.description": "\nClick relaunch to open the app again. After restart, you can report the problem from the settings menu.\n",
+  "mobile.error_handler.title": "Unexpected error occurred",
   "mobile.file_upload.camera": "Ein Foto oder ein Video aufnehmen",
   "mobile.file_upload.library": "Foto-Bibliothek",
   "mobile.file_upload.more": "Mehr",
@@ -1769,6 +1759,9 @@
   "mobile.select_team.join_open": "Offene Teams, denen Sie beitreten können",
   "mobile.select_team.no_teams": "Es sind keine Teams zum Betreten für Sie verfügbar.",
   "mobile.server_ping_failed": "Kann nicht mit Server verbinden. Bitte überprüfen Sie ihre Server-URL und Internetverbindung.",
+  "mobile.server_upgrade.button": "OK",
+  "mobile.server_upgrade.description": "\nA server upgrade is required to use the Mattermost app. Please ask your System Administrator for details.\n",
+  "mobile.server_upgrade.title": "Server upgrade required",
   "mobile.server_url.invalid_format": "URL muss mit http:// oder https:// beginnen",
   "mobile.session_expired": "Sitzung abgelaufen: Bitte anmelden um weiterhin Benachrichtigungen zu erhalten.",
   "mobile.settings.team_selection": "Teamauswahl",
@@ -2067,7 +2060,7 @@
   "suggestion.search.private": "Private Kanäle",
   "suggestion.search.public": "Öffentliche Kanäle",
   "system_users_list.count": "{count, number} {count, plural, one {Benutzer} other {Benutzer}}",
-  "system_users_list.countPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 Mitglieder} one {Mitglied} other {Mitglieder}} von {total} insgesamt",
+  "system_users_list.countPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 Mitglieder} one {Mitglied} other {Mitglieder}} von {total, number} insgesamt",
   "system_users_list.countSearch": "{count, number} {count, plural, one {Benutzer} other {Benutzer}} von {total, number} total",
   "team_export_tab.download": "Download",
   "team_export_tab.export": "Exportieren",
@@ -2192,8 +2185,6 @@
   "user.settings.display.collapseOff": "Eingeklappt",
   "user.settings.display.collapseOn": "Ausgeklappt",
   "user.settings.display.fixedWidthCentered": "Feste Breite, zentriert",
-  "user.settings.display.fontDesc": "Wählen Sie die Schriftart zur Anzeige im Mattermost Interface aus.",
-  "user.settings.display.fontTitle": "Schriftart",
   "user.settings.display.fullScreen": "Ganze Breite",
   "user.settings.display.language": "Sprache",
   "user.settings.display.messageDisplayClean": "Standard",
@@ -2209,7 +2200,7 @@
   "user.settings.display.showFullname": "Zeige Vor- und Nachname",
   "user.settings.display.showNickname": "Zeige Spitzname wenn verfügbar, sonst zeige Vor- und Nachname",
   "user.settings.display.showUsername": "Zeige Benutzername (Standard)",
-  "user.settings.display.teammateDisplay": "Namensdarstellung der Teammitglider",
+  "user.settings.display.teammateNameDisplay": "Namensdarstellung der Teammitglider",
   "user.settings.display.theme.applyToAllTeams": "Motiv für alle meine Teams festlegen",
   "user.settings.display.theme.customTheme": "Benutzerdefiniertes Motiv",
   "user.settings.display.theme.describe": "Öffnen um das Motiv zu ändern",
@@ -2437,7 +2428,7 @@
   "user_profile.webrtc.unavailable": "Neuer Anruf nicht möglich bis ihr bestehender Anruf beendet ist",
   "view_image.loading": "Laden ",
   "view_image_popover.download": "Herunterladen",
-  "view_image_popover.file": "File {count, number} of {total, number}",
+  "view_image_popover.file": "Datei {count, number} von {total, number}",
   "view_image_popover.publicLink": "Öffentlichen Link erhalten",
   "web.footer.about": "Über",
   "web.footer.help": "Hilfe",
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 0bb7f4231b..37f636bab4 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -881,12 +881,12 @@
   "admin.team.restrictTitle": "Restrict account creation to specified email domains:",
   "admin.team.restrict_direct_message_any": "Any user on the Mattermost server",
   "admin.team.restrict_direct_message_team": "Any member of the team",
-  "admin.team.siteNameDescription": "Name of service shown in login screens and UI.",
-  "admin.team.siteNameExample": "E.g.: \"Mattermost\"",
-  "admin.team.siteNameTitle": "Site Name:",
   "admin.team.showFullname": "Show first and last name (default)",
   "admin.team.showNickname": "Show nickname if one exists, otherwise show first and last name",
   "admin.team.showUsername": "Show username",
+  "admin.team.siteNameDescription": "Name of service shown in login screens and UI.",
+  "admin.team.siteNameExample": "E.g.: \"Mattermost\"",
+  "admin.team.siteNameTitle": "Site Name:",
   "admin.team.teamCreationDescription": "When false, only System Administrators can create teams.",
   "admin.team.teamCreationTitle": "Enable Team Creation: ",
   "admin.team.teammateNameDisplay": "Teammate Name Display:",
@@ -1116,13 +1116,13 @@
   "channel_invite.close": "Close",
   "channel_loader.connection_error": "There appears to be a problem with your internet connection.",
   "channel_loader.posted": "Posted",
+  "channel_loader.postedImage": " posted an image",
   "channel_loader.socketError": "Please check connection, Mattermost unreachable. If issue persists, ask administrator to <a href=\"https://about.mattermost.com/default-websocket-port-help\" target=\"_blank\">check WebSocket port</a>.",
   "channel_loader.someone": "Someone",
   "channel_loader.something": " did something new",
   "channel_loader.unknown_error": "We received an unexpected status code from the server.",
   "channel_loader.uploadedFile": " uploaded a file",
   "channel_loader.uploadedImage": " uploaded an image",
-  "channel_loader.postedImage": " posted an image",
   "channel_loader.wrote": " wrote: ",
   "channel_members_dropdown.channel_admin": "Channel Admin",
   "channel_members_dropdown.channel_member": "Channel Member",
@@ -1720,6 +1720,9 @@
   "mobile.custom_list.no_results": "No Results",
   "mobile.drawer.teamsTitle": "Teams",
   "mobile.edit_post.title": "Editing Message",
+  "mobile.error_handler.button": "Relaunch",
+  "mobile.error_handler.description": "\nClick relaunch to open the app again. After restart, you can report the problem from the settings menu.\n",
+  "mobile.error_handler.title": "Unexpected error occurred",
   "mobile.file_upload.camera": "Take Photo or Video",
   "mobile.file_upload.library": "Photo Library",
   "mobile.file_upload.more": "More",
@@ -1771,6 +1774,9 @@
   "mobile.select_team.join_open": "Open teams you can join",
   "mobile.select_team.no_teams": "There are no available teams for you to join.",
   "mobile.server_ping_failed": "Cannot connect to the server. Please check your server URL and internet connection.",
+  "mobile.server_upgrade.button": "OK",
+  "mobile.server_upgrade.description": "\nA server upgrade is required to use the Mattermost app. Please ask your System Administrator for details.\n",
+  "mobile.server_upgrade.title": "Server upgrade required",
   "mobile.server_url.invalid_format": "URL must start with http:// or https://",
   "mobile.session_expired": "Session Expired: Please log in to continue receiving notifications.",
   "mobile.settings.team_selection": "Team Selection",
diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json
index 01b495521c..a20d125653 100644
--- a/webapp/i18n/es.json
+++ b/webapp/i18n/es.json
@@ -415,18 +415,6 @@
   "admin.image.maxFileSizeDescription": "Tamaño máximo de los archivos adjuntos a los mensajes en megabytes. Precaución: Compruebe que la memoria del servidor puede soportar la configuración seleccionada. Los archivos de gran tamaño, pueden aumentar el riesgo de que se bloquee el servidor o que ocurran fallos debido a interrupciones en la red.",
   "admin.image.maxFileSizeExample": "50",
   "admin.image.maxFileSizeTitle": "Tamaño máximo de los Archivos:",
-  "admin.image.previewHeightDescription": "Altura máxima para la vista previa de la imágen (\"0\": Establecer a tamaño-automático). Actualizando este valor los cambios de vista previa se hacen en el futuro, pero no cambia para imagenes creadas en el pasado.",
-  "admin.image.previewHeightExample": "Ej.: \"0\"",
-  "admin.image.previewHeightTitle": "Altura de las Imágenes en Vista Previa:",
-  "admin.image.previewWidthDescription": "Ancho máximo para la vista previa de la imágen. Actualizando este valor los cambios de vista previa se hacen en el futuro, pero no cambia para imagenes creadas en el pasado.",
-  "admin.image.previewWidthExample": "Ej.: \"1024\"",
-  "admin.image.previewWidthTitle": "Ancho de la Vista Previa de las Imágenes:",
-  "admin.image.profileHeightDescription": "Alto de imagen de perfil.",
-  "admin.image.profileHeightExample": "Ej.: \"0\"",
-  "admin.image.profileHeightTitle": "Alto de la Imagen de Perfil:",
-  "admin.image.profileWidthDescription": "Ancho de la imagen de perfil.",
-  "admin.image.profileWidthExample": "Ej.: \"1024\"",
-  "admin.image.profileWidthTitle": "Ancho del la Imagen de Perfil:",
   "admin.image.publicLinkDescription": "Salt de 32-characteres agregado para firmar los enlaces para las imágenes públicas. Aleatoriamente generados en la instalación. Haz clic en \"Regenerar\" para crear un nuevo salt.",
   "admin.image.publicLinkExample": "Ej.: \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
   "admin.image.publicLinkTitle": "Título del enlace público:",
@@ -436,12 +424,6 @@
   "admin.image.storeDescription": "Sistema de Almacenamiento donde los archivos e imagenes adjuntos serán guardados.<br /><br />Al seleccionar \"Amazon S3\" habilita los campos para ingresar las credenciales de Amazon y los detalles de los bucket.<br /><br />Al seleccionar \"Almacenamiento Local\" habilita los campos para especificar un directorio local.",
   "admin.image.storeLocal": "Sistema local de archivos",
   "admin.image.storeTitle": "Sistema de Almacenamiento de Archivos:",
-  "admin.image.thumbHeightDescription": "Alto de imágen miniatura subida. Actualizando este valor la imagen miniatura cambia en el futuro, pero no cambia para imagenes creadas en el pasado.",
-  "admin.image.thumbHeightExample": "Ej.: \"100\"",
-  "admin.image.thumbHeightTitle": "Altura de las Miniaturas de los Adjuntos:",
-  "admin.image.thumbWidthDescription": "Ancho de imágen miniatura subida. Actualizando este valor la imagen miniatura cambia en el futuro, pero no cambia para imagenes creadas en el pasado.",
-  "admin.image.thumbWidthExample": "Ej.: \"120\"",
-  "admin.image.thumbWidthTitle": "Ancho de las Miniaturas de los Adjuntos:",
   "admin.integrations.custom": "Integraciones Personalizadas",
   "admin.integrations.external": "Servicios Externos",
   "admin.integrations.webrtc": "Mattermost WebRTC",
@@ -782,7 +764,6 @@
   "admin.sidebar.files": "Archivos",
   "admin.sidebar.general": "General",
   "admin.sidebar.gitlab": "GitLab",
-  "admin.sidebar.images": "Imagenes",
   "admin.sidebar.integrations": "Integraciones",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "Legal y Soporte",
@@ -832,7 +813,7 @@
   "admin.sql.maxOpenTitle": "Máximo de conexiones abiertas:",
   "admin.sql.noteDescription": "Cambiando las propiedades de esta sección se requerirá reiniciar el servidor para que los cambios tomen efecto",
   "admin.sql.noteTitle": "Nota:",
-  "admin.sql.queryTimeoutDescription": "El número de segundos a esperar por una respuesta de la base de datos después de la apertura de una conexión y envío de la consulta. Los errores que se ven en la interfaz de usuario o en los registros como resultado de que una consulta fallara por el tiempo de espera puede variar dependiendo del tipo de consulta. Este ajuste no tiene ningún efecto en las bases de datos PostgreSQL.",
+  "admin.sql.queryTimeoutDescription": "El número de segundos a esperar por una respuesta de la base de datos después de la apertura de una conexión y envío de la consulta. Los errores que se ven en la interfaz de usuario o en los registros como resultado de que una consulta fallara por el tiempo de espera puede variar dependiendo del tipo de consulta.",
   "admin.sql.queryTimeoutExample": "Ej.: \"30\"",
   "admin.sql.queryTimeoutTitle": "Tiempo de espera de la consulta:",
   "admin.sql.replicas": "Origen de datos de réplica:",
@@ -891,11 +872,16 @@
   "admin.team.restrictTitle": "Restringir la creación de cuentas a los dominios de correo electrónico especificados:",
   "admin.team.restrict_direct_message_any": "Cualquier usuario en el servidor de Mattermost",
   "admin.team.restrict_direct_message_team": "Cualquier miembro del equipo",
+  "admin.team.showFullname": "Mostrar el nombre y apellido (predeterminado)",
+  "admin.team.showNickname": "Mostrar el sobrenombre si existe, de lo contrario mostrar el nombre y apellido",
+  "admin.team.showUsername": "Mostrar nombre de usuario",
   "admin.team.siteNameDescription": "Nombre de servicios mostrados en pantalla login y UI.",
   "admin.team.siteNameExample": "Ej.: \"Mattermost\"",
   "admin.team.siteNameTitle": "Nombre de sitio:",
   "admin.team.teamCreationDescription": "Cuando es falso, sólo los Administradores del Sistema podrán crear equipos.",
   "admin.team.teamCreationTitle": "Habilitar Creación de Equipos: ",
+  "admin.team.teammateNameDisplay": "Visualización del nombre de los compañeros:",
+  "admin.team.teammateNameDisplayDesc": "Asigna como mostrar los nombres de los otros usuarios en los mensajes y en la lista de Mensajes Directos.",
   "admin.team.upload": "Subir",
   "admin.team.uploadDesc": "Personalizar la experiencia de usuario mediante la adición de una imagen personalizada en la pantalla de inicio de sesión. Se Recomienda que el tamaño máximo de la imagen sea menos de 2 MB.",
   "admin.team.uploaded": "Subida!",
@@ -1121,7 +1107,8 @@
   "channel_invite.close": "Cerrar",
   "channel_loader.connection_error": "Parece haber un problema con tu conexión a internet.",
   "channel_loader.posted": "Publicó",
-  "channel_loader.socketError": "No se puede conectar con Mattermost, por favor revise su conexión. Si el problema persiste, solicite a un administrador que revise el puerto del WebSocket.",
+  "channel_loader.postedImage": " publicó una imagen",
+  "channel_loader.socketError": "Por favor, revisa la conexión, Mattermost no puede contactarse. Si el problema persiste, solicite al administrador que <a href=\"https://about.mattermost.com/default-websocket-port-help\" target=\"_blank\">revise el puerto del WebSocket</a>",
   "channel_loader.someone": "Alguien",
   "channel_loader.something": " hizo algo nuevo",
   "channel_loader.unknown_error": "Hemos recibido un código de estado inesperado del servidor.",
@@ -1718,6 +1705,9 @@
   "mobile.custom_list.no_results": "Sin resultados",
   "mobile.drawer.teamsTitle": "Equipos",
   "mobile.edit_post.title": "Editando Mensaje",
+  "mobile.error_handler.button": "Reiniciar",
+  "mobile.error_handler.description": "\nPresiona reiniciar para abrir la aplicación de nuevo. Después de reiniciar, puedes reportar el problema desde el menú de configuración.\n",
+  "mobile.error_handler.title": "Ocurrió un error inesperado.",
   "mobile.file_upload.camera": "Sacar Foto o Vídeo",
   "mobile.file_upload.library": "Librería de Fotos",
   "mobile.file_upload.more": "Más",
@@ -1769,6 +1759,9 @@
   "mobile.select_team.join_open": "Equipos a los que te puedes unir",
   "mobile.select_team.no_teams": "No hay equipos disponibles a los que te puedas unir.",
   "mobile.server_ping_failed": "No se puede conectar con el servidor. Por favor verifica el URL ingresado y que tengas conexión a internet.",
+  "mobile.server_upgrade.button": "Aceptar",
+  "mobile.server_upgrade.description": "\nEs necesaria una actualización del servidor para utilizar la aplicación de Mattermost. Por favor, preguntale a tu Administrador del Sistema para obtener más detalles.\n",
+  "mobile.server_upgrade.title": "Es necesario actualizar el Servidor",
   "mobile.server_url.invalid_format": "URL debe comenzar con http:// o https://",
   "mobile.session_expired": "Sesión Caducada: Por favor, inicia sesión para seguir recibiendo notificaciones.",
   "mobile.settings.team_selection": "Seleccionar Equipo",
@@ -2192,8 +2185,6 @@
   "user.settings.display.collapseOff": "Colapsado",
   "user.settings.display.collapseOn": "Expandido",
   "user.settings.display.fixedWidthCentered": "De ancho fijo, centrado",
-  "user.settings.display.fontDesc": "Selecciona la fuente con la que quieres ver la interfaz de Mattermost.",
-  "user.settings.display.fontTitle": "Fuente de Visualización",
   "user.settings.display.fullScreen": "De ancho total",
   "user.settings.display.language": "Idioma",
   "user.settings.display.messageDisplayClean": "Estándar",
@@ -2209,7 +2200,7 @@
   "user.settings.display.showFullname": "Mostrar nombre y apellido",
   "user.settings.display.showNickname": "Mostrar el sobrenombre si existe, de lo contrario mostrar el nombre y apellido",
   "user.settings.display.showUsername": "Mostrar el nombre de usuario (predeterminado)",
-  "user.settings.display.teammateDisplay": "Visualización del nombre de los integrantes",
+  "user.settings.display.teammateNameDisplay": "Visualización del nombre de los compañeros",
   "user.settings.display.theme.applyToAllTeams": "Aplicar el nuevo tema para todos mis equipos",
   "user.settings.display.theme.customTheme": "Tema Personalizado",
   "user.settings.display.theme.describe": "Abrir para administrar tu tema",
diff --git a/webapp/i18n/fr.json b/webapp/i18n/fr.json
index 22e4c23661..83e485c7b4 100644
--- a/webapp/i18n/fr.json
+++ b/webapp/i18n/fr.json
@@ -415,18 +415,6 @@
   "admin.image.maxFileSizeDescription": "Taille maximum des pièce jointes en Mo. Attention : vérifiez que la mémoire du serveur puisse supporter votre saisie. Les gros fichiers augmentent les risques de crash serveur de de téléchargement échoués à cause des erreurs réseau.",
   "admin.image.maxFileSizeExample": "50",
   "admin.image.maxFileSizeTitle": "Taille de fichier maximum :",
-  "admin.image.previewHeightDescription": "Hauteur maxi de l'aperçu d'image (\"0\" pour taille automatique). Mettre cette valeur à jour change la manière dont les aperçus d'image seront générés par la suite, mais ne modifie pas les aperçus déjà générés.",
-  "admin.image.previewHeightExample": "Ex. : \"0\"",
-  "admin.image.previewHeightTitle": "Hauteur d'aperçu d'image :",
-  "admin.image.previewWidthDescription": "Largeur maximale de l'aperçu d'image. Mettre cette valeur à jour change la manière dont les aperçus d'image seront générés par la suite, mais ne modifie pas les aperçus déjà générés.",
-  "admin.image.previewWidthExample": "Ex. : \"1024\"",
-  "admin.image.previewWidthTitle": "Largeur d'aperçu d'image :",
-  "admin.image.profileHeightDescription": "Hauteur de la photo de profil",
-  "admin.image.profileHeightExample": "Ex. : \"0\"",
-  "admin.image.profileHeightTitle": "Hauteur de photo de profil :",
-  "admin.image.profileWidthDescription": "Largeur de la photo de profil.",
-  "admin.image.profileWidthExample": "Ex. : \"1024\"",
-  "admin.image.profileWidthTitle": "Largeur de photo de profil :",
   "admin.image.publicLinkDescription": "Clé de salage de 32 caractères ajoutée aux e-mails d'invitation. Générée aléatoirement lors de l'installation. Veuillez cliquer sur \"Regénérer\" pour créer une nouvelle clé de salage.",
   "admin.image.publicLinkExample": "Ex. : \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
   "admin.image.publicLinkTitle": "Clé de salage publique :",
@@ -436,12 +424,6 @@
   "admin.image.storeDescription": "Système de stockage où les fichiers, images et pièces jointes sont enregistrés.<br /><br />Choisissez \"Amazon S3\" pour saisir vos accès à Amazon et le bucket où stocker vos fichiers.<br /><br />Sélectionnez \"Système de fichier local\" pour choisir le répertoire du serveur où enregistrer les fichiers.",
   "admin.image.storeLocal": "Disque local",
   "admin.image.storeTitle": "Système de stockage des fichiers :",
-  "admin.image.thumbHeightDescription": "Hauteur des miniatures générées pour les images envoyées. Changer cette valeur modifie la façon dont les miniatures apparaîtront dans le futur, mais ne modifie pas les images créées précédemment.",
-  "admin.image.thumbHeightExample": "Ex. : \"100\"",
-  "admin.image.thumbHeightTitle": "Hauteur des miniatures de pièces jointes :",
-  "admin.image.thumbWidthDescription": "Largeur des miniatures générées pour les images envoyées. Changer cette valeur modifie la façon dont les miniatures apparaîtront dans le futur, mais ne modifie pas les images créées précédemment.",
-  "admin.image.thumbWidthExample": "Ex. : \"120\"",
-  "admin.image.thumbWidthTitle": "Largeur des miniatures de pièces jointes :",
   "admin.integrations.custom": "Intégrations personnalisées",
   "admin.integrations.external": "Services externes",
   "admin.integrations.webrtc": "Mattermost WebRTC",
@@ -782,7 +764,6 @@
   "admin.sidebar.files": "Ficher",
   "admin.sidebar.general": "Général",
   "admin.sidebar.gitlab": "GitLab",
-  "admin.sidebar.images": "Images",
   "admin.sidebar.integrations": "Intégrations",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "Mentions légales",
@@ -891,11 +872,16 @@
   "admin.team.restrictTitle": "Restreindre la création de compte à ces domaines :",
   "admin.team.restrict_direct_message_any": "Tout utilisateur sur le serveur Mattermost",
   "admin.team.restrict_direct_message_team": "Tout les membres de l’équipe",
+  "admin.team.showFullname": "Show first and last name (default)",
+  "admin.team.showNickname": "Afficher le pseudo s'il existe, sinon afficher le prénom d'abord puis le nom",
+  "admin.team.showUsername": "Show username",
   "admin.team.siteNameDescription": "Nom du service affiché dans les écrans de connexion et l'interface.",
   "admin.team.siteNameExample": "Ex. : \"Mattermost\"",
   "admin.team.siteNameTitle": "Nom du site :",
   "admin.team.teamCreationDescription": "Si désactivé, seuls les administrateurs système peuvent créer des équipes.",
   "admin.team.teamCreationTitle": "Autoriser la création d'équipes : ",
+  "admin.team.teammateNameDisplay": "Affichage des membres de l'équipe",
+  "admin.team.teammateNameDisplayDesc": "Choisissez comment afficher les autres utilisateurs dans les messages et les listes de messages privés.",
   "admin.team.upload": "Télécharger",
   "admin.team.uploadDesc": "Personnalisez votre expérience utilisateur en ajoutant une image personnalisée sur votre écran de connexion. Taille d'image recommandée inférieure à 2Mio.",
   "admin.team.uploaded": "téléchargement terminé!",
@@ -1121,7 +1107,8 @@
   "channel_invite.close": "Fermer",
   "channel_loader.connection_error": "Oups... Il semble que votre connexion internet ait un problème...",
   "channel_loader.posted": "Posté",
-  "channel_loader.socketError": "Vérifiez votre connexion, impossible de se connecter à Mattermost. Si ce problème persiste, demandez à un administrateur de vérifier le port WebSocket.",
+  "channel_loader.postedImage": " téléchargé une image",
+  "channel_loader.socketError": "Please check connection, Mattermost unreachable. If issue persists, ask administrator to <a href=\"https://about.mattermost.com/default-websocket-port-help\" target=\"_blank\">check WebSocket port</a>.",
   "channel_loader.someone": "Quelqu'un",
   "channel_loader.something": " a fait quelque chose",
   "channel_loader.unknown_error": "Réponse incorrecte de la part du serveur.",
@@ -1718,6 +1705,9 @@
   "mobile.custom_list.no_results": "Aucun résultat",
   "mobile.drawer.teamsTitle": "Équipes",
   "mobile.edit_post.title": "Edition du message",
+  "mobile.error_handler.button": "Relaunch",
+  "mobile.error_handler.description": "\nClick relaunch to open the app again. After restart, you can report the problem from the settings menu.\n",
+  "mobile.error_handler.title": "Unexpected error occurred",
   "mobile.file_upload.camera": "Prendre une photo ou une vidéo",
   "mobile.file_upload.library": "Bibliothèque de photos",
   "mobile.file_upload.more": "Plus…",
@@ -1769,6 +1759,9 @@
   "mobile.select_team.join_open": "Les autres équipes que vous pouvez rejoindre.",
   "mobile.select_team.no_teams": "Il n'y a aucune équipe disponible que vous pouvez rejoindre.",
   "mobile.server_ping_failed": "Impossible de se connecter au serveur. Veuillez vérifier l'URL de votre serveur et votre connexion internet.",
+  "mobile.server_upgrade.button": "OK",
+  "mobile.server_upgrade.description": "\nA server upgrade is required to use the Mattermost app. Please ask your System Administrator for details.\n",
+  "mobile.server_upgrade.title": "Server upgrade required",
   "mobile.server_url.invalid_format": "L'URL doit commencer par http:// ou https://",
   "mobile.session_expired": "La session a expiré. Veuillez vous connecter pour continuer à recevoir les notifications.",
   "mobile.settings.team_selection": "Sélection d'équipe",
@@ -2192,8 +2185,6 @@
   "user.settings.display.collapseOff": "Réduit",
   "user.settings.display.collapseOn": "Etendu",
   "user.settings.display.fixedWidthCentered": "Largeur fixe, centré",
-  "user.settings.display.fontDesc": "Choisissez la police de caractères utilisée pour l'interface de Mattermost.",
-  "user.settings.display.fontTitle": "Police d'affichage",
   "user.settings.display.fullScreen": "Largeur pleine",
   "user.settings.display.language": "Langue",
   "user.settings.display.messageDisplayClean": "Standard",
@@ -2209,7 +2200,7 @@
   "user.settings.display.showFullname": "Afficher prénom et nom",
   "user.settings.display.showNickname": "Afficher le pseudo s'il existe, sinon afficher le prénom d'abord puis le nom",
   "user.settings.display.showUsername": "Afficher le nom d'utilisateur (défaut)",
-  "user.settings.display.teammateDisplay": "Affichage des membres de l'équipe",
+  "user.settings.display.teammateNameDisplay": "Affichage des membres de l'équipe",
   "user.settings.display.theme.applyToAllTeams": "Appliquer le nouveau thème à toutes mes équipes",
   "user.settings.display.theme.customTheme": "Thème personnalisé",
   "user.settings.display.theme.describe": "Ouvrez pour gérer votre thème",
diff --git a/webapp/i18n/it.json b/webapp/i18n/it.json
index ed604dd776..f483ee739f 100644
--- a/webapp/i18n/it.json
+++ b/webapp/i18n/it.json
@@ -415,18 +415,6 @@
   "admin.image.maxFileSizeDescription": "Dimensione massima per gli allegati dei messaggi in megabytes. Attenzione: Verificare che il server disponga di sufficiente memoria per supportare la tua scelta.",
   "admin.image.maxFileSizeExample": "50",
   "admin.image.maxFileSizeTitle": "Dimensione Massima File:",
-  "admin.image.previewHeightDescription": "Altezza massima dell'anteprima immagine (\"0\": imposta la dimensione automaticamente). Aggiornando questo valore viene modificato l'aspetto delle immagini caricate in futuro, questo non ha effetto sui precedenti caricamenti.",
-  "admin.image.previewHeightExample": "Es.: \"10\"",
-  "admin.image.previewHeightTitle": "Altezza Antemprima Immagine:",
-  "admin.image.previewWidthDescription": "Larghezza massima dell'anteprima immagine. Aggiornando questo valore viene modificato l'aspetto delle immagini caricate in futuro, questo non ha effetto sui precedenti caricamenti. ",
-  "admin.image.previewWidthExample": "Es.: \"10\"",
-  "admin.image.previewWidthTitle": "Larghezza Anteprima immagine:",
-  "admin.image.profileHeightDescription": "Altezza dell'immagine profilo.",
-  "admin.image.profileHeightExample": "Es.: \"0\"",
-  "admin.image.profileHeightTitle": "Altezza immagine Profilo:",
-  "admin.image.profileWidthDescription": "Larghezza immagine profilo.",
-  "admin.image.profileWidthExample": "Es.: \"1024\"",
-  "admin.image.profileWidthTitle": "Larghezza Immagine Profilo:",
   "admin.image.publicLinkDescription": "Salt di 32 caratteri aggiunto per firmare i collegamenti pubblici alle immagini. Viene generato casualmente ad ogni installazione. Clic su \"Rigenera\" per creare un nuovo salt.",
   "admin.image.publicLinkExample": "Es.: \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
   "admin.image.publicLinkTitle": "Collegamento salt pubblico:",
@@ -436,12 +424,6 @@
   "admin.image.storeDescription": "Il sistema di storage dove allegati file ed immagini vengono salvati.<br /><br />Selezionando \"Amazon S3\" verranno abilitati i campi in cui immettere le credenziali ed il nome del bucket Amazon.<br /><br />Selezionando \"Filesystem Locale\" verrà abilitato il campo necessario per specificare il percorso ad una cartella locale.",
   "admin.image.storeLocal": "Filesystem Locale",
   "admin.image.storeTitle": "Sistema di Storage File:",
-  "admin.image.thumbHeightDescription": "Altezza delle anteprime generate dai file caricati. Aggiornare questo valore modifica il modo con cui verranno visualizzate le immagini in futuro, ma non quelle create in passato.",
-  "admin.image.thumbHeightExample": "Es.: \"100\"",
-  "admin.image.thumbHeightTitle": "Altezza Anteprima Allegato:",
-  "admin.image.thumbWidthDescription": "Larghezza delle anteprime generate dai file caricati. Aggiornare questo valore modifica il modo con cui verranno visualizzate le immagini in futuro, ma non quelle create in passato. ",
-  "admin.image.thumbWidthExample": "Es.: \"120\"",
-  "admin.image.thumbWidthTitle": "Larghezza Anteprima Allegati:",
   "admin.integrations.custom": "Integrazione personalizzata",
   "admin.integrations.external": "Servizi esterni",
   "admin.integrations.webrtc": "Mattermost WebRTC",
@@ -782,7 +764,6 @@
   "admin.sidebar.files": "Files",
   "admin.sidebar.general": "Generale",
   "admin.sidebar.gitlab": "GitLab",
-  "admin.sidebar.images": "Immagini",
   "admin.sidebar.integrations": "Integrazioni",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "Aspetti legali e supporto",
@@ -832,7 +813,7 @@
   "admin.sql.maxOpenTitle": "Numero massimo di connessioni:",
   "admin.sql.noteDescription": "Modificare le impostazioni in questa sezione richiede un riavvio del server affinché abbiano effetto.",
   "admin.sql.noteTitle": "Nota:",
-  "admin.sql.queryTimeoutDescription": "Il numero di secondi in cui attende una risposta dal database dopo aver aperto una connessione e inviato una richiesta. Errori visibili nell'interfaccia utente oppure nei log come risultato di un timeout di una query possono dipendere dal tipo di query. Questa impostazione non ha effetto su database PostgreSQL.",
+  "admin.sql.queryTimeoutDescription": "Il numero di secondi da attendere una risposta dal database dopo aver aperto una connessione e inviato una richiesta. Gli errori visualizzati nell'interfaccia utente oppure nei log come risultato di un timeout di una query possono cambiare a seconda del tipo di query.",
   "admin.sql.queryTimeoutExample": "Es.: \"30\"",
   "admin.sql.queryTimeoutTitle": "Timeout Query:",
   "admin.sql.replicas": "Repliche sorgente dati:",
@@ -891,11 +872,16 @@
   "admin.team.restrictTitle": "Restringi la creazione di account ai domini specificati:",
   "admin.team.restrict_direct_message_any": "Qualunque utente sul server Mattermost",
   "admin.team.restrict_direct_message_team": "Qualsiasi membro del gruppo",
+  "admin.team.showFullname": "Show first and last name (default)",
+  "admin.team.showNickname": "Visualizza soprannome se esiste, altrimenti visualizza nome e cognome",
+  "admin.team.showUsername": "Show username",
   "admin.team.siteNameDescription": "Nome del servizio visualizzato nella pagina di accesso e nell'interfaccia utente.",
   "admin.team.siteNameExample": "Es.: \"Mattermost\"",
   "admin.team.siteNameTitle": "Nome del sito:",
   "admin.team.teamCreationDescription": "Se false, solo gli Amministratori di Sistema possono creare Gruppi.",
   "admin.team.teamCreationTitle": "Abilita creazione gruppi:",
+  "admin.team.teammateNameDisplay": "Visualizza nome collega",
+  "admin.team.teammateNameDisplayDesc": "Seleziona come visualizzare i nomi degli altri utenti nelle pubblicazioni e nelle liste dei messaggi diretti.",
   "admin.team.upload": "Carica",
   "admin.team.uploadDesc": "Personalizza la tua esperienza utente aggiungendo un'immagine personalizzata alla pagina di accesso. La dimensione massima raccomandata per l'immagine è inferiore ai 2 MB.",
   "admin.team.uploaded": "Caricato!",
@@ -1121,7 +1107,8 @@
   "channel_invite.close": "Chiudi",
   "channel_loader.connection_error": "Sembra esserci un problema con la tua connessione internet.",
   "channel_loader.posted": "Pubblicato",
-  "channel_loader.socketError": "Controlla la connessione, Mattermost è irragiungibile. Se questo problema persiste, chiedi all'amministratore di controllare la porta del Websocket.",
+  "channel_loader.postedImage": " ha caricato un'immagine",
+  "channel_loader.socketError": "Controlla la connessione, Mattermost non è raggiungibile. Se il problema persiste chiedi al tuo Amministratore di Sistema di <a href=\"https://about.mattermost.com/default-websocket-port-help\" target=\"_blank\">controllare la porta del WebSocket</a>.",
   "channel_loader.someone": "Qualcuno",
   "channel_loader.something": " ha fatto qualcosa di nuovo",
   "channel_loader.unknown_error": "Abbiamo ricevuto un codice di stato inaspettato dal server.",
@@ -1332,7 +1319,7 @@
   "error_bar.expiring": "La licenza Enterprise scade il {date}. <a href='{link}' target='_blank'>Rinnova ora la licenza</a>.",
   "error_bar.past_grace": "La licenza Enterprise è scaduta e alcune funzionalità possono essere state disattivate. Contatta il tuo Amministratore di Sistema per ulteriori dettagli.",
   "error_bar.preview_mode": "Modalità anteprima: Le notifiche email non sono state configurate",
-  "error_bar.site_url": "Configura il tuo {docsLink} nel {link}.",
+  "error_bar.site_url": "Configura il tuo {docsLink} nella {link}.",
   "error_bar.site_url.docsLink": "URL del sito",
   "error_bar.site_url.link": "Console di Sistema",
   "error_bar.site_url_gitlab": "Configura il tuo {docsLink} nella Console di Sistema o in gitlab.rb se stai usando GitLab Mattermost.",
@@ -1688,7 +1675,7 @@
   "mobile.channel_info.alertTitleDeleteChannel": "Elimina {term}",
   "mobile.channel_info.alertTitleLeaveChannel": "Tralascia {term}",
   "mobile.channel_info.alertYes": "Si",
-  "mobile.channel_info.delete_failed": "We couldn't delete the channel {displayName}. Please check your connection and try again.",
+  "mobile.channel_info.delete_failed": "Impossibile cancellare il canale {displayName}. Controlla la connessione e riprova.",
   "mobile.channel_info.privateChannel": "Canale privato",
   "mobile.channel_info.publicChannel": "Canale Pubblico",
   "mobile.channel_list.alertMessageLeaveChannel": "Sei sicuro di voler tralasciare questo {term} {name}?",
@@ -1718,6 +1705,9 @@
   "mobile.custom_list.no_results": "Nessun risultato",
   "mobile.drawer.teamsTitle": "Gruppi",
   "mobile.edit_post.title": "Modifica Messaggio",
+  "mobile.error_handler.button": "Riavvia",
+  "mobile.error_handler.description": "\nClicca riavvia per aprire di nuovo l'app. Dopo il riavvio, puoi segnalare il problema dal menu impostazioni.\n",
+  "mobile.error_handler.title": "Rilevato errore non previsto",
   "mobile.file_upload.camera": "Scatta una Foto o registra un Video",
   "mobile.file_upload.library": "Galleria Fotografica",
   "mobile.file_upload.more": "Più",
@@ -1726,7 +1716,7 @@
   "mobile.intro_messages.DM": "Questo è l'inizio della tua conversazione privata con {teammate}. Messaggi diretti e file condivisi qui non saranno accessibili ad altre persone.",
   "mobile.intro_messages.default_message": "Questo è il primo canale che i colleghi vedranno una volta effettuato l'accesso - usalo per comunicare aggiornamenti che chiunque dovrebbe conoscere.",
   "mobile.intro_messages.default_welcome": "Benvenuto a {name}!",
-  "mobile.join_channel.error": "We couldn't join the channel {displayName}. Please check your connection and try again.",
+  "mobile.join_channel.error": "Impossibile aggiungere il canale {displayName}. Controlla la connessione e riprova.",
   "mobile.loading_channels": "Caricamento Canali...",
   "mobile.loading_members": "Caricamento Membri...",
   "mobile.loading_posts": "Caricamento Messaggi...",
@@ -1735,7 +1725,7 @@
   "mobile.offlineIndicator.connected": "Connesso",
   "mobile.offlineIndicator.connecting": "Connessione...",
   "mobile.offlineIndicator.offline": "Nessuna connessione internet",
-  "mobile.open_dm.error": "We couldn't open a direct message with {displayName}. Please check your connection and try again.",
+  "mobile.open_dm.error": "Impossibile aprire un messaggio diretto con {displayName}. Controlla la connessione e riprova.",
   "mobile.post.cancel": "Annulla",
   "mobile.post.delete_question": "Sei sicuro di voler eliminare questo post?",
   "mobile.post.delete_title": "Elimina Post",
@@ -1769,6 +1759,9 @@
   "mobile.select_team.join_open": "Gruppi librei a cui puoi accedere",
   "mobile.select_team.no_teams": "Non ci sono gruppi disponibili",
   "mobile.server_ping_failed": "Impossibile connettersi al server. Per favore controlla l'URL del tuo server e la connessione internet.",
+  "mobile.server_upgrade.button": "OK",
+  "mobile.server_upgrade.description": "\nE' richiesto un aggiornamento del server per usare l'app di Mattermost. Chiedi al tuo Amministratore di Sistema per i dettagli.\n",
+  "mobile.server_upgrade.title": "Richiesto aggiornamento del server",
   "mobile.server_url.invalid_format": "L'URL Deve iniziare con http:// o https://",
   "mobile.session_expired": "Sessione scaduta: accedere per ricevere le notifiche.",
   "mobile.settings.team_selection": "Seleziona gruppo",
@@ -1795,7 +1788,7 @@
   "msg_typing.someone": "Qualcuno",
   "multiselect.add": "Aggiungi",
   "multiselect.go": "Vai",
-  "multiselect.numPeopleRemaining": "Use ↑↓ to browse, ↵ to select. You can add {num, number} more {num, plural, one {person} other {people}}. ",
+  "multiselect.numPeopleRemaining": "Usa ↑↓ per navigare, ↵ per scegliere. Puoi aggiungere {num, number} più {num, plural, one {person} altre {people}}. ",
   "multiselect.numRemaining": "Si possono ancora aggiungere {num, number}",
   "multiselect.placeholder": "Cercare ed aggiungere membri",
   "navbar.addMembers": "Aggiungi Membro",
@@ -2192,8 +2185,6 @@
   "user.settings.display.collapseOff": "Contratto",
   "user.settings.display.collapseOn": "Espanso",
   "user.settings.display.fixedWidthCentered": "Larghezza fissa, centrato",
-  "user.settings.display.fontDesc": "Seleziona il carattere utilizzato dall'interfaccia utente di Mattermost.",
-  "user.settings.display.fontTitle": "Carattere visualizzato",
   "user.settings.display.fullScreen": "A tutta larghezza",
   "user.settings.display.language": "Lingua",
   "user.settings.display.messageDisplayClean": "Standard",
@@ -2209,7 +2200,7 @@
   "user.settings.display.showFullname": "Visualizza nome e cognome",
   "user.settings.display.showNickname": "Visualizza soprannome se esiste, altrimenti visualizza nome e cognome",
   "user.settings.display.showUsername": "Visualizza nome utente (default)",
-  "user.settings.display.teammateDisplay": "Visualizza nome collega",
+  "user.settings.display.teammateNameDisplay": "Visualizza nome collega",
   "user.settings.display.theme.applyToAllTeams": "Applica il nuovo tema a tutti i miei gruppi",
   "user.settings.display.theme.customTheme": "Tema personalizzato",
   "user.settings.display.theme.describe": "Apri per gestire il tema",
diff --git a/webapp/i18n/ja.json b/webapp/i18n/ja.json
index 86bd75d41c..13b96c3f9e 100644
--- a/webapp/i18n/ja.json
+++ b/webapp/i18n/ja.json
@@ -415,18 +415,6 @@
   "admin.image.maxFileSizeDescription": "メッセージに添付するファイルの最大サイズ(MB)。注意: サーバーメモリーがそのサイズをサポートできることを確認してください。巨大なファイルサイズはサーバーをクラッシュさせる恐れがあり、ネットワークの問題でアップロードが失敗するリスクも増加します。",
   "admin.image.maxFileSizeExample": "50",
   "admin.image.maxFileSizeTitle": "最大ファイルサイズ:",
-  "admin.image.previewHeightDescription": "プレビューイメージの最大高さ(\"0\"を設定すると自動でサイズが決められます)を指定します。この値を変更することで、設定以降の画像サイズが変更されます。しかし設定以前の画像サイズは変更されません。",
-  "admin.image.previewHeightExample": "例: \"0\"",
-  "admin.image.previewHeightTitle": "画像プレビューの高さ:",
-  "admin.image.previewWidthDescription": "プレビュー画像の最大幅(\"0\"を設定すると自動でサイズが決められます)を指定します。この値を変更することで、設定以降の画像サイズが変更されます。しかし設定以前の画像サイズは変更されません。",
-  "admin.image.previewWidthExample": "例: \"1024\"",
-  "admin.image.previewWidthTitle": "画像プレビューの幅:",
-  "admin.image.profileHeightDescription": "プロフィール画像の高さです。",
-  "admin.image.profileHeightExample": "例: \"0\"",
-  "admin.image.profileHeightTitle": "プロフィール画像の高さ:",
-  "admin.image.profileWidthDescription": "プロフィール画像の幅です。",
-  "admin.image.profileWidthExample": "例: \"1024\"",
-  "admin.image.profileWidthTitle": "プロフィール画像の幅:",
   "admin.image.publicLinkDescription": "公開画像リンクの署名に32文字のソルトを付与します。これはインストールするたびにランダムに生成されます。新しいソルトを生成するには「再生成する」をクリックしてください。",
   "admin.image.publicLinkExample": "例: \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
   "admin.image.publicLinkTitle": "公開リンクソルト:",
@@ -436,12 +424,6 @@
   "admin.image.storeDescription": "添付するファイルと画像を保存するストレージシステム。<br/><br/>\"Amazon S3\"を選択した場合、Amazonの認証情報の入力欄が有効化されます。<br/><br/>\"ローカルファイルシステム\"を選択した場合、ローカルのファイルディレクトリーの入力欄が有効化されます。",
   "admin.image.storeLocal": "ローカルファイルシステム",
   "admin.image.storeTitle": "ファイルストレージシステム:",
-  "admin.image.thumbHeightDescription": "アップロードされた画像から生成されるサムネイルの高さを指定します。この値を変更することで、設定以降のサムネイルサイズが変更されます。しかし設定以前の画像は変更されません。",
-  "admin.image.thumbHeightExample": "例: \"100\"",
-  "admin.image.thumbHeightTitle": "添付サムネイルの高さ:",
-  "admin.image.thumbWidthDescription": "アップロードされた画像から生成されるサムネイルの幅を指定します。この値を変更することで、設定以降のサムネイルサイズが変更されます。しかし設定以前の画像は変更されません。",
-  "admin.image.thumbWidthExample": "例: \"120\"",
-  "admin.image.thumbWidthTitle": "添付サムネイルの幅:",
   "admin.integrations.custom": "カスタム統合機能",
   "admin.integrations.external": "外部のサービス",
   "admin.integrations.webrtc": "Mattermost WebRTC",
@@ -782,7 +764,6 @@
   "admin.sidebar.files": "ファイル",
   "admin.sidebar.general": "全般",
   "admin.sidebar.gitlab": "GitLab",
-  "admin.sidebar.images": "画像",
   "admin.sidebar.integrations": "統合機能",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "法的事項とサポート",
@@ -832,7 +813,7 @@
   "admin.sql.maxOpenTitle": "最大稼働接続数:",
   "admin.sql.noteDescription": "このセクションでの設定値の変更を有効にするにはサーバーを再起動させる必要があります。",
   "admin.sql.noteTitle": "注意:",
-  "admin.sql.queryTimeoutDescription": "データベースに接続し、問い合わせを開始してからレスポンスを待つ秒数。問い合わせタイムアウトの結果としてUIやログで確認できるエラー内容は、問い合わせの種類によって異なります。この設定はPostgreSQLに対しては影響しません。",
+  "admin.sql.queryTimeoutDescription": "データベースに接続し、問い合わせを開始してからレスポンスを待つ秒数です。問い合わせタイムアウトの結果としてUIやログで確認できるエラー内容は、問い合わせの種類によって異なります。",
   "admin.sql.queryTimeoutExample": "例: \"30\"",
   "admin.sql.queryTimeoutTitle": "問い合わせタイムアウト:",
   "admin.sql.replicas": "データソースレプリカ:",
@@ -891,11 +872,16 @@
   "admin.team.restrictTitle": "特定のドメインに電子メールでのアカウント作成を制限する:",
   "admin.team.restrict_direct_message_any": "Mattermostの全てのユーザー",
   "admin.team.restrict_direct_message_team": "チームのメンバーのみ",
+  "admin.team.showFullname": "氏名を表示する (デフォルト)",
+  "admin.team.showNickname": "ニックネームが存在すればそれを表示する。存在していなければ氏名を表示する",
+  "admin.team.showUsername": "ユーザー名を表示する",
   "admin.team.siteNameDescription": "ログイン画面とユーザーインターフェースで表示されるサービス名です。",
   "admin.team.siteNameExample": "例: \"Mattermost\"",
   "admin.team.siteNameTitle": "サイト名:",
   "admin.team.teamCreationDescription": "無効な場合、システム管理者だけがチームを作成できます。",
   "admin.team.teamCreationTitle": "チーム作成を有効にする: ",
+  "admin.team.teammateNameDisplay": "チームメイトの名前の表示",
+  "admin.team.teammateNameDisplayDesc": "投稿やダイレクトメッセージ中の他のユーザーの名前の表示方法を設定します。",
   "admin.team.upload": "アップロードする",
   "admin.team.uploadDesc": "ログイン画面にカスタム画像を追加することで、ユーザー体験をカスタマイズできます。2MB以下の画像を推奨します。",
   "admin.team.uploaded": "アップロードしました!",
@@ -1121,7 +1107,8 @@
   "channel_invite.close": "閉じる",
   "channel_loader.connection_error": "あなたのインターネット接続には問題があるようです。",
   "channel_loader.posted": "投稿済",
-  "channel_loader.socketError": "Mattermostに接続できません。接続を確認してください。この状態が続くようであれば、システム管理者にWebSocketポートを確認するように依頼してください。",
+  "channel_loader.postedImage": " が画像をアップロードしました",
+  "channel_loader.socketError": "接続を確認してください、Mattermostに接続できません。問題が続くようならば、管理者に<a href=\"https://about.mattermost.com/default-websocket-port-help\" target=\"_blank\">ウェブソケットのポートを確認する</a>よう問い合わせてください。",
   "channel_loader.someone": "誰か",
   "channel_loader.something": " が何か新しいことをした",
   "channel_loader.unknown_error": "サーバーから想定していないステータスを受信しました。",
@@ -1688,7 +1675,7 @@
   "mobile.channel_info.alertTitleDeleteChannel": "{term} を削除する",
   "mobile.channel_info.alertTitleLeaveChannel": "{term}から脱退する",
   "mobile.channel_info.alertYes": "はい",
-  "mobile.channel_info.delete_failed": "We couldn't delete the channel {displayName}. Please check your connection and try again.",
+  "mobile.channel_info.delete_failed": "チャンネル {displayName} を削除できませんでした。接続を確認し、もう一度試してみてください。",
   "mobile.channel_info.privateChannel": "非公開チャンネル",
   "mobile.channel_info.publicChannel": "公開チャンネル",
   "mobile.channel_list.alertMessageLeaveChannel": "{term} {name} から本当に脱退しますか?",
@@ -1718,6 +1705,9 @@
   "mobile.custom_list.no_results": "該当するものはありません",
   "mobile.drawer.teamsTitle": "チーム",
   "mobile.edit_post.title": "メッセージ編集中",
+  "mobile.error_handler.button": "再起動",
+  "mobile.error_handler.description": "\nアプリケーションを再開するために再起動をクリックしてください。再起動した後、設定メニューから問題を報告してください。\n",
+  "mobile.error_handler.title": "予期しないエラーが発生しました。",
   "mobile.file_upload.camera": "写真もしくはビデオを撮る",
   "mobile.file_upload.library": "フォトライブラリー",
   "mobile.file_upload.more": "もっと",
@@ -1726,7 +1716,7 @@
   "mobile.intro_messages.DM": "{teammate}とのダイレクトメッセージの履歴の最初です。ダイレクトメッセージとそこで共有されているファイルは、この領域の外のユーザーからは見ることができません。",
   "mobile.intro_messages.default_message": "ここはチームメイトが利用登録した際に最初に見るチャンネルです - みんなが知るべき情報を投稿してください。",
   "mobile.intro_messages.default_welcome": "{name}へようこそ!",
-  "mobile.join_channel.error": "We couldn't join the channel {displayName}. Please check your connection and try again.",
+  "mobile.join_channel.error": "チャンネル {displayName} に参加できませんでした。接続を確認し、もう一度試してみてください。",
   "mobile.loading_channels": "チャンネルをロード中...",
   "mobile.loading_members": "メンバーをロード中...",
   "mobile.loading_posts": "メッセージをロード中...",
@@ -1735,7 +1725,7 @@
   "mobile.offlineIndicator.connected": "接続しました",
   "mobile.offlineIndicator.connecting": "接続中",
   "mobile.offlineIndicator.offline": "インターネット未接続",
-  "mobile.open_dm.error": "We couldn't open a direct message with {displayName}. Please check your connection and try again.",
+  "mobile.open_dm.error": "{displayName} とのダイレクトメッセージを開くことができませんでした。接続を確認し、もう一度試してみてください。",
   "mobile.post.cancel": "キャンセル",
   "mobile.post.delete_question": "この投稿を本当に削除しますか?",
   "mobile.post.delete_title": "投稿を削除する",
@@ -1769,6 +1759,9 @@
   "mobile.select_team.join_open": "参加可能なチームを開く",
   "mobile.select_team.no_teams": "あなたが参加できるチームはありません。",
   "mobile.server_ping_failed": "サーバーに接続できません。サーバーのURLとインターネット接続を確認してください。",
+  "mobile.server_upgrade.button": "OK",
+  "mobile.server_upgrade.description": "\nMattermostアプリケーションを利用するにはサーバーをアップグレードする必要があります。詳細についてはシステム管理者に問い合わせてください。\n",
+  "mobile.server_upgrade.title": "サーバーのアップグレードが必要です",
   "mobile.server_url.invalid_format": "URLはhttp://またはhttps://から始まらなくてはいけません",
   "mobile.session_expired": "セッション有効期限切れ: 通知を受け取るためにログインしてください。",
   "mobile.settings.team_selection": "チームを切り替える",
@@ -1795,7 +1788,7 @@
   "msg_typing.someone": "誰か",
   "multiselect.add": "追加",
   "multiselect.go": "ジャンプ",
-  "multiselect.numPeopleRemaining": "Use ↑↓ to browse, ↵ to select. You can add {num, number} more {num, plural, one {person} other {people}}. ",
+  "multiselect.numPeopleRemaining": "↑↓で閲覧、 ↵で選択。あと{num, number} {num, plural, one {person} other {people}} 追加できます。 ",
   "multiselect.numRemaining": "あと{num, number}人追加できます",
   "multiselect.placeholder": "メンバーを検索し追加します",
   "navbar.addMembers": "メンバーを追加する",
@@ -2192,8 +2185,6 @@
   "user.settings.display.collapseOff": "折り畳まれる",
   "user.settings.display.collapseOn": "展開される",
   "user.settings.display.fixedWidthCentered": "固定幅、中央寄せ",
-  "user.settings.display.fontDesc": "Mattermostユーザーインターフェイスで使うフォントを選択してください。",
-  "user.settings.display.fontTitle": "表示フォント",
   "user.settings.display.fullScreen": "最大幅",
   "user.settings.display.language": "言語",
   "user.settings.display.messageDisplayClean": "標準",
@@ -2206,10 +2197,10 @@
   "user.settings.display.nameOptsDesc": "投稿やダイレクトメッセージ中の他のユーザーの名前の表示方法を設定します。",
   "user.settings.display.normalClock": "時計の12時間表示(例: 4:00 PM)",
   "user.settings.display.preferTime": "時刻の表示形式を選択します。",
-  "user.settings.display.showFullname": "名前を表示する",
+  "user.settings.display.showFullname": "氏名を表示する",
   "user.settings.display.showNickname": "ニックネームが存在すればそれを表示する。存在していなければ氏名を表示する",
   "user.settings.display.showUsername": "ユーザー名を表示する(デフォルト)",
-  "user.settings.display.teammateDisplay": "チームメイトの名前の表示",
+  "user.settings.display.teammateNameDisplay": "チームメイトの名前の表示",
   "user.settings.display.theme.applyToAllTeams": "全ての自分のチームに新しいテーマを適用する",
   "user.settings.display.theme.customTheme": "カスタムテーマ",
   "user.settings.display.theme.describe": "テーマを管理する",
diff --git a/webapp/i18n/ko.json b/webapp/i18n/ko.json
index 603192231d..b89fb51f23 100644
--- a/webapp/i18n/ko.json
+++ b/webapp/i18n/ko.json
@@ -1,6 +1,6 @@
 {
   "about.close": "닫기",
-  "about.copyright": "Copyright 2016 Mattermost, Inc. All rights reserved",
+  "about.copyright": "Copyright 2015 - {currentYear} Mattermost, Inc. All rights reserved",
   "about.database": "데이터베이스:",
   "about.date": "빌드 일자:",
   "about.enterpriseEditionLearn": "엔터프라이즈 에디션에 대한 자세한 정보 ",
@@ -137,7 +137,7 @@
   "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Choose when to trigger the outgoing webhook; if the first word of a message matches a Trigger Word exactly, or if it starts with a Trigger Word.",
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "First word matches a trigger word exactly",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "First word starts with a trigger word",
-  "add_users_to_team.title": "Add New Members To {teamName} Team",
+  "add_users_to_team.title": "{teamName}팀에 새 멤버 추가",
   "admin.advance.cluster": "High Availability",
   "admin.advance.metrics": "Performance Monitoring",
   "admin.audits.reload": "사용자 활동 기록 새로고침",
@@ -415,18 +415,6 @@
   "admin.image.maxFileSizeDescription": "Maximum file size for message attachments in megabytes. Caution: Verify server memory can support your setting choice. Large file sizes increase the risk of server crashes and failed uploads due to network interruptions.",
   "admin.image.maxFileSizeExample": "50",
   "admin.image.maxFileSizeTitle": "최대 파일 크기:",
-  "admin.image.previewHeightDescription": "Maximum height of preview image (\"0\": Sets to auto-size). Updating this value changes how preview images render in future, but does not change images created in the past.",
-  "admin.image.previewHeightExample": "예시 \"0\"",
-  "admin.image.previewHeightTitle": "이미지 미리보기 높이:",
-  "admin.image.previewWidthDescription": "Maximum width of preview image. Updating this value changes how preview images render in future, but does not change images created in the past.",
-  "admin.image.previewWidthExample": "예시 \"1024\"",
-  "admin.image.previewWidthTitle": "이미지 미리보기 너비:",
-  "admin.image.profileHeightDescription": "Height of profile picture.",
-  "admin.image.profileHeightExample": "예시 \"0\"",
-  "admin.image.profileHeightTitle": "프로필 사진 높이:",
-  "admin.image.profileWidthDescription": "Width of profile picture.",
-  "admin.image.profileWidthExample": "예시 \"1024\"",
-  "admin.image.profileWidthTitle": "프로필 사진 너비:",
   "admin.image.publicLinkDescription": "32-character salt added to signing of public image links. Randomly generated on install. Click \"Regenerate\" to create new salt.",
   "admin.image.publicLinkExample": "예시 \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
   "admin.image.publicLinkTitle": "공개 링크 Salt:",
@@ -436,12 +424,6 @@
   "admin.image.storeDescription": "Storage system where files and image attachments are saved.<br /><br />Selecting \"Amazon S3\" enables fields to enter your Amazon credentials and bucket details.<br /><br />Selecting \"Local File System\" enables the field to specify a local file directory.",
   "admin.image.storeLocal": "로컬 파일 시스템",
   "admin.image.storeTitle": "파일 저장소 시스템:",
-  "admin.image.thumbHeightDescription": "Height of thumbnails generated from uploaded images. Updating this value changes how thumbnail images render in future, but does not change images created in the past.",
-  "admin.image.thumbHeightExample": "예시 \"100\"",
-  "admin.image.thumbHeightTitle": "첨부파일 썸네일 높이:",
-  "admin.image.thumbWidthDescription": "Width of thumbnails generated from uploaded images. Updating this value changes how thumbnail images render in future, but does not change images created in the past.",
-  "admin.image.thumbWidthExample": "예시 \"120\"",
-  "admin.image.thumbWidthTitle": "첨부파일 썸네일 너비:",
   "admin.integrations.custom": "Custom Integrations",
   "admin.integrations.external": "외부 서비스",
   "admin.integrations.webrtc": "Mattermost WebRTC",
@@ -782,7 +764,6 @@
   "admin.sidebar.files": "파일",
   "admin.sidebar.general": "일반",
   "admin.sidebar.gitlab": "GitLab",
-  "admin.sidebar.images": "이미지",
   "admin.sidebar.integrations": "통합",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "지원",
@@ -832,7 +813,7 @@
   "admin.sql.maxOpenTitle": "Maximum Open Connections:",
   "admin.sql.noteDescription": "Changing properties in this section will require a server restart before taking effect.",
   "admin.sql.noteTitle": "Note:",
-  "admin.sql.queryTimeoutDescription": "The number of seconds to wait for a response from the database after opening a connection and sending the query. Errors that you see in the UI or in the logs as a result of a query timeout can vary depending on the type of query. This setting has no effect on PostgreSQL databases.",
+  "admin.sql.queryTimeoutDescription": "The number of seconds to wait for a response from the database after opening a connection and sending the query. Errors that you see in the UI or in the logs as a result of a query timeout can vary depending on the type of query.",
   "admin.sql.queryTimeoutExample": "예시 \"30\"",
   "admin.sql.queryTimeoutTitle": "Query Timeout:",
   "admin.sql.replicas": "Data Source Replicas:",
@@ -891,11 +872,16 @@
   "admin.team.restrictTitle": "Restrict account creation to specified email domains:",
   "admin.team.restrict_direct_message_any": "Any user on the Mattermost server",
   "admin.team.restrict_direct_message_team": "Any member of the team",
+  "admin.team.showFullname": "Show first and last name (default)",
+  "admin.team.showNickname": "별명이 있으면 별명으로 보기, 없으면 본명으로 보기",
+  "admin.team.showUsername": "Show username",
   "admin.team.siteNameDescription": "Name of service shown in login screens and UI.",
   "admin.team.siteNameExample": "예시 \"Mattermost\"",
   "admin.team.siteNameTitle": "사이트 이름:",
   "admin.team.teamCreationDescription": "When false, only System Administrators can create teams.",
   "admin.team.teamCreationTitle": "팀 생성: ",
+  "admin.team.teammateNameDisplay": "사용자명 표시",
+  "admin.team.teammateNameDisplayDesc": "글과 대화 목록에서 사용자의 이름이 어떻게 표시될 지 선택하세요.",
   "admin.team.upload": "업로드",
   "admin.team.uploadDesc": "Customize your user experience by adding a custom image to your login screen. Recommended maximum image size is less than 2 MB.",
   "admin.team.uploaded": "업로드 완료!",
@@ -1121,7 +1107,8 @@
   "channel_invite.close": "닫기",
   "channel_loader.connection_error": "There appears to be a problem with your internet connection.",
   "channel_loader.posted": "Posted",
-  "channel_loader.socketError": "Please check connection, Mattermost unreachable. If issue persists, ask administrator to check WebSocket port.",
+  "channel_loader.postedImage": " uploaded an image",
+  "channel_loader.socketError": "Please check connection, Mattermost unreachable. If issue persists, ask administrator to <a href=\"https://about.mattermost.com/default-websocket-port-help\" target=\"_blank\">check WebSocket port</a>.",
   "channel_loader.someone": "Someone",
   "channel_loader.something": " did something new",
   "channel_loader.unknown_error": "We received an unexpected status code from the server.",
@@ -1138,12 +1125,12 @@
   "channel_members_modal.members": " 회원",
   "channel_modal.cancel": "취소",
   "channel_modal.createNew": "새로 만들기",
-  "channel_modal.descriptionHelp": "{term}은 이렇게 사용되어야 합니다.",
+  "channel_modal.descriptionHelp": "이 채널은 이렇게 사용되어야 합니다.",
   "channel_modal.displayNameError": "Channel name must be 2 or more characters",
   "channel_modal.edit": "편집",
   "channel_modal.header": "헤더",
   "channel_modal.headerEx": "E.g.: \"[Link Title](http://example.com)\"",
-  "channel_modal.headerHelp": "{term} 상단 이름 옆에 표시될 텍스트를 입력하세요. 예를 들면, 다음과 같이 자주 사용되는 링크를 등록할 수 있습니다. [링크](http://example.com).",
+  "channel_modal.headerHelp": "채널 이름 옆에있는 채널의 헤더에 표시될 텍스트를 입력하십시오. 예를 들면, 다음과 같이 자주 사용되는 링크 [링크 제목] (http://example.com)를 등록할수 있습니다.",
   "channel_modal.modalTitle": "New Channel",
   "channel_modal.name": "이름",
   "channel_modal.nameEx": "예시: \"버그\", \"마케팅\", \"고객지원\"",
@@ -1592,7 +1579,7 @@
   "invite_member.modalButton": "네, 취소합니다.",
   "invite_member.modalMessage": "You have unsent invitations, are you sure you want to discard them?",
   "invite_member.modalTitle": "초대를 취소하시겠습니까?",
-  "invite_member.newMember": "Send Email Invite",
+  "invite_member.newMember": "초대 메일 발송",
   "invite_member.send": "보내기",
   "invite_member.send2": "보내기",
   "invite_member.sending": " 보내는 중",
@@ -1718,6 +1705,9 @@
   "mobile.custom_list.no_results": "No Results",
   "mobile.drawer.teamsTitle": "서비스 약관",
   "mobile.edit_post.title": "Editing Message",
+  "mobile.error_handler.button": "Relaunch",
+  "mobile.error_handler.description": "\nClick relaunch to open the app again. After restart, you can report the problem from the settings menu.\n",
+  "mobile.error_handler.title": "Unexpected error occurred",
   "mobile.file_upload.camera": "Take Photo or Video",
   "mobile.file_upload.library": "Photo Library",
   "mobile.file_upload.more": "더 보기",
@@ -1769,6 +1759,9 @@
   "mobile.select_team.join_open": "Open teams you can join",
   "mobile.select_team.no_teams": "There are no available teams for you to join.",
   "mobile.server_ping_failed": "Cannot connect to the server. Please check your server URL and internet connection.",
+  "mobile.server_upgrade.button": "OK",
+  "mobile.server_upgrade.description": "\nA server upgrade is required to use the Mattermost app. Please ask your System Administrator for details.\n",
+  "mobile.server_upgrade.title": "Server upgrade required",
   "mobile.server_url.invalid_format": "URL 주소는 http:// 또는 https:// 로 시작되어야 합니다",
   "mobile.session_expired": "Session Expired: Please log in to continue receiving notifications.",
   "mobile.settings.team_selection": "팀 선택",
@@ -1814,15 +1807,15 @@
   "navbar.viewPinnedPosts": "View Pinned Posts",
   "navbar_dropdown.about": "Mattermost 정보",
   "navbar_dropdown.accountSettings": "계정 설정",
-  "navbar_dropdown.addMemberToTeam": "Add Members to Team",
+  "navbar_dropdown.addMemberToTeam": "팀 멤버 추가",
   "navbar_dropdown.console": "관리자 도구",
   "navbar_dropdown.create": "팀 만들기",
   "navbar_dropdown.emoji": "커스텀 이모티콘",
   "navbar_dropdown.help": "도움말",
   "navbar_dropdown.integrations": "통합 기능",
-  "navbar_dropdown.inviteMember": "Send Email Invite",
+  "navbar_dropdown.inviteMember": "초대 메일 발송",
   "navbar_dropdown.join": "Join Another Team",
-  "navbar_dropdown.keyboardShortcuts": "Keyboard Shortcuts",
+  "navbar_dropdown.keyboardShortcuts": "키보드 단축키",
   "navbar_dropdown.leave": "팀 떠나기",
   "navbar_dropdown.logout": "로그아웃",
   "navbar_dropdown.manageMembers": "회원 관리",
@@ -1986,11 +1979,11 @@
   "sidebar.unreadBelow": "하단에 읽지않은 메시지",
   "sidebar_header.tutorial": "<h4>메인 메뉴</h4><p> <strong>메인 메뉴</strong>에서 <strong>회원 초대</strong>를 하거나, <strong>계정 설정</strong>에 진입하여 <strong>테마 색상</strong>을 변경할 수 있습니다.</p><p>팀 관리자는 메뉴에서 <strong>팀 설정</strong>에 진입할 수 있습니다.</p><p>시스템 관리자는 <strong>관리자 도구</strong> 메뉴를 통해 시스템을 전체 설정을 관리할 수 있습니다.</p>",
   "sidebar_right_menu.accountSettings": "계정 설정",
-  "sidebar_right_menu.addMemberToTeam": "Add Members to Team",
+  "sidebar_right_menu.addMemberToTeam": "팀 멤버 추가",
   "sidebar_right_menu.console": "관리자 도구",
   "sidebar_right_menu.flagged": "중요 메시지",
   "sidebar_right_menu.help": "도움말",
-  "sidebar_right_menu.inviteNew": "Send Email Invite",
+  "sidebar_right_menu.inviteNew": "초대 메일 발송",
   "sidebar_right_menu.logout": "로그아웃",
   "sidebar_right_menu.manageMembers": "회원 관리하기",
   "sidebar_right_menu.nativeApps": "애플리케이션 다운로드",
@@ -2192,8 +2185,6 @@
   "user.settings.display.collapseOff": "Collapsed",
   "user.settings.display.collapseOn": "Expanded",
   "user.settings.display.fixedWidthCentered": "고정 너비, 가운데",
-  "user.settings.display.fontDesc": "Mattermost 화면에서 보여질 폰트를 선택하세요.",
-  "user.settings.display.fontTitle": "폰트",
   "user.settings.display.fullScreen": "전체 너비",
   "user.settings.display.language": "언어",
   "user.settings.display.messageDisplayClean": "표준",
@@ -2209,7 +2200,7 @@
   "user.settings.display.showFullname": "본명으로 보기",
   "user.settings.display.showNickname": "별명이 있으면 별명으로 보기, 없으면 본명으로 보기",
   "user.settings.display.showUsername": "사용자명으로 보기 (기본)",
-  "user.settings.display.teammateDisplay": "사용자명 표시",
+  "user.settings.display.teammateNameDisplay": "사용자명 표시",
   "user.settings.display.theme.applyToAllTeams": "가입한 모든 팀에서 새로운 테마를 적용합니다.",
   "user.settings.display.theme.customTheme": "커스텀 테마",
   "user.settings.display.theme.describe": "내 테마 관리하기",
diff --git a/webapp/i18n/nl.json b/webapp/i18n/nl.json
index f5ff9a5f6e..cd63c27314 100644
--- a/webapp/i18n/nl.json
+++ b/webapp/i18n/nl.json
@@ -415,18 +415,6 @@
   "admin.image.maxFileSizeDescription": "Maximale bestandsgroote voor bijlages in megabytes. Let Op: Controleer server geheugen voor jouw keuze. Grote bestanden kunnen het risico op server crashes en gefaalde uploads vergroten door netwerk interrupties.",
   "admin.image.maxFileSizeExample": "50",
   "admin.image.maxFileSizeTitle": "Maximale bestandsgrootte:",
-  "admin.image.previewHeightDescription": "De maximale hoogte van het beeld (\"0\": Stelt automatisch de hoogte in). Het bijwerken van deze waarde verandert hoe voorbeeld afbeeldingen worden afgebeeld in de toekomst, maar verandert niets aan beelden die reeds gemaakt zijn.",
-  "admin.image.previewHeightExample": "Bijv.: \"0\"",
-  "admin.image.previewHeightTitle": "Afbeelding Voorbeeld Hoogte:",
-  "admin.image.previewWidthDescription": "De maximale breedte van de voorbeeld afbeelding. Het bijwerken van deze waarde verandert hoe voorbeld afbeeldingen worden afgebeeld in de toekomst, maar verandert niets aan beelden die reeds gemaakt zijn.",
-  "admin.image.previewWidthExample": "Bijv.: \"1024\"",
-  "admin.image.previewWidthTitle": "Afbeeldingsvoorbeeld Breedte: ",
-  "admin.image.profileHeightDescription": "Hoogte van het profiel figuur.",
-  "admin.image.profileHeightExample": "Bijv.: \"0\"",
-  "admin.image.profileHeightTitle": "Profiel Afbeelding Hoogte: ",
-  "admin.image.profileWidthDescription": "Breedte van profiel figuur.",
-  "admin.image.profileWidthExample": "Bijv.: \"1024\"",
-  "admin.image.profileWidthTitle": "Profiel Afbeelding Breedte:",
   "admin.image.publicLinkDescription": "'salt' van 32 tekens welke wordt gebruikt voor het signeren van publieke afbeeldingen. Deze worden willekeurig gegenereerd tijdens de installatie. Klik op \"Opnieuw genereren\" om een nieuwe 'salt' te maken.",
   "admin.image.publicLinkExample": "Bijv.: \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
   "admin.image.publicLinkTitle": "Publieke link 'salt':",
@@ -436,12 +424,6 @@
   "admin.image.storeDescription": "Opslagsysteem waar bestanden en afbeeldingen opgeslagen worden.<br /><br />Het selecteren van \"Amazon S3\" maakt de velden beschikbaar om uw Amazon gegevens en bucket details in te vullen.<br /><br />Het selecteren van \"Lokaal bestandssysteem\" maakt het veld beschikbaar om een locale directory op te geven.",
   "admin.image.storeLocal": "Lokaal bestandssysteem",
   "admin.image.storeTitle": "Bestand Opslagsysteem:",
-  "admin.image.thumbHeightDescription": "De hoogte van de thumbnails gegenereerd op basis van geüploade foto's. Het bijwerken van deze waarde verandert hoe thumbnail afbeeldingen worden afgebeeld in de toekomst, maar verandert niets aan beelden die reeds gemaakt zijn.",
-  "admin.image.thumbHeightExample": "Bijv.: \"100\"",
-  "admin.image.thumbHeightTitle": "Bijlage Miniatuur Hoogte:",
-  "admin.image.thumbWidthDescription": "Breedte van de thumbnails gegenereerd op basis van geüploade foto's. Het bijwerken van deze waarde verandert hoe thumbnail afbeeldingen worden afgebeeld in de toekomst, maar verandert niets aan beelden die reeds gemaakt zijn.",
-  "admin.image.thumbWidthExample": "Bijv.: \"120\"",
-  "admin.image.thumbWidthTitle": "Bijlage Miniatuur Breedte:",
   "admin.integrations.custom": "Aangepaste Intergraties",
   "admin.integrations.external": "Externe services",
   "admin.integrations.webrtc": "Mattermost WebRTC",
@@ -782,7 +764,6 @@
   "admin.sidebar.files": "Bestanden",
   "admin.sidebar.general": "Algemeen",
   "admin.sidebar.gitlab": "GitLab",
-  "admin.sidebar.images": "Afbeeldingen",
   "admin.sidebar.integrations": "Integraties",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "Wettelijk en Ondersteuning",
@@ -832,7 +813,7 @@
   "admin.sql.maxOpenTitle": "Maximum aantal open verbindingen:",
   "admin.sql.noteDescription": "Wanneer u wijzigingen aanbrengt in deze sectie moet de server opnieuw worden opgestart.",
   "admin.sql.noteTitle": "Let op:",
-  "admin.sql.queryTimeoutDescription": "The number of seconds to wait for a response from the database after opening a connection and sending the query. Errors that you see in the UI or in the logs as a result of a query timeout can vary depending on the type of query. This setting has no effect on PostgreSQL databases.",
+  "admin.sql.queryTimeoutDescription": "The number of seconds to wait for a response from the database after opening a connection and sending the query. Errors that you see in the UI or in the logs as a result of a query timeout can vary depending on the type of query.",
   "admin.sql.queryTimeoutExample": "Bijv.: \"30\"",
   "admin.sql.queryTimeoutTitle": "Query Timeout:",
   "admin.sql.replicas": "Data Source Replicas:",
@@ -891,11 +872,16 @@
   "admin.team.restrictTitle": "Beperkt het aanmaken van accounts tot de volgende e-mail domeinen:",
   "admin.team.restrict_direct_message_any": "Elke gebruiker van de Mattermost server",
   "admin.team.restrict_direct_message_team": "Elke gebruiker van het team",
+  "admin.team.showFullname": "Show first and last name (default)",
+  "admin.team.showNickname": "Toon bijnaam, indien aanwezig, anders voor- en achternaam",
+  "admin.team.showUsername": "Show username",
   "admin.team.siteNameDescription": "Naam van de site welke getoond wordt op inlog- en andere schermen.",
   "admin.team.siteNameExample": "Bijv.: \"Mattermost\"",
   "admin.team.siteNameTitle": "Site naam:",
   "admin.team.teamCreationDescription": "Wanneer uitgeschakeld kunnen alleen Systeem Beheerders teams maken.",
   "admin.team.teamCreationTitle": "Team maken inschakelen: ",
+  "admin.team.teammateNameDisplay": "Naamweergave van teamgenoten",
+  "admin.team.teammateNameDisplayDesc": "Geef aan hoe de gebruikersnaam word weergegeven in berichten en de Directe Berichten lijst. ",
   "admin.team.upload": "Upload",
   "admin.team.uploadDesc": "Customize your user experience by adding a custom image to your login screen. Recommended maximum image size is less than 2 MB.",
   "admin.team.uploaded": "Geupload!",
@@ -1121,7 +1107,8 @@
   "channel_invite.close": "Afsluiten",
   "channel_loader.connection_error": "Er lijkt een probleem te zijn met uw internet verbinding, gelieve dit te controleren.",
   "channel_loader.posted": "Verzonden",
-  "channel_loader.socketError": "Controleer uw verbinding. Mattermost is onbereikbaar. Neem contact op met de systeembeheerder als het probleem aanhoud met de WebSocket poort.",
+  "channel_loader.postedImage": " heeft een afbeelding geüpload",
+  "channel_loader.socketError": "Please check connection, Mattermost unreachable. If issue persists, ask administrator to <a href=\"https://about.mattermost.com/default-websocket-port-help\" target=\"_blank\">check WebSocket port</a>.",
   "channel_loader.someone": "Iemand",
   "channel_loader.something": " deed iets nieuws",
   "channel_loader.unknown_error": "We kregen een onverwachte statuscode van de server.",
@@ -1718,6 +1705,9 @@
   "mobile.custom_list.no_results": "No Results",
   "mobile.drawer.teamsTitle": "Termen",
   "mobile.edit_post.title": "Editing Message",
+  "mobile.error_handler.button": "Relaunch",
+  "mobile.error_handler.description": "\nClick relaunch to open the app again. After restart, you can report the problem from the settings menu.\n",
+  "mobile.error_handler.title": "Unexpected error occurred",
   "mobile.file_upload.camera": "Take Photo or Video",
   "mobile.file_upload.library": "Photo Library",
   "mobile.file_upload.more": "Meer",
@@ -1769,6 +1759,9 @@
   "mobile.select_team.join_open": "Open teams you can join",
   "mobile.select_team.no_teams": "There are no available teams for you to join.",
   "mobile.server_ping_failed": "Cannot connect to the server. Please check your server URL and internet connection.",
+  "mobile.server_upgrade.button": "OK",
+  "mobile.server_upgrade.description": "\nA server upgrade is required to use the Mattermost app. Please ask your System Administrator for details.\n",
+  "mobile.server_upgrade.title": "Server upgrade required",
   "mobile.server_url.invalid_format": "Moet beginnen met http:// of https://",
   "mobile.session_expired": "Session Expired: Please log in to continue receiving notifications.",
   "mobile.settings.team_selection": "Team Selectie",
@@ -2192,8 +2185,6 @@
   "user.settings.display.collapseOff": "Collapsed",
   "user.settings.display.collapseOn": "Expanded",
   "user.settings.display.fixedWidthCentered": "Vaste breedte, gecentreerd",
-  "user.settings.display.fontDesc": "Selecteer het lettertype dat door de Mattermost user interface wordt gebruikt.",
-  "user.settings.display.fontTitle": "Lettertype",
   "user.settings.display.fullScreen": "Volledige breedte",
   "user.settings.display.language": "Taal",
   "user.settings.display.messageDisplayClean": "Standaard",
@@ -2209,7 +2200,7 @@
   "user.settings.display.showFullname": "Toon voornaam en achternaam",
   "user.settings.display.showNickname": "Toon bijnaam, indien aanwezig, anders voor- en achternaam",
   "user.settings.display.showUsername": "Toon gebruikersnaam (standaard)",
-  "user.settings.display.teammateDisplay": "Naamweergave van teamgenoten",
+  "user.settings.display.teammateNameDisplay": "Naamweergave van teamgenoten",
   "user.settings.display.theme.applyToAllTeams": "Apply new theme to all my teams",
   "user.settings.display.theme.customTheme": "Aangepast thema",
   "user.settings.display.theme.describe": "Open om uw thema te beheren",
diff --git a/webapp/i18n/pl.json b/webapp/i18n/pl.json
index 1631785b9e..692b6adeac 100644
--- a/webapp/i18n/pl.json
+++ b/webapp/i18n/pl.json
@@ -415,18 +415,6 @@
   "admin.image.maxFileSizeDescription": "Maksymalny rozmiar pliku załączanego do wiadomości w megabajtach. Uwaga: Zweryfikuj czy pamięć serwera wspiera wybrany rozmiar. Duże rozmiary plików mogą zwiększyć ryzyko błędów serwera i nieudanego wysyłania plików ze względu na przerywanie działania sieci.",
   "admin.image.maxFileSizeExample": "50",
   "admin.image.maxFileSizeTitle": "Maksymalny rozmiar pliku:",
-  "admin.image.previewHeightDescription": "Maksymalna wysokość podglądu obrazu (\"0\" - ustawia automatyczny rozmiar). Aktualizowanie tej wartości zmienia sposób renderowania podglądu w przyszłości, ale nie zmienia zdjęć utworzonych w przeszłości.",
-  "admin.image.previewHeightExample": "Np.: \"0\"",
-  "admin.image.previewHeightTitle": "Wysokość podglądu obrazu:",
-  "admin.image.previewWidthDescription": "Maksymalna szerokość podglądu obrazu. Aktualizowanie tej wartości zmienia sposób renderowania podglądu w przyszłości, ale nie zmienia zdjęć utworzonych w przeszłości.",
-  "admin.image.previewWidthExample": "Np.: \"1024\"",
-  "admin.image.previewWidthTitle": "Szerokość podglądu obrazu:",
-  "admin.image.profileHeightDescription": "Wysokość zdjęcia profilowego.",
-  "admin.image.profileHeightExample": "Np.: \"0\"",
-  "admin.image.profileHeightTitle": "Wysokość zdjęcia profilowego:",
-  "admin.image.profileWidthDescription": "Szerokość zdjęcia profilowego.",
-  "admin.image.profileWidthExample": "Np.: \"1024\"",
-  "admin.image.profileWidthTitle": "Szerokość zdjęcia profilowego:",
   "admin.image.publicLinkDescription": "32-znakowa wartość losowa dodawana do podpisu zaproszeń email. Losowo generowana przy instalacji. Kliknij \"Regeneruj\" aby utworzyć nową wartość losową.",
   "admin.image.publicLinkExample": "Np. \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
   "admin.image.publicLinkTitle": "Sól Linka Publicznego:",
@@ -436,12 +424,6 @@
   "admin.image.storeDescription": "System przechowywania danych, gdzie zapisywane są pliki i obrazy z załączników.<br /><br />Wybranie \"Amazon S3\" odblokowuje pola do wprowadzenia poświadczeń i szczegółów \"pojemnika\".<br /><br />Wybranie \"Lokalny System Plików\" odblokowuje pole do wprowadzenia lokalnego folderu na pliki.",
   "admin.image.storeLocal": "Lokalny system plików",
   "admin.image.storeTitle": "System Przechowywania Plików:",
-  "admin.image.thumbHeightDescription": "Wysokość miniatur generowanych podczas wysyłania zdjęć. Aktualizowanie tej wartości zmienia sposób wyświetlania miniatur w przyszłości, ale nie zmienia zdjęć utworzonych w przeszłości.",
-  "admin.image.thumbHeightExample": "Np.: \"100\"",
-  "admin.image.thumbHeightTitle": "Szerokość miniatury załącznika:",
-  "admin.image.thumbWidthDescription": "Szerokość miniatur generowanych podczas przesłania zdjęć. Aktualizowanie tej wartości zmienia sposób wyświetlania miniatur w przyszłości, ale nie zmienia zdjęć utworzonych w przeszłości.",
-  "admin.image.thumbWidthExample": "Np.: \"120\"",
-  "admin.image.thumbWidthTitle": "Szerokość miniatury załącznika:",
   "admin.integrations.custom": "Niestandardowe integracje",
   "admin.integrations.external": "Zewnętrzne usługi",
   "admin.integrations.webrtc": "Mattermost WebRTC",
@@ -782,7 +764,6 @@
   "admin.sidebar.files": "Pliki",
   "admin.sidebar.general": "Ogólne",
   "admin.sidebar.gitlab": "GitLab",
-  "admin.sidebar.images": "Obrazy",
   "admin.sidebar.integrations": "Integracje",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "Informacje prawne i wsparcie",
@@ -832,7 +813,7 @@
   "admin.sql.maxOpenTitle": "Maksymalna liczba otwartych połączeń:",
   "admin.sql.noteDescription": "Zmiana właściwości w tej sekcji będzie wymagała restartu serwera aby zaczęły one działać.",
   "admin.sql.noteTitle": "Notka:",
-  "admin.sql.queryTimeoutDescription": "The number of seconds to wait for a response from the database after opening a connection and sending the query. Errors that you see in the UI or in the logs as a result of a query timeout can vary depending on the type of query. This setting has no effect on PostgreSQL databases.",
+  "admin.sql.queryTimeoutDescription": "The number of seconds to wait for a response from the database after opening a connection and sending the query. Errors that you see in the UI or in the logs as a result of a query timeout can vary depending on the type of query.",
   "admin.sql.queryTimeoutExample": "Np.: \"30\"",
   "admin.sql.queryTimeoutTitle": "Limit czasu zapytania:",
   "admin.sql.replicas": "Repliki Źródeł Danych:",
@@ -891,11 +872,16 @@
   "admin.team.restrictTitle": "Ogranicz tworzenie kont tylko do podanym domen email:",
   "admin.team.restrict_direct_message_any": "Dowolny użytkownik na serwerze Mattermost",
   "admin.team.restrict_direct_message_team": "Dowolny uczestnik zespołu",
+  "admin.team.showFullname": "Show first and last name (default)",
+  "admin.team.showNickname": "Pokaż nick, jeśli taki istnieje, w przeciwnym przypadku wyświetl imię i nazwisko",
+  "admin.team.showUsername": "Show username",
   "admin.team.siteNameDescription": "Nazwa usługi wyświetlona na stronie logowania i w interfejsie użytkownika.",
   "admin.team.siteNameExample": "Np.: \"Mattermost\"",
   "admin.team.siteNameTitle": "Nazwa witryny",
   "admin.team.teamCreationDescription": "Jeśli wyłączone, tylko Systemowi Administratorzy mogą tworzyć zespoły.",
   "admin.team.teamCreationTitle": "Włącz Tworzenie Zespołów:",
+  "admin.team.teammateNameDisplay": "Wyświetlana nazwa",
+  "admin.team.teammateNameDisplayDesc": "Ustawia jak wyświetlać nazwy innych użytkowników w postach i wiadomościach bezpośrednich.",
   "admin.team.upload": "Wyślij",
   "admin.team.uploadDesc": "Dostosuj wrażenia użytkownika, dodając niestandardowy obraz do ekranu logowania. Zalecany maksymalny rozmiar obrazu to mniej niż 2 MB.",
   "admin.team.uploaded": "Wysłano!",
@@ -1121,7 +1107,8 @@
   "channel_invite.close": "Zamknij",
   "channel_loader.connection_error": "Wygląda na to, że wystąpił problem z twoim połączeniem internetowym.",
   "channel_loader.posted": "Wysłany",
-  "channel_loader.socketError": "Proszę, sprawdź połączenie, Mattermost nie jest dostępny. Jeśli problem nie zostanie rozwiązany, skontaktuj się z administratorem.",
+  "channel_loader.postedImage": " wysłano obraz",
+  "channel_loader.socketError": "Please check connection, Mattermost unreachable. If issue persists, ask administrator to <a href=\"https://about.mattermost.com/default-websocket-port-help\" target=\"_blank\">check WebSocket port</a>.",
   "channel_loader.someone": "Ktoś",
   "channel_loader.something": " zrobił/a coś nowego",
   "channel_loader.unknown_error": "Otrzymaliśmy nieoczekiwany kod statusu z serwera.",
@@ -1718,6 +1705,9 @@
   "mobile.custom_list.no_results": "Brak wyników",
   "mobile.drawer.teamsTitle": "Zespoły",
   "mobile.edit_post.title": "Edycja Wiadomości",
+  "mobile.error_handler.button": "Relaunch",
+  "mobile.error_handler.description": "\nClick relaunch to open the app again. After restart, you can report the problem from the settings menu.\n",
+  "mobile.error_handler.title": "Unexpected error occurred",
   "mobile.file_upload.camera": "Zrób Zdjęcie lub nagraj Film",
   "mobile.file_upload.library": "Biblioteka Zdjęć",
   "mobile.file_upload.more": "Więcej",
@@ -1769,6 +1759,9 @@
   "mobile.select_team.join_open": "Inne zespoły, do których możesz dołączyć.",
   "mobile.select_team.no_teams": "There are no available teams for you to join.",
   "mobile.server_ping_failed": "Nie można połączyć się z serwerem. Sprawdź adres serwera i połączenie internetowe.",
+  "mobile.server_upgrade.button": "OK",
+  "mobile.server_upgrade.description": "\nA server upgrade is required to use the Mattermost app. Please ask your System Administrator for details.\n",
+  "mobile.server_upgrade.title": "Server upgrade required",
   "mobile.server_url.invalid_format": "Adres musi zaczynać się od http:// lub https://",
   "mobile.session_expired": "Sesja wygasła: zaloguj się, aby kontynuować otrzymywanie powiadomień.",
   "mobile.settings.team_selection": "Wybór zespołu",
@@ -2067,8 +2060,8 @@
   "suggestion.search.private": "Kanały prywatne",
   "suggestion.search.public": "Kanały publiczne",
   "system_users_list.count": "{count, number} {count, plural, one {użytkownik} other {użytkowników}}",
-  "system_users_list.countPage": "{startCount, number} - {endCount, number} {count, plural, one {użytkownik} other {użytkowników}} z {total} razem",
-  "system_users_list.countSearch": "{count, number} {count, plural, one {użytkownik} other {użytkowników}} z {total} razem",
+  "system_users_list.countPage": "{startCount, number} - {endCount, number} {count, plural, one {użytkownik} other {użytkowników}} z {total, number} razem",
+  "system_users_list.countSearch": "{count, number} {count, plural, one {użytkownik} other {użytkowników}} z {total, number} razem",
   "team_export_tab.download": "pobierz",
   "team_export_tab.export": "Eksportuj",
   "team_export_tab.exportTeam": "Eksportuj zespół",
@@ -2192,8 +2185,6 @@
   "user.settings.display.collapseOff": "Zwinięty",
   "user.settings.display.collapseOn": "Rozwinięty",
   "user.settings.display.fixedWidthCentered": "O stałej szerokości na środku",
-  "user.settings.display.fontDesc": "Wybierz czcionkę używaną w interfejsie użytkownika Mattermost.",
-  "user.settings.display.fontTitle": "Wyświetlana czcionka",
   "user.settings.display.fullScreen": "Cała szerokość",
   "user.settings.display.language": "Język",
   "user.settings.display.messageDisplayClean": "Standard",
@@ -2209,7 +2200,7 @@
   "user.settings.display.showFullname": "Pokaż imię i nazwisko",
   "user.settings.display.showNickname": "Pokaż nick, jeśli taki istnieje, w przeciwnym przypadku wyświetl imię i nazwisko",
   "user.settings.display.showUsername": "Pokaż nazwę użytkownika (domyślnie)",
-  "user.settings.display.teammateDisplay": "Wyświetlana nazwa",
+  "user.settings.display.teammateNameDisplay": "Wyświetlana nazwa",
   "user.settings.display.theme.applyToAllTeams": "Zastosuj nowy motyw do wszystkich moich zespołów",
   "user.settings.display.theme.customTheme": "Motyw użytkownika",
   "user.settings.display.theme.describe": "Otwórz, aby zarządzać motywem",
diff --git a/webapp/i18n/pt-BR.json b/webapp/i18n/pt-BR.json
index 4dbc38872a..8a344a4a1f 100644
--- a/webapp/i18n/pt-BR.json
+++ b/webapp/i18n/pt-BR.json
@@ -415,18 +415,6 @@
   "admin.image.maxFileSizeDescription": "Tamanho máximo de arquivo para anexos de mensagens em megabytes. Atenção: Verifique a memória do servidor pode suportar sua escolha configuração. Tamanhos de arquivos grandes aumentam o risco de falhas do servidor e falhas de uploads devido a interrupções de rede.",
   "admin.image.maxFileSizeExample": "50",
   "admin.image.maxFileSizeTitle": "Tamanho Máximo do Arquivo:",
-  "admin.image.previewHeightDescription": "Altura máxima da imagem de pré-visualização (\"0\": Define como tamanho automático). Atualizando este valor muda como as imagens de pré-visualização serão exibidas no futuro, mas não altera as imagens já criadas.",
-  "admin.image.previewHeightExample": "Ex.: \"0\"",
-  "admin.image.previewHeightTitle": "Altura da Visualização da Imagem:",
-  "admin.image.previewWidthDescription": "Largura máxima da imagem de pré-visualização. Atualizando este valor muda como as imagens de pré-visualização serão mostradas no futuro, mas não altera as imagens já criadas.",
-  "admin.image.previewWidthExample": "Ex.: \"1024\"",
-  "admin.image.previewWidthTitle": "Largura da Visualização da Imagem:",
-  "admin.image.profileHeightDescription": "Altura da imagem do perfil.",
-  "admin.image.profileHeightExample": "Ex.: \"0\"",
-  "admin.image.profileHeightTitle": "Altura da Imagem do Perfil:",
-  "admin.image.profileWidthDescription": "Largura do imagem do perfil.",
-  "admin.image.profileWidthExample": "Ex.: \"1024\"",
-  "admin.image.profileWidthTitle": "Largura da Imagem do Perfil:",
   "admin.image.publicLinkDescription": "Salt de 32-caracteres adicionados a assinatura de links de imagens públicas. Aleatoriamente gerados na instalação. Click \"Re-Gerar\" para criar um novo salt.",
   "admin.image.publicLinkExample": "Ex.: \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
   "admin.image.publicLinkTitle": "Link Público Salt:",
@@ -436,12 +424,6 @@
   "admin.image.storeDescription": "Sistema de armazenamento onde os arquivos anexos de imagem são salvos.<br /><br />Selecionando \"Amazon S3\" habilita campos para inserir suas credenciais Amazon e detalhes de bucket.<br /><br />Selecionando \"Sistema de Arquivos Local\" habilita o campo para especificar um diretório de arquivos local.",
   "admin.image.storeLocal": "Sistema de Arquivos Local",
   "admin.image.storeTitle": "Sistema de Armazenamento de Arquivo:",
-  "admin.image.thumbHeightDescription": "Altura dos thumbnails gerados das imagens enviadas. Atualizando este valor muda como o thumbnail das imagens serão geradas no futuro, mas não muda as imagens já criadas no passado.",
-  "admin.image.thumbHeightExample": "Ex.: \"100\"",
-  "admin.image.thumbHeightTitle": "Anexo Thumbnail Altura:",
-  "admin.image.thumbWidthDescription": "Largura dos thumbnails gerados das imagens enviadas. Atualizando este valor muda como o thumbnail das imagens serão geradas no futuro, mas não muda as imagens já criadas no passado.",
-  "admin.image.thumbWidthExample": "Ex.: \"120\"",
-  "admin.image.thumbWidthTitle": "Anexo Thumbnail Largura:",
   "admin.integrations.custom": "Integrações Personalizadas",
   "admin.integrations.external": "Serviços Externos",
   "admin.integrations.webrtc": "Mattermost WebRTC",
@@ -782,7 +764,6 @@
   "admin.sidebar.files": "Arquivos",
   "admin.sidebar.general": "Geral",
   "admin.sidebar.gitlab": "GitLab",
-  "admin.sidebar.images": "Imagens",
   "admin.sidebar.integrations": "Integrações",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "Legal e Suporte",
@@ -832,7 +813,7 @@
   "admin.sql.maxOpenTitle": "Máximo de Conexões Abertas:",
   "admin.sql.noteDescription": "Alterando as propriedades nesta seção irá exigir que o servidor seja reiniciado para que tenha efeito.",
   "admin.sql.noteTitle": "Nota:",
-  "admin.sql.queryTimeoutDescription": "O tempo em segundos para esperar uma resposta do banco de dados após abrir a conexão e enviar a consulta. Erros que você vê na UI ou nos logs que são resultados de uma consulta que expirou pode variar dependendo do tipo de consulta. Esta configuração não tem efeito em bando de dados PostgreSQL.",
+  "admin.sql.queryTimeoutDescription": "O tempo em segundos para esperar uma resposta do banco de dados após abrir a conexão e enviar a consulta. Erros que você vê na UI ou nos logs são resultados de uma consulta que expirou pode variar dependendo do tipo de consulta.",
   "admin.sql.queryTimeoutExample": "Ex.: \"30\"",
   "admin.sql.queryTimeoutTitle": "Tempo-limite da consulta:",
   "admin.sql.replicas": "Replicas Fonte de Dados:",
@@ -891,11 +872,16 @@
   "admin.team.restrictTitle": "Restringir a criação de contas para os domínios de e-mail específicos:",
   "admin.team.restrict_direct_message_any": "Qualquer usuário no Servidor Mattermost",
   "admin.team.restrict_direct_message_team": "Qualquer membro da equipe",
+  "admin.team.showFullname": "Mostrar primeiro nome e sobrenome (padrão)",
+  "admin.team.showNickname": "Mostrar apelidos se existir, caso contrário mostrar o primeiro e sobrenome",
+  "admin.team.showUsername": "Mostrar nome do usuário",
   "admin.team.siteNameDescription": "Nome do serviço mostrado na tela de início da sessão e na UI.",
   "admin.team.siteNameExample": "Ex.: \"Mattermost\"",
   "admin.team.siteNameTitle": "Nome do Site:",
   "admin.team.teamCreationDescription": "Quando falso, somente o Administrador do Sistema poderá criar equipes.",
   "admin.team.teamCreationTitle": "Habilitar a Criação de Equipes: ",
+  "admin.team.teammateNameDisplay": "Nome de Exibição da Equipe de Trabalho:",
+  "admin.team.teammateNameDisplayDesc": "Ajustar como mostrar os nomes de usuários nas postagens e lista de Mensagens Diretas.",
   "admin.team.upload": "Enviar",
   "admin.team.uploadDesc": "Personalizar sua experiência como usuário, adicionando uma imagem personalizada para a tela de login. tamanho da imagem máxima recomendada é de menos de 2 MB.",
   "admin.team.uploaded": "Enviado!",
@@ -1121,7 +1107,8 @@
   "channel_invite.close": "Fechar",
   "channel_loader.connection_error": "Parece existir um problema com a sua conexão de internet.",
   "channel_loader.posted": "Postado",
-  "channel_loader.socketError": "Por favor verifique sua conexão, Mattermost está inalcançável. Se este problema persistir, peça ao administrador para verificar a porta WebSocket.",
+  "channel_loader.postedImage": " postado uma imagem",
+  "channel_loader.socketError": "Por favor verifique a sua conexão, Mattermost está inacessível. Se o problema persistir, pergunte ao administrador para verificar <a href=\"https://about.mattermost.com/default-websocket-port-help\" target=\"_blank\"> a porta do WebSocket</a>.",
   "channel_loader.someone": "Alguém",
   "channel_loader.something": " fez algo novo",
   "channel_loader.unknown_error": "Recebido um código de status inesperado do servidor.",
@@ -1688,7 +1675,7 @@
   "mobile.channel_info.alertTitleDeleteChannel": "Deletar {term}",
   "mobile.channel_info.alertTitleLeaveChannel": "Sair {term}",
   "mobile.channel_info.alertYes": "Sim",
-  "mobile.channel_info.delete_failed": "We couldn't delete the channel {displayName}. Please check your connection and try again.",
+  "mobile.channel_info.delete_failed": "Não foi possível apagar o canal {displayName}. Por favor verifique a sua conexão e tente novamente.",
   "mobile.channel_info.privateChannel": "Canal Privado",
   "mobile.channel_info.publicChannel": "Canal Público",
   "mobile.channel_list.alertMessageLeaveChannel": "Você tem certeza que quer deixar o {term} {name}?",
@@ -1718,6 +1705,9 @@
   "mobile.custom_list.no_results": "Nenhum Resultado",
   "mobile.drawer.teamsTitle": "Equipes",
   "mobile.edit_post.title": "Editando a Mensagem",
+  "mobile.error_handler.button": "Relançar",
+  "mobile.error_handler.description": "\nClique relançar para abrir a app novamente. Após o reinício, você pode relatar o problema no menu the configuração.\n",
+  "mobile.error_handler.title": "Ocorreu um erro inesperado",
   "mobile.file_upload.camera": "Tirar Foto ou Vídeo",
   "mobile.file_upload.library": "Biblioteca de Fotos",
   "mobile.file_upload.more": "Mais",
@@ -1726,7 +1716,7 @@
   "mobile.intro_messages.DM": "Este é o início do seu histórico de mensagens diretas com {teammate}. Mensagens diretas e arquivos compartilhados aqui não são mostrados para pessoas de fora desta área.",
   "mobile.intro_messages.default_message": "Este é o primeiro canal da equipe veja quando eles se registrarem - use para postar atualizações que todos devem saber.",
   "mobile.intro_messages.default_welcome": "Bem-vindo ao {name}!",
-  "mobile.join_channel.error": "We couldn't join the channel {displayName}. Please check your connection and try again.",
+  "mobile.join_channel.error": "Não foi possível entrar no canal {displayName}. Por favor verifique a sua conexão e tente novamente.",
   "mobile.loading_channels": "Carregando Canais...",
   "mobile.loading_members": "Carregando Membros...",
   "mobile.loading_posts": "Carregando Mensagens...",
@@ -1735,7 +1725,7 @@
   "mobile.offlineIndicator.connected": "Conectado",
   "mobile.offlineIndicator.connecting": "Conectando...",
   "mobile.offlineIndicator.offline": "Sem conexão com a internet",
-  "mobile.open_dm.error": "We couldn't open a direct message with {displayName}. Please check your connection and try again.",
+  "mobile.open_dm.error": "Não foi possível entrar nas mensagens diretas com {displayName}. Por favor verifique a sua conexão e tente novamente.",
   "mobile.post.cancel": "Cancelar",
   "mobile.post.delete_question": "Tem certeza de que deseja excluir este post?",
   "mobile.post.delete_title": "Deletar Post",
@@ -1769,6 +1759,9 @@
   "mobile.select_team.join_open": "Equipes abertas que você pode se juntar",
   "mobile.select_team.no_teams": "Não existem equipes disponíveis para você entrar.",
   "mobile.server_ping_failed": "Não é possível conectar ao servidor. Por favor verifique a URL do seu servidor e a conexão de internet.",
+  "mobile.server_upgrade.button": "OK",
+  "mobile.server_upgrade.description": "\nUm upgrade no servidor é necessário para usar o Mattermost app. Por favor fale com o seu Administrador de sistema para mais detalhes.\n",
+  "mobile.server_upgrade.title": "Atualização do servidor necessária",
   "mobile.server_url.invalid_format": "URL deve começar com http:// ou https://",
   "mobile.session_expired": "Sessão Expirada: Por favor faça o login para continuar recebendo as notificações.",
   "mobile.settings.team_selection": "Seleção da Equipe",
@@ -1795,7 +1788,7 @@
   "msg_typing.someone": "Alguém",
   "multiselect.add": "Adicionar",
   "multiselect.go": "Ir",
-  "multiselect.numPeopleRemaining": "Use ↑↓ to browse, ↵ to select. You can add {num, number} more {num, plural, one {person} other {people}}. ",
+  "multiselect.numPeopleRemaining": "Utilize ↑↓ para navegar, ↵ para selecionar. Você pode adicionar mais {num, number}{num, plural, one {pessoa} other {pessoas}}. ",
   "multiselect.numRemaining": "Você pode adicionar mais {num, number}",
   "multiselect.placeholder": "Procura e adiciona membros",
   "navbar.addMembers": "Adicionar Membros",
@@ -2192,8 +2185,6 @@
   "user.settings.display.collapseOff": "Recolhido",
   "user.settings.display.collapseOn": "Expandido",
   "user.settings.display.fixedWidthCentered": "Largura fixa, centralizada",
-  "user.settings.display.fontDesc": "Selecione a fonte mostrada na interface do usuário no Mattermost.",
-  "user.settings.display.fontTitle": "Fonte Exibição",
   "user.settings.display.fullScreen": "Largura inteira",
   "user.settings.display.language": "Idioma",
   "user.settings.display.messageDisplayClean": "Padrão",
@@ -2209,7 +2200,7 @@
   "user.settings.display.showFullname": "Mostrar primeiro e último nome",
   "user.settings.display.showNickname": "Mostras apelidos se um existir, caso contrário mostrar o primeiro e último nome",
   "user.settings.display.showUsername": "Mostrar nome de usuário (padrão)",
-  "user.settings.display.teammateDisplay": "Nome de Exibição da Equipe de Trabalho",
+  "user.settings.display.teammateNameDisplay": "Nome de Exibição dos Colegas de Trabalho",
   "user.settings.display.theme.applyToAllTeams": "Aplicar novo tema para todas as minhas equipes",
   "user.settings.display.theme.customTheme": "Tema Personalizado",
   "user.settings.display.theme.describe": "Abrir para gerenciar seu tema",
diff --git a/webapp/i18n/ru.json b/webapp/i18n/ru.json
index ec754d234f..43ae9a8a69 100644
--- a/webapp/i18n/ru.json
+++ b/webapp/i18n/ru.json
@@ -415,18 +415,6 @@
   "admin.image.maxFileSizeDescription": "Максимальный размер файла для отправки в сообщениях. Внимание: Проверьте, что памяти сервера достаточно для этой настройки. Файлы больших размеров увеличивают риск сбоя сервера и неудачных загрузок файлов из-за проблем в подключении к сети.",
   "admin.image.maxFileSizeExample": "50",
   "admin.image.maxFileSizeTitle": "Максимальный размер файла:",
-  "admin.image.previewHeightDescription": "Maximum height of preview image (\"0\": Sets to auto-size). Updating this value changes how preview images render in future, but does not change images created in the past.",
-  "admin.image.previewHeightExample": "Например: \"0\"",
-  "admin.image.previewHeightTitle": "Высота изображения для предварительного просмотра:",
-  "admin.image.previewWidthDescription": "Максимальная ширина превью изображения. Обновление этого значения изменит генерацию превью в будущем, но не повлияет на существующие изображения.",
-  "admin.image.previewWidthExample": "Например: \"1024\"",
-  "admin.image.previewWidthTitle": "Просмотр изображения:",
-  "admin.image.profileHeightDescription": "Высота изображения профиля.",
-  "admin.image.profileHeightExample": "Например: \"0\"",
-  "admin.image.profileHeightTitle": "Высота изображения профиля:",
-  "admin.image.profileWidthDescription": "Ширина изображения профиля.",
-  "admin.image.profileWidthExample": "Например: \"1024\"",
-  "admin.image.profileWidthTitle": "Ширина изображения профиля:",
   "admin.image.publicLinkDescription": "32-символьная соль для подписи ссылок на публичные изображения. Генерируется во время инсталляции. Нажмите \"Перегенерировать\" для генерации новой соли.",
   "admin.image.publicLinkExample": "Например: \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
   "admin.image.publicLinkTitle": "Соль для публичных ссылок:",
@@ -436,12 +424,6 @@
   "admin.image.storeDescription": "Система хранения, в которой сохраняются приложенные файлы и изображения.<br /><br />Выбор \"Amazon S3\" включает поля для ввода ваших учетных данных и деталей хранилища Amazon.<br /><br />Выбор \"Локальной файловой системы\" включает поля для указания локального файлового каталога.",
   "admin.image.storeLocal": "Локальная файловая система",
   "admin.image.storeTitle": "Хранилище файлов:",
-  "admin.image.thumbHeightDescription": "Высота эскизов загруженных изображений. Обновление этого значения изменит генерацию эскизов в будущем, но не повлияет на существующие изображения.",
-  "admin.image.thumbHeightExample": "Например: \"100\"",
-  "admin.image.thumbHeightTitle": "Высота миниатюры вложения:",
-  "admin.image.thumbWidthDescription": "Ширина эскизов загруженных изображений. Обновление этого значения изменит генерацию эскизов в будущем, но не повлияет на существующие изображения.",
-  "admin.image.thumbWidthExample": "Например: \"120\"",
-  "admin.image.thumbWidthTitle": "Ширина миниатюры вложения:",
   "admin.integrations.custom": "Пользовательские интеграции",
   "admin.integrations.external": "Внешние службы",
   "admin.integrations.webrtc": "Mattermost WebRTC",
@@ -782,7 +764,6 @@
   "admin.sidebar.files": "Файлы",
   "admin.sidebar.general": "Общие",
   "admin.sidebar.gitlab": "GitLab",
-  "admin.sidebar.images": "Изображения",
   "admin.sidebar.integrations": "Интеграция",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "Право и поддержка",
@@ -832,7 +813,7 @@
   "admin.sql.maxOpenTitle": "Максимальное число открытых соединений:",
   "admin.sql.noteDescription": "Изменение параметров в этой секции потребует перезагрузки сервера.",
   "admin.sql.noteTitle": "Заметка:",
-  "admin.sql.queryTimeoutDescription": "The number of seconds to wait for a response from the database after opening a connection and sending the query. Errors that you see in the UI or in the logs as a result of a query timeout can vary depending on the type of query. This setting has no effect on PostgreSQL databases.",
+  "admin.sql.queryTimeoutDescription": "The number of seconds to wait for a response from the database after opening a connection and sending the query. Errors that you see in the UI or in the logs as a result of a query timeout can vary depending on the type of query.",
   "admin.sql.queryTimeoutExample": "Например: \"30\"",
   "admin.sql.queryTimeoutTitle": "Query Timeout:",
   "admin.sql.replicas": "Реплики источника данных:",
@@ -891,11 +872,16 @@
   "admin.team.restrictTitle": "Ограничить создание аккаунтов с указанных почтовых доменов:",
   "admin.team.restrict_direct_message_any": "Все пользователи сервера Mattermost",
   "admin.team.restrict_direct_message_team": "Все участники команды",
+  "admin.team.showFullname": "Show first and last name (default)",
+  "admin.team.showNickname": "Показывать псевдоним, если он существует, в противном случае показывать имя и фамилию",
+  "admin.team.showUsername": "Show username",
   "admin.team.siteNameDescription": "Отображаемое имя сервиса в окне входа и пользовательском интерфейсе.",
   "admin.team.siteNameExample": "Например: \"Mattermost\"",
   "admin.team.siteNameTitle": "Название сайта:",
   "admin.team.teamCreationDescription": "Когда выключено, только системные администраторы могут создавать команды.",
   "admin.team.teamCreationTitle": "Включить создание команды: ",
+  "admin.team.teammateNameDisplay": "Отображение имени в команде",
+  "admin.team.teammateNameDisplayDesc": "Установите, как отображать Ваши имена в постах и в списке выбора личных сообщений.",
   "admin.team.upload": "Загрузить",
   "admin.team.uploadDesc": "Настройте свой пользовательский интерфейс, добавив пользовательское изображение на экране входа в систему. Рекомендуемый максимальный размер изображения составляет менее 2 МБ.",
   "admin.team.uploaded": "Загружено!",
@@ -1121,7 +1107,8 @@
   "channel_invite.close": "Закрыть",
   "channel_loader.connection_error": "Возникла проблема с сетевым подключением.",
   "channel_loader.posted": "Опубликовано",
-  "channel_loader.socketError": "Пожалуйста, проверьте ваше соединение, Mattermost недостижим. Если эта проблема постоянна, попросите администратора проверить порт WebSocket.",
+  "channel_loader.postedImage": " загрузил изображение",
+  "channel_loader.socketError": "Please check connection, Mattermost unreachable. If issue persists, ask administrator to <a href=\"https://about.mattermost.com/default-websocket-port-help\" target=\"_blank\">check WebSocket port</a>.",
   "channel_loader.someone": "Кто-то",
   "channel_loader.something": " сделал что-то новое",
   "channel_loader.unknown_error": "Мы получили неожиданный код состояния от сервера.",
@@ -1718,6 +1705,9 @@
   "mobile.custom_list.no_results": "Нет результатов",
   "mobile.drawer.teamsTitle": "Команды",
   "mobile.edit_post.title": "Редактирование сообщения",
+  "mobile.error_handler.button": "Relaunch",
+  "mobile.error_handler.description": "\nClick relaunch to open the app again. After restart, you can report the problem from the settings menu.\n",
+  "mobile.error_handler.title": "Unexpected error occurred",
   "mobile.file_upload.camera": "Сделать фото или видео",
   "mobile.file_upload.library": "Библиотека изображений",
   "mobile.file_upload.more": "Еще",
@@ -1769,6 +1759,9 @@
   "mobile.select_team.join_open": "Другие команды, к которым вы можете присоединиться.",
   "mobile.select_team.no_teams": "There are no available teams for you to join.",
   "mobile.server_ping_failed": "Cannot connect to the server. Please check your server URL and internet connection.",
+  "mobile.server_upgrade.button": "OK",
+  "mobile.server_upgrade.description": "\nA server upgrade is required to use the Mattermost app. Please ask your System Administrator for details.\n",
+  "mobile.server_upgrade.title": "Server upgrade required",
   "mobile.server_url.invalid_format": "Адрес должен начинаться с http:// или https://",
   "mobile.session_expired": "Session Expired: Please log in to continue receiving notifications.",
   "mobile.settings.team_selection": "Выбор команды",
@@ -2192,8 +2185,6 @@
   "user.settings.display.collapseOff": "Свёрнуто",
   "user.settings.display.collapseOn": "Раскрыто",
   "user.settings.display.fixedWidthCentered": "По центру, фиксировано по ширине",
-  "user.settings.display.fontDesc": "Выберите шрифт пользовательского интерфейса Mattermost.",
-  "user.settings.display.fontTitle": "Шрифт",
   "user.settings.display.fullScreen": "В полную ширину",
   "user.settings.display.language": "Язык",
   "user.settings.display.messageDisplayClean": "Стандартный",
@@ -2209,7 +2200,7 @@
   "user.settings.display.showFullname": "Показывать имя и фамилию",
   "user.settings.display.showNickname": "Показывать псевдоним, если он существует, в противном случае показывать имя и фамилию",
   "user.settings.display.showUsername": "Показывать имя пользователя (по умолчанию)",
-  "user.settings.display.teammateDisplay": "Отображение имени в команде",
+  "user.settings.display.teammateNameDisplay": "Отображение имени в команде",
   "user.settings.display.theme.applyToAllTeams": "Применить новую тему для всех моих команд",
   "user.settings.display.theme.customTheme": "Пользовательская Тема",
   "user.settings.display.theme.describe": "Откройте для настройки темы",
diff --git a/webapp/i18n/tr.json b/webapp/i18n/tr.json
index 541cc532e3..82101c5e33 100644
--- a/webapp/i18n/tr.json
+++ b/webapp/i18n/tr.json
@@ -415,18 +415,6 @@
   "admin.image.maxFileSizeDescription": "Megabayt cinsinden en büyük ileti ek dosyası boyutu. Dikkat: Sunucu belleğinin yaptığınız seçimi desteklediğinden emin olun. Büyük dosya boyutları sunucunun çökmesine ve ağ kesintileri nedeniyle yüklemelerin yapılamamasına neden olabilir.",
   "admin.image.maxFileSizeExample": "50",
   "admin.image.maxFileSizeTitle": "En Büyük Dosya Boyutu:",
-  "admin.image.previewHeightDescription": "En büyük önizleme görseli yüksekliği (\"0\": Otomatik boyut). Bu değer değiştirildiğinde bundan sonraki önizleme görselleri için geçerli olur, daha önce oluşturulmuş görseller önceki boyutta kalır.",
-  "admin.image.previewHeightExample": "Örnek: \"0\"",
-  "admin.image.previewHeightTitle": "Görsel Önizleme Yüksekliği:",
-  "admin.image.previewWidthDescription": "En büyük önizleme görseli genişliği. Bu değer değiştirildiğinde bundan sonraki önizleme görselleri için geçerli olur, daha önce oluşturulmuş görseller önceki boyutta kalır.",
-  "admin.image.previewWidthExample": "Örnek: \"1024\"",
-  "admin.image.previewWidthTitle": "Görsel Önizleme Genişliği:",
-  "admin.image.profileHeightDescription": "Profil görselinin yüksekliği.",
-  "admin.image.profileHeightExample": "Örnek: \"0\"",
-  "admin.image.profileHeightTitle": "Profil Görseli Yüksekliği:",
-  "admin.image.profileWidthDescription": "Profil görselinin genişliği.",
-  "admin.image.profileWidthExample": "Örnek: \"1024\"",
-  "admin.image.profileWidthTitle": "Profil Görselinin Genişliği:",
   "admin.image.publicLinkDescription": "Herkese açık görsel bağlantılarını imzalamak için eklenecek 32 karakter uzunluğundaki çeşni. Kurulum sırasında rastgele olarak üretilir. Yeni bir çeşni oluşturmak için \"Yeniden Oluştur\" üzerine tıklayın.",
   "admin.image.publicLinkExample": "Örnek: \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
   "admin.image.publicLinkTitle": "Herkese Açık Bağlantı Çeşnisi:",
@@ -436,12 +424,6 @@
   "admin.image.storeDescription": "Eklenecek dosya ve görsellerin kaydedileceği depolama sistemi.<br /><br />\"Amazon S3\" olarak seçildiğinde, Amazon kimlik doğrulama bilgileri ile buket ayrıntılarının yazılabileceği alanlar etkinleştirilir.<br /><br />\"Yerel Dosya Sistemi\" olarak seçildiğinde yerel dosya klasörünün yazılabileceği alan etkinleştirilir.",
   "admin.image.storeLocal": "Yerel Dosya Sistemi",
   "admin.image.storeTitle": "Dosya Depolama Sistemi:",
-  "admin.image.thumbHeightDescription": "Yüklenen görsellerden oluşturulacak küçük görsellerin yüksekliği. Bu değer değiştirildiğinde bundan sonraki küçük görseller için geçerli olur, daha önce oluşturulmuş görseller önceki boyutta kalır.",
-  "admin.image.thumbHeightExample": "Örnek: \"100\"",
-  "admin.image.thumbHeightTitle": "Ek Dosya Küçük Görseli Yüksekliği:",
-  "admin.image.thumbWidthDescription": "Yüklenen görsellerden oluşturulacak küçük görsellerin genişliği. Bu değer değiştirildiğinde bundan sonraki küçük görseller için geçerli olur, daha önce oluşturulmuş görseller önceki boyutta kalır.",
-  "admin.image.thumbWidthExample": "Örnek: \"120\"",
-  "admin.image.thumbWidthTitle": "Ek Dosya Küçük Görseli Genişliği:",
   "admin.integrations.custom": "Özel Bütünleştirmeler",
   "admin.integrations.external": "Dış Hizmetler",
   "admin.integrations.webrtc": "Mattermost WebRTC",
@@ -782,7 +764,6 @@
   "admin.sidebar.files": "Dosyalar",
   "admin.sidebar.general": "Genel",
   "admin.sidebar.gitlab": "GitLab",
-  "admin.sidebar.images": "Görseller",
   "admin.sidebar.integrations": "Bütünleştirmeler",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "Hükümler ve Destek",
@@ -832,7 +813,7 @@
   "admin.sql.maxOpenTitle": "En Fazla Açık Bağlantı Sayısı:",
   "admin.sql.noteDescription": "Bu bölümde yapılan değişikliklerin etkin olması için sunucu yeniden başlatılmalıdır.",
   "admin.sql.noteTitle": "Not:",
-  "admin.sql.queryTimeoutDescription": "Bir bağlantı açılıp sorgu gönderilmeden önce veritabanından yanıt almak için beklenecek saniye. Sorgunun türüne bağlı olarak oluşacak zaman aşımları nedeniyle arayüzde hatalar görebilirsiniz. Bu ayarın PostgreSQL veritabanları üzerinde etkisi yoktur.",
+  "admin.sql.queryTimeoutDescription": "Bir bağlantı açılıp sorgu gönderilmeden önce veritabanından yanıt almak için beklenecek saniye. Sorgunun türüne bağlı olarak oluşacak zaman aşımları nedeniyle kullanıcı arayüzünde ya da günlük kayıtlarında hatalar görebilirsiniz.",
   "admin.sql.queryTimeoutExample": "Örnek: \"30\"",
   "admin.sql.queryTimeoutTitle": "Sorgu Zaman Aşımı:",
   "admin.sql.replicas": "Veri Kaynağı Kopyaları:",
@@ -891,11 +872,16 @@
   "admin.team.restrictTitle": "Hesap ekleme belirtilen etki alanları ile kısıtlansın:",
   "admin.team.restrict_direct_message_any": "Mattermost sunucusundaki herhangi bir kullanıcı",
   "admin.team.restrict_direct_message_team": "Takımdaki herhangi bir kullanıcı",
+  "admin.team.showFullname": "Ad ve soyad görüntülensin (varsayılan)",
+  "admin.team.showNickname": "Varsa takma ad görüntülensin, yoksa ad ve soyad görüntülensin",
+  "admin.team.showUsername": "Kullanıcı adı görüntülensin",
   "admin.team.siteNameDescription": "Oturum açma sayfaları ve kullanıcı arayüzünde görüntülenecek hizmet adı.",
   "admin.team.siteNameExample": "Örnek: \"Mattermost\"",
   "admin.team.siteNameTitle": "Site Adı:",
   "admin.team.teamCreationDescription": "Bu seçenek devre dışı bırakıldığında, yalnız Sistem Yöneticileri takım ekleyebilir.",
   "admin.team.teamCreationTitle": "Takım Eklenebilsin: ",
+  "admin.team.teammateNameDisplay": "Takım Arkadaşı Adı Görünümü:",
+  "admin.team.teammateNameDisplayDesc": "İleti ve Doğrudan İleti listelerinde kullanıcı adlarının nasıl görüntüleneceğini ayarlayın.",
   "admin.team.upload": "Yükle",
   "admin.team.uploadDesc": "Oturum açma sayfasına özel bir görsel yükleyebilirsiniz. Görselin 2 MB boyutundan büyük olmaması önerilir.",
   "admin.team.uploaded": "Yüklendi!",
@@ -1121,7 +1107,8 @@
   "channel_invite.close": "Kapat",
   "channel_loader.connection_error": "İnternet bağlantınızda bir sorun var gibi görünüyor.",
   "channel_loader.posted": "Gönderildi",
-  "channel_loader.socketError": "Lütfen bağlantınızı denetleyin. Mattermost sunucusuna erişilemiyor. Sorun sürerse yöneticinizden WebSocket kapısını denetlemesini isteyin.",
+  "channel_loader.postedImage": " bir görsel yükledi",
+  "channel_loader.socketError": "Lütfen bağlantıyı denetleyin, Mattermost ulaşılabilir değil. Sorun sürerse, yöneticiden <a href=\"https://about.mattermost.com/default-websocket-port-help\" target=\"_blank\">WebSocket kapısını denetlemesini</a> isteyin.",
   "channel_loader.someone": "Biri",
   "channel_loader.something": " yeni bir şey yaptı",
   "channel_loader.unknown_error": "Sunucudan beklenmedik bir durum kodu alındı.",
@@ -1688,7 +1675,7 @@
   "mobile.channel_info.alertTitleDeleteChannel": "{term} Kanalını Sil",
   "mobile.channel_info.alertTitleLeaveChannel": "{term} Kanalından Ayrıl",
   "mobile.channel_info.alertYes": "Evet",
-  "mobile.channel_info.delete_failed": "We couldn't delete the channel {displayName}. Please check your connection and try again.",
+  "mobile.channel_info.delete_failed": "{displayName} kanalı silinemedi. Lütfen bağlantınızı denetleyip yeniden deneyin.",
   "mobile.channel_info.privateChannel": "Özel Kanal",
   "mobile.channel_info.publicChannel": "Herkese Açık Kanal",
   "mobile.channel_list.alertMessageLeaveChannel": "{term} {name} kanalından ayrılmak istediğinize emin misiniz?",
@@ -1718,6 +1705,9 @@
   "mobile.custom_list.no_results": "Herhangi bir sonuç bulunamadı",
   "mobile.drawer.teamsTitle": "Takımlar",
   "mobile.edit_post.title": "İleti Düzenleniyor",
+  "mobile.error_handler.button": "Yeniden başlat",
+  "mobile.error_handler.description": "\nUygulamayı açmak için yeniden başlat üzerine tıklayın. Yeniden başlatıldıktan sonra ayarlar menüsünden sorunu bildirebilirsiniz.\n",
+  "mobile.error_handler.title": "Beklenmeyen bir sorun çıktı",
   "mobile.file_upload.camera": "Fotoğraf ya da Görüntü Çek",
   "mobile.file_upload.library": "Fotoğraf Kitaplığı",
   "mobile.file_upload.more": "Diğer",
@@ -1726,7 +1716,7 @@
   "mobile.intro_messages.DM": "{teammate} takım arkadaşınız ile doğrudan ileti geçmişinizin başlangıcı. Bu bölüm dışındaki kişiler burada paylaşılan doğrudan ileti ve dosyaları göremez.",
   "mobile.intro_messages.default_message": "Takım arkadaşlarınız kayıt olduğunda görecekleri ilk kanal budur. Bu kanalı herkesin bilmesi gereken iletiler için kullanın.",
   "mobile.intro_messages.default_welcome": "{name} üzerine hoş geldiniz!",
-  "mobile.join_channel.error": "We couldn't join the channel {displayName}. Please check your connection and try again.",
+  "mobile.join_channel.error": "{displayName} kanalına katınılamadı. Lütfen bağlantınızı denetleyip yeniden deneyin.",
   "mobile.loading_channels": "Kanallar Yükleniyor...",
   "mobile.loading_members": "Üyeler Yükleniyor...",
   "mobile.loading_posts": "İletiler Yükleniyor...",
@@ -1735,7 +1725,7 @@
   "mobile.offlineIndicator.connected": "Bağlandı",
   "mobile.offlineIndicator.connecting": "Bağlanıyor...",
   "mobile.offlineIndicator.offline": "İnternet bağlantısı yok",
-  "mobile.open_dm.error": "We couldn't open a direct message with {displayName}. Please check your connection and try again.",
+  "mobile.open_dm.error": "{displayName} kanalına doğrudan ileti açılamadı. Lütfen bağlantınızı denetleyip yeniden deneyin.",
   "mobile.post.cancel": "İptal",
   "mobile.post.delete_question": "Bu iletiyi silmek istediğinize emin misiniz?",
   "mobile.post.delete_title": "İletisi Sil",
@@ -1769,6 +1759,9 @@
   "mobile.select_team.join_open": "Katılabileceğiniz diğer açık takımlar",
   "mobile.select_team.no_teams": "Katılabileceğiniz herhangi bir takım yok.",
   "mobile.server_ping_failed": "Sunucuya bağlanılamadı. Lütfen sunucu adresini ve İnternet bağlantınızı denetleyin.",
+  "mobile.server_upgrade.button": "Tamam",
+  "mobile.server_upgrade.description": "\nMattermost uygulamasını kullanmak için sunucunun güncellenmesi gerekiyor. Lütfen ayrıntılı bilgi almak için sistem yöneticisi ile görüşün.\n",
+  "mobile.server_upgrade.title": "Sunucunun güncellenmesi gerekli",
   "mobile.server_url.invalid_format": "Adres http:// yada https:// ile başlamalıdır",
   "mobile.session_expired": "Oturumun Süresi Dolmuş: Lütfen bildirimleri almaya devam etmek için oturum açın.",
   "mobile.settings.team_selection": "Takım Seçimi",
@@ -1795,7 +1788,7 @@
   "msg_typing.someone": "Biri",
   "multiselect.add": "Ekle",
   "multiselect.go": "Git",
-  "multiselect.numPeopleRemaining": "Use ↑↓ to browse, ↵ to select. You can add {num, number} more {num, plural, one {person} other {people}}. ",
+  "multiselect.numPeopleRemaining": "Gezinmek için ↑↓, seçmek için ↵ tuşlarını kullanın. {num, number} more {num, plural, one {person} other {people}} daha ekleyebilirsiniz. ",
   "multiselect.numRemaining": "{num, number} kişi daha ekleyebilirsiniz",
   "multiselect.placeholder": "Üye arama ve ekleme",
   "navbar.addMembers": "Üye Ekle",
@@ -1826,7 +1819,7 @@
   "navbar_dropdown.leave": "Takımdan Ayrıl",
   "navbar_dropdown.logout": "Oturumu Kapat",
   "navbar_dropdown.manageMembers": "Üye Yönetimi",
-  "navbar_dropdown.nativeApps": "Uygulama İndir",
+  "navbar_dropdown.nativeApps": "Uygulamaları İndir",
   "navbar_dropdown.report": "Sorun Bildir",
   "navbar_dropdown.switchTeam": "{team} Takımına Geç",
   "navbar_dropdown.switchTo": "Şuraya Geç ",
@@ -1966,7 +1959,7 @@
   "setting_picture.help": "BMP, JPG, JPEG ya da PNG biçiminde ve en az {width} genişliğinde ve {height} yüksekliğinde bir profil görseli yükleyin.",
   "setting_picture.save": "Kaydet",
   "setting_picture.select": "Seçin",
-  "setting_upload.import": "Al",
+  "setting_upload.import": "İçe Aktar",
   "setting_upload.noFile": "Herhangi bir dosya seçilmemiş.",
   "setting_upload.select": "Dosya seçin",
   "sidebar.channels": "Kanallar",
@@ -1993,7 +1986,7 @@
   "sidebar_right_menu.inviteNew": "E-posta Çağrısı Gönder",
   "sidebar_right_menu.logout": "Oturumu Kapat",
   "sidebar_right_menu.manageMembers": "Üye Yönetimi",
-  "sidebar_right_menu.nativeApps": "Uygulama İndir",
+  "sidebar_right_menu.nativeApps": "Uygulamaları İndir",
   "sidebar_right_menu.recentMentions": "Son Anmalar",
   "sidebar_right_menu.report": "Sorun Bildir",
   "sidebar_right_menu.teamLink": "Takım Çağrı Bağlantısını Al",
@@ -2070,22 +2063,22 @@
   "system_users_list.countPage": "{startCount, number} - {endCount, number} {count, plural, one {user} other {users}} / {total, number}",
   "system_users_list.countSearch": "{count, number} {count, plural, one {user} other {users}} / {total, number}",
   "team_export_tab.download": "indir",
-  "team_export_tab.export": "Ver",
-  "team_export_tab.exportTeam": "Takımınızı verin",
-  "team_export_tab.exporting": " Veriliyor...",
+  "team_export_tab.export": "Dışa Aktar",
+  "team_export_tab.exportTeam": "Takımınızı dışa aktarın",
+  "team_export_tab.exporting": " Dışa aktarılıyor...",
   "team_export_tab.ready": " Şunun için hazır ",
-  "team_export_tab.unable": " Verilemedi: {error}",
+  "team_export_tab.unable": " Dışa aktarılamadı: {error}",
   "team_import_tab.failure": " Alınamadı: ",
-  "team_import_tab.import": "Al",
+  "team_import_tab.import": "İçe Aktar",
   "team_import_tab.importHelpDocsLink": "belgeler",
-  "team_import_tab.importHelpExportInstructions": "Slack > Takım Ayarları > Veri Alma/Verme > Ver > Vermeyi Başlat",
-  "team_import_tab.importHelpExporterLink": "Slack Gelişmiş Verme",
-  "team_import_tab.importHelpLine1": "Slack alma özelliği ile Slack takımının herkese açık kanalları Mattermost üzerine aktarılabilir.",
-  "team_import_tab.importHelpLine2": "Slack üzerinden bir takım almak için {exportInstructions} bölümüne bakın. Ayrıntılı bilgi almak için {uploadDocsLink} bölümüne bakın.",
-  "team_import_tab.importHelpLine3": "Dosya eki olan iletileri alma ayrıntıları için {slackAdvancedExporterLink} bölümüne bakın.",
-  "team_import_tab.importSlack": "Slack üzerinden al (Beta)",
-  "team_import_tab.importing": " Alınıyor...",
-  "team_import_tab.successful": " Veriler alındı: ",
+  "team_import_tab.importHelpExportInstructions": "Slack > Takım Ayarları > İçe/Dışa Veri Aktarma > Dışa Aktar > Dışa Aktarmayı Başlat",
+  "team_import_tab.importHelpExporterLink": "Slack Gelişmiş Dışa Aktarma",
+  "team_import_tab.importHelpLine1": "Slack içe aktarma özelliği ile Slack takımının herkese açık kanalları Mattermost içine aktarılabilir.",
+  "team_import_tab.importHelpLine2": "Slack üzerindeki bir takımı içe aktarmak için {exportInstructions} bölümüne bakın. Ayrıntılı bilgi almak için {uploadDocsLink} bölümüne bakın.",
+  "team_import_tab.importHelpLine3": "Dosya eki olan iletileri içe aktarma ayrıntıları için {slackAdvancedExporterLink} bölümüne bakın.",
+  "team_import_tab.importSlack": "Slack üzerinden içe aktar (Beta)",
+  "team_import_tab.importing": " İçe aktarılıyor...",
+  "team_import_tab.successful": " İçe aktarma tamamlandı: ",
   "team_import_tab.summary": "Özeti Görüntüle",
   "team_member_modal.close": "Kapat",
   "team_member_modal.members": "{team} Üyeleri",
@@ -2102,9 +2095,9 @@
   "team_members_dropdown.member": "Üye",
   "team_members_dropdown.systemAdmin": "Sistem Yöneticisi",
   "team_members_dropdown.teamAdmin": "Takım Yöneticisi",
-  "team_settings_modal.exportTab": "Ver",
+  "team_settings_modal.exportTab": "Dışa Aktar",
   "team_settings_modal.generalTab": "Genel",
-  "team_settings_modal.importTab": "Al",
+  "team_settings_modal.importTab": "İçe Aktar",
   "team_settings_modal.title": "Takım Ayarları",
   "team_sidebar.join": "Katılabileceğiniz diğer takımlar.",
   "textbox.bold": "**koyu**",
@@ -2192,8 +2185,6 @@
   "user.settings.display.collapseOff": "Daraltılmış",
   "user.settings.display.collapseOn": "Genişletilmiş",
   "user.settings.display.fixedWidthCentered": "Sabit genişlikli, ortalanmış",
-  "user.settings.display.fontDesc": "Mattermost kullanıcı arayüzünde kullanılacak yazı türünü seçin.",
-  "user.settings.display.fontTitle": "Yazı Türü",
   "user.settings.display.fullScreen": "Tam genişlil",
   "user.settings.display.language": "Dil",
   "user.settings.display.messageDisplayClean": "Standart",
@@ -2209,11 +2200,11 @@
   "user.settings.display.showFullname": "Ad ve soyad görüntülensin",
   "user.settings.display.showNickname": "Varsa takma ad görüntülensin, yoksa ad ve soyad görüntülensin",
   "user.settings.display.showUsername": "Kullanıcı adı görüntülensin (varsayılan)",
-  "user.settings.display.teammateDisplay": "Takım Arkadaşı Adı Görünümü",
+  "user.settings.display.teammateNameDisplay": "Takım Arkadaşı Adı Görünümü",
   "user.settings.display.theme.applyToAllTeams": "Yeni tema tüm takımlarıma uygulansın",
   "user.settings.display.theme.customTheme": "Özel Tema",
   "user.settings.display.theme.describe": "Temanızı düzenlemek için açın",
-  "user.settings.display.theme.import": "Tema renkleri Slack üzerinden alınsın",
+  "user.settings.display.theme.import": "Tema renklerini Slack üzerinden içe aktarma",
   "user.settings.display.theme.otherThemes": "Diğer temaları görüntüle",
   "user.settings.display.theme.themeColors": "Tema Renkleri",
   "user.settings.display.theme.title": "Tema",
@@ -2271,8 +2262,8 @@
   "user.settings.general.validEmail": "Lütfen geçerli bir e-posta adresi yazın",
   "user.settings.general.validImage": "Profil görseli olarak yalnız JPG ya da PNG görselleri kullanılabilir",
   "user.settings.import_theme.cancel": "İptal",
-  "user.settings.import_theme.importBody": "Bir temayı almak için Slack takımına gidin ve 'Ayarlar -> Yan Çubuk Teması' bölümüne bakın. Özel tema seçeneğini açın ve tema renk değerlerini kopyalayıp buraya yapıştırın:",
-  "user.settings.import_theme.importHeader": "Slack Teması Al",
+  "user.settings.import_theme.importBody": "Bir temayı içe aktarmak için Slack takımına gidin ve 'Ayarlar -> Yan Çubuk Teması' bölümüne bakın. Özel tema seçeneğini açın ve tema renk değerlerini kopyalayıp buraya yapıştırın:",
+  "user.settings.import_theme.importHeader": "Slack Temasını İçe Aktar",
   "user.settings.import_theme.submit": "Gönder",
   "user.settings.import_theme.submitError": "Biçim geçersiz, lütfen yeniden kopyalayıp yapıştırmayı deneyin.",
   "user.settings.languages.change": "Arayüz dilini değiştir",
diff --git a/webapp/i18n/zh-CN.json b/webapp/i18n/zh-CN.json
index 83c0ab5777..506d92338d 100644
--- a/webapp/i18n/zh-CN.json
+++ b/webapp/i18n/zh-CN.json
@@ -415,18 +415,6 @@
   "admin.image.maxFileSizeDescription": "最大允许的讯息附件文件大小(MB)。注意：请确认服务器内存能够承受您的设定。过大的文件大小会增加服务器崩溃和因网路问题而上传失败的风险。",
   "admin.image.maxFileSizeExample": "50",
   "admin.image.maxFileSizeTitle": "最大文件大小：",
-  "admin.image.previewHeightDescription": "预览图最大高度(\"0\": 设置为自动)。更新这个值改变之后的预览图显示，但不改变在过去创建的图片。",
-  "admin.image.previewHeightExample": "例如 \"0\"",
-  "admin.image.previewHeightTitle": "预览图像高度：",
-  "admin.image.previewWidthDescription": "预览图最大宽度。更新这个值改变之后的预览图显示，但不改变在过去创建的图片。",
-  "admin.image.previewWidthExample": "例如 \"1024\"",
-  "admin.image.previewWidthTitle": "预览图像宽度：",
-  "admin.image.profileHeightDescription": "个人头像高度。",
-  "admin.image.profileHeightExample": "例如 \"0\"",
-  "admin.image.profileHeightTitle": "个人头像高度：",
-  "admin.image.profileWidthDescription": "个人头像宽度。",
-  "admin.image.profileWidthExample": "例如 \"1024\"",
-  "admin.image.profileWidthTitle": "个人头像宽度：",
   "admin.image.publicLinkDescription": "32字盐值用来签署公开的图片链接。由安装时随机生成。点击 \"重新生成\" 生成新的盐。",
   "admin.image.publicLinkExample": "例如 \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
   "admin.image.publicLinkTitle": "公共链接盐值：",
@@ -436,12 +424,6 @@
   "admin.image.storeDescription": "文件和图片所存放的储存系统。<br /><br />选择 \"Amazon S3\" 会启用对应栏位让您填入 Amazon 的认证跟储存贮体的详细资料。<br /><br />选择 \"本地文件系统\" 会启用对应栏位让您填入本地文件目录。",
   "admin.image.storeLocal": "本地文件系统",
   "admin.image.storeTitle": "文件存储系统：",
-  "admin.image.thumbHeightDescription": "上传图片时生成缩略图高度。更新这个值改变之后的缩略图显示，但不改变在过去创建的图片。",
-  "admin.image.thumbHeightExample": "例如 \"100\"",
-  "admin.image.thumbHeightTitle": "附件缩略图高度：",
-  "admin.image.thumbWidthDescription": "上传图片时生成缩略图宽度。更新这个值改变之后的缩略图显示，但不改变在过去创建的图片。",
-  "admin.image.thumbWidthExample": "例如 \"120\"",
-  "admin.image.thumbWidthTitle": "附件缩略图宽度：",
   "admin.integrations.custom": "自定义集成",
   "admin.integrations.external": "外部服务",
   "admin.integrations.webrtc": "Mattermost WebRTC",
@@ -609,7 +591,7 @@
   "admin.rate.memoryDescription": "连接到系统的最大用户会话数由以下 \"根据远程地址改变频率限制\" 以及 \"通过HTTP头变化频率限制\" 设定而决定。",
   "admin.rate.memoryExample": "例如 \"10000\"",
   "admin.rate.memoryTitle": "内存存储大小：",
-  "admin.rate.noteDescription": "修改了这部分属性需要重启服务器才能生效。",
+  "admin.rate.noteDescription": "在这部分修改站点网址以外的属性需要重启服务器才能生效。",
   "admin.rate.noteTitle": "注释：",
   "admin.rate.queriesDescription": "限制每秒API请求数。",
   "admin.rate.queriesExample": "例如 \"10\"",
@@ -782,7 +764,6 @@
   "admin.sidebar.files": "文件",
   "admin.sidebar.general": "常规",
   "admin.sidebar.gitlab": "GitLab",
-  "admin.sidebar.images": "图像",
   "admin.sidebar.integrations": "集成",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "法律和支持",
@@ -891,11 +872,16 @@
   "admin.team.restrictTitle": "只允许特定电子邮件域名创建帐号：",
   "admin.team.restrict_direct_message_any": "在Mattermost服务器上的任何用户",
   "admin.team.restrict_direct_message_team": "任何团队成员",
+  "admin.team.showFullname": "Show first and last name (default)",
+  "admin.team.showNickname": "若存在昵称显示昵称，否则显示姓名",
+  "admin.team.showUsername": "Show username",
   "admin.team.siteNameDescription": "登录画面和界面所显示的服务名称。",
   "admin.team.siteNameExample": "例如 \"Mattermost\"",
   "admin.team.siteNameTitle": "网站名称：",
   "admin.team.teamCreationDescription": "当设为否时，只有系统管理能创建团队。",
   "admin.team.teamCreationTitle": "开启创建团队：",
+  "admin.team.teammateNameDisplay": "团队队友的名字显示",
+  "admin.team.teammateNameDisplayDesc": "设置在信息和私信列表中如何显示其他用户的名字。",
   "admin.team.upload": "上传",
   "admin.team.uploadDesc": "添加一个自定义图片到登入界面以定制用户体验。推荐图片小于 2 MB。",
   "admin.team.uploaded": "已上传！",
@@ -1121,7 +1107,8 @@
   "channel_invite.close": "关闭",
   "channel_loader.connection_error": "您的网络连接似乎出现一个问题。",
   "channel_loader.posted": "已发布",
-  "channel_loader.socketError": "请检查连接，无法连接到 Mattermost。如果问题持续存在，请管理员检查 WebSocket 端口。",
+  "channel_loader.postedImage": "上传图片",
+  "channel_loader.socketError": "Please check connection, Mattermost unreachable. If issue persists, ask administrator to <a href=\"https://about.mattermost.com/default-websocket-port-help\" target=\"_blank\">check WebSocket port</a>.",
   "channel_loader.someone": "有人",
   "channel_loader.something": "新事物",
   "channel_loader.unknown_error": "我们从服务器上接收到一个异常状态码。",
@@ -1342,13 +1329,13 @@
   "file_upload.disabled": "文件附件已禁用。",
   "file_upload.fileAbove": "文件超过{max}MB不能被上传：{filename}",
   "file_upload.filesAbove": "文件超过{max}MB不能被上传：{filenames}",
-  "file_upload.limited": "最大上传文件数限制为 {count}。请使用新信息来上传更多文件。",
+  "file_upload.limited": "最大上传文件数限制为 {count, number}。请使用新信息以上传更多文件。",
   "file_upload.pasted": "图片已粘贴至",
   "filtered_channels_list.search": "搜索频道",
   "filtered_user_list.any_team": "所有用户",
   "filtered_user_list.count": "{count, number} 位用户",
-  "filtered_user_list.countTotal": "{count, number} 位用户，共 {total}",
-  "filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count} 位用户，共 {total} 位",
+  "filtered_user_list.countTotal": "{count, number} 位用户，共 {total, number}",
+  "filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count} 位用户，共 {total, number} 位",
   "filtered_user_list.member": "成员",
   "filtered_user_list.next": "下一页",
   "filtered_user_list.prev": "上一页",
@@ -1478,7 +1465,7 @@
   "help.mentioning.mentions": "## @提及\n用 @提及 来引起特定团队成员的注意。",
   "help.mentioning.recent": "## 最近提及\n点击搜索栏旁边的 `@` 以查询您最近的 @提及 以及触发提及的词。点击右边栏搜索结果旁的 **跳转** 将中间栏跳转到提及的频道和消息的位置。",
   "help.mentioning.title": "# 提及团友\n_____",
-  "help.mentioning.triggers": "## 触发提及的词\n除了被 @用户名 和 @频道 通知意外，您可以在 **帐号设定** > **通知** > **触发提及的词** 自定义被触发提及通知的词。默认情况下，您会收到您名字的通知，但您可以添加用逗号分开的触发词。这在您想要在收到特定主题的通知时很有帮助，比如，\"面试\" 或 \"市场\"。",
+  "help.mentioning.triggers": "## 触发提及的词\n除了被 @用户名 和 @频道 通知以外，您可以在 **帐号设定** > **通知** > **触发提及的词** 自定义被触发提及通知的词。默认情况下，您会收到您名字的通知，但您可以添加用逗号分开的触发词。这在您想要在收到特定主题的通知时很有帮助，比如，\"面试\" 或 \"市场\"。",
   "help.mentioning.username": "#### @用户名\n您可以用 `@` 符号紧接着他们的用户名来发送提及通知给他们。\n\n输入 `@` 来打开可以被提及的团队成员。输入用户名，名字，姓氏，或昵称开头几个字来过滤列表。用 **上** 和 **下** 方向键可以从列表中选择项目，然后用 **回车** 确认选择。一旦选中，全名或昵称将自动被代替为用户名。\n以下例子将发送特殊提及通知给 **alice** 告诉她被提及到的频道和消息内容。如果 **alice** 在 Mattermost 为离开并且开启[电子邮件通知](http://docs.mattermost.com/help/getting-started/configuring-notifications.html#email-notifications)，那么她会收到带有提及和消息的电子邮件通知。",
   "help.mentioning.usernameCont": "如果您提及的用户不属于这频道，系统会发信息告知您。这只是个临时的信息且只有触发的人看见。如想添加提及的用户到频道，点击频道名旁的下拉菜单中的 **添加成员**。",
   "help.mentioning.usernameExample": "@alice 新候选人的面试怎么样？",
@@ -1688,7 +1675,7 @@
   "mobile.channel_info.alertTitleDeleteChannel": "删除 {term}",
   "mobile.channel_info.alertTitleLeaveChannel": "离开 {term}",
   "mobile.channel_info.alertYes": "是",
-  "mobile.channel_info.delete_failed": "We couldn't delete the channel {displayName}. Please check your connection and try again.",
+  "mobile.channel_info.delete_failed": "我们无法删除频道 {displayName}。请检查您的网络连接再尝试。",
   "mobile.channel_info.privateChannel": "私有频道",
   "mobile.channel_info.publicChannel": "公共频道",
   "mobile.channel_list.alertMessageLeaveChannel": "您确定要离开{term} {name}？",
@@ -1718,6 +1705,9 @@
   "mobile.custom_list.no_results": "无结果",
   "mobile.drawer.teamsTitle": "团队",
   "mobile.edit_post.title": "编辑消息",
+  "mobile.error_handler.button": "Relaunch",
+  "mobile.error_handler.description": "\nClick relaunch to open the app again. After restart, you can report the problem from the settings menu.\n",
+  "mobile.error_handler.title": "Unexpected error occurred",
   "mobile.file_upload.camera": "拍照或视频",
   "mobile.file_upload.library": "照片库",
   "mobile.file_upload.more": "更多",
@@ -1726,7 +1716,7 @@
   "mobile.intro_messages.DM": "这是您和{teammate}私信记录的开端。此区域外的人不能看到这里共享的私信和文件。",
   "mobile.intro_messages.default_message": "这是团队成员注册后第一个看到的频道 - 使用它发布所有人需要知道的消息。",
   "mobile.intro_messages.default_welcome": "欢迎来到 {name}！",
-  "mobile.join_channel.error": "We couldn't join the channel {displayName}. Please check your connection and try again.",
+  "mobile.join_channel.error": "我们无法加入频道 {displayName}。请检查您的网络连接再尝试。",
   "mobile.loading_channels": "正在加载频道...",
   "mobile.loading_members": "正在加载成员...",
   "mobile.loading_posts": "正在加载消息...",
@@ -1735,7 +1725,7 @@
   "mobile.offlineIndicator.connected": "已连接",
   "mobile.offlineIndicator.connecting": "正在连接...",
   "mobile.offlineIndicator.offline": "无网络连接",
-  "mobile.open_dm.error": "We couldn't open a direct message with {displayName}. Please check your connection and try again.",
+  "mobile.open_dm.error": "我们无法打开私信 {displayName}。请检查您的网络连接再尝试。",
   "mobile.post.cancel": "取消",
   "mobile.post.delete_question": "您确认要删除此消息？",
   "mobile.post.delete_title": "删除消息",
@@ -1769,6 +1759,9 @@
   "mobile.select_team.join_open": "您可以加入的开放团队",
   "mobile.select_team.no_teams": "没有您可以加入的团队。",
   "mobile.server_ping_failed": "无法连接服务器。请检查您的服务器网址和网络连接。",
+  "mobile.server_upgrade.button": "OK",
+  "mobile.server_upgrade.description": "\nA server upgrade is required to use the Mattermost app. Please ask your System Administrator for details.\n",
+  "mobile.server_upgrade.title": "Server upgrade required",
   "mobile.server_url.invalid_format": "每个 URL 必须以 http:// 或 https:// 开头",
   "mobile.session_expired": "会话已超时：请登入再继续接收通知。",
   "mobile.settings.team_selection": "团队选择",
@@ -1861,7 +1854,7 @@
   "post_attachment.more": "展开...",
   "post_body.commentedOn": "对 {name}{apostrophe} 的信息评论：",
   "post_body.deleted": "(消息被删除)",
-  "post_body.plusMore": " plus {count, number} other {count, plural, one {file} other {files}}",
+  "post_body.plusMore": " 以及 {count, number} 个其他文件",
   "post_delete.notPosted": "无法发布评论",
   "post_delete.okay": "确定",
   "post_delete.someone": "有人删除了你想评论的信息。",
@@ -2067,8 +2060,8 @@
   "suggestion.search.private": "私有频道",
   "suggestion.search.public": "公共频道",
   "system_users_list.count": "{count, number} 位用户",
-  "system_users_list.countPage": "{startCount, number} - {endCount, number} {count} 位用户，共 {total} 位",
-  "system_users_list.countSearch": "{count, number} 位用户，共 {total}",
+  "system_users_list.countPage": "{startCount, number} - {endCount, number} {count} 位用户，共 {total, number} 位",
+  "system_users_list.countSearch": "{count, number} 位用户，共 {total, number}",
   "team_export_tab.download": "下载",
   "team_export_tab.export": "导出",
   "team_export_tab.exportTeam": "导出您的团队",
@@ -2192,8 +2185,6 @@
   "user.settings.display.collapseOff": "已折叠",
   "user.settings.display.collapseOn": "已展开",
   "user.settings.display.fixedWidthCentered": "固定宽度，居中",
-  "user.settings.display.fontDesc": "选择在Mattermost用户界面显示的字体。",
-  "user.settings.display.fontTitle": "显示字体",
   "user.settings.display.fullScreen": "完整宽度",
   "user.settings.display.language": "语言",
   "user.settings.display.messageDisplayClean": "标准",
@@ -2209,7 +2200,7 @@
   "user.settings.display.showFullname": "显示姓名",
   "user.settings.display.showNickname": "若存在昵称显示昵称，否则显示姓名",
   "user.settings.display.showUsername": "显示用户名（默认)",
-  "user.settings.display.teammateDisplay": "团队队友的名字显示",
+  "user.settings.display.teammateNameDisplay": "团队队友的名字显示",
   "user.settings.display.theme.applyToAllTeams": "应用新主题到所有我的团队",
   "user.settings.display.theme.customTheme": "自定义主题",
   "user.settings.display.theme.describe": "打开管理您的主题",
@@ -2437,7 +2428,7 @@
   "user_profile.webrtc.unavailable": "不能在结束当前通话前开新通话",
   "view_image.loading": "加载中 ",
   "view_image_popover.download": "下载",
-  "view_image_popover.file": "File {count, number} of {total, number}",
+  "view_image_popover.file": "{count, number} 个文件，共 {total, number}",
   "view_image_popover.publicLink": "获取公开链接",
   "web.footer.about": "关于",
   "web.footer.help": "帮助",
diff --git a/webapp/i18n/zh-TW.json b/webapp/i18n/zh-TW.json
index d6c2dd4bcd..8dcf586589 100644
--- a/webapp/i18n/zh-TW.json
+++ b/webapp/i18n/zh-TW.json
@@ -415,18 +415,6 @@
   "admin.image.maxFileSizeDescription": "最大所容許的訊息附件檔案大小(MB)。注意：請確認伺服器記憶體能夠承受設定。大檔案會增加伺服器崩潰以及由於網路問題而上傳失敗的風險。",
   "admin.image.maxFileSizeExample": "50",
   "admin.image.maxFileSizeTitle": "最大檔案大小：",
-  "admin.image.previewHeightDescription": "預覽圖最大高度(\"0\"：自動)。改變這個值只會改變之後的圖片如何顯示，但不會改變以前的圖片。",
-  "admin.image.previewHeightExample": "如：\"0\"",
-  "admin.image.previewHeightTitle": "預覽圖片高：",
-  "admin.image.previewWidthDescription": "預覽圖最大寬度。改變這個值只會改變之後的圖片如何顯示，但不會改變以前的圖片。",
-  "admin.image.previewWidthExample": "如：\"1024\"",
-  "admin.image.previewWidthTitle": "預覽圖片寬：",
-  "admin.image.profileHeightDescription": "個人圖像的高度。",
-  "admin.image.profileHeightExample": "如：\"0\"",
-  "admin.image.profileHeightTitle": "個人圖像高：",
-  "admin.image.profileWidthDescription": "個人圖像的寬度。",
-  "admin.image.profileWidthExample": "如：\"1024\"",
-  "admin.image.profileWidthTitle": "個人圖像寬：",
   "admin.image.publicLinkDescription": "32字元的 Salt 用來簽署公開的圖片連結。於安裝時隨機產生。按\"重新產生\"建立新的 Salt。",
   "admin.image.publicLinkExample": "如：\"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
   "admin.image.publicLinkTitle": "公開連結的 Salt：",
@@ -436,12 +424,6 @@
   "admin.image.storeDescription": "檔案跟圖片所存放的儲存系統。<br /><br />選擇 \"Amazon S3\" 會啟用對應欄位以填入 Amazon 的認證跟儲存貯體的詳細資料。<br /><br />選擇 \"本地檔案系統\" 會啟用對應欄位以填入本地檔案目錄。",
   "admin.image.storeLocal": "本地端檔案系統",
   "admin.image.storeTitle": "檔案儲存系統：",
-  "admin.image.thumbHeightDescription": "上傳圖片的縮圖高度。改變這個值只會改變之後的縮圖如何顯示，但不會改變以前的縮圖。",
-  "admin.image.thumbHeightExample": "如：\"100\"",
-  "admin.image.thumbHeightTitle": "附件檔案縮圖高：",
-  "admin.image.thumbWidthDescription": "上傳圖片的縮圖寬度。改變這個值只會改變之後的縮圖如何顯示，但不會改變以前的縮圖。",
-  "admin.image.thumbWidthExample": "如：\"120\"",
-  "admin.image.thumbWidthTitle": "附加檔案縮圖寬：",
   "admin.integrations.custom": "自訂整合",
   "admin.integrations.external": "外部服務",
   "admin.integrations.webrtc": "Mattermost WebRTC",
@@ -782,7 +764,6 @@
   "admin.sidebar.files": "檔案",
   "admin.sidebar.general": "一般",
   "admin.sidebar.gitlab": "GitLab",
-  "admin.sidebar.images": "圖片",
   "admin.sidebar.integrations": "整合",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "法律與支援",
@@ -891,11 +872,16 @@
   "admin.team.restrictTitle": "限制僅有特定的電子郵件網域能建立帳號：",
   "admin.team.restrict_direct_message_any": "任何 Mattermost 伺服器上的使用者",
   "admin.team.restrict_direct_message_team": "任何團隊成員",
+  "admin.team.showFullname": "Show first and last name (default)",
+  "admin.team.showNickname": "有暱稱時顯示暱稱，沒有時顯示姓跟名",
+  "admin.team.showUsername": "Show username",
   "admin.team.siteNameDescription": "顯示於登入畫面與界面上的服務名稱.",
   "admin.team.siteNameExample": "如：\"Mattermost\"",
   "admin.team.siteNameTitle": "站台名稱：",
   "admin.team.teamCreationDescription": "停用時，只有系統管理者能建立團隊。",
   "admin.team.teamCreationTitle": "啟用建立團隊:：",
+  "admin.team.teammateNameDisplay": "團隊成員名稱顯示",
+  "admin.team.teammateNameDisplayDesc": "設定在訊息及直接訊息列表該如何顯示其他使用者的名字。",
   "admin.team.upload": "上傳",
   "admin.team.uploadDesc": "增加自訂圖片到登入畫面以客製使用者體驗。建議影像檔案小於 2 MB。",
   "admin.team.uploaded": "已上傳!",
@@ -1121,7 +1107,8 @@
   "channel_invite.close": "關閉",
   "channel_loader.connection_error": "您的網路似乎有問題。",
   "channel_loader.posted": "已發文",
-  "channel_loader.socketError": "無法連線到 Mattermost。如果問題持續存在，請系統管理員檢查 WebSocket 連接埠。",
+  "channel_loader.postedImage": " 已上傳一張圖片",
+  "channel_loader.socketError": "Please check connection, Mattermost unreachable. If issue persists, ask administrator to <a href=\"https://about.mattermost.com/default-websocket-port-help\" target=\"_blank\">check WebSocket port</a>.",
   "channel_loader.someone": "某人",
   "channel_loader.something": " 做了新事",
   "channel_loader.unknown_error": "從伺服器收到不在預期內的狀態碼。",
@@ -1718,6 +1705,9 @@
   "mobile.custom_list.no_results": "找不到相符的結果",
   "mobile.drawer.teamsTitle": "團隊",
   "mobile.edit_post.title": "編輯訊息",
+  "mobile.error_handler.button": "Relaunch",
+  "mobile.error_handler.description": "\nClick relaunch to open the app again. After restart, you can report the problem from the settings menu.\n",
+  "mobile.error_handler.title": "Unexpected error occurred",
   "mobile.file_upload.camera": "照相或錄影",
   "mobile.file_upload.library": "相簿",
   "mobile.file_upload.more": "更多",
@@ -1769,6 +1759,9 @@
   "mobile.select_team.join_open": "能加入的開放團隊。",
   "mobile.select_team.no_teams": "There are no available teams for you to join.",
   "mobile.server_ping_failed": "無法與伺服器連線。請檢查伺服器網址與網際網路連線。",
+  "mobile.server_upgrade.button": "OK",
+  "mobile.server_upgrade.description": "\nA server upgrade is required to use the Mattermost app. Please ask your System Administrator for details.\n",
+  "mobile.server_upgrade.title": "Server upgrade required",
   "mobile.server_url.invalid_format": "網址開頭必須是 http:// 或 https://",
   "mobile.session_expired": "工作階段過期：請登入以繼續接收通知。",
   "mobile.settings.team_selection": "選擇團隊",
@@ -2192,8 +2185,6 @@
   "user.settings.display.collapseOff": "已收摺",
   "user.settings.display.collapseOn": "已展開",
   "user.settings.display.fixedWidthCentered": "固定寬度，置中對齊",
-  "user.settings.display.fontDesc": "選擇 Mattermost 使用者介面的字型。",
-  "user.settings.display.fontTitle": "顯示字型",
   "user.settings.display.fullScreen": "全寬",
   "user.settings.display.language": "語言",
   "user.settings.display.messageDisplayClean": "標準",
@@ -2209,7 +2200,7 @@
   "user.settings.display.showFullname": "顯示姓跟名",
   "user.settings.display.showNickname": "有暱稱時顯示暱稱，沒有時顯示姓跟名",
   "user.settings.display.showUsername": "顯示使用者名稱(預設)",
-  "user.settings.display.teammateDisplay": "團隊成員名稱顯示",
+  "user.settings.display.teammateNameDisplay": "團隊成員名稱顯示",
   "user.settings.display.theme.applyToAllTeams": "將新主題套用到所有的團隊上",
   "user.settings.display.theme.customTheme": "自訂主題",
   "user.settings.display.theme.describe": "管理主題",