translations PR 20170306 (#5666)

* translations PR 20170306

* Fix platform zh_TW.json

22 files changed, 1726 insertions, 631 deletions

diff --git a/i18n/de.json b/i18n/de.json
index 21a96835b..ff4b6016b 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -220,6 +220,14 @@
     "translation": "Ungültige Benutzer-ID für eine Direktnachrichtenkanal Erstellung"
   },
   {
+    "id": "api.channel.create_group.bad_size.app_error",
+    "translation": "Group message channels must contain at least 3 and no more than 8 users"
+  },
+  {
+    "id": "api.channel.create_group.bad_user.app_error",
+    "translation": "One of the provided users does not exist"
+  },
+  {
     "id": "api.channel.delete_channel.archived",
     "translation": "Der Kanal wurde von %v archiviert."
   },
@@ -892,6 +900,10 @@
     "translation": "Gehe zum Beitrag"
   },
   {
+    "id": "api.email_batching.render_batched_post.group_message",
+    "translation": "Group Message"
+  },
+  {
     "id": "api.email_batching.render_batched_post.sender.app_error",
     "translation": "Konnte Absender der Nachricht für gestapelte E-Mail Benachrichtigung nicht finden"
   },
@@ -1214,6 +1226,10 @@
     "translation": "Fehler beim Setzen der E-Mail-Adresse als geprüft. Fehler=%v"
   },
   {
+    "id": "api.incoming_webhook.disabled.app_errror",
+    "translation": "Eingehende Webhooks wurden vom Systemadministrator deaktiviert."
+  },
+  {
     "id": "api.license.add_license.array.app_error",
     "translation": "Leeres Array unterhalb von 'Lizenz' in der Anfrage"
   },
@@ -1800,6 +1816,14 @@
     "translation": "Es wurde versucht, den Benutzer mit existierendem Konto ({{.Email}}, {{.Username}}) zusammenzuführen, konnte den Benutzer aber nicht zu diesem Team hinzufügen.\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.missing_email_address",
+    "translation": "User {{.Username}} does not have an email address in the Slack export. Using {{.Email}} as a placeholder. The user should update their email address once logged in to the system.\r\n"
+  },
+  {
+    "id": "api.slackimport.slack_add_users.missing_email_address.warn",
+    "translation": "User {{.Username}} does not have an email address in the Slack export. Using {{.Email}} as a placeholder. The user should update their email address once logged in to the system."
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "Kann Benutzer nicht importieren: {{.Username}}\r\n"
   },
@@ -2012,6 +2036,10 @@
     "translation": "Sie haben nicht die erforderlichen Zugriffsrechte"
   },
   {
+    "id": "api.templates.channel_name.group",
+    "translation": "Group Message"
+  },
+  {
     "id": "api.templates.email_change_body.info",
     "translation": "Ihre E-Mail-Adresse für {{.TeamDisplayName}} wurde in {{.NewEmail}} geändert.<br>Wenn Sie diese Änderungen nicht durchgeführt haben, kontaktieren Sie bitte den Systemadministrator."
   },
@@ -2021,7 +2049,7 @@
   },
   {
     "id": "api.templates.email_change_subject",
-    "translation": "Ihre E-Mail-Adresse für {{.TeamDisplayName}} wurde geändert"
+    "translation": "[{{ .SiteName }}] Ihre E-Mail-Adresse wurde geändert"
   },
   {
     "id": "api.templates.email_change_verify_body.button",
@@ -2037,7 +2065,7 @@
   },
   {
     "id": "api.templates.email_change_verify_subject",
-    "translation": "Bestätige neue E-Mail-Adresse für {{.TeamDisplayName}}"
+    "translation": "[{{ .SiteName }}] Bestätigen Sie die neue E-Mail-Adresse"
   },
   {
     "id": "api.templates.email_footer",
@@ -2093,7 +2121,7 @@
   },
   {
     "id": "api.templates.invite_subject",
-    "translation": "{{ .SenderName }} hat Sie eingeladen, dem Team {{ .TeamDisplayName }} auf {{.SiteName}} beizutreten"
+    "translation": "[{{ .SiteName }}] {{ .SenderName }} hat Sie eingeladen dem Team {{ .TeamDisplayName }} beizutreten"
   },
   {
     "id": "api.templates.mfa_activated_body.info",
@@ -2105,7 +2133,7 @@
   },
   {
     "id": "api.templates.mfa_change_subject",
-    "translation": "Ihre MFA wurde auf {{ .SiteName }} aktualisiert"
+    "translation": "[{{ .SiteName }}] Ihre MFA wurde aktualisiert"
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
@@ -2125,7 +2153,7 @@
   },
   {
     "id": "api.templates.password_change_subject",
-    "translation": "Ihr Passwort wurde aktualisiert für {{.TeamDisplayName}} bei {{ .SiteName }}"
+    "translation": "[{{ .SiteName }}] Ihr Passwort wurde aktualisiert"
   },
   {
     "id": "api.templates.post_body.button",
@@ -2144,6 +2172,10 @@
     "translation": "{{.SubjectText}} bei {{.TeamDisplayName}} von {{.SenderDisplayName}} am {{.Day}}.{{.Month}}.{{.Year}}"
   },
   {
+    "id": "api.templates.post_subject_in_group_message",
+    "translation": "{{.SubjectText}} bei {{.TeamDisplayName}} von {{.SenderDisplayName}} am {{.Day}}.{{.Month}}.{{.Year}}"
+  },
+  {
     "id": "api.templates.reset_body.button",
     "translation": "Passwort zurücksetzen"
   },
@@ -2157,7 +2189,11 @@
   },
   {
     "id": "api.templates.reset_subject",
-    "translation": "Passwort zurücksetzen"
+    "translation": "[{{ .SiteName }}] Passwort zurücksetzen"
+  },
+  {
+    "id": "api.templates.signin_change_email.body.info",
+    "translation": "Sie haben Ihre Anmeldemethode für {{ .SiteName }} auf {{.Method}} geändert.<br>Falls Sie diese Änderung nicht veranlasst haben, wenden Sie sich bitte an den Systemadministrator."
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -2168,6 +2204,10 @@
     "translation": "Sie haben Ihre Anmeldemethode geändert"
   },
   {
+    "id": "api.templates.signin_change_email.subject",
+    "translation": "[{{ .SiteName }}] Sie haben Ihre Anmeldemethode für {{ .SiteName }} geändert"
+  },
+  {
     "id": "api.templates.signup_team_body.button",
     "translation": "Erstellen Sie Ihr Team"
   },
@@ -2184,14 +2224,6 @@
     "translation": "{{ .SiteName }} Team-Einrichtung"
   },
   {
-    "id": "api.templates.singin_change_email.body.info",
-    "translation": "Sie haben Ihre Anmeldemethode für {{ .SiteName }} auf {{.Method}} geändert.<br>Falls Sie diese Änderung nicht veranlasst haben, wenden Sie sich bitte an den Systemadministrator."
-  },
-  {
-    "id": "api.templates.singin_change_email.subject",
-    "translation": "Ihre Anmeldemethode wurde aktualisiert bei {{ .SiteName }}"
-  },
-  {
     "id": "api.templates.upgrade_30_body.info",
     "translation": "<h3 style='font-weight: normal; margin-top: 10px;'>IHRE MEHRFACHZUGÄNGE WURDEN AKTUALISIERT</h3>Ihr Mattermost-Server wurde auf Version 3.0 aktualisiert, bei dem Sie einen Zugang in mehreren Teams nutzen können.<br/><br/>Sie erhalten diese E-Mail weil die Aktualisierung festgestellt hat, dass diese E-Mail-Adresse oder der Benutzername mehrfach vorkommt.<br/><br/>Die folgenden Änderungen wurden durchgeführt: <br/><br/>{{if .EmailChanged }}- Die mehrfache E-Mail-Adresse des Zugangs bei dem `/{{.TeamName}}` Team wurde geändert auf `{{.Email}}`. Sie müssen zur Anmeldung E-Mail-Adresse und Passwort angeben. Sie können diese E-Mail-Adresse nutzen.<br/><br/>{{end}}{{if .UsernameChanged }}- Der mehrfach benutze Benutzername für das Team `/{{.TeamName}}` wurde geändert auf `{{.Username}}` zur Vermeidung von Missverständnissen.<br/><br/>{{end}} EMPFOHLENE HANDLUNGSWEISE: <br/><br/>Es wird empfohlen sich bei dem Teams mit den Mehrfachzugängen anzumelden und dort den bevorzugten Zugang auszuwählen, der künftig verwendet werden soll. <br/><br/>Dies gibt dem bevorzugtem Zugang Zugriff auf die öffentlichen Kanäle und die private Historie. Direktnachrichten zu den bisherigen Mehrfachgängen können Sie noch mit den alten Zugangsdaten abrufen. <br/><br/>WEITEREN INFORMATIONEN: <br/><br/>Weitere Informationen zur Mattermost 3.0 Aktualisierung finden Sie auf: <a href='http://www.mattermost.org/upgrading-to-mattermost-3-0/'>http://www.mattermost.org/upgrading-to-mattermost-3-0/</a><br/><br/>"
   },
@@ -2209,7 +2241,7 @@
   },
   {
     "id": "api.templates.username_change_subject",
-    "translation": "Ihr Benutzername wurde für {{.TeamDisplayName}} geändert"
+    "translation": "[{{ .SiteName }}] Ihr Benutzername wurde geändert"
   },
   {
     "id": "api.templates.verify_body.button",
@@ -2253,7 +2285,7 @@
   },
   {
     "id": "api.templates.welcome_subject",
-    "translation": "Sie sind {{ .ServerURL }} beigetreten"
+    "translation": "[{{ .SiteName }}] Sie sind {{ .ServerURL }} beigetreten"
   },
   {
     "id": "api.user.activate_mfa.email_and_ldap_only.app_error",
@@ -2692,10 +2724,6 @@
     "translation": "Team-Hub wird gestoppt für teamId=%v"
   },
   {
-    "id": "api.webhook.create_incoming.disabled.app_error",
-    "translation": "Eingehende Webhooks wurden vom Systemadministrator deaktiviert."
-  },
-  {
     "id": "api.webhook.create_outgoing.disabled.app_error",
     "translation": "Ausgehende Webhooks wurden vom Systemadministrator deaktiviert."
   },
@@ -2732,14 +2760,6 @@
     "translation": "Ungültige Berechtigungen um ausgehenden Webhook zu löschen"
   },
   {
-    "id": "api.webhook.get_incoming.disabled.app_error",
-    "translation": "Eingehende webhooks wurden vom System Administrator deaktiviert."
-  },
-  {
-    "id": "api.webhook.get_outgoing.disabled.app_error",
-    "translation": "Ausgehende webhooks wurden vom System Administrator deaktiviert."
-  },
-  {
     "id": "api.webhook.incoming.debug",
     "translation": "Eingehender Webhook erhalten. Inhalt="
   },
@@ -2752,10 +2772,6 @@
     "translation": "Initialisiere Webhook-API-Routen"
   },
   {
-    "id": "api.webhook.regen_outgoing_token.disabled.app_error",
-    "translation": "Ausgehende webhooks wurden vom System Administrator deaktiviert."
-  },
-  {
     "id": "api.webhook.regen_outgoing_token.permissions.app_error",
     "translation": "Ungültige Berechtigungen um ausgehenden Webhook-Token zu regenerieren"
   },
@@ -2852,6 +2868,10 @@
     "translation": "Importdatenzeile hat den Typ \"channel\", aber das Kanalobjekt ist null."
   },
   {
+    "id": "app.import.import_line.null_post.error",
+    "translation": "Importdatenzeile hat den Typ \"post\", aber das Nachrichtenobjekt ist null."
+  },
+  {
     "id": "app.import.import_line.null_team.error",
     "translation": "Importdatenzeile hat den Typ \"team\", aber das Teamobjekt ist null."
   },
@@ -2864,6 +2884,18 @@
     "translation": "Importdatenzeile hat den unbekannten Typ \"{{.Type}}\"."
   },
   {
+    "id": "app.import.import_post.channel_not_found.error",
+    "translation": "Fehler beim Importieren der Nachricht. Kanal mit dem Namen \"{{.ChannelName}}\" konnte nicht gefunden werden."
+  },
+  {
+    "id": "app.import.import_post.team_not_found.error",
+    "translation": "Fehler beim Importieren der Nachricht. Team mit dem Namen \"{{.TeamName}}\" konnte nicht gefunden werden."
+  },
+  {
+    "id": "app.import.import_post.user_not_found.error",
+    "translation": "Fehler beim Importieren der Nachricht. Benutzer mit dem Namen \"{{.Username}}\" konnte nicht gefunden werden."
+  },
+  {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
     "translation": "Kanal create_at darf nicht 0 sein wenn angegeben."
   },
@@ -2908,6 +2940,34 @@
     "translation": "Fehlende erforderliche Kanaleigenschaft: type."
   },
   {
+    "id": "app.import.validate_post_import_data.channel_missing.error",
+    "translation": "Fehlende erforderliche Nachrichteigenschaft: Channel."
+  },
+  {
+    "id": "app.import.validate_post_import_data.create_at_missing.error",
+    "translation": "Fehlende erforderliche Nachrichteigenschaft: create_at."
+  },
+  {
+    "id": "app.import.validate_post_import_data.create_at_zero.error",
+    "translation": "Wenn angegeben darf CreateAt der Nachricht nicht Null sein."
+  },
+  {
+    "id": "app.import.validate_post_import_data.message_length.error",
+    "translation": "Post Message property is longer than the maximum permitted length."
+  },
+  {
+    "id": "app.import.validate_post_import_data.message_missing.error",
+    "translation": "Fehlende erforderliche Nachrichteigenschaft: Message."
+  },
+  {
+    "id": "app.import.validate_post_import_data.team_missing.error",
+    "translation": "Fehlende erforderliche Nachrichteigenschaft: Team."
+  },
+  {
+    "id": "app.import.validate_post_import_data.user_missing.error",
+    "translation": "Fehlende erforderliche Nachrichteigenschaft: User."
+  },
+  {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
     "translation": "Team allowed_domains ist zu lang."
   },
@@ -3020,6 +3080,14 @@
     "translation": "Team name fehlt in Teammitgliedschaft des Benutzers."
   },
   {
+    "id": "authentication.permissions.create_group_channel.description",
+    "translation": "Ability to create new group message channels"
+  },
+  {
+    "id": "authentication.permissions.create_group_channel.name",
+    "translation": "Create Group Message"
+  },
+  {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "Die Möglichkeit, neue Teams zu erstellen"
   },
@@ -3596,6 +3664,14 @@
     "translation": "Es trat ein Fehler beim Lesen der Datei auf"
   },
   {
+    "id": "model.client.set_profile_user.no_file.app_error",
+    "translation": "Keine Datei unter 'image' in der Anfrage"
+  },
+  {
+    "id": "model.client.set_profile_user.writer.app_error",
+    "translation": "Problem beim Schreiben der Anfrage"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "Erstellt am muss eine gültige Zeit sein"
   },
@@ -4725,7 +4801,7 @@
   },
   {
     "id": "store.sql_channel.update.previously.app_error",
-    "translation": "Es wurde schon ein Kanal mit dem Zugang erstellt"
+    "translation": "Es wurde schon ein Kanal mit dem Handle erstellt"
   },
   {
     "id": "store.sql_channel.update.updating.app_error",
@@ -4976,6 +5052,10 @@
     "translation": "Die übergeordneten Nachrichten des Kanals konnten nicht abgerufen werden"
   },
   {
+    "id": "store.sql_post.get_posts_created_att.app_error",
+    "translation": "Die Nachrichten für den Kanal konnten nicht abgerufen werden"
+  },
+  {
     "id": "store.sql_post.get_posts_since.app_error",
     "translation": "Die Nachrichten für den Kanal konnten nicht abgerufen werden"
   },
@@ -4984,6 +5064,10 @@
     "translation": "Die Nachrichten für den Kanal konnten nicht abgerufen werden"
   },
   {
+    "id": "store.sql_post.overwrite.app_error",
+    "translation": "Die Nachricht konnte nicht überschrieben werden"
+  },
+  {
     "id": "store.sql_post.permanent_delete.app_error",
     "translation": "Die Nachricht konnte nicht gelöscht werden"
   },
@@ -5012,8 +5096,8 @@
     "translation": "Sie können keine existierende Nachricht aktualisieren"
   },
   {
-    "id": "store.sql_post.search.app_error",
-    "translation": "Es trat ein Fehler während der Suche nach Nachrichten auf"
+    "id": "store.sql_post.search.warn",
+    "translation": "Query error searching posts: %v"
   },
   {
     "id": "store.sql_post.update.app_error",
@@ -5620,6 +5704,18 @@
     "translation": "Es ist ein Fehler beim Speichern der Datei in {{.Filename}} aufgetreten"
   },
   {
+    "id": "utils.config.supported_client_locale.app_error",
+    "translation": "Konnte Mattermost Konfigurationsdatei nicht laden:  DefaultClientLocale muss eine der unterstützen Locales entsprechen"
+  },
+  {
+    "id": "utils.config.supported_server_locale.app_error",
+    "translation": "Konnte Mattermost Konfigurationsdatei nicht laden:  DefaultServerLocale muss eine der unterstützen Locale entsprechen"
+  },
+  {
+    "id": "utils.config.validate_locale.app_error",
+    "translation": "Konnte Mattermost Konfigurationsdatei nicht laden:  AvailableLocales muss DefaultClientLocale enthalten"
+  },
+  {
     "id": "utils.diagnostic.analytics_not_found.app_error",
     "translation": "Analytics nicht initialisiert"
   },
diff --git a/i18n/en.json b/i18n/en.json
index 14b8383da..c013459e2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -204,14 +204,6 @@
     "translation": "Must use createDirectChannel API service for direct message channel creation"
   },
   {
-    "id": "api.channel.create_group.bad_size.app_error",
-    "translation": "Group message channels must contain at least 3 and no more than 8 users"
-  },
-  {
-    "id": "api.channel.create_group.bad_user.app_error",
-    "translation": "One of the provided users does not exist"
-  },
-  {
     "id": "api.channel.create_channel.invalid_character.app_error",
     "translation": "Invalid character '__' in channel name for non-direct channel"
   },
@@ -232,6 +224,14 @@
     "translation": "Invalid user ID for direct channel creation"
   },
   {
+    "id": "api.channel.create_group.bad_size.app_error",
+    "translation": "Group message channels must contain at least 3 and no more than 8 users"
+  },
+  {
+    "id": "api.channel.create_group.bad_user.app_error",
+    "translation": "One of the provided users does not exist"
+  },
+  {
     "id": "api.channel.delete_channel.archived",
     "translation": "%v has archived the channel."
   },
@@ -900,14 +900,14 @@
     "translation": "Direct Message"
   },
   {
-    "id": "api.email_batching.render_batched_post.group_message",
-    "translation": "Group Message"
-  },
-  {
     "id": "api.email_batching.render_batched_post.go_to_post",
     "translation": "Go to Post"
   },
   {
+    "id": "api.email_batching.render_batched_post.group_message",
+    "translation": "Group Message"
+  },
+  {
     "id": "api.email_batching.render_batched_post.sender.app_error",
     "translation": "Unable to find sender of post for batched email notification"
   },
@@ -1230,6 +1230,10 @@
     "translation": "Failed to set email verified err=%v"
   },
   {
+    "id": "api.incoming_webhook.disabled.app_errror",
+    "translation": "Incoming webhooks have been disabled by the system admin."
+  },
+  {
     "id": "api.license.add_license.array.app_error",
     "translation": "Empty array under 'license' in request"
   },
@@ -1736,14 +1740,6 @@
     "translation": "Failed to add user to channel: {{.Username}}\r\n"
   },
   {
-    "id": "api.slackimport.slack_add_users.missing_email_address",
-    "translation": "User {{.Username}} does not have an email address in the Slack export. Using {{.Email}} as a placeholder. The user should update their email address once logged in to the system.\r\n"
-  },
-  {
-    "id": "api.slackimport.slack_add_users.missing_email_address.warn",
-    "translation": "User {{.Username}} does not have an email address in the Slack export. Using {{.Email}} as a placeholder. The user should update their email address once logged in to the system."
-  },
-  {
     "id": "api.slackimport.slack_add_channels.import_failed",
     "translation": "Failed to import: {{.DisplayName}}\r\n"
   },
@@ -1824,6 +1820,14 @@
     "translation": "Tried to merge user with existing account: {{.Email}}, {{.Username}}, but failed to add the user to this team.\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.missing_email_address",
+    "translation": "User {{.Username}} does not have an email address in the Slack export. Using {{.Email}} as a placeholder. The user should update their email address once logged in to the system.\r\n"
+  },
+  {
+    "id": "api.slackimport.slack_add_users.missing_email_address.warn",
+    "translation": "User {{.Username}} does not have an email address in the Slack export. Using {{.Email}} as a placeholder. The user should update their email address once logged in to the system."
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "Unable to import user: {{.Username}}\r\n"
   },
@@ -2036,6 +2040,10 @@
     "translation": "You do not have the appropriate permissions"
   },
   {
+    "id": "api.templates.channel_name.group",
+    "translation": "Group Message"
+  },
+  {
     "id": "api.templates.email_change_body.info",
     "translation": "Your email address for {{.TeamDisplayName}} has been changed to {{.NewEmail}}.<br>If you did not make this change, please contact the system administrator."
   },
@@ -2168,10 +2176,6 @@
     "translation": "{{.SubjectText}} from {{.SenderDisplayName}} on {{.Month}} {{.Day}}, {{.Year}}"
   },
   {
-    "id": "api.templates.channel_name.group",
-    "translation": "Group Message"
-  },
-  {
     "id": "api.templates.post_subject_in_group_message",
     "translation": "New Group Message from {{ .SenderDisplayName}} on {{.Month}} {{.Day}}, {{.Year}}"
   },
@@ -2192,6 +2196,10 @@
     "translation": "[{{ .SiteName }}] Reset your password"
   },
   {
+    "id": "api.templates.signin_change_email.body.info",
+    "translation": "You updated your sign-in method on {{ .SiteName }} to {{.Method}}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
     "id": "api.templates.signin_change_email.body.method_email",
     "translation": "email and password"
   },
@@ -2200,6 +2208,10 @@
     "translation": "You updated your sign-in method"
   },
   {
+    "id": "api.templates.signin_change_email.subject",
+    "translation": "[{{ .SiteName }}] You updated your sign-in method on {{ .SiteName }}"
+  },
+  {
     "id": "api.templates.signup_team_body.button",
     "translation": "Set up your team"
   },
@@ -2216,14 +2228,6 @@
     "translation": "{{ .SiteName }} Team Setup"
   },
   {
-    "id": "api.templates.signin_change_email.body.info",
-    "translation": "You updated your sign-in method on {{ .SiteName }} to {{.Method}}.<br>If this change wasn't initiated by you, please contact your system administrator."
-  },
-  {
-    "id": "api.templates.signin_change_email.subject",
-    "translation": "[{{ .SiteName }}] You updated your sign-in method on {{ .SiteName }}"
-  },
-  {
     "id": "api.templates.upgrade_30_body.info",
     "translation": "<h3 style='font-weight: normal; margin-top: 10px;'>YOUR DUPLICATE ACCOUNTS HAVE BEEN UPDATED</h3>Your Mattermost server is being upgraded to Version 3.0, which lets you use a single account across multiple teams.<br/><br/>You are receiving this email because the upgrade process has detected your account had the same email or username as other accounts on the server.<br/><br/>The following updates have been made: <br/><br/>{{if .EmailChanged }}- The duplicate email of an account on the `/{{.TeamName}}` team was changed to `{{.Email}}`. You will need to use email and password to login, you can use this new email address for login.<br/><br/>{{end}}{{if .UsernameChanged }}- The duplicate username of an account on the team site `/{{.TeamName}}` has been changed to `{{.Username}}` to avoid confusion with other accounts.<br/><br/>{{end}} RECOMMENDED ACTION: <br/><br/>It is recommended that you login to your teams used by your duplicate accounts and add your primary account to the team and any public channels and private groups which you wish to continue using. <br/><br/>This gives your primary account access to all public channel and private group history. You can continue to access the direct message history of your duplicate accounts by logging in with their credentials. <br/><br/>FOR MORE INFORMATION: <br/><br/>For more information on the upgrade to Mattermost 3.0 please see: <a href='http://www.mattermost.org/upgrading-to-mattermost-3-0/'>http://www.mattermost.org/upgrading-to-mattermost-3-0/</a><br/><br/>"
   },
@@ -2724,10 +2728,6 @@
     "translation": "team hub stopping for teamId=%v"
   },
   {
-    "id": "api.incoming_webhook.disabled.app_errror",
-    "translation": "Incoming webhooks have been disabled by the system admin."
-  },
-  {
     "id": "api.webhook.create_outgoing.disabled.app_error",
     "translation": "Outgoing webhooks have been disabled by the system admin."
   },
@@ -2872,6 +2872,10 @@
     "translation": "Import data line has type \"channel\" but the channel object is null."
   },
   {
+    "id": "app.import.import_line.null_post.error",
+    "translation": "Import data line has type \"post\" but the post object is null."
+  },
+  {
     "id": "app.import.import_line.null_team.error",
     "translation": "Import data line has type \"team\" but the team object is null."
   },
@@ -2884,6 +2888,18 @@
     "translation": "Import data line has unknown type \"{{.Type}}\"."
   },
   {
+    "id": "app.import.import_post.channel_not_found.error",
+    "translation": "Error importing post. Channel with name \"{{.ChannelName}}\" could not be found."
+  },
+  {
+    "id": "app.import.import_post.team_not_found.error",
+    "translation": "Error importing post. Team with name \"{{.TeamName}}\" could not be found."
+  },
+  {
+    "id": "app.import.import_post.user_not_found.error",
+    "translation": "Error importing post. User with username \"{{.Username}}\" could not be found."
+  },
+  {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
     "translation": "Channel create_at must not be 0 if provided."
   },
@@ -2928,6 +2944,34 @@
     "translation": "Missing required channel property: type."
   },
   {
+    "id": "app.import.validate_post_import_data.channel_missing.error",
+    "translation": "Missing required Post property: Channel."
+  },
+  {
+    "id": "app.import.validate_post_import_data.create_at_missing.error",
+    "translation": "Missing required Post property: create_at."
+  },
+  {
+    "id": "app.import.validate_post_import_data.create_at_zero.error",
+    "translation": "Post CreateAt must not be zero if it is provided."
+  },
+  {
+    "id": "app.import.validate_post_import_data.message_length.error",
+    "translation": "Post Message property is longer than the maximum permitted length."
+  },
+  {
+    "id": "app.import.validate_post_import_data.message_missing.error",
+    "translation": "Missing required Post property: Message."
+  },
+  {
+    "id": "app.import.validate_post_import_data.team_missing.error",
+    "translation": "Missing required Post property: Team."
+  },
+  {
+    "id": "app.import.validate_post_import_data.user_missing.error",
+    "translation": "Missing required Post property: User."
+  },
+  {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
     "translation": "Team allowed_domains is too long."
   },
@@ -3040,50 +3084,6 @@
     "translation": "Team name missing from User's Team Membership."
   },
   {
-    "id": "app.import.import_post.team_not_found.error",
-    "translation": "Error importing post. Team with name \"{{.TeamName}}\" could not be found."
-  },
-  {
-    "id": "app.import.import_post.channel_not_found.error",
-    "translation": "Error importing post. Channel with name \"{{.ChannelName}}\" could not be found."
-  },
-  {
-    "id": "app.import.import_post.user_not_found.error",
-    "translation": "Error importing post. User with username \"{{.Username}}\" could not be found."
-  },
-  {
-    "id": "app.import.validate_post_import_data.team_missing.error",
-    "translation": "Missing required Post property: Team."
-  },
-  {
-    "id": "app.import.validate_post_import_data.channel_missing.error",
-    "translation": "Missing required Post property: Channel."
-  },
-  {
-    "id": "app.import.validate_post_import_data.user_missing.error",
-    "translation": "Missing required Post property: User."
-  },
-  {
-    "id": "app.import.validate_post_import_data.message_missing.error",
-    "translation": "Missing required Post property: Message."
-  },
-  {
-    "id": "app.import.validate_post_import_data.create_at_missing.error",
-    "translation": "Missing required Post property: create_at."
-  },
-  {
-    "id": "app.import.validate_post_import_data.message_length.error",
-    "translation": "Post Message property is longer than the maximum permitted length."
-  },
-  {
-    "id": "app.import.validate_post_import_data.create_at_zero.error",
-    "translation": "Post CreateAt must not be zero if it is provided."
-  },
-  {
-    "id": "app.import.import_line.null_post.error",
-    "translation": "Import data line has type \"post\" but the post object is null."
-  },
-  {
     "id": "authentication.permissions.create_group_channel.description",
     "translation": "Ability to create new group message channels"
   },
@@ -5052,14 +5052,14 @@
     "translation": "We couldn't get the posts for the channel"
   },
   {
-    "id": "store.sql_post.get_posts_created_att.app_error",
-    "translation": "We couldn't get the posts for the channel"
-  },
-  {
     "id": "store.sql_post.get_posts_around.get_parent.app_error",
     "translation": "We couldn't get the parent posts for the channel"
   },
   {
+    "id": "store.sql_post.get_posts_created_att.app_error",
+    "translation": "We couldn't get the posts for the channel"
+  },
+  {
     "id": "store.sql_post.get_posts_since.app_error",
     "translation": "We couldn't get the posts for the channel"
   },
@@ -5068,6 +5068,10 @@
     "translation": "We couldn't get the posts for the channel"
   },
   {
+    "id": "store.sql_post.overwrite.app_error",
+    "translation": "We couldn't overwrite the Post"
+  },
+  {
     "id": "store.sql_post.permanent_delete.app_error",
     "translation": "We couldn't delete the post"
   },
@@ -5104,10 +5108,6 @@
     "translation": "We couldn't update the Post"
   },
   {
-    "id": "store.sql_post.overwrite.app_error",
-    "translation": "We couldn't overwrite the Post"
-  },
-  {
     "id": "store.sql_preference.delete.app_error",
     "translation": "We encountered an error while deleting preferences"
   },
diff --git a/i18n/es.json b/i18n/es.json
index 55ce01316..001ced420 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -220,6 +220,14 @@
     "translation": "ID del usuario no válido para la creación del canal directo"
   },
   {
+    "id": "api.channel.create_group.bad_size.app_error",
+    "translation": "Los canales de mensajes de grupo debe contener al menos 3 y no más de 8 usuarios"
+  },
+  {
+    "id": "api.channel.create_group.bad_user.app_error",
+    "translation": "Uno de los usuarios suministrados no existe"
+  },
+  {
     "id": "api.channel.delete_channel.archived",
     "translation": "%v ha archivado el canal."
   },
@@ -892,6 +900,10 @@
     "translation": "Ir al mensaje"
   },
   {
+    "id": "api.email_batching.render_batched_post.group_message",
+    "translation": "Mensaje de Grupo"
+  },
+  {
     "id": "api.email_batching.render_batched_post.sender.app_error",
     "translation": "No se puede encontrar el remitente del mensaje para la notificación de correos electrónicos por lote"
   },
@@ -1214,6 +1226,10 @@
     "translation": "Falla al asignar el correo como verificado err=%v"
   },
   {
+    "id": "api.incoming_webhook.disabled.app_errror",
+    "translation": "Webhooks entrantes han sido deshabilitados por el administrador del sistema."
+  },
+  {
     "id": "api.license.add_license.array.app_error",
     "translation": "Arreglo vacío bajo 'license' en la solicitud"
   },
@@ -1800,6 +1816,14 @@
     "translation": "Se trató de combinar el usuario con una cuenta existente: {{.Email}}, {{.Username}}, pero no se pudo agregar el usuario a este equipo.\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.missing_email_address",
+    "translation": "Usuario {{.Username}} no posee una dirección de correo electrónico en la exportación de Slack. Se utiliza {{.Email}} como el valor. El usuario debe actualizar su dirección de correo electrónico una vez que inicie sesión en el sistema.\r\n"
+  },
+  {
+    "id": "api.slackimport.slack_add_users.missing_email_address.warn",
+    "translation": "Usuario {{.Username}} no posee una dirección de correo electrónico en la exportación de Slack. Se utiliza {{.Email}} como el valor. El usuario debe actualizar su dirección de correo electrónico una vez que inicie sesión en el sistema."
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "No se pudo importar el usuario: {{.Username}}\r\n"
   },
@@ -2012,6 +2036,10 @@
     "translation": "No tienes los permisos apropiados"
   },
   {
+    "id": "api.templates.channel_name.group",
+    "translation": "Mensaje de Grupo"
+  },
+  {
     "id": "api.templates.email_change_body.info",
     "translation": "Tu dirección de correo electrónico para {{.TeamDisplayName}} ha sido cambiada por {{.NewEmail}}.<br>Si este cambio no fue realizado por ti, por favor contacta un administrador de sistema."
   },
@@ -2021,7 +2049,7 @@
   },
   {
     "id": "api.templates.email_change_subject",
-    "translation": "Tu dirección de correo para {{.TeamDisplayName}} ha cambiado"
+    "translation": "[{{ .SiteName }}] Tu dirección de correo electrónico ha cambiado"
   },
   {
     "id": "api.templates.email_change_verify_body.button",
@@ -2037,7 +2065,7 @@
   },
   {
     "id": "api.templates.email_change_verify_subject",
-    "translation": "Verificación de la nueva dirección de correo electrónico para {{.TeamDisplayName}}"
+    "translation": "[{{ .SiteName }}] comprobación de la nueva dirección de correo electrónico"
   },
   {
     "id": "api.templates.email_footer",
@@ -2093,7 +2121,7 @@
   },
   {
     "id": "api.templates.invite_subject",
-    "translation": "{{ .SenderName }} te ha invitado a unirte al equipo {{ .TeamDisplayName }} en {{.SiteName}}"
+    "translation": "[{{ .SiteName }}] {{ .SenderName }} te ha invitado a unirte al Equipo {{ .TeamDisplayName }}"
   },
   {
     "id": "api.templates.mfa_activated_body.info",
@@ -2105,7 +2133,7 @@
   },
   {
     "id": "api.templates.mfa_change_subject",
-    "translation": "tu MFA ha sido actualizado en {{ .SiteName }}"
+    "translation": "[{{ .SiteName }}] Tu MFA ha sido actualizado"
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
@@ -2125,7 +2153,7 @@
   },
   {
     "id": "api.templates.password_change_subject",
-    "translation": "Tu contraseña ha sido cambiada para {{.TeamDisplayName}} en {{ .SiteName }}"
+    "translation": "[{{ .SiteName }}] Tu contraseña ha sido actualizado"
   },
   {
     "id": "api.templates.post_body.button",
@@ -2141,7 +2169,11 @@
   },
   {
     "id": "api.templates.post_subject_in_direct_message",
-    "translation": "{{.SubjectText}} en {{.TeamDisplayName}} de {{.SenderDisplayName}} on {{.Day}} {{.Month}}, {{.Year}}"
+    "translation": "{{.SubjectText}} de {{.SenderDisplayName}} el {{.Day}} {{.Month}}, {{.Year}}"
+  },
+  {
+    "id": "api.templates.post_subject_in_group_message",
+    "translation": "Nuevo Mensaje de Grupo de {{.SenderDisplayName}} el {{.Day}} {{.Month}}, {{.Year}}"
   },
   {
     "id": "api.templates.reset_body.button",
@@ -2157,7 +2189,11 @@
   },
   {
     "id": "api.templates.reset_subject",
-    "translation": "Restablece tu contraseña"
+    "translation": "[{{ .SiteName }}] Restablecer tu contraseña"
+  },
+  {
+    "id": "api.templates.signin_change_email.body.info",
+    "translation": "Haz actualizado tu método de inicio de sesión en {{ .SiteName }} a {{.Method}}.<br>Sí este cambio no fue realizado por ti, por favor contacta a tu administrador de sistema."
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -2168,6 +2204,10 @@
     "translation": "Haz actualizado el método con el que inicias sesión"
   },
   {
+    "id": "api.templates.signin_change_email.subject",
+    "translation": "[{{ .SiteName }}] has actualizado el método de inicio de sesión en {{ .SiteName }}"
+  },
+  {
     "id": "api.templates.signup_team_body.button",
     "translation": "Configura tu equipo"
   },
@@ -2184,14 +2224,6 @@
     "translation": "Configuración del equipo en {{ .SiteName }}"
   },
   {
-    "id": "api.templates.singin_change_email.body.info",
-    "translation": "Haz actualizado tu método de inicio de sesión en {{ .SiteName }} a {{.Method}}.<br>Sí este cambio no fue realizado por ti, por favor contacta a tu administrador de sistema."
-  },
-  {
-    "id": "api.templates.singin_change_email.subject",
-    "translation": "Haz actualizado el método de inicio de sesión en {{ .SiteName }}"
-  },
-  {
     "id": "api.templates.upgrade_30_body.info",
     "translation": "<h3 style='font-weight: normal; margin-top: 10px;'>TUS CUENTAS DUPLICADAS HAN SIDO ACTUALIZADAS</h3>Tu servidor de Mattermost ha sido actualizado a la Versión 3.0, la cual permite que utilices una sólo cuenta de usuario en múltiples equipos.<br/><br/>Estás recibiendo este correo electrónico debido a que el proceso de actualización ha detectado que tu cuenta tiene la misma dirección de correo electrónico o nombre de usuario que otras cuentas en el servidor.<br/><br/>Los siguiente cambios han sido realizados: <br/><br/>{{if .EmailChanged }}- La dirección de correo electrónico duplicada para la cuenta en el equipo `/{{.TeamName}}` fue cambiada a `{{.Email}}`. En el caso de que utilices el correo electrónico y la contraseña para iniciar sesión, puedes utilizar esta nueva dirección de correo para iniciar tu sesión.<br/><br/>{{end}}{{if .UsernameChanged }}- El nombre de usuario duplicado para la cuenta en el equipo `/{{.TeamName}}` ha sido cambiado por `{{.Username}}` para evitar confusión con otras cuentas.<br/><br/>{{end}} ACCIÓN RECOMENDADA: <br/><br/>Se recomienda que inicies sesión en tus equipos donde se encontraron duplicados y agregues tu cuenta principal al equipo y a cualquier canal público y grupo privado que quieras continuar utilizando. <br/><br/>Esto hará que tu cuenta principal tenga acceso al historial de todos tus canales públicos y grupos privados. Podrás continuar teniendo acceso al historial de todos los mensajes directos de cada cuenta duplicada al iniciar sesión con las credenciales de de cada una de las cuentas. <br/><br/>PARA MÁS INFORMACIÓN: <br/><br/>Para obtener más información referente a la actualización a Mattermost 3.0 por favor revisa: <a href='http://www.mattermost.org/upgrading-to-mattermost-3-0/'>http://www.mattermost.org/upgrading-to-mattermost-3-0/</a><br/><br/>"
   },
@@ -2209,7 +2241,7 @@
   },
   {
     "id": "api.templates.username_change_subject",
-    "translation": "Tu nombre de usuario para {{.TeamDisplayName}} ha cambiado"
+    "translation": "[{{ .SiteName }}] Tu nombre de usuario ha cambiado"
   },
   {
     "id": "api.templates.verify_body.button",
@@ -2253,7 +2285,7 @@
   },
   {
     "id": "api.templates.welcome_subject",
-    "translation": "Te uniste a {{ .ServerURL }}"
+    "translation": "[{{ .SiteName }}] Te haz unido a {{ .ServerURL }}"
   },
   {
     "id": "api.user.activate_mfa.email_and_ldap_only.app_error",
@@ -2692,12 +2724,8 @@
     "translation": "deteniendo el hub de equipo para teamId=%v"
   },
   {
-    "id": "api.webhook.create_incoming.disabled.app_error",
-    "translation": "Webhooks entrantes han sido deshabilitados por el administrador del sistema."
-  },
-  {
     "id": "api.webhook.create_outgoing.disabled.app_error",
-    "translation": "Webhooks de Salida han sido inhabilitados por el administrador del sistema."
+    "translation": "Webhooks de Salida han sido deshabilitados por el administrador del sistema."
   },
   {
     "id": "api.webhook.create_outgoing.intersect.app_error",
@@ -2732,14 +2760,6 @@
     "translation": "Permisos no válidos para eliminar el webhook de salida"
   },
   {
-    "id": "api.webhook.get_incoming.disabled.app_error",
-    "translation": "Webhooks entrantes han sido inhabilitados por el administrador del sistema."
-  },
-  {
-    "id": "api.webhook.get_outgoing.disabled.app_error",
-    "translation": "Webhooks de Salida han sido inhabilitados por el administrador del sistema."
-  },
-  {
     "id": "api.webhook.incoming.debug",
     "translation": "Recibido webhook de entrada. Contenido="
   },
@@ -2752,10 +2772,6 @@
     "translation": "Inicializando rutas del API para los webhooks"
   },
   {
-    "id": "api.webhook.regen_outgoing_token.disabled.app_error",
-    "translation": "Webhooks de Salida han sido inhabilitados por el administrador del sistema."
-  },
-  {
     "id": "api.webhook.regen_outgoing_token.permissions.app_error",
     "translation": "Permisos no válidos para regenerar un token para el webhook de salida"
   },
@@ -2852,6 +2868,10 @@
     "translation": "La linea a importar tiene un tipo de \"canal\" pero el objeto del canal 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."
+  },
+  {
     "id": "app.import.import_line.null_team.error",
     "translation": "La linea a importar tiene un tipo de \"equipo\" pero el objeto del equipo es null."
   },
@@ -2864,6 +2884,18 @@
     "translation": "La línea a importar tiene un tipo desconocido de \"{{.Type}}\""
   },
   {
+    "id": "app.import.import_post.channel_not_found.error",
+    "translation": "Error al importar el mensaje. El canal con el nombre \"{{.ChannelName}}\" no pudo ser encontrado."
+  },
+  {
+    "id": "app.import.import_post.team_not_found.error",
+    "translation": "Error al importar el mensaje. El equipo con el nombre \"{{.TeamName}}\" no pudo ser encontrado."
+  },
+  {
+    "id": "app.import.import_post.user_not_found.error",
+    "translation": "Error al importar el mensaje. El usuario con nombre de usuario \"{{.Username}}\" no pudo ser encontrado."
+  },
+  {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
     "translation": "La propiedad create_at del canal no debe ser 0 si se proporciona."
   },
@@ -2908,6 +2940,34 @@
     "translation": "Falta la propiedad obligatoria del canal: type"
   },
   {
+    "id": "app.import.validate_post_import_data.channel_missing.error",
+    "translation": "Falta la propiedad obligatoria del mensaje: Channel."
+  },
+  {
+    "id": "app.import.validate_post_import_data.create_at_missing.error",
+    "translation": "Falta la propiedad del mensaje: create_at."
+  },
+  {
+    "id": "app.import.validate_post_import_data.create_at_zero.error",
+    "translation": "La propiedad CreateAt del mensaje no debe ser cero si se proporciona."
+  },
+  {
+    "id": "app.import.validate_post_import_data.message_length.error",
+    "translation": "La propiedad Message del mensaje supera la longitud máxima permitida."
+  },
+  {
+    "id": "app.import.validate_post_import_data.message_missing.error",
+    "translation": "Falta la propiedad obligatoria del mensaje: Message."
+  },
+  {
+    "id": "app.import.validate_post_import_data.team_missing.error",
+    "translation": "Falta la propiedad obligatoria del mensaje: Team."
+  },
+  {
+    "id": "app.import.validate_post_import_data.user_missing.error",
+    "translation": "Falta la propiedad obligatoria del mensaje: User."
+  },
+  {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
     "translation": "La propiedad del equipo allowed_domains es demasiado larga."
   },
@@ -3020,6 +3080,14 @@
     "translation": "Team name missing from User's Team Membership."
   },
   {
+    "id": "authentication.permissions.create_group_channel.description",
+    "translation": "Capacidad para crear nuevos canales de mensaje de grupo"
+  },
+  {
+    "id": "authentication.permissions.create_group_channel.name",
+    "translation": "Create Mensaje de Grupo"
+  },
+  {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "Capacidad para crear equipos nuevos"
   },
@@ -3596,6 +3664,14 @@
     "translation": "Encontramos un error mientras se leía el archivo"
   },
   {
+    "id": "model.client.set_profile_user.no_file.app_error",
+    "translation": "No hay un archivo bajo 'image' en la solicitud"
+  },
+  {
+    "id": "model.client.set_profile_user.writer.app_error",
+    "translation": "No se puede escribir la solicitud"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "Fecha de Creación debe ser válida"
   },
@@ -4976,6 +5052,10 @@
     "translation": "No pudimos obtener los mensajes padres del canal"
   },
   {
+    "id": "store.sql_post.get_posts_created_att.app_error",
+    "translation": "No se pudo obtener los mensajes para el canal"
+  },
+  {
     "id": "store.sql_post.get_posts_since.app_error",
     "translation": "No pudimos obtener los mensajes para el canal"
   },
@@ -4984,6 +5064,10 @@
     "translation": "No pudimos obtener los mensajes para el canal"
   },
   {
+    "id": "store.sql_post.overwrite.app_error",
+    "translation": "No pudimos sobreescribir el mensaje"
+  },
+  {
     "id": "store.sql_post.permanent_delete.app_error",
     "translation": "No pudimos eliminar el mensaje"
   },
@@ -5012,8 +5096,8 @@
     "translation": "No puedes actualizar el Mensaje"
   },
   {
-    "id": "store.sql_post.search.app_error",
-    "translation": "Encontramos un error mientras buscamos los mensajes"
+    "id": "store.sql_post.search.warn",
+    "translation": "Error en la consulta de la búsqueda de mensajes. %v"
   },
   {
     "id": "store.sql_post.update.app_error",
@@ -5620,6 +5704,18 @@
     "translation": "Ocurrió un error mientras se guardaba el archivo en {{.Filename}}"
   },
   {
+    "id": "utils.config.supported_client_locale.app_error",
+    "translation": "No se pudo cargar la configuración de mattermost:  El valor de DefaultClientLocale debe ser uno de los idiomas soportados"
+  },
+  {
+    "id": "utils.config.supported_server_locale.app_error",
+    "translation": "No se pudo cargar la configuración de mattermost:  El valor de DefaultServerLocale debe ser uno de los idiomas soportados"
+  },
+  {
+    "id": "utils.config.validate_locale.app_error",
+    "translation": "No se pudo cargar la configuración de mattermost:  El valor de AvailableLocales debe ser includir el valor de DefaultClientLocale"
+  },
+  {
     "id": "utils.diagnostic.analytics_not_found.app_error",
     "translation": "Analytics no se ha inicializado"
   },
diff --git a/i18n/fr.json b/i18n/fr.json
index fa45041b5..894edf7e5 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -220,6 +220,14 @@
     "translation": "Invalid user ID for direct channel creation"
   },
   {
+    "id": "api.channel.create_group.bad_size.app_error",
+    "translation": "Group message channels must contain at least 3 and no more than 8 users"
+  },
+  {
+    "id": "api.channel.create_group.bad_user.app_error",
+    "translation": "One of the provided users does not exist"
+  },
+  {
     "id": "api.channel.delete_channel.archived",
     "translation": "%v a archivé le canal."
   },
@@ -892,6 +900,10 @@
     "translation": "Aller au message"
   },
   {
+    "id": "api.email_batching.render_batched_post.group_message",
+    "translation": "Group Message"
+  },
+  {
     "id": "api.email_batching.render_batched_post.sender.app_error",
     "translation": "Impossible de trouver l’expéditeur du message pour l'envoi d'e-mails groupés"
   },
@@ -1214,6 +1226,10 @@
     "translation": "Impossible de marquer l'adresse e-mail comme vérifiée err=%v"
   },
   {
+    "id": "api.incoming_webhook.disabled.app_errror",
+    "translation": "Les webhooks entrants ont été désactivés par l'administrateur système."
+  },
+  {
     "id": "api.license.add_license.array.app_error",
     "translation": "Il manque le paramètre \"licence\" dans la requête"
   },
@@ -1800,6 +1816,14 @@
     "translation": "Impossible de fusionner l'utilisateur avec le compte existant: {{.Email}}, {{.Username}}, l'utilisateur n'a pas été ajouté à cette équipe.\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.missing_email_address",
+    "translation": "User {{.Username}} does not have an email address in the Slack export. Using {{.Email}} as a placeholder. The user should update their email address once logged in to the system.\r\n"
+  },
+  {
+    "id": "api.slackimport.slack_add_users.missing_email_address.warn",
+    "translation": "User {{.Username}} does not have an email address in the Slack export. Using {{.Email}} as a placeholder. The user should update their email address once logged in to the system."
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "Impossible d'importer l'utilisateur : {{.Username}}\r\n"
   },
@@ -2012,6 +2036,10 @@
     "translation": "Vous n'avez pas les permissions appropriées"
   },
   {
+    "id": "api.templates.channel_name.group",
+    "translation": "Group Message"
+  },
+  {
     "id": "api.templates.email_change_body.info",
     "translation": "Votre adresse e-mail pour {{.TeamDisplayName}} a été remplacée par {{.NewEmail}}.<br>Si vous n'êtes pas à l'origine de cette action, veuillez contacter votre administrateur système."
   },
@@ -2021,7 +2049,7 @@
   },
   {
     "id": "api.templates.email_change_subject",
-    "translation": "Votre adresse e-mail a été modifiée pour {{.TeamDisplayName}}"
+    "translation": "[{{ .SiteName }}] Your email address has changed"
   },
   {
     "id": "api.templates.email_change_verify_body.button",
@@ -2037,7 +2065,7 @@
   },
   {
     "id": "api.templates.email_change_verify_subject",
-    "translation": "Vérifier la nouvelle adresse e-mail pour {{.TeamDisplayName}}"
+    "translation": "[{{ .SiteName }}] Verify new email address"
   },
   {
     "id": "api.templates.email_footer",
@@ -2093,7 +2121,7 @@
   },
   {
     "id": "api.templates.invite_subject",
-    "translation": "{{ .SenderName }} vous a invité à rejoindre l'équipe {{ .TeamDisplayName }} sur {{.SiteName}}"
+    "translation": "[{{ .SiteName }}] {{ .SenderName }} invited you to join {{ .TeamDisplayName }} Team"
   },
   {
     "id": "api.templates.mfa_activated_body.info",
@@ -2105,7 +2133,7 @@
   },
   {
     "id": "api.templates.mfa_change_subject",
-    "translation": "Votre authentification multi-facteur a été mise à jour sur {{ .SiteName }}"
+    "translation": "[{{ .SiteName }}] Your MFA has been updated"
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
@@ -2125,7 +2153,7 @@
   },
   {
     "id": "api.templates.password_change_subject",
-    "translation": "Votre mot de passe a été modifié pour {{.TeamDisplayName}} sur {{ .SiteName }}"
+    "translation": "[{{ .SiteName }}] Your password has been updated"
   },
   {
     "id": "api.templates.post_body.button",
@@ -2144,6 +2172,10 @@
     "translation": "{{.SubjectText}} sur {{.TeamDisplayName}} le {{.Day}} {{.Month}} {{.Year}}"
   },
   {
+    "id": "api.templates.post_subject_in_group_message",
+    "translation": "{{.SubjectText}} sur {{.TeamDisplayName}} le {{.Day}} {{.Month}} {{.Year}}"
+  },
+  {
     "id": "api.templates.reset_body.button",
     "translation": "Réinitialiser le mot de passe"
   },
@@ -2157,7 +2189,11 @@
   },
   {
     "id": "api.templates.reset_subject",
-    "translation": "Réinitialiser votre mot de passe."
+    "translation": "[{{ .SiteName }}] Reset your password"
+  },
+  {
+    "id": "api.templates.signin_change_email.body.info",
+    "translation": "Vous avez mis à jour votre méthode de connexion pour le {{ .SiteName }} à {{.Method}}.<br>Si vous n'êtes pas à l'origine de ce changement, veuillez contacter votre administrateur système."
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -2168,6 +2204,10 @@
     "translation": "Vous avez mis-à-jour votre méthode de connexion"
   },
   {
+    "id": "api.templates.signin_change_email.subject",
+    "translation": "[{{ .SiteName }}] You updated your sign-in method on {{ .SiteName }}"
+  },
+  {
     "id": "api.templates.signup_team_body.button",
     "translation": "Configurer votre équipe"
   },
@@ -2184,14 +2224,6 @@
     "translation": "Paramétrage Équipe {{ .SiteName }}"
   },
   {
-    "id": "api.templates.singin_change_email.body.info",
-    "translation": "Vous avez mis à jour votre méthode de connexion pour le {{ .SiteName }} à {{.Method}}.<br>Si vous n'êtes pas à l'origine de ce changement, veuillez contacter votre administrateur système."
-  },
-  {
-    "id": "api.templates.singin_change_email.subject",
-    "translation": "Vous avez mis à jour votre méthode de connexion sur {{ .SiteName }}"
-  },
-  {
     "id": "api.templates.upgrade_30_body.info",
     "translation": "<h3 style='font-weight: normal; margin-top: 10px;'>VOS COMPTES DUPLIQUES ONT ETE MIS A NIVEAU</h3>Votre serveur Mattermost a été mis à niveau vers la version 3.0, qui vous permet d'utiliser un seul compte pour plusieurs équipes.<br/><br/>Vous recevez cet email parce que le processus de mise à niveau a détecté que votre compte utilisait la même adresse email ou le même nom d'utilisateur que d'autres comptes présents sur le serveur.<br/><br/>Les mises à niveau suivantes ont été effectuées : <br/><br/>{{if .EmailChanged }}- Une adresse email dupliquée d'un compte de l'équipe `/{{.TeamName}}` a été changé en `{{.Email}}`. Vous devrez utiliser cette nouvelle adresse email la prochaine fois que vous vous connecterez à l'aide de votre adresse email et mot de passe.<br/><br/>{{end}}{{if .UsernameChanged }}- Un nom d'utilisateur en doublon d'un compte de l'équipe `/{{.TeamName}}` a été changé en `{{.Username}}` pour éviter toute confusion avec d'autres comptes.<br/><br/>{{end}} ACTION RECOMMANDÉE : <br/><br/>Il est nécessaire que vous vous connectiez aux équipes qui utilisent vos comptes dupliqués de façon à ajouter votre compte principal à cette équipe et ainsi pouvoir continuer à utiliser vos groupes publics et privés.<br/><br/>De cette façon, votre compte principal aura accès à l'entièreté de l'historique des canaux publics et privés. Vous pouvez continuer à utiliser l'historique des messages privés en utilisant vos comptes dupliqués en vous connectant à l'aide de leurs paramètres d'authentification. <br/><br/>POUR PLUS D'INFORMATION: <br/><br/>Pour plus d'information sur la mise à niveau vers Mattermost 3.0, veuillez vous référer à : <a href='http://www.mattermost.org/upgrading-to-mattermost-3-0/'>http://www.mattermost.org/upgrading-to-mattermost-3-0/</a><br/><br/>"
   },
@@ -2209,7 +2241,7 @@
   },
   {
     "id": "api.templates.username_change_subject",
-    "translation": "Votre nom d'utilisateur a été modifié pour {{.TeamDisplayName}}"
+    "translation": "[{{ .SiteName }}] Your username has changed"
   },
   {
     "id": "api.templates.verify_body.button",
@@ -2253,7 +2285,7 @@
   },
   {
     "id": "api.templates.welcome_subject",
-    "translation": "Vous avez rejoint {{ .ServerURL }}"
+    "translation": "[{{ .SiteName }}] You joined {{ .ServerURL }}"
   },
   {
     "id": "api.user.activate_mfa.email_and_ldap_only.app_error",
@@ -2692,10 +2724,6 @@
     "translation": "Hub d'équipe arrêté pour teamId=%v"
   },
   {
-    "id": "api.webhook.create_incoming.disabled.app_error",
-    "translation": "Les webhooks entrants ont été désactivés par l'administrateur système."
-  },
-  {
     "id": "api.webhook.create_outgoing.disabled.app_error",
     "translation": "Les webhooks entrants ont été désactivés par l'administrateur système."
   },
@@ -2732,14 +2760,6 @@
     "translation": "Droits insuffisants pour supprimer le webhook sortant"
   },
   {
-    "id": "api.webhook.get_incoming.disabled.app_error",
-    "translation": "Les webhooks entrants ont été désactivées par l'administrateur système."
-  },
-  {
-    "id": "api.webhook.get_outgoing.disabled.app_error",
-    "translation": "Les webhooks sortants ont été désactivés par l'administrateur système."
-  },
-  {
     "id": "api.webhook.incoming.debug",
     "translation": "webhook entrant reçu. Contenu ="
   },
@@ -2752,10 +2772,6 @@
     "translation": "Initialisation des routes de l'API webhook"
   },
   {
-    "id": "api.webhook.regen_outgoing_token.disabled.app_error",
-    "translation": "Les webhooks sortants ont été désactivés par l'administrateur système."
-  },
-  {
     "id": "api.webhook.regen_outgoing_token.permissions.app_error",
     "translation": "Droits insuffisants pour regénérer le jeton du webhook sortant"
   },
@@ -2852,6 +2868,10 @@
     "translation": "Import data line has type \"channel\" but the channel object is null."
   },
   {
+    "id": "app.import.import_line.null_post.error",
+    "translation": "Import data line has type \"post\" but the post object is null."
+  },
+  {
     "id": "app.import.import_line.null_team.error",
     "translation": "Import data line has type \"team\" but the team object is null."
   },
@@ -2864,6 +2884,18 @@
     "translation": "Import data line has unknown type \"{{.Type}}\"."
   },
   {
+    "id": "app.import.import_post.channel_not_found.error",
+    "translation": "Error importing post. Channel with name \"{{.ChannelName}}\" could not be found."
+  },
+  {
+    "id": "app.import.import_post.team_not_found.error",
+    "translation": "Error importing post. Team with name \"{{.TeamName}}\" could not be found."
+  },
+  {
+    "id": "app.import.import_post.user_not_found.error",
+    "translation": "Error importing post. User with username \"{{.Username}}\" could not be found."
+  },
+  {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
     "translation": "Channel create_at must not be 0 if provided."
   },
@@ -2908,6 +2940,34 @@
     "translation": "Missing required channel property: type."
   },
   {
+    "id": "app.import.validate_post_import_data.channel_missing.error",
+    "translation": "Missing required Post property: Channel."
+  },
+  {
+    "id": "app.import.validate_post_import_data.create_at_missing.error",
+    "translation": "Missing required Post property: create_at."
+  },
+  {
+    "id": "app.import.validate_post_import_data.create_at_zero.error",
+    "translation": "Post CreateAt must not be zero if it is provided."
+  },
+  {
+    "id": "app.import.validate_post_import_data.message_length.error",
+    "translation": "Post Message property is longer than the maximum permitted length."
+  },
+  {
+    "id": "app.import.validate_post_import_data.message_missing.error",
+    "translation": "Missing required Post property: Message."
+  },
+  {
+    "id": "app.import.validate_post_import_data.team_missing.error",
+    "translation": "Missing required Post property: Team."
+  },
+  {
+    "id": "app.import.validate_post_import_data.user_missing.error",
+    "translation": "Missing required Post property: User."
+  },
+  {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
     "translation": "Team allowed_domains is too long."
   },
@@ -3020,6 +3080,14 @@
     "translation": "Team name missing from User's Team Membership."
   },
   {
+    "id": "authentication.permissions.create_group_channel.description",
+    "translation": "Ability to create new group message channels"
+  },
+  {
+    "id": "authentication.permissions.create_group_channel.name",
+    "translation": "Create Group Message"
+  },
+  {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "Ability to create new teams"
   },
@@ -3596,6 +3664,14 @@
     "translation": "Nous avons rencontré une erreur lors de la recherche des profils utilisateurs"
   },
   {
+    "id": "model.client.set_profile_user.no_file.app_error",
+    "translation": "Pas de fichier dans le paramètre \"image\" de la requête"
+  },
+  {
+    "id": "model.client.set_profile_user.writer.app_error",
+    "translation": "Impossible d'écrire la demande"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "La date de création doit être une date valide"
   },
@@ -4976,6 +5052,10 @@
     "translation": "Nous n'avons pas pu obtenir les messages parent pour le canal"
   },
   {
+    "id": "store.sql_post.get_posts_created_att.app_error",
+    "translation": "Nous n'avons pas pu obtenir les messages pour le canal"
+  },
+  {
     "id": "store.sql_post.get_posts_since.app_error",
     "translation": "Nous n'avons pas pu obtenir les messages pour le canal"
   },
@@ -4984,6 +5064,10 @@
     "translation": "Nous n'avons pas pu obtenir les messages pour le canal"
   },
   {
+    "id": "store.sql_post.overwrite.app_error",
+    "translation": "Nous n'avons pas pu supprimer le message"
+  },
+  {
     "id": "store.sql_post.permanent_delete.app_error",
     "translation": "Nous n'avons pas pu supprimer le message"
   },
@@ -5012,8 +5096,8 @@
     "translation": "Vous ne pouvez pas mettre à jour un message existant"
   },
   {
-    "id": "store.sql_post.search.app_error",
-    "translation": "Vous avons rencontré une erreur durant la recherche des messages"
+    "id": "store.sql_post.search.warn",
+    "translation": "Query error searching posts: %v"
   },
   {
     "id": "store.sql_post.update.app_error",
@@ -5620,6 +5704,18 @@
     "translation": "Une erreur s'est produite lors de l'enregistrement du fichier {{.Filename}}"
   },
   {
+    "id": "utils.config.supported_client_locale.app_error",
+    "translation": "Unable to load mattermost configuration file:  DefaultClientLocale must be one of the supported locales"
+  },
+  {
+    "id": "utils.config.supported_server_locale.app_error",
+    "translation": "Unable to load mattermost configuration file:  DefaultServerLocale must be one of the supported locales"
+  },
+  {
+    "id": "utils.config.validate_locale.app_error",
+    "translation": "Unable to load mattermost configuration file:  AvailableLocales must include DefaultClientLocale"
+  },
+  {
     "id": "utils.diagnostic.analytics_not_found.app_error",
     "translation": "Analytics non initialisé"
   },
diff --git a/i18n/ja.json b/i18n/ja.json
index 8b61f58fc..3d63a370c 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -220,6 +220,14 @@
     "translation": "ダイレクトチャンネル作成のユーザーIDが不正です"
   },
   {
+    "id": "api.channel.create_group.bad_size.app_error",
+    "translation": "グループメッセージチャンネルは３〜８ユーザーでなければなりません"
+  },
+  {
+    "id": "api.channel.create_group.bad_user.app_error",
+    "translation": "指定されたユーザーの一人が存在しません"
+  },
+  {
     "id": "api.channel.delete_channel.archived",
     "translation": "%vがチャンネルをアーカイブしました。"
   },
@@ -892,6 +900,10 @@
     "translation": "投稿へ行く"
   },
   {
+    "id": "api.email_batching.render_batched_post.group_message",
+    "translation": "グループメッセージ"
+  },
+  {
     "id": "api.email_batching.render_batched_post.sender.app_error",
     "translation": "バッチ処理された電子メールについて、投稿の投稿者が見付かりません"
   },
@@ -1214,6 +1226,10 @@
     "translation": "電子メールを確認済みに設定できませんでした err=%v"
   },
   {
+    "id": "api.incoming_webhook.disabled.app_errror",
+    "translation": "内向きのウェブフックはシステム管理者によって無効にされています。"
+  },
+  {
     "id": "api.license.add_license.array.app_error",
     "translation": "リクエストの'license'配列が空です"
   },
@@ -1800,6 +1816,14 @@
     "translation": "既存のアカウント{{.Email}}, {{.Username}} とユーザーをマージしようとしましたが、このチームにユーザーを追加できませんでした。\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.missing_email_address",
+    "translation": "ユーザー {{.Username}} はSlackエクスポートで電子メールアドレスが設定されていません。プレイスホルダーの {{.Email}} を利用してください。システムにログインした時、そのユーザーは電子メールアドレスを更新する必要があります。\r\n"
+  },
+  {
+    "id": "api.slackimport.slack_add_users.missing_email_address.warn",
+    "translation": "ユーザー {{.Username}} はSlackエクスポートで電子メールアドレスが設定されていません。プレイスホルダーの {{.Email}} を利用してください。システムにログインした時、そのユーザーは電子メールアドレスを更新する必要があります。"
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "ユーザーをインポートできません: {{.Username}}\r\n"
   },
@@ -2012,6 +2036,10 @@
     "translation": "あなたには必要な権限が付与されていません"
   },
   {
+    "id": "api.templates.channel_name.group",
+    "translation": "グループメッセージ"
+  },
+  {
     "id": "api.templates.email_change_body.info",
     "translation": "あなたの{{.TeamDisplayName}}用の電子メールアドレスが{{.NewEmail}}に変更されました。<br>あなたが変更したのでなければ、システム管理者に問い合わせてください。"
   },
@@ -2021,7 +2049,7 @@
   },
   {
     "id": "api.templates.email_change_subject",
-    "translation": "{{.TeamDisplayName}}用に電子メールアドレスが変更されました"
+    "translation": "[{{ .SiteName }}] あなたの電子メールアドレスが変更されました"
   },
   {
     "id": "api.templates.email_change_verify_body.button",
@@ -2037,7 +2065,7 @@
   },
   {
     "id": "api.templates.email_change_verify_subject",
-    "translation": "{{.TeamDisplayName}}用の電子メールアドレスを確認する"
+    "translation": "[{{ .SiteName }}] 新しい電子メールアドレスを確認してください"
   },
   {
     "id": "api.templates.email_footer",
@@ -2093,7 +2121,7 @@
   },
   {
     "id": "api.templates.invite_subject",
-    "translation": "{{ .SenderName }}が{{.SiteName}}の{{ .TeamDisplayName }}に参加するように招待しています。"
+    "translation": "[{{ .SiteName }}] {{ .SenderName }} があなたを {{ .TeamDisplayName }} チームに招待しました"
   },
   {
     "id": "api.templates.mfa_activated_body.info",
@@ -2105,7 +2133,7 @@
   },
   {
     "id": "api.templates.mfa_change_subject",
-    "translation": "{{ .SiteName }}のあなたの多要素認証がアップデートされました"
+    "translation": "[{{ .SiteName }}] あなたの多要素認証が更新されました"
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
@@ -2125,7 +2153,7 @@
   },
   {
     "id": "api.templates.password_change_subject",
-    "translation": "{{ .SiteName }}の{{.TeamDisplayName}}のパスワードが更新されました。"
+    "translation": "[{{ .SiteName }}] あなたのパスワードが更新されました"
   },
   {
     "id": "api.templates.post_body.button",
@@ -2141,7 +2169,11 @@
   },
   {
     "id": "api.templates.post_subject_in_direct_message",
-    "translation": "{{.SenderDisplayName}}の投稿した{{.TeamDisplayName}}の{{.SubjectText}} 日付: {{.Month}} {{.Day}}, {{.Year}}"
+    "translation": "{{.SenderDisplayName}}からの{{.SubjectText}} 日付: {{.Month}} {{.Day}}, {{.Year}}"
+  },
+  {
+    "id": "api.templates.post_subject_in_group_message",
+    "translation": "{{ .SenderDisplayName}} からの新しいグループメッセージ 日付: {{.Month}} {{.Day}}, {{.Year}}"
   },
   {
     "id": "api.templates.reset_body.button",
@@ -2157,7 +2189,11 @@
   },
   {
     "id": "api.templates.reset_subject",
-    "translation": "パスワードを初期化する"
+    "translation": "[{{ .SiteName }}] あなたのパスワードをリセットしました"
+  },
+  {
+    "id": "api.templates.signin_change_email.body.info",
+    "translation": "{{ .SiteName }}のサインイン方法を{{.Method}}に更新しました。<br>あなたが変更したのでなければ、システム管理者へ問い合わせてください。"
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -2168,6 +2204,10 @@
     "translation": "サインイン方法を更新しました"
   },
   {
+    "id": "api.templates.signin_change_email.subject",
+    "translation": "[{{ .SiteName }}] {{ .SiteName }}のサインイン方法が更新されました"
+  },
+  {
     "id": "api.templates.signup_team_body.button",
     "translation": "チームをセットアップする"
   },
@@ -2184,14 +2224,6 @@
     "translation": "{{ .SiteName }}チームのセットアップ"
   },
   {
-    "id": "api.templates.singin_change_email.body.info",
-    "translation": "{{ .SiteName }}のサインイン方法は{{.Method}}に更新されました。<br>あなたが変更したのでなければ、システム管理者へ問い合わせてください。"
-  },
-  {
-    "id": "api.templates.singin_change_email.subject",
-    "translation": "{{ .SiteName }}へのあなたのサインイン方法を更新しました"
-  },
-  {
     "id": "api.templates.upgrade_30_body.info",
     "translation": "<h3 style='font-weight: normal; margin-top: 10px;'>重複していたアカウントが更新されました</h3>利用しているMattermostサーバーがバージョン3.0に更新され、1つのアカウントで複数のチームを利用できるようになりました。<br/><br/>サーバー上の他のアカウントと同じメールアドレス・ユーザー名が使用されていることを検知したため、このメールでお知らせしています。<br/><br/>アカウントは次の通りに更新されました: <br/><br/>{{if .EmailChanged }}- メールアドレスが重複していた`/{{.TeamName}}`チームのアカウントのメールアドレスは`{{.Email}}`に変更されました。 メールアドレスとパスワードをログインに使用している場合は、この新しいメールアドレスを使用してください。<br/><br/>{{end}}{{if .UsernameChanged }}- ユーザー名が重複していた`/{{.TeamName}}`チームのアカウントのユーザー名は`{{.Username}}`に変更されました。<br/><br/>{{end}} 推奨される操作: <br/><br/>重複していたアカウントを利用してチームへログインし、メインのアカウントをチームと公開チャンネル、利用を続ける非公開グループに追加することを推奨します。<br/><br/>メインのアカウントで全ての公開チャンネルと非公開グループの履歴を閲覧することが出来ます。ダイレクトメッセージの履歴は、重複していたアカウントでログインすることで閲覧することが出来ます。<br/><br/>追加情報: <br/><br/>Mattermost 3.0への更新に関する情報は、次のURLよりご確認ください: <a href='http://www.mattermost.org/upgrading-to-mattermost-3-0/'>http://www.mattermost.org/upgrading-to-mattermost-3-0/</a><br/><br/>"
   },
@@ -2209,7 +2241,7 @@
   },
   {
     "id": "api.templates.username_change_subject",
-    "translation": "{{.TeamDisplayName}}用にユーザー名が変更されました"
+    "translation": "[{{ .SiteName }}] あなたのユーザー名が変更されました"
   },
   {
     "id": "api.templates.verify_body.button",
@@ -2253,7 +2285,7 @@
   },
   {
     "id": "api.templates.welcome_subject",
-    "translation": "{{ .ServerURL }}に参加しました"
+    "translation": "[{{ .SiteName }}] {{ .ServerURL }}に参加しました"
   },
   {
     "id": "api.user.activate_mfa.email_and_ldap_only.app_error",
@@ -2692,10 +2724,6 @@
     "translation": "teamId=%v用のチームハブを停止しています"
   },
   {
-    "id": "api.webhook.create_incoming.disabled.app_error",
-    "translation": "内向きのウェブフックはシステム管理者によって無効にされています。"
-  },
-  {
     "id": "api.webhook.create_outgoing.disabled.app_error",
     "translation": "外向きのウェブフックはシステム管理者によって無効にされています。"
   },
@@ -2732,14 +2760,6 @@
     "translation": "外向きのウェブフックを削除するのに十分な権限が付与されていません"
   },
   {
-    "id": "api.webhook.get_incoming.disabled.app_error",
-    "translation": "内向きのウェブフックはシステム管理者によって無効にされています。"
-  },
-  {
-    "id": "api.webhook.get_outgoing.disabled.app_error",
-    "translation": "外向きのウェブフックはシステム管理者によって無効にされています。"
-  },
-  {
     "id": "api.webhook.incoming.debug",
     "translation": "内向きのウェブフックを受信。内容="
   },
@@ -2752,10 +2772,6 @@
     "translation": "ウェブフックAPIルートを初期化しています"
   },
   {
-    "id": "api.webhook.regen_outgoing_token.disabled.app_error",
-    "translation": "外向きのウェブフックはシステム管理者によって無効にされています。"
-  },
-  {
     "id": "api.webhook.regen_outgoing_token.permissions.app_error",
     "translation": "外向きのウェブフックトークンを再生成するのに十分な権限が付与されていません"
   },
@@ -2852,6 +2868,10 @@
     "translation": "インポートデータに \"channel\" という型がありましたが、そのチャンネルのオブジェクトがnullでした。"
   },
   {
+    "id": "app.import.import_line.null_post.error",
+    "translation": "インポートデータに \"post\" という型がありましたが、その投稿のオブジェクトがnullでした。"
+  },
+  {
     "id": "app.import.import_line.null_team.error",
     "translation": "インポートデータに \"team\" という型がありましたが、そのチームのオブジェクトがnullでした。"
   },
@@ -2864,8 +2884,20 @@
     "translation": "インポートデータに不明な型 \"{{.Type}}\"がありました。"
   },
   {
+    "id": "app.import.import_post.channel_not_found.error",
+    "translation": "投稿のインポート中にエラーが発生しました。 名前 \"{{.ChannelName}}\" のチャンネルが見つかりません。"
+  },
+  {
+    "id": "app.import.import_post.team_not_found.error",
+    "translation": "投稿のインポート中にエラーが発生しました。 名前 \"{{.TeamName}}\" のチームが見つかりません。"
+  },
+  {
+    "id": "app.import.import_post.user_not_found.error",
+    "translation": "投稿のインポート中にエラーが発生しました。 名前 \"{{.Username}}\" のユーザーが見つかりません。"
+  },
+  {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
-    "translation": "チャンネル作成日時は0ではないはずです。"
+    "translation": "チャンネル作成日時には0を設定できません。"
   },
   {
     "id": "app.import.validate_channel_import_data.display_name_length.error",
@@ -2908,12 +2940,40 @@
     "translation": "必須のチャンネル設定値 type が存在しません。"
   },
   {
+    "id": "app.import.validate_post_import_data.channel_missing.error",
+    "translation": "必須の投稿設定値 Channel が存在しません。"
+  },
+  {
+    "id": "app.import.validate_post_import_data.create_at_missing.error",
+    "translation": "必須の投稿設定値 create_at が存在しません。"
+  },
+  {
+    "id": "app.import.validate_post_import_data.create_at_zero.error",
+    "translation": "投稿の作成日には0を設定できません。"
+  },
+  {
+    "id": "app.import.validate_post_import_data.message_length.error",
+    "translation": "投稿メッセージ設定値が許可された最大長を超えています。"
+  },
+  {
+    "id": "app.import.validate_post_import_data.message_missing.error",
+    "translation": "必須の投稿設定値 Message が存在しません。"
+  },
+  {
+    "id": "app.import.validate_post_import_data.team_missing.error",
+    "translation": "必須の投稿設定値 Team が存在しません。"
+  },
+  {
+    "id": "app.import.validate_post_import_data.user_missing.error",
+    "translation": "必須の投稿設定値 User が存在しません。"
+  },
+  {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
     "translation": "チームの許可されたドメインが長すぎます。"
   },
   {
     "id": "app.import.validate_team_import_data.create_at_zero.error",
-    "translation": "チームの作成日時は0ではないはずです。"
+    "translation": "チームの作成日時には0を設定できません。"
   },
   {
     "id": "app.import.validate_team_import_data.description_length.error",
@@ -3020,6 +3080,14 @@
     "translation": "ユーザーのチームメンバーシップにチーム名が存在しません。"
   },
   {
+    "id": "authentication.permissions.create_group_channel.description",
+    "translation": "新しいグループメッセージチャンネルを作成できるようにする"
+  },
+  {
+    "id": "authentication.permissions.create_group_channel.name",
+    "translation": "グループメッセージを作成する"
+  },
+  {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "新しいチームを作成できるようにする"
   },
@@ -3596,6 +3664,14 @@
     "translation": "ファイルを読み込む際にエラーが発生しました"
   },
   {
+    "id": "model.client.set_profile_user.no_file.app_error",
+    "translation": "リクエストの'image'以下にファイルがありません"
+  },
+  {
+    "id": "model.client.set_profile_user.writer.app_error",
+    "translation": "リクエストを書き込めません"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "作成日時は有効な時刻にしてください"
   },
@@ -4976,6 +5052,10 @@
     "translation": "チャンネルの親に当たる投稿を取得できませんでした"
   },
   {
+    "id": "store.sql_post.get_posts_created_att.app_error",
+    "translation": "チャンネルの投稿を取得できませんでした"
+  },
+  {
     "id": "store.sql_post.get_posts_since.app_error",
     "translation": "チャンネルの投稿を取得できませんでした"
   },
@@ -4984,6 +5064,10 @@
     "translation": "チャンネルの投稿を取得できませんでした"
   },
   {
+    "id": "store.sql_post.overwrite.app_error",
+    "translation": "投稿の上書きができませんでした"
+  },
+  {
     "id": "store.sql_post.permanent_delete.app_error",
     "translation": "投稿を削除できませんでした"
   },
@@ -5012,8 +5096,8 @@
     "translation": "既存の投稿は更新できません。"
   },
   {
-    "id": "store.sql_post.search.app_error",
-    "translation": "投稿を検索する際にエラーが発生しました"
+    "id": "store.sql_post.search.warn",
+    "translation": "投稿検索時のクエリエラー: %v"
   },
   {
     "id": "store.sql_post.update.app_error",
@@ -5620,6 +5704,18 @@
     "translation": "ファイルを{{.Filename}}に保存中にエラーが発生しました"
   },
   {
+    "id": "utils.config.supported_client_locale.app_error",
+    "translation": "mattermostの設定ファイルをロードできませんでした:  DefaultClientLocale はサポートされているロケールでなければなりません"
+  },
+  {
+    "id": "utils.config.supported_server_locale.app_error",
+    "translation": "mattermostの設定ファイルをロードできませんでした:  DefaultServerLocale はサポートされているロケールでなければなりません"
+  },
+  {
+    "id": "utils.config.validate_locale.app_error",
+    "translation": "mattermostの設定ファイルをロードできませんでした:  AvailableLocales はDefaultClientLocaleを含んでいなければなりません"
+  },
+  {
     "id": "utils.diagnostic.analytics_not_found.app_error",
     "translation": "解析は初期化されていません"
   },
diff --git a/i18n/ko.json b/i18n/ko.json
index 3be22282e..89aebcce3 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -220,6 +220,14 @@
     "translation": "개인 메시지 채널에 적합하지 않은 사용자 ID"
   },
   {
+    "id": "api.channel.create_group.bad_size.app_error",
+    "translation": "Group message channels must contain at least 3 and no more than 8 users"
+  },
+  {
+    "id": "api.channel.create_group.bad_user.app_error",
+    "translation": "One of the provided users does not exist"
+  },
+  {
     "id": "api.channel.delete_channel.archived",
     "translation": "%v 가 채널을 보존 처리 하였습니다."
   },
@@ -892,6 +900,10 @@
     "translation": "글로 이동하기"
   },
   {
+    "id": "api.email_batching.render_batched_post.group_message",
+    "translation": "Group Message"
+  },
+  {
     "id": "api.email_batching.render_batched_post.sender.app_error",
     "translation": "배치된 이메일 알림 대상 글의 작성자를 찾을 수 없습니다."
   },
@@ -1214,6 +1226,10 @@
     "translation": "확인된 이메일로 설정하는데 실패했습니다. err=%v"
   },
   {
+    "id": "api.incoming_webhook.disabled.app_errror",
+    "translation": "Incoming webhook은 관리자가 사용할 수 없게 설정했습니다."
+  },
+  {
     "id": "api.license.add_license.array.app_error",
     "translation": "'license' 아래에 비어있는 배열이 있습니다."
   },
@@ -1800,6 +1816,14 @@
     "translation": "Tried to merge user with existing account: {{.Email}}, {{.Username}}, but failed to add the user to this team.\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.missing_email_address",
+    "translation": "User {{.Username}} does not have an email address in the Slack export. Using {{.Email}} as a placeholder. The user should update their email address once logged in to the system.\r\n"
+  },
+  {
+    "id": "api.slackimport.slack_add_users.missing_email_address.warn",
+    "translation": "User {{.Username}} does not have an email address in the Slack export. Using {{.Email}} as a placeholder. The user should update their email address once logged in to the system."
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "불러올 수 없는 사용자: {{.Username}}\r\n"
   },
@@ -2012,6 +2036,10 @@
     "translation": "작업을 할 수 있는 권한이 없습니다"
   },
   {
+    "id": "api.templates.channel_name.group",
+    "translation": "Group Message"
+  },
+  {
     "id": "api.templates.email_change_body.info",
     "translation": "{{.TeamDisplayName}} 이메일이 {{.NewEmail}}(으)로 변경되었습니다.<br> 잘못 변경된 경우, 시스템 관리자에게 문의하세요."
   },
@@ -2021,7 +2049,7 @@
   },
   {
     "id": "api.templates.email_change_subject",
-    "translation": "{{.TeamDisplayName}} 이메일이 변경되었습니다."
+    "translation": "[{{ .SiteName }}] Your email address has changed"
   },
   {
     "id": "api.templates.email_change_verify_body.button",
@@ -2037,7 +2065,7 @@
   },
   {
     "id": "api.templates.email_change_verify_subject",
-    "translation": "{{.TeamDisplayName}} 새 이메일을 검증하세요."
+    "translation": "[{{ .SiteName }}] Verify new email address"
   },
   {
     "id": "api.templates.email_footer",
@@ -2093,7 +2121,7 @@
   },
   {
     "id": "api.templates.invite_subject",
-    "translation": "{{ .SenderName }} invited you to join {{ .TeamDisplayName }} Team on {{.SiteName}}"
+    "translation": "[{{ .SiteName }}] {{ .SenderName }} invited you to join {{ .TeamDisplayName }} Team"
   },
   {
     "id": "api.templates.mfa_activated_body.info",
@@ -2105,7 +2133,7 @@
   },
   {
     "id": "api.templates.mfa_change_subject",
-    "translation": "Your MFA has been updated on {{ .SiteName }}"
+    "translation": "[{{ .SiteName }}] Your MFA has been updated"
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
@@ -2125,7 +2153,7 @@
   },
   {
     "id": "api.templates.password_change_subject",
-    "translation": "{{.TeamDisplayName}}의 비밀번호가 변경되었습니다. {{.TeamURL}} {{.Method}}"
+    "translation": "[{{ .SiteName }}] Your password has been updated"
   },
   {
     "id": "api.templates.post_body.button",
@@ -2144,6 +2172,10 @@
     "translation": "{{.SubjectText}} on {{.TeamDisplayName}} at {{.Month}} {{.Day}}, {{.Year}}"
   },
   {
+    "id": "api.templates.post_subject_in_group_message",
+    "translation": "{{.SubjectText}} on {{.TeamDisplayName}} at {{.Month}} {{.Day}}, {{.Year}}"
+  },
+  {
     "id": "api.templates.reset_body.button",
     "translation": "비밀번호 재설정"
   },
@@ -2157,7 +2189,11 @@
   },
   {
     "id": "api.templates.reset_subject",
-    "translation": "비밀번호 재설정"
+    "translation": "[{{ .SiteName }}] Reset your password"
+  },
+  {
+    "id": "api.templates.signin_change_email.body.info",
+    "translation": "You updated your sign-in method for on {{ .SiteName }} to {{.Method}}.<br>If this change wasn't initiated by you, please contact your system administrator."
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -2168,6 +2204,10 @@
     "translation": "You updated your sign-in method"
   },
   {
+    "id": "api.templates.signin_change_email.subject",
+    "translation": "[{{ .SiteName }}] You updated your sign-in method on {{ .SiteName }}"
+  },
+  {
     "id": "api.templates.signup_team_body.button",
     "translation": "팀 설정하기"
   },
@@ -2184,14 +2224,6 @@
     "translation": "{{ .SiteName }} 팀 설정"
   },
   {
-    "id": "api.templates.singin_change_email.body.info",
-    "translation": "You updated your sign-in method for on {{ .SiteName }} to {{.Method}}.<br>If this change wasn't initiated by you, please contact your system administrator."
-  },
-  {
-    "id": "api.templates.singin_change_email.subject",
-    "translation": "You updated your sign-in method on {{ .SiteName }}"
-  },
-  {
     "id": "api.templates.upgrade_30_body.info",
     "translation": "<h3 style='font-weight: normal; margin-top: 10px;'>YOUR DUPLICATE ACCOUNTS HAVE BEEN UPDATED</h3>Your Mattermost server is being upgraded to Version 3.0, which lets you use a single account across multiple teams.<br/><br/>You are receiving this email because the upgrade process has detected your account had the same email or username as other accounts on the server.<br/><br/>The following updates have been made: <br/><br/>{{if .EmailChanged }}- The duplicate email of an account on the `/{{.TeamName}}` team was changed to `{{.Email}}`. You will need to use email and password to login, you can use this new email address for login.<br/><br/>{{end}}{{if .UsernameChanged }}- The duplicate username of an account on the team site `/{{.TeamName}}` has been changed to `{{.Username}}` to avoid confusion with other accounts.<br/><br/>{{end}} RECOMMENDED ACTION: <br/><br/>It is recommended that you login to your teams used by your duplicate accounts and add your primary account to the team and any public channels and private groups which you wish to continue using. <br/><br/>This gives your primary account access to all public channel and private group history. You can continue to access the direct message history of your duplicate accounts by logging in with their credentials. <br/><br/>FOR MORE INFORMATION: <br/><br/>For more information on the upgrade to Mattermost 3.0 please see: <a href='http://www.mattermost.org/upgrading-to-mattermost-3-0/'>http://www.mattermost.org/upgrading-to-mattermost-3-0/</a><br/><br/>"
   },
@@ -2209,7 +2241,7 @@
   },
   {
     "id": "api.templates.username_change_subject",
-    "translation": "{{.TeamDisplayName}}에서 사용자명이 변경되었습니다."
+    "translation": "[{{ .SiteName }}] Your username has changed"
   },
   {
     "id": "api.templates.verify_body.button",
@@ -2253,7 +2285,7 @@
   },
   {
     "id": "api.templates.welcome_subject",
-    "translation": "You joined {{ .ServerURL }}"
+    "translation": "[{{ .SiteName }}] You joined {{ .ServerURL }}"
   },
   {
     "id": "api.user.activate_mfa.email_and_ldap_only.app_error",
@@ -2692,10 +2724,6 @@
     "translation": "team hub stopping for teamId=%v"
   },
   {
-    "id": "api.webhook.create_incoming.disabled.app_error",
-    "translation": "Incoming webhook은 관리자가 사용할 수 없게 설정했습니다."
-  },
-  {
     "id": "api.webhook.create_outgoing.disabled.app_error",
     "translation": "Outgoing webhook은 관리자가 사용할 수 없게 설정했습니다."
   },
@@ -2732,14 +2760,6 @@
     "translation": "Outcoming webhook을 삭제할 권한이 없습니다"
   },
   {
-    "id": "api.webhook.get_incoming.disabled.app_error",
-    "translation": "Incoming webhook은 관리자가 사용할 수 없게 설정했습니다."
-  },
-  {
-    "id": "api.webhook.get_outgoing.disabled.app_error",
-    "translation": "Outgoing webhook은 관리자가 사용할 수 없게 설정했습니다."
-  },
-  {
     "id": "api.webhook.incoming.debug",
     "translation": "Incoming webhook 수신. 내용="
   },
@@ -2752,10 +2772,6 @@
     "translation": "webhook API 경로 초기화 중"
   },
   {
-    "id": "api.webhook.regen_outgoing_token.disabled.app_error",
-    "translation": "Outgoing webhook은 관리자가 사용할 수 없게 설정했습니다."
-  },
-  {
     "id": "api.webhook.regen_outgoing_token.permissions.app_error",
     "translation": "Outgoing webhook 토큰을 재생성할 권한이 없습니다"
   },
@@ -2852,6 +2868,10 @@
     "translation": "Import data line has type \"channel\" but the channel object is null."
   },
   {
+    "id": "app.import.import_line.null_post.error",
+    "translation": "Import data line has type \"post\" but the post object is null."
+  },
+  {
     "id": "app.import.import_line.null_team.error",
     "translation": "Import data line has type \"team\" but the team object is null."
   },
@@ -2864,6 +2884,18 @@
     "translation": "Import data line has unknown type \"{{.Type}}\"."
   },
   {
+    "id": "app.import.import_post.channel_not_found.error",
+    "translation": "Error importing post. Channel with name \"{{.ChannelName}}\" could not be found."
+  },
+  {
+    "id": "app.import.import_post.team_not_found.error",
+    "translation": "Error importing post. Team with name \"{{.TeamName}}\" could not be found."
+  },
+  {
+    "id": "app.import.import_post.user_not_found.error",
+    "translation": "Error importing post. User with username \"{{.Username}}\" could not be found."
+  },
+  {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
     "translation": "Channel create_at must not be 0 if provided."
   },
@@ -2908,6 +2940,34 @@
     "translation": "Missing required channel property: type."
   },
   {
+    "id": "app.import.validate_post_import_data.channel_missing.error",
+    "translation": "Missing required Post property: Channel."
+  },
+  {
+    "id": "app.import.validate_post_import_data.create_at_missing.error",
+    "translation": "Missing required Post property: create_at."
+  },
+  {
+    "id": "app.import.validate_post_import_data.create_at_zero.error",
+    "translation": "Post CreateAt must not be zero if it is provided."
+  },
+  {
+    "id": "app.import.validate_post_import_data.message_length.error",
+    "translation": "Post Message property is longer than the maximum permitted length."
+  },
+  {
+    "id": "app.import.validate_post_import_data.message_missing.error",
+    "translation": "Missing required Post property: Message."
+  },
+  {
+    "id": "app.import.validate_post_import_data.team_missing.error",
+    "translation": "Missing required Post property: Team."
+  },
+  {
+    "id": "app.import.validate_post_import_data.user_missing.error",
+    "translation": "Missing required Post property: User."
+  },
+  {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
     "translation": "Team allowed_domains is too long."
   },
@@ -3020,6 +3080,14 @@
     "translation": "Team name missing from User's Team Membership."
   },
   {
+    "id": "authentication.permissions.create_group_channel.description",
+    "translation": "Ability to create new group message channels"
+  },
+  {
+    "id": "authentication.permissions.create_group_channel.name",
+    "translation": "Create Group Message"
+  },
+  {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "Ability to create new teams"
   },
@@ -3596,6 +3664,14 @@
     "translation": "We encountered an error while finding user profiles"
   },
   {
+    "id": "model.client.set_profile_user.no_file.app_error",
+    "translation": "요청의 'image' 속성 아래에 파일이 없습니다"
+  },
+  {
+    "id": "model.client.set_profile_user.writer.app_error",
+    "translation": "Unable to write request"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "Create at must be a valid time"
   },
@@ -4976,6 +5052,10 @@
     "translation": "We couldn't get the parent posts for the channel"
   },
   {
+    "id": "store.sql_post.get_posts_created_att.app_error",
+    "translation": "We couldn't get the posts for the channel"
+  },
+  {
     "id": "store.sql_post.get_posts_since.app_error",
     "translation": "We couldn't get the posts for the channel"
   },
@@ -4984,6 +5064,10 @@
     "translation": "We couldn't get the posts for the channel"
   },
   {
+    "id": "store.sql_post.overwrite.app_error",
+    "translation": "채널을 찾을 수 없습니다"
+  },
+  {
     "id": "store.sql_post.permanent_delete.app_error",
     "translation": "채널을 찾을 수 없습니다"
   },
@@ -5012,8 +5096,8 @@
     "translation": "You cannot update an existing Post"
   },
   {
-    "id": "store.sql_post.search.app_error",
-    "translation": "We encountered an error while searching for posts"
+    "id": "store.sql_post.search.warn",
+    "translation": "Query error searching posts: %v"
   },
   {
     "id": "store.sql_post.update.app_error",
@@ -5620,6 +5704,18 @@
     "translation": "An error occurred while saving the file to {{.Filename}}"
   },
   {
+    "id": "utils.config.supported_client_locale.app_error",
+    "translation": "Unable to load mattermost configuration file:  DefaultClientLocale must be one of the supported locales"
+  },
+  {
+    "id": "utils.config.supported_server_locale.app_error",
+    "translation": "Unable to load mattermost configuration file:  DefaultServerLocale must be one of the supported locales"
+  },
+  {
+    "id": "utils.config.validate_locale.app_error",
+    "translation": "Unable to load mattermost configuration file:  AvailableLocales must include DefaultClientLocale"
+  },
+  {
     "id": "utils.diagnostic.analytics_not_found.app_error",
     "translation": "분석기가 초기화되지 않았습니다"
   },
diff --git a/i18n/nl.json b/i18n/nl.json
index c2bb12250..d42bfb103 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -220,6 +220,14 @@
     "translation": "Invalid user ID for direct channel creation"
   },
   {
+    "id": "api.channel.create_group.bad_size.app_error",
+    "translation": "Group message channels must contain at least 3 and no more than 8 users"
+  },
+  {
+    "id": "api.channel.create_group.bad_user.app_error",
+    "translation": "One of the provided users does not exist"
+  },
+  {
     "id": "api.channel.delete_channel.archived",
     "translation": "%v heeft het kanaal gearchiveerd."
   },
@@ -301,7 +309,7 @@
   },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.create_post.error",
-    "translation": "Fout bij het weergeven van het bericht over de bijgewerkte weergavenaam %v"
+    "translation": "Fout bij het weergeven van het bericht over de bijgewerkte weergavenaam"
   },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.retrieve_user.error",
@@ -892,6 +900,10 @@
     "translation": "Ga naar Bericht"
   },
   {
+    "id": "api.email_batching.render_batched_post.group_message",
+    "translation": "Group Message"
+  },
+  {
     "id": "api.email_batching.render_batched_post.sender.app_error",
     "translation": "Kon de verzender van bericht voor batch email notificatie niet vinden."
   },
@@ -1214,6 +1226,10 @@
     "translation": "Fout tijdens het instellen van e-mail verificatie. Fout=%v"
   },
   {
+    "id": "api.incoming_webhook.disabled.app_errror",
+    "translation": "Commando's zijn uitgeschakeld door de beheerder."
+  },
+  {
     "id": "api.license.add_license.array.app_error",
     "translation": "Lege data bij 'license' in aanvraag"
   },
@@ -1800,6 +1816,14 @@
     "translation": "Tried to merge user with existing account: {{.Email}}, {{.Username}}, but failed to add the user to this team.\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.missing_email_address",
+    "translation": "User {{.Username}} does not have an email address in the Slack export. Using {{.Email}} as a placeholder. The user should update their email address once logged in to the system.\r\n"
+  },
+  {
+    "id": "api.slackimport.slack_add_users.missing_email_address.warn",
+    "translation": "User {{.Username}} does not have an email address in the Slack export. Using {{.Email}} as a placeholder. The user should update their email address once logged in to the system."
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "Kan gebruiker niet importeren: {{.Username}}\r\n"
   },
@@ -2012,6 +2036,10 @@
     "translation": "U beschikt niet over de juiste rechten"
   },
   {
+    "id": "api.templates.channel_name.group",
+    "translation": "Group Message"
+  },
+  {
     "id": "api.templates.email_change_body.info",
     "translation": "Uw e-mailadres voor {{.TeamDisplayName}} is veranderd naar {{.NewEmail}}.<br>Als u deze wijziging niet zelf gemaakt hebt, neem kontakt op met de systeembeheerder."
   },
@@ -2021,7 +2049,7 @@
   },
   {
     "id": "api.templates.email_change_subject",
-    "translation": "Je e-mailadres voor {{.TeamDisplayName}} is gewijzigd"
+    "translation": "[{{ .SiteName }}] Your email address has changed"
   },
   {
     "id": "api.templates.email_change_verify_body.button",
@@ -2037,7 +2065,7 @@
   },
   {
     "id": "api.templates.email_change_verify_subject",
-    "translation": "Verifieer het nieuwe e-mail adres voor {{.TeamDisplayName}}"
+    "translation": "[{{ .SiteName }}] Verify new email address"
   },
   {
     "id": "api.templates.email_footer",
@@ -2093,7 +2121,7 @@
   },
   {
     "id": "api.templates.invite_subject",
-    "translation": "{{ .SenderName }} heeft U uitgenodigd om lid te worden van team {{ .TeamDisplayName }} op {{.SiteName}}"
+    "translation": "[{{ .SiteName }}] {{ .SenderName }} invited you to join {{ .TeamDisplayName }} Team"
   },
   {
     "id": "api.templates.mfa_activated_body.info",
@@ -2105,7 +2133,7 @@
   },
   {
     "id": "api.templates.mfa_change_subject",
-    "translation": "Your MFA has been updated on {{ .SiteName }}"
+    "translation": "[{{ .SiteName }}] Your MFA has been updated"
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
@@ -2125,7 +2153,7 @@
   },
   {
     "id": "api.templates.password_change_subject",
-    "translation": "Uw wachtwoord werd bijgewerkt voor {{.TeamDisplayName}} op {{ .SiteName }}"
+    "translation": "[{{ .SiteName }}] Your password has been updated"
   },
   {
     "id": "api.templates.post_body.button",
@@ -2144,6 +2172,10 @@
     "translation": "{{.SubjectText}} in {{.TeamDisplayName}} van {{.SenderDisplayName}} op {{.Month}} {{.Day}} {{.Year}}"
   },
   {
+    "id": "api.templates.post_subject_in_group_message",
+    "translation": "{{.SubjectText}} in {{.TeamDisplayName}} van {{.SenderDisplayName}} op {{.Month}} {{.Day}} {{.Year}}"
+  },
+  {
     "id": "api.templates.reset_body.button",
     "translation": "Wachtwoord opnieuw instellen"
   },
@@ -2157,7 +2189,11 @@
   },
   {
     "id": "api.templates.reset_subject",
-    "translation": "Herstel uw wachtwoord"
+    "translation": "[{{ .SiteName }}] Reset your password"
+  },
+  {
+    "id": "api.templates.signin_change_email.body.info",
+    "translation": "Uw inlog methode is bijgewerkt voor {{.SiteName}} naar {{.Method}}.<br>Als deze aanpassing niet door U gedaan is, neem dan contact op met uw systeembeheerder."
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -2168,6 +2204,10 @@
     "translation": "Uw inlog methode is bijgewerkt"
   },
   {
+    "id": "api.templates.signin_change_email.subject",
+    "translation": "[{{ .SiteName }}] You updated your sign-in method on {{ .SiteName }}"
+  },
+  {
     "id": "api.templates.signup_team_body.button",
     "translation": "Stel uw team in"
   },
@@ -2184,14 +2224,6 @@
     "translation": "{{ .SiteName }} Team configuratie"
   },
   {
-    "id": "api.templates.singin_change_email.body.info",
-    "translation": "Uw inlog methode is bijgewerkt voor {{.SiteName}} naar {{.Method}}.<br>Als deze aanpassing niet door U gedaan is, neem dan contact op met uw systeembeheerder."
-  },
-  {
-    "id": "api.templates.singin_change_email.subject",
-    "translation": "U heeft uw inlog methode op {{ .SiteName }} bijgewerkt"
-  },
-  {
     "id": "api.templates.upgrade_30_body.info",
     "translation": "<h3 style='font-weight: normal; margin-top: 10px;'>UW DUBBELE ACCOUNTS ZIJN BIJGEWERKT</h3>Uw Mattermost server wordt geüpgraded naar versie 3.0, die toelaat om één account te gebruiken voor verschillende teams.<br/><br/>U krijgt deze email omdat het upgrade proces gedetecteerd heeft dat uw account dezelfde email of gebruikersnaam heeft als voor andere accounts op deze server.<br/><br/>De volgende bijwerkingen zijn gemaakt: <br/><br/>{{if .EmailChanged }}- De dubbele email van een account op het `/{{.TeamName}}` team is veranderd naar `{{.Email}}`. Indien u email en wachtwoord gebruikt om in te loggen kunt bovenstaand email adres gebruiken.<br/><br/>{{end}}{{if .UsernameChanged }}- De dubbele gebruikersnaam van van een account op de team site `/{{.TeamName}}` is veranderd naar `{{.Username}}` om verwarring met andere accounts te voorkomen.<br/><br/>{{end}} AANGERADEN ACTIE: <br/><br/>Het is aangeraden dat u inlogt in uw team die gebruikt zijn door de dubbele accounts en uw primair account aan het team en alle publieke kanalen toevoegt die u wilt blijven gebruiken. <br/><br/>Dit geeft uw primair account toegang tot alle publieke kanalen en de privé groepshistoriek. U kunt uw dubbele accounts blijven gebruiken om de privé berichten historiek te lezen door in te loggen met de oude inloggevens. <br/><br/>VOOR MEER INFORMATIE: <br/><br/>Voor meer informatie over de upgrade naar Mattermost 3.0: <a href='http://www.mattermost.org/upgrading-to-mattermost-3-0/'>http://www.mattermost.org/upgrading-to-mattermost-3-0/</a><br/><br/>"
   },
@@ -2209,7 +2241,7 @@
   },
   {
     "id": "api.templates.username_change_subject",
-    "translation": "Uw e-mailadres voor {{.TeamDisplayName}} is gewijzigd"
+    "translation": "[{{ .SiteName }}] Your username has changed"
   },
   {
     "id": "api.templates.verify_body.button",
@@ -2253,7 +2285,7 @@
   },
   {
     "id": "api.templates.welcome_subject",
-    "translation": "Je hebt je aangesloten bij {{ .ServerURL }}"
+    "translation": "[{{ .SiteName }}] You joined {{ .ServerURL }}"
   },
   {
     "id": "api.user.activate_mfa.email_and_ldap_only.app_error",
@@ -2517,7 +2549,7 @@
   },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
-    "translation": "Aanpassings mail voor notificatie kon niet verstuurd worden, fout=%v"
+    "translation": "Aanpassings mail voor notificatie kon niet verstuurd worden"
   },
   {
     "id": "api.user.send_email_change_username_and_forget.error",
@@ -2692,10 +2724,6 @@
     "translation": "Team hub word gestopt voor teamId=%v"
   },
   {
-    "id": "api.webhook.create_incoming.disabled.app_error",
-    "translation": "Commando's zijn uitgeschakeld door de beheerder."
-  },
-  {
     "id": "api.webhook.create_outgoing.disabled.app_error",
     "translation": "Uitgaande webhooks zijn uitgeschakeld door de beheerder."
   },
@@ -2732,14 +2760,6 @@
     "translation": "Onjuiste rechten voor het verwijderen van de uitgaande webhook opdracht"
   },
   {
-    "id": "api.webhook.get_incoming.disabled.app_error",
-    "translation": "Commando's zijn uitgeschakeld door de beheerder."
-  },
-  {
-    "id": "api.webhook.get_outgoing.disabled.app_error",
-    "translation": "Uitgaande webhooks zijn uitgeschakeld door de beheerder."
-  },
-  {
     "id": "api.webhook.incoming.debug",
     "translation": "Inkomende webhook ontvangen. Content="
   },
@@ -2752,10 +2772,6 @@
     "translation": "Initialisatie van de webhook api"
   },
   {
-    "id": "api.webhook.regen_outgoing_token.disabled.app_error",
-    "translation": "Uitgaande webhooks zijn uitgeschakeld door de beheerder."
-  },
-  {
     "id": "api.webhook.regen_outgoing_token.permissions.app_error",
     "translation": "Ongeldige rechten om tokens voor uitgaande webhooks opnieuw te genereren"
   },
@@ -2852,6 +2868,10 @@
     "translation": "Import data line has type \"channel\" but the channel object is null."
   },
   {
+    "id": "app.import.import_line.null_post.error",
+    "translation": "Import data line has type \"post\" but the post object is null."
+  },
+  {
     "id": "app.import.import_line.null_team.error",
     "translation": "Import data line has type \"team\" but the team object is null."
   },
@@ -2864,6 +2884,18 @@
     "translation": "Import data line has unknown type \"{{.Type}}\"."
   },
   {
+    "id": "app.import.import_post.channel_not_found.error",
+    "translation": "Error importing post. Channel with name \"{{.ChannelName}}\" could not be found."
+  },
+  {
+    "id": "app.import.import_post.team_not_found.error",
+    "translation": "Error importing post. Team with name \"{{.TeamName}}\" could not be found."
+  },
+  {
+    "id": "app.import.import_post.user_not_found.error",
+    "translation": "Error importing post. User with username \"{{.Username}}\" could not be found."
+  },
+  {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
     "translation": "Channel create_at must not be 0 if provided."
   },
@@ -2908,6 +2940,34 @@
     "translation": "Missing required channel property: type."
   },
   {
+    "id": "app.import.validate_post_import_data.channel_missing.error",
+    "translation": "Missing required Post property: Channel."
+  },
+  {
+    "id": "app.import.validate_post_import_data.create_at_missing.error",
+    "translation": "Missing required Post property: create_at."
+  },
+  {
+    "id": "app.import.validate_post_import_data.create_at_zero.error",
+    "translation": "Post CreateAt must not be zero if it is provided."
+  },
+  {
+    "id": "app.import.validate_post_import_data.message_length.error",
+    "translation": "Post Message property is longer than the maximum permitted length."
+  },
+  {
+    "id": "app.import.validate_post_import_data.message_missing.error",
+    "translation": "Missing required Post property: Message."
+  },
+  {
+    "id": "app.import.validate_post_import_data.team_missing.error",
+    "translation": "Missing required Post property: Team."
+  },
+  {
+    "id": "app.import.validate_post_import_data.user_missing.error",
+    "translation": "Missing required Post property: User."
+  },
+  {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
     "translation": "Team allowed_domains is too long."
   },
@@ -3020,6 +3080,14 @@
     "translation": "Team name missing from User's Team Membership."
   },
   {
+    "id": "authentication.permissions.create_group_channel.description",
+    "translation": "Ability to create new group message channels"
+  },
+  {
+    "id": "authentication.permissions.create_group_channel.name",
+    "translation": "Create Group Message"
+  },
+  {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "Ability to create new teams"
   },
@@ -3596,6 +3664,14 @@
     "translation": "Er is een probleem opgestreden tijdens het opzoeken van het gebruikersprofiel"
   },
   {
+    "id": "model.client.set_profile_user.no_file.app_error",
+    "translation": "Geen bestand bij 'image' in aanvraag"
+  },
+  {
+    "id": "model.client.set_profile_user.writer.app_error",
+    "translation": "Fout bij het schrijven van verzoek"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "Aangemaakt op moet een geldige tijd zijn"
   },
@@ -4976,6 +5052,10 @@
     "translation": "We kunnen het start bericht voor het kanaal niet ophalen"
   },
   {
+    "id": "store.sql_post.get_posts_created_att.app_error",
+    "translation": "We kunnen de berichten van het kanaal niet ophalen"
+  },
+  {
     "id": "store.sql_post.get_posts_since.app_error",
     "translation": "We kunnen de berichten van het kanaal niet ophalen"
   },
@@ -4984,6 +5064,10 @@
     "translation": "We kunnen de berichten van het kanaal niet ophalen"
   },
   {
+    "id": "store.sql_post.overwrite.app_error",
+    "translation": "Het bericht kan niet verwijderd worden"
+  },
+  {
     "id": "store.sql_post.permanent_delete.app_error",
     "translation": "Het bericht kan niet verwijderd worden"
   },
@@ -5012,8 +5096,8 @@
     "translation": "Een bestaand bericht kan niet bijwerkt worden"
   },
   {
-    "id": "store.sql_post.search.app_error",
-    "translation": "Er is een probleem opgetreden tijdens het zoeken naar berichten"
+    "id": "store.sql_post.search.warn",
+    "translation": "Query error searching posts: %v"
   },
   {
     "id": "store.sql_post.update.app_error",
@@ -5620,6 +5704,18 @@
     "translation": "Er is ee probleem opgetreden bij het opslaan van het bestand in {{.Filename}}"
   },
   {
+    "id": "utils.config.supported_client_locale.app_error",
+    "translation": "Unable to load mattermost configuration file:  DefaultClientLocale must be one of the supported locales"
+  },
+  {
+    "id": "utils.config.supported_server_locale.app_error",
+    "translation": "Unable to load mattermost configuration file:  DefaultServerLocale must be one of the supported locales"
+  },
+  {
+    "id": "utils.config.validate_locale.app_error",
+    "translation": "Unable to load mattermost configuration file:  AvailableLocales must include DefaultClientLocale"
+  },
+  {
     "id": "utils.diagnostic.analytics_not_found.app_error",
     "translation": "Analytics niet geïnitialiseerd"
   },
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index 93f0f171b..99992efc6 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -220,6 +220,14 @@
     "translation": "ID de usuário inválido para a criação do canal direto"
   },
   {
+    "id": "api.channel.create_group.bad_size.app_error",
+    "translation": "Group message channels must contain at least 3 and no more than 8 users"
+  },
+  {
+    "id": "api.channel.create_group.bad_user.app_error",
+    "translation": "One of the provided users does not exist"
+  },
+  {
     "id": "api.channel.delete_channel.archived",
     "translation": "%v arquivou o canal."
   },
@@ -892,6 +900,10 @@
     "translation": "Ir para o Post"
   },
   {
+    "id": "api.email_batching.render_batched_post.group_message",
+    "translation": "Group Message"
+  },
+  {
     "id": "api.email_batching.render_batched_post.sender.app_error",
     "translation": "Não foi possível encontrar o remetente da postagem para a notificação de email em lote"
   },
@@ -1214,6 +1226,10 @@
     "translation": "Não foi possível definir email verificado err=%v"
   },
   {
+    "id": "api.incoming_webhook.disabled.app_errror",
+    "translation": "Webhooks de entrada foram desabilitados pelo administrador do sistema."
+  },
+  {
     "id": "api.license.add_license.array.app_error",
     "translation": "Matriz vazia sobre a 'licença' na requisição"
   },
@@ -1800,6 +1816,14 @@
     "translation": "Tentado mesclar o usuário com a conta existente: {{.Email}}, {{.Username}}, mas houve uma falha ao adicionar o usuário a essa equipe.\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.missing_email_address",
+    "translation": "User {{.Username}} does not have an email address in the Slack export. Using {{.Email}} as a placeholder. The user should update their email address once logged in to the system.\r\n"
+  },
+  {
+    "id": "api.slackimport.slack_add_users.missing_email_address.warn",
+    "translation": "User {{.Username}} does not have an email address in the Slack export. Using {{.Email}} as a placeholder. The user should update their email address once logged in to the system."
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "Não foi possível importar o usuário: {{.Username}}\r\n"
   },
@@ -2012,6 +2036,10 @@
     "translation": "Você não tem a permissão apropriada"
   },
   {
+    "id": "api.templates.channel_name.group",
+    "translation": "Group Message"
+  },
+  {
     "id": "api.templates.email_change_body.info",
     "translation": "Seu endereço de email para {{.TeamDisplayName}} foi alterado para {{.NewEmail}}.<br>Se você não fez está mudança, por favor contate o administrador do sistema."
   },
@@ -2021,7 +2049,7 @@
   },
   {
     "id": "api.templates.email_change_subject",
-    "translation": "Seu endereço de email foi alterado para {{.TeamDisplayName}}"
+    "translation": "[{{ .SiteName }}] Seu endereço de email foi alterado"
   },
   {
     "id": "api.templates.email_change_verify_body.button",
@@ -2037,7 +2065,7 @@
   },
   {
     "id": "api.templates.email_change_verify_subject",
-    "translation": "Verifique novo endereço de email para {{.TeamDisplayName}}"
+    "translation": "[{{ .SiteName }}] Verifique o novo endereço de email"
   },
   {
     "id": "api.templates.email_footer",
@@ -2093,7 +2121,7 @@
   },
   {
     "id": "api.templates.invite_subject",
-    "translation": "{{ .SenderName }} convidou você para se juntar a Equipe {{ .TeamDisplayName }} no {{.SiteName}}"
+    "translation": "[{{ .SiteName }}] {{ .SenderName }} convidou você para se juntar a equipe {{ .TeamDisplayName }}"
   },
   {
     "id": "api.templates.mfa_activated_body.info",
@@ -2105,7 +2133,7 @@
   },
   {
     "id": "api.templates.mfa_change_subject",
-    "translation": "Seu MFA foi atualizado em {{ .SiteName }}"
+    "translation": "[{{ .SiteName }}] Seu MFA foi atualizado"
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
@@ -2125,7 +2153,7 @@
   },
   {
     "id": "api.templates.password_change_subject",
-    "translation": "Sua senha foi atualizada para {{.TeamDisplayName}} no {{ .SiteName }}"
+    "translation": "[{{ .SiteName }}] Sua senha foi atualizada"
   },
   {
     "id": "api.templates.post_body.button",
@@ -2141,7 +2169,11 @@
   },
   {
     "id": "api.templates.post_subject_in_direct_message",
-    "translation": "{{.SubjectText}} de {{.TeamDisplayName}} para {{.SenderDisplayName}} em {{.Day}} {{.Month}}, {{.Year}}"
+    "translation": "{{.SubjectText}} de {{.SenderDisplayName}} em {{.Day}} {{.Month}}, {{.Year}}"
+  },
+  {
+    "id": "api.templates.post_subject_in_group_message",
+    "translation": "{{.SubjectText}} de {{.SenderDisplayName}} em {{.Day}} {{.Month}}, {{.Year}}"
   },
   {
     "id": "api.templates.reset_body.button",
@@ -2157,7 +2189,11 @@
   },
   {
     "id": "api.templates.reset_subject",
-    "translation": "Resetar sua senha"
+    "translation": "[{{ .SiteName }}] Redefinir sua senha"
+  },
+  {
+    "id": "api.templates.signin_change_email.body.info",
+    "translation": "Você atualizou seu método de login para {{.Method}} em {{ .SiteName }}.<br>Se esta mudança não foi iniciada por você, por favor entre em contato com o administrador do sistema."
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -2168,6 +2204,10 @@
     "translation": "Você atualizou seu método de login"
   },
   {
+    "id": "api.templates.signin_change_email.subject",
+    "translation": "[{{ .SiteName }}] Você atualizou seu método de login em {{ .SiteName }}"
+  },
+  {
     "id": "api.templates.signup_team_body.button",
     "translation": "Configure sua equipe"
   },
@@ -2184,14 +2224,6 @@
     "translation": "{{ .SiteName }} Configuração da Equipe"
   },
   {
-    "id": "api.templates.singin_change_email.body.info",
-    "translation": "Você atualizou seu método de login para {{.Method}} em {{ .SiteName}}.<br>Se esta mudança não foi iniciada por você, por favor entre em contato com o administrador do sistema."
-  },
-  {
-    "id": "api.templates.singin_change_email.subject",
-    "translation": "Você atualizou seu método de login em {{ .SiteName }}"
-  },
-  {
     "id": "api.templates.upgrade_30_body.info",
     "translation": "<h3 style='font-weight: normal; margin-top: 10px;'>SUAS CONTAS DUPLICADAS FORAM ATUALIZADAS</h3>Seu servidor Mattermost está sendo atualizado para a Versão 3.0, o qual permite que você use uma única conta com múltiplas equipes.<br/><br/>Você está recebendo este email porque durante o processo de atualização foi detectado que sua conta tinha o mesmo email e usuário em outras contas no servidor.<br/><br/>As seguintes atualizações foram feitas: <br/><br/>{{if .EmailChanged }}- O email duplicado da conta na equipe `/{{.TeamName}}` foi alterado para `{{.Email}}`. Se você usa email e senha para login, você pode usar este endereço de email para login.<br/><br/>{{end}}{{if .UsernameChanged }}- O usuário duplicado da conta na na equipe `/{{.TeamName}}` foi alterado para `{{.Username}}` para evitar confusões com outras contas.<br/><br/>{{end}} AÇÃO RECOMENDADA: <br/><br/>É recomendável que você acesse suas equipes usadas por suas contas duplicadas e adicione sua conta principal para a equipe e quaisquer canais públicos e grupos privados que deseja continuar usando. <br/><br/>Isto dá o acesso ao histórico para sua conta primária para todos os canais públicos e grupos privados. Você pode continuar acessando o histórico de mensagens diretas de suas contas duplicadas fazendo login com suas credenciais. <br/><br/>PARA MAIS INFORMAÇÕES: <br/><br/>Para mais informações sobre a atualização para o Mattermost 3.0 consulte: <a href='http://www.mattermost.org/upgrading-to-mattermost-3-0/'>http://www.mattermost.org/upgrading-to-mattermost-3-0/</a><br/><br/>"
   },
@@ -2209,7 +2241,7 @@
   },
   {
     "id": "api.templates.username_change_subject",
-    "translation": "Seu nome de usuário foi alterado para {{.TeamDisplayName}}"
+    "translation": "[{{ .SiteName }}] Seu nome de usuário foi alterado"
   },
   {
     "id": "api.templates.verify_body.button",
@@ -2253,7 +2285,7 @@
   },
   {
     "id": "api.templates.welcome_subject",
-    "translation": "Você entrou {{ .ServerURL }}"
+    "translation": "[{{ .SiteName }}] Você se juntou {{ .ServerURL }}"
   },
   {
     "id": "api.user.activate_mfa.email_and_ldap_only.app_error",
@@ -2357,7 +2389,7 @@
   },
   {
     "id": "api.user.create_user.disabled.app_error",
-    "translation": "User creation is disabled."
+    "translation": "Criação de usuário está desabilitada."
   },
   {
     "id": "api.user.create_user.joining.error",
@@ -2569,7 +2601,7 @@
   },
   {
     "id": "api.user.update_oauth_user_attrs.get_user.app_error",
-    "translation": "Não foi possível criar o usuário fora do {{.Service}} do objeto de usuário"
+    "translation": "Não foi possível obter o usuário de {{.Service}} do objeto de usuário"
   },
   {
     "id": "api.user.update_password.context.app_error",
@@ -2692,10 +2724,6 @@
     "translation": "central de equipes parou para teamId=%v"
   },
   {
-    "id": "api.webhook.create_incoming.disabled.app_error",
-    "translation": "Webhooks de entrada foram desabilitados pelo administrador do sistema."
-  },
-  {
     "id": "api.webhook.create_outgoing.disabled.app_error",
     "translation": "Webhooks de saída foram desabilitados pelo administrador do sistema."
   },
@@ -2732,14 +2760,6 @@
     "translation": "Permissões inadequadas para deletar o webhook de saída"
   },
   {
-    "id": "api.webhook.get_incoming.disabled.app_error",
-    "translation": "Webhooks de entrada foram desabilitados pelo administrador do sistema."
-  },
-  {
-    "id": "api.webhook.get_outgoing.disabled.app_error",
-    "translation": "Webhooks de saída foram desabilitados pelo administrador do sistema."
-  },
-  {
     "id": "api.webhook.incoming.debug",
     "translation": "Webhook de entrada recebido. Contendo="
   },
@@ -2752,16 +2772,12 @@
     "translation": "Inicializando as rotas de API webhook"
   },
   {
-    "id": "api.webhook.regen_outgoing_token.disabled.app_error",
-    "translation": "Webhooks de saída foram desabilitados pelo administrador do sistema."
-  },
-  {
     "id": "api.webhook.regen_outgoing_token.permissions.app_error",
     "translation": "Permissões inadequadas para gerar novo token do webhook de saída"
   },
   {
     "id": "api.webhook.team_mismatch.app_error",
-    "translation": "Não é possível atualizar os comandos entre equipes"
+    "translation": "Não é possível atualizar os webhook entre equipes"
   },
   {
     "id": "api.webhook.update_incoming.disabled.app_error",
@@ -2769,7 +2785,7 @@
   },
   {
     "id": "api.webhook.update_incoming.permissions.app_error",
-    "translation": "Permissões inadequadas para deletar o webhook de entrada"
+    "translation": "Permissões inadequadas para atualizar o webhook de entrada"
   },
   {
     "id": "api.webhook.update_outgoing.disabled.app_error",
@@ -2781,15 +2797,15 @@
   },
   {
     "id": "api.webhook.update_outgoing.not_open.app_error",
-    "translation": "Webhooks de saída só pode ser criado para canais públicos."
+    "translation": "Webhooks de saída só pode ser atualizado para canais públicos."
   },
   {
     "id": "api.webhook.update_outgoing.permissions.app_error",
-    "translation": "Permissões inadequadas para criar o webhook de saída."
+    "translation": "Permissões inadequadas para atualizar o webhook de saída."
   },
   {
     "id": "api.webhook.update_outgoing.triggers.app_error",
-    "translation": "Ou trigger_words ou channel_id precisa ser definido"
+    "translation": "Necessita ser definido trigger_words ou channel_id"
   },
   {
     "id": "api.webrtc.disabled.app_error",
@@ -2852,6 +2868,10 @@
     "translation": "A linha de dados de importação é do tipo \"channel\" mas o objeto channel é 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."
+  },
+  {
     "id": "app.import.import_line.null_team.error",
     "translation": "A linha de dados de importação é do tipo \"team\" mas o objeto team é nulo."
   },
@@ -2864,6 +2884,18 @@
     "translation": "A linha de dados de importação possui o tipo desconhecido \"{{.Type}}\"."
   },
   {
+    "id": "app.import.import_post.channel_not_found.error",
+    "translation": "Erro ao importar post. O canal com o nome \"{{.ChannelName}}\" não foi encontrado."
+  },
+  {
+    "id": "app.import.import_post.team_not_found.error",
+    "translation": "Erro ao importar post. A equipe com o nome \"{{.TeamName}}\" não foi encontrada."
+  },
+  {
+    "id": "app.import.import_post.user_not_found.error",
+    "translation": "Erro ao importar post. O usuário com o nome \"{{.Username}}\" não foi encontrado."
+  },
+  {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
     "translation": "Canal create_at precisa ser maior que 0 se informado."
   },
@@ -2908,6 +2940,34 @@
     "translation": "Faltando a propriedade obrigatória do canal: type."
   },
   {
+    "id": "app.import.validate_post_import_data.channel_missing.error",
+    "translation": "Propriedade obrigatória do Post não foi informada: Channel."
+  },
+  {
+    "id": "app.import.validate_post_import_data.create_at_missing.error",
+    "translation": "Propriedade obrigatória do Post não foi informada: create_at."
+  },
+  {
+    "id": "app.import.validate_post_import_data.create_at_zero.error",
+    "translation": "Post CreateAt não pode ser zero se for informado."
+  },
+  {
+    "id": "app.import.validate_post_import_data.message_length.error",
+    "translation": "A propriedade Message do Post é maior que o comprimento máximo permitido."
+  },
+  {
+    "id": "app.import.validate_post_import_data.message_missing.error",
+    "translation": "Propriedade obrigatória do Post não foi informada: Message."
+  },
+  {
+    "id": "app.import.validate_post_import_data.team_missing.error",
+    "translation": "Propriedade obrigatória do Post não foi informada: Team."
+  },
+  {
+    "id": "app.import.validate_post_import_data.user_missing.error",
+    "translation": "Propriedade obrigatória do Post não foi informada: User."
+  },
+  {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
     "translation": "Equipe allowed_domains é muito longo."
   },
@@ -3020,6 +3080,14 @@
     "translation": "Falta nome da equipe em Usuário Membro da Equipe."
   },
   {
+    "id": "authentication.permissions.create_group_channel.description",
+    "translation": "Ability to create new group message channels"
+  },
+  {
+    "id": "authentication.permissions.create_group_channel.name",
+    "translation": "Create Group Message"
+  },
+  {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "Capacidade de criar novas equipes"
   },
@@ -3549,7 +3617,7 @@
   },
   {
     "id": "model.channel_member.is_valid.email_value.app_error",
-    "translation": "Invalid email notification value"
+    "translation": "Valor de notificação de email inválida"
   },
   {
     "id": "model.channel_member.is_valid.notify_level.app_error",
@@ -3557,7 +3625,7 @@
   },
   {
     "id": "model.channel_member.is_valid.push_level.app_error",
-    "translation": "Invalid push notification level"
+    "translation": "Nível de notificação de push inválido"
   },
   {
     "id": "model.channel_member.is_valid.role.app_error",
@@ -3596,6 +3664,14 @@
     "translation": "Encontramos um erro ao ler o arquivo"
   },
   {
+    "id": "model.client.set_profile_user.no_file.app_error",
+    "translation": "Nenhum arquivo em 'image' no pedido"
+  },
+  {
+    "id": "model.client.set_profile_user.writer.app_error",
+    "translation": "Não foi possível escrever o pedido"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "Create deve ser um tempo válido"
   },
@@ -4517,7 +4593,7 @@
   },
   {
     "id": "store.sql_channel.analytics_deleted_type_count.app_error",
-    "translation": "Não foi possível obter o número de tipos de canal"
+    "translation": "Não foi possível obter as contagens de canais excluídos"
   },
   {
     "id": "store.sql_channel.analytics_type_count.app_error",
@@ -4976,6 +5052,10 @@
     "translation": "Não foi possível obter o post pai para o canal"
   },
   {
+    "id": "store.sql_post.get_posts_created_att.app_error",
+    "translation": "Não foi possível obter as postagens para o canal"
+  },
+  {
     "id": "store.sql_post.get_posts_since.app_error",
     "translation": "Não foi possível obter as postagens do canal"
   },
@@ -4984,6 +5064,10 @@
     "translation": "Não foi possível obter as postagens do canal"
   },
   {
+    "id": "store.sql_post.overwrite.app_error",
+    "translation": "Não foi possível sobrescrever o Post"
+  },
+  {
     "id": "store.sql_post.permanent_delete.app_error",
     "translation": "Não foi possível deletar o post"
   },
@@ -5012,8 +5096,8 @@
     "translation": "Você não pode atualizar um Post"
   },
   {
-    "id": "store.sql_post.search.app_error",
-    "translation": "Encontramos um erro enquanto procurava por postagens"
+    "id": "store.sql_post.search.warn",
+    "translation": "Query error searching posts: %v"
   },
   {
     "id": "store.sql_post.update.app_error",
@@ -5341,11 +5425,11 @@
   },
   {
     "id": "store.sql_user.analytics_get_inactive_users_count.app_error",
-    "translation": "Não foi possível contar os usuários ativos"
+    "translation": "Não foi possível contar os usuários inativos"
   },
   {
     "id": "store.sql_user.analytics_get_system_admin_count.app_error",
-    "translation": "We couldn't get the system admin count"
+    "translation": "Não foi possível obter as contagens dos administradores do sistema"
   },
   {
     "id": "store.sql_user.analytics_unique_user_count.app_error",
@@ -5589,7 +5673,7 @@
   },
   {
     "id": "store.sql_webhooks.update_incoming.app_error",
-    "translation": "Não foi possível salvar o IncomingWebhook"
+    "translation": "Não foi possível atualizar o Webhook de entrada"
   },
   {
     "id": "store.sql_webhooks.update_outgoing.app_error",
@@ -5620,6 +5704,18 @@
     "translation": "Um erro ocorreu durante o salvamento do arquivo {{.Filename}}"
   },
   {
+    "id": "utils.config.supported_client_locale.app_error",
+    "translation": "Unable to load mattermost configuration file:  DefaultClientLocale must be one of the supported locales"
+  },
+  {
+    "id": "utils.config.supported_server_locale.app_error",
+    "translation": "Unable to load mattermost configuration file:  DefaultServerLocale must be one of the supported locales"
+  },
+  {
+    "id": "utils.config.validate_locale.app_error",
+    "translation": "Unable to load mattermost configuration file:  AvailableLocales must include DefaultClientLocale"
+  },
+  {
     "id": "utils.diagnostic.analytics_not_found.app_error",
     "translation": "Análise não inicializada"
   },
diff --git a/i18n/ru.json b/i18n/ru.json
index 9e1c861c9..0497f4c22 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -220,6 +220,14 @@
     "translation": "Неверный ID пользователя при создании приватного канала"
   },
   {
+    "id": "api.channel.create_group.bad_size.app_error",
+    "translation": "Group message channels must contain at least 3 and no more than 8 users"
+  },
+  {
+    "id": "api.channel.create_group.bad_user.app_error",
+    "translation": "One of the provided users does not exist"
+  },
+  {
     "id": "api.channel.delete_channel.archived",
     "translation": "%v переместил канал в архив."
   },
@@ -892,6 +900,10 @@
     "translation": "Перейти к записи"
   },
   {
+    "id": "api.email_batching.render_batched_post.group_message",
+    "translation": "Group Message"
+  },
+  {
     "id": "api.email_batching.render_batched_post.sender.app_error",
     "translation": "Невозможно найти отправителя поста для почтового объединения уведомлений"
   },
@@ -1155,7 +1167,7 @@
   },
   {
     "id": "api.file.upload_file.bad_parse.app_error",
-    "translation": "Unable to upload file. Header cannot be parsed."
+    "translation": "Невозможно загрузить файл. Заголовок не может быть распознан."
   },
   {
     "id": "api.file.upload_file.large_image.app_error",
@@ -1214,6 +1226,10 @@
     "translation": "Не удалось проверить адрес электронной почты err=%v"
   },
   {
+    "id": "api.incoming_webhook.disabled.app_errror",
+    "translation": "Входящие вебхуки были отключены системным администратором."
+  },
+  {
     "id": "api.license.add_license.array.app_error",
     "translation": "Пустой массив 'license' в запросе"
   },
@@ -1800,6 +1816,14 @@
     "translation": "При слиянии с существующим аккаунтом: {{.Email}}, {{.Username}}, возникла ошибка добавления пользователя в команду.\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.missing_email_address",
+    "translation": "User {{.Username}} does not have an email address in the Slack export. Using {{.Email}} as a placeholder. The user should update their email address once logged in to the system.\r\n"
+  },
+  {
+    "id": "api.slackimport.slack_add_users.missing_email_address.warn",
+    "translation": "User {{.Username}} does not have an email address in the Slack export. Using {{.Email}} as a placeholder. The user should update their email address once logged in to the system."
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "Невозможно импортировать пользователя: {{.Username}}\r\n"
   },
@@ -2012,6 +2036,10 @@
     "translation": "У Вас нет соответствующих разрешений"
   },
   {
+    "id": "api.templates.channel_name.group",
+    "translation": "Group Message"
+  },
+  {
     "id": "api.templates.email_change_body.info",
     "translation": "Ваш адрес электронной почты для {{.TeamDisplayName}} изменен на {{.NewEmail}}. <br> Если Вы не делали это изменение, пожалуйста, обратитесь к системному администратору."
   },
@@ -2021,7 +2049,7 @@
   },
   {
     "id": "api.templates.email_change_subject",
-    "translation": "Ваш адрес электронной почты был изменен для {{.TeamDisplayName}}"
+    "translation": "[{{ .SiteName }}] Ваш email был изменён"
   },
   {
     "id": "api.templates.email_change_verify_body.button",
@@ -2037,7 +2065,7 @@
   },
   {
     "id": "api.templates.email_change_verify_subject",
-    "translation": "Проверьте новый адрес электронной почты для {{.TeamDisplayName}}"
+    "translation": "[{{ .SiteName }}] Подтвердить новый email"
   },
   {
     "id": "api.templates.email_footer",
@@ -2093,7 +2121,7 @@
   },
   {
     "id": "api.templates.invite_subject",
-    "translation": "{{ .SenderName }} приглашает Вас присоединиться к команде {{ .TeamDisplayName }} на {{.SiteName}}"
+    "translation": "[{{ .SiteName }}] {{ .SenderName }} invited you to join {{ .TeamDisplayName }} Team"
   },
   {
     "id": "api.templates.mfa_activated_body.info",
@@ -2105,7 +2133,7 @@
   },
   {
     "id": "api.templates.mfa_change_subject",
-    "translation": "Ваша MFA обновлена на {{ .SiteName }}"
+    "translation": "[{{ .SiteName }}] Your MFA has been updated"
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
@@ -2125,7 +2153,7 @@
   },
   {
     "id": "api.templates.password_change_subject",
-    "translation": "Ваш пароль был обновлен для команды {{.TeamDisplayName}} на {{ .SiteName }}"
+    "translation": "[{{ .SiteName }}] Your password has been updated"
   },
   {
     "id": "api.templates.post_body.button",
@@ -2144,6 +2172,10 @@
     "translation": "{{.SubjectText}} в {{.TeamDisplayName}} от {{.SenderDisplayName}} в {{.Month}} {{.Day}}, {{.Year}}"
   },
   {
+    "id": "api.templates.post_subject_in_group_message",
+    "translation": "{{.SubjectText}} в {{.TeamDisplayName}} от {{.SenderDisplayName}} в {{.Month}} {{.Day}}, {{.Year}}"
+  },
+  {
     "id": "api.templates.reset_body.button",
     "translation": "Сброс пароля"
   },
@@ -2157,7 +2189,11 @@
   },
   {
     "id": "api.templates.reset_subject",
-    "translation": "Сбросить Ваш пароль"
+    "translation": "[{{ .SiteName }}] Reset your password"
+  },
+  {
+    "id": "api.templates.signin_change_email.body.info",
+    "translation": "Вы обновили свой метод входа для {{ .SiteName }} на {{.Method}}.<br>Если это изменение не было сделано Вами, пожалуйста, обратитесь к системному администратору."
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -2168,6 +2204,10 @@
     "translation": "Вы обновили свой способ входа"
   },
   {
+    "id": "api.templates.signin_change_email.subject",
+    "translation": "[{{ .SiteName }}] You updated your sign-in method on {{ .SiteName }}"
+  },
+  {
     "id": "api.templates.signup_team_body.button",
     "translation": "Настройка Вашей команды"
   },
@@ -2184,14 +2224,6 @@
     "translation": "{{ .SiteName }} настройки команды"
   },
   {
-    "id": "api.templates.singin_change_email.body.info",
-    "translation": "Вы обновили свой метод входа для {{ .SiteName }} на {{.Method}}.<br>Если это изменение не было сделано Вами, пожалуйста, обратитесь к системному администратору."
-  },
-  {
-    "id": "api.templates.singin_change_email.subject",
-    "translation": "Вы обновили свой метод входа для {{ .SiteName }}"
-  },
-  {
     "id": "api.templates.upgrade_30_body.info",
     "translation": "<h3 style='font-weight: normal; margin-top: 10px;'>ВАШИ ДУБЛИРУЮЩИЕ АККАУНТЫ БЫЛИ ОБНОВЛЕНЫ</h3>Ваш сервер Mattermost обновлен до версии 3.0, она позволяет использовать одну учетную запись на несколько команд.<br/><br/>Вы получили это письмо, так как в процессе обновления было найдено, что Ваш аккаунт был привязан к адресу электронной почты или пользователю для другой учетной записи на сервере.<br/><br/>Были выполнены следующие обновления:<br/><br/>{{if .EmailChanged }}-Дубликат адреса электронной почты для команды `/{{.TeamName}}` изменен на `{{.Email}}`. Вам нужно будет использовать этот адрес электронной почты и пароль для входа в систему.<br/><br/>{{end}}{{if .UsernameChanged }}-Дубликат логина для команды `/{{.TeamName}}` изменен на `{{.Username}}`, чтобы избежать путаницы с другими аккаунтами.<br/><br/>{{end}} РЕКОМЕНДОВАННОЕ ДЕЙСТВИЕ: <br/><br/>Мы рекомендуем, чтобы Вы вошли в Ваши команды, используя Ваши дублирующиеся аккаунты и добавили Ваш основной аккаунт в команду, а так же публичные каналы и приватные группы, которые Вы хотите продолжать использовать далее. <br/><br/>Это даст Вашему основному аккаунту доступ ко всем публичным каналам и истории приватных групп. Если Вы хотите получить доступ к истории личных сообщений Ваших дублирующих аккаунтов, Вам нужно войти в систему со своими полномочиями. <br/><br/>ЧТОБЫ ПОЛУЧИТЬ БОЛЬШЕ ИНФОРМАЦИИ: <br/><br/>Для получения дополнительной информации об обновлении до Mattermost 3.0 перейдите по ссылке: <a href='http://www.mattermost.org/upgrading-to-mattermost-3-0/'>http://www.mattermost.org/upgrading-to-mattermost-3-0/</a><br/><br/>"
   },
@@ -2209,7 +2241,7 @@
   },
   {
     "id": "api.templates.username_change_subject",
-    "translation": "Ваше имя пользователя изменено для {{.TeamDisplayName}}"
+    "translation": "[{{ .SiteName }}] Ваш email был изменён"
   },
   {
     "id": "api.templates.verify_body.button",
@@ -2253,7 +2285,7 @@
   },
   {
     "id": "api.templates.welcome_subject",
-    "translation": "Вы присоединились к {{ .ServerURL }}"
+    "translation": "[{{ .SiteName }}] You joined {{ .ServerURL }}"
   },
   {
     "id": "api.user.activate_mfa.email_and_ldap_only.app_error",
@@ -2692,10 +2724,6 @@
     "translation": "остановка командного хаба для teamId=%v"
   },
   {
-    "id": "api.webhook.create_incoming.disabled.app_error",
-    "translation": "Входящие вебхуки были отключены системным администратором."
-  },
-  {
     "id": "api.webhook.create_outgoing.disabled.app_error",
     "translation": "Исходящие вебхуки были отключены системным администратором."
   },
@@ -2732,14 +2760,6 @@
     "translation": "Отсутствуют права на удаление исходящего вебхука"
   },
   {
-    "id": "api.webhook.get_incoming.disabled.app_error",
-    "translation": "Входящие вебхуки отключены системным администратором."
-  },
-  {
-    "id": "api.webhook.get_outgoing.disabled.app_error",
-    "translation": "Исходящие вебхуки отключены системным администратором."
-  },
-  {
     "id": "api.webhook.incoming.debug",
     "translation": "Входящий вебхук получен. Содержание="
   },
@@ -2752,10 +2772,6 @@
     "translation": "Инициализация API вебхуков"
   },
   {
-    "id": "api.webhook.regen_outgoing_token.disabled.app_error",
-    "translation": "Исходящие вебхуки отключены системным администратором."
-  },
-  {
     "id": "api.webhook.regen_outgoing_token.permissions.app_error",
     "translation": "Отсутствуют права на пересоздание токена для исходящего вебхука"
   },
@@ -2852,6 +2868,10 @@
     "translation": "Строка импорта данных содержит тип \"channel\", но объект channel равен null."
   },
   {
+    "id": "app.import.import_line.null_post.error",
+    "translation": "Строка импорта данных содержит тип \"team\", но объект team равен null."
+  },
+  {
     "id": "app.import.import_line.null_team.error",
     "translation": "Строка импорта данных содержит тип \"team\", но объект team равен null."
   },
@@ -2864,6 +2884,18 @@
     "translation": "Строка импорта данных содержит неизвестный тип \"{{.Type}}\"."
   },
   {
+    "id": "app.import.import_post.channel_not_found.error",
+    "translation": "Ошибка импорта канала. Команда с именем \"{{.TeamName}}\" не найдена."
+  },
+  {
+    "id": "app.import.import_post.team_not_found.error",
+    "translation": "Ошибка импорта канала. Команда с именем \"{{.TeamName}}\" не найдена."
+  },
+  {
+    "id": "app.import.import_post.user_not_found.error",
+    "translation": "Ошибка импорта канала. Команда с именем \"{{.TeamName}}\" не найдена."
+  },
+  {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
     "translation": "Если свойство Channel create_at присутствует, то оно не может быть равно 0."
   },
@@ -2908,6 +2940,34 @@
     "translation": "Пропущено обязательное свойство channel: type."
   },
   {
+    "id": "app.import.validate_post_import_data.channel_missing.error",
+    "translation": "Пропущено необходимое свойство team: name."
+  },
+  {
+    "id": "app.import.validate_post_import_data.create_at_missing.error",
+    "translation": "Пропущено необходимое свойство team: name."
+  },
+  {
+    "id": "app.import.validate_post_import_data.create_at_zero.error",
+    "translation": "Post CreateAt must not be zero if it is provided."
+  },
+  {
+    "id": "app.import.validate_post_import_data.message_length.error",
+    "translation": "Post Message property is longer than the maximum permitted length."
+  },
+  {
+    "id": "app.import.validate_post_import_data.message_missing.error",
+    "translation": "Пропущено необходимое свойство team: name."
+  },
+  {
+    "id": "app.import.validate_post_import_data.team_missing.error",
+    "translation": "Пропущено необходимое свойство team: name."
+  },
+  {
+    "id": "app.import.validate_post_import_data.user_missing.error",
+    "translation": "Пропущено необходимое свойство team: name."
+  },
+  {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
     "translation": "Свойство Team allowed_domains слишком длинное."
   },
@@ -3020,6 +3080,14 @@
     "translation": "Пропущено имя команды в «Участие пользователей в команде»"
   },
   {
+    "id": "authentication.permissions.create_group_channel.description",
+    "translation": "Ability to create new group message channels"
+  },
+  {
+    "id": "authentication.permissions.create_group_channel.name",
+    "translation": "Create Group Message"
+  },
+  {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "Возможность создавать новые команды"
   },
@@ -3596,6 +3664,14 @@
     "translation": "Возникла ошибка при поиске пользовательских профилей"
   },
   {
+    "id": "model.client.set_profile_user.no_file.app_error",
+    "translation": "Нет файла 'image' в запросе"
+  },
+  {
+    "id": "model.client.set_profile_user.writer.app_error",
+    "translation": "Не удалось записать запрос"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "\"Создать в\" должно быть корректным временем"
   },
@@ -4976,6 +5052,10 @@
     "translation": "Не удалось получить родительские посты для канала"
   },
   {
+    "id": "store.sql_post.get_posts_created_att.app_error",
+    "translation": "Не удалось получить посты для канала"
+  },
+  {
     "id": "store.sql_post.get_posts_since.app_error",
     "translation": "Не удалось получить посты для канала"
   },
@@ -4984,6 +5064,10 @@
     "translation": "Не удалось получить посты для канала"
   },
   {
+    "id": "store.sql_post.overwrite.app_error",
+    "translation": "Неудачная попытка удалить пост"
+  },
+  {
     "id": "store.sql_post.permanent_delete.app_error",
     "translation": "Неудачная попытка удалить пост"
   },
@@ -5012,8 +5096,8 @@
     "translation": "Вы не можете обновить существующий Пост"
   },
   {
-    "id": "store.sql_post.search.app_error",
-    "translation": "Возникла ошибка во время поиска постов"
+    "id": "store.sql_post.search.warn",
+    "translation": "Query error searching posts: %v"
   },
   {
     "id": "store.sql_post.update.app_error",
@@ -5620,6 +5704,18 @@
     "translation": "Возникла ошибка при сохранении файла в {{.Filename}}"
   },
   {
+    "id": "utils.config.supported_client_locale.app_error",
+    "translation": "Unable to load mattermost configuration file:  DefaultClientLocale must be one of the supported locales"
+  },
+  {
+    "id": "utils.config.supported_server_locale.app_error",
+    "translation": "Unable to load mattermost configuration file:  DefaultServerLocale must be one of the supported locales"
+  },
+  {
+    "id": "utils.config.validate_locale.app_error",
+    "translation": "Unable to load mattermost configuration file:  AvailableLocales must include DefaultClientLocale"
+  },
+  {
     "id": "utils.diagnostic.analytics_not_found.app_error",
     "translation": "Аналитика не инициализирована"
   },
diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json
index 80638a28d..cef1f7e9d 100644
--- a/i18n/zh_CN.json
+++ b/i18n/zh_CN.json
@@ -220,6 +220,14 @@
     "translation": "用于创建私信频道的用户 ID 无效"
   },
   {
+    "id": "api.channel.create_group.bad_size.app_error",
+    "translation": "团体消息频道必须至少包含 3 个但不超过 8 位用户"
+  },
+  {
+    "id": "api.channel.create_group.bad_user.app_error",
+    "translation": "有不存在的用户"
+  },
+  {
     "id": "api.channel.delete_channel.archived",
     "translation": "%v 已归档该频道。"
   },
@@ -313,7 +321,7 @@
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.post.error",
-    "translation": "更新频道头部消息失败"
+    "translation": "更新频道标题消息失败"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.removed",
@@ -892,6 +900,10 @@
     "translation": "转至发文"
   },
   {
+    "id": "api.email_batching.render_batched_post.group_message",
+    "translation": "团体消息"
+  },
+  {
     "id": "api.email_batching.render_batched_post.sender.app_error",
     "translation": "无法找到批量电子邮件通知发送人"
   },
@@ -1155,7 +1167,7 @@
   },
   {
     "id": "api.file.upload_file.bad_parse.app_error",
-    "translation": "Unable to upload file. Header cannot be parsed."
+    "translation": "无法上传文件。标题无法被解析。"
   },
   {
     "id": "api.file.upload_file.large_image.app_error",
@@ -1214,6 +1226,10 @@
     "translation": "设置电子邮件验证失败 err=%v"
   },
   {
+    "id": "api.incoming_webhook.disabled.app_errror",
+    "translation": "传入的 webhooks 已被系统管理员禁用。"
+  },
+  {
     "id": "api.license.add_license.array.app_error",
     "translation": "请求中‘许可证’空数组"
   },
@@ -1800,6 +1816,14 @@
     "translation": "尝试将用户合并到已存在的帐号：{{.Email}}，{{.Username}}，但是无法添加该用户到本团队。\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.missing_email_address",
+    "translation": "用户 {{.Username}} 在 Slack 导入里没有电子邮箱地址。暂使用 {{.Email}} 代替。用户需要在登入系统后更新他们的邮箱地址。\r\n"
+  },
+  {
+    "id": "api.slackimport.slack_add_users.missing_email_address.warn",
+    "translation": "用户 {{.Username}} 在 Slack 导入里没有电子邮箱地址。暂使用 {{.Email}} 代替。用户需要在登入系统后更新他们的邮箱地址。"
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "不能导入用户: {{.Username}}\r\n"
   },
@@ -2012,6 +2036,10 @@
     "translation": "您没有对应的权限"
   },
   {
+    "id": "api.templates.channel_name.group",
+    "translation": "团体消息"
+  },
+  {
     "id": "api.templates.email_change_body.info",
     "translation": "您的邮箱地址从 {{.TeamDisplayName}} 修改为 {{.NewEmail}}。<br>如果您没有做过这个修改，请联系系统管理员。"
   },
@@ -2021,7 +2049,7 @@
   },
   {
     "id": "api.templates.email_change_subject",
-    "translation": "您的邮箱地址修改为 {{.TeamDisplayName}}"
+    "translation": "[{{ .SiteName }}] 您的邮箱地址已更改"
   },
   {
     "id": "api.templates.email_change_verify_body.button",
@@ -2037,7 +2065,7 @@
   },
   {
     "id": "api.templates.email_change_verify_subject",
-    "translation": "验证在 {{.TeamDisplayName}} 上的新电子邮件地址"
+    "translation": "[{{ .SiteName }}] 验证新邮件地址"
   },
   {
     "id": "api.templates.email_footer",
@@ -2093,7 +2121,7 @@
   },
   {
     "id": "api.templates.invite_subject",
-    "translation": "{{ .SenderName }} 邀请您加入 {{ .TeamDisplayName }} 团队在 {{.SiteName}}"
+    "translation": "[{{ .SiteName }}] {{ .SenderName }} 邀请您加入 {{ .TeamDisplayName }} 团队"
   },
   {
     "id": "api.templates.mfa_activated_body.info",
@@ -2105,7 +2133,7 @@
   },
   {
     "id": "api.templates.mfa_change_subject",
-    "translation": "您在 {{ .SiteName}} 的多重验证已更新"
+    "translation": "[{{ .SiteName }}] 您的多重验证已更新"
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
@@ -2125,7 +2153,7 @@
   },
   {
     "id": "api.templates.password_change_subject",
-    "translation": "您的密码已经被更新 {{.TeamDisplayName}} 在 {{ .SiteName }}"
+    "translation": "[{{ .SiteName }}] 您的密码已更新"
   },
   {
     "id": "api.templates.post_body.button",
@@ -2141,7 +2169,11 @@
   },
   {
     "id": "api.templates.post_subject_in_direct_message",
-    "translation": "{{.SubjectText}} 在 {{.TeamDisplayName}} 来自 {{.SenderDisplayName}} 于 {{.Month}} {{.Day}}, {{.Year}}"
+    "translation": "{{.SubjectText}} {{.SenderDisplayName}} 于 {{.Month}} {{.Day}}, {{.Year}}"
+  },
+  {
+    "id": "api.templates.post_subject_in_group_message",
+    "translation": "新团体消息来自 {{ .SenderDisplayName}} 于 {{.Month}} {{.Day}}, {{.Year}}"
   },
   {
     "id": "api.templates.reset_body.button",
@@ -2157,7 +2189,11 @@
   },
   {
     "id": "api.templates.reset_subject",
-    "translation": "重设您的密码"
+    "translation": "[{{ .SiteName }}] 重置您的密码"
+  },
+  {
+    "id": "api.templates.signin_change_email.body.info",
+    "translation": "您在 {{.SiteName}} 更新了登录方式为 {{.Method}}。<br>如果这个变更不是由您发起的，请联系您的系统管理员。"
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -2168,6 +2204,10 @@
     "translation": "您更新了您的登录方式"
   },
   {
+    "id": "api.templates.signin_change_email.subject",
+    "translation": "[{{ .SiteName }}] 您在 {{ .SiteName }} 更新了您的登入方式"
+  },
+  {
     "id": "api.templates.signup_team_body.button",
     "translation": "设置您的团队"
   },
@@ -2184,14 +2224,6 @@
     "translation": "{{ .SiteName }} 团队设置"
   },
   {
-    "id": "api.templates.singin_change_email.body.info",
-    "translation": "您在 {{.SiteName}} 更新了登录方式为 {{.Method}}。<br>如果这个变更不是由您发起的，请联系您的系统管理员。"
-  },
-  {
-    "id": "api.templates.singin_change_email.subject",
-    "translation": "你已经更新您的登录方法{{ .SiteName }}"
-  },
-  {
     "id": "api.templates.upgrade_30_body.info",
     "translation": "<h3 style='font-weight: normal; margin-top: 10px;'>您的多重帐号已更新</h3>您的 Mattermost 伺服器正在升级到版本 3.0，从此您可以在多个团队中使用同一个帐号。<br/><br/>您收到此邮件因为升级过程中发现您的邮箱地址或用户名和另外个帐号重复。<br/><br/>改动如下：<br/><br/>{{if .EmailChanged }}- 在 `/{{.TeamName}}` 团队中重复电子邮件已改为 `{{.Email}}`。你可以使用此新的电子邮件地址和密码登入。<br/><br/>{{end}}{{if .UsernameChanged }}- 在 `/{{.TeamName}}` 团队中重复用户名已改为 `{{.Username}}` 亿避免与其他帐号混淆。<br/><br/>{{end}} 建议操作： <br/><br/>建议您登入重复帐号的团队并将主帐号添加到想继续使用的团队，公开频道以及私有群组。<br/><br/>这样您可以用主帐号访问所有公开频道以及私有群组的历史。您可以继续登入重复帐号来获取私信历史。<br/><br/>更多咨询： <br/><br/>关于更多升级到 Mattermost 3.0 的相关咨询，请参见：<a href='http://www.mattermost.org/upgrading-to-mattermost-3-0/'>http://www.mattermost.org/upgrading-to-mattermost-3-0/</a><br/><br/>"
   },
@@ -2209,7 +2241,7 @@
   },
   {
     "id": "api.templates.username_change_subject",
-    "translation": "您在 {{.TeamDisplayName}} 的用户名已更改"
+    "translation": "[{{ .SiteName }}] 您的用户名已更改"
   },
   {
     "id": "api.templates.verify_body.button",
@@ -2253,7 +2285,7 @@
   },
   {
     "id": "api.templates.welcome_subject",
-    "translation": "您已加入 {{ .ServerURL }}"
+    "translation": "[{{ .SiteName }}] 您加入了 {{ .ServerURL }}"
   },
   {
     "id": "api.user.activate_mfa.email_and_ldap_only.app_error",
@@ -2261,7 +2293,7 @@
   },
   {
     "id": "api.user.add_direct_channels_and_forget.failed.error",
-    "translation": "Failed to add direct channel preferences for user user_id={{.UserId}}, team_id={{.TeamId}}, err={{.Error}}"
+    "translation": "添加用户直接频道偏好设定失败 user_id={{.UserId}}, team_id={{.TeamId}}, err={{.Error}}"
   },
   {
     "id": "api.user.authorize_oauth_user.bad_response.app_error",
@@ -2357,7 +2389,7 @@
   },
   {
     "id": "api.user.create_user.disabled.app_error",
-    "translation": "User creation is disabled."
+    "translation": "用户创建已停用。"
   },
   {
     "id": "api.user.create_user.joining.error",
@@ -2569,7 +2601,7 @@
   },
   {
     "id": "api.user.update_oauth_user_attrs.get_user.app_error",
-    "translation": "无法创建用户 {{.Service}} 用户对象"
+    "translation": "无法从 {{.Service}} 用户对象获取用户"
   },
   {
     "id": "api.user.update_password.context.app_error",
@@ -2692,12 +2724,8 @@
     "translation": "团队枢纽停止 teamId=%v"
   },
   {
-    "id": "api.webhook.create_incoming.disabled.app_error",
-    "translation": "传入的webhooks已被系统管理员禁用。"
-  },
-  {
     "id": "api.webhook.create_outgoing.disabled.app_error",
-    "translation": "传出的webhooks已被系统管理员禁用。"
+    "translation": "传出的 webhooks 已被系统管理员禁用。"
   },
   {
     "id": "api.webhook.create_outgoing.intersect.app_error",
@@ -2732,14 +2760,6 @@
     "translation": "无效的删除传出的 webhook 权限"
   },
   {
-    "id": "api.webhook.get_incoming.disabled.app_error",
-    "translation": "传入的webhooks已被系统管理员禁用。"
-  },
-  {
-    "id": "api.webhook.get_outgoing.disabled.app_error",
-    "translation": "传出的webhooks已被系统管理员禁用。"
-  },
-  {
     "id": "api.webhook.incoming.debug",
     "translation": "收到传入的webhook。内容="
   },
@@ -2752,16 +2772,12 @@
     "translation": "正在初始化 webhook API 路由"
   },
   {
-    "id": "api.webhook.regen_outgoing_token.disabled.app_error",
-    "translation": "传出的webhooks已被系统管理员禁用。"
-  },
-  {
     "id": "api.webhook.regen_outgoing_token.permissions.app_error",
     "translation": "无效的重新生成传出的 webhook 令牌权限"
   },
   {
     "id": "api.webhook.team_mismatch.app_error",
-    "translation": "无法跨团队更新命令"
+    "translation": "无法跨团队更新 webhook"
   },
   {
     "id": "api.webhook.update_incoming.disabled.app_error",
@@ -2769,7 +2785,7 @@
   },
   {
     "id": "api.webhook.update_incoming.permissions.app_error",
-    "translation": "无效的删除传入的 webhook 权限"
+    "translation": "无效的更新传入的 webhook 权限"
   },
   {
     "id": "api.webhook.update_outgoing.disabled.app_error",
@@ -2781,15 +2797,15 @@
   },
   {
     "id": "api.webhook.update_outgoing.not_open.app_error",
-    "translation": "只有公共频道可以创建传出 webhooks。"
+    "translation": "只有公共频道可以更新传出 webhooks。"
   },
   {
     "id": "api.webhook.update_outgoing.permissions.app_error",
-    "translation": "无效的创建传出的 webhook 权限。"
+    "translation": "无效的更新传出的 webhook 权限。"
   },
   {
     "id": "api.webhook.update_outgoing.triggers.app_error",
-    "translation": "无论是trigger_words或channel_id必须设置"
+    "translation": "必须设置 rigger_words 或 channel_id"
   },
   {
     "id": "api.webrtc.disabled.app_error",
@@ -2852,6 +2868,10 @@
     "translation": "导入数据行有类型 \"channel\" 但频道对象是无。"
   },
   {
+    "id": "app.import.import_line.null_post.error",
+    "translation": "导入数据行有类型 \"post\" 但消息对象是无。"
+  },
+  {
     "id": "app.import.import_line.null_team.error",
     "translation": "导入数据行有类型 \"team\" 但团队对象是无。"
   },
@@ -2864,6 +2884,18 @@
     "translation": "导入数据行有无效的类型 \"{{.Type}}\"。"
   },
   {
+    "id": "app.import.import_post.channel_not_found.error",
+    "translation": "导入消息失败。无法找到频道 \"{{.ChannelName}}\"。"
+  },
+  {
+    "id": "app.import.import_post.team_not_found.error",
+    "translation": "导入消息失败。无法找到团队 \"{{.TeamName}}\"。"
+  },
+  {
+    "id": "app.import.import_post.user_not_found.error",
+    "translation": "导入消息失败。无法找到用户 \"{{.Username}}\"。"
+  },
+  {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
     "translation": "如果提供频道 create_at 则不能为 0。"
   },
@@ -2908,6 +2940,34 @@
     "translation": "缺少频道必须属性：type。"
   },
   {
+    "id": "app.import.validate_post_import_data.channel_missing.error",
+    "translation": "缺少消息必须属性：Channel。"
+  },
+  {
+    "id": "app.import.validate_post_import_data.create_at_missing.error",
+    "translation": "缺少消息必须属性：create_at。"
+  },
+  {
+    "id": "app.import.validate_post_import_data.create_at_zero.error",
+    "translation": "如果提供消息 CreateAt 则不能为零。"
+  },
+  {
+    "id": "app.import.validate_post_import_data.message_length.error",
+    "translation": "消息属性超过允许的最大长度。"
+  },
+  {
+    "id": "app.import.validate_post_import_data.message_missing.error",
+    "translation": "缺少消息必须属性：Message。"
+  },
+  {
+    "id": "app.import.validate_post_import_data.team_missing.error",
+    "translation": "缺少消息必须属性：Team。"
+  },
+  {
+    "id": "app.import.validate_post_import_data.user_missing.error",
+    "translation": "缺少消息必须属性：User。"
+  },
+  {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
     "translation": "团队 allowed_domains 过长。"
   },
@@ -2957,11 +3017,11 @@
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_notify_props_desktop.error",
-    "translation": "Invalid Desktop NotifyProps for User's Channel Membership."
+    "translation": "用户的频道身份的桌面 NotifyProps 无效。"
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mark_unread.error",
-    "translation": "Invalid MarkUnread NotifyProps for User's Channel Membership."
+    "translation": "用户的频道身份的 MarkUnread NotifyProps 无效。"
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
@@ -3020,6 +3080,14 @@
     "translation": "用户的团队成员资格中缺少团队名称。"
   },
   {
+    "id": "authentication.permissions.create_group_channel.description",
+    "translation": "允许新建团体消息频道"
+  },
+  {
+    "id": "authentication.permissions.create_group_channel.name",
+    "translation": "创建团体消息"
+  },
+  {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "能创建新团队"
   },
@@ -3549,7 +3617,7 @@
   },
   {
     "id": "model.channel_member.is_valid.email_value.app_error",
-    "translation": "Invalid email notification value"
+    "translation": "无效的电子邮件通知值"
   },
   {
     "id": "model.channel_member.is_valid.notify_level.app_error",
@@ -3557,7 +3625,7 @@
   },
   {
     "id": "model.channel_member.is_valid.push_level.app_error",
-    "translation": "Invalid push notification level"
+    "translation": "无效的推送通知等级"
   },
   {
     "id": "model.channel_member.is_valid.role.app_error",
@@ -3593,7 +3661,15 @@
   },
   {
     "id": "model.client.read_file.app_error",
-    "translation": "我们查找用户配置文件遇到了一个错误"
+    "translation": "我们在读取文件时遇到了一个错误"
+  },
+  {
+    "id": "model.client.set_profile_user.no_file.app_error",
+    "translation": "缺少请求中的 '图片' 文件"
+  },
+  {
+    "id": "model.client.set_profile_user.writer.app_error",
+    "translation": "无法写入请求"
   },
   {
     "id": "model.command.is_valid.create_at.app_error",
@@ -4517,7 +4593,7 @@
   },
   {
     "id": "store.sql_channel.analytics_deleted_type_count.app_error",
-    "translation": "我们无法获取频道类型数"
+    "translation": "我们无法获取已删除的频道类型数"
   },
   {
     "id": "store.sql_channel.analytics_type_count.app_error",
@@ -4976,6 +5052,10 @@
     "translation": "我们无法获取这个频道的父信息"
   },
   {
+    "id": "store.sql_post.get_posts_created_att.app_error",
+    "translation": "我们无法获取这个频道的消息"
+  },
+  {
     "id": "store.sql_post.get_posts_since.app_error",
     "translation": "我们无法获取这个频道的信息"
   },
@@ -4984,6 +5064,10 @@
     "translation": "我们无法获取这个频道的信息"
   },
   {
+    "id": "store.sql_post.overwrite.app_error",
+    "translation": "我们无法覆盖消息"
+  },
+  {
     "id": "store.sql_post.permanent_delete.app_error",
     "translation": "我们无法删除这个邮件"
   },
@@ -5012,8 +5096,8 @@
     "translation": "您不能更新一个村庄的邮件"
   },
   {
-    "id": "store.sql_post.search.app_error",
-    "translation": "我们在搜索邮件时出现一个错误"
+    "id": "store.sql_post.search.warn",
+    "translation": "搜索消息查询错误：%v"
   },
   {
     "id": "store.sql_post.update.app_error",
@@ -5341,11 +5425,11 @@
   },
   {
     "id": "store.sql_user.analytics_get_inactive_users_count.app_error",
-    "translation": "我们无法计算启用的用户数"
+    "translation": "我们无法计算未活动的用户数"
   },
   {
     "id": "store.sql_user.analytics_get_system_admin_count.app_error",
-    "translation": "We couldn't get the system admin count"
+    "translation": "我们无法获取系统管理数"
   },
   {
     "id": "store.sql_user.analytics_unique_user_count.app_error",
@@ -5589,7 +5673,7 @@
   },
   {
     "id": "store.sql_webhooks.update_incoming.app_error",
-    "translation": "我们不能保存传入的 webhook"
+    "translation": "我们无法更新 IncomingWebhook"
   },
   {
     "id": "store.sql_webhooks.update_outgoing.app_error",
@@ -5620,6 +5704,18 @@
     "translation": "保存文件时出错 {{.Filename}}"
   },
   {
+    "id": "utils.config.supported_client_locale.app_error",
+    "translation": "无法加载 Mattermost 配置文件：DefaultClientLocale 必须为支持的区域"
+  },
+  {
+    "id": "utils.config.supported_server_locale.app_error",
+    "translation": "无法加载 Mattermost 配置文件：DefaultServerLocale 必须为支持的区域"
+  },
+  {
+    "id": "utils.config.validate_locale.app_error",
+    "translation": "无法加载 Mattermost 配置文件：AvailableLocales 必须包含 DefaultClientLocale"
+  },
+  {
     "id": "utils.diagnostic.analytics_not_found.app_error",
     "translation": "解析未初始化"
   },
diff --git a/i18n/zh_TW.json b/i18n/zh_TW.json
index 2e8d8d668..7eeb068c3 100644
--- a/i18n/zh_TW.json
+++ b/i18n/zh_TW.json
@@ -217,7 +217,15 @@
   },
   {
     "id": "api.channel.create_direct_channel.invalid_user.app_error",
-    "translation": "Invalid user ID for direct channel creation"
+    "translation": "建立直接傳訊頻道的使用者 ID 無效"
+  },
+  {
+    "id": "api.channel.create_group.bad_size.app_error",
+    "translation": "群組訊息頻道必須含有至少三個至多八個使用者"
+  },
+  {
+    "id": "api.channel.create_group.bad_user.app_error",
+    "translation": "有不存在的使用者"
   },
   {
     "id": "api.channel.delete_channel.archived",
@@ -892,6 +900,10 @@
     "translation": "前往發文"
   },
   {
+    "id": "api.email_batching.render_batched_post.group_message",
+    "translation": "群組訊息"
+  },
+  {
     "id": "api.email_batching.render_batched_post.sender.app_error",
     "translation": "找不到批次郵件通知文章的發文者"
   },
@@ -1155,7 +1167,7 @@
   },
   {
     "id": "api.file.upload_file.bad_parse.app_error",
-    "translation": "Unable to upload file. Header cannot be parsed."
+    "translation": "無法上傳檔案。無法解析標頭。"
   },
   {
     "id": "api.file.upload_file.large_image.app_error",
@@ -1214,6 +1226,10 @@
     "translation": "設定電子郵件為已驗證時失敗 err=%v"
   },
   {
+    "id": "api.incoming_webhook.disabled.app_errror",
+    "translation": "傳入的 Webhook 已被系統管理員停用。"
+  },
+  {
     "id": "api.license.add_license.array.app_error",
     "translation": "要求中的 'license' 欄位為空陣列"
   },
@@ -1800,6 +1816,14 @@
     "translation": "嘗試與現有帳號整合使用者：{{.Email}}、{{.Username}}，但是無法將此使用者加入此團隊。\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.missing_email_address",
+    "translation": "使用者{{.Username}}在Slack匯出資料中沒有電子郵件地址。{{.Email}}將會被用作預留地址。使用者在登入系統後應更新電子郵件地址。\r\n"
+  },
+  {
+    "id": "api.slackimport.slack_add_users.missing_email_address.warn",
+    "translation": "使用者{{.Username}}在Slack匯出資料中沒有電子郵件地址。{{.Email}}將會被用作預留地址。使用者在登入系統後應更新電子郵件地址。"
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "無法匯入使用者： {{.Username}}\r\n"
   },
@@ -2012,6 +2036,10 @@
     "translation": "您沒有適當的權限"
   },
   {
+    "id": "api.templates.channel_name.group",
+    "translation": "群組訊息"
+  },
+  {
     "id": "api.templates.email_change_body.info",
     "translation": "您在 {{.TeamDisplayName}} 上的電子郵件地址已經變更為 {{.NewEmail}}。<br>如果這不是您所變更的，請聯繫系統管理員。"
   },
@@ -2021,7 +2049,7 @@
   },
   {
     "id": "api.templates.email_change_subject",
-    "translation": "您在 {{.TeamDisplayName}} 上的電子郵件地址已經變更"
+    "translation": "[{{ .SiteName }}] 電子郵件地址已變更"
   },
   {
     "id": "api.templates.email_change_verify_body.button",
@@ -2037,7 +2065,7 @@
   },
   {
     "id": "api.templates.email_change_verify_subject",
-    "translation": "驗證在 {{.TeamDisplayName}} 上的新電子郵件地址"
+    "translation": "[{{ .SiteName }}] 驗證新的電子郵件地址"
   },
   {
     "id": "api.templates.email_footer",
@@ -2093,7 +2121,7 @@
   },
   {
     "id": "api.templates.invite_subject",
-    "translation": "{{ .SenderName }} 已經邀請您加入 {{.SiteName}} 上的 {{ .TeamDisplayName }} 團隊"
+    "translation": "[{{ .SiteName }}] {{ .SenderName }} 邀請您加入團隊 {{ .TeamDisplayName }}"
   },
   {
     "id": "api.templates.mfa_activated_body.info",
@@ -2105,7 +2133,7 @@
   },
   {
     "id": "api.templates.mfa_change_subject",
-    "translation": "{{ .SiteName}}的多重要素驗證已更新"
+    "translation": "[{{ .SiteName }}] 多重要素驗證已更新"
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
@@ -2125,7 +2153,7 @@
   },
   {
     "id": "api.templates.password_change_subject",
-    "translation": "您在 {{ .SiteName }} 上的 {{.TeamDisplayName}} 密碼已經更新"
+    "translation": "[{{ .SiteName }}]  密碼已更新"
   },
   {
     "id": "api.templates.post_body.button",
@@ -2141,7 +2169,11 @@
   },
   {
     "id": "api.templates.post_subject_in_direct_message",
-    "translation": "{{.SubjectText}}，來自於{{.TeamDisplayName}}團隊的{{.SenderDisplayName}}，發於 {{.Year}} {{.Month}} {{.Day}}"
+    "translation": "{{.SubjectText}}，來自{{.SenderDisplayName}}，發於 {{.Year}} {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "api.templates.post_subject_in_group_message",
+    "translation": "來自 {{.SenderDisplayName}} 的群組訊息，發於 {{.Year}} {{.Month}} {{.Day}}"
   },
   {
     "id": "api.templates.reset_body.button",
@@ -2157,7 +2189,11 @@
   },
   {
     "id": "api.templates.reset_subject",
-    "translation": "重新設定密碼"
+    "translation": "[{{ .SiteName }}] 重置密碼"
+  },
+  {
+    "id": "api.templates.signin_change_email.body.info",
+    "translation": "您已經將 {{ .SiteName }} 上的登入方式變更為 {{.Method}}。<br>如果這項變更不是您做的，請聯繫系統管理員。"
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -2168,6 +2204,10 @@
     "translation": "已變更登入方式"
   },
   {
+    "id": "api.templates.signin_change_email.subject",
+    "translation": "[{{ .SiteName }}] 在{{ .SiteName}}的登入方式已更新"
+  },
+  {
     "id": "api.templates.signup_team_body.button",
     "translation": "設定團隊"
   },
@@ -2184,14 +2224,6 @@
     "translation": "{{ .SiteName }} 團隊設定"
   },
   {
-    "id": "api.templates.singin_change_email.body.info",
-    "translation": "您已經將 {{ .SiteName }} 上的登入方式變更為 {{.Method}}。<br>如果這項變更不是您做的，請聯繫系統管理員。"
-  },
-  {
-    "id": "api.templates.singin_change_email.subject",
-    "translation": "您已經變更了 {{ .SiteName }} 上 {{.TeamDisplayName}} 的登入方式"
-  },
-  {
     "id": "api.templates.upgrade_30_body.info",
     "translation": "<h3 style='font-weight: normal; margin-top: 10px;'>您的多重帳號已更新</h3> Mattermost 伺服器已升級到版本3.0，從此可以在多個團隊中使用同一帳號。<br/><br/>升級程式發現伺服器上有您的帳號所以寄信給您。<br/><br/>更新如下：<br/><br/>{{if .EmailChanged }}- `/{{.TeamName}}`帳號中重覆的電子郵件已變更為`{{.Email}}`。您必須使用電子郵件與密碼登入，可用此新的電子郵件進行登入。<br/><br/>{{end}}{{if .UsernameChanged }}- `/{{.TeamName}}`站台重覆的使用者名稱變更為`{{.Username}}`以避免與其它的帳號混淆。<br/><br/>{{end}} 建議動作：<br/><br/>建議您用重覆的帳號登入並把主要帳號加到要繼續使用的團隊、公開頻道與私有群組。<br/><br/>這樣方可使用主要帳號存取所有公開頻道與私有群組的歷史。可以用其它重覆的帳號登入存取之前的直接傳送訊息。<br/><br/>詳細訊息：<br/><br/>如需關於升到到 Mattermost 3.0 的詳細資訊，請參閱：<a href='http://www.mattermost.org/upgrading-to-mattermost-3-0/'>http://www.mattermost.org/upgrading-to-mattermost-3-0/</a><br/><br/>"
   },
@@ -2209,7 +2241,7 @@
   },
   {
     "id": "api.templates.username_change_subject",
-    "translation": "使用者名稱已變更為{{.TeamDisplayName}}"
+    "translation": "[{{ .SiteName }}] 使用者名稱已變更"
   },
   {
     "id": "api.templates.verify_body.button",
@@ -2253,7 +2285,7 @@
   },
   {
     "id": "api.templates.welcome_subject",
-    "translation": "已加入{{ .ServerURL }}"
+    "translation": "[{{ .SiteName }}] 已加入 {{ .ServerURL }}"
   },
   {
     "id": "api.user.activate_mfa.email_and_ldap_only.app_error",
@@ -2357,7 +2389,7 @@
   },
   {
     "id": "api.user.create_user.disabled.app_error",
-    "translation": "User creation is disabled."
+    "translation": "建立使用者已被停用"
   },
   {
     "id": "api.user.create_user.joining.error",
@@ -2569,7 +2601,7 @@
   },
   {
     "id": "api.user.update_oauth_user_attrs.get_user.app_error",
-    "translation": "無法建立用於 {{.Service}} 的使用者物件"
+    "translation": "無法從 {{.Service}} 使用者物件取得使用者"
   },
   {
     "id": "api.user.update_password.context.app_error",
@@ -2692,10 +2724,6 @@
     "translation": "正在停止團隊中心 teamId=%v"
   },
   {
-    "id": "api.webhook.create_incoming.disabled.app_error",
-    "translation": "傳入的 Webhook 已被系統管理員停用。"
-  },
-  {
     "id": "api.webhook.create_outgoing.disabled.app_error",
     "translation": "傳出的 Webhook 已被系統管理員停用。"
   },
@@ -2721,7 +2749,7 @@
   },
   {
     "id": "api.webhook.delete_incoming.permissions.app_error",
-    "translation": "沒有適當的權限刪除傳入的 Webhook"
+    "translation": "沒有權限刪除傳入的 Webhook"
   },
   {
     "id": "api.webhook.delete_outgoing.disabled.app_error",
@@ -2732,14 +2760,6 @@
     "translation": "沒有適當的權限刪除傳出的 Webhook"
   },
   {
-    "id": "api.webhook.get_incoming.disabled.app_error",
-    "translation": "傳入的 Webhook 已被系統管理員停用"
-  },
-  {
-    "id": "api.webhook.get_outgoing.disabled.app_error",
-    "translation": "傳出的 Webhook 已被系統管理員停用"
-  },
-  {
     "id": "api.webhook.incoming.debug",
     "translation": "收到傳入的 Webhook。內容="
   },
@@ -2752,16 +2772,12 @@
     "translation": "正在初始化 Webhook API 路徑"
   },
   {
-    "id": "api.webhook.regen_outgoing_token.disabled.app_error",
-    "translation": "傳出的 Webhook 已被系統管理員停用"
-  },
-  {
     "id": "api.webhook.regen_outgoing_token.permissions.app_error",
     "translation": "沒有適當的權限重新產生傳出的 Webhook Token"
   },
   {
     "id": "api.webhook.team_mismatch.app_error",
-    "translation": "無法更新不同團隊的指令"
+    "translation": "無法更新不同團隊的 Webhook"
   },
   {
     "id": "api.webhook.update_incoming.disabled.app_error",
@@ -2769,7 +2785,7 @@
   },
   {
     "id": "api.webhook.update_incoming.permissions.app_error",
-    "translation": "沒有適當的權限刪除傳入的 Webhook"
+    "translation": "沒有適當的權限更新傳入的 Webhook"
   },
   {
     "id": "api.webhook.update_outgoing.disabled.app_error",
@@ -2781,11 +2797,11 @@
   },
   {
     "id": "api.webhook.update_outgoing.not_open.app_error",
-    "translation": "只有公開頻道可以建立傳出的 Webhook。"
+    "translation": "只有公開頻道可以更新傳出的 Webhook。"
   },
   {
     "id": "api.webhook.update_outgoing.permissions.app_error",
-    "translation": "沒有適當的權限建立傳出的 Webhook。"
+    "translation": "沒有適當的權限更新傳出的 Webhook。"
   },
   {
     "id": "api.webhook.update_outgoing.triggers.app_error",
@@ -2852,6 +2868,10 @@
     "translation": "匯入資料行資料型別為\"頻道\"但頻道物件為 null"
   },
   {
+    "id": "app.import.import_line.null_post.error",
+    "translation": "匯入資料行資料型別為\"訊息\"但訊息物件為 null"
+  },
+  {
     "id": "app.import.import_line.null_team.error",
     "translation": "匯入資料行資料型別為\"團隊\"但團隊物件為 null"
   },
@@ -2864,6 +2884,18 @@
     "translation": "匯入資料行型別為未知型別 \"{{.Type}}\"。"
   },
   {
+    "id": "app.import.import_post.channel_not_found.error",
+    "translation": "匯入訊息失敗。不存在名字為 \"{{.Channelame}}\" 的頻道。"
+  },
+  {
+    "id": "app.import.import_post.team_not_found.error",
+    "translation": "匯入訊息失敗。不存在名字為 \"{{.TeamName}}\" 的團隊。"
+  },
+  {
+    "id": "app.import.import_post.user_not_found.error",
+    "translation": "匯入訊息失敗。不存在名字為 \"{{.Username}}\" 的使用者。"
+  },
+  {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
     "translation": "如果有提供頻道建立時間，該值不能為 0。"
   },
@@ -2908,6 +2940,34 @@
     "translation": "缺少必要的頻道屬性：類型。"
   },
   {
+    "id": "app.import.validate_post_import_data.channel_missing.error",
+    "translation": "缺少必要的訊息屬性：頻道。"
+  },
+  {
+    "id": "app.import.validate_post_import_data.create_at_missing.error",
+    "translation": "缺少必要的訊息屬性：建立日期。"
+  },
+  {
+    "id": "app.import.validate_post_import_data.create_at_zero.error",
+    "translation": "如果有提供，訊息建立日期不能為零。"
+  },
+  {
+    "id": "app.import.validate_post_import_data.message_length.error",
+    "translation": "訊息屬性長度超過允許的最大長度"
+  },
+  {
+    "id": "app.import.validate_post_import_data.message_missing.error",
+    "translation": "缺少必要的訊息屬性：訊息。"
+  },
+  {
+    "id": "app.import.validate_post_import_data.team_missing.error",
+    "translation": "缺少必要的訊息屬性：團隊。"
+  },
+  {
+    "id": "app.import.validate_post_import_data.user_missing.error",
+    "translation": "缺少必要的訊息屬性：使用者。"
+  },
+  {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
     "translation": "團隊允許網域過長。"
   },
@@ -2957,11 +3017,11 @@
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_notify_props_desktop.error",
-    "translation": "Invalid Desktop NotifyProps for User's Channel Membership."
+    "translation": "使用者頻道成員身份的桌面 NotifyProps 無效"
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mark_unread.error",
-    "translation": "Invalid MarkUnread NotifyProps for User's Channel Membership."
+    "translation": "使用者頻道成員身份的標注未讀 NotifyProps 無效"
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
@@ -3020,6 +3080,14 @@
     "translation": "使用者團隊資料中缺少團隊名字。"
   },
   {
+    "id": "authentication.permissions.create_group_channel.description",
+    "translation": "允許建立新的群組訊息頻道"
+  },
+  {
+    "id": "authentication.permissions.create_group_channel.name",
+    "translation": "建立群組訊息"
+  },
+  {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "允許建立團隊"
   },
@@ -3549,7 +3617,7 @@
   },
   {
     "id": "model.channel_member.is_valid.email_value.app_error",
-    "translation": "Invalid email notification value"
+    "translation": "無效的電子郵件通知值"
   },
   {
     "id": "model.channel_member.is_valid.notify_level.app_error",
@@ -3557,7 +3625,7 @@
   },
   {
     "id": "model.channel_member.is_valid.push_level.app_error",
-    "translation": "Invalid push notification level"
+    "translation": "無效的推播通知等級"
   },
   {
     "id": "model.channel_member.is_valid.role.app_error",
@@ -3593,7 +3661,15 @@
   },
   {
     "id": "model.client.read_file.app_error",
-    "translation": "尋找使用者資訊時遇到錯誤"
+    "translation": "讀取檔案時遇到錯誤"
+  },
+  {
+    "id": "model.client.set_profile_user.no_file.app_error",
+    "translation": "要求的 'image' 欄位沒有檔案"
+  },
+  {
+    "id": "model.client.set_profile_user.writer.app_error",
+    "translation": "無法寫入要求"
   },
   {
     "id": "model.command.is_valid.create_at.app_error",
@@ -4517,7 +4593,7 @@
   },
   {
     "id": "store.sql_channel.analytics_deleted_type_count.app_error",
-    "translation": "無法取得頻道類別數量"
+    "translation": "無法取得已刪除的頻道類別數量"
   },
   {
     "id": "store.sql_channel.analytics_type_count.app_error",
@@ -4976,6 +5052,10 @@
     "translation": "無法取得該頻道的上層訊息"
   },
   {
+    "id": "store.sql_post.get_posts_created_att.app_error",
+    "translation": "無法取得該頻道的訊息"
+  },
+  {
     "id": "store.sql_post.get_posts_since.app_error",
     "translation": "無法取得該頻道的訊息"
   },
@@ -4984,6 +5064,10 @@
     "translation": "無法取得該頻道的訊息"
   },
   {
+    "id": "store.sql_post.overwrite.app_error",
+    "translation": "無法覆蓋訊息"
+  },
+  {
     "id": "store.sql_post.permanent_delete.app_error",
     "translation": "無法刪除訊息"
   },
@@ -5012,8 +5096,8 @@
     "translation": "無法更新已存在的訊息"
   },
   {
-    "id": "store.sql_post.search.app_error",
-    "translation": "尋找訊息時遇到錯誤"
+    "id": "store.sql_post.search.warn",
+    "translation": "搜尋訊息查詢錯誤：%v"
   },
   {
     "id": "store.sql_post.update.app_error",
@@ -5341,11 +5425,11 @@
   },
   {
     "id": "store.sql_user.analytics_get_inactive_users_count.app_error",
-    "translation": "無法計算活躍使用者的數量"
+    "translation": "無法計算非活躍使用者的數量"
   },
   {
     "id": "store.sql_user.analytics_get_system_admin_count.app_error",
-    "translation": "We couldn't get the system admin count"
+    "translation": "無法計算系統管理員的數量"
   },
   {
     "id": "store.sql_user.analytics_unique_user_count.app_error",
@@ -5589,7 +5673,7 @@
   },
   {
     "id": "store.sql_webhooks.update_incoming.app_error",
-    "translation": "無法儲存傳入的 Webhook"
+    "translation": "無法更新傳入的 Webhook"
   },
   {
     "id": "store.sql_webhooks.update_outgoing.app_error",
@@ -5620,6 +5704,18 @@
     "translation": "儲存檔案到 {{.Filename}} 時發生錯誤"
   },
   {
+    "id": "utils.config.supported_client_locale.app_error",
+    "translation": "無法讀入 Mattermost 設定檔： DefaultClientLocale 必須為支援的地域"
+  },
+  {
+    "id": "utils.config.supported_server_locale.app_error",
+    "translation": "無法讀入 Mattermost 設定檔： DefaultServerLocale 必須為支援的地域"
+  },
+  {
+    "id": "utils.config.validate_locale.app_error",
+    "translation": "無法讀入 Mattermost 設定檔： AvaiableLocales 必須為包含 DefaultClientLocale"
+  },
+  {
     "id": "utils.diagnostic.analytics_not_found.app_error",
     "translation": "分析尚未初始化"
   },
diff --git a/webapp/i18n/de.json b/webapp/i18n/de.json
index 65c0d18bc..168233d17 100644
--- a/webapp/i18n/de.json
+++ b/webapp/i18n/de.json
@@ -138,7 +138,7 @@
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "Erstes Wort entspricht exakt einem Auslösewort",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "Erstes Wort startet mit dem Auslösewort",
   "admin.advance.cluster": "High Availability (Beta)",
-  "admin.advance.metrics": "Performance Monitoring (Beta)",
+  "admin.advance.metrics": "Performance Überwachung",
   "admin.audits.reload": "Benutzeraktivitäten Log neuladen",
   "admin.audits.title": "Benutzeraktivitäten Log",
   "admin.authentication.email": "E-Mail Authentisierung",
@@ -529,7 +529,7 @@
   "admin.metrics.listenAddressDesc": "Die Adresse auf die der Server hören wird um die Performancemetriken auszugeben.",
   "admin.metrics.listenAddressEx": "z.B.: \":8067\"",
   "admin.metrics.listenAddressTitle": "Empfangs-Adresse:",
-  "admin.mfa.bannerDesc": "Multi-Faktor-Authentifizierung ist nur verfügbar für Zugänge mit LDAP und E-Mail Logins.  Wenn es Benutzer in Ihrem System mit anderen Loginmethoden gibt,  wird es empfohlen das Sie Multi-Faktor-Authentifizierung direkt in SSO oder SAML implementieren.",
+  "admin.mfa.bannerDesc": "<a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>Multi-Faktor-Authentifizierung</a> ist für Konten mit AD/LDAP oder E-Mail-Login verfügbar. Wenn andere Loginmethoden verwendet werden, sollte MFA beim Authentifikationsprovider eingerichtet werden.",
   "admin.mfa.cluster": "Hoch",
   "admin.mfa.title": "Multi-Faktor-Authentifizierung",
   "admin.nav.help": "Hilfe",
@@ -689,7 +689,7 @@
   "admin.service.developerDesc": "Wenn wahr werden Javascript Fehler in einer roten Zeile im oberen Bereich des Interfaces angezeigt. Nicht empfohlen für Produktivumgebungen. ",
   "admin.service.developerTitle": "Aktiviere Entwickler Modus: ",
   "admin.service.enforcMfaTitle": "Multi-Faktor-Authentifizierung erzwingen:",
-  "admin.service.enforceMfaDesc": "Wenn wahr müssen Benutzer <a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>Multi-Faktor-Authentifizierung</a> einrichten. Jeder eingeloggte Benutzer wird zur Multi-Faktor-Authentifizierung-Einrichtungsseite weitergeleitet bis sie erfolgreich MFA zu Ihrem Account hinzugefügt haben.<br/><br/>Es wird empfohlen diese Pflichteinrichtung nicht während der Hauptzeit zu aktivieren. Neue Benutzer werden aufgefordert ihre Multi-Faktor-Authentifizierung während der Registrierung einzurichten. Nach der Einrichtung können Benutzer die Multi-Faktor-Authentifizierung nicht mehr entfernen bis diese Einstellung deaktiviert wurde.<br/><br/>Multi-Faktor-Authentifizierung ist nur für Zugange mit LDAP und E-Mail-Login verfügbar, Mattermost wird Multi-Faktor-Authentifizierung nicht für andere Anmeldemethoden erzwingen. Wenn sich Benutzer in Ihrem System befinden, die andere Anmeldemethoden verwenden, wird empfohlen Multi-Faktor-Authentifizierung direkt bei Ihrem SSO oder SAML Provider einrichten zu lassen.",
+  "admin.service.enforceMfaDesc": "Wenn wahr, wird <a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>Multi-Faktor-Authentifizierung</a> für einen Login vorausgesetzt. Neue Benutzer werden aufgefordert MFA bei Registrierung zu konfigurieren. Angemeldete Benutzer ohne eingerichtetem MFA werden zur MFA Einrichtungsseite weitergeleitet bis die Einrichtung abgeschlossen wurde.<br/><br/>Wenn es im System Benutzer mit einer anderen Anmeldemethode als AD/LDAP oder E-Mail gibt, muss MFA beim Authentifikationsprovider außerhalb von Mattermost erzwungen werden.",
   "admin.service.forward80To443": "Port 80 auf 443 weiterleiten:",
   "admin.service.forward80To443Description": "Leitet alle unsicheren Anfragen von Port 80 auf den sicheren Port 443 um",
   "admin.service.googleDescription": "Diesen Key setzen um den Titel von eingebetteten YouTube Videovorschauen anzeigen zu lassen. Ohne den Schlüssel werden YouTube Vorschauen basierend auf den Hyperlinks in Nachrichten und Kommentaren erstellt, sie werden aber nicht den Video Titel enthalten. Sehen Sie sich das <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a> für eine Anleitung, wie Sie an den Schlüssel kommen, an.",
@@ -706,7 +706,7 @@
   "admin.service.listenAddress": "Empfangs-Adresse:",
   "admin.service.listenDescription": "Die Adresse und Port an die gebunden und gehört wird. Bei Angabe von \":8065\" wird an alle Netzwerkkarten gebunden. Bei Angabe von \"127.0.0.1:8065\" wird nur an die Netzwerkkarte mit der IP Adresse gebunden. Wenn Sie einen Port eines niedrigen Levels wählen (auch \"System Ports\" oder \"Well Known Ports\" im Bereich 0-1023), müssen Sie Berechtigungen für das Binden an den Port haben. Auf Linux können Sie \"sudo setcap cap_net_bind_service=+ep ./bin/platform\" verwenden um Mattermost das Binden an Well Known Ports zu erlauben.",
   "admin.service.listenExample": "z.B.: \":8065\"",
-  "admin.service.mfaDesc": "Wenn wahr erhalten Nutzer die Möglichkeit Multi-Faktor-Authentifizierung zu ihren Zugängen hinzuzufügen. Sie benötigen ein Smartphone und eine Authenticator App wie beispielsweise den Google Authenticator.",
+  "admin.service.mfaDesc": "Wenn wahr können Benutzer mit AD/LDAP oder E-Mail Anmeldung Multi-Faktor-Authentifikation ihrem Konti mit Google Authenticator hinzufügen.",
   "admin.service.mfaTitle": "Multi-Faktor Authentifizierung einschalten:",
   "admin.service.mobileSessionDays": "Sessiondauer für mobile Anwendungen (Tage):",
   "admin.service.mobileSessionDaysDesc": "Die Anzahl der Tage seit der letzten Anmeldung des Benutzers bis zum Ablauf der Sitzung. Bei Änderung dieser Einstellung tritt die neue Sitzungsdauer in Kraft nachdem der Benutzer sich das nächste Mal anmeldet.",
@@ -768,7 +768,7 @@
   "admin.sidebar.logging": "Protokollierung",
   "admin.sidebar.login": "Anmelden",
   "admin.sidebar.logs": "Protokolle",
-  "admin.sidebar.metrics": "Performance Monitoring (Beta)",
+  "admin.sidebar.metrics": "Performance Überwachung",
   "admin.sidebar.nativeAppLinks": "Mattermost App Links",
   "admin.sidebar.notifications": "Benachrichtigungen",
   "admin.sidebar.oauth": "OAuth 2.0",
@@ -1048,11 +1048,11 @@
   "calling_screen": "Rufe an",
   "center_panel.recent": "Klicken Sie hier um zu vorherigen Mittelungen zurückzukehren. ",
   "change_url.close": "Schließen",
-  "change_url.endWithLetter": "Muss mit einem Buchstaben oder einer Nummer enden",
+  "change_url.endWithLetter": "Die URL muss mit einem Buchstaben oder einer Nummer enden.",
   "change_url.invalidUrl": "Ungültige URL",
-  "change_url.longer": "Muss länger als zwei Zeichen sein",
-  "change_url.noUnderscore": "Darf keine zwei aufeinander folgende Unterstriche enthalten.",
-  "change_url.startWithLetter": "Muss mit einem Buchstaben oder einer Nummer beginnen",
+  "change_url.longer": "Die URL muss aus zwei oder mehr Zeichen bestehen.",
+  "change_url.noUnderscore": "Die URL darf keine zwei aufeinander folgende Unterstriche enthalten.",
+  "change_url.startWithLetter": "Die URL muss mit einem Buchstaben oder einer Nummer beginnen.",
   "channelHeader.addToFavorites": "Zu Favoriten hinzufügen",
   "channelHeader.removeFromFavorites": "Aus Favoriten entfernen",
   "channel_flow.alreadyExist": "Ein Kanal mit der URL existiert bereits",
@@ -1132,7 +1132,7 @@
   "channel_modal.publicChannel2": "Erstelle einen neuen öffentlichen Kanal dem jeder beitreten kann. ",
   "channel_modal.purpose": "Zweck",
   "channel_modal.purposeEx": "z.B.: \"Ein Kanal um Fehler und Verbesserungsvorschläge abzulegen\"",
-  "channel_notification.push": "Send mobile push notifications",
+  "channel_notification.push": "Mobile Push-Nachrichten versenden",
   "channel_notifications.allActivity": "Für alle Aktivitäten",
   "channel_notifications.allUnread": "Für alle ungelesenen Nachrichten",
   "channel_notifications.globalDefault": "Globaler Standard ({notifyLevel})",
@@ -1140,7 +1140,7 @@
   "channel_notifications.never": "Nie",
   "channel_notifications.onlyMentions": "Nur für Erwähnungen",
   "channel_notifications.override": "Auswählen eines anderen Wertes als \"Standard\" wird die globalen Benachrichtigungseinstellungen außer Kraft setzen. Desktop Benachrichtigungen sind für Firefox, Safari und Chrome verfügbar.",
-  "channel_notifications.overridePush": "Selecting an option other than \"Global default\" will override the global notification settings for mobile push notifications in account settings. Push notifications must be enabled by the System Admin.",
+  "channel_notifications.overridePush": "Auswählen einer anderen Einstellung als \"Globaler Standard\" wird die globalen Benachrichtigungen für mobile Pushbenachrichtigungen in den Benutzereinstellungen überschreiben. Pushbenachrichtigungen müssen durch den Systemadministrator aktiviert werden.",
   "channel_notifications.preferences": "Benachrichtigungseinstellungen für ",
   "channel_notifications.sendDesktop": "Desktop Benachrichtigungen senden",
   "channel_notifications.unreadInfo": "Der Kanalname wird fettgedruckt dargestellt wenn es ungelesene Nachrichten gibt. Auswählen von \"Nur für Erwähnungen\" wird die Fettschreibung der Kanäle nur durchführen wenn Sie erwähnt werden.",
@@ -1381,7 +1381,7 @@
   "help.composing.deleting": "## Eine Nachricht löschen\nSie können eine Nachricht durch einen Klick auf das **[...]** Symbol neben jeder Ihrer Mitteilungen und anschließendem Klick auf **Löschen** entfernen. System- und Teamadministratoren können jede Nachricht Ihres Systems oder Teams löschen.",
   "help.composing.editing": "## Eine Nachricht bearbeiten\nSie können eine Nachricht durch einen Klick auf das **[...]** Symbol neben jeder Ihrer Mitteilungen und anschließendem Klick auf **Bearbeiten** editieren, drücken Sie **Enter** um die Änderungen zu speichern. Bearbeitete Nachrichten lösen keine neuen @Erwähnungen, Desktop Benachrichtigungen oder Töne aus.",
   "help.composing.linking": "## Eine Nachricht verlinken\nDie **dauerhafter Link**-Funktion erstellt einen Link für jede Nachricht. Den Link mit anderen Kanalmitgliedern zu teilen ermöglicht ihnen, die verknüpfte Nachricht im Archiv zu betrachten. Benutzer, die nicht Mitglied des originären Kanals sind, können den Link nicht betrachten. Um den dauerhaften Link zu einer Nachricht zu erhalten klicken Sie auf das **[...]** Symbol neben einer Nachricht  > **Dauerhafter Link** > **Link kopieren**.",
-  "help.composing.posting": "## Eine Nachricht senden\nSchreiben Sie eine Nachricht indem Sie diese in das Eingabefeld eingeben und anschließend **Enter**  drücken, um sie zu senden. Verwenden Sie **Shift + Enter** um einen Zeilenumbruch zu erzeugen, ohne die Nachricht zu versenden. Um Nachrichten durch **Strg + Enter** zu senden, wechseln Sie zu **Hauptmenü > Kontoeinstellungen > Erweitert > Sende Nachrichten mit Strg + Enter**.",
+  "help.composing.posting": "## Eine Nachricht senden\nSchreiben Sie eine Nachricht indem Sie diese in das Eingabefeld eingeben und anschließend **Enter** drücken, um sie zu senden. Verwenden Sie **Shift + Enter** um einen Zeilenumbruch zu erzeugen, ohne die Nachricht zu versenden. Um Nachrichten durch **Strg + Enter** zu senden, wechseln Sie zu **Hauptmenü > Kontoeinstellungen > Erweitert > Sende Nachrichten mit Strg + Enter**.",
   "help.composing.posts": "#### Nachrichten\nNachrichten können als übergeordnete Mitteilungen verstanden werden. Sie sind häufig die Nachrichten die den Start für Antworten sind. Nachrichten werden über das Eingabefeld am Ende des mittleren Feldes erzeugt und versendet.",
   "help.composing.replies": "#### Antworten\nAntworten Sie auf eine Nachricht, indem Sie auf das Antworten-Symbol neben einer Nachricht klicken. Diese Aktion öffnet die rechte Seitenleiste, in der Sie den Nachrichtenverlauf sehen und Ihre Antwort schreiben und versenden können. Antworten werden etwas eingerückt im mittleren Feld dargestellt, um zu signalisieren, dass es sich um eine Antwort einer übergeordneten Nachricht handelt.\n\nWenn Sie eine Antwort in der rechten Seitenleiste erstellen, klicken Sie auf das erweitern/verkleinern-Symbol mit den zwei Pfeilen in der oberen Ecke der Seitenleiste, um leichter lesen zu können.",
   "help.composing.title": "# Senden von Nachrichten\n_____",
@@ -1445,9 +1445,10 @@
   "help.messaging.notify": "**Teammitglieder benachrichtigen** sobald benötigt durch die Eingabe von `@Benutzername`.",
   "help.messaging.reply": "**Auf Mitteilungen Antworten** durch klicke auf den Antworten Pfeil neben dem Nachrichtentext.",
   "help.messaging.title": "# Grundlagen zu Nachrichten\n_____",
-  "help.messaging.write": "**Schreiben Sie Nachrichten** indem Sie das Eingabefeld am unteren Ende von Mattermost verwenden. Drücken Sie **Enter* um sie zu verwenden. Verwenden Sie **Shift+Enter** um einen Zeilenumbruch einzufügen ohne die Nachricht zu senden.",
+  "help.messaging.write": "**Schreiben Sie Nachrichten** indem Sie das Eingabefeld am unteren Ende von Mattermost verwenden. Drücken Sie **Enter* um sie zu versenden. Verwenden Sie **Shift+Enter** um einen Zeilenumbruch einzufügen ohne die Nachricht zu senden.",
   "installed_command.header": "Slash-Befehle",
   "installed_commands.add": "Slash-Befehl hinzufügen",
+  "installed_commands.delete.confirm": "This action permanently deletes the slash command and breaks any integrations using it. Are you sure you want to delete it?",
   "installed_commands.empty": "Keine Befehle gefunden",
   "installed_commands.header": "Slash-Befehle",
   "installed_commands.help": "Erstelle Slash-Befehle zur Verwendung in externen Integrationen. Bitte {link} für mehr Informationen ansehen.",
@@ -1455,6 +1456,7 @@
   "installed_commands.search": "Suche nach Slash-Befehlen",
   "installed_commands.unnamed_command": "Unbenannter Slash-Befehl",
   "installed_incoming_webhooks.add": "Eingehenden Webhook hinzufügen",
+  "installed_incoming_webhooks.delete.confirm": "This action permanently deletes the incoming webhook and breaks any integrations using it. Are you sure you want to delete it?",
   "installed_incoming_webhooks.empty": "Keine eingehende Webhooks gefunden",
   "installed_incoming_webhooks.header": "Eingehende Webhooks",
   "installed_incoming_webhooks.help": "Erstelle eingehende Webhook URLs zur Verwendung in externen Integrationen. Bitte {link} für mehr Informationen ansehen.",
@@ -1480,6 +1482,7 @@
   "installed_oauth_apps.add": "OAuth 2.0 Applikation hinzufügen",
   "installed_oauth_apps.callbackUrls": "Callback URLs (eine pro Zeile)",
   "installed_oauth_apps.cancel": "Abbrechen",
+  "installed_oauth_apps.delete.confirm": "This action permanently deletes the OAuth 2.0 application and breaks any integrations using it. Are you sure you want to delete it?",
   "installed_oauth_apps.description": "Beschreibung",
   "installed_oauth_apps.empty": "Keine OAuth 2.0 Applikationen gefunden",
   "installed_oauth_apps.header": "OAuth 2.0 Applikationen",
@@ -1495,6 +1498,7 @@
   "installed_oauth_apps.trusted.no": "Nein",
   "installed_oauth_apps.trusted.yes": "Ja",
   "installed_outgoing_webhooks.add": "Ausgehenden Webhook hinzufügen",
+  "installed_outgoing_webhooks.delete.confirm": "This action permanently deletes the outgoing webhook and breaks any integrations using it. Are you sure you want to delete it?",
   "installed_outgoing_webhooks.empty": "Keine ausgehenden Webhooks gefunden",
   "installed_outgoing_webhooks.header": "Ausgehende Webhooks",
   "installed_outgoing_webhooks.help": "Erstelle ausgehende Webhook URLs zur Verwendung in externen Integrationen. Bitte {link} für mehr Informationen ansehen.",
@@ -1504,6 +1508,8 @@
   "integrations.add": "Hinzufügen",
   "integrations.command.description": "Slash-Befehle senden Events an externe Integrationen",
   "integrations.command.title": "Slash-Befehle",
+  "integrations.delete.confirm.button": "Entfernen",
+  "integrations.delete.confirm.title": "Integration entfernen",
   "integrations.done": "Erledigt",
   "integrations.edit": "Bearbeiten",
   "integrations.header": "Integration",
@@ -1633,10 +1639,17 @@
   "more_channels.title": "Weitere Kanäle",
   "more_direct_channels.close": "Schließen",
   "more_direct_channels.message": "Nachricht",
+  "more_direct_channels.new_convo_note": "This will start a new conversation. If you’re adding a lot of people, consider creating a private group instead.",
+  "more_direct_channels.new_convo_note.full": "You’ve reached the maximum number of people for this conversation. Consider creating a private group instead.",
   "more_direct_channels.title": "Direktnachricht",
   "msg_typing.areTyping": "{users} und {last} tippen gerade...",
   "msg_typing.isTyping": "{user} tippt...",
   "msg_typing.someone": "Jemand",
+  "multiselect.go": "Go",
+  "multiselect.instructions": "Use up/down arrows to navigate and enter to select",
+  "multiselect.numPeopleRemaining": "You can add {num, number} more {num, plural, =0 {people} one {person} other {people}}. ",
+  "multiselect.numRemaining": "You can add {num, number} more",
+  "multiselect.placeholder": "Search and add members",
   "navbar.addMembers": "Mitglieder hinzufügen",
   "navbar.click": "Klicken Sie hier",
   "navbar.delete": "Kanal löschen...",
@@ -1730,7 +1743,7 @@
   "rename_channel.defaultError": " - Kann nicht für den Vorgabe-Kanal geändert werden",
   "rename_channel.displayName": "Angezeigter Name",
   "rename_channel.displayNameHolder": "Anzeigenamen eingeben",
-  "rename_channel.handleHolder": "nur Kleinbuchstaben und Ziffern",
+  "rename_channel.handleHolder": "Dürfen nur Kleinbuchstaben oder Ziffern sein",
   "rename_channel.lowercase": "Dürfen nur Kleinbuchstaben oder Ziffern sein",
   "rename_channel.maxLength": "Dieses Feld darf nur bis zu 22 Zeichen enthalten",
   "rename_channel.required": "Dieses Feld wird erforderlich",
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 53f7a7f3e..de5beaf67 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1490,8 +1490,8 @@
   "installed_oauth_apps.add": "Add OAuth 2.0 Application",
   "installed_oauth_apps.callbackUrls": "Callback URLs (One Per Line)",
   "installed_oauth_apps.cancel": "Cancel",
-  "installed_oauth_apps.description": "Description",
   "installed_oauth_apps.delete.confirm": "This action permanently deletes the OAuth 2.0 application and breaks any integrations using it. Are you sure you want to delete it?",
+  "installed_oauth_apps.description": "Description",
   "installed_oauth_apps.empty": "No OAuth 2.0 Applications found",
   "installed_oauth_apps.header": "OAuth 2.0 Applications",
   "installed_oauth_apps.help": "Create OAuth 2.0 applications to securely integrate bots and third-party applications with Mattermost. Please see {link} to learn more.",
@@ -1646,13 +1646,18 @@
   "more_channels.prev": "Previous",
   "more_channels.title": "More Channels",
   "more_direct_channels.close": "Close",
+  "more_direct_channels.message": "Message",
   "more_direct_channels.new_convo_note": "This will start a new conversation. If you’re adding a lot of people, consider creating a private group instead.",
   "more_direct_channels.new_convo_note.full": "You’ve reached the maximum number of people for this conversation. Consider creating a private group instead.",
-  "more_direct_channels.message": "Message",
   "more_direct_channels.title": "Direct Messages",
   "msg_typing.areTyping": "{users} and {last} are typing...",
   "msg_typing.isTyping": "{user} is typing...",
   "msg_typing.someone": "Someone",
+  "multiselect.go": "Go",
+  "multiselect.instructions": "Use up/down arrows to navigate and enter to select",
+  "multiselect.numPeopleRemaining": "You can add {num, number} more {num, plural, =0 {people} one {person} other {people}}. ",
+  "multiselect.numRemaining": "You can add {num, number} more",
+  "multiselect.placeholder": "Search and add members",
   "navbar.addMembers": "Add Members",
   "navbar.click": "Click here",
   "navbar.delete": "Delete Channel...",
diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json
index 7a3b36585..643ee0f03 100644
--- a/webapp/i18n/es.json
+++ b/webapp/i18n/es.json
@@ -138,7 +138,7 @@
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "La primera palabra coincide exactamente con una palabra que desencadena la acción",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "La primera palabra empieza con una palabra que desencadena la acción",
   "admin.advance.cluster": "Alta Disponibilidad (Beta)",
-  "admin.advance.metrics": "Monitoreo de Desempeño (Beta)",
+  "admin.advance.metrics": "Monitoreo de Desempeño",
   "admin.audits.reload": "Recargar",
   "admin.audits.title": "Auditorías del Servidor",
   "admin.authentication.email": "Correo Electrónico",
@@ -529,7 +529,7 @@
   "admin.metrics.listenAddressDesc": "La dirección del servidor que escuchará para mostrar las métricas de rendimiento.",
   "admin.metrics.listenAddressEx": "Ej: \":8067\"",
   "admin.metrics.listenAddressTitle": "Dirección de escucha:",
-  "admin.mfa.bannerDesc": "La autenticación de múltiples factores sólo está disponible para los métodos de inicio de sesión con cuentas LDAP y de correo electrónico. Si hay usuarios en su sistema con otros métodos de inicio de sesión, se recomienda configurar la autenticación de múltiples factores directamente con el SSO o proveedor SAML.",
+  "admin.mfa.bannerDesc": "<a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>Autenticación de Múltiples factores</a> está disponible para cuentas con inicio de sesión AD/LDAP o correo electrónico. Si se utilizan otros métodos de inicio de sesión, MFA debe ser configurado en el proveedor de autenticación.",
   "admin.mfa.cluster": "Alta",
   "admin.mfa.title": "Autenticación de Múltiples factores:",
   "admin.nav.help": "Ayuda",
@@ -689,7 +689,7 @@
   "admin.service.developerDesc": "Cuando es verdadero, los errores de JavaScript se muestran en una barra roja en la parte superior de la interfaz de usuario. No se recomienda su uso en producción. ",
   "admin.service.developerTitle": "Habilitar modo de Desarrollador: ",
   "admin.service.enforcMfaTitle": "Imponer la Autenticación de Múltiples factores:",
-  "admin.service.enforceMfaDesc": "Cuando es verdadero, los usuarios del sistema tendrán que configurar la <a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>autenticación de múltiples factores</a>. Cualquier usuario que tenga su sesión iniciada será dirigido a la página de configuración de la autenticación de múltiples factores hasta que ésta sea agregada exitosamente a la cuenta.<br/><br/>Se recomienda encender está opción durante las horas de bajo tráfico, cuando las personas son menos propensas a utilizar el sistema. Los nuevos usuarios tendrán que configurar la autenticación de múltiples factores la primera que inicien sesión. Después de configurar está opción, los usuarios no serán capaces de eliminar la autenticación de múltiples factores, a menos que se desactiva la imposición.<br/><br/>Por favor, tenga en cuenta que la autenticación de múltiples factores sólo está disponible para cuentas con los métodos de inicio de sesión LDAP y correo electrónico. Mattermost no impondrá la autenticación de múltiples factores para otros métodos de inicio de sesión. Si hay usuarios en el sistema utilizando otros métodos de inicio de sesión, se recomienda configurar y aplicar la autenticación de múltiples factores directamente con el SSO o  proveedor SAML.",
+  "admin.service.enforceMfaDesc": "Cuando es verdadero, <a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>la autenticación de múltiples factores</a> es requerida para iniciar sesión. Nuevos usuarios tendrán que configurar MFA cuando se registran. Los usuarios con sesiones iniciadas sin MFA configurado serán enviados a la página de configuración de MFA hasta que la configuración haya sido completada.<br/><br/>Si su sistema tiene usuarios con sesiones iniciadas cuyo métodos son diferentes a AD/LDAP o correo electrónico, La imposición de MFA debe realizarse en el proveedor de autenticación fuera de Mattermost.",
   "admin.service.forward80To443": "Redirigir el puerto 80 a 443:",
   "admin.service.forward80To443Description": "Redirige todo el trafico inseguro del puerto 80 al puerto seguro 443",
   "admin.service.googleDescription": "Establece esta clave para mostrar los títulos de los vídeos de YouTube incorporado en las previsualizaciones. Sin la clave, las previsualizaciones de YouTube igual serán creadas en base a los enlaces que aparecen en los mensajes o comentarios, pero no se mostrará el título de vídeo. Ve el <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target='_blank'>Tutorial para Desarrolladores de Google</a> para ver las instrucciones sobre cómo obtener una clave.",
@@ -706,7 +706,7 @@
   "admin.service.listenAddress": "Dirección de escucha:",
   "admin.service.listenDescription": "La dirección y el puerto al que se debe enlazar y escuchar. Si se especifica \":8065\" se enlaza a todas las interfaces de red. Al especificar \"127.0.0.1:8065\" sólo se enlaza a la interfaz de red que tiene esa dirección IP. Si eliges un puerto de un nivel inferior (llamado \"puertos de sistema\" o \"puertos conocidos\", en el rango de 0-1023), debes tener permisos para enlazar a ese puerto. En Linux puedes usar: \"sudo setcap cap_net_bind_service=+ep ./bin/platform\" para permitir que Mattermost sea enlazado a los puertos conocidos.",
   "admin.service.listenExample": "Ej.: \":8065\"",
-  "admin.service.mfaDesc": "Cuando es verdadero, los usuarios tendrán la opción de agregar autenticación de múltiples factores a sus cuentas. Necesitarán un teléfono inteligente y una app de autenticación como Google Authenticator.",
+  "admin.service.mfaDesc": "Cuando es verdadero, los usuarios con inicio de sesión AD/LDAP o correo electrónico podrán agregar la autenticación de múltiples factores a su cuenta utilizando Google Authenticator.",
   "admin.service.mfaTitle": "Habilitar Autenticación de Múltiples Factores:",
   "admin.service.mobileSessionDays": "Duración de la sesión para móviles (días):",
   "admin.service.mobileSessionDaysDesc": "El número de días desde la última vez que un usuario ingreso sus credenciales para que la sesión del usuario expire. Luego de cambiar esta configuración, la nueva duración de la sesión tendrá efecto luego de la próxima vez que el usuario ingrese sus credenciales.",
@@ -768,7 +768,7 @@
   "admin.sidebar.logging": "Registros",
   "admin.sidebar.login": "Inicio de Sesión",
   "admin.sidebar.logs": "Registros",
-  "admin.sidebar.metrics": "Monitoreo de Desempeño (Beta)",
+  "admin.sidebar.metrics": "Monitoreo de Desempeño",
   "admin.sidebar.nativeAppLinks": "Enlaces de Mattermost App",
   "admin.sidebar.notifications": "Notificaciones",
   "admin.sidebar.oauth": "OAuth 2.0",
@@ -1048,11 +1048,11 @@
   "calling_screen": "Llamando",
   "center_panel.recent": "Clic aquí para ir a los mensajes más recientes. ",
   "change_url.close": "Cerrar",
-  "change_url.endWithLetter": "Debe terminar con una letra o número",
+  "change_url.endWithLetter": "URL debe terminar con una letra o número",
   "change_url.invalidUrl": "URL Inválida",
-  "change_url.longer": "Debe ser mayor a 2 caracteres",
-  "change_url.noUnderscore": "No puede tener dos guíones bajos seguidos",
-  "change_url.startWithLetter": "Debe comenzar con una letra o número",
+  "change_url.longer": "URL debe ser de dos o más caracteres.",
+  "change_url.noUnderscore": "URL no puede tener dos guíones bajos seguidos",
+  "change_url.startWithLetter": "URL debe comenzar con una letra o número",
   "channelHeader.addToFavorites": "Agregar a favoritos",
   "channelHeader.removeFromFavorites": "Quitar de favoritos",
   "channel_flow.alreadyExist": "Un canal con este identificador ya existe",
@@ -1132,7 +1132,7 @@
   "channel_modal.publicChannel2": "Crear un canal público al que cualquiera puede unirse. ",
   "channel_modal.purpose": "Propósito",
   "channel_modal.purposeEx": "Ej: \"Un canal para describir errores y mejoras\"",
-  "channel_notification.push": "Send mobile push notifications",
+  "channel_notification.push": "Enviar notificaciones push móviles",
   "channel_notifications.allActivity": "Para toda actividad",
   "channel_notifications.allUnread": "Para todos los mensajes sin leer",
   "channel_notifications.globalDefault": "Predeterminada ({notifyLevel})",
@@ -1140,7 +1140,7 @@
   "channel_notifications.never": "Nunca",
   "channel_notifications.onlyMentions": "Sólo para menciones",
   "channel_notifications.override": "Seleccionar una opción diferente a \"Predeterminada\" anulará las configuraciones globales de notificación. Las notificaciones de Escritorio están disponibles para Firefox, Safari, y Chrome.",
-  "channel_notifications.overridePush": "Selecting an option other than \"Global default\" will override the global notification settings for mobile push notifications in account settings. Push notifications must be enabled by the System Admin.",
+  "channel_notifications.overridePush": "Seleccionando una opción diferente a \"Predeterminada\" sustituirá la configuración globar para las notitificaciones push a móviles fijados en la configuración de la cuenta.",
   "channel_notifications.preferences": "Preferencias de Notificación para ",
   "channel_notifications.sendDesktop": "Enviar notificaciones de escritorio",
   "channel_notifications.unreadInfo": "El nombre del canal está en negritas en la barra lateral cuando hay mensajes sin leer. Al elegir \"Sólo para menciones\" sólo lo dejará en negritas cuando seas mencionado.",
@@ -1381,7 +1381,7 @@
   "help.composing.deleting": "## Eliminar un mensaje\nElimina un mensaje haciendo clic en el icono **[...]** junto a cualquier mensaje de texto que has compuesto, a continuación, haz clic en **Borrar**. Los Administradores de Sistema y Equipo pueden borrar cualquier mensaje en su sistema o equipo.",
   "help.composing.editing": "## Editar un Mensaje\nEdita un mensaje haciendo clic en el icono **[...]** junto a cualquier mensaje de texto que has compuesto, a continuación, haz clic en **Editar**. Después de realizar modificaciones en el texto del mensaje, pulse la tecla **RETORNO** para guardar las modificaciones. La edición del mensaje no desencadenan nuevas notificaciones a @menciones, notificaciones de escritorio o sonidos.",
   "help.composing.linking": "## Enlace a un mensaje\nLa característica de **Enlace Permanente** crea un vínculo de cualquier mensaje. Al compartir este enlace con otros usuarios en el canal les permite ver el mensaje vinculado en los Archivos de Mensajes. Los usuarios que no son miembros del canal de donde se envió el mensaje no podrán ver el enlace permanente. Obtén el enlace permanente a cualquier mensaje haciendo clic en el icono **[...]** al lado del mensaje de texto  > **Enlace Permanente** > **Copiar Enlace**.",
-  "help.composing.posting": "## Publicar un Mensaje\nPublica un mensaje escribiendo en el campo de texto, a continuación, pulsa **RETORNO** para enviar. Usa **Mayus + RETORNO** para crear una nueva línea sin necesidad de enviar el mensaje. Para enviar mensajes pulsando **Ctrl+RETORNO** ve al **Menú Principal > Configuración de la Cuenta > Enviar mensajes en Ctrl + RETORNO**.",
+  "help.composing.posting": "## Publicar un Mensaje\nPublica un mensaje escribiendo en el campo de texto, a continuación, pulsa **RETORNO** para enviarlo. Usa **MAYUS+RETORNO** para crear una nueva línea sin necesidad de enviar el mensaje. Para enviar mensajes pulsando CTRL+RETORNO ve al **Menú Principal > Configuración de la Cuenta > Enviar mensajes en CTRL+RETORNO**.",
   "help.composing.posts": "#### Mensajes\nLos mensajes pueden ser considerados mensajes padre. Son los mensajes que a menudo comienzan con un hilo de respuestas. Los mensajes son compuestos y enviados desde el campo de texto en la parte inferior del panel central.",
   "help.composing.replies": "#### Respuestas\nResponde a un mensaje haciendo clic en el icono responder junto a cualquier mensaje de texto. Esta acción abre la barra lateral derecha, donde se puede ver el hilo de mensajes, a continuación, redacta y envía tu respuesta. Las respuestas tienen una ligera sangría en el centro del panel para indicar que ellos son hijos de los mensajes de los padres.\n\nA la hora de componer una respuesta en la barra lateral derecha, haz clic en el icono de expandir/contraer el cual es dos flechas en la parte superior de la barra lateral para que sea más fácil de leer.",
   "help.composing.title": "# Enviar Mensajes\n_____",
@@ -1445,9 +1445,10 @@
   "help.messaging.notify": "**Notificar a los compañeros de equipo** cuando es necesario escribiendo `@usuario`.",
   "help.messaging.reply": "**Responde a los mensajes** haciendo clic en la flecha que aparece junto al mensaje de texto.",
   "help.messaging.title": "# Mensajería Básica\n_____",
-  "help.messaging.write": "**Escribe mensajes** usando la caja de entrada de texto en la parte inferior de Mattermost. Pulse **RETORNO** para enviar un mensaje. Usa **Mayus+RETORNO** para crear una nueva línea sin enviar el mensaje.",
+  "help.messaging.write": "**Escribe mensajes** usando la caja de entrada de texto en la parte inferior de Mattermost. Presiona RETORNO para enviar un mensaje. Usa MAYUS+RETORNO para crear una nueva línea sin enviar el mensaje.",
   "installed_command.header": "Comandos de Barra",
   "installed_commands.add": "Agregar Comandos de Barra",
+  "installed_commands.delete.confirm": "Esta acción elimina permanentemente el comando de barras y rompe cualquier integración que lo esté utilizando. ¿Estás seguro de que deseas eliminarlo?",
   "installed_commands.empty": "No se encontraron comandos",
   "installed_commands.header": "Comandos de Barra",
   "installed_commands.help": "Crea comandos de barra para su uso en integraciones externas. Por favor, consulta la {link} para obtener más información.",
@@ -1455,6 +1456,7 @@
   "installed_commands.search": "Buscar Comandos de Barra",
   "installed_commands.unnamed_command": "Comando de Barra sin nombre",
   "installed_incoming_webhooks.add": "Agregar Webhook de Entrada",
+  "installed_incoming_webhooks.delete.confirm": "Esta acción elimina permanentemente el webhook entrante y rompe cualquier integración que lo esté utilizando. ¿Estás seguro de que deseas eliminarlo?",
   "installed_incoming_webhooks.empty": "No se encontraron webhooks de entrada",
   "installed_incoming_webhooks.header": "Webhooks de Entrada",
   "installed_incoming_webhooks.help": "Crea webhooks de entrada para su uso en integraciones externas. Por favor, consulta la {link} para obtener más información.",
@@ -1480,6 +1482,7 @@
   "installed_oauth_apps.add": "Agregar Aplicación OAuth 2.0",
   "installed_oauth_apps.callbackUrls": "Callback URLs (Uno por Línea)",
   "installed_oauth_apps.cancel": "Cancelar",
+  "installed_oauth_apps.delete.confirm": "Esta acción elimina permanentemente la aplicación de OAuth 2.0 y rompe cualquier integración que lo esté utilizando. ¿Estás seguro de que deseas eliminarla?",
   "installed_oauth_apps.description": "Descripción",
   "installed_oauth_apps.empty": "No se encontraron Aplicaciones OAuth 2.0",
   "installed_oauth_apps.header": "Apliaciones OAuth 2.0",
@@ -1495,6 +1498,7 @@
   "installed_oauth_apps.trusted.no": "No",
   "installed_oauth_apps.trusted.yes": "Sí",
   "installed_outgoing_webhooks.add": "Agregar Webhook de Salida",
+  "installed_outgoing_webhooks.delete.confirm": "Esta acción elimina permanentemente el webhook saliente y rompe cualquier integración que lo esté utilizando. ¿Estás seguro de que deseas eliminarlo?",
   "installed_outgoing_webhooks.empty": "No se encontraron webhooks de salida",
   "installed_outgoing_webhooks.header": "Webhooks de Salida",
   "installed_outgoing_webhooks.help": "Crea webhooks de salida para su uso en integraciones externas. Por favor, consulta la {link} para obtener más información.",
@@ -1504,6 +1508,8 @@
   "integrations.add": "Agregar",
   "integrations.command.description": "Comandos de barra envían eventos a integraciones externar",
   "integrations.command.title": "Comando de Barra",
+  "integrations.delete.confirm.button": "Eliminar",
+  "integrations.delete.confirm.title": "Eliminar Integración",
   "integrations.done": "Hecho",
   "integrations.edit": "Editar",
   "integrations.header": "Integraciones",
@@ -1633,10 +1639,17 @@
   "more_channels.title": "Más Canales",
   "more_direct_channels.close": "Cerrar",
   "more_direct_channels.message": "Mensaje",
+  "more_direct_channels.new_convo_note": "Se iniciará una nueva conversación. Si estás agregando a mucha gente, considera crear un grupo privado en su lugar.",
+  "more_direct_channels.new_convo_note.full": "Haz alcanzado el número máximo de personas para esta conversación. Considera crear un grupo privado en su lugar.",
   "more_direct_channels.title": "Mensajes Directos",
   "msg_typing.areTyping": "{users} y {last} están escribiendo...",
   "msg_typing.isTyping": "{user} está escribiendo...",
   "msg_typing.someone": "Alguien",
+  "multiselect.go": "Ir",
+  "multiselect.instructions": "Utilice las flechas arriba/abajo para navegar y retorno para seleccionar",
+  "multiselect.numPeopleRemaining": "Puedes agregar {num, number} más {num, plural, =0 {personas} {persona} other {personas}}. ",
+  "multiselect.numRemaining": "Puedes agregar {num, number} más",
+  "multiselect.placeholder": "Buscar y agregar miembros",
   "navbar.addMembers": "Agregar Miembros",
   "navbar.click": "Clic aquí",
   "navbar.delete": "Borrar Canal...",
@@ -1730,7 +1743,7 @@
   "rename_channel.defaultError": " - No se puede cambiar el del canal predeterminado",
   "rename_channel.displayName": "Nombre a Mostrar",
   "rename_channel.displayNameHolder": "Ingresa el nombre a mostrar",
-  "rename_channel.handleHolder": "Sólo caracteres alfanumericos y en minúscula",
+  "rename_channel.handleHolder": "Debe tener caracteres alfanuméricos y en minúscula",
   "rename_channel.lowercase": "Debe tener caracteres alfanumericos y minúscula",
   "rename_channel.maxLength": "Este campo debe tener menos de 22 caracteres",
   "rename_channel.required": "Este campo es obligatorio",
@@ -1956,8 +1969,8 @@
   "user.settings.advance.on": "Encendido",
   "user.settings.advance.preReleaseDesc": "Marca las características de pre-lanzamiento que quieras previsualizar.  Es posible que necesites refrescar la página antes de que los cambios se vean reflejados.",
   "user.settings.advance.preReleaseTitle": "Previsualizar características de pre-lanzamiento",
-  "user.settings.advance.sendDesc": "Si está habilitado 'RETORNO' inserta una nueva linea y 'Ctrl + RETORNO' envía el mensaje.",
-  "user.settings.advance.sendTitle": "Enviar mensajes con Ctrl + RETORNO",
+  "user.settings.advance.sendDesc": "Si está habilitado RETORNO inserta una nueva linea y CTRL+RETORNO envía el mensaje.",
+  "user.settings.advance.sendTitle": "Enviar mensajes con CTRL+RETORNO",
   "user.settings.advance.slashCmd_autocmp": "Habilitar que una aplicación externa ofrezca el autocompletado de los comandos de barra",
   "user.settings.advance.title": "Configuración Avanzada",
   "user.settings.advance.webrtc_preview": "Habilitar la capacidad para hacer y recibir llamadas WebRTC uno-a-uno",
diff --git a/webapp/i18n/fr.json b/webapp/i18n/fr.json
index 23bfd5c24..a2a5bf4e7 100644
--- a/webapp/i18n/fr.json
+++ b/webapp/i18n/fr.json
@@ -529,7 +529,7 @@
   "admin.metrics.listenAddressDesc": "L'adresse d'écoute du serveur pour publier les mesures de performances.",
   "admin.metrics.listenAddressEx": "Ex. : \":8065\"",
   "admin.metrics.listenAddressTitle": "Adresse IP du serveur :",
-  "admin.mfa.bannerDesc": "L'authentification multi-facteurs n'est disponible que pour les comptes avec authentification LDAP ou email. Si vous avez des utilisateurs avec d'autres méthodes d'authentification, il est recommandé de paramétrer l'authentification multi-facteurs directement avec le fournisseur SSO ou SAML.",
+  "admin.mfa.bannerDesc": "<a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>Multi-factor authentication</a> is available for accounts with AD/LDAP or email login. If other login methods are used, MFA should be configured with the authentication provider.",
   "admin.mfa.cluster": "Haute",
   "admin.mfa.title": "Authentification multi-facteurs",
   "admin.nav.help": "Aide",
@@ -689,7 +689,7 @@
   "admin.service.developerDesc": "Si activé, les erreurs Javascript sont affichées dans une barre rouge en haut de l'interface utilisateur. Ceci n'est pas recommandé sur un serveur de production. ",
   "admin.service.developerTitle": "Activer le mode développeur : ",
   "admin.service.enforcMfaTitle": "Imposer l'authentification multi-facteurs :",
-  "admin.service.enforceMfaDesc": "Lorsqu'activé, les utilisateurs du système devront mettre en place l'<a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>authentification multi-facteurs (MFA)</a>. Tous les utilisateurs connectés seront redirigés vers la page de configuration de l'authentification multi-facteurs jusqu'à ce qu'ils aient réussi à ajouter la MFA à leur compte.<br/><br/>Il est recommandé que vous n'activiez ce paramètre pendant les heures creuses, lorsque les utilisateurs sont moins susceptibles d'utiliser le système. Les nouveaux utilisateurs seront tenus de mettre en place d'authentification multi-facteurs lors de leur première inscription. Après avoir l'avoir activée, les utilisateurs ne seront pas en mesure de supprimer d'authentification multi-facteurs, à moins que l'imposition ne soit désactivée.<br/><br/>Veuillez noter que l'authentification multi-facteurs n'est disponible que pour les comptes utilisant LDAP et l'e-mail comme méthodes d'authentification. Mattermost n'appliquera pas d'authentification multi-facteurs pour les autres méthodes d'authentification. Si des utilisateurs de votre système utilisent d'autres méthodes de connexion, il est recommandé de définir et d'appliquer l'authentification multi-facteurs directement avec le fournisseur SSO ou SAML.",
+  "admin.service.enforceMfaDesc": "When true, <a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>multi-factor authentication</a> is required for login. New users will be required to configure MFA on signup. Logged in users without MFA configured are redirected to the MFA setup page until configuration is complete.<br/><br/>If your system has users with login methods other than AD/LDAP and email, MFA must be enforced with the authentication provider outside of Mattermost.",
   "admin.service.forward80To443": "Transférer le port 80 vers le port 443 :",
   "admin.service.forward80To443Description": "Faire suivre le trafic non chiffré du port 80 vers le port sécurisé 443",
   "admin.service.googleDescription": "Définissez cette clé pour activer l'affichage des titres pour les aperçus de vidéos YouTube. Sans la clé, les aperçus YouTube seront créés à partir des liens apparaissant des messages ou commentaires mais ils ne montreront pas le titre de la vidéo. Regardez un <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">tutoriel Google Developers</a> pour des instructions sur comment obtenir une clé.",
@@ -706,7 +706,7 @@
   "admin.service.listenAddress": "Adresse IP du serveur :",
   "admin.service.listenDescription": "L'adresse et le port sur laquelle se lier et écouter. Spécifier \":8065\" se liera sur toutes les interfaces réseau. Spécifier \"127.0.0.1:8065\" se liera uniquement sur l'interface réseau disposant de cette adresse IP. Si vous choisissez un port de bas niveau (également appelés \"ports systèmes\" ou \"ports bien connus\", dans l'intervalle 0-1023), vous devez disposer des permissions pour vous lier sur ces ports. Sous Linux, vous pouvez utiliser : \"sudo setcap cap_net_bind_service=+ep ./bin/platform\" pour autoriser Mattermost à se lier sur ces ports bien connus.",
   "admin.service.listenExample": "Ex. : \":8065\"",
-  "admin.service.mfaDesc": "Si activé, Les utilisateurs auront la possibilité d'ajouter l'authentification multi- facteur à leur compte . Ils auront besoin d'un smartphone et une application d'authentification tels que Google Authenticator .",
+  "admin.service.mfaDesc": "When true, users with AD/LDAP or email login can add multi-factor authentication to their account using Google Authenticator.",
   "admin.service.mfaTitle": "Activité l’authentification multi-facteurs:",
   "admin.service.mobileSessionDays": "Durée de la session sur les applis mobiles (en jours) :",
   "admin.service.mobileSessionDaysDesc": "Le nombre de jours entre la dernière fois qu'un utilisateur a spécifié ses identifiants et l'expiration de la session de l'utilisateur. Après le changement de ce paramètre, la nouvelle durée de session prendra effet la prochaine fois que les utilisateurs saisiront leurs identifiants.",
@@ -1050,7 +1050,7 @@
   "change_url.close": "Fermer",
   "change_url.endWithLetter": "Doit se terminer par une lettre ou un nombre",
   "change_url.invalidUrl": "URL non valide",
-  "change_url.longer": "Doit comporter plus de 2 caractères",
+  "change_url.longer": "URL must be two or more characters.",
   "change_url.noUnderscore": "Ne peux pas contenir deux tirets de suite.",
   "change_url.startWithLetter": "Doit commencer par une lettre ou un nombre",
   "channelHeader.addToFavorites": "Ajouter aux favoris",
@@ -1132,7 +1132,7 @@
   "channel_modal.publicChannel2": "Crée un canal public que tout le monde peut rejoindre. ",
   "channel_modal.purpose": "Description",
   "channel_modal.purposeEx": "E.g.: \"A channel to file bugs and improvements\"",
-  "channel_notification.push": "Send mobile push notifications",
+  "channel_notification.push": "Notifications push mobile",
   "channel_notifications.allActivity": "Pour toute l'activité",
   "channel_notifications.allUnread": "Pour les messages non-lus",
   "channel_notifications.globalDefault": "Par défaut ({notifyLevel})",
@@ -1448,6 +1448,7 @@
   "help.messaging.write": "**Ecrivez des messages** en utilisant la zone de saisie en bas de l'interface de Mattermost. Appuyez sur **ENTREE** pour envoyer un message. Utilisez *Maj+ENTREE** pour effectuer un retour à la ligne sans envoyer le message.",
   "installed_command.header": "Commandes Slash",
   "installed_commands.add": "Ajout de la commande Slash",
+  "installed_commands.delete.confirm": "This action permanently deletes the slash command and breaks any integrations using it. Are you sure you want to delete it?",
   "installed_commands.empty": "Pas de commande trouvée",
   "installed_commands.header": "Commande Slash",
   "installed_commands.help": "Créez des commandes slash pour les intégrations externes. Vous pouvez consulter la documentation {link}.",
@@ -1455,6 +1456,7 @@
   "installed_commands.search": "Rechercher les commandes slash",
   "installed_commands.unnamed_command": "Commande slash sans nom",
   "installed_incoming_webhooks.add": "Ajouter des Webhooks entrants",
+  "installed_incoming_webhooks.delete.confirm": "This action permanently deletes the incoming webhook and breaks any integrations using it. Are you sure you want to delete it?",
   "installed_incoming_webhooks.empty": "Aucun webhooks entrants trouvés",
   "installed_incoming_webhooks.header": "Webhooks entrants",
   "installed_incoming_webhooks.help": "Créer des webhooks entrants pour vos intégrations externes. Vous pouvez consulter la documentation {link}.",
@@ -1480,6 +1482,7 @@
   "installed_oauth_apps.add": "Ajouter une application OAuth 2.0",
   "installed_oauth_apps.callbackUrls": "URLs de callback (une par ligne)",
   "installed_oauth_apps.cancel": "Annuler",
+  "installed_oauth_apps.delete.confirm": "This action permanently deletes the OAuth 2.0 application and breaks any integrations using it. Are you sure you want to delete it?",
   "installed_oauth_apps.description": "Description",
   "installed_oauth_apps.empty": "Pas d'applications OAuth 2.0 trouvées",
   "installed_oauth_apps.header": "Applications OAuth 2.0",
@@ -1495,6 +1498,7 @@
   "installed_oauth_apps.trusted.no": "Non",
   "installed_oauth_apps.trusted.yes": "Oui",
   "installed_outgoing_webhooks.add": "Ajouter des Webhooks sortants",
+  "installed_outgoing_webhooks.delete.confirm": "This action permanently deletes the outgoing webhook and breaks any integrations using it. Are you sure you want to delete it?",
   "installed_outgoing_webhooks.empty": "Aucun webhooks sortants trouvés",
   "installed_outgoing_webhooks.header": "Webhooks sortants",
   "installed_outgoing_webhooks.help": "Créer des webhooks sortants pour vos intégrations externes. Vous pouvez consulter la documentation {link}.",
@@ -1504,6 +1508,8 @@
   "integrations.add": "Ajouter",
   "integrations.command.description": "Les commandes Slash envoient des évènements à des intégrations extérieures",
   "integrations.command.title": "Commande Slash",
+  "integrations.delete.confirm.button": "Supprimer",
+  "integrations.delete.confirm.title": "Delete Integration",
   "integrations.done": "Effectué",
   "integrations.edit": "Modifier",
   "integrations.header": "Intégrations",
@@ -1633,10 +1639,17 @@
   "more_channels.title": "Plus de canaux",
   "more_direct_channels.close": "Fermer",
   "more_direct_channels.message": "Message",
+  "more_direct_channels.new_convo_note": "This will start a new conversation. If you’re adding a lot of people, consider creating a private group instead.",
+  "more_direct_channels.new_convo_note.full": "You’ve reached the maximum number of people for this conversation. Consider creating a private group instead.",
   "more_direct_channels.title": "Messages privés",
   "msg_typing.areTyping": "{users} et {last} sont en train d'écrire...",
   "msg_typing.isTyping": "{user} est en train d'écrire...",
   "msg_typing.someone": "Quelqu'un",
+  "multiselect.go": "Go",
+  "multiselect.instructions": "Use up/down arrows to navigate and enter to select",
+  "multiselect.numPeopleRemaining": "You can add {num, number} more {num, plural, =0 {people} one {person} other {people}}. ",
+  "multiselect.numRemaining": "You can add {num, number} more",
+  "multiselect.placeholder": "Search and add members",
   "navbar.addMembers": "Ajouter Membres",
   "navbar.click": "Cliquez ici",
   "navbar.delete": "Supprimer le canal...",
@@ -1730,7 +1743,7 @@
   "rename_channel.defaultError": " - Ne peut être changé en canal par défaut",
   "rename_channel.displayName": "Nom d'affichage",
   "rename_channel.displayNameHolder": "Saisissez le nom d'affichage",
-  "rename_channel.handleHolder": "minuscules alphanumériques seulement",
+  "rename_channel.handleHolder": "Doit être en caractères alphanumériques minuscules",
   "rename_channel.lowercase": "Doit être en caractères alphanumériques minuscules",
   "rename_channel.maxLength": "Ce champ doit faire moins de 22 caractères",
   "rename_channel.required": "Ce champ est obligatoire",
diff --git a/webapp/i18n/ja.json b/webapp/i18n/ja.json
index 327382921..f72af3026 100644
--- a/webapp/i18n/ja.json
+++ b/webapp/i18n/ja.json
@@ -138,7 +138,7 @@
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "最初の単語がトリガーワードと正確に一致する",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "最初の単語がトリガーワードで始まる",
   "admin.advance.cluster": "高可用(ベータ版)",
-  "admin.advance.metrics": "パフォーマンスモニタリング (ベータ版)",
+  "admin.advance.metrics": "パフォーマンスモニタリング",
   "admin.audits.reload": "再読み込み",
   "admin.audits.title": "ユーザーのアクティビティー",
   "admin.authentication.email": "電子メールアドレス認証",
@@ -529,7 +529,7 @@
   "admin.metrics.listenAddressDesc": "パフォーマンスメトリクスの公開先のサーバーが接続待ちをするアドレスです。",
   "admin.metrics.listenAddressEx": "例: \":8067\"",
   "admin.metrics.listenAddressTitle": "接続待ちアドレス:",
-  "admin.mfa.bannerDesc": "多要素認証はLDAPと電子メールによるログイン方法を持つアカウントにのみ利用可能となります。Mattermostは他のログイン方法に対して他要素認証を適用しません。システムに他のログイン方法を使用しているユーザーがいた場合、直接SSOかSAMLプロバイダーに多要素認証の設定と適用を行うことをお勧めします。",
+  "admin.mfa.bannerDesc": "<a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>多要素認証</a>はAD/LDAPか電子メールログインのアカウントで利用できます。他のログイン方法が使用されている場合、多要素認証は認証プロバイダー側で設定されるはずです。",
   "admin.mfa.cluster": "高",
   "admin.mfa.title": "多要素認証",
   "admin.nav.help": "ヘルプ",
@@ -689,7 +689,7 @@
   "admin.service.developerDesc": "有効にした場合、JavaScriptのエラーはユーザーインターフェイス上部の赤いバーに表示されます。本番環境での使用はお勧めできません。 ",
   "admin.service.developerTitle": "開発者モードを有効にする: ",
   "admin.service.enforcMfaTitle": "多要素認証を有効にする:",
-  "admin.service.enforceMfaDesc": "有効な場合、システムのユーザーは<a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>多要素認証</a>の設定を求められます。ログインしているユーザーは、多要素認証の設定が正常に行われるまで多要素認証設定ページへリダイレクトされます。<br/><br/>ユーザーがシステムを利用していなさそうなピークでない時間帯に多要素認証の適用を行うことをお勧めします。新しいユーザーは最初のサインアップ時に多要素認証の設定を求められます。設定後、ユーザーは多要素認証の適用が無効になるまで他要素認証を削除できません。<br/><br/>多要素認証がLDAPと電子メールによるログイン方法を持つアカウントにのみ利用可能となることに注意してください。Mattermostは他のログイン方法に対して他要素認証を適用しません。システムに他のログイン方法を使用しているユーザーがいた場合、直接SSOかSAMLプロバイダーに多要素認証の設定と適用を行うことをお勧めします。",
+  "admin.service.enforceMfaDesc": "有効の場合、<a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>多要素認証</a>がログイン時に求められます。新しいユーザーはサインアップ時に多要素認証の設定を求められます。多要素認証設定なしにログインしているユーザーは設定が完了するまで多要素認証設定ページへリダイレクトされます。<br/><br/>システムにAD/LDAPと電子メール以外のログイン方法のユーザーがいる場合、Mattermostの外部の認証プロバイダーで多要素認証が強制されます。",
   "admin.service.forward80To443": "ポート80の443への転送:",
   "admin.service.forward80To443Description": "ポート80からの安全でない接続を安全なポート443へ転送します",
   "admin.service.googleDescription": "このキーを設定することで、YouTubeビデオプレビューのタイトルが表示されます。キーを設定しない場合、投稿かコメントにハイパーリンクが含まれると、タイトルが表示されない形式でYouTubeビデオのプレビューが生成されます。キーの取得方法については<a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target='_blank'>Google Developers Tutorial</a>を参照してください。",
@@ -706,7 +706,7 @@
   "admin.service.listenAddress": "接続待ちアドレス:",
   "admin.service.listenDescription": "使用するIPアドレスとポート番号を設定します。\":8065\"と入力することで全てのインターフェイスのIPアドレスでアクセスを待ちます。\"127.0.0.1:8065\"と指定することで、一つのIPアドレスでアクセスを待ちます。\"システムポート\"や\"ウェルノウンポート\"と呼ばれる 0～1023 までの範囲のポート番号を選んだ場合、そのポートを使用する権限が必要になります。Linuxでは、Mattermostがウェルノウンポートを使用するために \"sudo setcap cap_net_bind_service=+ep ./bin/platform\" を利用することができます。",
   "admin.service.listenExample": "例: \":8065\"",
-  "admin.service.mfaDesc": "有効な場合、ユーザーは多要素認証をオプションとして選択できます。ユーザーはスマートフォンとGoogle Authenticatorのような認証アプリが必要になります。",
+  "admin.service.mfaDesc": "有効な場合、AD/LDAPか電子メールログインのユーザーはGoogle Authenticatorを使用した多要素認証をアカウントに追加することができます。",
   "admin.service.mfaTitle": "多要素認証を有効にする:",
   "admin.service.mobileSessionDays": "モバイルアプリのセッション維持期間 (日数):",
   "admin.service.mobileSessionDaysDesc": "ユーザーが最後に認証情報を入力した時から、そのユーザーのセッションが期限切れとなるまでの日数です。この設定を変更した後の新しいセッション維持期間は、次にユーザーが認証情報を入力してから有効になります。",
@@ -768,7 +768,7 @@
   "admin.sidebar.logging": "ログ",
   "admin.sidebar.login": "ログイン",
   "admin.sidebar.logs": "ログ",
-  "admin.sidebar.metrics": "パフォーマンスモニタリング (ベータ版)",
+  "admin.sidebar.metrics": "パフォーマンスモニタリング",
   "admin.sidebar.nativeAppLinks": "Mattermostアプリリンク",
   "admin.sidebar.notifications": "通知",
   "admin.sidebar.oauth": "OAuth 2.0",
@@ -1048,11 +1048,11 @@
   "calling_screen": "呼び出し中",
   "center_panel.recent": "ここをクリックして最近のメッセージへ移動します。 ",
   "change_url.close": "閉じる",
-  "change_url.endWithLetter": "英数字で終わらせてください",
+  "change_url.endWithLetter": "URLは英数字で終わらせてください",
   "change_url.invalidUrl": "不正なURL",
-  "change_url.longer": "2文字より長くしてください",
-  "change_url.noUnderscore": "列には2つのアンダーバーを含められません",
-  "change_url.startWithLetter": "英数字で始めてください",
+  "change_url.longer": "URLは２文字以上にしてください。",
+  "change_url.noUnderscore": "URLには2つ続いたアンダーバーを含められません",
+  "change_url.startWithLetter": "URLは英数字で始めてください",
   "channelHeader.addToFavorites": "お気に入りに追加する",
   "channelHeader.removeFromFavorites": "お気に入りから削除する",
   "channel_flow.alreadyExist": "このURLを持つチャンネルは既に存在しています",
@@ -1132,7 +1132,7 @@
   "channel_modal.publicChannel2": "新しい誰でも参加できる公開チャンネルを作成します。 ",
   "channel_modal.purpose": "目的",
   "channel_modal.purposeEx": "例: \"バグや改善を取りまとめるチャンネル\"",
-  "channel_notification.push": "Send mobile push notifications",
+  "channel_notification.push": "モバイルプッシュ通知を送信する",
   "channel_notifications.allActivity": "全てのアクティビティーについて",
   "channel_notifications.allUnread": "全ての未読のメッセージについて",
   "channel_notifications.globalDefault": "システム全体のデフォルト({notifyLevel})",
@@ -1140,7 +1140,7 @@
   "channel_notifications.never": "通知しない",
   "channel_notifications.onlyMentions": "あなたについての投稿のみ",
   "channel_notifications.override": "「デフォルト」以外を選択した場合、システム全体に関する通知の設定は上書きされます。デスクトップ通知は、Firefox、Safari、Chromeで利用可能です。",
-  "channel_notifications.overridePush": "Selecting an option other than \"Global default\" will override the global notification settings for mobile push notifications in account settings. Push notifications must be enabled by the System Admin.",
+  "channel_notifications.overridePush": "「システム全体のデフォルト」以外を選択した場合、アカウント設定のシステム全体に関するモバイルプッシュ通知設定が上書きされます。プッシュ通知は、システム管理者によって有効にされている必要があります。",
   "channel_notifications.preferences": "通知の設定。設定先:",
   "channel_notifications.sendDesktop": "デスクトップ通知を送信する",
   "channel_notifications.unreadInfo": "未読のメッセージがある場合、チャンネル名がサイドバーに太字で表示されます。「あなたについての投稿のみ」を選択することで、あなたについての投稿がある場合のみ太字で表示されます。",
@@ -1160,14 +1160,14 @@
   "claim.email_to_ldap.ldapPwd": "AD/LDAPパスワード",
   "claim.email_to_ldap.pwd": "パスワード",
   "claim.email_to_ldap.pwdError": "パスワードを入力してください。",
-  "claim.email_to_ldap.ssoNote": "あなたは既に有効なAD/LDAPアカウントを持っています",
+  "claim.email_to_ldap.ssoNote": "有効なAD/LDAPアカウントを持っている必要があります",
   "claim.email_to_ldap.ssoType": "この設定をすることで、AD/LDAPでしかログインできなくなります",
   "claim.email_to_ldap.switchTo": "アカウントをAD/LDAPに切り替える",
   "claim.email_to_ldap.title": "電子メールアドレス/パスワードによるアカウントをAD/LDAPに切り替える",
   "claim.email_to_oauth.enterPwd": "{site}アカウントのパスワードを入力してください",
   "claim.email_to_oauth.pwd": "パスワード",
   "claim.email_to_oauth.pwdError": "パスワードを入力してください。",
-  "claim.email_to_oauth.ssoNote": "あなたは既に有効な{type}アカウントを持っています",
+  "claim.email_to_oauth.ssoNote": "有効な{type}アカウントを持っている必要があります",
   "claim.email_to_oauth.ssoType": "この変更をすることで、あなたのアカウントでは{type}シングルサインオンとしてのみログインできるようになります",
   "claim.email_to_oauth.switchTo": "アカウントを{uiType}に切り替える",
   "claim.email_to_oauth.title": "電子メールアドレスとパスワードによるログインのアカウントを{uiType}に切り替える",
@@ -1381,7 +1381,7 @@
   "help.composing.deleting": "## メッセージの削除\nあなたが書いたメッセージの隣にある**[...]**アイコンをクリックし、**削除**をクリックすることでメッセージを削除できます。システム管理者とチーム管理者は彼らのシステムやチーム内のどんなメッセージでも削除できます。",
   "help.composing.editing": "## メッセージの編集\nあなたが書いたメッセージの隣にある**[...]**アイコンをクリックし、**編集**をクリックすることでメッセージを編集できます。メッセージテキストへの修正をした後、**ENTER**を押すと修正を保存します。メッセージの編集は新規に@mention通知やデスクトップ通知、通知音をトリガーしません。",
   "help.composing.linking": "## メッセージへのリンク\n**パーマリンク**機能はメッセージへのリンクを生成します。このリンクをチャンネル内の他のユーザーに共有することで、メッセージアーカイブ内のリンクされたメッセージを見せることができます。メッセージが投稿されたチャンネルのメンバーでないユーザーはパーマリンクを見ることができません。メッセージの隣にある**[...]**アイコン > **パーマリンク** > **リンクをコピーする**からパーマリンクを取得できます。",
-  "help.composing.posting": "## メッセージの投稿\nテキスト入力ボックスへの入力によりメッセージを書き、**ENTER**を押すとメッセージを送信します。メッセージを送信せずに改行するには**Shift + ENTER**を使用してください。**CTRL + ENTER**でメッセージを送信するには**メインメニュー > アカウント設定 > CTRL + ENTERでメッセージを投稿する**から設定してください。",
+  "help.composing.posting": "## メッセージの投稿\nテキスト入力ボックスへメッセージを書き、ENTER を押すとメッセージを送信します。メッセージを送信せずに改行するには SHIFT + ENTER を使用してください。 CTRL + ENTER でメッセージを送信するには **メインメニュー > アカウント設定 > CTRL + ENTERでメッセージを投稿する** から設定してください。",
   "help.composing.posts": "#### 投稿\n投稿は親となるメッセージと考えることができます。たびたび返信によるスレッドの始まりとなるメッセージです。投稿は、中央下部にあるテキスト入力ボックスから作成し、送信することができます。",
   "help.composing.replies": "#### 返信\nメッセージテキストの隣の返信アイコンをクリックすることでメッセージへの返信ができます。このアクションでメッセージスレッドを確認できる画面右部を開き、あなたの返信を作成し、送信することができます。返信は元の投稿の子メッセージであることを示すために画面中央部ではわずかにインデントされます。\n\n画面右部で返信を作成する際に、サイドバー上部の二つの矢印で表された展開/折り畳みアイコンをクリックすることで読みやすくなります。",
   "help.composing.title": "# メッセージを送信する\n_____",
@@ -1445,9 +1445,10 @@
   "help.messaging.notify": "**チームメイトへの通知** 必要な時に`@username`を入力します。",
   "help.messaging.reply": "**メッセージへの返信** メッセージの隣にある返信の矢印をクリックします。",
   "help.messaging.title": "# 基本的なメッセージを作成する\n_____",
-  "help.messaging.write": "**メッセージを書く** Mattermostの画面下部のテキスト入力ボックスを使います。**ENTER**を押すとメッセージが送信されます。**Shift+ENTER**を使うとメッセージを送ることなく改行することができます。",
+  "help.messaging.write": "**メッセージを書く** Mattermostの画面下部のテキスト入力ボックスを使います。ENTER を押すとメッセージが送信されます。SHIFT+ENTER を使うとメッセージを送ることなく改行することができます。",
   "installed_command.header": "スラッシュコマンド",
   "installed_commands.add": "スラッシュコマンドを追加する",
+  "installed_commands.delete.confirm": "この操作によりスラッシュコマンドは削除され、そのコマンドを利用している統合機能が動作しなくなります。本当に削除しますか？",
   "installed_commands.empty": "スラッシュコマンドは作成されていません",
   "installed_commands.header": "スラッシュコマンド",
   "installed_commands.help": "外部の統合機能用のスラッシュコマンドを作成する。詳細は{link}をご覧ください。",
@@ -1455,6 +1456,7 @@
   "installed_commands.search": "スラッシュコマンドを検索",
   "installed_commands.unnamed_command": "名前のないスラッシュコマンド",
   "installed_incoming_webhooks.add": "内向きのウェブフックを追加する",
+  "installed_incoming_webhooks.delete.confirm": "この操作により内向きのウェブフックは削除され、そのウェブフックを利用している統合機能が動作しなくなります。本当に削除しますか？",
   "installed_incoming_webhooks.empty": "内向きのウェブフックは作成されていません",
   "installed_incoming_webhooks.header": "内向きのウェブフック",
   "installed_incoming_webhooks.help": "外部の統合機能用の内向きのウェブフックURLを作成する。詳細は{link}をご覧ください。",
@@ -1480,6 +1482,7 @@
   "installed_oauth_apps.add": "OAuth 2.0アプリケーションを追加する",
   "installed_oauth_apps.callbackUrls": "コールバックURL(1つにつき1行)",
   "installed_oauth_apps.cancel": "キャンセル",
+  "installed_oauth_apps.delete.confirm": "この操作によりOAuth 2.0アプリケーションは削除され、そのアプリケーションを利用している統合機能が動作しなくなります。本当に削除しますか？",
   "installed_oauth_apps.description": "説明",
   "installed_oauth_apps.empty": "OAuth 2.0アプリケーションが見つかりませんでした",
   "installed_oauth_apps.header": "OAuth 2.0アプリケーション",
@@ -1495,6 +1498,7 @@
   "installed_oauth_apps.trusted.no": "いいえ",
   "installed_oauth_apps.trusted.yes": "はい",
   "installed_outgoing_webhooks.add": "外向きのウェブフックを追加する",
+  "installed_outgoing_webhooks.delete.confirm": "この操作により外向きのウェブフックは削除され、そのウェブフックを利用している統合機能が動作しなくなります。本当に削除しますか？",
   "installed_outgoing_webhooks.empty": "外向きのウェブフックは作成されていません",
   "installed_outgoing_webhooks.header": "外向きのウェブフック",
   "installed_outgoing_webhooks.help": "外部の統合機能用の外向きのウェブフックURLを作成する。詳細は{link}をご覧ください。",
@@ -1504,6 +1508,8 @@
   "integrations.add": "追加する",
   "integrations.command.description": "スラッシュコマンドは外部の統合機能にイベントを送信します",
   "integrations.command.title": "スラッシュコマンド",
+  "integrations.delete.confirm.button": "削除",
+  "integrations.delete.confirm.title": "統合機能を削除する",
   "integrations.done": "完了",
   "integrations.edit": "編集",
   "integrations.header": "統合機能",
@@ -1633,10 +1639,17 @@
   "more_channels.title": "他のチャンネル",
   "more_direct_channels.close": "閉じる",
   "more_direct_channels.message": "メッセージ",
+  "more_direct_channels.new_convo_note": "新しい会話を始めます。多くの人々を追加する場合、非公開グループの作成を検討してください。",
+  "more_direct_channels.new_convo_note.full": "この会話に参加できる人数の最大数に達しました。代わりに非公開グループを作成することを検討してください。",
   "more_direct_channels.title": "ダイレクトメッセージ",
   "msg_typing.areTyping": "{users}と{last}が入力しています…",
   "msg_typing.isTyping": "{user}が入力しています…",
   "msg_typing.someone": "誰か",
+  "multiselect.go": "ジャンプ",
+  "multiselect.instructions": "up/downキーで移動し、Enterで選択します",
+  "multiselect.numPeopleRemaining": "あと{num, number}人追加できます {num, plural, =0 {people} one {person} other {people}}. ",
+  "multiselect.numRemaining": "あと{num, number}人追加できます",
+  "multiselect.placeholder": "メンバーを検索し追加します",
   "navbar.addMembers": "メンバーを追加する",
   "navbar.click": "ここをクリックしてください",
   "navbar.delete": "チャンネルを削除する",
@@ -1730,7 +1743,7 @@
   "rename_channel.defaultError": " - デフォルトのチャンネルは変更できません",
   "rename_channel.displayName": "表示名",
   "rename_channel.displayNameHolder": "表示名を入力してください",
-  "rename_channel.handleHolder": "小文字の英数字のみ",
+  "rename_channel.handleHolder": "小文字の英数字にしてください",
   "rename_channel.lowercase": "小文字の英数字にしてください",
   "rename_channel.maxLength": "この項目は22文字より短くしてください",
   "rename_channel.required": "この項目は必須です",
@@ -1956,8 +1969,8 @@
   "user.settings.advance.on": "オン",
   "user.settings.advance.preReleaseDesc": "プレビューしたいプリリリース機能をチェックしてください。効果が有効になるのはページを再読み込みした後からです。",
   "user.settings.advance.preReleaseTitle": "プリリリース機能をプレビューする",
-  "user.settings.advance.sendDesc": "オンにした場合「ENTER」で改行し「CTRL + ENTER」でメッセージを投稿します。",
-  "user.settings.advance.sendTitle": "CTRL + ENTERでメッセージを投稿する",
+  "user.settings.advance.sendDesc": "オンにした場合 ENTER で改行し CTRL + ENTER でメッセージを投稿します。",
+  "user.settings.advance.sendTitle": "CTRL + ENTER でメッセージを投稿する",
   "user.settings.advance.slashCmd_autocmp": "スラッシュコマンドの自動補完をするために外部のアプリケーションを有効にする",
   "user.settings.advance.title": "詳細の設定",
   "user.settings.advance.webrtc_preview": "1対1のWebRTC通話をかけたり受けたりすることを可能にします",
diff --git a/webapp/i18n/ko.json b/webapp/i18n/ko.json
index b4d25b9f9..ae72b5f6f 100644
--- a/webapp/i18n/ko.json
+++ b/webapp/i18n/ko.json
@@ -138,7 +138,7 @@
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "First word matches a trigger word exactly",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "First word starts with a trigger word",
   "admin.advance.cluster": "고 가용성 (베타)",
-  "admin.advance.metrics": "Performance Monitoring (Beta)",
+  "admin.advance.metrics": "Performance Monitoring",
   "admin.audits.reload": "사용자 활동 기록 새로고침",
   "admin.audits.title": "사용자 활동 기록",
   "admin.authentication.email": "이메일 인증",
@@ -529,7 +529,7 @@
   "admin.metrics.listenAddressDesc": "The address the server will listen on to expose performance metrics.",
   "admin.metrics.listenAddressEx": "예시 \":8065\"",
   "admin.metrics.listenAddressTitle": "Listen Address:",
-  "admin.mfa.bannerDesc": "Multi-factor authentication is only available for accounts with LDAP and email login methods. If there are users on your system with other login methods, it is recommended you set up multi-factor authentication directly with the SSO or SAML provider.",
+  "admin.mfa.bannerDesc": "<a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>Multi-factor authentication</a> is available for accounts with AD/LDAP or email login. If other login methods are used, MFA should be configured with the authentication provider.",
   "admin.mfa.cluster": "High",
   "admin.mfa.title": "Enable Multi-factor Authentication:",
   "admin.nav.help": "도움말",
@@ -689,7 +689,7 @@
   "admin.service.developerDesc": "When true, Javascript errors are shown in a red bar at the top of the user interface. Not recommended for use in production. ",
   "admin.service.developerTitle": "개발자 모드: ",
   "admin.service.enforcMfaTitle": "Enable Multi-factor Authentication:",
-  "admin.service.enforceMfaDesc": "When true, users on the system will be required to set up <a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>multi-factor authentication</a>. Any logged in users will be redirected to the multi-factor authentication setup page until they successfully add MFA to their account.<br/><br/>It is recommended you turn on enforcement during non-peak hours, when people are less likely to be using the system. New users will be required to set up multi-factor authentication when they first sign up. After set up, users will not be able to remove multi-factor authentication unless enforcement is disabled.<br/><br/>Please note that multi-factor authentication is only available for accounts with LDAP and email login methods. Mattermost will not enforce multi-factor authentication for other login methods. If there are users on your system using other login methods, it is recommended you set up and enforce multi-factor authentication directly with the SSO or SAML provider.",
+  "admin.service.enforceMfaDesc": "When true, <a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>multi-factor authentication</a> is required for login. New users will be required to configure MFA on signup. Logged in users without MFA configured are redirected to the MFA setup page until configuration is complete.<br/><br/>If your system has users with login methods other than AD/LDAP and email, MFA must be enforced with the authentication provider outside of Mattermost.",
   "admin.service.forward80To443": "Forward port 80 to 443:",
   "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443",
   "admin.service.googleDescription": "Set this key to enable the display of titles for embedded YouTube video previews. Without the key, YouTube previews will still be created based on hyperlinks appearing in messages or comments but they will not show the video title. View a <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a> for instructions on how to obtain a key.",
@@ -706,7 +706,7 @@
   "admin.service.listenAddress": "Listen Address:",
   "admin.service.listenDescription": "The address and port to which to bind and listen. Specifying \":8065\" will bind to all network interfaces. Specifying \"127.0.0.1:8065\" will only bind to the network interface having that IP address. If you choose a port of a lower level (called \"system ports\" or \"well-known ports\", in the range of 0-1023), you must have permissions to bind to that port. On Linux you can use: \"sudo setcap cap_net_bind_service=+ep ./bin/platform\" to allow Mattermost to bind to well-known ports.",
   "admin.service.listenExample": "예시 \":8065\"",
-  "admin.service.mfaDesc": "When true, users will be given the option to add multi-factor authentication to their account. They will need a smartphone and an authenticator app such as Google Authenticator.",
+  "admin.service.mfaDesc": "When true, users with AD/LDAP or email login can add multi-factor authentication to their account using Google Authenticator.",
   "admin.service.mfaTitle": "Enable Multi-factor Authentication:",
   "admin.service.mobileSessionDays": "Session length for mobile apps (days):",
   "admin.service.mobileSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. After changing this setting, the new session length will take effect after the next time the user enters their credentials.",
@@ -768,7 +768,7 @@
   "admin.sidebar.logging": "로그",
   "admin.sidebar.login": "로그인",
   "admin.sidebar.logs": "서버 로그 보기",
-  "admin.sidebar.metrics": "Performance Monitoring (Beta)",
+  "admin.sidebar.metrics": "Performance Monitoring",
   "admin.sidebar.nativeAppLinks": "Mattermost 애플리케이션 링크",
   "admin.sidebar.notifications": "알림",
   "admin.sidebar.oauth": "OAuth 2.0",
@@ -1050,7 +1050,7 @@
   "change_url.close": "닫기",
   "change_url.endWithLetter": "Must end with a letter or number",
   "change_url.invalidUrl": "잘못된 URL",
-  "change_url.longer": "Must be longer than two characters",
+  "change_url.longer": "URL must be two or more characters.",
   "change_url.noUnderscore": "Can not contain two underscores in a row.",
   "change_url.startWithLetter": "Must start with a letter or number",
   "channelHeader.addToFavorites": "즐겨찾기에 추가",
@@ -1132,7 +1132,7 @@
   "channel_modal.publicChannel2": "누구나 참여할 수 있는 새 공개 채널을 만듭니다. ",
   "channel_modal.purpose": "설명",
   "channel_modal.purposeEx": "E.g.: \"A channel to file bugs and improvements\"",
-  "channel_notification.push": "Send mobile push notifications",
+  "channel_notification.push": "알림 받기",
   "channel_notifications.allActivity": "모든 활동",
   "channel_notifications.allUnread": "모든 읽지않은 메시지",
   "channel_notifications.globalDefault": "전역 기본 설정 ({notifyLevel})",
@@ -1448,6 +1448,7 @@
   "help.messaging.write": "**글 쓰기:** Mattermost 하단의 입력 창에 원하는 메시지를 입력하고 **ENTER**를 눌러 글을 등록하세요. **Shift+ENTER**를 눌러 등록하는 대신 줄바꿈을 할 수 있습니다.",
   "installed_command.header": "슬래시 명령어",
   "installed_commands.add": "슬래시 명령어 추가",
+  "installed_commands.delete.confirm": "This action permanently deletes the slash command and breaks any integrations using it. Are you sure you want to delete it?",
   "installed_commands.empty": "명령어가 없습니다.",
   "installed_commands.header": "슬래시 명령어",
   "installed_commands.help": "외부 통합에 사용하기 위한 슬래시 명령어를 생성하세요. 자세한 내용은 {link}를 참조하세요.",
@@ -1455,6 +1456,7 @@
   "installed_commands.search": "슬래시 명령어 검색",
   "installed_commands.unnamed_command": "이름없는 슬래시 명령어",
   "installed_incoming_webhooks.add": "Incoming Webhook 추가하기",
+  "installed_incoming_webhooks.delete.confirm": "This action permanently deletes the incoming webhook and breaks any integrations using it. Are you sure you want to delete it?",
   "installed_incoming_webhooks.empty": "Incoming Webhook이 없습니다.",
   "installed_incoming_webhooks.header": "Incoming Webhook",
   "installed_incoming_webhooks.help": "외부 통합에 사용하기 위한 Incoming webhook URL을 생성하세요. 자세한 내용은 {link}를 참조하세요.",
@@ -1480,6 +1482,7 @@
   "installed_oauth_apps.add": "애플리케이션 추가하기",
   "installed_oauth_apps.callbackUrls": "콜백 URL (줄 당 하나씩)",
   "installed_oauth_apps.cancel": "취소",
+  "installed_oauth_apps.delete.confirm": "This action permanently deletes the OAuth 2.0 application and breaks any integrations using it. Are you sure you want to delete it?",
   "installed_oauth_apps.description": "설명",
   "installed_oauth_apps.empty": "OAuth 2.0 애플리케이션이 없습니다",
   "installed_oauth_apps.header": "OAuth 2.0 애플리케이션",
@@ -1495,6 +1498,7 @@
   "installed_oauth_apps.trusted.no": "아니요",
   "installed_oauth_apps.trusted.yes": "네",
   "installed_outgoing_webhooks.add": "Outgoing Webhook 추가하기",
+  "installed_outgoing_webhooks.delete.confirm": "This action permanently deletes the outgoing webhook and breaks any integrations using it. Are you sure you want to delete it?",
   "installed_outgoing_webhooks.empty": "Outgoing Webhook이 없습니다.",
   "installed_outgoing_webhooks.header": "Outgoing Webhook",
   "installed_outgoing_webhooks.help": "외부 통합에 사용하기 위한 Outgoing webhook URL을 생성하세요. 자세한 내용은 {link}를 참조하세요.",
@@ -1504,6 +1508,8 @@
   "integrations.add": "추가",
   "integrations.command.description": "슬래시 명령어는 외부에 연결한 서비스에 이벤트를 보냅니다.",
   "integrations.command.title": "슬래시 명령어",
+  "integrations.delete.confirm.button": "삭제",
+  "integrations.delete.confirm.title": "Delete Integration",
   "integrations.done": "확인",
   "integrations.edit": "편집",
   "integrations.header": "통합 기능",
@@ -1633,10 +1639,17 @@
   "more_channels.title": "채널 더보기",
   "more_direct_channels.close": "닫기",
   "more_direct_channels.message": "메시지",
+  "more_direct_channels.new_convo_note": "This will start a new conversation. If you’re adding a lot of people, consider creating a private group instead.",
+  "more_direct_channels.new_convo_note.full": "You’ve reached the maximum number of people for this conversation. Consider creating a private group instead.",
   "more_direct_channels.title": "개인 메시지",
   "msg_typing.areTyping": "{users}, {last}(이)가 입력중입니다...",
   "msg_typing.isTyping": "{user}(이)가 입력중입니다...",
   "msg_typing.someone": "Someone",
+  "multiselect.go": "Go",
+  "multiselect.instructions": "Use up/down arrows to navigate and enter to select",
+  "multiselect.numPeopleRemaining": "You can add {num, number} more {num, plural, =0 {people} one {person} other {people}}. ",
+  "multiselect.numRemaining": "You can add {num, number} more",
+  "multiselect.placeholder": "Search and add members",
   "navbar.addMembers": "회원 추가",
   "navbar.click": "클릭하기",
   "navbar.delete": "채널 삭제",
@@ -1730,7 +1743,7 @@
   "rename_channel.defaultError": " - 기본 채널의 URL은 변경할 수 없습니다.",
   "rename_channel.displayName": "표시명",
   "rename_channel.displayNameHolder": "표시명을 입력하세요.",
-  "rename_channel.handleHolder": "lowercase alphanumeric&#39;s only",
+  "rename_channel.handleHolder": "Must be lowercase alphanumeric characters",
   "rename_channel.lowercase": "Must be lowercase alphanumeric characters",
   "rename_channel.maxLength": "This field must be less than 22 characters",
   "rename_channel.required": "필수 항목입니다.",
diff --git a/webapp/i18n/nl.json b/webapp/i18n/nl.json
index 8fa05595b..9c1178a4b 100644
--- a/webapp/i18n/nl.json
+++ b/webapp/i18n/nl.json
@@ -138,7 +138,7 @@
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "Eerste trigger woord komt exact overeen",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "Eerste woord start met een trigger woord",
   "admin.advance.cluster": "High Availability (Beta)",
-  "admin.advance.metrics": "Performance Monitoring (Beta)",
+  "admin.advance.metrics": "Performance Monitoring",
   "admin.audits.reload": "Laad de gebruikeractiviteit logs opnieuw",
   "admin.audits.title": "Gebruiker activiteits logs",
   "admin.authentication.email": "Email authenticatie",
@@ -529,7 +529,7 @@
   "admin.metrics.listenAddressDesc": "The address the server will listen on to expose performance metrics.",
   "admin.metrics.listenAddressEx": "Bijv.: \":8065\"",
   "admin.metrics.listenAddressTitle": "Luister Adres:",
-  "admin.mfa.bannerDesc": "Multi-factor authentication is only available for accounts with LDAP and email login methods. If there are users on your system with other login methods, it is recommended you set up multi-factor authentication directly with the SSO or SAML provider.",
+  "admin.mfa.bannerDesc": "<a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>Multi-factor authentication</a> is available for accounts with AD/LDAP or email login. If other login methods are used, MFA should be configured with the authentication provider.",
   "admin.mfa.cluster": "High",
   "admin.mfa.title": "Multi-factor Authenticatie:",
   "admin.nav.help": "Help",
@@ -689,7 +689,7 @@
   "admin.service.developerDesc": "Javascript fout worden weergeven in een rode bar boven in de user interface. Niet aangeraden voor productie.",
   "admin.service.developerTitle": "Developer mode inschakelen: ",
   "admin.service.enforcMfaTitle": "Aanzetten multi-factor authenticatie:",
-  "admin.service.enforceMfaDesc": "When true, users on the system will be required to set up <a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>multi-factor authentication</a>. Any logged in users will be redirected to the multi-factor authentication setup page until they successfully add MFA to their account.<br/><br/>It is recommended you turn on enforcement during non-peak hours, when people are less likely to be using the system. New users will be required to set up multi-factor authentication when they first sign up. After set up, users will not be able to remove multi-factor authentication unless enforcement is disabled.<br/><br/>Please note that multi-factor authentication is only available for accounts with LDAP and email login methods. Mattermost will not enforce multi-factor authentication for other login methods. If there are users on your system using other login methods, it is recommended you set up and enforce multi-factor authentication directly with the SSO or SAML provider.",
+  "admin.service.enforceMfaDesc": "When true, <a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>multi-factor authentication</a> is required for login. New users will be required to configure MFA on signup. Logged in users without MFA configured are redirected to the MFA setup page until configuration is complete.<br/><br/>If your system has users with login methods other than AD/LDAP and email, MFA must be enforced with the authentication provider outside of Mattermost.",
   "admin.service.forward80To443": "Forward port 80 to 443:",
   "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443",
   "admin.service.googleDescription": "Zet deze sleutel om de titel van ingevoegde Youtube video's te tonen. Zonder deze sleutel zullen Youtube previews nog steeds gemaakt worden op basis van links die in berichten en reacties worden geplaatst, maar er word geen titel getoond. Bekijken een <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a> voor instructies over hoe deze sleutel te krijgen.",
@@ -706,7 +706,7 @@
   "admin.service.listenAddress": "Luister Adres:",
   "admin.service.listenDescription": "The address and port to which to bind and listen. Specifying \":8065\" will bind to all network interfaces. Specifying \"127.0.0.1:8065\" will only bind to the network interface having that IP address. If you choose a port of a lower level (called \"system ports\" or \"well-known ports\", in the range of 0-1023), you must have permissions to bind to that port. On Linux you can use: \"sudo setcap cap_net_bind_service=+ep ./bin/platform\" to allow Mattermost to bind to well-known ports.",
   "admin.service.listenExample": "Bijv.: \":8065\"",
-  "admin.service.mfaDesc": "Wanneer dit ingeschakeld is, krijgen de gebruikers de mogelijkheid om multi-factor authenticatie te gebruiken om in te loggen. Ze zullen een smartphone en een authenticator-app zoals Google Authenticator nodig hebben.",
+  "admin.service.mfaDesc": "When true, users with AD/LDAP or email login can add multi-factor authentication to their account using Google Authenticator.",
   "admin.service.mfaTitle": "Aanzetten multi-factor authenticatie:",
   "admin.service.mobileSessionDays": "Sessie duur voor mobiel (dagen):",
   "admin.service.mobileSessionDaysDesc": "Het aantal dagen dat de gebruiker voor het laatst zijn credentials heeft ingevoerd voordat gebruikers sessie verloopt. Nadat deze instelling is gewijzigd, zal de nieuwe sessie lengte plaatsvinden de volgende keer de gebruiker zijn credentials invult. ",
@@ -768,7 +768,7 @@
   "admin.sidebar.logging": "Loggen",
   "admin.sidebar.login": "Login",
   "admin.sidebar.logs": "Logs",
-  "admin.sidebar.metrics": "Performance Monitoring (Beta)",
+  "admin.sidebar.metrics": "Performance Monitoring",
   "admin.sidebar.nativeAppLinks": "Mattermost App Links",
   "admin.sidebar.notifications": "Meldingen",
   "admin.sidebar.oauth": "OAuth 2.0",
@@ -1050,7 +1050,7 @@
   "change_url.close": "Afsluiten",
   "change_url.endWithLetter": "Moet eindigen met een letter of een cijfer",
   "change_url.invalidUrl": "Ongeldige URL",
-  "change_url.longer": "Moet langer zijn dan twee tekens",
+  "change_url.longer": "URL must be two or more characters.",
   "change_url.noUnderscore": "Het niet is toegestaan om 2 underscores na elkaar te gebruiken.",
   "change_url.startWithLetter": "Moet beginnen met een letter of een cijfer",
   "channelHeader.addToFavorites": "Add to Favorites",
@@ -1132,7 +1132,7 @@
   "channel_modal.publicChannel2": "Maak een publiek kanaal waar iedereen lid van kan worden. ",
   "channel_modal.purpose": "Doel",
   "channel_modal.purposeEx": "E.g.: \"A channel to file bugs and improvements\"",
-  "channel_notification.push": "Send mobile push notifications",
+  "channel_notification.push": "Stuur mobiele push notificaties",
   "channel_notifications.allActivity": "Voor alle activiteiten",
   "channel_notifications.allUnread": "Voor alle ongelezen berichten",
   "channel_notifications.globalDefault": "Globale standaard ({notifyLevel})",
@@ -1445,9 +1445,10 @@
   "help.messaging.notify": "**Notify teammates** when they are needed by typing `@username`.",
   "help.messaging.reply": "**Reply to messages** by clicking the reply arrow next to the message text.",
   "help.messaging.title": "# Berichten Basics\n _____",
-  "help.messaging.write": "**Write messages** using the text input box at the bottom of Mattermost. Press **ENTER** to send a message. Use **Shift+ENTER** to create a new line without sending a message.",
+  "help.messaging.write": "**Write messages** using the text input box at the bottom of Mattermost. Press ENTER to send a message. Use SHIFT+ENTER to create a new line without sending a message.",
   "installed_command.header": "Slash opdrachten",
   "installed_commands.add": "Slash opdracht toevoegen",
+  "installed_commands.delete.confirm": "This action permanently deletes the slash command and breaks any integrations using it. Are you sure you want to delete it?",
   "installed_commands.empty": "Geen opdrachten gevonden",
   "installed_commands.header": "Slash opdrachten",
   "installed_commands.help": "Maak slash commando's voor gebruik in externe integraties. Bekijk de {link} om hier meer over te lezen.",
@@ -1455,6 +1456,7 @@
   "installed_commands.search": "Zoek Slash Commando's",
   "installed_commands.unnamed_command": "Slash opdracht zonder naam",
   "installed_incoming_webhooks.add": "Inkomende webhook toevoegen",
+  "installed_incoming_webhooks.delete.confirm": "This action permanently deletes the incoming webhook and breaks any integrations using it. Are you sure you want to delete it?",
   "installed_incoming_webhooks.empty": "Geen inkomende webhooks gevonden",
   "installed_incoming_webhooks.header": "Inkomende webhooks",
   "installed_incoming_webhooks.help": "Maak inkomende webhook URLs voor gebruik in externe integraties.  Bekijk de {link} om hier meer over te lezen.",
@@ -1480,6 +1482,7 @@
   "installed_oauth_apps.add": "OAuth 2.0 Applicatie Toevoegen",
   "installed_oauth_apps.callbackUrls": "Callback URL's (Een per regel)",
   "installed_oauth_apps.cancel": "Annuleren",
+  "installed_oauth_apps.delete.confirm": "This action permanently deletes the OAuth 2.0 application and breaks any integrations using it. Are you sure you want to delete it?",
   "installed_oauth_apps.description": "Omschrijving",
   "installed_oauth_apps.empty": "Geen OAuth 2.0 Applicaties gevonden",
   "installed_oauth_apps.header": "OAuth 2.0 Applicaties",
@@ -1495,6 +1498,7 @@
   "installed_oauth_apps.trusted.no": "Nee",
   "installed_oauth_apps.trusted.yes": "Ja",
   "installed_outgoing_webhooks.add": "Uitgaande webhook toevoegen",
+  "installed_outgoing_webhooks.delete.confirm": "This action permanently deletes the outgoing webhook and breaks any integrations using it. Are you sure you want to delete it?",
   "installed_outgoing_webhooks.empty": "Geen uitgaande webhooks gevonden",
   "installed_outgoing_webhooks.header": "Uitgaande webhooks",
   "installed_outgoing_webhooks.help": "Maak uitgaande webhook URLs voor gebruik in externe integraties.  Bekijk de {link} om hier meer over te lezen.",
@@ -1504,6 +1508,8 @@
   "integrations.add": "Toevoegen",
   "integrations.command.description": "Slash opdrachten sturen events naar externe integraties",
   "integrations.command.title": "Slash opdracht",
+  "integrations.delete.confirm.button": "Verwijderen",
+  "integrations.delete.confirm.title": "Delete Integration",
   "integrations.done": "Gereed",
   "integrations.edit": "Bewerken",
   "integrations.header": "Integraties",
@@ -1633,10 +1639,17 @@
   "more_channels.title": "Meer kanalen",
   "more_direct_channels.close": "Afsluiten",
   "more_direct_channels.message": "Bericht",
+  "more_direct_channels.new_convo_note": "This will start a new conversation. If you’re adding a lot of people, consider creating a private group instead.",
+  "more_direct_channels.new_convo_note.full": "You’ve reached the maximum number of people for this conversation. Consider creating a private group instead.",
   "more_direct_channels.title": "Privé bericht",
   "msg_typing.areTyping": "{users} en {last} zijn aan het typen...",
   "msg_typing.isTyping": "{user} typt...",
   "msg_typing.someone": "Iemand",
+  "multiselect.go": "Go",
+  "multiselect.instructions": "Use up/down arrows to navigate and enter to select",
+  "multiselect.numPeopleRemaining": "You can add {num, number} more {num, plural, =0 {people} one {person} other {people}}. ",
+  "multiselect.numRemaining": "You can add {num, number} more",
+  "multiselect.placeholder": "Search and add members",
   "navbar.addMembers": "Leden toevoegen",
   "navbar.click": "Klik hier",
   "navbar.delete": "Verwijder kanaal...",
@@ -1730,7 +1743,7 @@
   "rename_channel.defaultError": " - Kan niet worden verandert voor het standaard kanaal",
   "rename_channel.displayName": "Weergavenaam",
   "rename_channel.displayNameHolder": "Voer de weergavenaam in",
-  "rename_channel.handleHolder": "enkel kleine letters en nummers",
+  "rename_channel.handleHolder": "Kan enkel kleine letters en nummers zijn",
   "rename_channel.lowercase": "Kan enkel kleine letters en nummers zijn",
   "rename_channel.maxLength": "Dit veld moet minder dan 22 tekens bevatten",
   "rename_channel.required": "Dit veld is verplicht",
diff --git a/webapp/i18n/pt-BR.json b/webapp/i18n/pt-BR.json
index 15df6b5b8..163a56d29 100644
--- a/webapp/i18n/pt-BR.json
+++ b/webapp/i18n/pt-BR.json
@@ -138,7 +138,7 @@
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "Primeira palavra corresponde exatamente a uma palavra gatilho",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "Primeira palavra começa com uma palavra gatilho",
   "admin.advance.cluster": "Alta Disponibilidade (Beta)",
-  "admin.advance.metrics": "Monitoramento de Performance (Beta)",
+  "admin.advance.metrics": "Monitoramento de Performance",
   "admin.audits.reload": "Recarregar",
   "admin.audits.title": "Atividade de Usuário",
   "admin.authentication.email": "Autenticação Email",
@@ -318,7 +318,7 @@
   "admin.general.policy.permissionsAdmin": "Administradores de Time e Sistema",
   "admin.general.policy.permissionsAll": "Todos os membros da equipe",
   "admin.general.policy.permissionsAllChannel": "Todos os membros do canal",
-  "admin.general.policy.permissionsChannelAdmin": "Channel, Team and System Admins",
+  "admin.general.policy.permissionsChannelAdmin": "Canal, Time e Admistradores de Sistema",
   "admin.general.policy.permissionsDeletePostAdmin": "Administradores de Equipe e Sistema",
   "admin.general.policy.permissionsDeletePostAll": "Autor da mensagem pode deletar sua própria mensagem, e Administradores podem deletar qualquer mensagem",
   "admin.general.policy.permissionsDeletePostSystemAdmin": "Administrador de Sistema",
@@ -529,7 +529,7 @@
   "admin.metrics.listenAddressDesc": "O endereço que o servidor irá escutar para expor as métricas de performance.",
   "admin.metrics.listenAddressEx": "Ex.: \":8067\"",
   "admin.metrics.listenAddressTitle": "Endereço à escutar:",
-  "admin.mfa.bannerDesc": "Autenticação por Multi-fator está apenas disponível para contas com LDAP e login por email. Se existir algum usuário no sistema com outro tipo de login, é recomendado que você configure a autenticação por multi-fator diretamente com o provedor de SSO ou SAML.",
+  "admin.mfa.bannerDesc": "<a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>Multi-factor authentication</a> is available for accounts with AD/LDAP or email login. If other login methods are used, MFA should be configured with the authentication provider.",
   "admin.mfa.cluster": "Alta",
   "admin.mfa.title": "Autenticação Multi-Fator",
   "admin.nav.help": "Ajuda",
@@ -689,7 +689,7 @@
   "admin.service.developerDesc": "Quando verdadeiro, os erros de Javascript serão mostrados em uma barra vermelha no topo da interface de usuário. Não recomendado para uso em produção. ",
   "admin.service.developerTitle": "Ativar o Modo Desenvolvedor: ",
   "admin.service.enforcMfaTitle": "Obrigar Autenticação Multi-Fator:",
-  "admin.service.enforceMfaDesc": "Quando verdadeiro, os usuários no sistema serão obrigados a configurar  <a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'> a autenticação multi-fator</a>. Todos os usuários conectados serão redirecionados para a página de configuração de autenticação multi-fator até que eles adicionem a MFA com êxito à sua conta.<br/><br/>É recomendável que você ative a autenticação durante as horas de baixo pico, quando é menos provável de ter pessoas usando o sistema. Os novos usuários serão obrigados a configurar a autenticação multi-fator quando eles se logarem pela primeira vez. Após a configuração, os usuários não poderão remover a autenticação multi-fator, a menos que a autenticação seja desativada.<br/><br/>Observe que a autenticação multi-fator só está disponível para contas com LDAP e métodos de login por e-mail. O Mattermost não aplicará a autenticação multi-fator para outros métodos de login. Se houver usuários em seu sistema usando outros métodos de login, é recomendável configurar e aplicar a autenticação multi-fator diretamente com o provedor SSO ou SAML.",
+  "admin.service.enforceMfaDesc": "When true, <a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>multi-factor authentication</a> is required for login. New users will be required to configure MFA on signup. Logged in users without MFA configured are redirected to the MFA setup page until configuration is complete.<br/><br/>If your system has users with login methods other than AD/LDAP and email, MFA must be enforced with the authentication provider outside of Mattermost.",
   "admin.service.forward80To443": "Redirecionamento porta 80 para 443:",
   "admin.service.forward80To443Description": "Redirecionar todo trafego inseguro da porta 80 para porta segura 443",
   "admin.service.googleDescription": "Defina esta chave para permitir a exibição de títulos para pré-visualizações de vídeo do YouTube embutidos. Sem a chave, pré-visualizações do YouTube ainda serão criadas com base em hiperlinks que aparecem nas mensagens ou comentários, mas eles não vão mostrar o título do vídeo. Veja o <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target='_blank'>Google Developers Tutorial</a> para instruções sobre como obter uma chave.",
@@ -706,7 +706,7 @@
   "admin.service.listenAddress": "Endereço à Escutar:",
   "admin.service.listenDescription": "O endereço e a porta à qual se ligar e ouvir. Especificando \":8065\" irá ligar-se a todas as interfaces de rede. Especificando \"127.0.0.1:8065\" só irá ligar à interface de rede com esse endereço IP. Se você escolher uma porta de um nível mais baixo (chamadas de \"portas do sistema\" ou \"portas conhecidas\", na faixa de 0-1023), você deve ter permissões para se ligar a essa porta. No Linux, você pode usar: \"sudo setcap cap_net_bind_service=+ep ./bin/platform\" para permitir o Mattermost vincular a portas conhecidas.",
   "admin.service.listenExample": "Ex.: \":8065\"",
-  "admin.service.mfaDesc": "Quando verdadeiro, vai ser dada a opção do usuário adicionar autenticação multi-fator em sua conta. Eles irão precisar de um smartphone e um app autenticador como o Google Authenticator.",
+  "admin.service.mfaDesc": "When true, users with AD/LDAP or email login can add multi-factor authentication to their account using Google Authenticator.",
   "admin.service.mfaTitle": "Ativar Autenticação Multi-Fator:",
   "admin.service.mobileSessionDays": "Tamanho da sessão para app móvel (dias):",
   "admin.service.mobileSessionDaysDesc": "O número de dias desde a última vez que um usuário entrou suas credenciais para expirar a sessão do usuário. Depois de alterar essa configuração, a nova duração da sessão terá efeito após a próxima vez que o usuário digitar suas credenciais.",
@@ -768,7 +768,7 @@
   "admin.sidebar.logging": "Logs",
   "admin.sidebar.login": "Login",
   "admin.sidebar.logs": "Logs",
-  "admin.sidebar.metrics": "Monitoramento de Performance (Beta)",
+  "admin.sidebar.metrics": "Monitoramento de Performance",
   "admin.sidebar.nativeAppLinks": "Links Aplicativo Mattermost",
   "admin.sidebar.notifications": "Notificações",
   "admin.sidebar.oauth": "OAuth 2.0",
@@ -1048,11 +1048,11 @@
   "calling_screen": "Chamando",
   "center_panel.recent": "Clique aqui para pular para mensagens recentes. ",
   "change_url.close": "Fechar",
-  "change_url.endWithLetter": "Deve teminar com uma letra ou número",
+  "change_url.endWithLetter": "URL deve terminar com uma letra ou número.",
   "change_url.invalidUrl": "URL inválida",
-  "change_url.longer": "Deve ter mais de dois caracteres",
-  "change_url.noUnderscore": "Não pode conter dois sublinhados consecutivos.",
-  "change_url.startWithLetter": "Deve começar com uma letra ou número",
+  "change_url.longer": "URL precisa ter dois ou mais caracteres.",
+  "change_url.noUnderscore": "URL não pode conter dois sublinhados consecutivos.",
+  "change_url.startWithLetter": "URL deve começar com uma letra ou número.",
   "channelHeader.addToFavorites": "Adicionar aos Favoritos",
   "channelHeader.removeFromFavorites": "Remover dos Favoritos",
   "channel_flow.alreadyExist": "Um canal com essa URL já existe",
@@ -1132,7 +1132,7 @@
   "channel_modal.publicChannel2": "Criar um novo canal público para qualquer um participar. ",
   "channel_modal.purpose": "Propósito",
   "channel_modal.purposeEx": "Ex.: \"Um canal para arquivar bugs e melhorias\"",
-  "channel_notification.push": "Send mobile push notifications",
+  "channel_notification.push": "Enviar notificações push para o celular",
   "channel_notifications.allActivity": "Para todas as atividades",
   "channel_notifications.allUnread": "Para todas as mensagens não lidas",
   "channel_notifications.globalDefault": "Global padrão ({notifyLevel})",
@@ -1381,7 +1381,7 @@
   "help.composing.deleting": "## Deletando uma mensagem\nDelete uma mensagem clicando no ícone **[...]** ao lado do texto da mensagem que você escreveu, em seguida, clique em **Deletar**. Administrador de Sistema e de Equipe podem excluir qualquer mensagem em seu sistema ou equipe.",
   "help.composing.editing": "## Edição de Mensagem\nEdite uma mensagem clicando no ícone **[...]** ao lado do texto de qualquer mensagem que você compôs, em seguida, clique em **Editar**. Após fazer modificações no texto da mensagem, pressione **ENTER** para salvá-las. Edições em mensagens não geram novas notificações de @menção, notificações da área de trabalho ou sons de notificação.",
   "help.composing.linking": "## Link para uma mensagem\nO recurso **Permalink** cria um link para qualquer mensagem. Compartilhar este link com outros usuários no canal lhes permite visualizar a mensagem lincada no Arquivos de Mensagem. Os usuários que não são membros do canal onde a mensagem foi postada não podem ver o permalink. Obter o permalink de qualquer mensagem clicando no ícone **[...]** ao lado do texto da mensagem  > **Permalink** > **Copiar Link**.",
-  "help.composing.posting": "## Postando uma Mensagem\nEscreva uma mensagem digitando na caixa de entrada de texto, em seguida, pressione **ENTER** para enviá-la. Use **Shift + ENTER** para criar uma nova linha sem enviar uma mensagem. Para enviar mensagens pressionando **CTRL + ENTER** vá para **Menu Principal > Configurações de Conta > Enviar mensagens com CTRL + ENTER**.",
+  "help.composing.posting": "## Postando uma Mensagem\nEscreva uma mensagem digitando na caixa de entrada de texto, em seguida, pressione ENTER para enviá-la. Use SHIFT+ENTER para criar uma nova linha sem enviar a mensagem. Para enviar mensagens pressionando CTRL+ENTER vá para **Menu Principal > Configurações de Conta > Enviar mensagens com CTRL+ENTER**.",
   "help.composing.posts": "#### Posts\nPosts podem ser consideradas as mensagens principais. Eles são as mensagens que, muitas vezes iniciam uma discussão com respostas. Posts são criados e enviados a partir da caixa de entrada de texto na parte inferior do painel central.",
   "help.composing.replies": "#### Respostas\nResponda a uma mensagem clicando no ícone de resposta ao lado de qualquer texto da mensagem. Esta ação abre a barra lateral direita, onde você pode ver as mensagens relacionadas, e então escrever e enviar sua resposta. As respostas são recuada ligeiramente no painel central para indicar que eles são mensagens filha de um post pai.\n\nAo compor uma resposta no lado direito, clique no ícone de expandir/fechar com duas setas na parte superior da barra lateral para tornar as coisas mais fáceis de ler.",
   "help.composing.title": "# Enviando Mensagens\n_____",
@@ -1445,9 +1445,10 @@
   "help.messaging.notify": "**Notificar colegas de equipe** quando eles são necessários digitando `@usuário`.",
   "help.messaging.reply": "**Responder a mensagens** clicando na seta de resposta ao lado do texto da mensagem.",
   "help.messaging.title": "# Mensagens Básico\n_____",
-  "help.messaging.write": "**Escreva mensagens** usando a caixa de texto na parte inferior do Mattermost. Pressione **ENTER** para enviar a mensagem. Use **Shift+ENTER** para criar uma nova linha sem enviar a mensagem.",
+  "help.messaging.write": "**Escreva mensagens** usando a caixa de texto na parte inferior do Mattermost. Pressione ENTER para enviar a mensagem. Use SHIFT+ENTER para criar uma nova linha sem enviar a mensagem.",
   "installed_command.header": "Comandos Slash",
   "installed_commands.add": "Adicionar Comando Slash",
+  "installed_commands.delete.confirm": "This action permanently deletes the slash command and breaks any integrations using it. Are you sure you want to delete it?",
   "installed_commands.empty": "Nenhum comando encotrado",
   "installed_commands.header": "Comandos Slash",
   "installed_commands.help": "Criar comandos slash para uso em integrações internas. Por favor veja {link} para aprender mais.",
@@ -1455,6 +1456,7 @@
   "installed_commands.search": "Pesquisar Comandos Slash",
   "installed_commands.unnamed_command": "Comando Slash sem Nome",
   "installed_incoming_webhooks.add": "Adicionar Webhooks Entrada",
+  "installed_incoming_webhooks.delete.confirm": "This action permanently deletes the incoming webhook and breaks any integrations using it. Are you sure you want to delete it?",
   "installed_incoming_webhooks.empty": "Nenhum webhook de entrada encontrado",
   "installed_incoming_webhooks.header": "Webhooks Entrada",
   "installed_incoming_webhooks.help": "Criar URLs para webhook de entrada para uso em integrações externas. Por favor veja {link} para aprender mais.",
@@ -1480,6 +1482,7 @@
   "installed_oauth_apps.add": "Adicionar Aplicativo OAuth 2.0",
   "installed_oauth_apps.callbackUrls": "URLs Callback (Uma Por Linha)",
   "installed_oauth_apps.cancel": "Cancelar",
+  "installed_oauth_apps.delete.confirm": "This action permanently deletes the OAuth 2.0 application and breaks any integrations using it. Are you sure you want to delete it?",
   "installed_oauth_apps.description": "Descrição",
   "installed_oauth_apps.empty": "Nenhum Aplicativo OAuth 2.0 encontrado",
   "installed_oauth_apps.header": "Aplicativos OAuth 2.0",
@@ -1495,6 +1498,7 @@
   "installed_oauth_apps.trusted.no": "Não",
   "installed_oauth_apps.trusted.yes": "Sim",
   "installed_outgoing_webhooks.add": "Adicionar Webhooks Saída",
+  "installed_outgoing_webhooks.delete.confirm": "This action permanently deletes the outgoing webhook and breaks any integrations using it. Are you sure you want to delete it?",
   "installed_outgoing_webhooks.empty": "Nenhum webhook de saída encontrado",
   "installed_outgoing_webhooks.header": "Webhooks Saída",
   "installed_outgoing_webhooks.help": "Criar URLs para webhook de saída para uso em integrações externas. Por favor veja {link} para aprender mais.",
@@ -1504,6 +1508,8 @@
   "integrations.add": "Adicionar",
   "integrations.command.description": "Comandos slash envia evento para integrações externas",
   "integrations.command.title": "Comando Slash",
+  "integrations.delete.confirm.button": "Deletar",
+  "integrations.delete.confirm.title": "Deletar Integração",
   "integrations.done": "Feito",
   "integrations.edit": "Editar",
   "integrations.header": "Integrações",
@@ -1633,10 +1639,17 @@
   "more_channels.title": "Mais Canais",
   "more_direct_channels.close": "Fechar",
   "more_direct_channels.message": "Mensagem",
+  "more_direct_channels.new_convo_note": "This will start a new conversation. If you’re adding a lot of people, consider creating a private group instead.",
+  "more_direct_channels.new_convo_note.full": "You’ve reached the maximum number of people for this conversation. Consider creating a private group instead.",
   "more_direct_channels.title": "Mensagens Diretas",
   "msg_typing.areTyping": "{users} e {last} estão digitando...",
   "msg_typing.isTyping": "{user} está digitando...",
   "msg_typing.someone": "Alguém",
+  "multiselect.go": "Ir",
+  "multiselect.instructions": "Use up/down arrows to navigate and enter to select",
+  "multiselect.numPeopleRemaining": "You can add {num, number} more {num, plural, =0 {people} one {person} other {people}}. ",
+  "multiselect.numRemaining": "You can add {num, number} more",
+  "multiselect.placeholder": "Search and add members",
   "navbar.addMembers": "Adicionar Membros",
   "navbar.click": "Clique aqui",
   "navbar.delete": "Deletar Canal...",
@@ -1730,7 +1743,7 @@
   "rename_channel.defaultError": " - Não pode ser alterado para o canal padrão",
   "rename_channel.displayName": "Nome De Exibição",
   "rename_channel.displayNameHolder": "Insira o nome de exibição",
-  "rename_channel.handleHolder": "alfanuméricos minúsculos somente",
+  "rename_channel.handleHolder": "caracteres minúsculos alfanuméricos",
   "rename_channel.lowercase": "Tem de ser caracteres minúsculos alfanuméricos",
   "rename_channel.maxLength": "Este campo deve ser menor do que 22 caracteres",
   "rename_channel.required": "Este campo é obrigatório",
@@ -1940,8 +1953,8 @@
   "update_command.question": "Suas alterações podem fazer parar de funcionar o comando slash existente. Tem a certeza de que pretende atualizá-lo?",
   "update_command.update": "Atualizar",
   "update_incoming_webhook.update": "Atualizar",
-  "update_outgoing_webhook.confirm": "Adicionar Webhooks Saída",
-  "update_outgoing_webhook.question": "Suas alterações podem fazer parar de funcionar o comando slash existente. Tem a certeza de que pretende atualizá-lo?",
+  "update_outgoing_webhook.confirm": "Editar Webhooks de Saída",
+  "update_outgoing_webhook.question": "Suas alterações podem fazer parar de funcionar webhook de saída existente. Tem a certeza de que pretende atualizá-lo?",
   "update_outgoing_webhook.update": "Atualizar",
   "upload_overlay.info": "Soltar um arquivo para enviá-lo.",
   "user.settings.advance.embed_preview": "Para o primeiro link da web em uma mensagem, exiba uma visualização do conteúdo do site abaixo da mensagem, se disponível",
@@ -1956,8 +1969,8 @@
   "user.settings.advance.on": "Ligado",
   "user.settings.advance.preReleaseDesc": "Verifique todos os recursos de pré-lançamento que você gostaria de visualizar.  Você também pode precisar atualizar a página antes das configuração terem efeito.",
   "user.settings.advance.preReleaseTitle": "Visualizar recursos de pré-lançamento",
-  "user.settings.advance.sendDesc": "Se habilitado 'ENTER' insere uma nova linha e 'CTRL + ENTER' envia a mensagem.",
-  "user.settings.advance.sendTitle": "Enviar mensagens com CTRL + ENTER",
+  "user.settings.advance.sendDesc": "Se habilitado ENTER insere uma nova linha e CTRL+ENTER envia a mensagem.",
+  "user.settings.advance.sendTitle": "Enviar mensagens com CTRL+ENTER",
   "user.settings.advance.slashCmd_autocmp": "Ativar aplicação externa para autocompletar comandos slash",
   "user.settings.advance.title": "Configurações Avançadas",
   "user.settings.advance.webrtc_preview": "Ativar a capacidade de fazer e receber chamadas WebRTC um-pra-um",
diff --git a/webapp/i18n/ru.json b/webapp/i18n/ru.json
index e826b5183..a3ad7388f 100644
--- a/webapp/i18n/ru.json
+++ b/webapp/i18n/ru.json
@@ -529,7 +529,7 @@
   "admin.metrics.listenAddressDesc": "Адрес, прослушиваемый сервером для предоставления метрик производительности",
   "admin.metrics.listenAddressEx": "Например: \":8065\"",
   "admin.metrics.listenAddressTitle": "Прослушиваемый адрес:",
-  "admin.mfa.bannerDesc": "Многофакторная проверка подлинности доступна только для учетных записей со входом через адрес эл. почты или LDAP. Если на вашей системе есть пользователи с другими методами входа, рекомендуем настроить многофакторную проверку подлинности напрямую через провайдер SSO или SAML.",
+  "admin.mfa.bannerDesc": "<a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>Multi-factor authentication</a> is available for accounts with AD/LDAP or email login. If other login methods are used, MFA should be configured with the authentication provider.",
   "admin.mfa.cluster": "Высокий",
   "admin.mfa.title": "Включить многофакторную аутентификацию",
   "admin.nav.help": "Помощь",
@@ -689,7 +689,7 @@
   "admin.service.developerDesc": "Когда включено, на красной панели сверху будут показываться ошибки Javascript. Не рекомендуется включать на боевом сервере. ",
   "admin.service.developerTitle": "Включить режим разработчика:",
   "admin.service.enforcMfaTitle": "Принудительная многофакторная аутентификация:",
-  "admin.service.enforceMfaDesc": "Когда включено, пользователи системы будут обязаны установить <a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>многофакторную аутентификацию.</a> При любом входе в систему они будут перенаправляться на страницу установки многофакторной аутентификации до тех пор, пока успешно не добавят MFA к своей учетной записи. <br/><br/>Рекомендуется включать эту опцию не в часы пик, когда люди, скорее всего, используют систему. Новые пользователи будут обязаны установить многофакторную аутентификацию после того, как сначала зарегистрируются в системе. После включения этой опции пользователи будут не в состоянии отключить многофакторную аутентификацию, пока эта опция не будет отключена.<br/><br/>Обратите внимание на то, что многофакторная аутентификация доступна только для учетных записей с LDAP и с методом входа в систему через почту. Mattermost не осуществит многофакторную аутентификацию для других способов входа. Если в Вашей системе есть пользователи, использующие другие методы входа, рекомендуется, чтобы Вы установили и осуществили многофакторную аутентификацию напрямую через провайдера SAML или SSO.",
+  "admin.service.enforceMfaDesc": "When true, <a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>multi-factor authentication</a> is required for login. New users will be required to configure MFA on signup. Logged in users without MFA configured are redirected to the MFA setup page until configuration is complete.<br/><br/>If your system has users with login methods other than AD/LDAP and email, MFA must be enforced with the authentication provider outside of Mattermost.",
   "admin.service.forward80To443": "Перенаправить 80 порт на 443:",
   "admin.service.forward80To443Description": "Перенаправляет весь незащищённый трафик с 80 порта на 443",
   "admin.service.googleDescription": "Задайте этот ключ, чтобы включить отображение подписей к предпросмотрам встроенных YouTube-видео. Без этого ключа предпросмотры YouTube-видео по прежнему будут создаваться на основе гиперссылок, появляющихся в сообщениях или комментариях, но название видео отображаться не будет. Посмотрите <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target='_blank'>Google Developers Tutorial</a>, для того чтобы узнать, как получить ключ.",
@@ -706,7 +706,7 @@
   "admin.service.listenAddress": "Прослушиваемый адрес:",
   "admin.service.listenDescription": "Адрес и порт для привязки и ожидания соединений. Указание \":8065\" приведет к привязке ко всем сетевым интерфейсам. Указание \"127.0.0.1:8065\" приведет к привязке к сетевому интерфейсу, с указанным IP-адресом. Если вы выбираете порт нижнего уровня (так называемые \"системные порты\" или \"хорошо известные порты\", в диапазоне 0-1023), вы должны обладать необходимыми правами, для привязку к этому порту. На Linux вы можете выполнить: \"sudo setcap cap_net_bind_service=+ep ./bin/platform\", что позволит Mattermost привязываться к известным портам.",
   "admin.service.listenExample": "Например: \":8065\"",
-  "admin.service.mfaDesc": "When true, users will be given the option to add multi-factor authentication to their account. They will need a smartphone and an authenticator app such as Google Authenticator.",
+  "admin.service.mfaDesc": "When true, users with AD/LDAP or email login can add multi-factor authentication to their account using Google Authenticator.",
   "admin.service.mfaTitle": "Включить мультифакторную аутентификацию:",
   "admin.service.mobileSessionDays": "Длина сессии на мобильных устройствах (дней):",
   "admin.service.mobileSessionDaysDesc": "Количество дней с последнего ввода пользователем своих учетных данных до истечения срока пользовательской сессии. После изменения этого параметра, новая продолжительность сессии вступит в силу после следующего ввода пользователями своих учетных данных.",
@@ -1050,7 +1050,7 @@
   "change_url.close": "Закрыть",
   "change_url.endWithLetter": "Должен заканчиваться буквой или цифрой",
   "change_url.invalidUrl": "Некорректный URL",
-  "change_url.longer": "Должен быть больше двух символов",
+  "change_url.longer": "URL must be two or more characters.",
   "change_url.noUnderscore": "Не может содержать два подчеркивания подряд.",
   "change_url.startWithLetter": "Должен начинаться с буквы или цифры",
   "channelHeader.addToFavorites": "Добавить в избранное",
@@ -1132,7 +1132,7 @@
   "channel_modal.publicChannel2": "Создать новый публичный канал. ",
   "channel_modal.purpose": "Назначение",
   "channel_modal.purposeEx": "E.g.: \"A channel to file bugs and improvements\"",
-  "channel_notification.push": "Send mobile push notifications",
+  "channel_notification.push": "Отправить мобильное push-уведомление",
   "channel_notifications.allActivity": "При любой активности",
   "channel_notifications.allUnread": "При любых непрочитанных сообщениях",
   "channel_notifications.globalDefault": "По умолчанию глобально ({notifyLevel})",
@@ -1448,6 +1448,7 @@
   "help.messaging.write": "**Написать сообщение** используйте поле ввода текста внизу Mattermost. Нажмите **ENTER** для отправки сообщения. Используйте **Shift+ENTER** для перехода на новую строку без отправки сообщения.",
   "installed_command.header": "Слэш-команды",
   "installed_commands.add": "Добавить слэш-команду",
+  "installed_commands.delete.confirm": "This action permanently deletes the slash command and breaks any integrations using it. Are you sure you want to delete it?",
   "installed_commands.empty": "Команда не найдена",
   "installed_commands.header": "Слэш-команды",
   "installed_commands.help": "Создание команды слэш для использования c внешними интеграциями. Пожалуйста, смотрите  {link}, чтобы узнать больше.",
@@ -1455,6 +1456,7 @@
   "installed_commands.search": "Поиск по слэш-командам",
   "installed_commands.unnamed_command": "Неизвестная Slash-команда",
   "installed_incoming_webhooks.add": "Добавить входящий Webhook",
+  "installed_incoming_webhooks.delete.confirm": "This action permanently deletes the incoming webhook and breaks any integrations using it. Are you sure you want to delete it?",
   "installed_incoming_webhooks.empty": "Не обнаружено входящих webhook'ов",
   "installed_incoming_webhooks.header": "Входящие Webhook'и",
   "installed_incoming_webhooks.help": "Создание входящих webhook URL для использования с внешними интеграциями. Пожалуйста, смотрите ссылку {link}, чтобы узнать больше.",
@@ -1480,6 +1482,7 @@
   "installed_oauth_apps.add": "Подключить OAuth 2.0 приложение",
   "installed_oauth_apps.callbackUrls": "Callback URLs (Один на каждую строку)",
   "installed_oauth_apps.cancel": "Отмена",
+  "installed_oauth_apps.delete.confirm": "This action permanently deletes the OAuth 2.0 application and breaks any integrations using it. Are you sure you want to delete it?",
   "installed_oauth_apps.description": "Описание",
   "installed_oauth_apps.empty": "OAuth 2.0 приложения не найдены",
   "installed_oauth_apps.header": "OAuth 2.0 приложения",
@@ -1495,6 +1498,7 @@
   "installed_oauth_apps.trusted.no": "Нет",
   "installed_oauth_apps.trusted.yes": "Да",
   "installed_outgoing_webhooks.add": "Добавить исходящий Webhook",
+  "installed_outgoing_webhooks.delete.confirm": "This action permanently deletes the outgoing webhook and breaks any integrations using it. Are you sure you want to delete it?",
   "installed_outgoing_webhooks.empty": "Не обнаружено исходящих вебхуков",
   "installed_outgoing_webhooks.header": "Исходящие Webhook'и",
   "installed_outgoing_webhooks.help": "Создание исходящих webhook URL для использования c внешними интеграцями. Пожалуйста, смотрите {link}, чтобы узнать больше.",
@@ -1504,6 +1508,8 @@
   "integrations.add": "Добавить",
   "integrations.command.description": "Команды вызывают отправляют события к внешним приложениям",
   "integrations.command.title": "Команда",
+  "integrations.delete.confirm.button": "Удалить",
+  "integrations.delete.confirm.title": "Delete Integration",
   "integrations.done": "Завершено",
   "integrations.edit": "Редактировать",
   "integrations.header": "Интеграция",
@@ -1633,10 +1639,17 @@
   "more_channels.title": "Больше каналов",
   "more_direct_channels.close": "Закрыть",
   "more_direct_channels.message": "Сообщение",
+  "more_direct_channels.new_convo_note": "This will start a new conversation. If you’re adding a lot of people, consider creating a private group instead.",
+  "more_direct_channels.new_convo_note.full": "You’ve reached the maximum number of people for this conversation. Consider creating a private group instead.",
   "more_direct_channels.title": "Личные сообщения",
   "msg_typing.areTyping": "{users} и {last} печатают...",
   "msg_typing.isTyping": "{user} печатает...",
   "msg_typing.someone": "Кто-то",
+  "multiselect.go": "Go",
+  "multiselect.instructions": "Use up/down arrows to navigate and enter to select",
+  "multiselect.numPeopleRemaining": "You can add {num, number} more {num, plural, =0 {people} one {person} other {people}}. ",
+  "multiselect.numRemaining": "You can add {num, number} more",
+  "multiselect.placeholder": "Search and add members",
   "navbar.addMembers": "Добавить участников",
   "navbar.click": "Щелкните здесь",
   "navbar.delete": "Удалить канал...",
@@ -1730,7 +1743,7 @@
   "rename_channel.defaultError": " - Нельзя изменить для канала по умолчанию",
   "rename_channel.displayName": "Имя",
   "rename_channel.displayNameHolder": "Введите имя",
-  "rename_channel.handleHolder": "только цифры и строчные буквы",
+  "rename_channel.handleHolder": "Должны быть буквы или цифры в нижнем регистре",
   "rename_channel.lowercase": "Должны быть буквы или цифры в нижнем регистре",
   "rename_channel.maxLength": "Содержание поля должно быть короче 22 байт",
   "rename_channel.required": "Обязательное поле",
diff --git a/webapp/i18n/zh_CN.json b/webapp/i18n/zh_CN.json
index 5ed2a539c..ad35efe10 100644
--- a/webapp/i18n/zh_CN.json
+++ b/webapp/i18n/zh_CN.json
@@ -138,7 +138,7 @@
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "第一个完全符合触发关键字",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "第一字以触发关键字为开头",
   "admin.advance.cluster": "高可用性 (Beta)",
-  "admin.advance.metrics": "性能监视 (Beta)",
+  "admin.advance.metrics": "性能监视",
   "admin.audits.reload": "重新载入用户活动日志",
   "admin.audits.title": "用户活动日志",
   "admin.authentication.email": "邮件验证",
@@ -318,7 +318,7 @@
   "admin.general.policy.permissionsAdmin": "团队和系统管理员",
   "admin.general.policy.permissionsAll": "所有团队成员",
   "admin.general.policy.permissionsAllChannel": "所有频道成员",
-  "admin.general.policy.permissionsChannelAdmin": "Channel, Team and System Admins",
+  "admin.general.policy.permissionsChannelAdmin": "频道，团队和系统管理员",
   "admin.general.policy.permissionsDeletePostAdmin": "团队和系统管理员",
   "admin.general.policy.permissionsDeletePostAll": "消息作者可以删除他们自己的消息，同时管理员可以删除任何消息",
   "admin.general.policy.permissionsDeletePostSystemAdmin": "系统管理员",
@@ -529,7 +529,7 @@
   "admin.metrics.listenAddressDesc": "服务端监听的地址以公开性能指标数据。",
   "admin.metrics.listenAddressEx": "例如：\":8065\"",
   "admin.metrics.listenAddressTitle": "监听地址：",
-  "admin.mfa.bannerDesc": "多重验证只能用在使用 LDAP 或邮箱地址登入方式的帐号。如果您的系统有用户使用其他登入方式，我们推荐您在 SSO 或 SAML 提供商直接设置多重验证。",
+  "admin.mfa.bannerDesc": "<a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>多重验证</a>可以在使用 AD/LDAP 或邮箱地址登入的帐号使用。如果使用其他登入方式，多重验证需要在验证提供商设置。",
   "admin.mfa.cluster": "高",
   "admin.mfa.title": "多重验证",
   "admin.nav.help": "帮助",
@@ -566,9 +566,9 @@
   "admin.password.requirementsDescription": "有效的密码所需的字符类型。",
   "admin.password.symbol": "至少有一个符号 (例如：\"~!@#$%^&*()\")",
   "admin.password.uppercase": "至少有一个大写字母",
-  "admin.privacy.showEmailDescription": "When false, hides the email address of members from everyone except System Administrators.",
+  "admin.privacy.showEmailDescription": "当设为否时，从除了系统管理员外隐藏成员的电子邮件。",
   "admin.privacy.showEmailTitle": "显示电子邮箱地址：",
-  "admin.privacy.showFullNameDescription": "When false, hides the full name of members from everyone except System Administrators. Username is shown in place of full name.",
+  "admin.privacy.showFullNameDescription": "当设为否时，从除了系统管理员外隐藏成员的姓名。姓名将被用户名取代。",
   "admin.privacy.showFullNameTitle": "显示全名：",
   "admin.purge.button": "清除所有缓存",
   "admin.purge.loading": " 加载中...",
@@ -689,7 +689,7 @@
   "admin.service.developerDesc": "开启时，Javascript错误将显示在页面顶端红条里。不推荐在正式环境使用。",
   "admin.service.developerTitle": "开启开发者模式：",
   "admin.service.enforcMfaTitle": "强制多重身份验证：",
-  "admin.service.enforceMfaDesc": "当设为是时，在此系统的用户需要设置<a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>多重验证</a>。任何登入的用户将转跳至设置多重验证页面直到他们成功添加多重验证到他们的帐号。<br/><br/>建议您在非高峰期，当使用的用户较少时候开启。新用户将在他们注册时候设置多重验证。设置后，用户将无法删除多重验证除非关闭强制。<br/><br/>需要注意的是，多重验证只有对用 LDAP 和邮箱地址登入方式的帐号可用。Mattermost 将不会对使用其他登入方式的帐号强制多重验证。如果有用户在您的系统使用其他登入方式，我们建议您直接到 SSO 或 SMAL 提供商那里设定强制多重验证。",
+  "admin.service.enforceMfaDesc": "当设为是时，必须需要<a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>多重验证</a>登入。新用户将在注册时候设置多重验证。已登入并未设置多重验证的用户将重指向多重验证设置页面直到配置完成。<br/><br/>如果您的系统有 AD/LDAP 或电子邮件登入方式以外的用户，多重验证必须在 Mattermost 外的验证提供商设置。",
   "admin.service.forward80To443": "映射端口 80 到 443:",
   "admin.service.forward80To443Description": "映射所有非安全流量从端口 80 到安全端口 443",
   "admin.service.googleDescription": "设置此钥匙以开启内嵌YouTube视频预览。如果没有此钥匙，YouTube预览仍然会在消息或评论中显示但不会显示视频标题。参见<a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target='_blank'>Google Developers Tutorial</a>教程以获得钥匙。",
@@ -706,7 +706,7 @@
   "admin.service.listenAddress": "监听地址：",
   "admin.service.listenDescription": "绑定和监听的地址和端口。指定 \":8065\" 将会绑定所有网络接口。指定 \"127.0.0.1:8065\" 将只绑定拥有此 IP 的网络接口。如果您选择一个低级端口 (叫 \"system ports\" 或 \"well-known ports\" 于 0-1023 之间)，您必须要拥有权限才能绑定到此端口。在 Linux 上您可以使用：\"sudo setcap cap_net_bind_service=+ep ./bin/platform\" 以允许 Mattermost 绑定知名端口。",
   "admin.service.listenExample": "例如 \":8065\"",
-  "admin.service.mfaDesc": "如果正确，用户将被提供对其账户添加多重因素身份验证的选项。他们需要一部智能手机和一个像Google Authenticator一样的身份验证器应用程序。",
+  "admin.service.mfaDesc": "当设为是时，使用 AD/LDAP 或电子邮件登入的用户可以使用添加 Google Authenticator 多重验证到他们的帐号。",
   "admin.service.mfaTitle": "启用多重身份验证：",
   "admin.service.mobileSessionDays": "移动应用会话时长 (天)：",
   "admin.service.mobileSessionDaysDesc": "从用户上一次输入他们的认证到会话过期的天数。修改此设定后，新的会话时常将在用户下一次输入认证后生效。",
@@ -768,7 +768,7 @@
   "admin.sidebar.logging": "日志",
   "admin.sidebar.login": "登录",
   "admin.sidebar.logs": "日志",
-  "admin.sidebar.metrics": "性能监视 (Beta)",
+  "admin.sidebar.metrics": "性能监视",
   "admin.sidebar.nativeAppLinks": "Mattermost 应用链接",
   "admin.sidebar.notifications": "通知",
   "admin.sidebar.oauth": "OAuth 2.0",
@@ -1048,11 +1048,11 @@
   "calling_screen": "呼叫中",
   "center_panel.recent": "点击这里跳转到最近的消息。",
   "change_url.close": "关闭",
-  "change_url.endWithLetter": "必须以字母或数字结尾",
+  "change_url.endWithLetter": "网址必须以字母或数字结尾。",
   "change_url.invalidUrl": "无效的网址",
-  "change_url.longer": "必须超过两个字符",
-  "change_url.noUnderscore": "不能包含两个连续的下划线。",
-  "change_url.startWithLetter": "必须以字母或数字开始",
+  "change_url.longer": "网址必须两个或更多字符。",
+  "change_url.noUnderscore": "网址不能包含两个连续的下划线。",
+  "change_url.startWithLetter": "网址必须以字母或数字开始。",
   "channelHeader.addToFavorites": "添加到收藏",
   "channelHeader.removeFromFavorites": "从收藏中移除",
   "channel_flow.alreadyExist": "已存在使用该 URL 的频道",
@@ -1132,7 +1132,7 @@
   "channel_modal.publicChannel2": "创建一个任何人都能加入的新公共频道。",
   "channel_modal.purpose": "用途",
   "channel_modal.purposeEx": "例如：\"用于提交问题和建议的频道\"",
-  "channel_notification.push": "Send mobile push notifications",
+  "channel_notification.push": "发送手机推送通知",
   "channel_notifications.allActivity": "所有操作",
   "channel_notifications.allUnread": "所有未读消息",
   "channel_notifications.globalDefault": "默认全局（{notifyLevel}）",
@@ -1140,7 +1140,7 @@
   "channel_notifications.never": "从不",
   "channel_notifications.onlyMentions": "仅对提及",
   "channel_notifications.override": "选择一个“默认”以外的选项将会重写全局通知设置。桌面通知在Firefox、Safari和Chrome中有效。",
-  "channel_notifications.overridePush": "Selecting an option other than \"Global default\" will override the global notification settings for mobile push notifications in account settings. Push notifications must be enabled by the System Admin.",
+  "channel_notifications.overridePush": "选择 \"全局默认\" 以外的选项将覆盖帐号设定中的移动推送通知全局通知设定。推送通知必须由系统管理员启用。",
   "channel_notifications.preferences": "通知偏好 ",
   "channel_notifications.sendDesktop": "发送桌面通知",
   "channel_notifications.unreadInfo": "有未读消息时，侧边栏的频道名称粗体显示。只有当您被提及时选择“仅对提及”会加粗频道名称。",
@@ -1221,7 +1221,7 @@
   "create_team.team_url.required": "此栏必须填写",
   "create_team.team_url.taken": "URL已被使用或含有预留词",
   "create_team.team_url.teamUrl": "团队URL",
-  "create_team.team_url.unavailable": "这个URL已使用或不可用。请尝试其他。",
+  "create_team.team_url.unavailable": "此网址不可用。请重新尝试。",
   "create_team.team_url.webAddress": "选择您的新团队网址：",
   "custom_emoji.empty": "未找到自定义表情符",
   "custom_emoji.header": "自定义表情符",
@@ -1360,7 +1360,7 @@
   "get_team_invite_link_modal.helpDisabled": "您的团队已禁止创建用户。详情请联系您的团队管理员。",
   "get_team_invite_link_modal.title": "团队邀请链接",
   "help.attaching.downloading": "#### 下载文件\n点击文件预览图旁边的下载图标或者打开文件预览后点击**下载**。",
-  "help.attaching.dragdrop": "#### 拖放\n从电脑拖动一个或多个文件到右侧栏或中间栏上传文件。拖放文件到消息输入框，你页可以附加消息并按**回车**发送。",
+  "help.attaching.dragdrop": "#### 拖放\n从电脑拖动一个或多个文件到右侧栏或中间栏上传文件。拖放文件到消息输入框，您也可以附加消息并按**回车**发送。",
   "help.attaching.icon": "#### 附件图标\n除此之外，也可以点击消息输入框里的回形针来上传文件。当您在系统的文件选择对话框里选择想要上传的文件后点击**打开**以上传文件到输入框。另外可以附加信息后按**回车**发布。",
   "help.attaching.limitations": "## 文件大小限制\nMattermost支持最多每贴5个附件，每个文件最大50MB。",
   "help.attaching.methods": "## 附件方式\n用拖放或点击消息输入框里的附件图标以附上文件。",
@@ -1381,7 +1381,7 @@
   "help.composing.deleting": "## 删除消息\n点击您在自己发送的消息中想删除的消息旁的 **[...]** 文字图标，然后点击 **删除**。系统或团队管理员可以删除任何在系统或团队中的消息。",
   "help.composing.editing": "## 修改消息\n点击您在自己发送的消息中想删除的消息旁的 **[...]** 文字图标，然后点击 **修改**。在修改消息内容后，按 **回车** 以保存改动。消息内容不触发新的 @mention 通知，桌面通知或通知声音。",
   "help.composing.linking": "## 消息链接\n**永久链接** 功能可以给任何消息创建链接。共享此链接给此频道的其他用户让他们直接访问消息归档里的消息。不在此频道的成员无法看永久链接。点任何消息旁边 **[...]** 图标 > **永久链接** > **复制链接** 来获取链接。",
-  "help.composing.posting": "## 发布消息\n在文字输入框里打入消息，然后按 **ENTER** 发送。用 **Shift + ENTER** 将在不发送消息下换行。如果想使用 **Ctrl+ENTER** 发信息，请到 **主菜单 > 帐号设定 > 用 Ctrl + Enter 发消息**。",
+  "help.composing.posting": "## 发布消息\n在文字输入框里打入消息，然后按 ENTER 发送。用 Shift + ENTER 将在不发送消息下换行。如果想使用 Ctrl+ENTER 发信息，请到 **主菜单 > 帐号设定 > 用 Ctrl + Enter 发消息**。",
   "help.composing.posts": "#### 发文\n发文被视为母消息。它们通常时回复串的开头。发文是从中间面板下方的输入框发送。",
   "help.composing.replies": "#### 回复\n点击任意消息旁的回复图标来回复该消息。此操作将打开显示消息串的右边栏，然后您可以编写并发送您的回复。回复会有少许的缩进来标识它们时回复母消息的子消息。\n\n当在右边栏编写回复时，在上方点击展开/合并图标以便更容易阅读。",
   "help.composing.title": "# 发送信息\n_____",
@@ -1445,9 +1445,10 @@
   "help.messaging.notify": "**通知团友** 当他们需要时输入 `@用户名`。",
   "help.messaging.reply": "点击消息文字旁的的回复图标来**回复消息**。",
   "help.messaging.title": "# 消息基础\n_____",
-  "help.messaging.write": "用 Mattermost 底部的文字输入框 **编写消息**。按 **回车** 来发送消息。用 **SHIFT+回车** 以不发消息情况下换行。",
+  "help.messaging.write": "用 Mattermost 底部的文字输入框 **编写消息**。按 回车 来发送消息。用 SHIFT+回车 以不发消息情况下换行。",
   "installed_command.header": "斜杠命令",
   "installed_commands.add": "添加斜杠命令",
+  "installed_commands.delete.confirm": "此操作降永久删除斜杠命令并让依赖的集成无法工作。您确定要删除它吗？",
   "installed_commands.empty": "未找到命令",
   "installed_commands.header": "斜杠命令",
   "installed_commands.help": "创建与外部系统集成的斜杠命令。详情请见 {link} 。",
@@ -1455,6 +1456,7 @@
   "installed_commands.search": "搜索斜杠命令",
   "installed_commands.unnamed_command": "未命名斜杠命令",
   "installed_incoming_webhooks.add": "添加引入勾子",
+  "installed_incoming_webhooks.delete.confirm": "此操作降永久删除传入的 webhook 并让依赖的集成无法工作。您确定要删除它吗？",
   "installed_incoming_webhooks.empty": "没有找到传入webhooks",
   "installed_incoming_webhooks.header": "引入Webhooks",
   "installed_incoming_webhooks.help": "创建对内的网络钩子链接以便与内部系统集成。想了解更多请参考 {link}",
@@ -1480,6 +1482,7 @@
   "installed_oauth_apps.add": "添加 OAuth 2.0 应用",
   "installed_oauth_apps.callbackUrls": "回调网址 (每行一个)",
   "installed_oauth_apps.cancel": "取消",
+  "installed_oauth_apps.delete.confirm": "此操作降永久删除 OAuth 2.0 应用并让依赖的集成无法工作。您确定要删除它吗？",
   "installed_oauth_apps.description": "描述",
   "installed_oauth_apps.empty": "没有找到 OAuth 2.0 应用",
   "installed_oauth_apps.header": "OAuth 2.0 应用",
@@ -1495,6 +1498,7 @@
   "installed_oauth_apps.trusted.no": "否",
   "installed_oauth_apps.trusted.yes": "是",
   "installed_outgoing_webhooks.add": "添加对外Webhooks",
+  "installed_outgoing_webhooks.delete.confirm": "此操作降永久删除传出的 webhook 并让依赖的集成无法工作。您确定要删除它吗？",
   "installed_outgoing_webhooks.empty": "没找到传出webhooks",
   "installed_outgoing_webhooks.header": "对外Webhooks",
   "installed_outgoing_webhooks.help": "创建对外的网络钩子链接以便与外部部系统集成。想了解更多请参考 {link}",
@@ -1504,6 +1508,8 @@
   "integrations.add": "添加",
   "integrations.command.description": "发送事件到外部整合的斜杠命令",
   "integrations.command.title": "斜线命令",
+  "integrations.delete.confirm.button": "删除",
+  "integrations.delete.confirm.title": "删除集成",
   "integrations.done": "完成",
   "integrations.edit": "编辑",
   "integrations.header": "集成",
@@ -1633,10 +1639,17 @@
   "more_channels.title": "更多频道",
   "more_direct_channels.close": "关闭",
   "more_direct_channels.message": "消息",
+  "more_direct_channels.new_convo_note": "这将创建新对话。如果你在添加很多用户，请考虑创建私有租。",
+  "more_direct_channels.new_convo_note.full": "您已达到此对话的最多人数。请考虑创建私有租。",
   "more_direct_channels.title": "私信",
   "msg_typing.areTyping": "{users}和{last}正在输入...",
   "msg_typing.isTyping": "{user}正在输入...",
   "msg_typing.someone": "有人",
+  "multiselect.go": "转到",
+  "multiselect.instructions": "使用上/下键选择并用回车做选择",
+  "multiselect.numPeopleRemaining": "您还可以添加 {num, number} 位用户。",
+  "multiselect.numRemaining": "您还可以添加 {num, number} 位",
+  "multiselect.placeholder": "搜索并添加成员",
   "navbar.addMembers": "添加成员",
   "navbar.click": "请点击这里",
   "navbar.delete": "删除频道...",
@@ -1730,7 +1743,7 @@
   "rename_channel.defaultError": "-不能改变默认频道",
   "rename_channel.displayName": "显示名称",
   "rename_channel.displayNameHolder": "输入显示名",
-  "rename_channel.handleHolder": "小写字母数字#39;只有",
+  "rename_channel.handleHolder": "小写字母符",
   "rename_channel.lowercase": "必须小写字母数字字符",
   "rename_channel.maxLength": "这个字段必须少于22个字符",
   "rename_channel.required": "该字段不能为空",
@@ -1940,8 +1953,8 @@
   "update_command.question": "您的修改可能破坏现有的斜杠命令。您确定要更新吗？",
   "update_command.update": "更新",
   "update_incoming_webhook.update": "更新",
-  "update_outgoing_webhook.confirm": "添加对外Webhooks",
-  "update_outgoing_webhook.question": "您的修改可能破坏现有的斜杠命令。您确定要更新吗？",
+  "update_outgoing_webhook.confirm": "修改对外的 Webhooks",
+  "update_outgoing_webhook.question": "您的修改可能破坏现有的对外的 webhook。您确定要更新吗？",
   "update_outgoing_webhook.update": "更新",
   "upload_overlay.info": "拖动文件上传。",
   "user.settings.advance.embed_preview": "如果邮件中的第一个网络链接可用，在邮件下方会显示网站内容的预览",
@@ -1956,8 +1969,8 @@
   "user.settings.advance.on": "开启",
   "user.settings.advance.preReleaseDesc": "检查您想预览的任何预发布功能。在设置生效前，您可能还需要刷新页面。",
   "user.settings.advance.preReleaseTitle": "预览预发布功能",
-  "user.settings.advance.sendDesc": "启用时，\"Enter\" 键插入行而按 \"Ctrl+Enter\" 键提交消息。",
-  "user.settings.advance.sendTitle": "按 Ctrl+Enter 发送消息",
+  "user.settings.advance.sendDesc": "启用时，回车键插入行而按 Ctrl+回车 键提交消息。",
+  "user.settings.advance.sendTitle": "按 CTRL+ENTER 发送消息",
   "user.settings.advance.slashCmd_autocmp": "启用外部应用程序提供斜杠命令的自动补全功能",
   "user.settings.advance.title": "高级设置",
   "user.settings.advance.webrtc_preview": "开启使用 WebRTC 的一对一通话",
@@ -1989,7 +2002,7 @@
   "user.settings.display.channelDisplayTitle": "频道显示模式",
   "user.settings.display.channeldisplaymode": "选择中间栏的宽度。",
   "user.settings.display.clockDisplay": "时钟显示",
-  "user.settings.display.collapseDesc": "Set whether previews of image links show as expanded or collapsed by default. This setting can also be controlled using the slash commands /expand and /collapse.",
+  "user.settings.display.collapseDesc": "设置默认情况下图片链接的预览是展开还是折叠。此设置也可以使用斜杠命令 /expand 和 /collapse 控制。",
   "user.settings.display.collapseDisplay": "图片链接预览默认显示",
   "user.settings.display.collapseOff": "已折叠",
   "user.settings.display.collapseOn": "已展开",
@@ -2132,7 +2145,7 @@
   "user.settings.notifications.emailNotifications": "邮件通知",
   "user.settings.notifications.header": "通知",
   "user.settings.notifications.info": "桌面通知可在 IE11、Edge、Safari、Chrome 以及 Mattermost 桌面应用使用。",
-  "user.settings.notifications.mentionsInfo": "Mentions trigger when someone sends a message that includes your username (\"@{username}\") or any of the options selected above.",
+  "user.settings.notifications.mentionsInfo": "提及会在某人发送含有您的用户名 (\"@{username}\") 或者任何以上选项的消息时被触发。",
   "user.settings.notifications.never": "从不",
   "user.settings.notifications.noWords": "敏感词没有配置",
   "user.settings.notifications.off": "关闭",
diff --git a/webapp/i18n/zh_TW.json b/webapp/i18n/zh_TW.json
index a575596d0..320af58c5 100644
--- a/webapp/i18n/zh_TW.json
+++ b/webapp/i18n/zh_TW.json
@@ -138,7 +138,7 @@
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "第一個字完全符合觸發關鍵字",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "第一個字以觸發關鍵字為開頭",
   "admin.advance.cluster": "高可用性 (Beta)",
-  "admin.advance.metrics": "效能監視 (Beta)",
+  "admin.advance.metrics": "效能監視",
   "admin.audits.reload": "重新載入使用者活動記錄",
   "admin.audits.title": "使用者活動記錄",
   "admin.authentication.email": "電子郵件認證",
@@ -318,7 +318,7 @@
   "admin.general.policy.permissionsAdmin": "團隊跟系統管理員",
   "admin.general.policy.permissionsAll": "團隊全員",
   "admin.general.policy.permissionsAllChannel": "所有頻道成員",
-  "admin.general.policy.permissionsChannelAdmin": "Channel, Team and System Admins",
+  "admin.general.policy.permissionsChannelAdmin": "頻道、團隊與系統管理員",
   "admin.general.policy.permissionsDeletePostAdmin": "團隊跟系統管理員",
   "admin.general.policy.permissionsDeletePostAll": "訊息作者可以刪除自己的訊息，管理者可以刪除任意訊息",
   "admin.general.policy.permissionsDeletePostSystemAdmin": "系統管理員",
@@ -529,7 +529,7 @@
   "admin.metrics.listenAddressDesc": "伺服器將監聽以公開效能計量值的位址。",
   "admin.metrics.listenAddressEx": "如：\":8065\"",
   "admin.metrics.listenAddressTitle": "監聽位址：",
-  "admin.mfa.bannerDesc": "多重要素驗證僅供以 LDAP 或是電子郵件登入的帳號使用。如果系統中有使用者使用其他的登入方式，我們建議直接對 SSO 或 SAML 提供者設定多重要素驗證。",
+  "admin.mfa.bannerDesc": "使用 AD/LDAP 或 電子郵件登入的帳號可以使用<a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>多重要素驗證</a>。如果使用了其他登入方式，多重要素驗證必須要在認證提供者處設定。",
   "admin.mfa.cluster": "高",
   "admin.mfa.title": "多重要素驗證",
   "admin.nav.help": "說明",
@@ -566,9 +566,9 @@
   "admin.password.requirementsDescription": "有效密碼所應有的字元類型。",
   "admin.password.symbol": "至少一個符號(\"~!@#$%^&*()\")",
   "admin.password.uppercase": "至少一個大寫英文字母",
-  "admin.privacy.showEmailDescription": "When false, hides the email address of members from everyone except System Administrators.",
+  "admin.privacy.showEmailDescription": "選擇否時，對系統管理員以外的所有人隱藏成員的電子郵件位址",
   "admin.privacy.showEmailTitle": "顯示電子郵件地址：",
-  "admin.privacy.showFullNameDescription": "When false, hides the full name of members from everyone except System Administrators. Username is shown in place of full name.",
+  "admin.privacy.showFullNameDescription": "選擇否時，對系統管理員以外的所有人隱藏成員的全名。顯示全名處改為顯示使用者名稱。",
   "admin.privacy.showFullNameTitle": "顯示全名：",
   "admin.purge.button": "清除所有快取",
   "admin.purge.loading": " 載入中...",
@@ -689,7 +689,7 @@
   "admin.service.developerDesc": "啟用時，Javascript 錯誤會顯示在使用者界面頂端上的紅色橫欄。不建議在正式環境中使用。",
   "admin.service.developerTitle": "啟用開發者模式：",
   "admin.service.enforcMfaTitle": "強制使用多重要素驗證：",
-  "admin.service.enforceMfaDesc": "啟用時，系統上的使用者將會被要求設定<a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>多重要素驗證</a>。所有已登入的使用者將會被重導至多重要素驗證設定頁面直到他們成功的將多重要素驗證加入帳號。<br/><br/>建議您在非尖峰時間，當使用者比較不會使用系統時啟用強制設定。新使用者將會在他們登錄時被要求設定。一旦設定完畢，除非強制設定被解除，使用者將無法移除多重要素驗證。<br/><br/>注意：多重要素驗證僅供 LDAP 或電子郵件登入帳號使用。Mattermost 將不會對其他登入方式強制要求多重要素驗證。如果系統中有使用者使用其他的登入方式，我們建議直接對 SSO 或 SAML 提供者設定強制要求多重要素驗證。",
+  "admin.service.enforceMfaDesc": "啟用時，登入必須使用<a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>多重要素驗證</a>。新的使用者將會在登錄時被要求設定多重要素驗證。已登入但沒有設定多重要素驗證的使用者將會被重新導向至多重要素驗證設定頁面直到完成設定為止。<br/><br/>如果使用了 AD/LDAP 與電子郵件以外的登入方式，多重要素驗證必須要在認證提供者處設定。 ",
   "admin.service.forward80To443": "轉送80通訊埠至443：",
   "admin.service.forward80To443Description": "轉送所有經由80通訊埠的不安全連線至安全的443通訊埠",
   "admin.service.googleDescription": "設定此金鑰以啟用顯示內嵌預覽 YouTube 影片的標題。即使沒有金鑰，訊息或註解有連結一樣會建立 YouTube 影片預覽，但是這些預覽無法顯示影片標題。請看 <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target='_blank'>Google Developers Tutorial</a> 的指示以取得金鑰。",
@@ -706,7 +706,7 @@
   "admin.service.listenAddress": "監聽位址：",
   "admin.service.listenDescription": "綁定並監聽的位址與通訊埠。輸入\":8065\"會跟所有的網路界面綁定。輸入\"127.0.0.1:8065\"會僅與擁有該 IP 位址的網路界面綁定。如果選取了較低的通訊埠(稱為\"系統通訊埠\"或是\"常見通訊埠\"，介於 0 到 1023 之間)，您必須擁有與該通訊埠綁定的權限。在 Linux 上可以用 \"sudo setcap cap_net_bind_service=+ep ./bin/platform\" 來允許 Mattermost 與那些通訊埠綁定。",
   "admin.service.listenExample": "如：\":8065\"",
-  "admin.service.mfaDesc": "若啟用，使用者可選擇將帳號增加多重要素驗證，多重要素驗證需要用智慧型手機與像 Google Authenticator 一樣的認證應用程式。",
+  "admin.service.mfaDesc": "啟用時，使用 AD/LDAP 或 電子郵件登入的使用者可以使用 Google Authenticator 將多重要素驗證加入帳號。",
   "admin.service.mfaTitle": "啟用多重要素驗證：",
   "admin.service.mobileSessionDays": "行動裝置的工作階段長度(以天計)：",
   "admin.service.mobileSessionDaysDesc": "從使用者最後一次輸入他們的認證到工作階段過期之間的天數。修改設定之後新的工作階段長度會在下次使用者輸入認證之後開始生效。",
@@ -768,7 +768,7 @@
   "admin.sidebar.logging": "記錄",
   "admin.sidebar.login": "登入",
   "admin.sidebar.logs": "記錄",
-  "admin.sidebar.metrics": "效能監視(Beta)",
+  "admin.sidebar.metrics": "效能監視",
   "admin.sidebar.nativeAppLinks": "Mattermost 應用程式連結",
   "admin.sidebar.notifications": "通知",
   "admin.sidebar.oauth": "OAuth 2.0",
@@ -1048,11 +1048,11 @@
   "calling_screen": "撥打中",
   "center_panel.recent": "按這裡跳到最新的訊息。",
   "change_url.close": "關閉",
-  "change_url.endWithLetter": "必須以字元或數字做結尾",
+  "change_url.endWithLetter": "網址必須以字元或數字做結尾",
   "change_url.invalidUrl": "錯誤的網址",
-  "change_url.longer": "長度必須大於2個字元",
-  "change_url.noUnderscore": "不允許包含兩個連續的底線",
-  "change_url.startWithLetter": "必須以字元或數字開頭",
+  "change_url.longer": "網址必須為兩個或兩個以上的字元",
+  "change_url.noUnderscore": "網址不能包含兩個連續的底線",
+  "change_url.startWithLetter": "網址必須以字元或數字開頭",
   "channelHeader.addToFavorites": "新增至我的最愛",
   "channelHeader.removeFromFavorites": "從我的最愛中移除",
   "channel_flow.alreadyExist": "該網址的頻道已經存在",
@@ -1132,7 +1132,7 @@
   "channel_modal.publicChannel2": "建立一個人人可加入的頻道。 ",
   "channel_modal.purpose": "用途",
   "channel_modal.purposeEx": "如：\"用於歸檔錯誤跟改善的頻道\"",
-  "channel_notification.push": "Send mobile push notifications",
+  "channel_notification.push": "發送行動推播通知",
   "channel_notifications.allActivity": "所有的活動所有的活動",
   "channel_notifications.allUnread": "全部的未讀訊息",
   "channel_notifications.globalDefault": "系統預設({notifyLevel})",
@@ -1140,7 +1140,7 @@
   "channel_notifications.never": "永不",
   "channel_notifications.onlyMentions": "僅限於提及您的",
   "channel_notifications.override": "選擇\"預設\"以外會覆蓋系統的通知設定。Firefox、Safari 跟 Chrome可以使用桌面通知。",
-  "channel_notifications.overridePush": "Selecting an option other than \"Global default\" will override the global notification settings for mobile push notifications in account settings. Push notifications must be enabled by the System Admin.",
+  "channel_notifications.overridePush": "選擇\"系統預設\"以外的選項將會覆蓋帳號設定中行動推播通知的全域通知設定。推播通知必須由系統管理員啟用。",
   "channel_notifications.preferences": "通知喜好設定",
   "channel_notifications.sendDesktop": "發送桌面通知",
   "channel_notifications.unreadInfo": "當有未讀訊息時，側邊欄的頻道名字會用粗體表示。選擇\"僅限於提及您的\"將只有您被提及的頻道會用粗體。",
@@ -1448,6 +1448,7 @@
   "help.messaging.write": "用 Mattermost 底部的文字輸入框來**編寫訊息**。按 **ENTER** 發送訊息。用 **Shift+ENTER** 在不發送訊息下插入新行。",
   "installed_command.header": "斜線命令",
   "installed_commands.add": "新增斜線命令",
+  "installed_commands.delete.confirm": "此動作將永久刪除該斜線命令，並中斷任何使用它的整合。確定要刪除嘛？",
   "installed_commands.empty": "沒有命令",
   "installed_commands.header": "斜線命令",
   "installed_commands.help": "建立給外部整合功能使用的斜線命令。詳情請看{link}。",
@@ -1455,6 +1456,7 @@
   "installed_commands.search": "搜尋斜線命令",
   "installed_commands.unnamed_command": "沒有名字的斜線命令",
   "installed_incoming_webhooks.add": "增加傳入的 Webhook",
+  "installed_incoming_webhooks.delete.confirm": "此動作將永久刪除該傳入的 Webhook，並中斷任何使用它的整合。確定要刪除嘛？",
   "installed_incoming_webhooks.empty": "沒有傳入的 Webhook",
   "installed_incoming_webhooks.header": "傳入的 Webhook",
   "installed_incoming_webhooks.help": "建立給外部整合功能使用的傳入的 Webhook 網址。詳情請看{link}。",
@@ -1480,6 +1482,7 @@
   "installed_oauth_apps.add": "新增 OAuth 2.0 應用程式",
   "installed_oauth_apps.callbackUrls": "回呼網址(一行一個)",
   "installed_oauth_apps.cancel": "取消",
+  "installed_oauth_apps.delete.confirm": "此動作將永久刪除該 OAuth 2.0 應用程式，並中斷任何使用它的整合。確定要刪除嘛？",
   "installed_oauth_apps.description": "敘述",
   "installed_oauth_apps.empty": "沒有找到 OAuth 2.0 應用程式",
   "installed_oauth_apps.header": "OAuth 2.0 應用程式",
@@ -1495,6 +1498,7 @@
   "installed_oauth_apps.trusted.no": "否",
   "installed_oauth_apps.trusted.yes": "是",
   "installed_outgoing_webhooks.add": "增加傳出的 Webhook",
+  "installed_outgoing_webhooks.delete.confirm": "此動作將永久刪除該傳出的 Webhook，並中斷任何使用它的整合。確定要刪除嘛？",
   "installed_outgoing_webhooks.empty": "沒有傳出的 Webhook",
   "installed_outgoing_webhooks.header": "傳出的 Webhook",
   "installed_outgoing_webhooks.help": "建立給外部整合功能使用的傳出的 Webhook 網址。詳情請看{link}。",
@@ -1504,6 +1508,8 @@
   "integrations.add": "新增",
   "integrations.command.description": "斜線命令用來傳送事件給外部整合功能",
   "integrations.command.title": "斜線命令",
+  "integrations.delete.confirm.button": "刪除",
+  "integrations.delete.confirm.title": "刪除整合",
   "integrations.done": "完成",
   "integrations.edit": "編輯",
   "integrations.header": "整合",
@@ -1633,10 +1639,17 @@
   "more_channels.title": "更多頻道",
   "more_direct_channels.close": "關閉",
   "more_direct_channels.message": "訊息",
+  "more_direct_channels.new_convo_note": "這會起始新的對話。如果要加入大量的成員，請考慮改成建立新的私人群組。",
+  "more_direct_channels.new_convo_note.full": "已達到此對話的最大人數。請考慮改成建立新的私人群組。",
   "more_direct_channels.title": "直接傳訊",
   "msg_typing.areTyping": "{users}跟{last}正在打字...",
   "msg_typing.isTyping": "{user}正在打字...",
   "msg_typing.someone": "某人",
+  "multiselect.go": "前往",
+  "multiselect.instructions": "用上/下方向鍵來瀏覽，ENTER鍵選擇",
+  "multiselect.numPeopleRemaining": "還可以加 {num, number} 個人。",
+  "multiselect.numRemaining": "還可以加 {num, number} 個",
+  "multiselect.placeholder": "搜尋與新增成員",
   "navbar.addMembers": "新增成員",
   "navbar.click": "請按此處",
   "navbar.delete": "刪除頻道...",
@@ -1730,7 +1743,7 @@
   "rename_channel.defaultError": " - 預設頻道不能更改",
   "rename_channel.displayName": "顯示名稱",
   "rename_channel.displayNameHolder": "請輸入顯示名稱",
-  "rename_channel.handleHolder": "僅限小寫英數字",
+  "rename_channel.handleHolder": "請用小寫英數字",
   "rename_channel.lowercase": "請用小寫英數字",
   "rename_channel.maxLength": "此欄位必須少於22個字元",
   "rename_channel.required": "此欄位是必需的",
@@ -1940,8 +1953,8 @@
   "update_command.question": "變更可能會導致現有的斜線命令無法使用。您確定要更新嘛？",
   "update_command.update": "更新",
   "update_incoming_webhook.update": "更新",
-  "update_outgoing_webhook.confirm": "增加傳出的 Webhook",
-  "update_outgoing_webhook.question": "變更可能會導致現有的斜線命令無法使用。您確定要更新嘛？",
+  "update_outgoing_webhook.confirm": "編輯傳出的 Webhook",
+  "update_outgoing_webhook.question": "變更可能會導致現有的傳出的 Webhook 無法使用。您確定要更新嘛？",
   "update_outgoing_webhook.update": "更新",
   "upload_overlay.info": "將檔案拖曳到這裡上傳。",
   "user.settings.advance.embed_preview": "訊息中第一個網站連結，嘗試顯示網站內容預覽於訊息下方",
@@ -2132,7 +2145,7 @@
   "user.settings.notifications.emailNotifications": "電子郵件通知",
   "user.settings.notifications.header": "通知",
   "user.settings.notifications.info": "桌面通知支援 Edge、Firefox、Safari、Chrome 跟 Mattermost 桌面應用程式。",
-  "user.settings.notifications.mentionsInfo": "Mentions trigger when someone sends a message that includes your username (\"@{username}\") or any of the options selected above.",
+  "user.settings.notifications.mentionsInfo": "提及會在某人發送含有您的使用者名稱(\"@{username}\")或上面任何選取的選項時被觸發。",
   "user.settings.notifications.never": "永不",
   "user.settings.notifications.noWords": "沒有設定單字",
   "user.settings.notifications.off": "關閉",