diff --git a/api/context.go b/api/context.go
index 370e254ba6..21bbb1e37b 100644
--- a/api/context.go
+++ b/api/context.go
@@ -149,7 +149,7 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	c.SetSiteURLHeader(app.GetProtocol(r) + "://" + r.Host)
 
 	w.Header().Set(model.HEADER_REQUEST_ID, c.RequestId)
-	w.Header().Set(model.HEADER_VERSION_ID, fmt.Sprintf("%v.%v.%v.%v", model.CurrentVersion, model.BuildNumber, utils.CfgHash, utils.IsLicensed))
+	w.Header().Set(model.HEADER_VERSION_ID, fmt.Sprintf("%v.%v.%v.%v", model.CurrentVersion, model.BuildNumber, utils.ClientCfgHash, utils.IsLicensed))
 	if einterfaces.GetClusterInterface() != nil {
 		w.Header().Set(model.HEADER_CLUSTER_ID, einterfaces.GetClusterInterface().GetClusterId())
 	}
diff --git a/api/oauth_test.go b/api/oauth_test.go
index 18938b9023..3dcaa0ddfc 100644
--- a/api/oauth_test.go
+++ b/api/oauth_test.go
@@ -188,8 +188,8 @@ func TestOAuthGetAppsByUser(t *testing.T) {
 
 	utils.Cfg.ServiceSettings.EnableOAuthServiceProvider = true
 
-	if _, err := Client.GetOAuthAppsByUser(); err != nil {
-		t.Fatal("Should have passed.")
+	if _, err := Client.GetOAuthAppsByUser(); err == nil {
+		t.Fatal("Should have failed.")
 	}
 
 	*utils.Cfg.ServiceSettings.EnableOnlyAdminIntegrations = false
diff --git a/api4/context.go b/api4/context.go
index 0566fbc23f..847a8d55fc 100644
--- a/api4/context.go
+++ b/api4/context.go
@@ -128,7 +128,7 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	c.SetSiteURLHeader(app.GetProtocol(r) + "://" + r.Host)
 
 	w.Header().Set(model.HEADER_REQUEST_ID, c.RequestId)
-	w.Header().Set(model.HEADER_VERSION_ID, fmt.Sprintf("%v.%v.%v.%v", model.CurrentVersion, model.BuildNumber, utils.CfgHash, utils.IsLicensed))
+	w.Header().Set(model.HEADER_VERSION_ID, fmt.Sprintf("%v.%v.%v.%v", model.CurrentVersion, model.BuildNumber, utils.ClientCfgHash, utils.IsLicensed))
 	if einterfaces.GetClusterInterface() != nil {
 		w.Header().Set(model.HEADER_CLUSTER_ID, einterfaces.GetClusterInterface().GetClusterId())
 	}
diff --git a/app/web_conn.go b/app/web_conn.go
index ce0b874b45..000704791a 100644
--- a/app/web_conn.go
+++ b/app/web_conn.go
@@ -190,7 +190,7 @@ func (webCon *WebConn) IsAuthenticated() bool {
 
 func (webCon *WebConn) SendHello() {
 	msg := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_HELLO, "", "", webCon.UserId, nil)
-	msg.Add("server_version", fmt.Sprintf("%v.%v.%v.%v", model.CurrentVersion, model.BuildNumber, utils.CfgHash, utils.IsLicensed))
+	msg.Add("server_version", fmt.Sprintf("%v.%v.%v.%v", model.CurrentVersion, model.BuildNumber, utils.ClientCfgHash, utils.IsLicensed))
 	webCon.Send <- msg
 }
 
diff --git a/i18n/de.json b/i18n/de.json
index a1f8d27f9f..8467a39cc9 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -185,11 +185,11 @@
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
-    "translation": "Verwaltung und Erstellung von öffentlichen Kanälen ist auf Systemadministratoren begrenzt."
+    "translation": "Verwaltung und Erstellung von privaten Kanälen ist auf Systemadministratoren begrenzt."
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
-    "translation": "Verwaltung und Erstellung von öffentlichen Kanälen ist auf Team- und Systemadministratoren begrenzt."
+    "translation": "Verwaltung und Erstellung von privaten Kanälen ist auf Team- und Systemadministratoren begrenzt."
   },
   {
     "id": "api.channel.can_manage_channel.public_restricted_system_admin.app_error",
@@ -201,11 +201,11 @@
   },
   {
     "id": "api.channel.create_channel.direct_channel.app_error",
-    "translation": "Für die Erstellung eines Direktnachrichten-Kanals muss der createDirectChannel-API-Service verwendet werden"
+    "translation": "Für die Erstellung eines Direktnachrichtenkanals muss der createDirectChannel-API-Service verwendet werden"
   },
   {
     "id": "api.channel.create_channel.invalid_character.app_error",
-    "translation": "Im Kanalnamen für Nicht-Direktnachrichten-Kanal wurde ein unerlaubtes Zeichen '__' verwendet"
+    "translation": "Ungültiges Zeichen '__' im Kanalnamen für Nicht-Direktnachrichtenkanal"
   },
   {
     "id": "api.channel.create_channel.max_channel_limit.app_error",
@@ -237,7 +237,7 @@
   },
   {
     "id": "api.channel.delete_channel.cannot.app_error",
-    "translation": "Der Standard-Kanal {{.Channel}} kann nicht gelöscht werden"
+    "translation": "Der Standardkanal {{.Channel}} kann nicht gelöscht werden"
   },
   {
     "id": "api.channel.delete_channel.deleted.app_error",
@@ -265,7 +265,7 @@
   },
   {
     "id": "api.channel.get_channel.wrong_team.app_error",
-    "translation": "Es gibt keinen Kanal mit der channel_id={{.ChannelId}} im Team mit der team_id={{.TeamId}}"
+    "translation": "Es gibt keinen Kanal mit channel_id={{.ChannelId}} im Team mit team_id={{.TeamId}}"
   },
   {
     "id": "api.channel.get_channel_counts.app_error",
@@ -301,7 +301,7 @@
   },
   {
     "id": "api.channel.leave.default.app_error",
-    "translation": "Der Standard-Kanal{{.Channel}} kann nicht verlassen werden"
+    "translation": "Der Standardkanal {{.Channel}} kann nicht verlassen werden"
   },
   {
     "id": "api.channel.leave.direct.app_error",
@@ -309,7 +309,7 @@
   },
   {
     "id": "api.channel.leave.last_member.app_error",
-    "translation": "Sie sind das letzte Mitglied dieser Gruppe. Versuchen Sie die Gruppe zu löschen anstatt sie zu verlassen."
+    "translation": "Sie sind das letzte Mitglied, versuchen Sie die private Gruppe zu löschen anstatt sie zu verlassen."
   },
   {
     "id": "api.channel.leave.left",
@@ -333,7 +333,7 @@
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.removed",
-    "translation": "Der Kanaltitel %s wurde entfernt (vorher: %s)"
+    "translation": "Die Kanalüberschrift %s wurde entfernt (vorher: %s)"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.retrieve_user.error",
@@ -341,11 +341,11 @@
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.updated_from",
-    "translation": "%s Der Kanaltitel wurde aktualisiert von %s nach %s"
+    "translation": "%s hat die Kanalüberschrift von %s auf %s geändert"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.updated_to",
-    "translation": "%s der Kanaltitel wurde aktualisiert in %s"
+    "translation": "%s hat die Kanalüberschrift geändert auf: %s"
   },
   {
     "id": "api.channel.post_user_add_remove_message_and_forget.error",
@@ -353,7 +353,7 @@
   },
   {
     "id": "api.channel.remove.default.app_error",
-    "translation": "Der Benutzer kann nicht vom Standard-Kanal {{.Channel}} entfernt werden"
+    "translation": "Der Benutzer kann nicht aus dem Standardkanal {{.Channel}} entfernt werden"
   },
   {
     "id": "api.channel.remove_member.permissions.app_error",
@@ -1239,7 +1239,7 @@
   },
   {
     "id": "api.import.import_user.joining_default.error",
-    "translation": "Fehler beim Betreten des Standard Kanals user_id=%s, team_id=%s, err=%v"
+    "translation": "Fehler beim Betreten des Standardkanals user_id=%s, team_id=%s, err=%v"
   },
   {
     "id": "api.import.import_user.saving.error",
@@ -1553,7 +1553,7 @@
   },
   {
     "id": "api.post.make_direct_channel_visible.get_2_members.error",
-    "translation": "Fehler beim Abruf der 2 Mitglieder für den Direkt-Kanal channel_id={{.ChannelId}}"
+    "translation": "Fehler beim Abruf der 2 Mitglieder für den Direktnachrichtenkanal channel_id={{.ChannelId}}"
   },
   {
     "id": "api.post.make_direct_channel_visible.get_members.error",
@@ -1561,15 +1561,15 @@
   },
   {
     "id": "api.post.make_direct_channel_visible.save_pref.error",
-    "translation": "Fehler beim Speichern der Direktkanal-Einstellung user_id=%v other_user_id=%v err=%v"
+    "translation": "Fehler beim Speichern der Direktnachrichtenkanal-Einstellung user_id=%v other_user_id=%v err=%v"
   },
   {
     "id": "api.post.make_direct_channel_visible.update_pref.error",
-    "translation": "Fehler beim Speichern der Direktkanal-Einstellung user_id=%v other_user_id=%v err=%v"
+    "translation": "Fehler beim Speichern der Direktnachrichtenkanal-Einstellung user_id=%v other_user_id=%v err=%v"
   },
   {
     "id": "api.post.notification.member_profile.warn",
-    "translation": "Konnte Profil für Kanalmitglied laden, user_id=%v"
+    "translation": "Konnte Profil für Kanalmitglied nicht laden, user_id=%v"
   },
   {
     "id": "api.post.send_notifications.user_id.debug",
@@ -2281,7 +2281,7 @@
   },
   {
     "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/>"
+    "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 der Aktualisierungsprozess festgestellt hat, dass Ihre E-Mail-Adresse oder Ihr Benutzername mehrfach auf dem Server verwendet wurde.<br/><br/>Die folgenden Änderungen wurden durchgeführt: <br/><br/>{{if .EmailChanged }}- Die E-Mail-Adresse des Zugangs des Teams `/{{.TeamName}}` 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/>"
   },
   {
     "id": "api.templates.upgrade_30_subject.info",
@@ -2785,7 +2785,7 @@
   },
   {
     "id": "api.webhook.create_outgoing.intersect.app_error",
-    "translation": "Ausgehende Webhooks vom selben Kanal können nicht dieselben Triggerwörter/Callback-URLs haben."
+    "translation": "Ausgehende Webhooks desselben Kanals können nicht dieselben Triggerwörter/Callback-URLs haben."
   },
   {
     "id": "api.webhook.create_outgoing.not_open.app_error",
@@ -2849,7 +2849,7 @@
   },
   {
     "id": "api.webhook.update_outgoing.intersect.app_error",
-    "translation": "Ausgehende Webhooks des selben Kanals können nicht dieselben Triggerwörter/Callback-URLs haben."
+    "translation": "Ausgehende Webhooks desselben Kanals können nicht dieselben Triggerwörter/Callback-URLs haben."
   },
   {
     "id": "api.webhook.update_outgoing.not_open.app_error",
@@ -3721,23 +3721,23 @@
   },
   {
     "id": "model.client.upload_post_attachment.channel_id.app_error",
-    "translation": "Error writing channel id to multipart form"
+    "translation": "Fehler beim Schreiben der Kanal ID in Multipart Form"
   },
   {
     "id": "model.client.upload_post_attachment.file.app_error",
-    "translation": "Error writing file to multipart form"
+    "translation": "Fehler beim Schreiben von File in Multipart Form"
   },
   {
     "id": "model.client.upload_post_attachment.file_size.app_error",
-    "translation": "Error writing fileSize to multipart form"
+    "translation": "Fehler beim Schreiben von fileSize in Multipart Form"
   },
   {
     "id": "model.client.upload_post_attachment.import_from.app_error",
-    "translation": "Error writing importFrom to multipart form"
+    "translation": "Fehler beim Schreiben von importForm in Multipart Form"
   },
   {
     "id": "model.client.upload_post_attachment.writer.app_error",
-    "translation": "Error closing multipart writer"
+    "translation": "Fehler beim Schließen des Mulitpart Writer"
   },
   {
     "id": "model.client.upload_saml_cert.app_error",
@@ -5497,11 +5497,11 @@
   },
   {
     "id": "store.sql_team.search_all_team.app_error",
-    "translation": "Es trat ein Fehler beim Suchen nach Kanälen auf"
+    "translation": "Es trat ein Fehler beim Suchen nach Teams auf"
   },
   {
     "id": "store.sql_team.search_open_team.app_error",
-    "translation": "Es trat ein Fehler beim Suchen nach Kanälen auf"
+    "translation": "Es trat ein Fehler beim Suchen nach offenen Teams auf"
   },
   {
     "id": "store.sql_team.update.app_error",
diff --git a/i18n/fr.json b/i18n/fr.json
index 6032678207..6d103b9149 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -185,11 +185,11 @@
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
-    "translation": "La création et l'administration du canal public sont réservées aux administrateurs système."
+    "translation": "La gestion et la création de canaux privés sont réservés aux administrateurs systèmes."
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
-    "translation": "La création et l'administration du canal public sont réservées aux administrateurs systèmes et administrateurs d'équipe."
+    "translation": "La gestion et la création de canaux privés sont réservés aux administrateurs d'équipes et administrateurs systèmes."
   },
   {
     "id": "api.channel.can_manage_channel.public_restricted_system_admin.app_error",
@@ -309,7 +309,7 @@
   },
   {
     "id": "api.channel.leave.last_member.app_error",
-    "translation": "Vous êtes le seul membre restant, veuillez supprimer le groupe privé plutôt que d'essayer de le quitter."
+    "translation": "Vous êtes le seul membre restant, essayez de supprimer le groupe privé plutôt que d'essayer de le quitter."
   },
   {
     "id": "api.channel.leave.left",
@@ -1447,7 +1447,7 @@
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.one",
-    "translation": "{{.Username}} a été mentionné, mais ils ne reçoivent pas de notification, car ils ne font pas partie de ce canal."
+    "translation": "{{.Username}} a été mentionné, mais il ne recevra pas de notification, car il ne fait pas partie de ce canal."
   },
   {
     "id": "api.post.create_post.attach_files.error",
@@ -3721,23 +3721,23 @@
   },
   {
     "id": "model.client.upload_post_attachment.channel_id.app_error",
-    "translation": "Error writing channel id to multipart form"
+    "translation": "Une erreur est survenue lors de l'écriture de l'ID du channel dans le formulaire multiforme"
   },
   {
     "id": "model.client.upload_post_attachment.file.app_error",
-    "translation": "Error writing file to multipart form"
+    "translation": "Une erreur est survenue lors de l'écriture du fichier dans le formulaire à contenu multiple"
   },
   {
     "id": "model.client.upload_post_attachment.file_size.app_error",
-    "translation": "Error writing fileSize to multipart form"
+    "translation": "Une erreur est survenue lors de l'écriture de la taille du fichier (fileSize) dans le formulaire à contenu multiple"
   },
   {
     "id": "model.client.upload_post_attachment.import_from.app_error",
-    "translation": "Error writing importFrom to multipart form"
+    "translation": "Une erreur est survenue lors de l'écriture de l'origine d'importation (importForm) dans le formulaire à contenu multiple"
   },
   {
     "id": "model.client.upload_post_attachment.writer.app_error",
-    "translation": "Error closing multipart writer"
+    "translation": "Une erreur est survenue lors de la fermeture de l'outil d'écriture de contenu multiple"
   },
   {
     "id": "model.client.upload_saml_cert.app_error",
@@ -5497,11 +5497,11 @@
   },
   {
     "id": "store.sql_team.search_all_team.app_error",
-    "translation": "Nous avons rencontré une erreur durant la recherche des canaux"
+    "translation": "Une erreur s'est produite lors de la recherche des équipes"
   },
   {
     "id": "store.sql_team.search_open_team.app_error",
-    "translation": "Nous avons rencontré une erreur durant la recherche des canaux"
+    "translation": "Une erreur s'est produite lors de la recherche des équipes ouvertes"
   },
   {
     "id": "store.sql_team.update.app_error",
diff --git a/i18n/ja.json b/i18n/ja.json
index 46a5dde1cc..a0faf44b18 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -185,11 +185,11 @@
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
-    "translation": "公開チャンネルの作成と管理は、システム管理者しかできません。"
+    "translation": "非公開チャンネルの作成と管理は、システム管理者のみが行えます。"
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
-    "translation": "公開チャンネルの作成と管理は、チーム管理者かシステム管理者しかできません。"
+    "translation": "非公開チャンネルの作成と管理は、チーム管理者かシステム管理者のみが行えます。"
   },
   {
     "id": "api.channel.can_manage_channel.public_restricted_system_admin.app_error",
@@ -309,7 +309,7 @@
   },
   {
     "id": "api.channel.leave.last_member.app_error",
-    "translation": "あなたが最後のメンバーです。脱退する代わりに非公開グループを削除しましょう。"
+    "translation": "あなたが最後のメンバーです。脱退する代わりに非公開チャンネルを削除しましょう。"
   },
   {
     "id": "api.channel.leave.left",
@@ -2281,7 +2281,7 @@
   },
   {
     "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/>"
+    "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/>"
   },
   {
     "id": "api.templates.upgrade_30_subject.info",
@@ -3721,23 +3721,23 @@
   },
   {
     "id": "model.client.upload_post_attachment.channel_id.app_error",
-    "translation": "Error writing channel id to multipart form"
+    "translation": "チャンネルIDをマルチパートフォームに書き込む際にエラーが発生しました"
   },
   {
     "id": "model.client.upload_post_attachment.file.app_error",
-    "translation": "Error writing file to multipart form"
+    "translation": "ファイルをマルチパートフォームに書き込む際にエラーが発生しました"
   },
   {
     "id": "model.client.upload_post_attachment.file_size.app_error",
-    "translation": "Error writing fileSize to multipart form"
+    "translation": "ファイルサイズをマルチパートフォームに書き込む際にエラーが発生しました"
   },
   {
     "id": "model.client.upload_post_attachment.import_from.app_error",
-    "translation": "Error writing importFrom to multipart form"
+    "translation": "インポート元をマルチパートフォームに書き出す際にエラーが発生しました"
   },
   {
     "id": "model.client.upload_post_attachment.writer.app_error",
-    "translation": "Error closing multipart writer"
+    "translation": "マルチパートライターをクローズする際にエラーが発生しました"
   },
   {
     "id": "model.client.upload_saml_cert.app_error",
@@ -5497,11 +5497,11 @@
   },
   {
     "id": "store.sql_team.search_all_team.app_error",
-    "translation": "チャンネルを検索する際にエラーが発生しました"
+    "translation": "チームを検索する際にエラーが発生しました"
   },
   {
     "id": "store.sql_team.search_open_team.app_error",
-    "translation": "チャンネルを検索する際にエラーが発生しました"
+    "translation": "公開されているチームを検索する際にエラーが発生しました"
   },
   {
     "id": "store.sql_team.update.app_error",
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index cbc6f94768..c3a829f82d 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -185,11 +185,11 @@
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
-    "translation": "Gerenciamento de Canais Públicos e criação é restrito apenas para Administradores do Sistema."
+    "translation": "Gerenciamento de Canais Privados e criação é restrito apenas para Administradores do Sistema."
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
-    "translation": "Gerenciamento de Canais Públicos e criação é restrito apenas para o Time e Administradores do Sistema."
+    "translation": "Gerenciamento de Canais Privados e criação é restrito apenas para a Equipe e Administradores do Sistema."
   },
   {
     "id": "api.channel.can_manage_channel.public_restricted_system_admin.app_error",
@@ -309,7 +309,7 @@
   },
   {
     "id": "api.channel.leave.last_member.app_error",
-    "translation": "Você é o único membro que restou, tente remover o Grupo Privado ao invés de manter."
+    "translation": "Você é o único membro que restou, tente remover o Canal Privado ao invés de sair."
   },
   {
     "id": "api.channel.leave.left",
@@ -2281,7 +2281,7 @@
   },
   {
     "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/>"
+    "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 irá precisar usar 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/>É recomendado que você acesse suas equipes usadas por suas contas duplicadas e adicione sua conta principal para a equipe e quaisquer canais públicos ou 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 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/>"
   },
   {
     "id": "api.templates.upgrade_30_subject.info",
@@ -3721,23 +3721,23 @@
   },
   {
     "id": "model.client.upload_post_attachment.channel_id.app_error",
-    "translation": "Error writing channel id to multipart form"
+    "translation": "Erro ao escrever o id do canal no formulário de multipart"
   },
   {
     "id": "model.client.upload_post_attachment.file.app_error",
-    "translation": "Error writing file to multipart form"
+    "translation": "Error ao escrever o formulário de multipart"
   },
   {
     "id": "model.client.upload_post_attachment.file_size.app_error",
-    "translation": "Error writing fileSize to multipart form"
+    "translation": "Erro ao escrever fileSize no formulário de multipart"
   },
   {
     "id": "model.client.upload_post_attachment.import_from.app_error",
-    "translation": "Error writing importFrom to multipart form"
+    "translation": "Erro ao escrever ImportFrom no formulário de multipart"
   },
   {
     "id": "model.client.upload_post_attachment.writer.app_error",
-    "translation": "Error closing multipart writer"
+    "translation": "Error ao fechar a escrita do multipart"
   },
   {
     "id": "model.client.upload_saml_cert.app_error",
@@ -5497,11 +5497,11 @@
   },
   {
     "id": "store.sql_team.search_all_team.app_error",
-    "translation": "Encontramos um erro ao procurar pelos canais"
+    "translation": "Encontramos um erro ao procurar pelas equipes"
   },
   {
     "id": "store.sql_team.search_open_team.app_error",
-    "translation": "Encontramos um erro ao procurar pelos canais"
+    "translation": "Encontramos um erro ao procurar por equipes abertas"
   },
   {
     "id": "store.sql_team.update.app_error",
diff --git a/i18n/ru.json b/i18n/ru.json
index bdfe0e5e9b..9fa1bb49e5 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -925,7 +925,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.group_message",
-    "translation": "Group Message"
+    "translation": "Групповые сообщения"
   },
   {
     "id": "api.email_batching.render_batched_post.sender.app_error",
@@ -1853,11 +1853,11 @@
   },
   {
     "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"
+    "translation": "Пользователь {{.Username}} не имеет адреса электронной почты в экспорте из Slack. Используется {{.Email}} как заглушка. Пользователь должен обновить адрес электронной почты при входе в систему.\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."
+    "translation": "Пользователь {{.Username}} не имеет адреса электронной почты в экспорте из Slack. Используется {{.Email}} как заглушка. Пользователь должен обновить адрес электронной почты при входе в систему."
   },
   {
     "id": "api.slackimport.slack_add_users.unable_import",
@@ -1957,11 +1957,11 @@
   },
   {
     "id": "api.team.add_user_to_team.invalid_data.app_error",
-    "translation": "Invalid data."
+    "translation": "Неверные данные."
   },
   {
     "id": "api.team.add_user_to_team.invalid_invite_id.app_error",
-    "translation": "Invalid invite id. No team matches with this invite id."
+    "translation": "Неверный идентификатор приглашения. Не найдено команд с таким идентификатором."
   },
   {
     "id": "api.team.add_user_to_team.missing_parameter.app_error",
@@ -2093,7 +2093,7 @@
   },
   {
     "id": "api.templates.channel_name.group",
-    "translation": "Group Message"
+    "translation": "Групповые сообщения"
   },
   {
     "id": "api.templates.email_change_body.info",
@@ -2225,7 +2225,7 @@
   },
   {
     "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",
@@ -2245,11 +2245,11 @@
   },
   {
     "id": "api.templates.reset_subject",
-    "translation": "[{{ .SiteName }}] Reset your password"
+    "translation": "[{{ .SiteName }}] Сбросить пароль"
   },
   {
     "id": "api.templates.signin_change_email.body.info",
-    "translation": "Вы обновили свой метод входа для {{ .SiteName }} на {{.Method}}.<br>Если это изменение не было сделано Вами, пожалуйста, обратитесь к системному администратору."
+    "translation": "Вы обновили свой метод входа для {{ .SiteName }} на {{.Method}}.<br>Если это изменение было сделано не Вами, пожалуйста, обратитесь к системному администратору."
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -2261,7 +2261,7 @@
   },
   {
     "id": "api.templates.signin_change_email.subject",
-    "translation": "[{{ .SiteName }}] You updated your sign-in method on {{ .SiteName }}"
+    "translation": "[{{ .SiteName }}] Вы обновили свой метод входа на {{ .SiteName }}"
   },
   {
     "id": "api.templates.signup_team_body.button",
@@ -2297,7 +2297,7 @@
   },
   {
     "id": "api.templates.username_change_subject",
-    "translation": "[{{ .SiteName }}] Ваш email был изменён"
+    "translation": "[{{ .SiteName }}] Ваш имя пользователя было изменено"
   },
   {
     "id": "api.templates.verify_body.button",
@@ -2341,7 +2341,7 @@
   },
   {
     "id": "api.templates.welcome_subject",
-    "translation": "[{{ .SiteName }}] You joined {{ .ServerURL }}"
+    "translation": "[{{ .SiteName }}] Вы присоединились к {{ .ServerURL }}"
   },
   {
     "id": "api.user.activate_mfa.email_and_ldap_only.app_error",
@@ -2445,7 +2445,7 @@
   },
   {
     "id": "api.user.create_user.disabled.app_error",
-    "translation": "User creation is disabled."
+    "translation": "Создание аккаунтов отключено."
   },
   {
     "id": "api.user.create_user.joining.error",
@@ -2857,11 +2857,11 @@
   },
   {
     "id": "api.webhook.update_outgoing.permissions.app_error",
-    "translation": "Несоответствующие права для создания исходящего вебхука."
+    "translation": "Отсутствуют права на создания исходящего вебхука."
   },
   {
     "id": "api.webhook.update_outgoing.triggers.app_error",
-    "translation": "Должны быть заданы trigger_words или channel_id"
+    "translation": "Должны быть заданы слова-триггеры или идентификатор канала"
   },
   {
     "id": "api.webrtc.disabled.app_error",
@@ -2941,15 +2941,15 @@
   },
   {
     "id": "app.import.import_post.channel_not_found.error",
-    "translation": "Ошибка импорта канала. Команда с именем \"{{.TeamName}}\" не найдена."
+    "translation": "Ошибка импорта сообщения. Канал с именем \"{{.ChannelName}}\" не найден."
   },
   {
     "id": "app.import.import_post.team_not_found.error",
-    "translation": "Ошибка импорта канала. Команда с именем \"{{.TeamName}}\" не найдена."
+    "translation": "Ошибка импорта сообщения. Команда с именем \"{{.TeamName}}\" не найдена."
   },
   {
     "id": "app.import.import_post.user_not_found.error",
-    "translation": "Ошибка импорта канала. Команда с именем \"{{.TeamName}}\" не найдена."
+    "translation": "Ошибка импорта сообщения. Пользователя с именем \"{{.Username}}\" не найден."
   },
   {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
@@ -2997,31 +2997,31 @@
   },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
-    "translation": "Пропущено необходимое свойство team: name."
+    "translation": "Отсутствует необходимое поле для Post: Channel."
   },
   {
     "id": "app.import.validate_post_import_data.create_at_missing.error",
-    "translation": "Пропущено необходимое свойство team: name."
+    "translation": "Отсутствует необходимое поле для Post: create_at."
   },
   {
     "id": "app.import.validate_post_import_data.create_at_zero.error",
-    "translation": "Post CreateAt must not be zero if it is provided."
+    "translation": "Post CreateAt не может быть нулевым, если задан."
   },
   {
     "id": "app.import.validate_post_import_data.message_length.error",
-    "translation": "Post Message property is longer than the maximum permitted length."
+    "translation": "Post Message длиннее, чем максимально разрешённая длина."
   },
   {
     "id": "app.import.validate_post_import_data.message_missing.error",
-    "translation": "Пропущено необходимое свойство team: name."
+    "translation": "Отсутствует необходимое поле для Post: Message."
   },
   {
     "id": "app.import.validate_post_import_data.team_missing.error",
-    "translation": "Пропущено необходимое свойство team: name."
+    "translation": "Отсутствует необходимое поле для Post: Team."
   },
   {
     "id": "app.import.validate_post_import_data.user_missing.error",
-    "translation": "Пропущено необходимое свойство team: name."
+    "translation": "Отсутствует необходимое поле для Post: User."
   },
   {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
@@ -3709,7 +3709,7 @@
   },
   {
     "id": "model.client.read_file.app_error",
-    "translation": "Возникла ошибка при поиске пользовательских профилей"
+    "translation": "Возникла ошибка при попытке прочесть файл"
   },
   {
     "id": "model.client.set_profile_user.no_file.app_error",
@@ -4729,7 +4729,7 @@
   },
   {
     "id": "store.sql_channel.get_channels_by_ids.not_found.app_error",
-    "translation": "No channel found"
+    "translation": "Каналы не найдены"
   },
   {
     "id": "store.sql_channel.get_deleted_by_name.existing.app_error",
@@ -4777,11 +4777,11 @@
   },
   {
     "id": "store.sql_channel.get_public_channels.get.app_error",
-    "translation": "Не удалось получить каналы"
+    "translation": "Не удалось получить список публичных каналов"
   },
   {
     "id": "store.sql_channel.get_unread.app_error",
-    "translation": "Не удалось получить список непрочтённых сообщений для команды"
+    "translation": "Не удалось получить список непрочитанных сообщений в канале"
   },
   {
     "id": "store.sql_channel.increment_mention_count.app_error",
@@ -4801,7 +4801,7 @@
   },
   {
     "id": "store.sql_channel.pinned_posts.app_error",
-    "translation": "We couldn't find the pinned posts"
+    "translation": "Не удалось найти прикреплённые сообщения"
   },
   {
     "id": "store.sql_channel.remove_member.app_error",
@@ -5145,7 +5145,7 @@
   },
   {
     "id": "store.sql_post.get_posts_created_att.app_error",
-    "translation": "Не удалось получить посты для канала"
+    "translation": "Не удалось получить сообщения из канала"
   },
   {
     "id": "store.sql_post.get_posts_since.app_error",
@@ -5157,7 +5157,7 @@
   },
   {
     "id": "store.sql_post.overwrite.app_error",
-    "translation": "Неудачная попытка удалить пост"
+    "translation": "Не удалось перезаписать сообщение"
   },
   {
     "id": "store.sql_post.permanent_delete.app_error",
@@ -5189,7 +5189,7 @@
   },
   {
     "id": "store.sql_post.search.warn",
-    "translation": "Query error searching posts: %v"
+    "translation": "Ошибка запроса поиска сообщений: %v"
   },
   {
     "id": "store.sql_post.update.app_error",
@@ -5497,11 +5497,11 @@
   },
   {
     "id": "store.sql_team.search_all_team.app_error",
-    "translation": "Возникла проблема при поиске канала"
+    "translation": "Возникла проблема при поиске команд"
   },
   {
     "id": "store.sql_team.search_open_team.app_error",
-    "translation": "Возникла проблема при поиске канала"
+    "translation": "Возникла проблема при поиске открытых команд"
   },
   {
     "id": "store.sql_team.update.app_error",
@@ -5525,7 +5525,7 @@
   },
   {
     "id": "store.sql_user.analytics_get_inactive_users_count.app_error",
-    "translation": "Не удалось подсчитать активных пользователей"
+    "translation": "Не удалось подсчитать количество неактивных пользователей"
   },
   {
     "id": "store.sql_user.analytics_get_system_admin_count.app_error",
diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index 317a3aa954..04087b15f4 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -185,11 +185,11 @@
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
-    "translation": "只有系统管理员能创建公开频道。"
+    "translation": "只有系统管理员能创建私有频道。"
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
-    "translation": "只有团队和系统管理员能创建与管理公开频道。"
+    "translation": "只有团队和系统管理员能创建与管理私有频道。"
   },
   {
     "id": "api.channel.can_manage_channel.public_restricted_system_admin.app_error",
@@ -389,7 +389,7 @@
   },
   {
     "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error",
-    "translation": "无法获取 user_id=%v 以及 channel_id=%v 的未读数量，err=%v"
+    "translation": "无法获取未读数量：user_id=%v, channel_id=%v, err=%v"
   },
   {
     "id": "api.cluster.init.debug",
@@ -817,7 +817,7 @@
   },
   {
     "id": "api.config.client.old_format.app_error",
-    "translation": "New format for the client configuration is not supported yet. Please specify format=old in the query string."
+    "translation": "暂未支持客户端配置的新格式。请在查询字串指定 format=old。"
   },
   {
     "id": "api.context.404.app_error",
@@ -1295,7 +1295,7 @@
   },
   {
     "id": "api.license.client.old_format.app_error",
-    "translation": "New format for the client license is not supported yet. Please specify format=old in the query string."
+    "translation": "暂未支持客户端授权的新格式。请在查询字串指定 format=old。"
   },
   {
     "id": "api.license.init.debug",
@@ -2281,7 +2281,7 @@
   },
   {
     "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/>"
+    "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/>"
   },
   {
     "id": "api.templates.upgrade_30_subject.info",
@@ -3721,23 +3721,23 @@
   },
   {
     "id": "model.client.upload_post_attachment.channel_id.app_error",
-    "translation": "Error writing channel id to multipart form"
+    "translation": "写入频道 id 到混合表单错误"
   },
   {
     "id": "model.client.upload_post_attachment.file.app_error",
-    "translation": "Error writing file to multipart form"
+    "translation": "写入文件到混合表单错误"
   },
   {
     "id": "model.client.upload_post_attachment.file_size.app_error",
-    "translation": "Error writing fileSize to multipart form"
+    "translation": "写入 fileSize 到混合表单错误"
   },
   {
     "id": "model.client.upload_post_attachment.import_from.app_error",
-    "translation": "Error writing importFrom to multipart form"
+    "translation": "写入 importForm 到混合表单错误"
   },
   {
     "id": "model.client.upload_post_attachment.writer.app_error",
-    "translation": "Error closing multipart writer"
+    "translation": "关闭混合写入器错误"
   },
   {
     "id": "model.client.upload_saml_cert.app_error",
@@ -5497,11 +5497,11 @@
   },
   {
     "id": "store.sql_team.search_all_team.app_error",
-    "translation": "我们搜索频道时遇到错误"
+    "translation": "我们搜索团队时遇到错误"
   },
   {
     "id": "store.sql_team.search_open_team.app_error",
-    "translation": "我们搜索频道时遇到错误"
+    "translation": "我们搜索公开团队时遇到错误"
   },
   {
     "id": "store.sql_team.update.app_error",
diff --git a/i18n/zh-TW.json b/i18n/zh-TW.json
index b676f5df0a..a640879548 100644
--- a/i18n/zh-TW.json
+++ b/i18n/zh-TW.json
@@ -149,7 +149,7 @@
   },
   {
     "id": "api.brand.init.debug",
-    "translation": "正在初始化命令 API 路徑"
+    "translation": "正在初始化品牌 API 路徑"
   },
   {
     "id": "api.channel.add_member.added",
@@ -185,11 +185,11 @@
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
-    "translation": "只有系統管理員能建立與管理公開頻道。"
+    "translation": "只有系統管理員能建立與管理私人頻道。"
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
-    "translation": "只有團隊和系統管理員能建立與管理公開頻道。"
+    "translation": "只有團隊和系統管理員能建立與管理私人頻道。"
   },
   {
     "id": "api.channel.can_manage_channel.public_restricted_system_admin.app_error",
@@ -289,7 +289,7 @@
   },
   {
     "id": "api.channel.join_channel.already_deleted.app_error",
-    "translation": "Channel is already deleted"
+    "translation": "頻道已被刪除"
   },
   {
     "id": "api.channel.join_channel.permissions.app_error",
@@ -309,7 +309,7 @@
   },
   {
     "id": "api.channel.leave.last_member.app_error",
-    "translation": "您是最後一位成員，請移除私人群組而不是退出。"
+    "translation": "您是最後一位成員，請移除私人頻道而不是退出。"
   },
   {
     "id": "api.channel.leave.left",
@@ -389,11 +389,11 @@
   },
   {
     "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error",
-    "translation": "無法計算未讀訊息數量：user_id=%v, channel_id=%v, err=%v"
+    "translation": "無法取得未讀訊息數量：user_id=%v, channel_id=%v, err=%v"
   },
   {
     "id": "api.cluster.init.debug",
-    "translation": "正在初始化使用者 API 路徑"
+    "translation": "正在初始化叢集 API 路徑"
   },
   {
     "id": "api.command.admin_only.app_error",
@@ -813,11 +813,11 @@
   },
   {
     "id": "api.compliance.init.debug",
-    "translation": "正在初始化命令 API 路徑"
+    "translation": "正在初始化規範 API 路徑"
   },
   {
     "id": "api.config.client.old_format.app_error",
-    "translation": "New format for the client configuration is not supported yet. Please specify format=old in the query string."
+    "translation": "尚未支援新格式的用戶端設定。請在查詢字串中指定 format=old 。"
   },
   {
     "id": "api.context.404.app_error",
@@ -889,7 +889,7 @@
   },
   {
     "id": "api.deprecated.init.debug",
-    "translation": "正在初始化命令 API 路徑"
+    "translation": "正在初始化已被取代的 API 路徑"
   },
   {
     "id": "api.email_batching.add_notification_email_to_batch.channel_full.app_error",
@@ -1255,7 +1255,7 @@
   },
   {
     "id": "api.ldap.init.debug",
-    "translation": "正在初始化檔案 API 路徑"
+    "translation": "正在初始化 LDAP API 路徑"
   },
   {
     "id": "api.license.add_license.array.app_error",
@@ -1295,7 +1295,7 @@
   },
   {
     "id": "api.license.client.old_format.app_error",
-    "translation": "New format for the client license is not supported yet. Please specify format=old in the query string."
+    "translation": "尚未支援新格式的用戶端授權。請在查詢字串中指定 format=old 。"
   },
   {
     "id": "api.license.init.debug",
@@ -1953,19 +1953,19 @@
   },
   {
     "id": "api.status.user_not_found.app_error",
-    "translation": "User not found"
+    "translation": "找不到使用者"
   },
   {
     "id": "api.team.add_user_to_team.invalid_data.app_error",
-    "translation": "Invalid data."
+    "translation": "無效的資料。"
   },
   {
     "id": "api.team.add_user_to_team.invalid_invite_id.app_error",
-    "translation": "Invalid invite id. No team matches with this invite id."
+    "translation": "無效的邀請ID。沒有團隊符合此ID。"
   },
   {
     "id": "api.team.add_user_to_team.missing_parameter.app_error",
-    "translation": "Parameter required to add user to team."
+    "translation": "需要參數以新增團隊成員。"
   },
   {
     "id": "api.team.create_team.email_disabled.app_error",
@@ -2281,7 +2281,7 @@
   },
   {
     "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/>"
+    "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/>"
   },
   {
     "id": "api.templates.upgrade_30_subject.info",
@@ -3161,11 +3161,11 @@
   },
   {
     "id": "authentication.permissions.read_public_channel.description",
-    "translation": "Ability to read public channels"
+    "translation": "讀取公開頻道的權限"
   },
   {
     "id": "authentication.permissions.read_public_channel.name",
-    "translation": "Read Public Channels"
+    "translation": "讀取公開頻道"
   },
   {
     "id": "authentication.permissions.team_invite_user.description",
@@ -3721,27 +3721,27 @@
   },
   {
     "id": "model.client.upload_post_attachment.channel_id.app_error",
-    "translation": "Error writing channel id to multipart form"
+    "translation": "寫入 channel id 至 multipart 表單時遇到錯誤"
   },
   {
     "id": "model.client.upload_post_attachment.file.app_error",
-    "translation": "Error writing file to multipart form"
+    "translation": "寫入 file 至 multipart 表單時遇到錯誤"
   },
   {
     "id": "model.client.upload_post_attachment.file_size.app_error",
-    "translation": "Error writing fileSize to multipart form"
+    "translation": "寫入 fileSize 至 multipart 表單時遇到錯誤"
   },
   {
     "id": "model.client.upload_post_attachment.import_from.app_error",
-    "translation": "Error writing importFrom to multipart form"
+    "translation": "寫入 importFrom 至 multipart 表單時遇到錯誤"
   },
   {
     "id": "model.client.upload_post_attachment.writer.app_error",
-    "translation": "Error closing multipart writer"
+    "translation": "關閉 multipart writer 時遇到錯誤"
   },
   {
     "id": "model.client.upload_saml_cert.app_error",
-    "translation": "Error creating SAML certificate multipart form request"
+    "translation": "建立 SAML 憑證 multipart 表單要求時遇到錯誤"
   },
   {
     "id": "model.command.is_valid.create_at.app_error",
@@ -4725,11 +4725,11 @@
   },
   {
     "id": "store.sql_channel.get_channels_by_ids.get.app_error",
-    "translation": "無法取得這些頻道"
+    "translation": "無法取得頻道"
   },
   {
     "id": "store.sql_channel.get_channels_by_ids.not_found.app_error",
-    "translation": "No channel found"
+    "translation": "找不到頻道"
   },
   {
     "id": "store.sql_channel.get_deleted_by_name.existing.app_error",
@@ -4777,11 +4777,11 @@
   },
   {
     "id": "store.sql_channel.get_public_channels.get.app_error",
-    "translation": "無法取得這些頻道"
+    "translation": "無法取得公開頻道"
   },
   {
     "id": "store.sql_channel.get_unread.app_error",
-    "translation": "無法取得團隊未讀訊息"
+    "translation": "無法取得頻道未讀訊息"
   },
   {
     "id": "store.sql_channel.increment_mention_count.app_error",
@@ -4801,7 +4801,7 @@
   },
   {
     "id": "store.sql_channel.pinned_posts.app_error",
-    "translation": "We couldn't find the pinned posts"
+    "translation": "無法找尋被釘選的訊息"
   },
   {
     "id": "store.sql_channel.remove_member.app_error",
@@ -5497,11 +5497,11 @@
   },
   {
     "id": "store.sql_team.search_all_team.app_error",
-    "translation": "搜尋頻道時遇到錯誤"
+    "translation": "搜尋團隊時遇到錯誤"
   },
   {
     "id": "store.sql_team.search_open_team.app_error",
-    "translation": "搜尋頻道時遇到錯誤"
+    "translation": "搜尋開放團隊時遇到錯誤"
   },
   {
     "id": "store.sql_team.update.app_error",
@@ -6077,18 +6077,18 @@
   },
   {
     "id": "wsapi.status.init.debug",
-    "translation": "正在初始化狀態 API 路徑"
+    "translation": "正在初始化狀態 WebSocket API 路徑"
   },
   {
     "id": "wsapi.system.init.debug",
-    "translation": "正在初始化 web socket API 路徑"
+    "translation": "正在初始化系統 WebSocket API 路徑"
   },
   {
     "id": "wsapi.user.init.debug",
-    "translation": "正在初始化 web socket API 路徑"
+    "translation": "正在初始化使用者 WebSocket API 路徑"
   },
   {
     "id": "wsapi.webrtc.init.debug",
-    "translation": "正在初始化 web socket API 路徑"
+    "translation": "正在初始化 WebRTC WebSocket API 路徑"
   }
 ]
diff --git a/model/authorization.go b/model/authorization.go
index ef88b730ab..458ed1bdb1 100644
--- a/model/authorization.go
+++ b/model/authorization.go
@@ -369,7 +369,6 @@ func InitalizeRoles() {
 			PERMISSION_CREATE_DIRECT_CHANNEL.Id,
 			PERMISSION_CREATE_GROUP_CHANNEL.Id,
 			PERMISSION_PERMANENT_DELETE_USER.Id,
-			PERMISSION_MANAGE_OAUTH.Id,
 		},
 	}
 	BuiltInRoles[ROLE_SYSTEM_USER.Id] = ROLE_SYSTEM_USER
diff --git a/model/config.go b/model/config.go
index 206f5d70e2..303d7bb75c 100644
--- a/model/config.go
+++ b/model/config.go
@@ -699,7 +699,7 @@ func (o *Config) SetDefaults() {
 	}
 
 	if !IsSafeLink(o.SupportSettings.TermsOfServiceLink) {
-		o.SupportSettings.TermsOfServiceLink = nil
+		*o.SupportSettings.TermsOfServiceLink = ""
 	}
 
 	if o.SupportSettings.TermsOfServiceLink == nil {
@@ -708,7 +708,7 @@ func (o *Config) SetDefaults() {
 	}
 
 	if !IsSafeLink(o.SupportSettings.PrivacyPolicyLink) {
-		o.SupportSettings.PrivacyPolicyLink = nil
+		*o.SupportSettings.PrivacyPolicyLink = ""
 	}
 
 	if o.SupportSettings.PrivacyPolicyLink == nil {
@@ -717,7 +717,7 @@ func (o *Config) SetDefaults() {
 	}
 
 	if !IsSafeLink(o.SupportSettings.AboutLink) {
-		o.SupportSettings.AboutLink = nil
+		*o.SupportSettings.AboutLink = ""
 	}
 
 	if o.SupportSettings.AboutLink == nil {
@@ -726,7 +726,7 @@ func (o *Config) SetDefaults() {
 	}
 
 	if !IsSafeLink(o.SupportSettings.HelpLink) {
-		o.SupportSettings.HelpLink = nil
+		*o.SupportSettings.HelpLink = ""
 	}
 
 	if o.SupportSettings.HelpLink == nil {
@@ -735,7 +735,7 @@ func (o *Config) SetDefaults() {
 	}
 
 	if !IsSafeLink(o.SupportSettings.ReportAProblemLink) {
-		o.SupportSettings.ReportAProblemLink = nil
+		*o.SupportSettings.ReportAProblemLink = ""
 	}
 
 	if o.SupportSettings.ReportAProblemLink == nil {
diff --git a/store/sql_user_store.go b/store/sql_user_store.go
index 5ea04155d5..91c27cf3e7 100644
--- a/store/sql_user_store.go
+++ b/store/sql_user_store.go
@@ -1297,7 +1297,7 @@ func (us SqlUserStore) SearchNotInTeam(notInTeamId string, term string, options
 				ON tm.UserId = Users.Id
 				AND tm.TeamId = :NotInTeamId
 			WHERE
-				tm.UserId IS NULL
+				(tm.UserId IS NULL OR tm.DeleteAt != 0)
 				SEARCH_CLAUSE
 				INACTIVE_CLAUSE
 			ORDER BY Users.Username ASC
diff --git a/store/sql_user_store_test.go b/store/sql_user_store_test.go
index 700a0e1d71..94fd30a6f4 100644
--- a/store/sql_user_store_test.go
+++ b/store/sql_user_store_test.go
@@ -1659,6 +1659,44 @@ func TestUserStoreSearch(t *testing.T) {
 			t.Fatal("should not have found user")
 		}
 	}
+
+	// Check SearchNotInTeam finds previously deleted team members.
+	Must(store.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u4.Id}))
+
+	if r1 := <-store.User().SearchNotInTeam(tid, "simo", searchOptions); r1.Err != nil {
+		t.Fatal(r1.Err)
+	} else {
+		profiles := r1.Data.([]*model.User)
+		found := false
+		for _, profile := range profiles {
+			if profile.Id == u4.Id {
+				found = true
+				break
+			}
+		}
+
+		if found {
+			t.Fatal("should not have found user")
+		}
+	}
+
+	Must(store.Team().UpdateMember(&model.TeamMember{TeamId: tid, UserId: u4.Id, DeleteAt: model.GetMillis() - 1000}))
+	if r1 := <-store.User().SearchNotInTeam(tid, "simo", searchOptions); r1.Err != nil {
+		t.Fatal(r1.Err)
+	} else {
+		profiles := r1.Data.([]*model.User)
+		found := false
+		for _, profile := range profiles {
+			if profile.Id == u4.Id {
+				found = true
+				break
+			}
+		}
+
+		if !found {
+			t.Fatal("should have found user")
+		}
+	}
 }
 
 func TestUserStoreSearchWithoutTeam(t *testing.T) {
diff --git a/utils/config.go b/utils/config.go
index a4ec820789..802dfc2e91 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -35,6 +35,7 @@ var watcher *fsnotify.Watcher
 var Cfg *model.Config = &model.Config{}
 var CfgDiagnosticId = ""
 var CfgHash = ""
+var ClientCfgHash = ""
 var CfgFileName string = ""
 var CfgDisableConfigWatch = false
 var ClientCfg map[string]string = map[string]string{}
@@ -323,6 +324,8 @@ func LoadConfig(fileName string) {
 	Cfg = &config
 	CfgHash = fmt.Sprintf("%x", md5.Sum([]byte(Cfg.ToJson())))
 	ClientCfg = getClientConfig(Cfg)
+	clientCfgJson, _ := json.Marshal(ClientCfg)
+	ClientCfgHash = fmt.Sprintf("%x", md5.Sum(clientCfgJson))
 
 	// Actions that need to run every time the config is loaded
 	if ldapI := einterfaces.GetLdapInterface(); ldapI != nil {
diff --git a/webapp/actions/channel_actions.jsx b/webapp/actions/channel_actions.jsx
index 3f4ab210de..d441a0e945 100644
--- a/webapp/actions/channel_actions.jsx
+++ b/webapp/actions/channel_actions.jsx
@@ -300,7 +300,7 @@ export function loadDMsAndGMsForUnreads() {
         if (unreads[id].msgs > 0 || unreads[id].mentions > 0) {
             const channel = ChannelStore.get(id);
             if (channel && channel.type === Constants.DM_CHANNEL) {
-                loadNewDMIfNeeded(Utils.getUserIdFromChannelName(channel));
+                loadNewDMIfNeeded(channel.id);
             } else if (channel && channel.type === Constants.GM_CHANNEL) {
                 loadNewGMIfNeeded(channel.id);
             }
diff --git a/webapp/actions/notification_actions.jsx b/webapp/actions/notification_actions.jsx
index ecf301ed85..82a68c4523 100644
--- a/webapp/actions/notification_actions.jsx
+++ b/webapp/actions/notification_actions.jsx
@@ -66,7 +66,11 @@ export function sendDesktopNotification(post, msgProps) {
     }
 
     if (title === '') {
-        title = msgProps.channel_display_name;
+        if (msgProps.channel_type === Constants.DM_CHANNEL) {
+            title = Utils.localizeMessage('notification.dm', 'Direct Message');
+        } else {
+            title = msgProps.channel_display_name;
+        }
     }
 
     let notifyText = post.message.replace(/\n+/g, ' ');
diff --git a/webapp/actions/post_actions.jsx b/webapp/actions/post_actions.jsx
index e6daecf310..5319a00c62 100644
--- a/webapp/actions/post_actions.jsx
+++ b/webapp/actions/post_actions.jsx
@@ -20,24 +20,29 @@ const ActionTypes = Constants.ActionTypes;
 const Preferences = Constants.Preferences;
 
 export function handleNewPost(post, msg) {
-    let websocketMessageProps = null;
+    let websocketMessageProps = {};
     if (msg) {
         websocketMessageProps = msg.data;
     }
 
-    if (msg && msg.data) {
-        if (msg.data.channel_type === Constants.DM_CHANNEL) {
-            loadNewDMIfNeeded(post.user_id);
-        } else if (msg.data.channel_type === Constants.GM_CHANNEL) {
-            loadNewGMIfNeeded(post.channel_id, post.user_id);
-        }
-    }
-
     if (ChannelStore.getMyMember(post.channel_id)) {
         completePostReceive(post, websocketMessageProps);
     } else {
+        // This API call requires any real team id in API v3, so set one if we don't already have one
+        if (!Client.teamId && msg && msg.data) {
+            Client.setTeamId(msg.data.team_id);
+        }
+
         AsyncClient.getChannelMember(post.channel_id, UserStore.getCurrentId()).then(() => completePostReceive(post, websocketMessageProps));
     }
+
+    if (msg && msg.data) {
+        if (msg.data.channel_type === Constants.DM_CHANNEL) {
+            loadNewDMIfNeeded(post.channel_id);
+        } else if (msg.data.channel_type === Constants.GM_CHANNEL) {
+            loadNewGMIfNeeded(post.channel_id);
+        }
+    }
 }
 
 function completePostReceive(post, websocketMessageProps) {
diff --git a/webapp/actions/user_actions.jsx b/webapp/actions/user_actions.jsx
index b56d5ff455..9f9987cdd2 100644
--- a/webapp/actions/user_actions.jsx
+++ b/webapp/actions/user_actions.jsx
@@ -11,7 +11,7 @@ import ChannelStore from 'stores/channel_store.jsx';
 import {getChannelMembersForUserIds} from 'actions/channel_actions.jsx';
 import {loadStatusesForProfilesList, loadStatusesForProfilesMap} from 'actions/status_actions.jsx';
 
-import {getDirectChannelName} from 'utils/utils.jsx';
+import {getDirectChannelName, getUserIdFromChannelName} from 'utils/utils.jsx';
 
 import * as AsyncClient from 'utils/async_client.jsx';
 import Client from 'client/web_client.jsx';
@@ -255,24 +255,45 @@ function populateChannelWithProfiles(channelId, userIds) {
     UserStore.emitInChannelChange();
 }
 
-export function loadNewDMIfNeeded(userId) {
-    if (userId === UserStore.getCurrentId()) {
-        return;
+export function loadNewDMIfNeeded(channelId) {
+    function checkPreference(channel) {
+        const userId = getUserIdFromChannelName(channel);
+
+        if (!userId) {
+            return;
+        }
+
+        const pref = PreferenceStore.getBool(Preferences.CATEGORY_DIRECT_CHANNEL_SHOW, userId, false);
+        if (pref === false) {
+            PreferenceStore.setPreference(Preferences.CATEGORY_DIRECT_CHANNEL_SHOW, userId, 'true');
+            AsyncClient.savePreference(Preferences.CATEGORY_DIRECT_CHANNEL_SHOW, userId, 'true');
+            loadProfilesForDM();
+        }
     }
 
-    const pref = PreferenceStore.getBool(Preferences.CATEGORY_DIRECT_CHANNEL_SHOW, userId, false);
-    if (pref === false) {
-        PreferenceStore.setPreference(Preferences.CATEGORY_DIRECT_CHANNEL_SHOW, userId, 'true');
-        AsyncClient.savePreference(Preferences.CATEGORY_DIRECT_CHANNEL_SHOW, userId, 'true');
-        loadProfilesForDM();
+    const channel = ChannelStore.get(channelId);
+    if (channel) {
+        checkPreference(channel);
+    } else {
+        Client.getChannel(
+            channelId,
+            (data) => {
+                AppDispatcher.handleServerAction({
+                    type: ActionTypes.RECEIVED_CHANNEL,
+                    channel: data.channel,
+                    member: data.member
+                });
+
+                checkPreference(data.channel);
+            },
+            (err) => {
+                AsyncClient.dispatchError(err, 'getChannel');
+            }
+       );
     }
 }
 
-export function loadNewGMIfNeeded(channelId, userId) {
-    if (userId === UserStore.getCurrentId()) {
-        return;
-    }
-
+export function loadNewGMIfNeeded(channelId) {
     function checkPreference() {
         const pref = PreferenceStore.getBool(Preferences.CATEGORY_GROUP_CHANNEL_SHOW, channelId, false);
         if (pref === false) {
@@ -932,3 +953,15 @@ export function getMissingProfiles(ids, success, error) {
 
     AsyncClient.getProfilesByIds(missingIds, success, error);
 }
+
+export function loadMyTeamMembers() {
+    Client.getMyTeamMembers((data) => {
+        AppDispatcher.handleServerAction({
+            type: ActionTypes.RECEIVED_MY_TEAM_MEMBERS,
+            team_members: data
+        });
+        AsyncClient.getMyTeamsUnread();
+    }, (err) => {
+        AsyncClient.dispatchError(err, 'getMyTeamMembers');
+    });
+}
diff --git a/webapp/components/admin_console/admin_sidebar.jsx b/webapp/components/admin_console/admin_sidebar.jsx
index db978c808c..a2f2b75c08 100644
--- a/webapp/components/admin_console/admin_sidebar.jsx
+++ b/webapp/components/admin_console/admin_sidebar.jsx
@@ -96,7 +96,7 @@ export default class AdminSidebar extends React.Component {
                         title={
                             <FormattedMessage
                                 id='admin.sidebar.cluster'
-                                defaultMessage='High Availability (Beta)'
+                                defaultMessage='High Availability'
                             />
                         }
                     />
diff --git a/webapp/components/admin_console/cluster_settings.jsx b/webapp/components/admin_console/cluster_settings.jsx
index ad27989c38..895a87ce1b 100644
--- a/webapp/components/admin_console/cluster_settings.jsx
+++ b/webapp/components/admin_console/cluster_settings.jsx
@@ -53,7 +53,7 @@ export default class ClusterSettings extends AdminSettings {
         return (
             <FormattedMessage
                 id='admin.advance.cluster'
-                defaultMessage='High Availability (Beta)'
+                defaultMessage='High Availability'
             />
         );
     }
diff --git a/webapp/components/error_bar.jsx b/webapp/components/error_bar.jsx
index 806af9eb38..d0ecd604e1 100644
--- a/webapp/components/error_bar.jsx
+++ b/webapp/components/error_bar.jsx
@@ -49,12 +49,12 @@ export default class ErrorBar extends React.Component {
         const errorIgnored = ErrorStore.getIgnoreNotification();
 
         if (!errorIgnored) {
-            if (global.mm_config.SendEmailNotifications === 'false') {
-                ErrorStore.storeLastError({notification: true, message: Utils.localizeMessage('error_bar.preview_mode', 'Preview Mode: Email notifications have not been configured')});
-                return;
-            } else if (isSystemAdmin && global.mm_config.SiteURL === '') {
+            if (isSystemAdmin && global.mm_config.SiteURL === '') {
                 ErrorStore.storeLastError({notification: true, message: SITE_URL_ERROR});
                 return;
+            } else if (global.mm_config.SendEmailNotifications === 'false') {
+                ErrorStore.storeLastError({notification: true, message: Utils.localizeMessage('error_bar.preview_mode', 'Preview Mode: Email notifications have not been configured')});
+                return;
             }
         }
 
@@ -178,10 +178,10 @@ export default class ErrorBar extends React.Component {
             let defaultMessage;
             if (global.mm_config.EnableSignUpWithGitLab === 'true') {
                 id = 'error_bar.site_url_gitlab';
-                defaultMessage = '{docsLink} is now a required setting. Please configure it in the System Console or in gitlab.rb if you\'re using GitLab Mattermost.';
+                defaultMessage = 'Please configure your {docsLink} in the System Console or in gitlab.rb if you\'re using GitLab Mattermost.';
             } else {
                 id = 'error_bar.site_url';
-                defaultMessage = '{docsLink} is now a required setting. Please configure it in {link}.';
+                defaultMessage = 'Please configure your {docsLink} in the System Console.';
             }
 
             message = (
diff --git a/webapp/components/file_upload.jsx b/webapp/components/file_upload.jsx
index c63576f783..af5d768296 100644
--- a/webapp/components/file_upload.jsx
+++ b/webapp/components/file_upload.jsx
@@ -350,11 +350,16 @@ class FileUpload extends React.Component {
         const channelId = this.props.channelId || ChannelStore.getCurrentId();
 
         const uploadsRemaining = Constants.MAX_UPLOAD_FILES - this.props.getFileCount(channelId);
-        const emojiSpan = (<span
-            className={'fa fa-smile-o icon--emoji-picker emoji-' + this.props.navBarName}
-            onClick={this.emojiClick}
-                           />);
-        const filestyle = {visibility: 'hidden'};
+
+        let emojiSpan;
+        if (this.props.emojiEnabled) {
+            emojiSpan = (
+                <span
+                    className={'fa fa-smile-o icon--emoji-picker emoji-' + this.props.navBarName}
+                    onClick={this.emojiClick}
+                />
+            );
+        }
 
         return (
             <span
@@ -363,20 +368,19 @@ class FileUpload extends React.Component {
             >
                 <div className='icon--attachment'>
                     <span
+                        className='icon'
                         dangerouslySetInnerHTML={{__html: Constants.ATTACHMENT_ICON_SVG}}
-                        onClick={() => this.refs.fileInput.click()}
                     />
                     <input
                         ref='fileInput'
                         type='file'
-                        style={filestyle}
                         onChange={this.handleChange}
                         onClick={uploadsRemaining > 0 ? this.props.onClick : this.handleMaxUploadReached}
                         multiple={multiple}
                         accept={accept}
                     />
                 </div>
-                {this.props.emojiEnabled ? emojiSpan : ''}
+                {emojiSpan}
             </span>
         );
     }
diff --git a/webapp/components/post_view/components/post_header.jsx b/webapp/components/post_view/components/post_header.jsx
index 565f9629bf..9de0b7e798 100644
--- a/webapp/components/post_view/components/post_header.jsx
+++ b/webapp/components/post_view/components/post_header.jsx
@@ -82,7 +82,6 @@ export default class PostHeader extends React.Component {
                         commentCount={this.props.commentCount}
                         handleCommentClick={this.props.handleCommentClick}
                         handleDropdownOpened={this.props.handleDropdownOpened}
-                        allowReply={!isSystemMessage}
                         isLastComment={this.props.isLastComment}
                         sameUser={this.props.sameUser}
                         currentUser={this.props.currentUser}
diff --git a/webapp/components/post_view/components/post_info.jsx b/webapp/components/post_view/components/post_info.jsx
index 4754240fd0..e7cb9ffb04 100644
--- a/webapp/components/post_view/components/post_info.jsx
+++ b/webapp/components/post_view/components/post_info.jsx
@@ -63,13 +63,8 @@ export default class PostInfo extends React.Component {
         $('#post_dropdown' + this.props.post.id).on('hidden.bs.dropdown', () => this.props.handleDropdownOpened(false));
     }
 
-    createDropdown() {
+    createDropdown(isSystemMessage) {
         const post = this.props.post;
-        const isSystemMessage = PostUtils.isSystemMessage(post);
-
-        if (post.state === Constants.POST_FAILED || post.state === Constants.POST_LOADING) {
-            return '';
-        }
 
         var type = 'Post';
         if (post.root_id && post.root_id.length > 0) {
@@ -82,7 +77,7 @@ export default class PostInfo extends React.Component {
             dataComments = this.props.commentCount;
         }
 
-        if (this.props.allowReply) {
+        if (!isSystemMessage) {
             dropdownContents.push(
                 <li
                     key='replyLink'
@@ -157,42 +152,42 @@ export default class PostInfo extends React.Component {
                     </a>
                 </li>
             );
-        }
 
-        if (this.props.post.is_pinned) {
-            dropdownContents.push(
-                <li
-                    key='unpinLink'
-                    role='presentation'
-                >
-                    <a
-                        href='#'
-                        onClick={this.unpinPost}
+            if (this.props.post.is_pinned) {
+                dropdownContents.push(
+                    <li
+                        key='unpinLink'
+                        role='presentation'
                     >
-                        <FormattedMessage
-                            id='post_info.unpin'
-                            defaultMessage='Un-pin from channel'
-                        />
-                    </a>
-                </li>
-            );
-        } else {
-            dropdownContents.push(
-                <li
-                    key='pinLink'
-                    role='presentation'
-                >
-                    <a
-                        href='#'
-                        onClick={this.pinPost}
+                        <a
+                            href='#'
+                            onClick={this.unpinPost}
+                        >
+                            <FormattedMessage
+                                id='post_info.unpin'
+                                defaultMessage='Un-pin from channel'
+                            />
+                        </a>
+                    </li>
+                );
+            } else {
+                dropdownContents.push(
+                    <li
+                        key='pinLink'
+                        role='presentation'
                     >
-                        <FormattedMessage
-                            id='post_info.pin'
-                            defaultMessage='Pin to channel'
-                        />
-                    </a>
-                </li>
-            );
+                        <a
+                            href='#'
+                            onClick={this.pinPost}
+                        >
+                            <FormattedMessage
+                                id='post_info.pin'
+                                defaultMessage='Pin to channel'
+                            />
+                        </a>
+                    </li>
+                );
+            }
         }
 
         if (this.canDelete) {
@@ -331,21 +326,28 @@ export default class PostInfo extends React.Component {
 
     render() {
         var post = this.props.post;
-        var comments = '';
-        var showCommentClass = '';
-        var commentCountText = this.props.commentCount;
         const flagIcon = Constants.FLAG_ICON_SVG;
 
         this.canDelete = PostUtils.canDeletePost(post);
         this.canEdit = PostUtils.canEditPost(post, this.editDisableAction);
 
-        if (this.props.commentCount >= 1) {
-            showCommentClass = ' icon--show';
-        } else {
-            commentCountText = '';
-        }
+        const isEphemeral = Utils.isPostEphemeral(post);
+        const isPending = post.state === Constants.POST_FAILED || post.state === Constants.POST_LOADING;
+        const isSystemMessage = PostUtils.isSystemMessage(post);
+
+        let comments = null;
+        let react = null;
+        if (!isEphemeral && !isPending && !isSystemMessage) {
+            let showCommentClass;
+            let commentCountText;
+            if (this.props.commentCount >= 1) {
+                showCommentClass = ' icon--show';
+                commentCountText = this.props.commentCount;
+            } else {
+                showCommentClass = '';
+                commentCountText = '';
+            }
 
-        if (post.state !== Constants.POST_FAILED && post.state !== Constants.POST_LOADING && !Utils.isPostEphemeral(post) && this.props.allowReply) {
             comments = (
                 <a
                     href='#'
@@ -361,51 +363,48 @@ export default class PostInfo extends React.Component {
                     </span>
                 </a>
             );
-        }
 
-        let react;
-        if (post.state !== Constants.POST_FAILED &&
-            post.state !== Constants.POST_LOADING &&
-            !Utils.isPostEphemeral(post) &&
-            Utils.isFeatureEnabled(Constants.PRE_RELEASE_FEATURES.EMOJI_PICKER_PREVIEW)) {
-            react = (
-                <span>
-                    <Overlay
-                        show={this.state.showEmojiPicker}
-                        placement='top'
-                        rootClose={true}
-                        container={this}
-                        onHide={() => this.setState({showEmojiPicker: false})}
-                        target={() => ReactDOM.findDOMNode(this.refs['reactIcon_' + post.id])}
+            if (Utils.isFeatureEnabled(Constants.PRE_RELEASE_FEATURES.EMOJI_PICKER_PREVIEW)) {
+                react = (
+                    <span>
+                        <Overlay
+                            show={this.state.showEmojiPicker}
+                            placement='top'
+                            rootClose={true}
+                            container={this}
+                            onHide={() => this.setState({showEmojiPicker: false})}
+                            target={() => ReactDOM.findDOMNode(this.refs['reactIcon_' + post.id])}
 
-                    >
-                        <EmojiPicker
-                            onEmojiClick={this.reactEmojiClick}
-                            pickerLocation='top'
+                        >
+                            <EmojiPicker
+                                onEmojiClick={this.reactEmojiClick}
+                                pickerLocation='top'
 
-                        />
-                    </Overlay>
-                    <a
-                        href='#'
-                        className='reacticon__container'
-                        onClick={this.emojiPickerClick}
-                        ref={'reactIcon_' + post.id}
-                    ><i className='fa fa-smile-o'/>
-                    </a>
-                </span>
+                            />
+                        </Overlay>
+                        <a
+                            href='#'
+                            className='reacticon__container'
+                            onClick={this.emojiPickerClick}
+                            ref={'reactIcon_' + post.id}
+                        ><i className='fa fa-smile-o'/>
+                        </a>
+                    </span>
 
-            );
+                );
+            }
         }
 
         let options;
-        if (Utils.isPostEphemeral(post)) {
+        if (isEphemeral) {
             options = (
                 <li className='col col__remove'>
                     {this.createRemovePostButton()}
                 </li>
             );
-        } else {
-            const dropdown = this.createDropdown();
+        } else if (!isPending) {
+            const dropdown = this.createDropdown(isSystemMessage);
+
             if (dropdown) {
                 options = (
                     <li className='col col__reply'>
@@ -461,7 +460,7 @@ export default class PostInfo extends React.Component {
         }
 
         let flagTrigger;
-        if (!Utils.isPostEphemeral(post)) {
+        if (!isEphemeral) {
             flagTrigger = (
                 <OverlayTrigger
                     key={'flagtooltipkey' + flagVisible}
@@ -516,14 +515,12 @@ PostInfo.defaultProps = {
     post: null,
     commentCount: 0,
     isLastComment: false,
-    allowReply: false,
     sameUser: false
 };
 PostInfo.propTypes = {
     post: React.PropTypes.object.isRequired,
     commentCount: React.PropTypes.number.isRequired,
     isLastComment: React.PropTypes.bool.isRequired,
-    allowReply: React.PropTypes.bool.isRequired,
     handleCommentClick: React.PropTypes.func.isRequired,
     handleDropdownOpened: React.PropTypes.func.isRequired,
     sameUser: React.PropTypes.bool.isRequired,
diff --git a/webapp/components/post_view/components/post_list.jsx b/webapp/components/post_view/components/post_list.jsx
index 4e147d9c82..483ff78c89 100644
--- a/webapp/components/post_view/components/post_list.jsx
+++ b/webapp/components/post_view/components/post_list.jsx
@@ -489,8 +489,14 @@ export default class PostList extends React.Component {
     }
 
     scrollToBottomAnimated() {
-        var postList = $(this.refs.postlist);
-        postList.animate({scrollTop: this.refs.postlist.scrollHeight}, '500');
+        if (UserAgent.isIos()) {
+            // JQuery animation doesn't work on iOS
+            this.refs.postlist.scrollTop = this.refs.postlist.scrollHeight;
+        } else {
+            var postList = $(this.refs.postlist);
+
+            postList.animate({scrollTop: this.refs.postlist.scrollHeight}, '500');
+        }
     }
 
     getArchivesIntroMessage() {
diff --git a/webapp/components/rhs_comment.jsx b/webapp/components/rhs_comment.jsx
index 3dbe6a570f..10cd5fb555 100644
--- a/webapp/components/rhs_comment.jsx
+++ b/webapp/components/rhs_comment.jsx
@@ -151,7 +151,7 @@ export default class RhsComment extends React.Component {
         unpinPost(this.props.post.channel_id, this.props.post.id);
     }
 
-    createDropdown() {
+    createDropdown(isSystemMessage) {
         const post = this.props.post;
 
         if (post.state === Constants.POST_FAILED || post.state === Constants.POST_LOADING) {
@@ -201,57 +201,59 @@ export default class RhsComment extends React.Component {
             }
         }
 
-        dropdownContents.push(
-            <li
-                key='rhs-root-permalink'
-                role='presentation'
-            >
-                <a
-                    href='#'
-                    onClick={this.handlePermalink}
+        if (!isSystemMessage) {
+            dropdownContents.push(
+                <li
+                    key='rhs-root-permalink'
+                    role='presentation'
                 >
-                    <FormattedMessage
-                        id='rhs_comment.permalink'
-                        defaultMessage='Permalink'
-                    />
-                </a>
-            </li>
-        );
+                    <a
+                        href='#'
+                        onClick={this.handlePermalink}
+                    >
+                        <FormattedMessage
+                            id='rhs_comment.permalink'
+                            defaultMessage='Permalink'
+                        />
+                    </a>
+                </li>
+            );
 
-        if (post.is_pinned) {
-            dropdownContents.push(
-                <li
-                    key='rhs-comment-unpin'
-                    role='presentation'
-                >
-                    <a
-                        href='#'
-                        onClick={this.unpinPost}
+            if (post.is_pinned) {
+                dropdownContents.push(
+                    <li
+                        key='rhs-comment-unpin'
+                        role='presentation'
                     >
-                        <FormattedMessage
-                            id='rhs_root.unpin'
-                            defaultMessage='Un-pin from channel'
-                        />
-                    </a>
-                </li>
-            );
-        } else {
-            dropdownContents.push(
-                <li
-                    key='rhs-comment-pin'
-                    role='presentation'
-                >
-                    <a
-                        href='#'
-                        onClick={this.pinPost}
+                        <a
+                            href='#'
+                            onClick={this.unpinPost}
+                        >
+                            <FormattedMessage
+                                id='rhs_root.unpin'
+                                defaultMessage='Un-pin from channel'
+                            />
+                        </a>
+                    </li>
+                );
+            } else {
+                dropdownContents.push(
+                    <li
+                        key='rhs-comment-pin'
+                        role='presentation'
                     >
-                        <FormattedMessage
-                            id='rhs_root.pin'
-                            defaultMessage='Pin to channel'
-                        />
-                    </a>
-                </li>
-            );
+                        <a
+                            href='#'
+                            onClick={this.pinPost}
+                        >
+                            <FormattedMessage
+                                id='rhs_root.pin'
+                                defaultMessage='Pin to channel'
+                            />
+                        </a>
+                    </li>
+                );
+            }
         }
 
         if (this.canDelete) {
@@ -362,15 +364,10 @@ export default class RhsComment extends React.Component {
         const post = this.props.post;
         const flagIcon = Constants.FLAG_ICON_SVG;
         const mattermostLogo = Constants.MATTERMOST_ICON_SVG;
-        const isSystemMessage = PostUtils.isSystemMessage(post);
-        let canReact = false;
 
-        if (post.state !== Constants.POST_FAILED &&
-            post.state !== Constants.POST_LOADING &&
-            !Utils.isPostEphemeral(post) &&
-            Utils.isFeatureEnabled(Constants.PRE_RELEASE_FEATURES.EMOJI_PICKER_PREVIEW)) {
-            canReact = true;
-        }
+        const isEphemeral = Utils.isPostEphemeral(post);
+        const isPending = post.state === Constants.POST_FAILED || post.state === Constants.POST_LOADING;
+        const isSystemMessage = PostUtils.isSystemMessage(post);
 
         var currentUserCss = '';
         if (this.props.currentUser.id === post.user_id) {
@@ -412,7 +409,7 @@ export default class RhsComment extends React.Component {
             }
 
             botIndicator = <li className='col col__name bot-indicator'>{'BOT'}</li>;
-        } else if (PostUtils.isSystemMessage(post)) {
+        } else if (isSystemMessage) {
             userProfile = (
                 <UserProfile
                     user={{}}
@@ -474,7 +471,7 @@ export default class RhsComment extends React.Component {
             );
         }
 
-        if (PostUtils.isSystemMessage(post)) {
+        if (isSystemMessage) {
             profilePic = (
                 <span
                     className='icon'
@@ -556,7 +553,7 @@ export default class RhsComment extends React.Component {
         }
 
         let flagTrigger;
-        if (!Utils.isPostEphemeral(post)) {
+        if (!isEphemeral) {
             flagTrigger = (
                 <OverlayTrigger
                     key={'commentflagtooltipkey' + flagVisible}
@@ -578,7 +575,7 @@ export default class RhsComment extends React.Component {
         let react;
         let reactOverlay;
 
-        if (canReact) {
+        if (!isEphemeral && !isPending && !isSystemMessage && Utils.isFeatureEnabled(Constants.PRE_RELEASE_FEATURES.EMOJI_PICKER_PREVIEW)) {
             react = (
                 <span>
                     <a
@@ -612,17 +609,17 @@ export default class RhsComment extends React.Component {
         }
 
         let options;
-        if (Utils.isPostEphemeral(post)) {
+        if (isEphemeral) {
             options = (
                 <li className='col col__remove'>
                     {this.createRemovePostButton()}
                 </li>
             );
-        } else if (!PostUtils.isSystemMessage(post)) {
+        } else if (!isSystemMessage) {
             options = (
                 <li className='col col__reply'>
                     {reactOverlay}
-                    {this.createDropdown()}
+                    {this.createDropdown(isSystemMessage)}
                     {react}
                 </li>
             );
diff --git a/webapp/components/rhs_root_post.jsx b/webapp/components/rhs_root_post.jsx
index 542f3af42f..41dd92e91f 100644
--- a/webapp/components/rhs_root_post.jsx
+++ b/webapp/components/rhs_root_post.jsx
@@ -182,18 +182,15 @@ export default class RhsRootPost extends React.Component {
         const mattermostLogo = Constants.MATTERMOST_ICON_SVG;
         var timestamp = user ? user.last_picture_update : 0;
         var channel = ChannelStore.get(post.channel_id);
-        let canReact = false;
         const flagIcon = Constants.FLAG_ICON_SVG;
-        if (post.state !== Constants.POST_FAILED &&
-            post.state !== Constants.POST_LOADING &&
-            !Utils.isPostEphemeral(post) &&
-            Utils.isFeatureEnabled(Constants.PRE_RELEASE_FEATURES.EMOJI_PICKER_PREVIEW)) {
-            canReact = true;
-        }
 
         this.canDelete = PostUtils.canDeletePost(post);
         this.canEdit = PostUtils.canEditPost(post, this.editDisableAction);
 
+        const isEphemeral = Utils.isPostEphemeral(post);
+        const isPending = post.state === Constants.POST_FAILED || post.state === Constants.POST_LOADING;
+        const isSystemMessage = PostUtils.isSystemMessage(post);
+
         var type = 'Post';
         if (post.root_id.length > 0) {
             type = 'Comment';
@@ -205,7 +202,7 @@ export default class RhsRootPost extends React.Component {
         }
 
         var systemMessageClass = '';
-        if (PostUtils.isSystemMessage(post)) {
+        if (isSystemMessage) {
             systemMessageClass = 'post--system';
         }
 
@@ -226,7 +223,7 @@ export default class RhsRootPost extends React.Component {
         let react;
         let reactOverlay;
 
-        if (canReact) {
+        if (!isEphemeral && !isPending && !isSystemMessage && Utils.isFeatureEnabled(Constants.PRE_RELEASE_FEATURES.EMOJI_PICKER_PREVIEW)) {
             react = (
                 <span>
                     <a
@@ -298,57 +295,59 @@ export default class RhsRootPost extends React.Component {
             }
         }
 
-        dropdownContents.push(
-            <li
-                key='rhs-root-permalink'
-                role='presentation'
-            >
-                <a
-                    href='#'
-                    onClick={this.handlePermalink}
+        if (!isSystemMessage) {
+            dropdownContents.push(
+                <li
+                    key='rhs-root-permalink'
+                    role='presentation'
                 >
-                    <FormattedMessage
-                        id='rhs_root.permalink'
-                        defaultMessage='Permalink'
-                    />
-                </a>
-            </li>
-        );
+                    <a
+                        href='#'
+                        onClick={this.handlePermalink}
+                    >
+                        <FormattedMessage
+                            id='rhs_root.permalink'
+                            defaultMessage='Permalink'
+                        />
+                    </a>
+                </li>
+            );
 
-        if (post.is_pinned) {
-            dropdownContents.push(
-                <li
-                    key='rhs-root-unpin'
-                    role='presentation'
-                >
-                    <a
-                        href='#'
-                        onClick={this.unpinPost}
+            if (post.is_pinned) {
+                dropdownContents.push(
+                    <li
+                        key='rhs-root-unpin'
+                        role='presentation'
                     >
-                        <FormattedMessage
-                            id='rhs_root.unpin'
-                            defaultMessage='Un-pin from channel'
-                        />
-                    </a>
-                </li>
-            );
-        } else {
-            dropdownContents.push(
-                <li
-                    key='rhs-root-pin'
-                    role='presentation'
-                >
-                    <a
-                        href='#'
-                        onClick={this.pinPost}
+                        <a
+                            href='#'
+                            onClick={this.unpinPost}
+                        >
+                            <FormattedMessage
+                                id='rhs_root.unpin'
+                                defaultMessage='Un-pin from channel'
+                            />
+                        </a>
+                    </li>
+                );
+            } else {
+                dropdownContents.push(
+                    <li
+                        key='rhs-root-pin'
+                        role='presentation'
                     >
-                        <FormattedMessage
-                            id='rhs_root.pin'
-                            defaultMessage='Pin to channel'
-                        />
-                    </a>
-                </li>
-            );
+                        <a
+                            href='#'
+                            onClick={this.pinPost}
+                        >
+                            <FormattedMessage
+                                id='rhs_root.pin'
+                                defaultMessage='Pin to channel'
+                            />
+                        </a>
+                    </li>
+                );
+            }
         }
 
         if (this.canDelete) {
@@ -443,7 +442,7 @@ export default class RhsRootPost extends React.Component {
             }
 
             botIndicator = <li className='col col__name bot-indicator'>{'BOT'}</li>;
-        } else if (PostUtils.isSystemMessage(post)) {
+        } else if (isSystemMessage) {
             userProfile = (
                 <UserProfile
                     user={{}}
@@ -485,7 +484,7 @@ export default class RhsRootPost extends React.Component {
             );
         }
 
-        if (PostUtils.isSystemMessage(post)) {
+        if (isSystemMessage) {
             profilePic = (
                 <span
                     className='icon'
diff --git a/webapp/components/team_members_dropdown.jsx b/webapp/components/team_members_dropdown.jsx
index df925286a3..3f41804257 100644
--- a/webapp/components/team_members_dropdown.jsx
+++ b/webapp/components/team_members_dropdown.jsx
@@ -8,7 +8,7 @@ import UserStore from 'stores/user_store.jsx';
 import ChannelStore from 'stores/channel_store.jsx';
 
 import {removeUserFromTeam, updateTeamMemberRoles} from 'actions/team_actions.jsx';
-import {updateActive} from 'actions/user_actions.jsx';
+import {loadMyTeamMembers, updateActive} from 'actions/user_actions.jsx';
 
 import * as AsyncClient from 'utils/async_client.jsx';
 import * as Utils from 'utils/utils.jsx';
@@ -49,6 +49,10 @@ export default class TeamMembersDropdown extends React.Component {
                 'team_user',
                 () => {
                     AsyncClient.getUser(this.props.user.id);
+
+                    if (this.props.user.id === me.id) {
+                        loadMyTeamMembers();
+                    }
                 },
                 (err) => {
                     this.setState({serverError: err.message});
diff --git a/webapp/i18n/de.json b/webapp/i18n/de.json
index b780fcd87e..468e134146 100644
--- a/webapp/i18n/de.json
+++ b/webapp/i18n/de.json
@@ -86,7 +86,7 @@
   "add_emoji.save": "Speichern",
   "add_incoming_webhook.cancel": "Abbrechen",
   "add_incoming_webhook.channel": "Kanal",
-  "add_incoming_webhook.channel.help": "Öffentlicher Kanal oder private Gruppe welche die Webhook Daten empfängt. Sie müssen zur privaten Gruppe gehören sobald Sie den Webhook erstellen.",
+  "add_incoming_webhook.channel.help": "Öffentlicher oder privater Kanal welche die Webhook Daten empfängt. Sie müssen zum privatem Kanal gehören wenn Sie den Webhook erstellen.",
   "add_incoming_webhook.channelRequired": "Ein gültiger Kanal ist notwendig",
   "add_incoming_webhook.description": "Beschreibung",
   "add_incoming_webhook.description.help": "Beschreibung des eingehenden Webhooks.",
@@ -137,7 +137,8 @@
   "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Auswählen wann der ausgehende Webhook ausgelöst werden soll. Wenn das erste Wort der Nachricht einem Auslösewort exakt entspricht, oder wenn es mit dem Auslösewort beginnt.",
   "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)",
+  "add_users_to_team.title": "Neue Mitglieder zum Team {teamName} hinzufügen",
+  "admin.advance.cluster": "Hochverfügbarkeit",
   "admin.advance.metrics": "Performance Überwachung",
   "admin.audits.reload": "Benutzeraktivitäten Log neuladen",
   "admin.audits.title": "Benutzeraktivitäten Log",
@@ -282,6 +283,8 @@
   "admin.email.requireVerificationDescription": "Normalerweise wahr in Produktionsumgebungen. Wenn wahr erfordert Mattermost E-Mail-Adressen nach Account Erstellung zu bestätigen bevor ein Anmelden erlaubt wird. Entwickler sollten dies auf falsch setzen um für eine schnellere Entwicklung die E-Mail Bestätigung zu überspringen.",
   "admin.email.requireVerificationTitle": "Erzwinge E-Mail Bestätigung: ",
   "admin.email.selfPush": "Manuelle Eingabe des Orts zum Push-Mitteilungs-Service",
+  "admin.email.skipServerCertificateVerification.description": "Wenn wahr, wird Mattermost das Zertifikat des E-Mail-Servers nicht verifizieren.",
+  "admin.email.skipServerCertificateVerification.title": "Serverzertifikatsüberprüfung überspringen: ",
   "admin.email.smtpPasswordDescription": " Die Zugangsdaten erhalten Sie vom Administrator des E-Mail Servers.",
   "admin.email.smtpPasswordExample": "z.B.: \"IhrPasswort\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.email.smtpPasswordTitle": "SMTP Server Passwort:",
@@ -328,13 +331,15 @@
   "admin.general.policy.permissionsSystemAdmin": "Systemadministratoren",
   "admin.general.policy.restrictPostDeleteDescription": "Richtline festlegen, wer die Berechtigung erhält, Nachrichten zu löschen.",
   "admin.general.policy.restrictPostDeleteTitle": "Löschen von Nachrichten erlauben:",
-  "admin.general.policy.restrictPrivateChannelCreationDescription": "Regel festlegen, wer öffentliche Kanäle erstellen darf.",
-  "admin.general.policy.restrictPrivateChannelCreationTitle": "Erlaube Erstellung öffentlicher Kanäle für:",
+  "admin.general.policy.restrictPrivateChannelCreationDescription": "Regel festlegen, wer private Kanäle erstellen darf.",
+  "admin.general.policy.restrictPrivateChannelCreationTitle": "Erlaube Erstellung privater Kanäle für:",
   "admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "Kommandozeilenwerkzeug",
-  "admin.general.policy.restrictPrivateChannelDeletionDescription": "Regel festlegen, wer öffentliche Kanäle löschen darf. Gelöschte Kanäle können von der Datenbank mit einem {commandLineToolLink} wiederhergestellt werden.",
-  "admin.general.policy.restrictPrivateChannelDeletionTitle": "Erlaube Löschung öffentlicher Kanäle für:",
-  "admin.general.policy.restrictPrivateChannelManagementDescription": "Regel festlegen, wer öffentliche Kanäle umbenennen und Kopfzeile sowie Zweck anpassen darf.",
-  "admin.general.policy.restrictPrivateChannelManagementTitle": "Erlaube Umbenennung öffentlicher Kanäle für:",
+  "admin.general.policy.restrictPrivateChannelDeletionDescription": "Regel festlegen, wer private Kanäle löschen darf. Gelöschte Kanäle können von der Datenbank mit einem {commandLineToolLink} wiederhergestellt werden.",
+  "admin.general.policy.restrictPrivateChannelDeletionTitle": "Erlaube Löschung privater Kanäle für:",
+  "admin.general.policy.restrictPrivateChannelManageMembersDescription": "Regel festlegen, wer Mitglieder zu privaten Kanälen hinzufügen und davon löschen darf.",
+  "admin.general.policy.restrictPrivateChannelManageMembersTitle": "Erlaube Verwaltung von privaten Kanälen für:",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "Regel festlegen, wer private Kanäle umbenennen und Kopfzeile sowie Zweck anpassen darf.",
+  "admin.general.policy.restrictPrivateChannelManagementTitle": "Erlaube Umbenennung privater Kanäle für:",
   "admin.general.policy.restrictPublicChannelCreationDescription": "Regel festlegen, wer öffentliche Kanäle erstellen darf.",
   "admin.general.policy.restrictPublicChannelCreationTitle": "Erlaube Erstellung öffentlicher Kanäle für:",
   "admin.general.policy.restrictPublicChannelDeletionCommandLineToolLink": "Kommandozeilenwerkzeug",
@@ -342,7 +347,7 @@
   "admin.general.policy.restrictPublicChannelDeletionTitle": "Erlaube Löschung öffentlicher Kanäle für:",
   "admin.general.policy.restrictPublicChannelManagementDescription": "Regel festlegen, wer öffentliche Kanäle umbenennen und Kopfzeile sowie Zweck anpassen darf.",
   "admin.general.policy.restrictPublicChannelManagementTitle": "Erlaube Umbenennung öffentlicher Kanäle für:",
-  "admin.general.policy.teamInviteDescription": "Regel dafür festlegen wer andere in ein Team mit <b>Neues Mitglied einladen</b> via E-Mail einladen darf oder den <b>Team Einladungslink erhalten</b> Link im Hauptmenü verwenden darf. Wenn <b>Team Einladungslink erhalten</b> Link verwendet wird um einen Link zu teilen, können Sie den Einladungscode in den <b>Team Einstellungen</b> > <b>Einladungscode</b> verändern nachdem alle gewollten Nutzer dem Team beigetreten sind.",
+  "admin.general.policy.teamInviteDescription": "Regel dafür festlegen wer andere in ein Team mit <b>Neues Mitglied einladen</b> via E-Mail einladen darf oder den <b>Team Einladungslink erhalten</b> Link im Hauptmenü verwenden darf. Wenn <b>Team Einladungslink erhalten</b> Link verwendet wird um einen Link zu teilen, können Sie den Einladungscode in den <b>Team Einstellungen</b> > <b>Einladungscode</b> ablaufen lassen, nachdem alle gewollten Nutzer dem Team beigetreten sind.",
   "admin.general.policy.teamInviteTitle": "Erlaube Senden von Teameinladungen für:",
   "admin.general.privacy": "Privatsphäre",
   "admin.general.usersAndTeams": "Benutzer und Teams",
@@ -450,7 +455,7 @@
   "admin.ldap.lastnameAttrEx": "z.B.: \"sn\"",
   "admin.ldap.lastnameAttrTitle": "Attibut Nachname:",
   "admin.ldap.ldap_test_button": "AD/LDAP Test",
-  "admin.ldap.loginNameDesc": "Der Platzhalter der im Loginfeld der Loginseite angezeigt wird. Standart ist \"AD/LDAP Benutzername\".",
+  "admin.ldap.loginNameDesc": "Der Platzhalter, der im Anmeldefeld der Anmeldeseite angezeigt wird. Standard ist \"AD/LDAP Benutzername\".",
   "admin.ldap.loginNameEx": "z.B.: \"AD/LDAP Benutzername\"",
   "admin.ldap.loginNameTitle": "Login Feld Name:",
   "admin.ldap.maxPageSizeEx": "z.B.: \"2000\"",
@@ -506,7 +511,7 @@
   "admin.log.enableDiagnosticsDescription": "Durch aktivieren dieses Features kann die Qualität und Performance von Mattermost verbessert werden indem Diagnose und Fehler an Mattermost, Inc übermittelt werden. Lesen Sie unsere <a href=\"https://about.mattermost.com/default-privacy-policy/\" target=\"_blank\">Datenschutzbestimmungen</a> um mehr darüber zu erfahren.",
   "admin.log.enableWebhookDebugging": "Aktiviere Webhook Debugging:",
   "admin.log.enableWebhookDebuggingDescription": "Sie können dies auf falsch setzen, um das Debuglogging von eingehenden Webhook Anfragen zu deaktivieren.",
-  "admin.log.fileDescription": "In Produktionsumgebungen normalerweise wahr.   Wenn wahr werden Logdateien im Speicherort abgelegt, welcher im unteren Feld spezifiziert wird.",
+  "admin.log.fileDescription": "Normalerweise wahr in Produktionsumgebungen. Wenn wahr, werden Ereignisse in die mattermost.log in den unter Log-Verzeichnis angegebene Ordner mitgeschrieben. Die Logs  werden bei 10.000 Zeilen rotiert und in eine Datei im selben Verzeichnis archiviert und mit einem Datumsstempel und Seriennummer versehen. Zum Beispiel mattermost.2017-03-31.001.",
   "admin.log.fileLevelDescription": "Diese Einstellung bestimmt auf welchem Detailgrad Lognachrichten in die Konsole geschrieben werden. FEHLER: Gibt nur Fehlernachrichten aus. INFO: Gibt Fehlernachrichten und Informationen zum Start und Initialisierung aus. DEBUG: Gibt einen hohen Detailgrad für Entwickler zur Fehlersuche aus.",
   "admin.log.fileLevelTitle": "Datei Log-Level:",
   "admin.log.fileTitle": "Log in eine Datei schreiben:",
@@ -521,7 +526,7 @@
   "admin.log.formatTitle": "Log-Dateiformat:",
   "admin.log.levelDescription": "Diese Einstellung bestimmt auf welchem Detailgrad Lognachrichten in die Konsole geschrieben werden. ERROR: Gibt nur Fehlernachrichten aus. INFO: Gibt Fehlernachrichten und Informationen zum Start und Initialisierung aus. DEBUG: Gibt einen hohen Detailgrad für Entwickler zur Fehlersuche aus.",
   "admin.log.levelTitle": "Konsole Log Level:",
-  "admin.log.locationDescription": "Datei in welche die Lognachrichten geschrieben werden. Wenn leer wird ./logs/mattermost verwendet welches in mattermost.log schreibt. Log Rotation ist aktiviert und alle 10.000 Zeilen wird in eine neue Datei im selben Verzeichnis geschrieben, zum Beispiel mattermost.2015-09-23.001, mattermost.2015-09-23.002, und so weiter.",
+  "admin.log.locationDescription": "Der Ort für die Log-Dateien. Wenn leer werden sie im ./logs Verzeichnis gespeichert. Bei Angabe eines Verzeichnisses muss dieses existieren und Mattermost muss Schreibberechtigungen darauf haben.",
   "admin.log.locationPlaceholder": "Einen Dateiort eingeben",
   "admin.log.locationTitle": "Log-Verzeichnis:",
   "admin.log.logSettings": "Protokoll-Einstellungen",
@@ -691,7 +696,7 @@
   "admin.service.corsTitle": "Erlaube Cross Origin Requests von:",
   "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": "Enforce Multi-factor Authentication:",
+  "admin.service.enforcMfaTitle": "Multi-Faktor-Authentifizierung erzwingen:",
   "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",
@@ -725,7 +730,7 @@
   "admin.service.sessionCacheDesc": "Die Anzahl von Minuten in denen der Sitzungs-Cache im Speicher gehalten wird.",
   "admin.service.sessionDaysEx": "z.B.: \"30\"",
   "admin.service.siteURL": "URL der Seite:",
-  "admin.service.siteURLDescription": "Die URL, inklusive Port und Protokoll, welche Benutzer zum Zugriff auf Mattermost verwenden werden. Dieses Feld kann leer gelassen werden, sofern Sie E-Mail-Stapelverarbeitung in <b>Benachrichtigungen > E-Mail</b> nicht verwenden. Wenn leer wird die URL basierend auf eingehenden Verkehr ermittelt.",
+  "admin.service.siteURLDescription": "Die URL, inklusive Port und Protokoll, welche Benutzer zum Zugriff auf Mattermost verwenden werden. Diese Einstellung ist erforderlich.",
   "admin.service.siteURLExample": "z.B.: \"https://mattermost.example.com:1234\"",
   "admin.service.ssoSessionDays": "Sessiondauer für SSO Anwendungen (Tage):",
   "admin.service.ssoSessionDaysDesc": "Die Anzahl der Tage seit der letzten Anmeldung des Benutzers bis zum Ablauf der Sitzung. Wenn die Authentifizierungsmethode SAML oder GitLab ist, wird der Benutzer automatisch wieder angemeldet sofern er noch bei SAML oder GitLab angemeldet ist. Bei Änderung dieser Einstellung tritt die neue Sitzungsdauer in Kraft nachdem der Benutzer sich das nächste Mal anmeldet.",
@@ -743,11 +748,11 @@
   "admin.service.webhooksTitle": "Aktiviere eingehende Webhooks: ",
   "admin.service.writeTimeout": "Schreibe-Zeitüberschreitung:",
   "admin.service.writeTimeoutDescription": "Wenn HTTP verwendet wird (unsicher), ist dies die maximale erlaubte Zeit vom ende des Lesens der Anfrage bis die Antwort geschrieben wurde. Wenn HTTPS verwendet wird ist es die komplette Zeit von Verbindungsannahme bis die Antwort geschrieben wurde.",
-  "admin.sidebar.addTeamSidebar": "Add team from sidebar menu",
+  "admin.sidebar.addTeamSidebar": "Team aus dem Seitenmenü hinzufügen",
   "admin.sidebar.advanced": "Erweitert",
   "admin.sidebar.audits": "Compliance und Prüfung",
   "admin.sidebar.authentication": "Authentifizierung",
-  "admin.sidebar.cluster": "High Availability (Beta)",
+  "admin.sidebar.cluster": "Hochverfügbarkeit",
   "admin.sidebar.compliance": "Compliance",
   "admin.sidebar.configuration": "Konfiguration",
   "admin.sidebar.connections": "Verbindungen",
@@ -784,7 +789,7 @@
   "admin.sidebar.push": "Mobil Push",
   "admin.sidebar.rateLimiting": "Geschwindigkeitsbegrenzung",
   "admin.sidebar.reports": "REPORTING",
-  "admin.sidebar.rmTeamSidebar": "Remove team from sidebar menu",
+  "admin.sidebar.rmTeamSidebar": "Team aus dem Seitenmenü entfernen",
   "admin.sidebar.saml": "SAML",
   "admin.sidebar.security": "Sicherheit",
   "admin.sidebar.sessions": "Sitzungen",
@@ -880,8 +885,8 @@
   "admin.team_analytics.activeUsers": "Aktive Nutzer mit Beiträgen",
   "admin.team_analytics.totalPosts": "Summe aller Beiträge",
   "admin.true": "wahr",
-  "admin.userList.title": "Users for {team}",
-  "admin.userList.title2": "Users for {team} ({count})",
+  "admin.userList.title": "Mitglieder bei {team}",
+  "admin.userList.title2": "Mitglieder bei {team} ({count})",
   "admin.user_item.authServiceEmail": "<strong>Anmelde-Methode:</strong> E-Mail-Adresse",
   "admin.user_item.authServiceNotEmail": "<strong>Anmelde-Methode:</strong> {service}",
   "admin.user_item.confirmDemoteDescription": "Wenn Sie sich selbst die Systemadministrations-Rolle entziehen und es gibt keinen weitere Benutzer mit der Systemadministrations-Rolle, müssen Sie einen Systemadministrator über den Mattermost-Server in einer Terminal-Sitzung mit folgendem Kommando festlegen.",
@@ -895,13 +900,14 @@
   "admin.user_item.makeMember": "Zum Mitglied machen",
   "admin.user_item.makeSysAdmin": "Zum Systemadministrator machen",
   "admin.user_item.makeTeamAdmin": "Zum Teamadministrator machen",
+  "admin.user_item.manageTeams": "Teams verwalten",
   "admin.user_item.member": "Mitglied",
   "admin.user_item.mfaNo": "<strong>MFA</strong>: Nein",
   "admin.user_item.mfaYes": "<strong>MFA</strong>: Ja",
   "admin.user_item.resetMfa": "MFA entfernen",
   "admin.user_item.resetPwd": "Passwort zurücksetzen",
   "admin.user_item.switchToEmail": "Umschalten zu E-Mail-Adresse/Passwort",
-  "admin.user_item.sysAdmin": "System Admin",
+  "admin.user_item.sysAdmin": "Systemadministrator",
   "admin.user_item.teamAdmin": "Team Administrator",
   "admin.webrtc.enableDescription": "Wenn wahr, erlaubt Mattermost die Erstellung von <strong>eins-zu-eins</strong> Videokonferenzen. WebRTC Anrufe sind in Chrome, Firefox und Mattermost Desktop Anwendungen verfügbar.",
   "admin.webrtc.enableTitle": "Aktiviere Mattermost WebRTC: ",
@@ -941,7 +947,7 @@
   "analytics.system.dailyActiveUsers": "Tägliche aktive Benutzer",
   "analytics.system.monthlyActiveUsers": "Monatliche aktive Benutzer",
   "analytics.system.postTypes": "Nachrichten, Dateien und Hashtags",
-  "analytics.system.privateGroups": "Privater Kanal",
+  "analytics.system.privateGroups": "Private Kanäle",
   "analytics.system.publicChannels": "Öffentliche Kanäle",
   "analytics.system.skippedIntensiveQueries": "Um die Performance zu maximieren sind einige Statistiken deaktiviert. Sie können diese in der config.json wieder reaktivieren. Sie erfahren mehr in der <a href='https://docs.mattermost.com/administration/statistics.html' target='_blank'>Dokumentation</a>.",
   "analytics.system.textPosts": "Nur-Text Beiträge",
@@ -961,7 +967,7 @@
   "analytics.system.totalWebsockets": "Websocket Verbindungen",
   "analytics.team.activeUsers": "Aktive Benutzer mit Beiträgen",
   "analytics.team.newlyCreated": "Neu erstellte Benutzer",
-  "analytics.team.privateGroups": "Privater Kanal",
+  "analytics.team.privateGroups": "Private Kanäle",
   "analytics.team.publicChannels": "Öffentliche Kanäle",
   "analytics.team.recentActive": "Zuletzt aktive Benutzer",
   "analytics.team.recentUsers": "Zuletzt aktive Benutzer",
@@ -994,8 +1000,8 @@
   "audit_table.attemptedWebhookDelete": "Versuchte einen Webhook zu löschen",
   "audit_table.by": " von {username}",
   "audit_table.byAdmin": " von einem Administrator",
-  "audit_table.channelCreated": "Kanal/Gruppe {channelName} wurde erstellt",
-  "audit_table.channelDeleted": "Kanal/Gruppe mit der URL {url} wurde gelöscht",
+  "audit_table.channelCreated": "Kanal {channelName} wurde erstellt",
+  "audit_table.channelDeleted": "Kanal mit der URL {url} wurde gelöscht",
   "audit_table.establishedDM": "Ein Kanal für direkte Mitteilungen an {username} wurde aufgebaut",
   "audit_table.failedExpiredLicenseAdd": "Neue Lizenz wurde nicht hinzugefügt weil diese entweder abgelaufen oder noch nicht begonnen hat",
   "audit_table.failedInvalidLicenseAdd": "Ungültige Lizenz wurde nicht hinzugefügt",
@@ -1004,14 +1010,14 @@
   "audit_table.failedPassword": "Fehler beim Ändern des Passwortes - versuchte einen Benutzer zu aktualisieren der sich via OAuth anmeldet",
   "audit_table.failedWebhookCreate": "Fehler beim Erstellen eines Webhooks - unzureichende Kanal Zugriffsrechte",
   "audit_table.failedWebhookDelete": "Fehler beim Löschen eines Webhooks - unpassende Bedingungen",
-  "audit_table.headerUpdated": "Aktualisierte den Kanal/Gruppen Kopf bei {channelName}",
+  "audit_table.headerUpdated": "Überschrift des Kanals {channelName} aktualisiert",
   "audit_table.ip": "IP-Adresse",
   "audit_table.licenseRemoved": "Lizenz erfolgreich entfernt",
   "audit_table.loginAttempt": " (Anmeldeversuche)",
   "audit_table.loginFailure": " (Anmeldung fehlgeschlagen)",
   "audit_table.logout": "Von Ihren Zugang abgemeldet",
   "audit_table.member": "Mitglied",
-  "audit_table.nameUpdated": "Kanal/Gruppen-Name {channelName} wurde aktualisiert",
+  "audit_table.nameUpdated": "Name des Kanals {channelName} aktualisiert",
   "audit_table.oauthTokenFailed": "Fehler beim Laden des OAuth Access Token - {token}",
   "audit_table.revokedAll": "Alle aktuellen Sitzungen für das Team zurückgezogen",
   "audit_table.sentEmail": "Es wurde eine E-Mail an {email} gesendet um das Passwort zurückzusetzen",
@@ -1059,28 +1065,25 @@
   "channelHeader.removeFromFavorites": "Aus Favoriten entfernen",
   "channel_flow.alreadyExist": "Ein Kanal mit der URL existiert bereits",
   "channel_flow.changeUrlDescription": "Einige Zeichen sind nicht in URLs erlaubt und werden ggfs. entfernt.",
-  "channel_flow.changeUrlTitle": "Change {term} URL",
-  "channel_flow.channel": "Channel",
-  "channel_flow.create": "Privater Kanal",
-  "channel_flow.group": "Group",
+  "channel_flow.changeUrlTitle": "Kanal-URL ändern",
+  "channel_flow.create": "Kanal erstellen",
   "channel_flow.handleTooShort": "Kanal-URL muss zwei oder mehr alphanumerische Zeichen enthalten",
   "channel_flow.invalidName": "Ungültiger Kanal Name",
-  "channel_flow.set_url_title": "Set {term} URL",
+  "channel_flow.set_url_title": "Kanal-URL setzen",
   "channel_header.addMembers": "Mitglieder hinzufügen",
   "channel_header.addToFavorites": "Zu Favoriten hinzufügen",
-  "channel_header.channel": "Channel",
-  "channel_header.channelHeader": "Bearbeite Kanaltitel",
+  "channel_header.channel": "Kanal",
+  "channel_header.channelHeader": "Bearbeite Kanalüberschrift",
   "channel_header.delete": "Kanal löschen",
   "channel_header.flagged": "Markierte Nachrichten",
-  "channel_header.group": "Group",
   "channel_header.leave": "Kanal verlassen",
   "channel_header.manageMembers": "Mitglieder verwalten",
   "channel_header.notificationPreferences": "Benachrichtigungseinstellungen",
   "channel_header.recentMentions": "Letzte Erwähnungen",
   "channel_header.removeFromFavorites": "Aus Favoriten entfernen",
   "channel_header.rename": "Kanal umbenennen",
-  "channel_header.setHeader": "Bearbeite Kanaltitel",
-  "channel_header.setPurpose": "Edit {term} Purpose",
+  "channel_header.setHeader": "Bearbeite Kanalüberschrift",
+  "channel_header.setPurpose": "Kanalzweck bearbeiten",
   "channel_header.viewInfo": "Info anzeigen",
   "channel_header.viewMembers": "Zeige Mitglieder",
   "channel_header.webrtc.call": "Videoanruf starten",
@@ -1115,26 +1118,24 @@
   "channel_members_modal.addNew": " Füge neue Mitglieder hinzu",
   "channel_members_modal.members": " Mitglieder",
   "channel_modal.cancel": "Abbrechen",
-  "channel_modal.channel": "Channel",
   "channel_modal.createNew": "Neuen Kanal erstellen",
-  "channel_modal.descriptionHelp": "Beschreiben Sie wie diese(r) {term} genutzt werden soll.",
+  "channel_modal.descriptionHelp": "Beschreiben Sie wie dieser Kanal genutzt werden soll.",
   "channel_modal.displayNameError": "Kanalname muss aus 2 oder mehr Zeichen bestehen",
   "channel_modal.edit": "Bearbeiten",
-  "channel_modal.group": "Group",
   "channel_modal.header": "Überschrift",
   "channel_modal.headerEx": "z.B.: \"[Link Titel](http://beispiel.de)\"",
-  "channel_modal.headerHelp": "Der Text der in der Kopfzeile der/des {term} neben dem Namen steht. Zum Beispiel könnten Sie häufig genutzte Links durch Hinzufügen von [Link Titel](http://example.de) anzeigen lassen.",
-  "channel_modal.modalTitle": "New ",
+  "channel_modal.headerHelp": "Der Text der in der Kopfzeile des Kanals neben dem Namen steht. Zum Beispiel könnten Sie häufig genutzte Links durch Hinzufügen von [Link Titel](http://example.de) anzeigen lassen.",
+  "channel_modal.modalTitle": "Neuer Kanal",
   "channel_modal.name": "Name",
   "channel_modal.nameEx": "z.B.: \"Bugs\", \"Marketing\", \"客户支持\"",
   "channel_modal.optional": "(optional)",
-  "channel_modal.privateGroup1": "Erstelle eine neue private Gruppe mit beschränktem Nutzerkreis. ",
-  "channel_modal.privateGroup2": "Erstelle einen öffentlichen Kanal",
-  "channel_modal.publicChannel1": "Erstelle einen öffentlichen Kanal",
-  "channel_modal.publicChannel2": "Erstelle einen neuen öffentlichen Kanal dem jeder beitreten kann. ",
+  "channel_modal.privateGroup1": "Eine neue private Gruppe mit beschränktem Nutzerkreis erstellen. ",
+  "channel_modal.privateGroup2": "Einen privaten Kanal erstellen",
+  "channel_modal.publicChannel1": "Einen öffentlichen Kanal erstellen",
+  "channel_modal.publicChannel2": "Einen neuen öffentlichen Kanal dem jeder beitreten kann erstellen. ",
   "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})",
@@ -1229,11 +1230,9 @@
   "custom_emoji.search": "Suche eigenes Emoji",
   "default_channel.purpose": "Senden Sie Nachrichten hier, die jeder sehen können soll. Jeder wird automatisch ein permanentes Mitglied in diesem Kanal wenn Sie dem Team beitreten.",
   "delete_channel.cancel": "Abbrechen",
-  "delete_channel.channel": "channel",
   "delete_channel.confirm": "Bestätige LÖSCHUNG des Kanals",
   "delete_channel.del": "Löschen",
-  "delete_channel.group": "group",
-  "delete_channel.question": "Dieser Kanal und sein Inhalt wird aus dem Team gelöscht und ist dann für alle Nutzer nicht mehr verfügbar. Sind Sie sich sicher, dass Sie den {term}{display_name} löschen möchten?",
+  "delete_channel.question": "Dieser Kanal und sein Inhalt wird aus dem Team gelöscht und ist dann für alle Nutzer nicht mehr verfügbar. Sind Sie sich sicher, dass Sie den Kanal {display_name} löschen möchten?",
   "delete_post.cancel": "Abbrechen",
   "delete_post.comment": "Kommentar",
   "delete_post.confirm": "Bestätige Löschung von {term}",
@@ -1247,11 +1246,9 @@
   "edit_channel_header_modal.save": "Speichern",
   "edit_channel_header_modal.title": "Bearbeite Überschrift für {channel}",
   "edit_channel_header_modal.title_dm": "Überschrift bearbeiten",
-  "edit_channel_purpose_modal.body": "Beschreiben Sie wie diese(r) {type} genutzt werden soll. Dieser Text erscheint in der Kanalliste im \"Mehr...\" Menü und hilft anderen sich zu entscheiden ob sie beitreten sollen.",
+  "edit_channel_purpose_modal.body": "Beschreiben Sie wie dieser Kanal genutzt werden soll. Dieser Text erscheint in der Kanalliste im \"Mehr...\" Menü und hilft anderen sich zu entscheiden ob sie beitreten sollen.",
   "edit_channel_purpose_modal.cancel": "Abbrechen",
-  "edit_channel_purpose_modal.channel": "Channel",
   "edit_channel_purpose_modal.error": "Der Kanalzweck ist zu lang, bitte geben Sie einen kürzeren ein",
-  "edit_channel_purpose_modal.group": "Group",
   "edit_channel_purpose_modal.save": "Speichern",
   "edit_channel_purpose_modal.title1": "Zweck bearbeiten",
   "edit_channel_purpose_modal.title2": "Zweck bearbeiten für ",
@@ -1302,12 +1299,14 @@
   "error.not_found.link_message": "Zurück zu Mattermost",
   "error.not_found.message": "Die Seite, die Sie versuchten zu erreichen, existiert nicht",
   "error.not_found.title": "Seite nicht gefunden",
-  "error.not_supported.message": "Privates Browsing wird nicht unterstützt",
-  "error.not_supported.title": "Browser nicht unterstützt",
   "error_bar.expired": "Enterprise Lizenz ist abgelaufen und einige Funktionen wurden evtl. deaktiviert. <a href='{link}' target='_blank'>Bitte erneuern.</a>",
   "error_bar.expiring": "Enterprise Lizenz läuft ab am {date}. <a href='{link}' target='_blank'>Bitte erneuern.</a>",
   "error_bar.past_grace": "Enterprise Lizenz ist abgelaufen und einige Funktionen wurden evtl. deaktiviert. Bitte wenden Sie sich an den Systemadministrator für mehr Details.",
   "error_bar.preview_mode": "Vorführungsmodus: E-Mail Benachrichtigungen wurden nicht konfiguriert",
+  "error_bar.site_url": "Bitte konfigurieren Sie ihren {docsLink} hier {link}.",
+  "error_bar.site_url.docsLink": "URL der Seite:",
+  "error_bar.site_url.link": "System Konsole",
+  "error_bar.site_url_gitlab": "Bitte konfigurieren Sie ihren {docsLink} in der System Konsole oder in der gitlab.rb wenn Sie GitLab Mattermost verwenden.",
   "file_attachment.download": "Download",
   "file_info_preview.size": "Größe ",
   "file_info_preview.type": "Dateityp ",
@@ -1467,7 +1466,7 @@
   "installed_commands.delete.confirm": "Diese Aktion wird den Slash-Befehl permanent löschen und wird jede Integration, die ihn verwendet, stoppen. Sind Sie sich sicher dass sie ihn löschen möchten?",
   "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.",
+  "installed_commands.help": "Slash-Befehle zur Verwendung in externen Integrationen erstellen. Bitte {link} für mehr Informationen ansehen.",
   "installed_commands.helpLink": "Dokumentation",
   "installed_commands.search": "Suche nach Slash-Befehlen",
   "installed_commands.unnamed_command": "Unbenannter Slash-Befehl",
@@ -1475,7 +1474,7 @@
   "installed_incoming_webhooks.delete.confirm": "Die Aktion wird den eingehenden Webhook permanent löschen und jede Integration, die ihn verwendet, stoppen. Sind Sie sich sicher dass sie ihn löschen möchten?",
   "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.",
+  "installed_incoming_webhooks.help": "Eingehende Webhook URLs zur Verwendung in externen Integrationen erstellen. Bitte {link} für mehr Informationen ansehen.",
   "installed_incoming_webhooks.helpLink": "Dokumentation",
   "installed_incoming_webhooks.search": "Suche nach eingehenden Webhooks",
   "installed_incoming_webhooks.unknown_channel": "Ein privater Webhook",
@@ -1517,7 +1516,7 @@
   "installed_outgoing_webhooks.delete.confirm": "Diese Aktion wird den ausgehenden Webhook permanent löschen und und jede Integration, die ihn verwendet, stoppen. Sind Sie sich sicher dass sie ihn löschen möchten?",
   "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.",
+  "installed_outgoing_webhooks.help": "Ausgehende Webhook URLs zur Verwendung in externen Integrationen erstellen. Bitte {link} für mehr Informationen ansehen.",
   "installed_outgoing_webhooks.helpLink": "Dokumentation",
   "installed_outgoing_webhooks.search": "Suche ausgehende Webhooks",
   "installed_outgoing_webhooks.unknown_channel": "Ein privater Webhook",
@@ -1547,7 +1546,7 @@
   "intro_messages.inviteOthers": "Laden Sie andere zu diesem Team ein",
   "intro_messages.noCreator": "Dies ist der Start von {type} {name}, erstellt am {date}.",
   "intro_messages.offTopic": "<h4 class=\"channel-intro__title\">Start von {display_name}</h4><p class=\"channel-intro__content\">Dies ist der Start von {display_name}, einem Kanal für nicht-arbeitsbezogene Unterhaltungen.<br/></p>",
-  "intro_messages.onlyInvited": " Nur eingeladene Mitglieder können diese private Gruppe sehen.",
+  "intro_messages.onlyInvited": " Nur eingeladene Mitglieder können diesen privaten Kanal sehen.",
   "intro_messages.purpose": " Der Zweck der/des {type} ist: {purpose}.",
   "intro_messages.setHeader": "Eine Überschrift setzen",
   "intro_messages.teammate": "Dies ist der Start Ihres Privatnachrichtenverlaufs mit diesem Teammitglied. Privatnachrichten und versendete Dateien sind außerhalb dieses Bereichs nicht für andere sichtbar.",
@@ -1563,17 +1562,17 @@
   "invite_member.modalButton": "Ja, verwerfen",
   "invite_member.modalMessage": "Sie haben ungesendete Einladungen, möchte Sie diese wirklich verwerfen?",
   "invite_member.modalTitle": "Einladungen verwerfen?",
-  "invite_member.newMember": "Neuen Benutzer einladen",
+  "invite_member.newMember": "E-Mail-Einladung versenden",
   "invite_member.send": "Einladung senden",
   "invite_member.send2": "Einladungen senden",
   "invite_member.sending": " Sende",
   "invite_member.teamInviteLink": "Sie können außerdem Personen über den {link} einladen.",
   "ldap_signup.find": "Finde meine Teams",
-  "ldap_signup.ldap": "Erstelle neues Team mit AD/LDAP Account",
+  "ldap_signup.ldap": "Neues Team mit AD/LDAP Account erstellen",
   "ldap_signup.length_error": "Der Name muss 3 bis 15 Zeichen enthalten",
   "ldap_signup.teamName": "Name für neues Team eingeben",
   "ldap_signup.team_error": "Bitte geben Sie einen Team Namen ein",
-  "leave_team_modal.desc": "Sie werden von allen öffentlichen Kanälen und privaten Gruppen entfernt.  Wenn das Team privat ist können Sie diesem nicht wieder beitreten.  Sind Sie sich sicher?",
+  "leave_team_modal.desc": "Sie werden von allen öffentlichen und privaten Kanälen entfernt.  Wenn das Team privat ist können Sie diesem nicht wieder beitreten.  Sind Sie sich sicher?",
   "leave_team_modal.no": "Nein",
   "leave_team_modal.title": "Team verlassen?",
   "leave_team_modal.yes": "Ja",
@@ -1648,7 +1647,7 @@
   "mobile.account_notifications.threads_mentions": "Nennungen in Antworten",
   "mobile.account_notifications.threads_start": "Diskussionen die ich starte",
   "mobile.account_notifications.threads_start_participate": "Diskussionen die ich starte oder an denen ich teilnehme",
-  "mobile.channel_info.alertMessageDeleteChannel": "Sind Sie sicher, dass Sie den {term} {name} verlassen möchten?",
+  "mobile.channel_info.alertMessageDeleteChannel": "Sind Sie sicher, dass Sie den {term} {name} löschen möchten?",
   "mobile.channel_info.alertMessageLeaveChannel": "Sind Sie sicher, dass Sie den {term} {name} verlassen möchten?",
   "mobile.channel_info.alertNo": "Nein",
   "mobile.channel_info.alertTitleDeleteChannel": "{term} löschen",
@@ -1676,7 +1675,7 @@
   "mobile.components.select_server_view.proceed": "Fortfahren",
   "mobile.components.select_server_view.siteUrlPlaceholder": "https://mattermost.example.com",
   "mobile.create_channel": "Erstellen",
-  "mobile.create_channel.private": "Neue private Gruppe",
+  "mobile.create_channel.private": "Neuer privater Kanal",
   "mobile.create_channel.public": "Neuer Öffentlicher Kanal",
   "mobile.custom_list.no_results": "Keine Ergebnisse",
   "mobile.edit_post.title": "Nachricht bearbeiten",
@@ -1724,8 +1723,8 @@
   "more_channels.title": "Weitere Kanäle",
   "more_direct_channels.close": "Schließen",
   "more_direct_channels.message": "Nachricht",
-  "more_direct_channels.new_convo_note": "Dies wird eine neue Konversation starten, Wenn Sie viele Personen hinzufügen, könnte eine private Gruppe besser geeignet sein.",
-  "more_direct_channels.new_convo_note.full": "Sie haben die maximale Anzahl an Personen für diese Konversation erreicht. Ziehen Sie in Erwägung eine private Gruppe anzulegen.",
+  "more_direct_channels.new_convo_note": "Dies wird eine neue Unterhaltung starten. Wenn Sie viele Personen hinzufügen, könnte ein privater Kanal besser geeignet sein.",
+  "more_direct_channels.new_convo_note.full": "Sie haben die maximale Anzahl an Personen für diese Unterhaltung erreicht. Ziehen Sie in Erwägung einen privaten Kanal zu erstellen.",
   "more_direct_channels.title": "Direktnachricht",
   "msg_typing.areTyping": "{users} und {last} tippen gerade...",
   "msg_typing.isTyping": "{user} tippt...",
@@ -1751,12 +1750,13 @@
   "navbar.viewPinnedPosts": "Zeige angeheftete Nachrichten",
   "navbar_dropdown.about": "Über Mattermost",
   "navbar_dropdown.accountSettings": "Kontoeinstellungen",
+  "navbar_dropdown.addMemberToTeam": "Mitglieder zum Team hinzufügen",
   "navbar_dropdown.console": "System Konsole",
   "navbar_dropdown.create": "Neues Team erstellen",
   "navbar_dropdown.emoji": "Eigenes Emoji",
   "navbar_dropdown.help": "Hilfe",
   "navbar_dropdown.integrations": "Integration",
-  "navbar_dropdown.inviteMember": "Neues Mitglied einladen",
+  "navbar_dropdown.inviteMember": "E-Mail-Einladung versenden",
   "navbar_dropdown.join": "Einem anderen Team beitreten",
   "navbar_dropdown.leave": "Team verlassen",
   "navbar_dropdown.logout": "Abmelden",
@@ -1788,6 +1788,7 @@
   "pending_post_actions.cancel": "Abbrechen",
   "pending_post_actions.retry": "Erneut versuchen",
   "permalink.error.access": "Der dauerhafte Link verweist auf eine gelöschte Nachricht oder einen Kanal auf den Sie keinen Zugriff haben.",
+  "permalink.error.title": "Nachricht nicht gefunden",
   "post_attachment.collapse": "Weniger anzeigen...",
   "post_attachment.more": "Mehr anzeigen...",
   "post_body.commentedOn": "Kommentierte {name}{apostrophe} Nachricht: ",
@@ -1892,26 +1893,27 @@
   "setting_upload.noFile": "Keine Datei ausgewählt.",
   "setting_upload.select": "Datei auswählen",
   "sidebar.channels": "Kanäle",
-  "sidebar.createChannel": "Erstelle einen öffentlichen Kanal",
-  "sidebar.createGroup": "Create new group",
+  "sidebar.createChannel": "Einen neuen öffentlichen Kanal erstellen",
+  "sidebar.createGroup": "Einen neuen privaten Kanal erstellen",
   "sidebar.direct": "Direktnachricht",
   "sidebar.favorite": "Favoriten",
   "sidebar.more": "Mehr",
   "sidebar.moreElips": "Mehr...",
   "sidebar.otherMembers": "Außerhalb dieses Teams",
-  "sidebar.pg": "Privater Kanal",
+  "sidebar.pg": "Private Kanäle",
   "sidebar.removeList": "Von Liste entfernen",
-  "sidebar.tutorialScreen1": "<h4>Kanäle</h4><p><strong>Kanäle</strong> organisieren die Gespräche über verschiedene Themen. Jeder aus dem Team kann beitreten. Zur privaten, direkten Kommunikation nutzen Sie <strong>Direktnachrichten</strong> mit einer anderen Person oder <strong>Private Gruppen</strong> bei mehreren Personen.</p>",
+  "sidebar.tutorialScreen1": "<h4>Kanäle</h4><p><strong>Kanäle</strong> organisieren die Unterhaltungen über verschiedene Themen. Jeder aus dem Team kann beitreten. Zur privaten, direkten Kommunikation nutzen Sie <strong>Direktnachrichten</strong> mit einer anderen Person oder <strong>Private Kanäle</strong> bei mehreren Personen.</p>",
   "sidebar.tutorialScreen2": "<h4>\"{townsquare}\" und \"{offtopic}\" Kanäle</h4><p>Hier sind zwei öffentliche Kanäle zum Start:</p><p><strong>{townsquare}</strong> ist ein Platz für Teamweite Kommunikation. Jeder in Ihrem Team ist ein Mitglied dieses Kanals.</p><p><strong>{offtopic}</strong> ist ein Platz fpr Spaß und Unterhaltungen außerhalb von arbeitsrelevanten Kanälen. Sie und Ihr Team können entscheiden welche weiteren Kanäle erstellt werden müssen.</p>",
-  "sidebar.tutorialScreen3": "<h4>Erstellen und Beitreten von Kanälen</h4><p>Klicken Sie auf <strong>\"Mehr...\"</strong> um einen neuen Kanal zu erstellen oder einem bestehenden beizutreten.</p><p>Sie können auch einen neuen Kanal oder eine private Gruppe über einen Klick auf das <strong>\"+\" Symbol</strong> neben der Kanal- oder Gruppenüberschrift erstellen.</p>",
+  "sidebar.tutorialScreen3": "<h4>Erstellen und Beitreten von Kanälen</h4><p>Klicken Sie auf <strong>\"Mehr...\"</strong> um einen neuen Kanal zu erstellen oder einem bestehenden beizutreten.</p><p>Sie können auch einen neuen Kanal über einen Klick auf das <strong>\"+\" Symbol</strong> neben der öffentlichen oder privaten Kanalüberschrift erstellen.</p>",
   "sidebar.unreadAbove": "Ungelesene Nachricht(en) oben",
   "sidebar.unreadBelow": "Ungelesene Nachricht(en) unten",
   "sidebar_header.tutorial": "<h4>Hauptmenü</h4><p>Über das <strong>Hauptmenü</strong>können Sie <strong>neue Teammitglieder einladen</strong>, auf Ihre <strong>Benutzereinstellungen</strong> zugreifen und Ihre <strong>Motiv Farbe</strong> ändern.</p><p>Teamadministratoren können außerdem auf die <strong>Team Einstellungen</strong> zugreifen.</p><p>Systemadministratoren werden eine <strong>System Konsole</strong> Option für die Administration des kompletten Systems finden.</p>",
   "sidebar_right_menu.accountSettings": "Kontoeinstellungen",
+  "sidebar_right_menu.addMemberToTeam": "Mitglieder zum Team hinzufügen",
   "sidebar_right_menu.console": "System Konsole",
   "sidebar_right_menu.flagged": "Markierte Nachrichten",
   "sidebar_right_menu.help": "Hilfe",
-  "sidebar_right_menu.inviteNew": "Neues Mitglied einladen",
+  "sidebar_right_menu.inviteNew": "E-Mail-Einladung versenden",
   "sidebar_right_menu.logout": "Abmelden",
   "sidebar_right_menu.manageMembers": "Mitglieder verwalten",
   "sidebar_right_menu.nativeApps": "Apps herunterladen",
@@ -1925,7 +1927,7 @@
   "signup.google": "Google Account",
   "signup.ldap": "AD/LDAP Zugangsdaten",
   "signup.office365": "Office 365",
-  "signup.title": "Erstelle einen Account mit:",
+  "signup.title": "Einen Account erstellen mit:",
   "signup_team.createTeam": "Oder erstellen Sie ein Team",
   "signup_team.disabled": "Teamerstellung wurde deaktiviert.  Bitte kontaktieren Sie einen Administrator.",
   "signup_team.join_open": "Teams denen Sie beitreten können: ",
@@ -1966,8 +1968,8 @@
   "signup_user_completed.whatis": "Wie lautet Ihre E-Mail-Adresse?",
   "signup_user_completed.withLdap": "Mit Ihren AD/LDAP Zugangsdaten",
   "sso_signup.find": "Finde meine Teams",
-  "sso_signup.gitlab": "Erstelle Team mit GitLab Account",
-  "sso_signup.google": "Erstelle Team mit Google Apps Account",
+  "sso_signup.gitlab": "Team mit GitLab Account erstellen",
+  "sso_signup.google": "Team mit Google Apps Account erstellen",
   "sso_signup.length_error": "Der Name muss mindestens 3 bis 15 Zeichen enthalten",
   "sso_signup.teamName": "Geben Sie den Namen des neuen Teams ein",
   "sso_signup.team_error": "Bitte einen Teamnamen eingeben",
@@ -1979,7 +1981,7 @@
   "suggestion.mention.morechannels": "Andere Kanäle",
   "suggestion.mention.nonmembers": "Nicht im Kanal",
   "suggestion.mention.special": "Spezielle Erwähnungen",
-  "suggestion.search.private": "Privater Kanal",
+  "suggestion.search.private": "Private Kanäle",
   "suggestion.search.public": "Öffentliche Kanäle",
   "team_export_tab.download": "Download",
   "team_export_tab.export": "Exportieren",
@@ -2035,7 +2037,7 @@
   "tutorial_intro.mobileAppsLinkText": "PC, macOS, iOS und Android",
   "tutorial_intro.next": "Weiter",
   "tutorial_intro.screenOne": "<h3>Willkommen bei:</h3><h1>Mattermost</h1><p>Ihre Teamkommunikation an einer Stelle, sofort durchsuchbar und überall verfügbar.</p><p>Bleiben Sie mit Ihrem Team verbunden um zu erreichen, was am meisten zählt.</p>",
-  "tutorial_intro.screenTwo": "<h3>Wie Mattermost funktioniert:</h3><p>Die Kommunikation findet in öffentlichen Diskussionskanälen, privaten Gruppen und Direktnachrichten statt.</p><p>Alles ist archiviert und von jedem webfähigem Desktop, Laptop oder Telefon durchsuchbar.</p>",
+  "tutorial_intro.screenTwo": "<h3>Wie Mattermost funktioniert:</h3><p>Die Kommunikation findet in öffentlichen Diskussionskanälen, privaten Kanälen und Direktnachrichten statt.</p><p>Alles ist archiviert und von jedem webfähigem Desktop, Notebook oder Smartphone durchsuchbar.</p>",
   "tutorial_intro.skip": "Anleitung überspringen",
   "tutorial_intro.support": "Wenn Sie irgendwas benötigen, schreiben Sie uns einfach eine E-Mail an ",
   "tutorial_intro.teamInvite": "Teamkollegen einladen",
@@ -2055,7 +2057,7 @@
   "upload_overlay.info": "Datei zum Hochladen hier ablegen.",
   "user.settings.advance.embed_preview": "Für den ersten Weblink in einer Nachricht, eine Vorschau des Webseiteninhaltes unterhalb der Nachricht, sofern verfügbar, anzeigen",
   "user.settings.advance.embed_toggle": "Zeige Umschalter für alle eingebetteten Vorschauen",
-  "user.settings.advance.emojipicker": "Aktiviere Emoji-Auswahl im Nachrichteneingabefeld",
+  "user.settings.advance.emojipicker": "Emoji-Auswahl für Reaktionen und die Nachrichteneingabe aktivieren",
   "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Feature} other {Features}} aktiviert",
   "user.settings.advance.formattingDesc": "Wenn aktiviert werden Nachrichten formatiert, sodass Links erstellt, Emojis angezeigt, Text formatiert und Zeilenumbrüche hinzugefügt werden. Standardmäßig ist dies aktiviert. Ändern der Einstellung erfordert ein Neuladen der Seite.",
   "user.settings.advance.formattingTitle": "Formatierung von Nachrichten aktivieren",
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 76e8b003af..adcc2187f2 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.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",
   "add_users_to_team.title": "Add New Members To {teamName} Team",
-  "admin.advance.cluster": "High Availability (Beta)",
+  "admin.advance.cluster": "High Availability",
   "admin.advance.metrics": "Performance Monitoring",
   "admin.audits.reload": "Reload User Activity Logs",
   "admin.audits.title": "User Activity Logs",
@@ -337,10 +337,10 @@
   "admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "command line tool",
   "admin.general.policy.restrictPrivateChannelDeletionDescription": "Set policy on who can delete private channels. Deleted channels can be recovered from the database using a {commandLineToolLink}.",
   "admin.general.policy.restrictPrivateChannelDeletionTitle": "Enable private channel deletion for:",
-  "admin.general.policy.restrictPrivateChannelManagementDescription": "Set policy on who can rename and set the header or purpose for private channels.",
-  "admin.general.policy.restrictPrivateChannelManagementTitle": "Enable private channel renaming for:",
   "admin.general.policy.restrictPrivateChannelManageMembersDescription": "Set policy on who can add and remove members from private channels.",
   "admin.general.policy.restrictPrivateChannelManageMembersTitle": "Enable managing of private channel members for:",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "Set policy on who can rename and set the header or purpose for private channels.",
+  "admin.general.policy.restrictPrivateChannelManagementTitle": "Enable private channel renaming for:",
   "admin.general.policy.restrictPublicChannelCreationDescription": "Set policy on who can create public channels.",
   "admin.general.policy.restrictPublicChannelCreationTitle": "Enable public channel creation for:",
   "admin.general.policy.restrictPublicChannelDeletionCommandLineToolLink": "command line tool",
@@ -754,7 +754,7 @@
   "admin.sidebar.advanced": "Advanced",
   "admin.sidebar.audits": "Compliance and Auditing",
   "admin.sidebar.authentication": "Authentication",
-  "admin.sidebar.cluster": "High Availability (Beta)",
+  "admin.sidebar.cluster": "High Availability",
   "admin.sidebar.compliance": "Compliance",
   "admin.sidebar.configuration": "Configuration",
   "admin.sidebar.connections": "Connections",
@@ -912,7 +912,6 @@
   "admin.user_item.switchToEmail": "Switch to Email/Password",
   "admin.user_item.sysAdmin": "System Admin",
   "admin.user_item.teamAdmin": "Team Admin",
-  "admin.user_item.sysAdmin": "System Admin",
   "admin.webrtc.enableDescription": "When true, Mattermost allows making <strong>one-on-one</strong> video calls. WebRTC calls are available on Chrome, Firefox and Mattermost Desktop Apps.",
   "admin.webrtc.enableTitle": "Enable Mattermost WebRTC: ",
   "admin.webrtc.gatewayAdminSecretDescription": "Enter your admin secret password to access the Gateway Admin URL.",
@@ -1311,10 +1310,10 @@
   "error_bar.expiring": "Enterprise license expires on {date}. <a href='{link}' target='_blank'>Please renew.</a>",
   "error_bar.past_grace": "Enterprise license is expired and some features may be disabled. Please contact your System Administrator for details.",
   "error_bar.preview_mode": "Preview Mode: Email notifications have not been configured",
-  "error_bar.site_url": "{docsLink} is now a required setting. Please configure it in {link}.",
+  "error_bar.site_url": "Please configure your {docsLink} in the {link}.",
   "error_bar.site_url.docsLink": "Site URL",
-  "error_bar.site_url.link": "the System Console",
-  "error_bar.site_url_gitlab": "{docsLink} is now a required setting. Please configure it in the System Console or in gitlab.rb if you're using GitLab Mattermost.",
+  "error_bar.site_url.link": "System Console",
+  "error_bar.site_url_gitlab": "Please configure your {docsLink} in the System Console or in gitlab.rb if you're using GitLab Mattermost.",
   "file_attachment.download": "Download",
   "file_info_preview.size": "Size ",
   "file_info_preview.type": "File type ",
diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json
index fa0312436b..ebae3cec11 100644
--- a/webapp/i18n/es.json
+++ b/webapp/i18n/es.json
@@ -137,7 +137,8 @@
   "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Escoge cuando se desencadenan los webhooks de salida; si la primera palabra del mensaje coincide exactamente con una Palabra que desencadena la acción o si comienza con una Palabra que desencadena la acción.",
   "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)",
+  "add_users_to_team.title": "Agregar Nuevos Miembros al Equipo {teamName}",
+  "admin.advance.cluster": "Alta disponibilidad",
   "admin.advance.metrics": "Monitoreo de Desempeño",
   "admin.audits.reload": "Recargar",
   "admin.audits.title": "Auditorías del Servidor",
@@ -282,6 +283,8 @@
   "admin.email.requireVerificationDescription": "Normalmente asignado como verdadero en producción. Cuando es verdadero, Mattermost requiere una verificación del correo electrónico después de crear la cuenta y antes de iniciar sesión por primera vez. Los desarrolladores pude que quieran dejar esta opción en falso para evitar la necesidad de verificar correos y así desarrollar más rápido.",
   "admin.email.requireVerificationTitle": "Require verificación de correo electrónico: ",
   "admin.email.selfPush": "Ingresar manualmente la ubicación del Servicio de Notificaciones Push",
+  "admin.email.skipServerCertificateVerification.description": "Cuando es verdadero, Mattermost no verificará el certificado del servidor de correos.",
+  "admin.email.skipServerCertificateVerification.title": "Omitir la Verificación del Certificado del Servidor:",
   "admin.email.smtpPasswordDescription": " Obten esta credencial del administrador del servidor de correos.",
   "admin.email.smtpPasswordExample": "Ej: \"tucontraseña\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.email.smtpPasswordTitle": "Contraseña del Servidor SMTP:",
@@ -333,6 +336,8 @@
   "admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "herramienta de línea de comandos",
   "admin.general.policy.restrictPrivateChannelDeletionDescription": "Establece la política de quién puede eliminar canales privados. Los canales eliminados pueden ser recuperados desde la base de datos utilizando la {commandLineToolLink}.",
   "admin.general.policy.restrictPrivateChannelDeletionTitle": "Habilitar la eliminación de canales privados a:",
+  "admin.general.policy.restrictPrivateChannelManageMembersDescription": "Establecer la política sobre quién puede agregar y eliminar miembros de los canales privados.",
+  "admin.general.policy.restrictPrivateChannelManageMembersTitle": "Permitir la gestión de los miembros del canal privado a:",
   "admin.general.policy.restrictPrivateChannelManagementDescription": "Establece la política de quién puede cambiar el nombre, y establecer el encabezado o el propósito de canales privados.",
   "admin.general.policy.restrictPrivateChannelManagementTitle": "Habilitar el cambio de nombre a canales privados a:",
   "admin.general.policy.restrictPublicChannelCreationDescription": "Establece la política de quién puede crear canales públicos.",
@@ -342,7 +347,7 @@
   "admin.general.policy.restrictPublicChannelDeletionTitle": "Habilitar la eliminación de canales públicos a:",
   "admin.general.policy.restrictPublicChannelManagementDescription": "Establece la política de quién puede cambiar el nombre, y establecer el encabezado o el propósito de canales públicos.",
   "admin.general.policy.restrictPublicChannelManagementTitle": "Habilitar el cambio de nombre a canales públicos a:",
-  "admin.general.policy.teamInviteDescription": "Establecer la política sobre quién puede invitar a otros utilizando las opciones del Menú Principal <b>Invitar Nuevo Miembro</b> para invitar nuevos usuarios por correo electrónico, o con <b>Enlace de invitación al equipo</b>. Si se utiliza la opción de <b>Enlace de invitación al equipo</b> para compartir el enlace, puedes expirar el código de invitación en la <b>Configuración de Equipo</b> > <b>Código de Invitación</b> luego de que los usuarios deseados se hayan unido al equipo.",
+  "admin.general.policy.teamInviteDescription": "Establecer la política sobre quién puede invitar a otros utilizando las opciones del Menú Principal <b>Enviar Correo de Invitación</b> para invitar nuevos usuarios por correo electrónico, o con <b>Enlace de invitación al equipo</b> y <b>Agregar Miembros al Equipo</b>. Si se utiliza la opción de <b>Enlace de invitación al equipo</b> para compartir el enlace, puedes expirar el código de invitación en la <b>Configuración de Equipo</b> > <b>Código de Invitación</b> luego de que los usuarios deseados se hayan unido al equipo.",
   "admin.general.policy.teamInviteTitle": "Habilitar el envío de invitaciones a equipo por:",
   "admin.general.privacy": "Privacidad",
   "admin.general.usersAndTeams": "Usuarios y Equipos",
@@ -506,7 +511,7 @@
   "admin.log.enableDiagnosticsDescription": "Activa esta función para mejorar la calidad y el rendimiento de Mattermost mediante el envío de informes de error y la información de diagnóstico a Mattermost, Inc. Lee nuestra <a href=\"https://about.mattermost.com/default-privacy-policy/\" target='_blank'>política de privacidad</a> para obtener más información.",
   "admin.log.enableWebhookDebugging": "Habilitar Depuración de Webhook",
   "admin.log.enableWebhookDebuggingDescription": "Puedes establecer a falso para desactivar el registro de depuración del cuerpo de todas las solicitudes de webhooks de entrada.",
-  "admin.log.fileDescription": "Normalmente asignado en verdadero en producción. Cueando es verdadero, los archivos de registro son escritos en la ubicación especificada a continuación.",
+  "admin.log.fileDescription": "Normalmente se asigna como verdadero en producción. Cuando es verdadero, los eventos son registrados en el archivo mattermost.log en el directorio especificado en el campo Directorio del Archivo de Registro. Los registros son rotados cada 10.000 líneas y archivados en el mismo directorio, y se les asigna como nombre de archivo una fecha y un número de serie. Por ejemplo, mattermost.2017-03-31.001.",
   "admin.log.fileLevelDescription": "Esta configuración determina el nivel de detalle con el cual los eventos serán escritos en el archivo de registro. ERROR: Sólo salida de mensajes de error. INFO: Salida de mensaje de error y información acerca de la partida e inicialización. DEBUG: Muestra un alto detalle para que los desarolladores que trabajan con eventos de depuración.",
   "admin.log.fileLevelTitle": "Nivel registro:",
   "admin.log.fileTitle": "Escribir registros en un archivo: ",
@@ -521,7 +526,7 @@
   "admin.log.formatTitle": "Formato del archivo de Registro:",
   "admin.log.levelDescription": "Esta configuración determina el nivel de detalle con el cual los eventos serán escritos en la consola. ERROR: Sólo salida de mensajes de error. INFO: Salida de mensaje de error y información acerca de la partida e inicialización. DEBUG: Muestra un alto detalle para que los desarolladores que trabajan con eventos de depuración.",
   "admin.log.levelTitle": "Nivel de log de consola:",
-  "admin.log.locationDescription": "Archivo en el cual se escribirán los registros. Si lo dejas en blanco, será asignado de forma predeterminada ./logs/mattermost, lo que escribirá los registros a mattermost.log. La rotación de los registros está habilitada y cada 10,000 lineas de registro se escriben en un nuevo archivo almacenado en el mismo directorio, por ejemplo mattermost.2015-09-23.001, mattermost.2015-09-23.002, y así sucesivamente.",
+  "admin.log.locationDescription": "La ubicación para los archivos de registro. Si se deja en blanco, serán almacenados en el directorio ./logs. La ruta especificada debe existir y Mattermost debe tener permisos de escritura.",
   "admin.log.locationPlaceholder": "Ingresar locación de archivo",
   "admin.log.locationTitle": "Directorio del Archivo de Registro:",
   "admin.log.logSettings": "Configuración de registro",
@@ -691,7 +696,7 @@
   "admin.service.corsTitle": "Habilitar la procedencia de las solicitudes cruzadas de:",
   "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": "Enforce Multi-factor Authentication:",
+  "admin.service.enforcMfaTitle": "Imponer la Autenticación de Múltiples factores:",
   "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",
@@ -725,7 +730,7 @@
   "admin.service.sessionCacheDesc": "La cantidad de minutes que el cache de la sesión se guardará en memoria.",
   "admin.service.sessionDaysEx": "Ej.: \"30\"",
   "admin.service.siteURL": "URL del Sitio:",
-  "admin.service.siteURLDescription": "La dirección URL, incluyendo el número de puerto y protocolo, que los usuarios utilizan para acceder a Mattermost. Este campo puede dejarse en blanco a menos que estés configurando el correo electrónico de lotes en <b>Notificaciones > Correo electrónico</b>. Cuando está en blanco, la dirección URL se configura automáticamente basado en el tráfico entrante.",
+  "admin.service.siteURLDescription": "La dirección URL, incluyendo el número de puerto y protocolo, que los usuarios utilizan para acceder a Mattermost. Este ajuste es necesario.",
   "admin.service.siteURLExample": "Ej.: \"https://mattermost.example.com:1234\"",
   "admin.service.ssoSessionDays": "Duración de la sesión para SSO (días):",
   "admin.service.ssoSessionDaysDesc": "El número de días desde la última vez que un usuario ingreso sus credenciales para que la sesión del usuario expire. Si el método de autenticación es SAML o GitLab, el usuario puede iniciar su sesión automáticamente en Mattermost si ya cuenta con una sesión activa en SAML o GitLab.  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.",
@@ -743,11 +748,11 @@
   "admin.service.webhooksTitle": "Habilitar Webhooks de Entrada: ",
   "admin.service.writeTimeout": "Tiempo de Espera de Escritura:",
   "admin.service.writeTimeoutDescription": "Si se utiliza HTTP (inseguro), este es el tiempo máximo permitido desde que se termina de leer el encabezado de la solicitud hasta que la respuesta se escribe. Si se utiliza HTTPS, este el el tiempo total desde el momento en que se acepta la conexión hasta que la respuesta es escrita.",
-  "admin.sidebar.addTeamSidebar": "Add team from sidebar menu",
+  "admin.sidebar.addTeamSidebar": "Agregar un equipo el menú lateral",
   "admin.sidebar.advanced": "Avanzado",
   "admin.sidebar.audits": "Auditorías",
   "admin.sidebar.authentication": "Autenticación",
-  "admin.sidebar.cluster": "Alta Disponibilidad (Beta)",
+  "admin.sidebar.cluster": "Alta disponibilidad",
   "admin.sidebar.compliance": "Cumplimiento",
   "admin.sidebar.configuration": "Configuración",
   "admin.sidebar.connections": "Conexiones",
@@ -784,7 +789,7 @@
   "admin.sidebar.push": "Push a Móvil",
   "admin.sidebar.rateLimiting": "Límite de Velocidad",
   "admin.sidebar.reports": "INFORMES",
-  "admin.sidebar.rmTeamSidebar": "Remove team from sidebar menu",
+  "admin.sidebar.rmTeamSidebar": "Remover un equipo del menú lateral",
   "admin.sidebar.saml": "SAML",
   "admin.sidebar.security": "Seguridad",
   "admin.sidebar.sessions": "Sesiones",
@@ -794,7 +799,7 @@
   "admin.sidebar.statistics": "Estadísticas de Equipo",
   "admin.sidebar.storage": "Almacenamiento",
   "admin.sidebar.support": "Legal y Soporte",
-  "admin.sidebar.teams": "TEAMS ({count, number})",
+  "admin.sidebar.teams": "EQUIPOS ({count, number})",
   "admin.sidebar.users": "Usuarios",
   "admin.sidebar.usersAndTeams": "Usuarios y Equipos",
   "admin.sidebar.view_statistics": "Estadísticas del Sitio",
@@ -880,8 +885,8 @@
   "admin.team_analytics.activeUsers": "Active Users With Posts",
   "admin.team_analytics.totalPosts": "Total de Mensajes",
   "admin.true": "verdadero",
-  "admin.userList.title": "Users for {team}",
-  "admin.userList.title2": "Users for {team} ({count})",
+  "admin.userList.title": "Usuarios para {team}",
+  "admin.userList.title2": "Usuarios para {team} ({count})",
   "admin.user_item.authServiceEmail": "<strong>Método de inicio de sesión:</strong> Correo electrónico",
   "admin.user_item.authServiceNotEmail": "<strong>Método de inicio de sesión:</strong> {service}",
   "admin.user_item.confirmDemoteDescription": "Si te degradas a ti mismo de la función de Administrador de Sistema y no hay otro usuario con privilegios de Administrador de Sistema, tendrás que volver a asignar un Administrador del Sistema accediendo al servidor de Mattermost a través de un terminal y ejecutar el siguiente comando.",
@@ -895,13 +900,14 @@
   "admin.user_item.makeMember": "Hacer Miembro",
   "admin.user_item.makeSysAdmin": "Hacer Admin del Sistema",
   "admin.user_item.makeTeamAdmin": "Hacer Admin de Equipo",
+  "admin.user_item.manageTeams": "Gestionar Equipos",
   "admin.user_item.member": "Miembro",
   "admin.user_item.mfaNo": "<strong>MFA</strong>: No",
   "admin.user_item.mfaYes": "<strong>MFA</strong>: Sí",
   "admin.user_item.resetMfa": "Remover MFA",
   "admin.user_item.resetPwd": "Reiniciar Contraseña",
   "admin.user_item.switchToEmail": "Cambiar a Correo Electrónico/Contraseña",
-  "admin.user_item.sysAdmin": "System Admin",
+  "admin.user_item.sysAdmin": "Admin del Sistema",
   "admin.user_item.teamAdmin": "Admin de Equipo",
   "admin.webrtc.enableDescription": "Cuando es verdadero, Mattermost permite hacer llamadas de vídeo <strong>uno-a-uno</strong>. Las llamadas con WebRTC están disponibles en Chrome, Firefox y la Aplicación de Escritorio de Mattermost.",
   "admin.webrtc.enableTitle": "Habilitar Mattermost WebRTC: ",
@@ -1060,19 +1066,16 @@
   "channel_flow.alreadyExist": "Un canal con este identificador ya existe",
   "channel_flow.changeUrlDescription": "Algunos caracteres no están permitidos en las URLs y pueden ser removidos.",
   "channel_flow.changeUrlTitle": "Cambiar URL del Canal",
-  "channel_flow.channel": "Channel",
   "channel_flow.create": "Crear Canal",
-  "channel_flow.group": "Group",
   "channel_flow.handleTooShort": "Dirección URL del canal debe ser de 2 o más caracteres alfanuméricos en minúsculas",
   "channel_flow.invalidName": "Nombre de Canal Inválido",
   "channel_flow.set_url_title": "Asignar URL del Canal",
   "channel_header.addMembers": "Agregar Miembros",
   "channel_header.addToFavorites": "Añadir a favoritos",
-  "channel_header.channel": "Channel",
+  "channel_header.channel": "Canal",
   "channel_header.channelHeader": "Editar encabezado del canal",
   "channel_header.delete": "Borrar Canal",
   "channel_header.flagged": "Mensajes Marcados",
-  "channel_header.group": "Group",
   "channel_header.leave": "Abandonar Canal",
   "channel_header.manageMembers": "Administrar Miembros",
   "channel_header.notificationPreferences": "Preferencias de Notificación",
@@ -1115,12 +1118,10 @@
   "channel_members_modal.addNew": " Agregar nuevos Miembros",
   "channel_members_modal.members": " Miembros",
   "channel_modal.cancel": "Cancelar",
-  "channel_modal.channel": "Channel",
   "channel_modal.createNew": "Crear Nuevo Canal",
   "channel_modal.descriptionHelp": "Describe como este canal debería ser utilizado.",
   "channel_modal.displayNameError": "Nombre del canal debe ser de 2 o más caracteres",
   "channel_modal.edit": "Editar",
-  "channel_modal.group": "Group",
   "channel_modal.header": "Encabezado",
   "channel_modal.headerEx": "Ej: \"[Título del enlace](http://example.com)\"",
   "channel_modal.headerHelp": "Establece el texto que aparecerá en el encabezado del canal al lado del nombre del canal. Por ejemplo, incluye enlaces que se usan con frecuencia escribiendo [Título del Enlace](http://example.com).",
@@ -1134,7 +1135,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})",
@@ -1229,10 +1230,8 @@
   "custom_emoji.search": "Buscar Emoticon Personalizado",
   "default_channel.purpose": "Publica mensajes aquí que quieras que todos vean. Todo el mundo se convierte automáticamente en un miembro permanente de este canal cuando se unan al equipo.",
   "delete_channel.cancel": "Cancelar",
-  "delete_channel.channel": "channel",
   "delete_channel.confirm": "Confirmar BORRAR Canal",
   "delete_channel.del": "Borrar",
-  "delete_channel.group": "group",
   "delete_channel.question": "Se eliminará el canal del equipo y hará que su contenido sea inaccesible para todos los usuarios. ¿Está usted seguro de que quiere eliminar el canal {display_name}?",
   "delete_post.cancel": "Cancelar",
   "delete_post.comment": "Comentario",
@@ -1249,9 +1248,7 @@
   "edit_channel_header_modal.title_dm": "Editar Encabezado",
   "edit_channel_purpose_modal.body": "Describe como este canal debería ser usado. Este texto aparece en la lista de canales dentro del menú de \"Más...\" y ayuda a otros en decidir si deben unirse.",
   "edit_channel_purpose_modal.cancel": "Cancelar",
-  "edit_channel_purpose_modal.channel": "Channel",
   "edit_channel_purpose_modal.error": "El propósito de este canal es muy largo, por favor ingresa uno más corto",
-  "edit_channel_purpose_modal.group": "Group",
   "edit_channel_purpose_modal.save": "Guardar",
   "edit_channel_purpose_modal.title1": "Editar Propósito",
   "edit_channel_purpose_modal.title2": "Editar el Propósito de ",
@@ -1302,12 +1299,14 @@
   "error.not_found.link_message": "Volver a Mattermost",
   "error.not_found.message": "La página que está intentando acceder no existe",
   "error.not_found.title": "Página no encontrada",
-  "error.not_supported.message": "La navegación privada no es compatible",
-  "error.not_supported.title": "Navegador no compatible",
   "error_bar.expired": "La licencia para Empresas está vencida y algunas características pueden ser deshabilitadas. <a href='{link}' target='_blank'>Favor renovar.</a>",
   "error_bar.expiring": "La licencia para Empresas expira el {date}. <a href='{link}' target='_blank'>Favor renovar.</a>",
   "error_bar.past_grace": "La licencia para Empresas está vencida y algunas características pueden ser desbahilitadas. Por favor contacta a tu Adminstrador de Sistema para más detalles.",
   "error_bar.preview_mode": "Modo de prueba: Las notificaciones por correo electrónico no han sido configuradas",
+  "error_bar.site_url": "Please configure your {docsLink} in the {link}.",
+  "error_bar.site_url.docsLink": "URL del Sitio:",
+  "error_bar.site_url.link": "Consola de sistema",
+  "error_bar.site_url_gitlab": "Please configure your {docsLink} in the System Console or in gitlab.rb if you're using GitLab Mattermost.",
   "file_attachment.download": "Descargar",
   "file_info_preview.size": "Tamaño ",
   "file_info_preview.type": "Tipo de archivo ",
@@ -1563,7 +1562,7 @@
   "invite_member.modalButton": "Sí, Borrar",
   "invite_member.modalMessage": "Tienes invitaciones sin usar, estás seguro que quieres borrarlas?",
   "invite_member.modalTitle": "¿Descartar Invitaciones?",
-  "invite_member.newMember": "Invitar nuevo Miembro",
+  "invite_member.newMember": "Enviar Correo de Invitación",
   "invite_member.send": "Enviar Invitaciones",
   "invite_member.send2": "Enviar Invitaciones",
   "invite_member.sending": " Enviando",
@@ -1648,7 +1647,7 @@
   "mobile.account_notifications.threads_mentions": "Menciones en hilos",
   "mobile.account_notifications.threads_start": "Hilos que yo comience",
   "mobile.account_notifications.threads_start_participate": "Hilos que yo comience o participe",
-  "mobile.channel_info.alertMessageDeleteChannel": "¿Seguro quieres abandonar el {term} {name}?",
+  "mobile.channel_info.alertMessageDeleteChannel": "¿Eliminar el {term} {name}?",
   "mobile.channel_info.alertMessageLeaveChannel": "¿Seguro quieres abandonar el {term} {name}?",
   "mobile.channel_info.alertNo": "No",
   "mobile.channel_info.alertTitleDeleteChannel": "Eliminar {term}",
@@ -1751,12 +1750,13 @@
   "navbar.viewPinnedPosts": "Ver Mensajes Anclados",
   "navbar_dropdown.about": "Acerca de Mattermost",
   "navbar_dropdown.accountSettings": "Configurar Cuenta",
+  "navbar_dropdown.addMemberToTeam": "Agregar Miembros al Equipo",
   "navbar_dropdown.console": "Consola de Sistema",
   "navbar_dropdown.create": "Crear nuevo Equipo",
   "navbar_dropdown.emoji": "Emoticones Personalizados",
   "navbar_dropdown.help": "Ayuda",
   "navbar_dropdown.integrations": "Integraciones",
-  "navbar_dropdown.inviteMember": "Invitar Nuevo Miembro",
+  "navbar_dropdown.inviteMember": "Enviar Correo de Invitación",
   "navbar_dropdown.join": "Unirme a otro Equipo",
   "navbar_dropdown.leave": "Abandonar Equipo",
   "navbar_dropdown.logout": "Cerrar sesión",
@@ -1788,6 +1788,7 @@
   "pending_post_actions.cancel": "Cancelar",
   "pending_post_actions.retry": "Reintentar",
   "permalink.error.access": "El Enlace permanente pertenece a un mensaje eliminado o a un canal al cual no tienes acceso.",
+  "permalink.error.title": "Mensaje no encontrado",
   "post_attachment.collapse": "Mostrar menos...",
   "post_attachment.more": "Mostrar más... ",
   "post_body.commentedOn": "Comentó el mensaje de {name}{apostrophe}: ",
@@ -1901,17 +1902,18 @@
   "sidebar.otherMembers": "Fuera de este equipo",
   "sidebar.pg": "Canales Privados",
   "sidebar.removeList": "Remover de la lista",
-  "sidebar.tutorialScreen1": "<h4>Canales</h4><p><strong>Canales</strong> organizan las conversaciones en diferentes tópicos. Son abiertos para cualquier persona de tu equipo. Para enviar comunicaciones privadas con una sola persona utiliza <strong>Mensajes Directos</strong> o con multiples personas utilizando <strong>Grupos Privados</strong>.</p>",
+  "sidebar.tutorialScreen1": "<h4>Canales</h4><p><strong>Canales</strong> organizan las conversaciones en diferentes tópicos. Son abiertos para cualquier persona de tu equipo. Para enviar comunicaciones privadas con una sola persona utiliza <strong>Mensajes Directos</strong> o con multiples personas utilizando <strong>Canales Privados</strong>.</p>",
   "sidebar.tutorialScreen2": "<h4>Los canal \"{townsquare}\" y \"{offtopic}\"</h4><p>Estos son dos canales para comenzar:</p><p><strong>{townsquare}</strong> es el lugar para tener comunicación con todo el equipo. Todos los integrantes de tu equipo son miembros de este canal.</p><p><strong>{offtopic}</strong> es un lugar para diversión y humor fuera de los canales relacionados con el trabajo. Tu y tu equipo pueden decidir que otros canales crear.</p>",
-  "sidebar.tutorialScreen3": "<h4>Creando y Uniéndose a Canales</h4><p>Haz clic en <strong>\"Más...\"</strong> para crear un nuevo canal o unirte a uno existente.</p><p>También puedes crear un nuevo canal o grupo privado al hacer clic en el símbolo de <strong>\"+\"</strong> que se encuentra al lado del encabezado de Canales o Grupos Privados.</p>",
+  "sidebar.tutorialScreen3": "<h4>Creando y Uniéndose a Canales</h4><p>Haz clic en <strong>\"Más...\"</strong> para crear un nuevo canal o unirte a uno existente.</p><p>También puedes crear un nuevo canal al hacer clic en el símbolo de <strong>\"+\"</strong> que se encuentra al lado del encabezado de canales públicos o privados.</p>",
   "sidebar.unreadAbove": "Mensaje(s) sin leer ▲",
   "sidebar.unreadBelow": "Mensaje(s) sin leer ▼",
   "sidebar_header.tutorial": "<h4>Menú Principal</h4><p>El <strong>Menú Principal</strong> es donde puedes <strong>Invitar a nuevos miembros</strong>, podrás <strong>Configurar tu Cuenta</strong> y seleccionar un <strong>Tema</strong> para personalizar la apariencia.</p><p>Los administradores del Equipo podrán <strong>Configurar el Equipo</strong> desde este menú.</p><p>Los administradores del Sistema encontrarán una opción para ir a la <strong>Consola de Sistema</strong> para administrar el sistema completo.</p>",
   "sidebar_right_menu.accountSettings": "Configurar tu Cuenta",
+  "sidebar_right_menu.addMemberToTeam": "Agregar Miembros al Equipo",
   "sidebar_right_menu.console": "Consola del Sistema",
   "sidebar_right_menu.flagged": "Mensajes Marcados",
   "sidebar_right_menu.help": "Ayuda",
-  "sidebar_right_menu.inviteNew": "Invitar Nuevo Miembro",
+  "sidebar_right_menu.inviteNew": "Enviar Correo de Invitación",
   "sidebar_right_menu.logout": "Cerrar sesión",
   "sidebar_right_menu.manageMembers": "Adminisrar Miembros",
   "sidebar_right_menu.nativeApps": "Descargar Apps",
@@ -1979,7 +1981,7 @@
   "suggestion.mention.morechannels": "Otros Canales",
   "suggestion.mention.nonmembers": "No en el Canal",
   "suggestion.mention.special": "Menciones especiales",
-  "suggestion.search.private": "Canal Privado",
+  "suggestion.search.private": "Canales Privados",
   "suggestion.search.public": "Canales Públicos",
   "team_export_tab.download": "descargar",
   "team_export_tab.export": "Exportar",
@@ -2035,7 +2037,7 @@
   "tutorial_intro.mobileAppsLinkText": "PC, Mac, iOS y Android",
   "tutorial_intro.next": "Siguiente",
   "tutorial_intro.screenOne": "<h3>Bienvenido a:</h3><h1>Mattermost</h1><p>Las comunicaciones de tu equipo en un sólo lugar, con búsquedas instantáneas y disponible desde donde sea.</p><p>Mantén a tu equipo conectado para ayudarlos a conseguir lo que realmente importa.</p>",
-  "tutorial_intro.screenTwo": "<h3>Cómo funciona Mattermost:</h3> <p>Las comunicaciones ocurren en los canales de discusión los cuales son públicos, o en grupos privados e incluso con mensajes privados.</p> <p>Todo lo que ocurre es archivado y se puede buscar en cualquier momento desde cualquier dispositivo con acceso a Mattermost.</p>",
+  "tutorial_intro.screenTwo": "<h3>Cómo funciona Mattermost:</h3> <p>Las comunicaciones ocurren en los canales de discusión públicos, privados e incluso con mensajes directos.</p> <p>Todo lo que ocurre es archivado y se puede buscar en cualquier momento desde cualquier dispositivo con acceso a Mattermost.</p>",
   "tutorial_intro.skip": "Saltar el tutorial",
   "tutorial_intro.support": "Necesitas algo, escribemos a ",
   "tutorial_intro.teamInvite": "Invitar compañeros",
@@ -2055,7 +2057,7 @@
   "upload_overlay.info": "Arrastra un archivo para subirlo.",
   "user.settings.advance.embed_preview": "Para lel primer enlace web en un mensaje, se mostrará una vista previa del contenido del sitio web a continuación del mensaje, si está disponible",
   "user.settings.advance.embed_toggle": "Capacidad de Mostrar/Esconder las previsualizaciones",
-  "user.settings.advance.emojipicker": "Habilitar el selector de emoticones en el cuadro de entrada de mensajes",
+  "user.settings.advance.emojipicker": "Habilitar el selector de emoticones para las reacciones y del cuadro de entrada de mensajes",
   "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Característica} other {Caracteristicas}} Habilitadas",
   "user.settings.advance.formattingDesc": "Si está activada, se dará formato a los mensajes, creando enlaces, mostrando emoticones, el estilo del texto, y añadir saltos de línea. De forma predeterminada, esta opción está habilitada. El cambio de esta configuración requiere que la página se actualice.",
   "user.settings.advance.formattingTitle": "Habilitar el Formato de Mensajes",
diff --git a/webapp/i18n/fr.json b/webapp/i18n/fr.json
index c783cdaf82..6693b7647d 100644
--- a/webapp/i18n/fr.json
+++ b/webapp/i18n/fr.json
@@ -86,7 +86,7 @@
   "add_emoji.save": "Enregistrer",
   "add_incoming_webhook.cancel": "Annuler",
   "add_incoming_webhook.channel": "Canal",
-  "add_incoming_webhook.channel.help": "Canal public ou groupe privé qui reçoit les payloads du webhook. Vous devez appartenir au groupe privé pendant la mise en place du webhook.",
+  "add_incoming_webhook.channel.help": "Canal public ou privé qui reçoit les charges utiles du webhook. Vous devez appartenir au groupe privé pendant la mise en place du webhook.",
   "add_incoming_webhook.channelRequired": "Un canal valide est demandé",
   "add_incoming_webhook.description": "Description",
   "add_incoming_webhook.description.help": "Description pour votre webhook entrant.",
@@ -137,7 +137,8 @@
   "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Choisissez quand déclencher le webhook sortant; si le premier mot d'un message correspond exactement à un mot déclencheur, ou si il commence par un mot déclencheur.",
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "Premier mot correspond exactement à un mot déclencheur",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "Le premier mot commence avec un mot déclencheur",
-  "admin.advance.cluster": "Haute disponibilité (Bêta)",
+  "add_users_to_team.title": "Ajouter des nouveaux membres à l'équipe {teamName}",
+  "admin.advance.cluster": "Haute disponibilité",
   "admin.advance.metrics": "Suivi des performances",
   "admin.audits.reload": "Recharger les logs de l'activité utilisateur",
   "admin.audits.title": "Activité de l'utilisateur",
@@ -282,6 +283,8 @@
   "admin.email.requireVerificationDescription": "En général, activé en production. Si activé, Mattermost impose une vérification de l'adresse e-mail avant d'autoriser la connexion. Vous pouvez désactiver cette option en développement.",
   "admin.email.requireVerificationTitle": "Imposer la vérification de l'adresse e-mail : ",
   "admin.email.selfPush": "Spécifiez manuellement la configuration du service de notifications Push",
+  "admin.email.skipServerCertificateVerification.description": "Lorsqu'activé, Mattermost ne vérifiera pas le certificat du serveur e-mail.",
+  "admin.email.skipServerCertificateVerification.title": "Passer la vérification du certificat du serveur: ",
   "admin.email.smtpPasswordDescription": " Récupérez ces informations de la part de l'administrateur de votre serveur de mails.",
   "admin.email.smtpPasswordExample": "Ex. : \"votremotdepasse\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.email.smtpPasswordTitle": "Mot de passe du serveur SMTP :",
@@ -328,13 +331,15 @@
   "admin.general.policy.permissionsSystemAdmin": "Administrateurs système",
   "admin.general.policy.restrictPostDeleteDescription": "Définit quels sont les utilisateurs autorisés à supprimer des messages.",
   "admin.general.policy.restrictPostDeleteTitle": "Autorise quels utilisateurs peuvent supprimer des messages :",
-  "admin.general.policy.restrictPrivateChannelCreationDescription": "Choisit qui peut créer des canaux publics.",
-  "admin.general.policy.restrictPrivateChannelCreationTitle": "Activer la création de canaux publics pour :",
+  "admin.general.policy.restrictPrivateChannelCreationDescription": "Spécifie la politique définissant quel utilisateur peut créer des canaux privés.",
+  "admin.general.policy.restrictPrivateChannelCreationTitle": "Activer la création de canaux privés pour :",
   "admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "outil en ligne de commande",
-  "admin.general.policy.restrictPrivateChannelDeletionDescription": "Choisit qui peut supprimer des canaux publics. Les canaux supprimés peuvent être récupérés de la base de données en utilisant {commandLineToolLink}.",
-  "admin.general.policy.restrictPrivateChannelDeletionTitle": "Activer la suppression de canaux publics pour :",
-  "admin.general.policy.restrictPrivateChannelManagementDescription": "Choisit qui peut renommer et définir l'entête ou la description des canaux publics.",
-  "admin.general.policy.restrictPrivateChannelManagementTitle": "Activer le renommage de canaux publics pour :",
+  "admin.general.policy.restrictPrivateChannelDeletionDescription": "Spécifie la politique définissant quel utilisateur peut supprimer des canaux privés. Les canaux supprimés peuvent être récupérés de la base de données en utilisant {commandLineToolLink}.",
+  "admin.general.policy.restrictPrivateChannelDeletionTitle": "Activer la suppression de canaux privés pour :",
+  "admin.general.policy.restrictPrivateChannelManageMembersDescription": "Spécifie la politique définissant quel utilisateur peut ajouter ou supprimer des membres de canaux privés.",
+  "admin.general.policy.restrictPrivateChannelManageMembersTitle": "Active la gestion des membres de canaux privés pour :",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "Spécifie la politique définissant quel utilisateur peut renommer et définir l'entête ou la description des canaux privés.",
+  "admin.general.policy.restrictPrivateChannelManagementTitle": "Activer le renommage de canaux privés pour :",
   "admin.general.policy.restrictPublicChannelCreationDescription": "Choisit qui peut créer des canaux publics.",
   "admin.general.policy.restrictPublicChannelCreationTitle": "Activer la création de canaux publics pour :",
   "admin.general.policy.restrictPublicChannelDeletionCommandLineToolLink": "outil en ligne de commande",
@@ -506,7 +511,7 @@
   "admin.log.enableDiagnosticsDescription": "Activez cette fonctionnalité pour améliorer la qualité et la performance de Mattermost en envoyant des rapports d'erreur et de diagnostic à Mattermost, Inc. Lisez notre <a href=\"https://about.mattermost.com/default-privacy-policy/\" target=\"_blank\">politique de protection de la vie privée</a> pour en savoir plus.",
   "admin.log.enableWebhookDebugging": "Activer le débogage des webhooks :",
   "admin.log.enableWebhookDebuggingDescription": "Si ce paramètre est faux, les traces de débogage des requêtes webhook entrantes seront désactivées.",
-  "admin.log.fileDescription": "En principe activé en production. Si activé, les journaux sont écrits dans le fichier spécifié ci-dessous.",
+  "admin.log.fileDescription": "Typiquement activé en production. Lorsqu'activé, les événements sont écrits dans le fichier mattermost.log dans le répertoire spécifié dans le champ 'Répertoire des fichiers journaux'. La rotation des journaux s'effectue toutes les 10 000 lignes et sont archivés dans un fichier du même répertoire, avec un nom de fichier portant un timestamp et un numéro de série. Par exemple, mattermost.2017-03-31.001.",
   "admin.log.fileLevelDescription": "Ce paramètre indique le niveau de détail des journaux. ERROR : N'enregistre que les messages d'erreur. INFO : Affiche les erreurs et des informations sur le démarrage et l'initialisation du serveur. DEBUG : Affiche des informations utiles aux développeurs.",
   "admin.log.fileLevelTitle": "Niveau de détail des journaux :",
   "admin.log.fileTitle": "Enregistre les journaux dans un fichier : ",
@@ -521,7 +526,7 @@
   "admin.log.formatTitle": "Format de fichier : ",
   "admin.log.levelDescription": "Ce paramètre détermine le niveau de détail des événements du journal affichés sur la console. ERROR : Affiche seulement les erreurs. INFO : Affiche les messages d'erreur ainsi que des informations sur le démarrage et l'initialisation du serveur. DEBUG : Affiche un haut niveau de détail pour les développeurs.",
   "admin.log.levelTitle": "Niveau de détail affiché sur la console :",
-  "admin.log.locationDescription": "Fichier des journaux. Si vide, les journaux seront enregistrés dans \"./logs/mattermost.log\", avec une rotation toutes les 10000 lignes.",
+  "admin.log.locationDescription": "L'emplacement des fichiers journaux. Si laissé vide, ces derniers sont sauvegardés dans le répertoire ./logs. Le chemin vers ce répertoire doit exister et Mattermost doit disposer des permissions pour écrire dedans.",
   "admin.log.locationPlaceholder": "Saisir l'emplacement du fichier",
   "admin.log.locationTitle": "Répertoire des fichiers journaux :",
   "admin.log.logSettings": "Paramètres de journalisation (logs)",
@@ -691,7 +696,7 @@
   "admin.service.corsTitle": "Autoriser les requêtes cross-origin depuis :",
   "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": "Enforce Multi-factor Authentication:",
+  "admin.service.enforcMfaTitle": "Imposer l'authentification multi-facteurs :",
   "admin.service.enforceMfaDesc": "Lorsqu'activé, l'<a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>authentification multi-facteurs (MFA)</a> est requise pour la connexion. Les nouveaux utilisateurs devront configurer MFA lors de leur inscription. Les utilisateurs connectés sans MFA configuré seront redirigés vers la page de configuration MFA jusqu'à ce que la configuration soit terminée.<br/><br/>Si votre système dispose d'utilisateurs se connectant autrement que par AD/LDAP ou une adresse e-mail, MFA devra être appliqué avec un fournisseur d'authentification extérieur à Mattermost.",
   "admin.service.forward80To443": "Rediriger le port 80 sur le port 443 :",
   "admin.service.forward80To443Description": "Faire suivre le trafic non chiffré du port 80 vers le port sécurisé 443",
@@ -725,7 +730,7 @@
   "admin.service.sessionCacheDesc": "Durée pendant laquelle une session est gardée en mémoire.",
   "admin.service.sessionDaysEx": "Ex. : \"30\"",
   "admin.service.siteURL": "URL du site :",
-  "admin.service.siteURLDescription": "L'URL, incluant le numéro de port et le protocol, que les utilisateurs utilisent pour accéder à Mattermost. Ce champ peut être laissé vide à moins que vous ne configuriez l'envoi d'e-mail par lot dans <b>Notifications > Email</b>. Lorsque le champ est vide, l'URL est configurée automatiquement sur base du trafic entrant.",
+  "admin.service.siteURLDescription": "L'URL, incluant le numéro de port et le protocole, que les utilisateurs vont utiliser pour accéder à Mattermost. Ce paramètre est requis.",
   "admin.service.siteURLExample": "Ex. : \"https://mattermost.example.com:1234\"",
   "admin.service.ssoSessionDays": "Durée de la session SSO (en jours) :",
   "admin.service.ssoSessionDaysDesc": "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. Si la méthode d'authentification est SAML ou GitLab, l'utilisateur pourra être automatiquement connecté à nouveau dans Mattermost s'ils sont déjà connectés dans SAML ou GitLab. Après le changement de ce paramètre, il prendra effet la prochaine fois que les utilisateurs saisiront leurs identifiants.",
@@ -743,11 +748,11 @@
   "admin.service.webhooksTitle": "Activer les webhooks entrants : ",
   "admin.service.writeTimeout": "Délai d'attente d'écriture :",
   "admin.service.writeTimeoutDescription": "Si vous utilisez HTTP (non sécurisé), il s'agit du temps maximum autorisé à partir du moment où les entêtes sont lus jusqu'au moment où la réponse est écrite. Si vous utilisez le protocole HTTPS, c'est le temps total à partir du moment où la connexion est acceptée jusqu'au moment où la réponse est écrite.",
-  "admin.sidebar.addTeamSidebar": "Add team from sidebar menu",
+  "admin.sidebar.addTeamSidebar": "Afficher l'équipe dans le menu",
   "admin.sidebar.advanced": "Options avancées",
   "admin.sidebar.audits": "Conformité et vérification",
   "admin.sidebar.authentication": "authentification",
-  "admin.sidebar.cluster": "Haute disponibilité (Beta)",
+  "admin.sidebar.cluster": "Haute disponibilité",
   "admin.sidebar.compliance": "Conformité",
   "admin.sidebar.configuration": "Configuration",
   "admin.sidebar.connections": "Connexions",
@@ -784,7 +789,7 @@
   "admin.sidebar.push": "notifications Push",
   "admin.sidebar.rateLimiting": "Limitation de débit",
   "admin.sidebar.reports": "RAPPORTS",
-  "admin.sidebar.rmTeamSidebar": "Remove team from sidebar menu",
+  "admin.sidebar.rmTeamSidebar": "Ne plus afficher l'équipe dans le menu",
   "admin.sidebar.saml": "SAML",
   "admin.sidebar.security": "Sécurité",
   "admin.sidebar.sessions": "sessions",
@@ -794,7 +799,7 @@
   "admin.sidebar.statistics": "Statistiques de l'équipe",
   "admin.sidebar.storage": "Stockage",
   "admin.sidebar.support": "Juridique et de soutien",
-  "admin.sidebar.teams": "TEAMS ({count, number})",
+  "admin.sidebar.teams": "Equipes ({count, number})",
   "admin.sidebar.users": "Utilisateurs",
   "admin.sidebar.usersAndTeams": "Utilisateur et équipes",
   "admin.sidebar.view_statistics": "Statistiques du serveur",
@@ -880,8 +885,8 @@
   "admin.team_analytics.activeUsers": "Utilisateurs actifs avec messages",
   "admin.team_analytics.totalPosts": "Nombre total de messages",
   "admin.true": "oui",
-  "admin.userList.title": "Users for {team}",
-  "admin.userList.title2": "Users for {team} ({count})",
+  "admin.userList.title": "Utilisateurs de {team}",
+  "admin.userList.title2": "Utilisateurs de {team} ({count})",
   "admin.user_item.authServiceEmail": "<strong>Méthode de connexion :</strong> Adresse e-mail",
   "admin.user_item.authServiceNotEmail": "<strong>Méthode de connexion :</strong> {service}",
   "admin.user_item.confirmDemoteDescription": "Si vous vous retirez le rôle d'administrateur et qu'il n'y a aucun autre administrateur désigné, vous devrez en désigner un en utilisant les outils en ligne de commande depuis un terminal sur le serveur.",
@@ -895,13 +900,14 @@
   "admin.user_item.makeMember": "Assigner le rôle Membre",
   "admin.user_item.makeSysAdmin": "Assigner le rôle administrateur système",
   "admin.user_item.makeTeamAdmin": "Assigner le rôle \"Administrateur d'équipe\"",
+  "admin.user_item.manageTeams": "Gérer les équipes",
   "admin.user_item.member": "Membre",
   "admin.user_item.mfaNo": "<strong>MFA</strong> : Non",
   "admin.user_item.mfaYes": "<strong>MFA</strong> : Oui",
   "admin.user_item.resetMfa": "supprimer l’identification à facteurs-multiples",
   "admin.user_item.resetPwd": "Réinitialiser le mot de passe",
   "admin.user_item.switchToEmail": "Basculer le type de connexion sur le couple adresse e-mail / mot de passe",
-  "admin.user_item.sysAdmin": "System Admin",
+  "admin.user_item.sysAdmin": "Administrateur système",
   "admin.user_item.teamAdmin": "Administrateur d'équipe",
   "admin.webrtc.enableDescription": "Lorsqu'activé, Mattermost autorise les appels vidéo en <strong>tête-à-tête</strong>. Les appels par WebRTC sont disponibles sur Chrome, Firefox et les applications Mattermost de bureau.",
   "admin.webrtc.enableTitle": "Activer Mattermost WebRTC :",
@@ -941,7 +947,7 @@
   "analytics.system.dailyActiveUsers": "Utilisateurs actifs quotidiens",
   "analytics.system.monthlyActiveUsers": "Utilisateurs actifs mensuels",
   "analytics.system.postTypes": "Messages, fichiers et hashtags",
-  "analytics.system.privateGroups": "Canal privé",
+  "analytics.system.privateGroups": "Canaux privés",
   "analytics.system.publicChannels": "Canaux publics",
   "analytics.system.skippedIntensiveQueries": "Pour optimiser les performances, certaines statistiques ont été désactivées. Vous pouvez les réactiver dans la config.json. Voir : <a href='https://docs.mattermost.com/administration/statistics.html' target='_blank'>https://docs.mattermost.com/administration/statistics.html</a>",
   "analytics.system.textPosts": "Messages texte uniquement",
@@ -961,7 +967,7 @@
   "analytics.system.totalWebsockets": "Connexions WebSocket",
   "analytics.team.activeUsers": "Nombre d'utilisateurs actifs avec messages",
   "analytics.team.newlyCreated": "Nouveaux utilisateurs",
-  "analytics.team.privateGroups": "Canal privé",
+  "analytics.team.privateGroups": "Canaux privés",
   "analytics.team.publicChannels": "Canaux publics",
   "analytics.team.recentActive": "Utilisateurs actifs récemment",
   "analytics.team.recentUsers": "Utilisateurs actifs récemment",
@@ -994,8 +1000,8 @@
   "audit_table.attemptedWebhookDelete": "Tentative de supprimer un webhook",
   "audit_table.by": " par {username}",
   "audit_table.byAdmin": " par un administrateur",
-  "audit_table.channelCreated": "Canal/groupe {channelName} créé",
-  "audit_table.channelDeleted": "Supprimé le canal/groupe avec l'URL {url}",
+  "audit_table.channelCreated": "Le canal {channelName} a été créé",
+  "audit_table.channelDeleted": "Le canal portant l'URL {url} a été supprimé",
   "audit_table.establishedDM": "Envoyé un message privé avec {username}",
   "audit_table.failedExpiredLicenseAdd": "Echec d'ajout d'une licence (elle a déjà expiré ou pas encore démarré)",
   "audit_table.failedInvalidLicenseAdd": "Échec de l'ajout d'une licence",
@@ -1004,14 +1010,14 @@
   "audit_table.failedPassword": "Impossible de modifier le mot de passe pour un utilisateur connecté via OAuth",
   "audit_table.failedWebhookCreate": "Impossible de créer le webhook - permissions insuffisantes pour ce canal",
   "audit_table.failedWebhookDelete": "Impossible de supprimer un webhook - conditions non remplies",
-  "audit_table.headerUpdated": "Entête du canal/groupe {channelName} a été mis à jour",
+  "audit_table.headerUpdated": "L'entête du canal {channelName} a été mis à jour",
   "audit_table.ip": "Adresse IP",
   "audit_table.licenseRemoved": "Licence supprimée avec succès",
   "audit_table.loginAttempt": " (Tentative de connexion)",
   "audit_table.loginFailure": " (Échec de la connexion)",
   "audit_table.logout": "Déconnecté de votre compte",
   "audit_table.member": "membre",
-  "audit_table.nameUpdated": "Mis à jour le nom du canal/groupe {channelName}",
+  "audit_table.nameUpdated": "Le nom du canal {channelName} a été mis à jour",
   "audit_table.oauthTokenFailed": "Échec lors de la récupération du jeton d'accès OAuth - {token}",
   "audit_table.revokedAll": "Toutes les sessions actives de l'équipe ont été révoquées",
   "audit_table.sentEmail": "Un e-mail a été envoyé à {email} pour réinitialiser votre mot de passe",
@@ -1030,9 +1036,9 @@
   "audit_table.updateGlobalNotifications": "Vos paramètres de notification ont été mis à jour",
   "audit_table.updatePicture": "Mettre à jour votre photo de profil",
   "audit_table.updatedRol": "Mettre à jour les rôles à ",
-  "audit_table.userAdded": "{username} ajouté au canal/groupe {channelName}",
+  "audit_table.userAdded": "{username} a été ajouté au canal {channelName}",
   "audit_table.userId": "Identifiant de l'utilisateur",
-  "audit_table.userRemoved": "{username} retiré du canal/groupe {channelName}",
+  "audit_table.userRemoved": "{username} a été retiré du canal {channelName}",
   "audit_table.verified": "Votre adresse e-mail est maintenant vérifiée",
   "authorize.access": "Autoriser l'accès à <strong>{appName}</strong> ?",
   "authorize.allow": "Autoriser",
@@ -1059,20 +1065,17 @@
   "channelHeader.removeFromFavorites": "Retirer des favoris",
   "channel_flow.alreadyExist": "Il existe déjà un canal avec cette URL",
   "channel_flow.changeUrlDescription": "Certains caractères ne sont pas autorisés dans les URL et doivent être retirés.",
-  "channel_flow.changeUrlTitle": "Change {term} URL",
-  "channel_flow.channel": "Channel",
-  "channel_flow.create": "Canal privé",
-  "channel_flow.group": "Group",
+  "channel_flow.changeUrlTitle": "Changer l'URL du canal",
+  "channel_flow.create": "Créer un canal",
   "channel_flow.handleTooShort": "L'URL du canal doit comporter au moins 2 caractères alphanumériques minuscules",
   "channel_flow.invalidName": "Nom du canal incorrect",
-  "channel_flow.set_url_title": "Set {term} URL",
+  "channel_flow.set_url_title": "Définir l'URL du canal",
   "channel_header.addMembers": "Ajouter des membres",
   "channel_header.addToFavorites": "Ajouter aux favoris",
-  "channel_header.channel": "Channel",
+  "channel_header.channel": "Canal",
   "channel_header.channelHeader": "Éditer l'entête du canal",
   "channel_header.delete": "Supprimer le canal",
   "channel_header.flagged": "Messages marqués d'un indicateur",
-  "channel_header.group": "Group",
   "channel_header.leave": "Quitter le canal",
   "channel_header.manageMembers": "Gérer les membres",
   "channel_header.notificationPreferences": "Préférences de notification",
@@ -1080,7 +1083,7 @@
   "channel_header.removeFromFavorites": "Retirer des favoris",
   "channel_header.rename": "Renommer le canal",
   "channel_header.setHeader": "Éditer l'entête du canal",
-  "channel_header.setPurpose": "Edit {term} Purpose",
+  "channel_header.setPurpose": "Editer la description du canal",
   "channel_header.viewInfo": "Informations",
   "channel_header.viewMembers": "Voir les membres",
   "channel_header.webrtc.call": "Démarrer un appel vidéo",
@@ -1115,26 +1118,24 @@
   "channel_members_modal.addNew": " Ajouter des nouveaux membres",
   "channel_members_modal.members": " Membres",
   "channel_modal.cancel": "Annuler",
-  "channel_modal.channel": "Channel",
   "channel_modal.createNew": "Créer un nouveau canal",
-  "channel_modal.descriptionHelp": "Décrit comment ce {term} doit être utilisé.",
+  "channel_modal.descriptionHelp": "Décrit comment ce canal doit être utilisé.",
   "channel_modal.displayNameError": "Le nom du canal doit avoir au moins 2 caractères",
   "channel_modal.edit": "Modifier",
-  "channel_modal.group": "Group",
   "channel_modal.header": "Entête",
   "channel_modal.headerEx": "Ex. : \"[Titre du lien](http://exemple.com)\"",
-  "channel_modal.headerHelp": "Définit le texte qui apparaîtra comme entête de {term} en regard du nom du {term}. Par exemple, saisissez des liens fréquemment utilisés en tapant [Lien de titre](http://exemple.com).",
-  "channel_modal.modalTitle": "New ",
+  "channel_modal.headerHelp": "Définit le texte qui apparaîtra comme entête du canal en regard du nom du canal. Par exemple, saisissez des liens fréquemment utilisés en tapant [Lien de titre](http://exemple.com).",
+  "channel_modal.modalTitle": "Nouveau canal",
   "channel_modal.name": "Nom",
   "channel_modal.nameEx": "Exemple : \"Problèmes\", \"Marketing\", \"Éducation\"",
   "channel_modal.optional": "(facultatif)",
-  "channel_modal.privateGroup1": "Crée un nouveau groupe privé avec des membres restreints. ",
-  "channel_modal.privateGroup2": "Créer un canal public",
+  "channel_modal.privateGroup1": "Crée un nouveau canal privé avec des membres restreints. ",
+  "channel_modal.privateGroup2": "Créer un canal privé",
   "channel_modal.publicChannel1": "Créer un canal public",
   "channel_modal.publicChannel2": "Crée un canal public que tout le monde peut rejoindre. ",
   "channel_modal.purpose": "Description",
   "channel_modal.purposeEx": "Ex. : \"Un canal pour rapporter des bogues ou des améliorations\"",
-  "channel_notification.push": "Send mobile push notifications",
+  "channel_notification.push": "Envoyer des notifications push mobiles",
   "channel_notifications.allActivity": "Pour toute l'activité",
   "channel_notifications.allUnread": "Pour les messages non-lus",
   "channel_notifications.globalDefault": "Par défaut ({notifyLevel})",
@@ -1229,11 +1230,9 @@
   "custom_emoji.search": "Rechercher les emoji personnalisés",
   "default_channel.purpose": "Publiez ici les messages que vous souhaitez que tout le monde voie. Chaque utilisateur devient un membre permanent de ce canal lorsqu'il rejoint l'équipe.",
   "delete_channel.cancel": "Annuler",
-  "delete_channel.channel": "channel",
   "delete_channel.confirm": "Confirmez la SUPPRESSION du canal",
   "delete_channel.del": "Supprimer",
-  "delete_channel.group": "group",
-  "delete_channel.question": "Ceci va supprimer le canal de l'équipe et rendre son contenu inaccessible de tous les utilisateurs. Voulez-vous vraiment supprimer {display_name} {term} ?",
+  "delete_channel.question": "Ceci va supprimer le canal de l'équipe et rendre son contenu inaccessible de tous les utilisateurs. Voulez-vous vraiment supprimer le canal {display_name} ?",
   "delete_post.cancel": "Annuler",
   "delete_post.comment": "Commentaire",
   "delete_post.confirm": "Confirmer la suppression de {term}",
@@ -1247,11 +1246,9 @@
   "edit_channel_header_modal.save": "Enregistrer",
   "edit_channel_header_modal.title": "Modifier l'entête de {channel}",
   "edit_channel_header_modal.title_dm": "Modifier l'entête",
-  "edit_channel_purpose_modal.body": "Décrit de quelle manière ce {type} devrait être utilisé. Ce texte apparaît dans la liste des canaux dans le menu \"Suite...\" et guide les personnes pour décider si elles devraient le rejoindre ou non.",
+  "edit_channel_purpose_modal.body": "Décrit de quelle manière ce canal devrait être utilisé. Ce texte apparaît dans la liste des canaux dans le menu \"Suite...\" et guide les personnes pour décider si elles doivent le rejoindre ou non.",
   "edit_channel_purpose_modal.cancel": "Annuler",
-  "edit_channel_purpose_modal.channel": "Channel",
   "edit_channel_purpose_modal.error": "La description de ce canal est trop longue, veuillez en indiquer une plus courte.",
-  "edit_channel_purpose_modal.group": "Group",
   "edit_channel_purpose_modal.save": "Enregistrer",
   "edit_channel_purpose_modal.title1": "Modifier la description",
   "edit_channel_purpose_modal.title2": "Modifier la description de ",
@@ -1302,12 +1299,14 @@
   "error.not_found.link_message": "Retour à Mattermost",
   "error.not_found.message": "La page que vous essayer d'atteindre n'existe pas",
   "error.not_found.title": "Page non trouvée",
-  "error.not_supported.message": "La navigation privée n'est pas prise en charge.",
-  "error.not_supported.title": "Le navigateur n'est pas pris en charge",
   "error_bar.expired": "La licence entreprise a expiré et certaines fonctionnalités peuvent être désactivées. <a href='{link}' target='_blank'>Veuillez renouveler</a>.",
   "error_bar.expiring": "La licence entreprise expire le {date}. <a href='{link}' target='_blank'>Veuillez renouveler</a>.",
   "error_bar.past_grace": "La licence entreprise a expiré et certaines fonctionnalités peuvent être désactivées. Veuillez contacter votre administrateur système pour plus d'informations.",
   "error_bar.preview_mode": "Mode découverte : Les notifications par e-mail ne sont pas configurées",
+  "error_bar.site_url": "Veuillez configurer votre {docsLink} dans le {link}.",
+  "error_bar.site_url.docsLink": "URL du site :",
+  "error_bar.site_url.link": "Console système",
+  "error_bar.site_url_gitlab": "Veuillez configurer votre {docsLink} dans la console système ou dans le fichier gitlab.rb si vous utilisez GitLab Mattermost.",
   "file_attachment.download": "Télécharger",
   "file_info_preview.size": "Taille ",
   "file_info_preview.type": "Type de fichier ",
@@ -1542,14 +1541,14 @@
   "intro_messages.channel": "canal",
   "intro_messages.creator": "Ceci est le début de {type} {name}, créé par {creator} le {date}.",
   "intro_messages.default": "<h4 class='channel-intro__title'>Début de {display_name}</h4><p class='channel-intro__content'><strong>Bienvenue sur {display_name}!</strong><br/><br/>Publiez ici les messages que vous souhaitez que tout le monde voie. Chaque utilisateur devient un membre permanent de ce canal lorsqu'il rejoint l'équipe.</p>",
-  "intro_messages.group": "Canal privé",
+  "intro_messages.group": "canal privé",
   "intro_messages.invite": "Inviter d'autres membres sur ce {type}",
   "intro_messages.inviteOthers": "Inviter d'autres membres dans cette équipe",
   "intro_messages.noCreator": "Ceci est le début de {name} {type}, créé le {date}.",
   "intro_messages.offTopic": "<h4 class=\"channel-intro__title\">Début de {display_name}</h4><p class=\"channel-intro__content\">Ceci est le début de {display_name}, un canal destiné aux conversations extra-professionnelles.<br/></p>",
-  "intro_messages.onlyInvited": " Seuls les membres invités peuvent voir ce groupe privé.",
+  "intro_messages.onlyInvited": " Seuls les membres invités peuvent voir ce canal privé.",
   "intro_messages.purpose": " L'objectif de {type} est : {purpose}.",
-  "intro_messages.setHeader": "Définit l'entête",
+  "intro_messages.setHeader": "Définir l'entête",
   "intro_messages.teammate": "Vous êtes au début de votre historique de messages avec cet utilisateur. Les messages privés et les fichiers partagés ici ne sont pas visibles par les autres utilisateurs.",
   "invite_member.addAnother": "Ajouter un autre",
   "invite_member.autoJoin": "Les membres automatiquement invités rejoignent le canal <strong>{channel}</strong>.",
@@ -1563,7 +1562,7 @@
   "invite_member.modalButton": "Oui, abandonner",
   "invite_member.modalMessage": "Vous avez des invitations qui n'ont pas encore été envoyées, êtes vous sûr de vouloir abandonner ?",
   "invite_member.modalTitle": "Abandonner les invitations ?",
-  "invite_member.newMember": "Inviter un nouveau membre",
+  "invite_member.newMember": "Envoyer un e-mail d'invitation",
   "invite_member.send": "Ajouter une invitation",
   "invite_member.send2": "Ajouter une invitation",
   "invite_member.sending": " Envoi en cours",
@@ -1573,7 +1572,7 @@
   "ldap_signup.length_error": "Le nom doit contenir de 3 à 15 caractères",
   "ldap_signup.teamName": "Entrez le nom de votre nouvelle équipe",
   "ldap_signup.team_error": "Veuillez saisir le nom de votre équipe",
-  "leave_team_modal.desc": "Vous serez retiré de toutes les chaînes publiques et privées.   Si l'équipe est privé, vous ne serez pas en mesure de rejoindre l'équipe.   Êtes-vous sûr?",
+  "leave_team_modal.desc": "Vous allez être retiré de tous les canaux publics et privés.   Si l'équipe est privée, vous ne serez pas en mesure de rejoindre l'équipe.   Voulez-vous continuer ?",
   "leave_team_modal.no": "Non",
   "leave_team_modal.title": "Quitter l'équipe ?",
   "leave_team_modal.yes": "Oui",
@@ -1648,7 +1647,7 @@
   "mobile.account_notifications.threads_mentions": "Mentions dans les fils de discussion",
   "mobile.account_notifications.threads_start": "Fils de discussion que je démarre",
   "mobile.account_notifications.threads_start_participate": "Fils de discussion que je démarre ou auxquels je participe",
-  "mobile.channel_info.alertMessageDeleteChannel": "Voulez-vous vraiment quitter le {term} {name} ?",
+  "mobile.channel_info.alertMessageDeleteChannel": "Voulez-vous vraiment supprimer le {term} avec {name} ?",
   "mobile.channel_info.alertMessageLeaveChannel": "Voulez-vous vraiment quitter le {term} {name} ?",
   "mobile.channel_info.alertNo": "Non",
   "mobile.channel_info.alertTitleDeleteChannel": "Supprimer {term}",
@@ -1676,7 +1675,7 @@
   "mobile.components.select_server_view.proceed": "Continuer",
   "mobile.components.select_server_view.siteUrlPlaceholder": "https://mattermost.example.com",
   "mobile.create_channel": "Créer",
-  "mobile.create_channel.private": "Nouveau groupe privé",
+  "mobile.create_channel.private": "Nouveau canal privé",
   "mobile.create_channel.public": "Nouveau canal public",
   "mobile.custom_list.no_results": "Aucun résultat",
   "mobile.edit_post.title": "Edition du message",
@@ -1724,8 +1723,8 @@
   "more_channels.title": "Plus de canaux",
   "more_direct_channels.close": "Fermer",
   "more_direct_channels.message": "Message",
-  "more_direct_channels.new_convo_note": "Ceci va démarrer une nouvelle conversation. Si vous ajoutez beaucoup de personnes, veuillez envisager la création d'un groupe privé à la place.",
-  "more_direct_channels.new_convo_note.full": "Vous avez atteint le nombre maximum de personnes pour cette conversation. Veuillez envisager la création d'un groupe privé à la place.",
+  "more_direct_channels.new_convo_note": "Ceci va démarrer une nouvelle conversation. Si vous ajoutez beaucoup de personnes, veuillez envisager la création d'un canal privé à la place.",
+  "more_direct_channels.new_convo_note.full": "Vous avez atteint le nombre maximum de personnes pour cette conversation. Veuillez envisager la création d'un canal privé à la place.",
   "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...",
@@ -1751,12 +1750,13 @@
   "navbar.viewPinnedPosts": "Afficher les messages épinglés",
   "navbar_dropdown.about": "À propos",
   "navbar_dropdown.accountSettings": "Paramètres du compte",
+  "navbar_dropdown.addMemberToTeam": "Ajouter des membres à l'équipe",
   "navbar_dropdown.console": "Console système",
   "navbar_dropdown.create": "Créer une équipe",
   "navbar_dropdown.emoji": "Emoji personnalisés",
   "navbar_dropdown.help": "Aide",
   "navbar_dropdown.integrations": "Intégrations",
-  "navbar_dropdown.inviteMember": "Inviter un membre",
+  "navbar_dropdown.inviteMember": "Envoyer un e-mail d'invitation",
   "navbar_dropdown.join": "Rejoindre une autre équipe",
   "navbar_dropdown.leave": "Quitter l'équipe",
   "navbar_dropdown.logout": "Se déconnecter",
@@ -1788,6 +1788,7 @@
   "pending_post_actions.cancel": "Annuler",
   "pending_post_actions.retry": "Réessayer",
   "permalink.error.access": "Ce lien correspond à un message supprimé ou appartenant à un canal auquel vous n'avez pas accès.",
+  "permalink.error.title": "Message introuvable",
   "post_attachment.collapse": "Afficher moins...",
   "post_attachment.more": "Afficher plus...",
   "post_body.commentedOn": "A commenté le message de {name}{apostrophe} : ",
@@ -1892,26 +1893,27 @@
   "setting_upload.noFile": "Aucun fichier sélectionné.",
   "setting_upload.select": "Parcourir",
   "sidebar.channels": "Canaux",
-  "sidebar.createChannel": "Créer un canal public",
-  "sidebar.createGroup": "Create new group",
+  "sidebar.createChannel": "Créer un nouveau canal public",
+  "sidebar.createGroup": "Créer un nouveau canal privé",
   "sidebar.direct": "Messages privés",
   "sidebar.favorite": "Favoris",
   "sidebar.more": "Plus…",
   "sidebar.moreElips": "Plus...",
   "sidebar.otherMembers": "En dehors de l’équipe",
-  "sidebar.pg": "Canal privé",
+  "sidebar.pg": "Canaux privés",
   "sidebar.removeList": "Retirer de la liste",
-  "sidebar.tutorialScreen1": "<h4>Canaux</h4><p><strong>Les canaux</strong> organisent les conversations en sujets distincts. Ils sont ouverts à tous les utilisateurs de votre équipe. Pour envoyer des messages privés, utilisez <strong>Messages privés</strong> pour une personne ou <strong>Groupes privés</strong> pour plusieurs personnes.</p>",
+  "sidebar.tutorialScreen1": "<h4>Canaux</h4><p><strong>Les canaux</strong> organisent les conversations en sujets distincts. Ils sont ouverts à tous les utilisateurs de votre équipe. Pour envoyer des messages privés, utilisez <strong>Messages privés</strong> pour une personne ou des <strong>Canaux privés</strong> pour plusieurs personnes.</p>",
   "sidebar.tutorialScreen2": "<h4>Canaux \"{townsquare}\" et \"{offtopic}\"</h4><p>Voici deux canaux publics pour commencer :</p><p><strong>{townsquare}</strong> est l'endroit idéal pour communiquer avec toute l'équipe. Tous les membres de votre équipe sont membres de ce canal.</p><p><strong>{offtopic}</strong> (est l'endroit pour se détendre et parler d'autre chose que du travail. Vous et votre équipe décidez des autres canaux à créer.</p>",
-  "sidebar.tutorialScreen3": "<h4>Créer et rejoindre des canaux</h4><p>Cliquez sur <strong>\"Plus...\"</strong> pour créer un nouveau canal ou rejoindre un canal existant.</p><p>Vous pouvez aussi créer un nouveau canal ou un groupe privé en cliquant sur le symbole <strong>\"+\"</strong> à côté du nom du canal ou de l'entête du groupe privé.</p>",
+  "sidebar.tutorialScreen3": "<h4>Créer et rejoindre des canaux</h4><p>Cliquez sur <strong>\"Plus...\"</strong> pour créer un nouveau canal ou rejoindre un canal existant.</p><p>Vous pouvez aussi créer un nouveau canal ou un groupe privé en cliquant sur le symbole <strong>\"+\"</strong> à côté du nom du canal public ou privé.</p>",
   "sidebar.unreadAbove": "Message(s) non-lu(s) ci-dessus",
   "sidebar.unreadBelow": "Message(s) non-lu(s) ci-dessous",
   "sidebar_header.tutorial": "<h4>Menu principal</h4><p>Le <strong>Menu Principal</strong> est l'endroit où vous pouvez <strong>inviter des nouveaux membres</strong>, accéder aux <strong>paramètres de votre compte</strong> et configurer les <strong>couleurs de votre thème</strong>.</p><p>Les administrateurs d'équipe peuvent aussi accéder aux <strong>paramètres de l'équipe</strong>.</p><p>Les administrateurs système trouveront la <strong>console système</strong> pour administrer tout le site.</p>",
   "sidebar_right_menu.accountSettings": "Paramètres du compte",
+  "sidebar_right_menu.addMemberToTeam": "Ajouter des membres à l'équipe",
   "sidebar_right_menu.console": "Console système",
   "sidebar_right_menu.flagged": "Messages marqués d'un indicateur",
   "sidebar_right_menu.help": "Aide",
-  "sidebar_right_menu.inviteNew": "Inviter un membre",
+  "sidebar_right_menu.inviteNew": "Envoyer un e-mail d'invitation",
   "sidebar_right_menu.logout": "Se déconnecter",
   "sidebar_right_menu.manageMembers": "Gérer les membres",
   "sidebar_right_menu.nativeApps": "Télécharger les apps",
@@ -1979,7 +1981,7 @@
   "suggestion.mention.morechannels": "Autres canaux",
   "suggestion.mention.nonmembers": "Pas dans le canal",
   "suggestion.mention.special": "Mentions spéciales",
-  "suggestion.search.private": "Canal privé",
+  "suggestion.search.private": "Canaux privés",
   "suggestion.search.public": "Canaux publics",
   "team_export_tab.download": "Télécharger",
   "team_export_tab.export": "Exporter",
@@ -2035,7 +2037,7 @@
   "tutorial_intro.mobileAppsLinkText": "PC, Mac, iOS et Android",
   "tutorial_intro.next": "Suivant",
   "tutorial_intro.screenOne": "<h3>Bienvenue dans :</h3><h1>Mattermost</h1><p>Toute la communication de votre équipe à un seul endroit, consultable instantanément et disponible partout.</p><p>Gardez votre équipe soudée et aider-la à accomplir les tâches qui importent vraiment.</p>",
-  "tutorial_intro.screenTwo": "<h3>Comment fonctionne Mattermost :</h3><p>Vous pouvez échanger dans des canaux publics, des groupes privés ou des messages privés.</p><p>Tout est archivé et peut être recherché depuis n'importe quel navigateur web de bureau, tablette ou mobile.</p>",
+  "tutorial_intro.screenTwo": "<h3>Comment fonctionne Mattermost :</h3><p>Vous pouvez échanger dans des canaux publics, des canaux privés ou des messages privés.</p><p>Tout est archivé et peut être recherché depuis n'importe quel navigateur web de bureau, tablette ou mobile.</p>",
   "tutorial_intro.skip": "Passer le tutoriel",
   "tutorial_intro.support": "Vous avez besoin d'aide ? Envoyez-nous un e-mail à : ",
   "tutorial_intro.teamInvite": "Inviter des collègues",
@@ -2055,7 +2057,7 @@
   "upload_overlay.info": "Faites glisser un fichier pour le télécharger.",
   "user.settings.advance.embed_preview": "Pour le premier lien web dans un message, afficher un aperçu du contenu du site sous le message, si disponible.",
   "user.settings.advance.embed_toggle": "Voir un aperçu pour tous les messages inclus",
-  "user.settings.advance.emojipicker": "Activer la possibilité de choisir une émoticône à partir de la zone de composition du message",
+  "user.settings.advance.emojipicker": "Activer la sélection d'émoticônes pour la zone de saisie de commentaires et celle de saisie de nouveaux messages",
   "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Feature} other {Features}} Activée",
   "user.settings.advance.formattingDesc": "Si activé, les messages seront formatés pour créer des liens, montrer des emoji, le style du texte et ajouter des sauts de ligne. Par défaut, ce paramètre est activé. La modification de ce paramètre nécessite le rafraîchissement de la page.",
   "user.settings.advance.formattingTitle": "Activé le formatage des messages",
diff --git a/webapp/i18n/ja.json b/webapp/i18n/ja.json
index cb9136315e..2e74800043 100644
--- a/webapp/i18n/ja.json
+++ b/webapp/i18n/ja.json
@@ -86,7 +86,7 @@
   "add_emoji.save": "保存",
   "add_incoming_webhook.cancel": "キャンセル",
   "add_incoming_webhook.channel": "チャンネル",
-  "add_incoming_webhook.channel.help": "ウェブフックのペイロードを受け取る公開チャンネル・非公開グループです。非公開グループにウェブフックを設定する時は、そのグループに属していなければなりません。",
+  "add_incoming_webhook.channel.help": "ウェブフックのペイロードを受け取る公開チャンネル・非公開チャンネルです。非公開チャンネルにウェブフックを設定する時は、そのチャンネルに所属していなければなりません。",
   "add_incoming_webhook.channelRequired": "有効なチャンネルが必要です",
   "add_incoming_webhook.description": "説明",
   "add_incoming_webhook.description.help": "内向きのウェブフックについての説明です。",
@@ -137,7 +137,8 @@
   "add_outgoing_webhook.triggerWordsTriggerWhen.help": "外向きのウェブフックのトリガーとなる条件を選択してください。メッセージの最初の単語がトリガーワードと正確に一致する場合、もしくはトリガーワードで始まる場合。",
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "最初の単語がトリガーワードと正確に一致する",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "最初の単語がトリガーワードで始まる",
-  "admin.advance.cluster": "高可用(ベータ版)",
+  "add_users_to_team.title": "新しいメンバーを {teamName} チームに追加する",
+  "admin.advance.cluster": "高可用",
   "admin.advance.metrics": "パフォーマンスモニタリング",
   "admin.audits.reload": "再読み込み",
   "admin.audits.title": "ユーザーのアクティビティー",
@@ -282,6 +283,8 @@
   "admin.email.requireVerificationDescription": "本番環境では有効に設定してください。有効な場合、Mattermostは利用登録をして最初にログインする前に電子メールアドレスの確認を必須にします。開発者はこれを無効に設定することで、電子メールアドレスの確認電子メールの送信を省略し、開発をより早く進められるようにできます。",
   "admin.email.requireVerificationTitle": "電子メールアドレスの確認が必要: ",
   "admin.email.selfPush": "プッシュ通知サービスの場所を手入力する",
+  "admin.email.skipServerCertificateVerification.description": "有効な場合、Mattermostは電子メールサーバーの証明書を検証しなくなります。",
+  "admin.email.skipServerCertificateVerification.title": "証明書の検証をしない: ",
   "admin.email.smtpPasswordDescription": "電子メールサーバーを設定するために管理者から認証情報を入手してください。",
   "admin.email.smtpPasswordExample": "例: \"yourpassword\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.email.smtpPasswordTitle": "SMTPサーバーパスワード:",
@@ -328,13 +331,15 @@
   "admin.general.policy.permissionsSystemAdmin": "システム管理者",
   "admin.general.policy.restrictPostDeleteDescription": "メッセージを削除できる権限を持つユーザーについてのポリシーを設定してください。",
   "admin.general.policy.restrictPostDeleteTitle": "メッセージの削除ができるユーザー:",
-  "admin.general.policy.restrictPrivateChannelCreationDescription": "公開チャンネルの作成ができるユーザーについてのポリシーを設定してください。",
-  "admin.general.policy.restrictPrivateChannelCreationTitle": "公開チャンネル作成を許可する:",
+  "admin.general.policy.restrictPrivateChannelCreationDescription": "非公開チャンネルの作成ができるユーザーについてのポリシーを設定してください。",
+  "admin.general.policy.restrictPrivateChannelCreationTitle": "非公開チャンネル作成を許可する:",
   "admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "コマンドラインツール",
-  "admin.general.policy.restrictPrivateChannelDeletionDescription": "公開チャンネルの削除ができるユーザーについてのポリシーを設定してください。削除されたチャンネルは {commandLineToolLink} を利用することでデータベースから復元することができます。",
-  "admin.general.policy.restrictPrivateChannelDeletionTitle": "公開チャンネルの削除を許可する:",
-  "admin.general.policy.restrictPrivateChannelManagementDescription": "公開チャンネル名の変更や、ヘッダー・目的の設定ができるユーザーについてのポリシーを設定してください。",
-  "admin.general.policy.restrictPrivateChannelManagementTitle": "公開チャンネル名の変更を許可する許可する:",
+  "admin.general.policy.restrictPrivateChannelDeletionDescription": "非公開チャンネルの削除ができるユーザーについてのポリシーを設定してください。削除されたチャンネルは {commandLineToolLink} を利用することでデータベースから復元することができます。",
+  "admin.general.policy.restrictPrivateChannelDeletionTitle": "非公開チャンネルの削除を許可する:",
+  "admin.general.policy.restrictPrivateChannelManageMembersDescription": "非公開チャンネルにメンバーを追加/削除できるユーザーについてのポリシーを設定してください。",
+  "admin.general.policy.restrictPrivateChannelManageMembersTitle": "非公開チャンネルのメンバー管理を許可する: ",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "非公開チャンネル名の変更や、ヘッダー・目的の設定ができるユーザーについてのポリシーを設定してください。",
+  "admin.general.policy.restrictPrivateChannelManagementTitle": "非公開チャンネル名の変更を許可する:",
   "admin.general.policy.restrictPublicChannelCreationDescription": "公開チャンネルの作成ができるユーザーについてのポリシーを設定してください。",
   "admin.general.policy.restrictPublicChannelCreationTitle": "公開チャンネル作成を許可する:",
   "admin.general.policy.restrictPublicChannelDeletionCommandLineToolLink": "コマンドラインツール",
@@ -342,7 +347,7 @@
   "admin.general.policy.restrictPublicChannelDeletionTitle": "公開チャンネルの削除を許可する:",
   "admin.general.policy.restrictPublicChannelManagementDescription": "公開チャンネル名の変更や、ヘッダー・目的の設定ができるユーザーについてのポリシーを設定してください。",
   "admin.general.policy.restrictPublicChannelManagementTitle": "公開チャンネル名の変更を許可する許可する:",
-  "admin.general.policy.teamInviteDescription": "<b>新しいメンバーを招待</b>での電子メールの送信や<b>チーム招待リンクを入手</b>による招待を行うことができるユーザーについてのポリシーを設定してください。<b>チーム招待リンクを入手</b>によるリンクが共有されている場合、希望のユーザーがチームに参加した後、<b>チームの設定</b> > <b>招待コード</b>から招待コードを無効にできます。",
+  "admin.general.policy.teamInviteDescription": "<b>招待メールを送信</b>での電子メールによるユーザーの招待や、メインメニューの<b>チーム招待リンクを入手</b>や<b>メンバーをチームに追加</b>による招待を行うことができるユーザーについてのポリシーを設定してください。<b>チーム招待リンクを入手</b>によるリンクが共有されている場合、希望のユーザーがチームに参加した後、<b>チームの設定</b> > <b>招待コード</b>から招待コードを無効にできます。",
   "admin.general.policy.teamInviteTitle": "チームへの招待ができるユーザー:",
   "admin.general.privacy": "プライバシー",
   "admin.general.usersAndTeams": "ユーザーとチーム",
@@ -506,7 +511,7 @@
   "admin.log.enableDiagnosticsDescription": "Mattermost, Incへエラーレポートと診断情報を送信し、Mattermostの品質とパフォーマンスを改善するために、この機能を有効にしてください。 詳しくは<a href=\"https://about.mattermost.com/default-privacy-policy/\" target='_blank'>プライバシーポリシー</a>を参照してください。",
   "admin.log.enableWebhookDebugging": "ウェブフックのデバッグを有効にする:",
   "admin.log.enableWebhookDebuggingDescription": "これを無効にすることで、全ての内向きのウェブフックのリクエストボディーのデバッグログの出力を無効化します。",
-  "admin.log.fileDescription": "本番環境では有効に設定してください。有効な場合、ログファイルは以下のファイルの場所欄で指定されたファイルに出力されます。",
+  "admin.log.fileDescription": "本番環境では有効に設定してください。有効な場合、イベントはログファイルの出力ディレクトリーに指定されたディレクトリーの mattermost.log ファイルに書き込まれます。ログファイルは10,000行で交換され、元のファイルはファイル名に日付とシリアルナンバーが付与されて同じディレクトリにアーカイブされます。例えば mattermost.2017-03-31.001 です。",
   "admin.log.fileLevelDescription": "この設定は、どのログイベントをログファイルに出力するか決定します。ERROR: エラーメッセージのみを出力する。INFO: エラーと起動と初期化の情報を出力する。DEBUG: 問題をデバッグする開発者向けの詳細を出力する。",
   "admin.log.fileLevelTitle": "ファイルログレベル:",
   "admin.log.fileTitle": "ログをファイルに出力する: ",
@@ -521,7 +526,7 @@
   "admin.log.formatTitle": "ログファイルの形式:",
   "admin.log.levelDescription": "この設定は、どのログイベントをコンソールに出力するか決定します。ERROR: エラーメッセージのみを出力する。INFO: エラーと起動と初期化の情報を出力する。DEBUG: 問題をデバッグする開発者向けの詳細を出力する。",
   "admin.log.levelTitle": "コンソールログレベル:",
-  "admin.log.locationDescription": "ログファイルを指定します。空欄の場合には、./logs/mattermostのmattermost.logに設定されます。また、ログローテーションが有効になり、10,000行毎に同じディレクトリーに新しいファイルを作成します。ファイル名は、例えば、mattermost.2015-09-23.001、mattermost.2015-09-23.002のようになります。",
+  "admin.log.locationDescription": "ログファイルの場所。空欄の場合、./logsディレクトリーに保存されます。Mattermostが書き込み権限を持っており、かつ存在するパスでなくてはなりません。",
   "admin.log.locationPlaceholder": "ファイルの場所を入力してください",
   "admin.log.locationTitle": "ログファイルの出力ディレクトリー:",
   "admin.log.logSettings": "LDAPの設定",
@@ -691,7 +696,7 @@
   "admin.service.corsTitle": "クロスオリジンリクエストを許可する:",
   "admin.service.developerDesc": "有効にした場合、JavaScriptのエラーはユーザーインターフェイス上部の赤いバーに表示されます。本番環境での使用はお勧めできません。 ",
   "admin.service.developerTitle": "開発者モードを有効にする: ",
-  "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
+  "admin.service.enforcMfaTitle": "多要素認証を有効にする:",
   "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へ転送します",
@@ -725,7 +730,7 @@
   "admin.service.sessionCacheDesc": "セッションをメモリーにキャッシュしておく期間(分)です。",
   "admin.service.sessionDaysEx": "例: \"30\"",
   "admin.service.siteURL": "サイトURL:",
-  "admin.service.siteURLDescription": "ユーザーがMattermostへアクセスするために使用する、ポート番号とプロトコルを含むURLです。<b>通知 > 電子メール</b>の電子メールバッチ処理を設定しない限り、空欄にしてください。空欄の場合、URLは内向きのアクセスに基づいて自動的に設定されます。",
+  "admin.service.siteURLDescription": "ユーザーがMattermostにアクセスするために使用するポート番号とプロトコルを含んだURLです。この設定は必須です。",
   "admin.service.siteURLExample": "例: \"https://mattermost.example.com:1234\"",
   "admin.service.ssoSessionDays": "シングルサインオンのセッション維持期間 (日数):",
   "admin.service.ssoSessionDaysDesc": "ユーザーが最後に認証情報を入力したときから、そのユーザーのセッションが期限切れとなるまでの日数です。SAMLかGitLabによる認可の場合、SAMLかGitLabに既にログインしていれば、ユーザーは自動的にMattermostへ再ログインされます。この設定を変更した場合、次にユーザーが認証情報を入力してから有効になります。",
@@ -743,11 +748,11 @@
   "admin.service.webhooksTitle": "内向きのウェブフックを有効にする: ",
   "admin.service.writeTimeout": "Writeタイムアウト:",
   "admin.service.writeTimeoutDescription": "HTTP(安全でない)を使用している場合、これはリクエストヘッダーの読み込みが完了してからレスポンスが書き込まれるまでの上限となる時間です。HTTPSを使用している場合、接続が受け付けられてからレスポンスが書き込まれるまでの合計時間です。",
-  "admin.sidebar.addTeamSidebar": "Add team from sidebar menu",
+  "admin.sidebar.addTeamSidebar": "サイドバーメニューからチームを追加する",
   "admin.sidebar.advanced": "詳細",
   "admin.sidebar.audits": "コンプライアンスと監査",
   "admin.sidebar.authentication": "認証",
-  "admin.sidebar.cluster": "高可用(ベータ版)",
+  "admin.sidebar.cluster": "高可用",
   "admin.sidebar.compliance": "コンプライアンス",
   "admin.sidebar.configuration": "設定",
   "admin.sidebar.connections": "接続",
@@ -784,7 +789,7 @@
   "admin.sidebar.push": "モバイルプッシュ",
   "admin.sidebar.rateLimiting": "投稿頻度制限",
   "admin.sidebar.reports": "リポート",
-  "admin.sidebar.rmTeamSidebar": "Remove team from sidebar menu",
+  "admin.sidebar.rmTeamSidebar": "サイドバーメニューからチームを削除する",
   "admin.sidebar.saml": "SAML",
   "admin.sidebar.security": "セキュリティー",
   "admin.sidebar.sessions": "セッション",
@@ -794,7 +799,7 @@
   "admin.sidebar.statistics": "チームの統計",
   "admin.sidebar.storage": "ストレージ",
   "admin.sidebar.support": "法的事項とサポート",
-  "admin.sidebar.teams": "TEAMS ({count, number})",
+  "admin.sidebar.teams": "チーム ({count, number})",
   "admin.sidebar.users": "ユーザー",
   "admin.sidebar.usersAndTeams": "ユーザーとチーム",
   "admin.sidebar.view_statistics": "システムの使用統計",
@@ -880,8 +885,8 @@
   "admin.team_analytics.activeUsers": "投稿実績のあるアクティブユーザー",
   "admin.team_analytics.totalPosts": "総投稿数",
   "admin.true": "有効",
-  "admin.userList.title": "Users for {team}",
-  "admin.userList.title2": "Users for {team} ({count})",
+  "admin.userList.title": "{team}のユーザー",
+  "admin.userList.title2": "{team}のユーザー({count})",
   "admin.user_item.authServiceEmail": "<strong>サインイン方法:</strong> 電子メール",
   "admin.user_item.authServiceNotEmail": "<strong>サインイン方法:</strong> {service}",
   "admin.user_item.confirmDemoteDescription": "システム管理者を辞任する際に、他にシステム管理者の権限を持っているユーザーがいない場合、システム管理者の権限を再設定するには、Mattermostサーバーにターミナルでアクセスし、以下のコマンドを実行してください。",
@@ -895,13 +900,14 @@
   "admin.user_item.makeMember": "メンバーにする",
   "admin.user_item.makeSysAdmin": "システム管理者にする",
   "admin.user_item.makeTeamAdmin": "チーム管理者にする",
+  "admin.user_item.manageTeams": "チーム管理",
   "admin.user_item.member": "メンバー",
   "admin.user_item.mfaNo": "<strong>多要素認証</strong>: 使用しない",
   "admin.user_item.mfaYes": "<strong>多要素認証</strong>: 使用する",
   "admin.user_item.resetMfa": "多要素認証を削除する",
   "admin.user_item.resetPwd": "パスワードを初期化する",
   "admin.user_item.switchToEmail": "電子メールアドレス/パスワードに切り替える",
-  "admin.user_item.sysAdmin": "System Admin",
+  "admin.user_item.sysAdmin": "システム管理者",
   "admin.user_item.teamAdmin": "チーム管理者",
   "admin.webrtc.enableDescription": "有効な場合、Mattermostは<strong>1対1</strong>のビデオ通話を可能にします。WebRTC通話は、ChromeとFirefox、Mattermostデスクトップアプリで利用可能です。",
   "admin.webrtc.enableTitle": "Mattermost WebRTCを有効にする: ",
@@ -994,8 +1000,8 @@
   "audit_table.attemptedWebhookDelete": "ウェブフックを削除しました",
   "audit_table.by": " {username}による",
   "audit_table.byAdmin": " システム管理者による",
-  "audit_table.channelCreated": "{channelName}チャンネル/グループを作成しました",
-  "audit_table.channelDeleted": "URL {url}のチャンネル/グループを削除しました",
+  "audit_table.channelCreated": "{channelName} チャンネルを作成しました",
+  "audit_table.channelDeleted": "URL {url} のチャンネルを削除しました",
   "audit_table.establishedDM": "{username}のダイレクトメッセージチャンネルを作成しました",
   "audit_table.failedExpiredLicenseAdd": "有効期間外のため新しいライセンスを追加できませんでした",
   "audit_table.failedInvalidLicenseAdd": "不正なライセンスを追加できませんでした",
@@ -1004,14 +1010,14 @@
   "audit_table.failedPassword": "パスワードの変更に失敗しました - OAuthでログインしていたユーザーのパスワードを更新しようとしました",
   "audit_table.failedWebhookCreate": "ウェブフックの作成に失敗しました - チャンネルへの権限が不正です",
   "audit_table.failedWebhookDelete": "ウェブフックの削除に失敗しました - 不適切な状態です",
-  "audit_table.headerUpdated": "{channelName}チャンネル/グループヘッダーを更新しました",
+  "audit_table.headerUpdated": "{channelName} チャンネルのヘッダーを更新しました",
   "audit_table.ip": "IPアドレス",
   "audit_table.licenseRemoved": "ライセンスが正常に削除されました",
   "audit_table.loginAttempt": " (ログイン試行)",
   "audit_table.loginFailure": " (ログイン失敗)",
   "audit_table.logout": "ログアウトしました",
   "audit_table.member": "メンバー",
-  "audit_table.nameUpdated": "{channelName}チャンネル/グループの名称を更新しました",
+  "audit_table.nameUpdated": "{channelName} チャンネルの名称を更新しました",
   "audit_table.oauthTokenFailed": "OAuthアクセストークン{token}の取得に失敗しました",
   "audit_table.revokedAll": "チームの現在の全てのセッションを削除しました",
   "audit_table.sentEmail": "パスワードを初期化するために{email}へ電子メールを送信しました",
@@ -1030,9 +1036,9 @@
   "audit_table.updateGlobalNotifications": "システム全体に関する通知の設定を更新しました",
   "audit_table.updatePicture": "プロフィール画像を更新しました",
   "audit_table.updatedRol": "ユーザーの役割を変更しました。変更後: ",
-  "audit_table.userAdded": "{username}を{channelName}チャンネル/グループに追加ししました",
+  "audit_table.userAdded": "{username} を {channelName} チャンネルに追加しました",
   "audit_table.userId": "ユーザーID",
-  "audit_table.userRemoved": "{username}を{channelName}チャンネル/グループから削除しました",
+  "audit_table.userRemoved": "{username} を {channelName} チャンネルから削除しました",
   "audit_table.verified": "電子メールアドレスを確認しました",
   "authorize.access": "<strong>{appName}</strong>のアクセスを許可しますか?",
   "authorize.allow": "許可する",
@@ -1059,20 +1065,17 @@
   "channelHeader.removeFromFavorites": "お気に入りから削除する",
   "channel_flow.alreadyExist": "このURLを持つチャンネルは既に存在しています",
   "channel_flow.changeUrlDescription": "URLで使用できない文字が使われている場合、削除されます。",
-  "channel_flow.changeUrlTitle": "Change {term} URL",
-  "channel_flow.channel": "Channel",
-  "channel_flow.create": "非公開チャンネル",
-  "channel_flow.group": "Group",
+  "channel_flow.changeUrlTitle": "チャンネルURLを変更する",
+  "channel_flow.create": "チャンネルを作成する",
   "channel_flow.handleTooShort": "チャンネルURLは2文字以上の小文字の英数字にしてください",
   "channel_flow.invalidName": "不正なチャンネル名です",
-  "channel_flow.set_url_title": "Set {term} URL",
+  "channel_flow.set_url_title": "チャンネルURLを設定する",
   "channel_header.addMembers": "メンバーを追加する",
   "channel_header.addToFavorites": "お気に入りに追加する",
-  "channel_header.channel": "Channel",
+  "channel_header.channel": "チャンネル",
   "channel_header.channelHeader": "チャンネルヘッダーを編集する",
   "channel_header.delete": "チャンネルを削除する",
   "channel_header.flagged": "フラグの立てられた投稿",
-  "channel_header.group": "Group",
   "channel_header.leave": "チャンネルから脱退する",
   "channel_header.manageMembers": "メンバーを管理する",
   "channel_header.notificationPreferences": "通知の設定",
@@ -1080,7 +1083,7 @@
   "channel_header.removeFromFavorites": "お気に入りから削除する",
   "channel_header.rename": "チャンネル名を変更する",
   "channel_header.setHeader": "チャンネルヘッダーを編集する",
-  "channel_header.setPurpose": "Edit {term} Purpose",
+  "channel_header.setPurpose": "チャンネルの目的を編集する",
   "channel_header.viewInfo": "情報を表示する",
   "channel_header.viewMembers": "メンバーを見る",
   "channel_header.webrtc.call": "ビデオ通話の開始",
@@ -1108,33 +1111,31 @@
   "channel_loader.wrote": " が書きました: ",
   "channel_members_dropdown.channel_admin": "チャンネル管理者",
   "channel_members_dropdown.channel_member": "チャンネルのメンバー",
-  "channel_members_dropdown.make_channel_admin": "チャンネル管理者を作成する",
-  "channel_members_dropdown.make_channel_member": "チャンネルメンバーを作成する",
+  "channel_members_dropdown.make_channel_admin": "チャンネル管理者にする",
+  "channel_members_dropdown.make_channel_member": "チャンネルメンバーにする",
   "channel_members_dropdown.remove_from_channel": "チャンネルから削除する",
   "channel_members_dropdown.remove_member": "メンバーを削除する",
   "channel_members_modal.addNew": " 新しいメンバーを追加する",
   "channel_members_modal.members": " メンバー",
   "channel_modal.cancel": "キャンセル",
-  "channel_modal.channel": "Channel",
   "channel_modal.createNew": "新しいチャンネルを作成する",
-  "channel_modal.descriptionHelp": "この{term}がどのように使われるべきか説明してください。",
+  "channel_modal.descriptionHelp": "このチャンネルがどのように使われるべきか説明してください。",
   "channel_modal.displayNameError": "チャンネル名は2文字以上にしてください",
   "channel_modal.edit": "編集する",
-  "channel_modal.group": "Group",
   "channel_modal.header": "ヘッダー",
   "channel_modal.headerEx": "例: \"[Link Title](http://example.com)\"",
-  "channel_modal.headerHelp": "{term}名の近くの{term}のヘッダー部分に表示されるテキストを設定してください。例えば、よく入力されるリンク [リンクのタイトル](http://example.com) などを含めてください。",
-  "channel_modal.modalTitle": "New ",
+  "channel_modal.headerHelp": "チャンネル名近くのヘッダー部に表示されるテキストを設定してください。例えば、よく利用されるリンクを [リンクのタイトル](http://example.com) と入力してください。",
+  "channel_modal.modalTitle": "新しいチャンネル",
   "channel_modal.name": "名前",
   "channel_modal.nameEx": "例: \"Bugs\", \"Marketing\", \"客户支持\"",
   "channel_modal.optional": "(オプション)",
-  "channel_modal.privateGroup1": "ユーザーを制限した非公開グループを作成します。 ",
-  "channel_modal.privateGroup2": "公開チャンネルを作成する",
+  "channel_modal.privateGroup1": "メンバーを制限した非公開チャンネルを作成します。 ",
+  "channel_modal.privateGroup2": "非公開チャンネルを作成する",
   "channel_modal.publicChannel1": "公開チャンネルを作成する",
   "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})",
@@ -1229,11 +1230,9 @@
   "custom_emoji.search": "カスタム絵文字を検索",
   "default_channel.purpose": "全員に見てほしいメッセージをここに投稿して下さい。チームに参加すると、全員が自動的にこのチャンネルのメンバーになります。",
   "delete_channel.cancel": "キャンセル",
-  "delete_channel.channel": "channel",
   "delete_channel.confirm": "チャンネルの削除を確認する",
   "delete_channel.del": "削除",
-  "delete_channel.group": "group",
-  "delete_channel.question": "チームからチャンネルを削除し、全てのユーザーがチャンネルの内容にアクセスできないようになります。本当に {display_name} {term} を削除しますか？",
+  "delete_channel.question": "チームからチャンネルを削除し、全てのユーザーがチャンネルの内容にアクセスできないようになります。本当に {display_name} チャンネルを削除しますか？",
   "delete_post.cancel": "キャンセル",
   "delete_post.comment": "コメント",
   "delete_post.confirm": "{term}の削除を確認する",
@@ -1247,11 +1246,9 @@
   "edit_channel_header_modal.save": "保存する",
   "edit_channel_header_modal.title": "{channel}のヘッダーを編集する",
   "edit_channel_header_modal.title_dm": "ヘッダーを編集する",
-  "edit_channel_purpose_modal.body": "この{type}をどう使うかを説明してください。このテキストはチャンネル一覧の「詳細」メニューで表示され、他の人が参加するかどうか判断するのに使われます。",
+  "edit_channel_purpose_modal.body": "このチャンネルをどのように使うべきか説明してください。このテキストはチャンネル一覧の「詳細」メニューに表示され、他の人が参加するかどうか判断するのに使われます。",
   "edit_channel_purpose_modal.cancel": "キャンセル",
-  "edit_channel_purpose_modal.channel": "Channel",
   "edit_channel_purpose_modal.error": "このチャンネルの目的は長過ぎます。短くしてください",
-  "edit_channel_purpose_modal.group": "Group",
   "edit_channel_purpose_modal.save": "保存する",
   "edit_channel_purpose_modal.title1": "目的を編集する",
   "edit_channel_purpose_modal.title2": "目的を編集する。対象: ",
@@ -1302,12 +1299,14 @@
   "error.not_found.link_message": "Mattermostに戻る",
   "error.not_found.message": "あなたがアクセスしようしたページは存在しません",
   "error.not_found.title": "ページが見つかりません",
-  "error.not_supported.message": "プライベートブラウジングはサポートされていません",
-  "error.not_supported.title": "ブラウザーはサポートされていません",
   "error_bar.expired": "エンタープライズライセンスが期限切れのため、いくつかの機能が無効になります。<a href='{link}' target='_blank'>こちらから更新してください</a>。",
   "error_bar.expiring": "エンタープライズライセンスは {date} に有効期限が切れました。<a href='{link}' target='_blank'>こちらから更新してください</a>。",
   "error_bar.past_grace": "エンタープライズライセンスが期限切れのため、いくつかの機能が無効になります。詳細についてはシステム管理者に問い合わせてください。",
   "error_bar.preview_mode": "プレビューモード: 電子メール通知は設定されていません",
+  "error_bar.site_url": "{link} 内の {docsLink} を設定してください。",
+  "error_bar.site_url.docsLink": "サイトURL:",
+  "error_bar.site_url.link": "システムコンソール",
+  "error_bar.site_url_gitlab": "システムコンソール内、もしくはGitLab Mattermostを利用している場合はgitlab.rb内の {docsLink} を設定してください。",
   "file_attachment.download": "ダウンロードする",
   "file_info_preview.size": "サイズ ",
   "file_info_preview.type": "ファイル形式 ",
@@ -1547,7 +1546,7 @@
   "intro_messages.inviteOthers": "他の人をこのチームに招待する",
   "intro_messages.noCreator": "ここは{name} {type}のはじまりです。{date}に作成されました。",
   "intro_messages.offTopic": "<h4 class=\"channel-intro__title\">{display_name}のはじまり</h4><p class=\"channel-intro__content\">ここは{display_name}のはじまりです。仕事に関係のない会話に使ってください。<br/></p>",
-  "intro_messages.onlyInvited": " 招待されたメンバーだけがこの非公開グループを見ることができます。",
+  "intro_messages.onlyInvited": " 招待されたメンバーだけがこの非公開チャンネルを見ることができます。",
   "intro_messages.purpose": " この{type}の目的: {purpose}",
   "intro_messages.setHeader": "ヘッダーを設定する",
   "intro_messages.teammate": "あなたのダイレクトメッセージの履歴の最初です。ダイレクトメッセージとそこで共有されているファイルは、この領域の外のユーザーからは見ることができません。",
@@ -1563,7 +1562,7 @@
   "invite_member.modalButton": "破棄してかまわない",
   "invite_member.modalMessage": "未送信の招待状があります。破棄してよろしいですか?",
   "invite_member.modalTitle": "招待状を破棄しますか?",
-  "invite_member.newMember": "新しいメンバーを招待",
+  "invite_member.newMember": "招待メールを送信",
   "invite_member.send": "招待状を送信する",
   "invite_member.send2": "招待状を送信する",
   "invite_member.sending": " 送信しています",
@@ -1573,7 +1572,7 @@
   "ldap_signup.length_error": "名称は3文字以上15文字以下にしてください",
   "ldap_signup.teamName": "新しいチーム名を入力してください",
   "ldap_signup.team_error": "チーム名を入力してください",
-  "leave_team_modal.desc": "全ての公開チャンネルと非公開グループから脱退します。  チームが非公開な場合、再度参加することはできません。  実行してよろしいですか?",
+  "leave_team_modal.desc": "全ての公開チャンネルと非公開チャンネルから脱退します。  チームが非公開な場合、再度参加することはできません。  実行してよろしいですか?",
   "leave_team_modal.no": "いいえ",
   "leave_team_modal.title": "チームから脱退しますか?",
   "leave_team_modal.yes": "はい",
@@ -1648,7 +1647,7 @@
   "mobile.account_notifications.threads_mentions": "スレッド内のあなたについての投稿",
   "mobile.account_notifications.threads_start": "自分で開始したスレッド",
   "mobile.account_notifications.threads_start_participate": "開始もしくは参加したスレッド",
-  "mobile.channel_info.alertMessageDeleteChannel": "{term} {name} から本当に脱退しますか?",
+  "mobile.channel_info.alertMessageDeleteChannel": "{name} という名前の {term} を本当に削除しますか?",
   "mobile.channel_info.alertMessageLeaveChannel": "{term} {name} から本当に脱退しますか?",
   "mobile.channel_info.alertNo": "いいえ",
   "mobile.channel_info.alertTitleDeleteChannel": "{term} を削除する",
@@ -1676,7 +1675,7 @@
   "mobile.components.select_server_view.proceed": "続行する",
   "mobile.components.select_server_view.siteUrlPlaceholder": "https://mattermost.example.com",
   "mobile.create_channel": "作成する",
-  "mobile.create_channel.private": "新しい非公開グループ",
+  "mobile.create_channel.private": "新しい非公開チャンネル",
   "mobile.create_channel.public": "新しい公開チャンネル",
   "mobile.custom_list.no_results": "該当するものはありません",
   "mobile.edit_post.title": "メッセージ編集中",
@@ -1724,8 +1723,8 @@
   "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.new_convo_note": "新しい会話を始めます。多くの人々を追加する場合、非公開チャンネルの作成を検討してください。",
+  "more_direct_channels.new_convo_note.full": "この会話に参加できる人数の最大数に達しました。代わりに非公開チャンネルを作成することを検討してください。",
   "more_direct_channels.title": "ダイレクトメッセージ",
   "msg_typing.areTyping": "{users}と{last}が入力しています…",
   "msg_typing.isTyping": "{user}が入力しています…",
@@ -1751,12 +1750,13 @@
   "navbar.viewPinnedPosts": "ピン止めされた投稿を見る",
   "navbar_dropdown.about": "Mattermostについて",
   "navbar_dropdown.accountSettings": "アカウントの設定",
+  "navbar_dropdown.addMemberToTeam": "メンバーをチームに追加",
   "navbar_dropdown.console": "システムコンソール",
   "navbar_dropdown.create": "新しいチームを作成する",
   "navbar_dropdown.emoji": "カスタム絵文字",
   "navbar_dropdown.help": "ヘルプ",
   "navbar_dropdown.integrations": "統合機能",
-  "navbar_dropdown.inviteMember": "新しいメンバーを招待",
+  "navbar_dropdown.inviteMember": "招待メールを送信",
   "navbar_dropdown.join": "別のチームに参加する",
   "navbar_dropdown.leave": "チームを脱退する",
   "navbar_dropdown.logout": "ログアウト",
@@ -1788,6 +1788,7 @@
   "pending_post_actions.cancel": "キャンセル",
   "pending_post_actions.retry": "再試行",
   "permalink.error.access": "削除されたメッセージまたはアクセス権限のないチャンネルへのパーマリンクです。",
+  "permalink.error.title": "メッセージが見付かりません",
   "post_attachment.collapse": "表示を少なくする",
   "post_attachment.more": "さらに表示",
   "post_body.commentedOn": "{name}{apostrophe}のメッセージにコメントしました: ",
@@ -1867,7 +1868,7 @@
   "search_header.results": "検索結果",
   "search_header.title2": "最近のあなたについての投稿",
   "search_header.title3": "フラグの立てられた投稿",
-  "search_header.title4": "{channelDisplayName}チャンネルに投稿をピン止めする",
+  "search_header.title4": "{channelDisplayName}チャンネルにピン止めされた投稿",
   "search_item.direct": "ダイレクトメッセージ({username}を参照)",
   "search_item.jump": "ジャンプする",
   "search_results.because": "<ul><li>語句の一部を検索するには*を付けてください(\"reach\"や\"reaction\"を検索するのに\"rea\"を使う場合等)</li><li>検索結果の件数によっては、2文字の検索、一般的な\"this\"や\"a\"、\"is\"は表示されません</li></ul>",
@@ -1892,8 +1893,8 @@
   "setting_upload.noFile": "ファイルが選択されていません。",
   "setting_upload.select": "ファイルを選択してください",
   "sidebar.channels": "チャンネル",
-  "sidebar.createChannel": "公開チャンネルを作成する",
-  "sidebar.createGroup": "Create new group",
+  "sidebar.createChannel": "新しい公開チャンネルを作成する",
+  "sidebar.createGroup": "新しい非公開チャンネルを作成する",
   "sidebar.direct": "ダイレクトメッセージ",
   "sidebar.favorite": "お気に入り",
   "sidebar.more": "もっと",
@@ -1901,17 +1902,18 @@
   "sidebar.otherMembers": "このチームの外側",
   "sidebar.pg": "非公開チャンネル",
   "sidebar.removeList": "一覧から削除する",
-  "sidebar.tutorialScreen1": "<h4>チャンネル</h4><p><strong>チャンネル</strong>は様々な話題についての会話を扱います。チャンネルはあなたのチームの全員が読み書き可能です。個人的なコミュニケーションには特定の一人との場合には<strong>ダイレクトメッセージ</strong>を、複数の人との場合には<strong>非公開グループ</strong>を使ってください。</p>",
+  "sidebar.tutorialScreen1": "<h4>チャンネル</h4><p><strong>チャンネル</strong>は様々な話題についての会話を扱います。チャンネルはあなたのチームの全員が読み書き可能です。個人的なコミュニケーションを行う場合、特定の一人との場合には<strong>ダイレクトメッセージ</strong>を、複数の人との場合には<strong>非公開チャンネル</strong>を使用してください。</p>",
   "sidebar.tutorialScreen2": "<h4>\"{townsquare}\"と\"{offtopic}\"チャンネル</h4><p>以下は最初にふさわしい2つの公開チャンネルです</p><p><strong>{townsquare}</strong>は、チーム内のコミュニケーションのための場所です、あなたのチームの全員が参加しています。</p><p><strong>{offtopic}</strong>は仕事と関係のない楽しみとユーモアのための場所です。あなたとチームは、他のチャンネルを作るか決めることができます。</p>",
-  "sidebar.tutorialScreen3": "<h4>チャンネルの作成と参加</h4><p><strong>「もっと…」</strong>をクリックすることで新しいチャンネルを作成したり既存のチャンネルに参加することができます。</p><p>チャンネルや非公開グループのヘッダーの隣にある<strong>「+」記号</strong>をクリックすることで、新しいチャンネルや非公開グループを作成することができます。</p>",
+  "sidebar.tutorialScreen3": "<h4>チャンネルの作成と参加</h4><p><strong>「もっと…」</strong>をクリックすることで新しいチャンネルを作成したり既存のチャンネルに参加することができます。</p><p>公開/非公開チャンネルのヘッダーの隣にある<strong>「+」記号</strong>をクリックすることで、新しいチャンネルを作成することができます。</p>",
   "sidebar.unreadAbove": "上の未読へ",
   "sidebar.unreadBelow": "下の未読へ",
   "sidebar_header.tutorial": "<h4>メインメニュー</h4><p><strong>メインメニュー</strong>は、<strong>メンバーを招待したり</strong><strong>アカウントの設定</strong>にアクセスしたり、<strong>テーマ色</strong>を設定したりする場所です。</p><p>チーム管理者は<strong>チームの設定</strong>にもこのメニューからアクセスすることができます。</p><p>システム管理者には、システム全体を設定する<strong>システムコンソール</strong>へのリンクもここに表示されます。</p>",
   "sidebar_right_menu.accountSettings": "アカウントの設定",
+  "sidebar_right_menu.addMemberToTeam": "メンバーをチームに追加",
   "sidebar_right_menu.console": "システムコンソール",
   "sidebar_right_menu.flagged": "フラグの立てられた投稿",
   "sidebar_right_menu.help": "ヘルプ",
-  "sidebar_right_menu.inviteNew": "新しいメンバーを招待",
+  "sidebar_right_menu.inviteNew": "招待メールを送信",
   "sidebar_right_menu.logout": "ログアウト",
   "sidebar_right_menu.manageMembers": "メンバーを管理する",
   "sidebar_right_menu.nativeApps": "アプリをダウンロードする",
@@ -2035,7 +2037,7 @@
   "tutorial_intro.mobileAppsLinkText": "PC / Mac / iOS / Android",
   "tutorial_intro.next": "次へ",
   "tutorial_intro.screenOne": "<h3>ようこそ</h3><h1>Mattermostへ</h1><p>あなたのチームの全てのコミュニケーションを一箇所で、すぐに検索可能で、どこからでもアクセスできるものにします。</p><p>チームがつながり、互いに助け合うことで、大切なこと(what matters most)を成し遂げましょう</p>",
-  "tutorial_intro.screenTwo": "<h3>Mattermostの使い方</h3><p>公開チャンネル、非公開グループ、ダイレクトメッセージでコミュニケーションします。</p><p>全てがアーカイブされ、ウェブにアクセスできるデスクトップ、ラップトップ、スマートフォンのいずれからでも検索できます。</p>",
+  "tutorial_intro.screenTwo": "<h3>Mattermostの使い方</h3><p>公開チャンネル、非公開チャンネル、ダイレクトメッセージでコミュニケーションを行います。</p><p>全てがアーカイブされ、ウェブにアクセスできるデスクトップ、ラップトップ、スマートフォンのいずれからでも検索できます。</p>",
   "tutorial_intro.skip": "チュートリアルをスキップする",
   "tutorial_intro.support": "必要なことがあったら、電子メールを出してください: ",
   "tutorial_intro.teamInvite": "チームメイトを招待する",
@@ -2055,7 +2057,7 @@
   "upload_overlay.info": "ファイルをアップロードするためにドラッグアンドドロップします。",
   "user.settings.advance.embed_preview": "メッセージ内の最初のWebのリンクについて、可能ならばそのメッセージの下にWebサイトの内容のプレビューを表示します",
   "user.settings.advance.embed_toggle": "全ての埋め込まれたプレビューの表示非表示を切り替える",
-  "user.settings.advance.emojipicker": "メッセージ入力ボックスで絵文字選択を有効にする",
+  "user.settings.advance.emojipicker": "リアクションとメッセージ入力ボックスでの絵文字選択を有効にする",
   "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Feature} other {Features}}が有効化されました",
   "user.settings.advance.formattingDesc": "オンにした場合、投稿は、リンクを作成したり、絵文字を表示したり、テキストに書式を設定したり、改行したりされます。デフォルトではオンに設定されています。この設定を変更した場合には、ページを再読み込みしてください。",
   "user.settings.advance.formattingTitle": "投稿の書式設定",
@@ -2185,7 +2187,7 @@
   "user.settings.languages.change": "インターフェイスの言語を変更する",
   "user.settings.languages.promote": "ユーザーインターフェイスでMattermostが表示する言語を選択してください。<br /><br />翻訳を手伝っていただけますか？ 是非、<a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a>に参加してください。",
   "user.settings.mfa.add": "多要素認証をあなたのアカウントに追加する",
-  "user.settings.mfa.addHelp": "他要素認証を追加するとサインインの度にあなたの携帯電話からコードの入力が求められるため、あなたのアカウントがより安全になります。",
+  "user.settings.mfa.addHelp": "多要素認証を追加するとサインインの度にあなたの携帯電話からコードの入力が求められるため、あなたのアカウントがより安全になります。",
   "user.settings.mfa.addHelpQr": "スマートフォンのGoogle AuthenticatorアプリでQRコードをスキャンし、アプリから提供されるトークンを入力してください。コードをスキャンできない場合、秘密情報を手入力することができます。",
   "user.settings.mfa.enterToken": "トークン(メンバーのみ)",
   "user.settings.mfa.qrCode": "QRコード",
diff --git a/webapp/i18n/ko.json b/webapp/i18n/ko.json
index af93d30bcf..59bca59088 100644
--- a/webapp/i18n/ko.json
+++ b/webapp/i18n/ko.json
@@ -137,7 +137,8 @@
   "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Choose when to trigger the outgoing webhook; if the first word of a message matches a Trigger Word exactly, or if it starts with a Trigger Word.",
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "First word matches a trigger word exactly",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "First word starts with a trigger word",
-  "admin.advance.cluster": "고 가용성 (베타)",
+  "add_users_to_team.title": "Add New Members To {teamName} Team",
+  "admin.advance.cluster": "High Availability",
   "admin.advance.metrics": "Performance Monitoring",
   "admin.audits.reload": "사용자 활동 기록 새로고침",
   "admin.audits.title": "사용자 활동 기록",
@@ -282,6 +283,8 @@
   "admin.email.requireVerificationDescription": "Typically set to true in production. When true, Mattermost requires email verification after account creation prior to allowing login. Developers may set this field to false so skip sending verification emails for faster development.",
   "admin.email.requireVerificationTitle": "이메일 검증: ",
   "admin.email.selfPush": "Manually enter Push Notification Service location",
+  "admin.email.skipServerCertificateVerification.description": "When true, Mattermost will not verify the email server certificate.",
+  "admin.email.skipServerCertificateVerification.title": "인증서 검증 생략",
   "admin.email.smtpPasswordDescription": " Obtain this credential from administrator setting up your email server.",
   "admin.email.smtpPasswordExample": "예시 \"yourpassword\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.email.smtpPasswordTitle": "SMTP 서버 패스워드:",
@@ -328,13 +331,15 @@
   "admin.general.policy.permissionsSystemAdmin": "시스템 관리자",
   "admin.general.policy.restrictPostDeleteDescription": "Set policy on who has permission to delete messages.",
   "admin.general.policy.restrictPostDeleteTitle": "Allow which users to delete messages:",
-  "admin.general.policy.restrictPrivateChannelCreationDescription": "Set policy on who can create private groups.",
-  "admin.general.policy.restrictPrivateChannelCreationTitle": "Enable private group creation for:",
+  "admin.general.policy.restrictPrivateChannelCreationDescription": "Set policy on who can create private channels.",
+  "admin.general.policy.restrictPrivateChannelCreationTitle": "Enable private channel creation for:",
   "admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "command line tool",
-  "admin.general.policy.restrictPrivateChannelDeletionDescription": "Set policy on who can delete private groups. Deleted groups can be recovered from the database using a {commandLineToolLink}.",
-  "admin.general.policy.restrictPrivateChannelDeletionTitle": "Enable private group deletion for:",
+  "admin.general.policy.restrictPrivateChannelDeletionDescription": "Set policy on who can delete private channels. Deleted channels can be recovered from the database using a {commandLineToolLink}.",
+  "admin.general.policy.restrictPrivateChannelDeletionTitle": "Enable private channel deletion for:",
+  "admin.general.policy.restrictPrivateChannelManageMembersDescription": "Set policy on who can add and remove members from private channels.",
+  "admin.general.policy.restrictPrivateChannelManageMembersTitle": "Enable managing of private channel members for:",
   "admin.general.policy.restrictPrivateChannelManagementDescription": "Set policy on who can create, delete, rename, and set the header or purpose for public channels.",
-  "admin.general.policy.restrictPrivateChannelManagementTitle": "Enable private group renaming for:",
+  "admin.general.policy.restrictPrivateChannelManagementTitle": "Enable private channel renaming for:",
   "admin.general.policy.restrictPublicChannelCreationDescription": "Set policy on who can create public channels.",
   "admin.general.policy.restrictPublicChannelCreationTitle": "Enable public channel creation for:",
   "admin.general.policy.restrictPublicChannelDeletionCommandLineToolLink": "command line tool",
@@ -506,7 +511,7 @@
   "admin.log.enableDiagnosticsDescription": "Enable this feature to improve the quality and performance of Mattermost by sending error reporting and diagnostic information to Mattermost, Inc. Read our <a href=\"https://about.mattermost.com/default-privacy-policy/\" target=\"_blank\">privacy policy</a> to learn more.",
   "admin.log.enableWebhookDebugging": "Webhook 디버깅 활성화:",
   "admin.log.enableWebhookDebuggingDescription": "비활성화하면 incoming webhook의 모든 요청 내용이 디버그 로그에 남는 것을 막을 수 있습니다.",
-  "admin.log.fileDescription": "Typically set to true in production.  When true, log files are written to the log file specified in file location field below.",
+  "admin.log.fileDescription": "Typically set to true in production. When true, logged events are written to the mattermost.log file in the directory specified in the File Log Directory field. The logs are rotated at 10,000 lines and archived to a file in the same directory, and given a name with a datestamp and serial number. For example, mattermost.2017-03-31.001.",
   "admin.log.fileLevelDescription": "This setting determines the level of detail at which log events are written to the log file. ERROR: Outputs only error messages. INFO: Outputs error messages and information around startup and initialization. DEBUG: Prints high detail for developers working on debugging issues.",
   "admin.log.fileLevelTitle": "파일 로그 레벨:",
   "admin.log.fileTitle": "Output logs to file: ",
@@ -521,7 +526,7 @@
   "admin.log.formatTitle": "파일 로그 포맷:",
   "admin.log.levelDescription": "This setting determines the level of detail at which log events are written to the console. ERROR: Outputs only error messages. INFO: Outputs error messages and information around startup and initialization. DEBUG: Prints high detail for developers working on debugging issues.",
   "admin.log.levelTitle": "콘솔 로그 레벨:",
-  "admin.log.locationDescription": "File to which log files are written. If blank, will be set to ./logs/mattermost, which writes logs to mattermost.log. Log rotation is enabled and every 10,000 lines of log information is written to new files stored in the same directory, for example mattermost.2015-09-23.001, mattermost.2015-09-23.002, and so forth.",
+  "admin.log.locationDescription": "The location of the log files. If blank, they are stored in the ./logs directory. The path that you set must exist and Mattermost must have write permissions in it.",
   "admin.log.locationPlaceholder": "파일 위치를 지정하세요.",
   "admin.log.locationTitle": "파일 로그 경로:",
   "admin.log.logSettings": "로그 설정",
@@ -691,7 +696,7 @@
   "admin.service.corsTitle": "CORS 요청 허용:",
   "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": "Enforce Multi-factor Authentication:",
+  "admin.service.enforcMfaTitle": "Enable Multi-factor Authentication:",
   "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",
@@ -725,7 +730,7 @@
   "admin.service.sessionCacheDesc": "The number of minutes to cache a session in memory.",
   "admin.service.sessionDaysEx": "예시 \"30\"",
   "admin.service.siteURL": "사이트 URL:",
-  "admin.service.siteURLDescription": "The URL, including port number and protocol, that users will use to access Mattermost. This field can be left blank unless you are configuring email batching in <b>Notifications > Email</b>. When blank, the URL is automatically configured based on incoming traffic.",
+  "admin.service.siteURLDescription": "The URL, including port number and protocol, that users will use to access Mattermost. This setting is required.",
   "admin.service.siteURLExample": "예시 \"https://mattermost.example.com:1234\"",
   "admin.service.ssoSessionDays": "Session length for mobile apps (days):",
   "admin.service.ssoSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. If the authentication method is SAML or GitLab, the user may automatically be logged back in to Mattermost if they are already logged in to SAML or GitLab. After changing this setting, the setting will take effect after the next time the user enters their credentials.",
@@ -747,7 +752,7 @@
   "admin.sidebar.advanced": "고급",
   "admin.sidebar.audits": "활동",
   "admin.sidebar.authentication": "인증",
-  "admin.sidebar.cluster": "고가용성 (베타)",
+  "admin.sidebar.cluster": "High Availability",
   "admin.sidebar.compliance": "감사",
   "admin.sidebar.configuration": "환경설정",
   "admin.sidebar.connections": "연결",
@@ -784,7 +789,7 @@
   "admin.sidebar.push": "모바일 푸시",
   "admin.sidebar.rateLimiting": "Rate Limiting",
   "admin.sidebar.reports": "보고",
-  "admin.sidebar.rmTeamSidebar": "Remove team from sidebar menu",
+  "admin.sidebar.rmTeamSidebar": "사이드바 메뉴에서 팀 제거",
   "admin.sidebar.saml": "SAML",
   "admin.sidebar.security": "보안",
   "admin.sidebar.sessions": "세션",
@@ -794,7 +799,7 @@
   "admin.sidebar.statistics": "통계",
   "admin.sidebar.storage": "저장소",
   "admin.sidebar.support": "지원",
-  "admin.sidebar.teams": "TEAMS ({count, number})",
+  "admin.sidebar.teams": "팀 ({count, number})",
   "admin.sidebar.users": "사용자",
   "admin.sidebar.usersAndTeams": "팀과 사용자",
   "admin.sidebar.view_statistics": "사이트 통계",
@@ -895,13 +900,14 @@
   "admin.user_item.makeMember": "회원으로 변경",
   "admin.user_item.makeSysAdmin": "시스템 관리자로 변경",
   "admin.user_item.makeTeamAdmin": "팀 관리자로 변경",
+  "admin.user_item.manageTeams": "Manage Teams",
   "admin.user_item.member": "회원",
   "admin.user_item.mfaNo": ", <strong>MFA</strong>: 아니요",
   "admin.user_item.mfaYes": ", <strong>MFA</strong>: 예",
   "admin.user_item.resetMfa": "MFA 제거",
   "admin.user_item.resetPwd": "패스워드 리셋",
   "admin.user_item.switchToEmail": "이메일/패스워드로 변경",
-  "admin.user_item.sysAdmin": "System Admin",
+  "admin.user_item.sysAdmin": "시스템 관리자",
   "admin.user_item.teamAdmin": "팀 관리자",
   "admin.webrtc.enableDescription": "When true, Mattermost allows making <strong>one-on-one</strong> video calls. WebRTC calls are available on Chrome, Firefox and Mattermost Desktop Apps.",
   "admin.webrtc.enableTitle": "Mattermost WebRTC: ",
@@ -941,7 +947,7 @@
   "analytics.system.dailyActiveUsers": "Daily Active Users",
   "analytics.system.monthlyActiveUsers": "Monthly Active Users",
   "analytics.system.postTypes": "글, 파일, 해시태그",
-  "analytics.system.privateGroups": "Private Groups",
+  "analytics.system.privateGroups": "채널 떠나기",
   "analytics.system.publicChannels": "공개 채널",
   "analytics.system.skippedIntensiveQueries": "To maximize performance, some statistics are disabled. You can re-enable them in config.json. See: <a href='https://docs.mattermost.com/administration/statistics.html' target='_blank'>https://docs.mattermost.com/administration/statistics.html</a>",
   "analytics.system.textPosts": "텍스트 글 수",
@@ -961,7 +967,7 @@
   "analytics.system.totalWebsockets": "웹소켓 연결",
   "analytics.team.activeUsers": "활성 사용자 (글 작성 기준)",
   "analytics.team.newlyCreated": "Newly Created Users",
-  "analytics.team.privateGroups": "Private Groups",
+  "analytics.team.privateGroups": "채널 떠나기",
   "analytics.team.publicChannels": "공개 채널",
   "analytics.team.recentActive": "Recent Active Users",
   "analytics.team.recentUsers": "Recent Active Users",
@@ -1059,20 +1065,17 @@
   "channelHeader.removeFromFavorites": "즐겨찾기에서 제거",
   "channel_flow.alreadyExist": "이미 존재하는 채널 URL입니다.",
   "channel_flow.changeUrlDescription": "일부 URL로 사용할 수 없는 문자들은 제거될 수 있습니다.",
-  "channel_flow.changeUrlTitle": "Change {term} URL",
-  "channel_flow.channel": "Channel",
+  "channel_flow.changeUrlTitle": "Change Channel URL",
   "channel_flow.create": "채널 떠나기",
-  "channel_flow.group": "Group",
   "channel_flow.handleTooShort": "Channel URL must be 2 or more lowercase alphanumeric characters",
   "channel_flow.invalidName": "잘못된 채널 이름",
-  "channel_flow.set_url_title": "Set {term} URL",
+  "channel_flow.set_url_title": "Set Channel URL",
   "channel_header.addMembers": "회원 추가",
   "channel_header.addToFavorites": "즐겨찾기에 추가",
-  "channel_header.channel": "Channel",
+  "channel_header.channel": "채널",
   "channel_header.channelHeader": "채널 헤더 설정",
   "channel_header.delete": "채널 삭제",
   "channel_header.flagged": "중요 메시지",
-  "channel_header.group": "Group",
   "channel_header.leave": "채널 떠나기",
   "channel_header.manageMembers": "회원 관리",
   "channel_header.notificationPreferences": "알림 설정",
@@ -1080,7 +1083,7 @@
   "channel_header.removeFromFavorites": "즐겨찾기에서 제거",
   "channel_header.rename": "채널 이름 변경",
   "channel_header.setHeader": "채널 헤더 설정",
-  "channel_header.setPurpose": "Edit {term} Purpose",
+  "channel_header.setPurpose": "Edit Channel Purpose",
   "channel_header.viewInfo": "정보 보기",
   "channel_header.viewMembers": "회원 보기",
   "channel_header.webrtc.call": "영상 통화 시작하기",
@@ -1115,16 +1118,14 @@
   "channel_members_modal.addNew": " 새로운 회원 추가",
   "channel_members_modal.members": " 회원",
   "channel_modal.cancel": "취소",
-  "channel_modal.channel": "Channel",
   "channel_modal.createNew": "새로 만들기",
   "channel_modal.descriptionHelp": "{term}은 이렇게 사용되어야 합니다.",
   "channel_modal.displayNameError": "Channel name must be 2 or more characters",
   "channel_modal.edit": "편집",
-  "channel_modal.group": "Group",
   "channel_modal.header": "헤더",
   "channel_modal.headerEx": "E.g.: \"[Link Title](http://example.com)\"",
   "channel_modal.headerHelp": "{term} 상단 이름 옆에 표시될 텍스트를 입력하세요. 예를 들면, 다음과 같이 자주 사용되는 링크를 등록할 수 있습니다. [링크](http://example.com).",
-  "channel_modal.modalTitle": "New ",
+  "channel_modal.modalTitle": "New Channel",
   "channel_modal.name": "이름",
   "channel_modal.nameEx": "예시: \"버그\", \"마케팅\", \"고객지원\"",
   "channel_modal.optional": "(선택사항)",
@@ -1134,7 +1135,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})",
@@ -1229,10 +1230,8 @@
   "custom_emoji.search": "커스텀 이모티콘 검색",
   "default_channel.purpose": "Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.",
   "delete_channel.cancel": "취소",
-  "delete_channel.channel": "channel",
   "delete_channel.confirm": "채널 삭제 확인",
   "delete_channel.del": "삭제",
-  "delete_channel.group": "group",
   "delete_channel.question": "정말 {display_name} {term}을 삭제하시겠습니까?",
   "delete_post.cancel": "취소",
   "delete_post.comment": "답글",
@@ -1249,9 +1248,7 @@
   "edit_channel_header_modal.title_dm": "헤더 편집",
   "edit_channel_purpose_modal.body": "{type}(이)가 어떻게 사용되어야 하는지 설명하세요. 이 설명은 채널 목록의 \"더 보기...\"에서 가입을 위한 도움말로 표시됩니다.",
   "edit_channel_purpose_modal.cancel": "취소",
-  "edit_channel_purpose_modal.channel": "Channel",
   "edit_channel_purpose_modal.error": "채널 설명이 너무 깁니다. 더 짧은 채널 설명을 사용하세요.",
-  "edit_channel_purpose_modal.group": "Group",
   "edit_channel_purpose_modal.save": "저장",
   "edit_channel_purpose_modal.title1": "설명 편집",
   "edit_channel_purpose_modal.title2": "설명 편집: ",
@@ -1302,12 +1299,14 @@
   "error.not_found.link_message": "Mattermost(으)로 돌아가기",
   "error.not_found.message": "The page you were trying to reach does not exist",
   "error.not_found.title": "페이지를 찾을 수 없습니다.",
-  "error.not_supported.message": "비밀모드는 지원되지 않습니다.",
-  "error.not_supported.title": "지원되지 않는 브라우저입니다.",
   "error_bar.expired": "Enterprise license is expired and some features may be disabled. <a href='{link}' target='_blank'>Please renew.</a>",
   "error_bar.expiring": "Enterprise license expires on {date}. <a href='{link}' target='_blank'>Please renew.</a>",
   "error_bar.past_grace": "Enterprise license is expired and some features may be disabled. Please contact your System Administrator for details.",
   "error_bar.preview_mode": "미리보기 모드: 이메일 알림이 설정되지 않았습니다.",
+  "error_bar.site_url": "Please configure your {docsLink} in the {link}.",
+  "error_bar.site_url.docsLink": "사이트 URL:",
+  "error_bar.site_url.link": "관리자 도구",
+  "error_bar.site_url_gitlab": "Please configure your {docsLink} in the System Console or in gitlab.rb if you're using GitLab Mattermost.",
   "file_attachment.download": "다운로드",
   "file_info_preview.size": "용량 ",
   "file_info_preview.type": "파일 형식 ",
@@ -1542,7 +1541,7 @@
   "intro_messages.channel": "채널",
   "intro_messages.creator": "{name} {type}입니다. 만들어진 날짜: {date}.",
   "intro_messages.default": "<h4 class='channel-intro__title'>Beginning of {display_name}</h4><p class='channel-intro__content'><strong>Welcome to {display_name}!</strong><br/><br/>Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.</p>",
-  "intro_messages.group": "private group",
+  "intro_messages.group": "채널 떠나기",
   "intro_messages.invite": "{type}에 사용자 초대하기",
   "intro_messages.inviteOthers": "팀에 사용자 초대하기",
   "intro_messages.noCreator": "{name} {type}입니다. 만들어진 날짜: {date}.",
@@ -1563,7 +1562,7 @@
   "invite_member.modalButton": "네, 취소합니다.",
   "invite_member.modalMessage": "You have unsent invitations, are you sure you want to discard them?",
   "invite_member.modalTitle": "초대를 취소하시겠습니까?",
-  "invite_member.newMember": "회원 초대하기",
+  "invite_member.newMember": "Send Email Invite",
   "invite_member.send": "보내기",
   "invite_member.send2": "보내기",
   "invite_member.sending": " 보내는 중",
@@ -1649,14 +1648,14 @@
   "mobile.account_notifications.threads_start": "Threads that I start",
   "mobile.account_notifications.threads_start_participate": "Threads that I start or participate in",
   "mobile.channel_info.alertMessageDeleteChannel": "정말 {term}을 삭제하시겠습니까?",
-  "mobile.channel_info.alertMessageLeaveChannel": "Are you sure you want to leave the {term} {name}?",
+  "mobile.channel_info.alertMessageLeaveChannel": "정말 {term}을 삭제하시겠습니까?",
   "mobile.channel_info.alertNo": "아니요",
   "mobile.channel_info.alertTitleDeleteChannel": "{term} 삭제...",
   "mobile.channel_info.alertTitleLeaveChannel": "{term} 떠나기",
   "mobile.channel_info.alertYes": "네",
-  "mobile.channel_info.privateChannel": "Private Channel",
+  "mobile.channel_info.privateChannel": "채널 떠나기",
   "mobile.channel_info.publicChannel": "공개 채널",
-  "mobile.channel_list.alertMessageLeaveChannel": "Are you sure you want to leave the {term} {name}?",
+  "mobile.channel_list.alertMessageLeaveChannel": "정말 {term}을 삭제하시겠습니까?",
   "mobile.channel_list.alertNo": "아니요",
   "mobile.channel_list.alertTitleLeaveChannel": "{term} 떠나기",
   "mobile.channel_list.alertYes": "네",
@@ -1667,7 +1666,7 @@
   "mobile.channel_list.open": "Open {term}",
   "mobile.channel_list.openDM": "Open Direct Message",
   "mobile.channel_list.openGM": "Open Group Message",
-  "mobile.channel_list.privateChannel": "Private Channel",
+  "mobile.channel_list.privateChannel": "채널 떠나기",
   "mobile.channel_list.publicChannel": "공개 채널",
   "mobile.components.channels_list_view.yourChannels": "Your channels:",
   "mobile.components.error_list.dismiss_all": "Dismiss All",
@@ -1676,7 +1675,7 @@
   "mobile.components.select_server_view.proceed": "Proceed",
   "mobile.components.select_server_view.siteUrlPlaceholder": "https://mattermost.example.com",
   "mobile.create_channel": "Create",
-  "mobile.create_channel.private": "New Private Group",
+  "mobile.create_channel.private": "채널 떠나기",
   "mobile.create_channel.public": "공개 채널",
   "mobile.custom_list.no_results": "No Results",
   "mobile.edit_post.title": "Editing Message",
@@ -1724,8 +1723,8 @@
   "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.new_convo_note": "This will start a new conversation. If you’re adding a lot of people, consider creating a private channel instead.",
+  "more_direct_channels.new_convo_note.full": "You’ve reached the maximum number of people for this conversation. Consider creating a private channel instead.",
   "more_direct_channels.title": "개인 메시지",
   "msg_typing.areTyping": "{users}, {last}(이)가 입력중입니다...",
   "msg_typing.isTyping": "{user}(이)가 입력중입니다...",
@@ -1751,12 +1750,13 @@
   "navbar.viewPinnedPosts": "View Pinned Posts",
   "navbar_dropdown.about": "Mattermost 정보",
   "navbar_dropdown.accountSettings": "계정 설정",
+  "navbar_dropdown.addMemberToTeam": "Add Members to Team",
   "navbar_dropdown.console": "관리자 도구",
   "navbar_dropdown.create": "팀 만들기",
   "navbar_dropdown.emoji": "커스텀 이모티콘",
   "navbar_dropdown.help": "도움말",
   "navbar_dropdown.integrations": "통합 기능",
-  "navbar_dropdown.inviteMember": "회원 초대",
+  "navbar_dropdown.inviteMember": "Send Email Invite",
   "navbar_dropdown.join": "Join Another Team",
   "navbar_dropdown.leave": "팀 떠나기",
   "navbar_dropdown.logout": "로그아웃",
@@ -1788,6 +1788,7 @@
   "pending_post_actions.cancel": "취소",
   "pending_post_actions.retry": "다시 시도",
   "permalink.error.access": "Permalink belongs to a deleted message or to a channel to which you do not have access.",
+  "permalink.error.title": "Message Not Found",
   "post_attachment.collapse": "Show less...",
   "post_attachment.more": "더 보기...",
   "post_body.commentedOn": "Commented on {name}{apostrophe} message: ",
@@ -1893,13 +1894,13 @@
   "setting_upload.select": "파일 선택",
   "sidebar.channels": "채널",
   "sidebar.createChannel": "공개 채널 만들기",
-  "sidebar.createGroup": "Create new group",
+  "sidebar.createGroup": "공개 채널 만들기",
   "sidebar.direct": "개인 메시지",
   "sidebar.favorite": "즐겨찾기",
   "sidebar.more": "더 보기",
   "sidebar.moreElips": "더 보기...",
   "sidebar.otherMembers": "팀 외부",
-  "sidebar.pg": "Private Groups",
+  "sidebar.pg": "채널 떠나기",
   "sidebar.removeList": "목록에서 제거",
   "sidebar.tutorialScreen1": "<h4>채널</h4><p><strong>채널</strong>을 통해 주제별로 대화를 구성합니다. 팀의 모든 일원에게 공개되어 있습니다. 공개하고 싶지 않은 메시지는 <strong>개인 메시지</strong>나 <strong>비공개 그룹</strong>으로 전달할 수 있습니다. </p>",
   "sidebar.tutorialScreen2": "<h4>\"{townsquare}\" 와 \"{offtopic}\" 채널</h4><p>두 채널과 함께 시작합니다:</p><p><strong>{townsquare}</strong>(은)는 팀 전체의 소통을 위한 공간입니다. 모든 팀의 구성원들이 확인할 수 있습니다.</p><p><strong>{offtopic}</strong> 비업무 대화를 위한 공간입니다. 당신의 팀에 어떤 채널을 만들고 운영할지 결정할 수 있습니다.</p>",
@@ -1908,10 +1909,11 @@
   "sidebar.unreadBelow": "하단에 읽지않은 메시지",
   "sidebar_header.tutorial": "<h4>메인 메뉴</h4><p> <strong>메인 메뉴</strong>에서 <strong>회원 초대</strong>를 하거나, <strong>계정 설정</strong>에 진입하여 <strong>테마 색상</strong>을 변경할 수 있습니다.</p><p>팀 관리자는 메뉴에서 <strong>팀 설정</strong>에 진입할 수 있습니다.</p><p>시스템 관리자는 <strong>관리자 도구</strong> 메뉴를 통해 시스템을 전체 설정을 관리할 수 있습니다.</p>",
   "sidebar_right_menu.accountSettings": "계정 설정",
+  "sidebar_right_menu.addMemberToTeam": "Add Members to Team",
   "sidebar_right_menu.console": "관리자 도구",
   "sidebar_right_menu.flagged": "중요 메시지",
   "sidebar_right_menu.help": "도움말",
-  "sidebar_right_menu.inviteNew": "회원 초대하기",
+  "sidebar_right_menu.inviteNew": "Send Email Invite",
   "sidebar_right_menu.logout": "로그아웃",
   "sidebar_right_menu.manageMembers": "회원 관리하기",
   "sidebar_right_menu.nativeApps": "애플리케이션 다운로드",
@@ -1979,7 +1981,7 @@
   "suggestion.mention.morechannels": "Other Channels",
   "suggestion.mention.nonmembers": "Not in Channel",
   "suggestion.mention.special": "Special Mentions",
-  "suggestion.search.private": "Private Groups",
+  "suggestion.search.private": "채널 떠나기",
   "suggestion.search.public": "공개 채널",
   "team_export_tab.download": "다운로드",
   "team_export_tab.export": "내보내기",
@@ -2055,7 +2057,7 @@
   "upload_overlay.info": "이 곳에 파일을 끌어 업로드하세요.",
   "user.settings.advance.embed_preview": "For the first web link in a message, display a preview of website content below the message, if available",
   "user.settings.advance.embed_toggle": "미리보기 토글 버튼 보여주기",
-  "user.settings.advance.emojipicker": "Enable emoji picker in message input box",
+  "user.settings.advance.emojipicker": "Enable emoji picker for reactions and message input box",
   "user.settings.advance.enabledFeatures": "{count, number}개 기능 활성화",
   "user.settings.advance.formattingDesc": "활성화 하면 링크, 이모티콘, 글자 스타일 등을 사용할 수 있습니다. 기본적으로 활성화 되있습니다. 설정을 변경하려면 페이지 새로고침이 필요합니다.",
   "user.settings.advance.formattingTitle": "마크다운으로 글쓰기",
diff --git a/webapp/i18n/nl.json b/webapp/i18n/nl.json
index f3b3679a7d..ff8ffe1235 100644
--- a/webapp/i18n/nl.json
+++ b/webapp/i18n/nl.json
@@ -137,7 +137,8 @@
   "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Kies wanneer de activatie voor uitgaande webhook in werking treed; wanneer het eerste woord van het bericht overeenkomt met een trigger-woord, of wanneer het start met een trigger-woord.",
   "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)",
+  "add_users_to_team.title": "Add New Members To {teamName} Team",
+  "admin.advance.cluster": "High Availability",
   "admin.advance.metrics": "Performance Monitoring",
   "admin.audits.reload": "Laad de gebruikeractiviteit logs opnieuw",
   "admin.audits.title": "Gebruiker activiteits logs",
@@ -282,6 +283,8 @@
   "admin.email.requireVerificationDescription": "Meestal ingesteld op ingeschakeld in productie. Wanneer dit ingeschakeld is, zal Mattermost een e-mail verificatie versturen na het aanmaken van een account voor het maken van een account. Ontwikkelaars kunnen dit veld op uitgeschakeld zetten om het versturen van de verificatie-e-mails over te slaan voor een snellere ontwikkeling.",
   "admin.email.requireVerificationTitle": "Vereist e-mail verificatie: ",
   "admin.email.selfPush": "Voer de locatie van de push meldingen service handmatig in",
+  "admin.email.skipServerCertificateVerification.description": "When true, Mattermost will not verify the email server certificate.",
+  "admin.email.skipServerCertificateVerification.title": "Overslaan van certificaat verificatie:",
   "admin.email.smtpPasswordDescription": " Vraag de credentials op bij de beheerder van de e-mail server.",
   "admin.email.smtpPasswordExample": "Bijv. \"uwwachtwoord\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.email.smtpPasswordTitle": "SMTP server wachtwoord:",
@@ -328,13 +331,15 @@
   "admin.general.policy.permissionsSystemAdmin": "Systeem beheerders",
   "admin.general.policy.restrictPostDeleteDescription": "Set policy on who has permission to delete messages.",
   "admin.general.policy.restrictPostDeleteTitle": "Allow which users to delete messages:",
-  "admin.general.policy.restrictPrivateChannelCreationDescription": "Set policy on who can create private groups.",
-  "admin.general.policy.restrictPrivateChannelCreationTitle": "Enable private group creation for:",
+  "admin.general.policy.restrictPrivateChannelCreationDescription": "Set policy on who can create private channels.",
+  "admin.general.policy.restrictPrivateChannelCreationTitle": "Enable private channel creation for:",
   "admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "command line tool",
-  "admin.general.policy.restrictPrivateChannelDeletionDescription": "Set policy on who can delete private groups. Deleted groups can be recovered from the database using a {commandLineToolLink}.",
-  "admin.general.policy.restrictPrivateChannelDeletionTitle": "Enable private group deletion for:",
+  "admin.general.policy.restrictPrivateChannelDeletionDescription": "Set policy on who can delete private channels. Deleted channels can be recovered from the database using a {commandLineToolLink}.",
+  "admin.general.policy.restrictPrivateChannelDeletionTitle": "Enable private channel deletion for:",
+  "admin.general.policy.restrictPrivateChannelManageMembersDescription": "Set policy on who can add and remove members from private channels.",
+  "admin.general.policy.restrictPrivateChannelManageMembersTitle": "Enable managing of private channel members for:",
   "admin.general.policy.restrictPrivateChannelManagementDescription": "Stel in wie publieke kanalen kan maken, verwijderen, hernoemen, en de koptekst en het doel ervan instellen.",
-  "admin.general.policy.restrictPrivateChannelManagementTitle": "Enable private group renaming for:",
+  "admin.general.policy.restrictPrivateChannelManagementTitle": "Enable private channel renaming for:",
   "admin.general.policy.restrictPublicChannelCreationDescription": "Set policy on who can create public channels.",
   "admin.general.policy.restrictPublicChannelCreationTitle": "Enable public channel creation for:",
   "admin.general.policy.restrictPublicChannelDeletionCommandLineToolLink": "command line tool",
@@ -506,7 +511,7 @@
   "admin.log.enableDiagnosticsDescription": "Zet dit aan om de kwaliteit en snelheid te optimaliseren van Mattermost door versturen van fout rapporten en diagnostieke informatie naar Mattermost, Inc. Lees onze <a href=\"https://about.mattermost.com/default-privacy-policy/\" target=\"_blank\">privacy policy</a> om meer te lezen.",
   "admin.log.enableWebhookDebugging": "Webhook debugging inschakelen:",
   "admin.log.enableWebhookDebuggingDescription": "Zet debug logging uit voor alle inkomende webhook requests.",
-  "admin.log.fileDescription": "Meestal ingesteld op 'ingeschakeld' in de productie. Wanneer dit ingeschakeld is, worden log bestanden geschreven naar het log-bestand dat is opgegeven in de bestandslocatie in het veld hieronder.",
+  "admin.log.fileDescription": "Typically set to true in production. When true, logged events are written to the mattermost.log file in the directory specified in the File Log Directory field. The logs are rotated at 10,000 lines and archived to a file in the same directory, and given a name with a datestamp and serial number. For example, mattermost.2017-03-31.001.",
   "admin.log.fileLevelDescription": "Deze instelling bepaalt de mate van detail waarin log berichten naar het logboekbestand geschreven worden. FOUT: Geeft alleen maar foutmeldingen. INFO: Geeft de fout berichten en informatie rond het opstarten en initialisatie. DEBUG: Afdrukken van hoge mate van detail voor ontwikkelaars die werken aan het debuggen van problemen.",
   "admin.log.fileLevelTitle": "Bestand log-niveau:",
   "admin.log.fileTitle": "Log naar bestand:",
@@ -521,7 +526,7 @@
   "admin.log.formatTitle": "Bestand Log Formaat:",
   "admin.log.levelDescription": "Deze instelling bepaalt de mate van detail waarin log berichten naar het logboekbestand geschreven worden. FOUT: Geeft alleen maar foutmeldingen. INFO: Geeft de fout berichten en informatie rond het opstarten en initialisatie. DEBUG: Afdrukken van hoge mate van detail voor ontwikkelaars die werken aan het debuggen van problemen.",
   "admin.log.levelTitle": "Console Log Level:",
-  "admin.log.locationDescription": "Bestand waarin de logs worden geschreven. Indien leeg, wordt deze ingesteld op ./logs/mattermost, waarin het bestand mattermost.log wordt geschreven. Log rotatie is ingeschakeld en elke 10.000 lijnen van log informatie wordt geschreven naar een nieuw bestand, bewaard in dezelfde map, bijvoorbeeld mattermost.2015-09-23.001, mattermost.2015-09-23.002, enzovoort.",
+  "admin.log.locationDescription": "The location of the log files. If blank, they are stored in the ./logs directory. The path that you set must exist and Mattermost must have write permissions in it.",
   "admin.log.locationPlaceholder": "Voer uw bestand locatie in",
   "admin.log.locationTitle": "Map voor logs:",
   "admin.log.logSettings": "Log instellingen",
@@ -691,7 +696,7 @@
   "admin.service.corsTitle": "Cross-origin Requests toestaan van:",
   "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": "Enforce Multi-factor Authentication:",
+  "admin.service.enforcMfaTitle": "Aanzetten multi-factor authenticatie:",
   "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",
@@ -725,7 +730,7 @@
   "admin.service.sessionCacheDesc": "Het aantal minuten dat een sessie in het geheugen wordt gecached.",
   "admin.service.sessionDaysEx": "Bijv.: \"30\"",
   "admin.service.siteURL": "Site URL:",
-  "admin.service.siteURLDescription": "De URL, inclusief poort nummer en protocol, wat gebruikers zullen gebruiken om toegang te krijgen tot Mattermost. Dit veld kan leeg gelaten worden, tenzij je bulk email configureert in <b>Notificaties > Email</b>. Wanneer dit veld leeg is, dan zal de URL automatisch worden gebaseerd op inkomend verkeer.",
+  "admin.service.siteURLDescription": "The URL, including port number and protocol, that users will use to access Mattermost. This setting is required.",
   "admin.service.siteURLExample": "Bijv.: \"https://mattermost.example.com:1234\"",
   "admin.service.ssoSessionDays": "Sessie duur voor SSO (dagen):",
   "admin.service.ssoSessionDaysDesc": "Het aantal dagen dat de gebruiker voor het laatst zijn credentials heeft ingevoerd voordat gebruikers sessie verloopt. Als de authenticatie SAML of GitLab is, kan de gebruiker automatisch worden terug ingelogd in Mattermost omdat ze al waren ingelogd in SAML of GitLab. Nadat deze instelling is gewijzigd, zal de nieuwe sessie lengte plaatsvinden de volgende keer de gebruiker zijn credentials invult. ",
@@ -743,11 +748,11 @@
   "admin.service.webhooksTitle": "Inschakelen inkomende webhooks: ",
   "admin.service.writeTimeout": "Write Timeout:",
   "admin.service.writeTimeoutDescription": "If using HTTP (insecure), this is the maximum time allowed from the end of reading the request headers until the response is written. If using HTTPS, it is the total time from when the connection is accepted until the response is written.",
-  "admin.sidebar.addTeamSidebar": "Add team from sidebar menu",
+  "admin.sidebar.addTeamSidebar": "Voeg een team toe van de navigatiekolom",
   "admin.sidebar.advanced": "Geavanceerd",
   "admin.sidebar.audits": "Compliance en Auditing",
   "admin.sidebar.authentication": "Authenticatie",
-  "admin.sidebar.cluster": "High Availability (Beta)",
+  "admin.sidebar.cluster": "High Availability",
   "admin.sidebar.compliance": "Voldoet aan",
   "admin.sidebar.configuration": "Configuratie",
   "admin.sidebar.connections": "Verbindingen",
@@ -784,7 +789,7 @@
   "admin.sidebar.push": "Mobiele meldingen",
   "admin.sidebar.rateLimiting": "Snelheidsbeperking",
   "admin.sidebar.reports": "RAPPORTEREN",
-  "admin.sidebar.rmTeamSidebar": "Remove team from sidebar menu",
+  "admin.sidebar.rmTeamSidebar": "Verwijder een team van de navigatiekolom",
   "admin.sidebar.saml": "SAML",
   "admin.sidebar.security": "Beveiliging",
   "admin.sidebar.sessions": "Sessies",
@@ -880,8 +885,8 @@
   "admin.team_analytics.activeUsers": "Actieve gebruikers met berichten",
   "admin.team_analytics.totalPosts": "Totaal aantal berichten",
   "admin.true": "ingeschakeld",
-  "admin.userList.title": "Users for {team}",
-  "admin.userList.title2": "Users for {team} ({count})",
+  "admin.userList.title": "Gebruikers van {team}",
+  "admin.userList.title2": "Gebruikers van {team} ({count})",
   "admin.user_item.authServiceEmail": ", <strong>Aanmeld-methode:</strong> Email",
   "admin.user_item.authServiceNotEmail": ", <strong>Aanmeld-methode:</strong> {service}",
   "admin.user_item.confirmDemoteDescription": "Als je jezelf degradeert vanaf de System Admin rol en er is geen andere gebruiker met de System Admin rechten, zal je jezelf System Admin moeten maken door in te loggen op de Mattermost server en het volgende commando uit te voeren.",
@@ -895,13 +900,14 @@
   "admin.user_item.makeMember": "Maak lid",
   "admin.user_item.makeSysAdmin": "Maak systeembeheerder",
   "admin.user_item.makeTeamAdmin": "Maak team beheerder",
+  "admin.user_item.manageTeams": "Manage Teams",
   "admin.user_item.member": "Lid",
   "admin.user_item.mfaNo": ", <strong>MFA</strong>: Nee",
   "admin.user_item.mfaYes": ", <strong>MFA</strong>: Ja",
   "admin.user_item.resetMfa": "Verwijder MFA",
   "admin.user_item.resetPwd": "Reset wachtwoord",
   "admin.user_item.switchToEmail": "Overschakelen naar e-mail/wachtwoord",
-  "admin.user_item.sysAdmin": "System Admin",
+  "admin.user_item.sysAdmin": "Systeem beheerder",
   "admin.user_item.teamAdmin": "Team beheerder",
   "admin.webrtc.enableDescription": "When true, Mattermost allows making <strong>one-on-one</strong> video calls. WebRTC calls are available on Chrome, Firefox and Mattermost Desktop Apps.",
   "admin.webrtc.enableTitle": "Aanzetten Mattermost WebRTC: ",
@@ -941,7 +947,7 @@
   "analytics.system.dailyActiveUsers": "Daily Active Users",
   "analytics.system.monthlyActiveUsers": "Monthly Active Users",
   "analytics.system.postTypes": "Berichten, bestanden en hashtags",
-  "analytics.system.privateGroups": "Private Groups",
+  "analytics.system.privateGroups": "Verlaat kanaal",
   "analytics.system.publicChannels": "Publieke kanalen",
   "analytics.system.skippedIntensiveQueries": "To maximize performance, some statistics are disabled. You can re-enable them in config.json. See: <a href='https://docs.mattermost.com/administration/statistics.html' target='_blank'>https://docs.mattermost.com/administration/statistics.html</a>",
   "analytics.system.textPosts": "Berichten met enkel tekst",
@@ -961,7 +967,7 @@
   "analytics.system.totalWebsockets": "WebSocket Conns",
   "analytics.team.activeUsers": "Actieve gebruikers met berichten",
   "analytics.team.newlyCreated": "Nieuw gemaakte gebruikers",
-  "analytics.team.privateGroups": "Private Groups",
+  "analytics.team.privateGroups": "Verlaat kanaal",
   "analytics.team.publicChannels": "Publieke kanalen",
   "analytics.team.recentActive": "Recent actieve gebruikers",
   "analytics.team.recentUsers": "Recent actieve gebruikers",
@@ -1059,28 +1065,25 @@
   "channelHeader.removeFromFavorites": "Remove from Favorites",
   "channel_flow.alreadyExist": "Een kanaal met die URL bestaat reeds",
   "channel_flow.changeUrlDescription": "Sommige tekens zijn ongeldig in een URL en worden verwijderd.",
-  "channel_flow.changeUrlTitle": "Change {term} URL",
-  "channel_flow.channel": "Channel",
+  "channel_flow.changeUrlTitle": "Change Channel URL",
   "channel_flow.create": "Verlaat kanaal",
-  "channel_flow.group": "Group",
   "channel_flow.handleTooShort": "Kanaal URL moet 2 of meer kleine alfanumerieke karakters bevatten",
   "channel_flow.invalidName": "Ongeldige kanaal naam",
-  "channel_flow.set_url_title": "Set {term} URL",
+  "channel_flow.set_url_title": "Set Channel URL",
   "channel_header.addMembers": "Leden toevoegen",
   "channel_header.addToFavorites": "Add to Favorites",
-  "channel_header.channel": "Channel",
+  "channel_header.channel": "Kanaal",
   "channel_header.channelHeader": "Edit Channel Header",
   "channel_header.delete": "Verwijder kanaal...",
   "channel_header.flagged": "Gemarkeerde Berichten",
-  "channel_header.group": "Group",
   "channel_header.leave": "Verlaat kanaal",
   "channel_header.manageMembers": "Leden beheren",
   "channel_header.notificationPreferences": "Meldings-voorkeuren",
   "channel_header.recentMentions": "Recente vermeldingen",
   "channel_header.removeFromFavorites": "Remove from Favorites",
   "channel_header.rename": "Hernoem kanaal...",
-  "channel_header.setHeader": "Edit {term} Header",
-  "channel_header.setPurpose": "Edit {term} Purpose",
+  "channel_header.setHeader": "Edit Channel Header",
+  "channel_header.setPurpose": "Edit Channel Purpose",
   "channel_header.viewInfo": "Bekijk informatie",
   "channel_header.viewMembers": "Bekijk Leden",
   "channel_header.webrtc.call": "Een video-oproep starten",
@@ -1115,16 +1118,14 @@
   "channel_members_modal.addNew": "Leden toevoegen",
   "channel_members_modal.members": " Leden",
   "channel_modal.cancel": "Annuleren",
-  "channel_modal.channel": "Channel",
   "channel_modal.createNew": "Maak een nieuw kanaal",
   "channel_modal.descriptionHelp": "Beschrijf hoe deze {term} gebruikt moet worden.",
   "channel_modal.displayNameError": "Channel name must be 2 or more characters",
   "channel_modal.edit": "Bewerken",
-  "channel_modal.group": "Group",
   "channel_modal.header": "Kop",
   "channel_modal.headerEx": "E.g.: \"[Link Title](http://example.com)\"",
   "channel_modal.headerHelp": "Geef de tekst die zal verschijnen in het hoofd van de {term} naast de {term} naam. Bijvoorbeeld, veelgebruikte links door het opgeven van [Link Titel](http://example.com).",
-  "channel_modal.modalTitle": "New ",
+  "channel_modal.modalTitle": "New Channel",
   "channel_modal.name": "Naam",
   "channel_modal.nameEx": "Bijv.: \"Bugs\", \"Marketing\", \"客户支持\"",
   "channel_modal.optional": "(optioneel)",
@@ -1134,7 +1135,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})",
@@ -1229,11 +1230,9 @@
   "custom_emoji.search": "Zoek custom Emoji",
   "default_channel.purpose": "Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.",
   "delete_channel.cancel": "Annuleren",
-  "delete_channel.channel": "channel",
   "delete_channel.confirm": "Bevestig het WISSEN van het kanaal",
   "delete_channel.del": "Verwijderen",
-  "delete_channel.group": "group",
-  "delete_channel.question": "This will delete the channel from the team and make its contents inaccessible for all users. Are you sure you wish to delete the {display_name} {term}?",
+  "delete_channel.question": "This will delete the channel from the team and make its contents inaccessible for all users. Are you sure you wish to delete the {display_name} channel?",
   "delete_post.cancel": "Annuleren",
   "delete_post.comment": "Commentaar",
   "delete_post.confirm": "Bevestig {term} verwijdering",
@@ -1249,9 +1248,7 @@
   "edit_channel_header_modal.title_dm": "Koptekst bewerken",
   "edit_channel_purpose_modal.body": "Omschrijf hoe dit {type} zal worden gebruikt. Deze tekst word zichtbaar in de kanalen lijst in het \"Meer...\" menu en zal anderen helpen te beslissen of zij willen joinen.",
   "edit_channel_purpose_modal.cancel": "Annuleren",
-  "edit_channel_purpose_modal.channel": "Channel",
   "edit_channel_purpose_modal.error": "Het kanaaldoel is te lang, gelieve een kortere tekst in te geven",
-  "edit_channel_purpose_modal.group": "Group",
   "edit_channel_purpose_modal.save": "Opslaan",
   "edit_channel_purpose_modal.title1": "Bewerk doel",
   "edit_channel_purpose_modal.title2": "Doeleinden bewerken voor ",
@@ -1302,12 +1299,14 @@
   "error.not_found.link_message": "Terug naar Mattermost",
   "error.not_found.message": "De pagina die u probeerde op te halen bestaat niet",
   "error.not_found.title": "Pagina niet gevonden",
-  "error.not_supported.message": "Browsen in \"privé modus\" is niet toegestaan.",
-  "error.not_supported.title": "Browser niet ondersteund",
   "error_bar.expired": "Enterprise license is expired and some features may be disabled. <a href='{link}' target='_blank'>Please renew.</a>",
   "error_bar.expiring": "Enterprise license expires on {date}. <a href='{link}' target='_blank'>Please renew.</a>",
   "error_bar.past_grace": "Enterprise license is expired and some features may be disabled. Please contact your System Administrator for details.",
   "error_bar.preview_mode": "Preview Modus: Email notificaties zijn niet geconfigureerd",
+  "error_bar.site_url": "Please configure your {docsLink} in the {link}.",
+  "error_bar.site_url.docsLink": "Site URL:",
+  "error_bar.site_url.link": "Systeem console",
+  "error_bar.site_url_gitlab": "Please configure your {docsLink} in the System Console or in gitlab.rb if you're using GitLab Mattermost.",
   "file_attachment.download": "Downloaden",
   "file_info_preview.size": "Grootte ",
   "file_info_preview.type": "Bestandstype ",
@@ -1542,7 +1541,7 @@
   "intro_messages.channel": "kanaal",
   "intro_messages.creator": "Dit is de start van {name} {type}, gemaakt door {creator} op {date}.",
   "intro_messages.default": "<h4 class='channel-intro__title'>Beginning of {display_name}</h4><p class='channel-intro__content'><strong>Welcome to {display_name}!</strong><br/><br/>Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.</p>",
-  "intro_messages.group": "private group",
+  "intro_messages.group": "Verlaat kanaal",
   "intro_messages.invite": "Nodig anderen uit voor: {type}",
   "intro_messages.inviteOthers": "Nodig anderen uit voor dit team",
   "intro_messages.noCreator": "Dit is de start van {name} {type}, gemaakt op {date}.",
@@ -1563,7 +1562,7 @@
   "invite_member.modalButton": "Ja, verwijderen",
   "invite_member.modalMessage": "U hebt niet-verzonden uitnodigingen, weet u zeker dat u deze wilt verwijderen?",
   "invite_member.modalTitle": "Uitnodigingen verwijderen?",
-  "invite_member.newMember": "Nieuw lid uitnodigen",
+  "invite_member.newMember": "Send Email Invite",
   "invite_member.send": "Verstuur uitnodiging",
   "invite_member.send2": "Verstuur uitnodigingen",
   "invite_member.sending": " Versturen",
@@ -1649,14 +1648,14 @@
   "mobile.account_notifications.threads_start": "Threads that I start",
   "mobile.account_notifications.threads_start_participate": "Threads that I start or participate in",
   "mobile.channel_info.alertMessageDeleteChannel": "Weet u zeker dat u deze {term} wilt verwijderen?",
-  "mobile.channel_info.alertMessageLeaveChannel": "Are you sure you want to leave the {term} {name}?",
+  "mobile.channel_info.alertMessageLeaveChannel": "Weet u zeker dat u deze {term} wilt verwijderen?",
   "mobile.channel_info.alertNo": "Nee",
   "mobile.channel_info.alertTitleDeleteChannel": "Verwijder {term}...",
   "mobile.channel_info.alertTitleLeaveChannel": "Verlaat {term}",
   "mobile.channel_info.alertYes": "Ja",
-  "mobile.channel_info.privateChannel": "Private Channel",
+  "mobile.channel_info.privateChannel": "Verlaat kanaal",
   "mobile.channel_info.publicChannel": "Publieke kanalen",
-  "mobile.channel_list.alertMessageLeaveChannel": "Are you sure you want to leave the {term} {name}?",
+  "mobile.channel_list.alertMessageLeaveChannel": "Weet u zeker dat u deze {term} wilt verwijderen?",
   "mobile.channel_list.alertNo": "Nee",
   "mobile.channel_list.alertTitleLeaveChannel": "Verlaat {term}",
   "mobile.channel_list.alertYes": "Ja",
@@ -1667,7 +1666,7 @@
   "mobile.channel_list.open": "Open {term}",
   "mobile.channel_list.openDM": "Open Direct Message",
   "mobile.channel_list.openGM": "Open Group Message",
-  "mobile.channel_list.privateChannel": "Private Channel",
+  "mobile.channel_list.privateChannel": "Verlaat kanaal",
   "mobile.channel_list.publicChannel": "Publieke kanalen",
   "mobile.components.channels_list_view.yourChannels": "Your channels:",
   "mobile.components.error_list.dismiss_all": "Dismiss All",
@@ -1676,7 +1675,7 @@
   "mobile.components.select_server_view.proceed": "Proceed",
   "mobile.components.select_server_view.siteUrlPlaceholder": "https://mattermost.example.com",
   "mobile.create_channel": "Create",
-  "mobile.create_channel.private": "New Private Group",
+  "mobile.create_channel.private": "Verlaat kanaal",
   "mobile.create_channel.public": "Publieke kanalen",
   "mobile.custom_list.no_results": "No Results",
   "mobile.edit_post.title": "Editing Message",
@@ -1724,8 +1723,8 @@
   "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.new_convo_note": "This will start a new conversation. If you’re adding a lot of people, consider creating a private channel instead.",
+  "more_direct_channels.new_convo_note.full": "You’ve reached the maximum number of people for this conversation. Consider creating a private channel instead.",
   "more_direct_channels.title": "Privé bericht",
   "msg_typing.areTyping": "{users} en {last} zijn aan het typen...",
   "msg_typing.isTyping": "{user} typt...",
@@ -1751,12 +1750,13 @@
   "navbar.viewPinnedPosts": "View Pinned Posts",
   "navbar_dropdown.about": "Over Mattermost",
   "navbar_dropdown.accountSettings": "Account-instellingen",
+  "navbar_dropdown.addMemberToTeam": "Add Members to Team",
   "navbar_dropdown.console": "Systeem-console",
   "navbar_dropdown.create": "Maak een nieuw team",
   "navbar_dropdown.emoji": "Aangepaste emoji",
   "navbar_dropdown.help": "Help",
   "navbar_dropdown.integrations": "Integraties",
-  "navbar_dropdown.inviteMember": "Nodig een nieuw lid uit",
+  "navbar_dropdown.inviteMember": "Send Email Invite",
   "navbar_dropdown.join": "Join Another Team",
   "navbar_dropdown.leave": "Team verlaten",
   "navbar_dropdown.logout": "Afmelden",
@@ -1788,6 +1788,7 @@
   "pending_post_actions.cancel": "Annuleren",
   "pending_post_actions.retry": "Probeer opnieuw",
   "permalink.error.access": "Permalink behoort toe aan een verwijderd bericht of aan een kanaal waar je geen toegang tot hebt.",
+  "permalink.error.title": "Message Not Found",
   "post_attachment.collapse": "Minder tonen...",
   "post_attachment.more": "Meer tonen...",
   "post_body.commentedOn": "Reageerde op bericht van {name}{apostrophe}:",
@@ -1893,13 +1894,13 @@
   "setting_upload.select": "Selecteer een bestand",
   "sidebar.channels": "Kanalen",
   "sidebar.createChannel": "Maak een publiek kanaal",
-  "sidebar.createGroup": "Create new group",
+  "sidebar.createGroup": "Maak een publiek kanaal",
   "sidebar.direct": "Privé berichten",
   "sidebar.favorite": "Favorites",
   "sidebar.more": "Meer",
   "sidebar.moreElips": "Meer...",
   "sidebar.otherMembers": "Buiten dit team",
-  "sidebar.pg": "Private Groups",
+  "sidebar.pg": "Verlaat kanaal",
   "sidebar.removeList": "Uit de lijst verwijderen",
   "sidebar.tutorialScreen1": "<h4>Kanalen</h4><p><strong>Kanalen</strong> organiseren conversaties in verschillende onderwerpen. Ze zijn open voor iedereen in je team. Om privéberichten te sturen, gebruik <strong>Directe Berichten</strong> voor een enkel persoon of <strong>Privé Groepen</strong> voor meerdere personen.</p>",
   "sidebar.tutorialScreen2": "<h4>\"{townsquare}\" en \"{offtopic}\" kanalen</h4><p>Hier zijn 2 publieke kanalen om te starten:</p><p><strong>{townsquare}</strong> is een plaats voor team wijde communicatie. Iedereen in jouw team is lid van dit kanaal.</p><p><strong>{offtopic}</strong> is een plaats voor ontspanning en humor buiten werk gerelateerde zaken en kanalen. Jij en jouw team kunnen beslissen wel andere kanalen er gemaakt moeten worden.</p>",
@@ -1908,10 +1909,11 @@
   "sidebar.unreadBelow": "Ongelezen bericht(en) hierbeneden",
   "sidebar_header.tutorial": "<h4>Hoofdmenu</h4><p>Het <strong>Hoofdmenu</strong> is waar je kan  <strong>Uitnodigen van Nieuwe Leden</strong>, toegang tot jouw <strong>Account Instellingen</strong> en instellen van jouw  <strong>Thema Kleur</strong>.</p><p>Team admins kunnen ook hun <strong>Team Instellngen</strong>  instellen via dit menu.</p><p>Systeem admins vinden hier een <strong>Systeem Console</strong> optie om het hele systeem te beheren.</p>",
   "sidebar_right_menu.accountSettings": "Account instellingen",
+  "sidebar_right_menu.addMemberToTeam": "Add Members to Team",
   "sidebar_right_menu.console": "Systeem console",
   "sidebar_right_menu.flagged": "Gemarkeerde Berichten",
   "sidebar_right_menu.help": "Help",
-  "sidebar_right_menu.inviteNew": "Nodig een nieuw lid uit...",
+  "sidebar_right_menu.inviteNew": "Send Email Invite",
   "sidebar_right_menu.logout": "Afmelden",
   "sidebar_right_menu.manageMembers": "Leden beheren",
   "sidebar_right_menu.nativeApps": "Download Apps",
@@ -1979,7 +1981,7 @@
   "suggestion.mention.morechannels": "Andere Kanalen",
   "suggestion.mention.nonmembers": "Niet in kanaal",
   "suggestion.mention.special": "Speciale Vermeldingen",
-  "suggestion.search.private": "Private Groups",
+  "suggestion.search.private": "Verlaat kanaal",
   "suggestion.search.public": "Publieke kanalen",
   "team_export_tab.download": "downloaden",
   "team_export_tab.export": "Exporteer",
@@ -2055,7 +2057,7 @@
   "upload_overlay.info": "Sleep hier een bestand om te uploaden.",
   "user.settings.advance.embed_preview": "For the first web link in a message, display a preview of website content below the message, if available",
   "user.settings.advance.embed_toggle": "Toon schakel optie voor alle ingesloten voorbeelden",
-  "user.settings.advance.emojipicker": "Enable emoji picker in message input box",
+  "user.settings.advance.emojipicker": "Enable emoji picker for reactions and message input box",
   "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Feature} other {Features}} Ingeschakeld",
   "user.settings.advance.formattingDesc": "Indien ingeschakeld, worden berichten opgemaakt met links, emoji, stijl van de tekst, en regeleinden toevoegen. Standaard is deze instelling ingeschakeld. Het wijzigen van deze instelling vereist dat de pagina vernieuwd wordt.",
   "user.settings.advance.formattingTitle": "Bericht opmaak inschakelen",
diff --git a/webapp/i18n/pt-BR.json b/webapp/i18n/pt-BR.json
index 2246585c7c..a9044670af 100644
--- a/webapp/i18n/pt-BR.json
+++ b/webapp/i18n/pt-BR.json
@@ -86,7 +86,7 @@
   "add_emoji.save": "Salvar",
   "add_incoming_webhook.cancel": "Cancelar",
   "add_incoming_webhook.channel": "Canal",
-  "add_incoming_webhook.channel.help": "Canal público ou grupo privado que recebe as cargas webhook. Você deve pertencer ao grupo privado quando configurar o webhook.",
+  "add_incoming_webhook.channel.help": "Canal público ou privado que recebe as cargas webhook. Você deve pertencer ao canal privado ao configurar o webhook.",
   "add_incoming_webhook.channelRequired": "Um canal válido é necessário",
   "add_incoming_webhook.description": "Descrição",
   "add_incoming_webhook.description.help": "Descrição do seu webhook de entrada.",
@@ -137,7 +137,8 @@
   "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Escolher quando disparar o webhook de saída; se a primeira palavra de uma mensagem corresponde exatamente a uma Palavra Gatilho, ou se ele começa com uma Palavra Gatilho.",
   "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)",
+  "add_users_to_team.title": "Adicionar Novos Membros para Equipe {teamName}",
+  "admin.advance.cluster": "Alta Disponibilidade",
   "admin.advance.metrics": "Monitoramento de Performance",
   "admin.audits.reload": "Recarregar",
   "admin.audits.title": "Atividade de Usuário",
@@ -282,6 +283,8 @@
   "admin.email.requireVerificationDescription": "Normalmente definido como verdadeiro em produção. Quando verdadeiro, Mattermost requer a verificação de e-mail após a criação da conta antes de permitir login. Os desenvolvedores podem definir este campo como falso para ignorar o envio de e-mails de verificação para o desenvolvimento mais rápido.",
   "admin.email.requireVerificationTitle": "Requer Verificação de E-mail: ",
   "admin.email.selfPush": "Manualmente entre a localização do Serviço de Notificação Push",
+  "admin.email.skipServerCertificateVerification.description": "Quando verdadeiro, Mattermost não irá verificar o certificado do servidor de email.",
+  "admin.email.skipServerCertificateVerification.title": "Pular a Verificação do Certificado: ",
   "admin.email.smtpPasswordDescription": " Obter essa credencial do administrador das configurações do servidor de email.",
   "admin.email.smtpPasswordExample": "Ex: \"suasenha\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.email.smtpPasswordTitle": "Senha do Servidor de SMTP:",
@@ -328,13 +331,15 @@
   "admin.general.policy.permissionsSystemAdmin": "Administrador de Sistema",
   "admin.general.policy.restrictPostDeleteDescription": "Define a política de quem tem permissão para deletar mensagens.",
   "admin.general.policy.restrictPostDeleteTitle": "Permitir quais usuários a deletar mensagens:",
-  "admin.general.policy.restrictPrivateChannelCreationDescription": "Definir política sobre quem pode criar canais públicos.",
-  "admin.general.policy.restrictPrivateChannelCreationTitle": "Ativar a criação de canais públicos para:",
+  "admin.general.policy.restrictPrivateChannelCreationDescription": "Definir política de quem pode criar canais privados.",
+  "admin.general.policy.restrictPrivateChannelCreationTitle": "Ativar a criação de canais privados para:",
   "admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "ferramenta de linha de comando",
-  "admin.general.policy.restrictPrivateChannelDeletionDescription": "Definir política sobre quem pode excluir canais públicos. Canais deletados podem ser recuperados do banco de dados usando {commandLineToolLink}.",
-  "admin.general.policy.restrictPrivateChannelDeletionTitle": "Ativar a exclusão de canais públicos para:",
-  "admin.general.policy.restrictPrivateChannelManagementDescription": "Definir a política sobre quem pode renomear e definir o cabeçalho ou propósito para canais públicos.",
-  "admin.general.policy.restrictPrivateChannelManagementTitle": "Ativar o renomeio de canais públicos para:",
+  "admin.general.policy.restrictPrivateChannelDeletionDescription": "Definir política de quem pode excluir canais privados. Canais excluídos podem ser recuperados do banco de dados usando {commandLineToolLink}.",
+  "admin.general.policy.restrictPrivateChannelDeletionTitle": "Ativar a exclusão de canais privados para:",
+  "admin.general.policy.restrictPrivateChannelManageMembersDescription": "Definir a política de quem pode adicionar e remover membros de canais privados.",
+  "admin.general.policy.restrictPrivateChannelManageMembersTitle": "Ativar o gerenciamento de membros de canais privados para:",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "Definir a política de quem pode renomear e definir o cabeçalho ou propósito para canais privados.",
+  "admin.general.policy.restrictPrivateChannelManagementTitle": "Ativar o renomeio de canais privados para:",
   "admin.general.policy.restrictPublicChannelCreationDescription": "Definir política sobre quem pode criar canais públicos.",
   "admin.general.policy.restrictPublicChannelCreationTitle": "Ativar a criação de canais públicos para:",
   "admin.general.policy.restrictPublicChannelDeletionCommandLineToolLink": "ferramenta de linha de comando",
@@ -342,7 +347,7 @@
   "admin.general.policy.restrictPublicChannelDeletionTitle": "Ativar a exclusão de canais públicos para:",
   "admin.general.policy.restrictPublicChannelManagementDescription": "Definir a política sobre quem pode renomear e definir o cabeçalho ou propósito para canais públicos.",
   "admin.general.policy.restrictPublicChannelManagementTitle": "Ativar o renomeio de canais públicos para:",
-  "admin.general.policy.teamInviteDescription": "Definir a política de quem pode convidar outros para a equipe usando <b>Convide um Novo Membro</b> para convidar um novo usuário por email, ou a opção <b>Obter Link Convite para Equipe</b> no Menu Principal. Se <b>Obter Link Convite para Equipe</b> for usado para compartilhar um link, você pode expirar o código convite em <b>Configurações de Equipe</b> > <b>Código Convite</b> depois que os usuários desejados já se juntaram a equipe.",
+  "admin.general.policy.teamInviteDescription": "Definir a política de quem pode convidar outros para a equipe usando <b>Enviar Email de Convite</b> para convidar um novo usuário por email, ou as opções <b>Obter Link Convite para Equipe</b> e <b>Adicionar Membros a Equipe</b> no Menu Principal. Se <b>Obter Link Convite para Equipe</b> for usado para compartilhar um link, você pode expirar o código convite em <b>Configurações de Equipe</b> > <b>Código Convite</b> depois que os usuários desejados já se juntaram a equipe.",
   "admin.general.policy.teamInviteTitle": "Permitir o envio de convites de equipe para:",
   "admin.general.privacy": "Privacidade",
   "admin.general.usersAndTeams": "Usuários e Equipes",
@@ -506,7 +511,7 @@
   "admin.log.enableDiagnosticsDescription": "Ativar este recurso para melhorar a qualidade e performance do Mattermost enviando relatório de erros e informações de diagnóstico para Mattermost, Inc. Leia nossa <a href=\"https://about.mattermost.com/default-privacy-policy/\" target='_blank'>política de privacidade</a> para saber mais.",
   "admin.log.enableWebhookDebugging": "Ativar Debugging Webhook:",
   "admin.log.enableWebhookDebuggingDescription": "Você pode definir isto como falso para desativar o log de depuração de todos os bodies de solicitação de solicitação webhook recebidas.",
-  "admin.log.fileDescription": "Normalmente definido como verdadeiro em produção.  Quando verdadeiro, arquivos de log são gravados no arquivo de log especificado no campo de localização abaixo.",
+  "admin.log.fileDescription": "Normalmente definida como verdadeira em produção. Quando verdadeiro, os eventos registrados são gravados no arquivo mattermost.log no diretório especificado no campo Diretório de Arquivo de Log. Os logs são girados em 10.000 linhas e arquivados em um arquivo no mesmo diretório, e dado um nome com um datetamp e número de série. Por exemplo, mattermost.2017-03-31.001.",
   "admin.log.fileLevelDescription": "Esta configuração determina o nível de detalhe que são gravados no log de eventos no console. ERROR: Saídas somente mensagens de erro. INFO: Saídas de mensagens de erro e informações em torno de inicialização. DEBUG: Impressões de alto detalhe para desenvolvedores que trabalham na depuração de problemas.",
   "admin.log.fileLevelTitle": "Nível do Arquivo de Log:",
   "admin.log.fileTitle": "Arquivo de logs de saída: ",
@@ -521,9 +526,9 @@
   "admin.log.formatTitle": "Formato do Arquivo de Log:",
   "admin.log.levelDescription": "Esta configuração determina o nível de detalhe que são gravados no log de eventos no console. ERROR: Saídas somente mensagens de erro. INFO: Saídas de mensagens de erro e informações em torno de inicialização. DEBUG: Impressões de alto detalhe para desenvolvedores que trabalham na depuração de problemas.",
   "admin.log.levelTitle": "Nível de Log Console:",
-  "admin.log.locationDescription": "Arquivo para o qual os arquivos de log são escritos. Se estiver em branco, será definido para ./logs/mattermost, que grava logs em mattermost.log. Rotação de log está habilitada a cada 10.000 linhas de informações de log gravada para novos arquivos armazenados no mesmo diretório, por exemplo mattermost.2015-09-23.001, mattermost.2015-09-23.002, e assim por diante.",
+  "admin.log.locationDescription": "A localização dos arquivos de log. Se estiverem em branco, eles serão armazenadas no diretório ./logs. O caminho que você definir deve existir e o Mattermost deve ter permissões de gravação nele.",
   "admin.log.locationPlaceholder": "Entre a localização do seu arquivo",
-  "admin.log.locationTitle": "Diretório do Arquivo de Log:",
+  "admin.log.locationTitle": "Diretório de Arquivo de Log:",
   "admin.log.logSettings": "Configurações de Log",
   "admin.logs.reload": "Recarregar",
   "admin.logs.title": "Log do Servidor",
@@ -691,7 +696,7 @@
   "admin.service.corsTitle": "Permitir requisição cross-origin de:",
   "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": "Enforce Multi-factor Authentication:",
+  "admin.service.enforcMfaTitle": "Impor Autenticação Multi-Fator:",
   "admin.service.enforceMfaDesc": "Quando verdadeiro, <a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>autenticação pode multi-fator</a> será requerida para o login. O configuração do MFA será requerida para os novos usuários na inscrição. Usuários logados sem o MFA configurado serão redirecionados para a página de configuração do MFA até a configuração estiver completa.<br/><br/>Se o seu sistema tiver usuários com outros métodos de login que não AD/LDAP e por email, o MFA deverá ser aplicado um provedor de autenticação externo ao Mattermost.",
   "admin.service.forward80To443": "Redirecionamento porta 80 para 443:",
   "admin.service.forward80To443Description": "Redirecionar todo trafego inseguro da porta 80 para porta segura 443",
@@ -725,7 +730,7 @@
   "admin.service.sessionCacheDesc": "O número de minutos para o cache de uma sessão na memória.",
   "admin.service.sessionDaysEx": "Ex.: \"30\"",
   "admin.service.siteURL": "Site URL:",
-  "admin.service.siteURLDescription": "A URL, incluindo o número da porta e protocolo, que os usuários usarão para acessar Mattermost. Este campo pode ser deixado em branco, a menos que você estiver configurando email em lotes em <b>Notificações > Email</b>. Quando em branco, a URL é automaticamente configurada com base no tráfego de entrada.",
+  "admin.service.siteURLDescription": "O URL, incluindo o número da porta e o protocolo, que os usuários usarão para acessar o Mattermost. Essa configuração é necessária.",
   "admin.service.siteURLExample": "Ex.: \"https://mattermost.example.com:1234\"",
   "admin.service.ssoSessionDays": "Tamanho da sessão SSO (dias):",
   "admin.service.ssoSessionDaysDesc": "O número de dias desde a última vez que um usuário entrou suas credenciais para expirar a sessão do usuário. Se o método de autenticação é SAML ou GitLab, o usuário pode automaticamente ser registrado novamente no Mattermost se já estiver conectado ao SAML ou GitLab. Depois de alterar essa configuração, a configuração terá efeito após a próxima vez que o usuário digitar suas credenciais.",
@@ -743,11 +748,11 @@
   "admin.service.webhooksTitle": "Ativar Webhooks Entrada: ",
   "admin.service.writeTimeout": "Tempo limite de gravação:",
   "admin.service.writeTimeoutDescription": "Se estiver usando HTTP (inseguro), este é o tempo máximo permitido desde o final da leitura dos cabeçalhos de solicitação até que a resposta seja escrita. Se estiver usando HTTPS, é o tempo total de quando a conexão é aceita até que a resposta seja escrita.",
-  "admin.sidebar.addTeamSidebar": "Add team from sidebar menu",
+  "admin.sidebar.addTeamSidebar": "Adicionar equipe do menu lateral",
   "admin.sidebar.advanced": "Avançado",
   "admin.sidebar.audits": "Conformidade e Auditoria",
   "admin.sidebar.authentication": "Autenticação",
-  "admin.sidebar.cluster": "Alta Disponibilidade (Beta)",
+  "admin.sidebar.cluster": "Alta Disponibilidade",
   "admin.sidebar.compliance": "Conformidade",
   "admin.sidebar.configuration": "Configuração",
   "admin.sidebar.connections": "Conexões",
@@ -784,7 +789,7 @@
   "admin.sidebar.push": "Notificação Móvel",
   "admin.sidebar.rateLimiting": "Limite de Velocidade",
   "admin.sidebar.reports": "REPORTANDO",
-  "admin.sidebar.rmTeamSidebar": "Remove team from sidebar menu",
+  "admin.sidebar.rmTeamSidebar": "Remover equipe do menu lateral",
   "admin.sidebar.saml": "SAML",
   "admin.sidebar.security": "Segurança",
   "admin.sidebar.sessions": "Sessões",
@@ -794,7 +799,7 @@
   "admin.sidebar.statistics": "Estatísticas de Equipe",
   "admin.sidebar.storage": "Armazenamento",
   "admin.sidebar.support": "Legal e Suporte",
-  "admin.sidebar.teams": "TEAMS ({count, number})",
+  "admin.sidebar.teams": "EQUIPES ({count, number})",
   "admin.sidebar.users": "Usuários",
   "admin.sidebar.usersAndTeams": "Usuários e Equipes",
   "admin.sidebar.view_statistics": "Estatísticas do Site",
@@ -880,8 +885,8 @@
   "admin.team_analytics.activeUsers": "Usuários Ativos Com Postagens",
   "admin.team_analytics.totalPosts": "Total Posts",
   "admin.true": "verdadeiro",
-  "admin.userList.title": "Users for {team}",
-  "admin.userList.title2": "Users for {team} ({count})",
+  "admin.userList.title": "Usuários para {team}",
+  "admin.userList.title2": "Usuários para {team} ({count})",
   "admin.user_item.authServiceEmail": "<strong>Método de Login:</strong> Email",
   "admin.user_item.authServiceNotEmail": "<strong>Método de Login:</strong> {service}",
   "admin.user_item.confirmDemoteDescription": "Se você rebaixar você mesmo de Admin de Sistema e não exista outro usuário como privilegios de Admin de Sistema, você precisa-rá re-inscrever um Admin de Sistema acessando o servidor Mattermost através do terminal e executando o seguinte comando.",
@@ -895,13 +900,14 @@
   "admin.user_item.makeMember": "Tornar um Membro",
   "admin.user_item.makeSysAdmin": "Tornar Admin do Sistema",
   "admin.user_item.makeTeamAdmin": "Tornar Admin de Equipe",
+  "admin.user_item.manageTeams": "Gerenciar Equipes",
   "admin.user_item.member": "Membro",
   "admin.user_item.mfaNo": "<strong>MFA</strong>: Não",
   "admin.user_item.mfaYes": "<strong>MFA</strong>: Sim",
   "admin.user_item.resetMfa": "Remover MFA",
   "admin.user_item.resetPwd": "Resetar Senha",
   "admin.user_item.switchToEmail": "Trocar para Email/Senha",
-  "admin.user_item.sysAdmin": "System Admin",
+  "admin.user_item.sysAdmin": "Admin do Sistema",
   "admin.user_item.teamAdmin": "Admin Equipe",
   "admin.webrtc.enableDescription": "Quando verdadeiro, Mattermost permite fazer vídeo chamadas <strong>ponto-a-ponto</strong>. Chamadas WebRTC estão disponíveis no Chrome, Firefox e Mattermost Desktop Apps.",
   "admin.webrtc.enableTitle": "Ativar Mattermost WebRTC: ",
@@ -941,7 +947,7 @@
   "analytics.system.dailyActiveUsers": "Usuários Diários Ativos",
   "analytics.system.monthlyActiveUsers": "Usuários Mensais Ativos",
   "analytics.system.postTypes": "Posts, Arquivos e Hashtags",
-  "analytics.system.privateGroups": "Canal Privado",
+  "analytics.system.privateGroups": "Canais Privados",
   "analytics.system.publicChannels": "Canais Públicos",
   "analytics.system.skippedIntensiveQueries": "Para maximizar a performance, algumas estatísticas foram desativadas. Veja: <a href='https://docs.mattermost.com/administration/statistics.html' target='_blank'>https://docs.mattermost.com/administration/statistics.html</a>",
   "analytics.system.textPosts": "Post com Texto somente",
@@ -961,7 +967,7 @@
   "analytics.system.totalWebsockets": "Conexão Websocket",
   "analytics.team.activeUsers": "Usuários Ativos Com Posts",
   "analytics.team.newlyCreated": "Novos Usuários Criados",
-  "analytics.team.privateGroups": "Canal Privado",
+  "analytics.team.privateGroups": "Canais Privados",
   "analytics.team.publicChannels": "Canais Públicos",
   "analytics.team.recentActive": "Usuários Ativos Recentes",
   "analytics.team.recentUsers": "Usuários Ativos Recentes",
@@ -994,8 +1000,8 @@
   "audit_table.attemptedWebhookDelete": "Tentativa de deletar um webhook",
   "audit_table.by": " por {username}",
   "audit_table.byAdmin": " por um admin",
-  "audit_table.channelCreated": "Criado o {channelName} canal/grupo",
-  "audit_table.channelDeleted": "Excluído o canal/grupo com a URL {url}",
+  "audit_table.channelCreated": "Criado o canal {channelName}",
+  "audit_table.channelDeleted": "Excluído o canal com a URL {url}",
   "audit_table.establishedDM": "Estabelecido uma mensagem direta para o canal com {username}",
   "audit_table.failedExpiredLicenseAdd": "Falha ao adicionar uma nova licença uma vez que expirou ou ainda não foi iniciado",
   "audit_table.failedInvalidLicenseAdd": "Falha ao adicionar um licença inválida",
@@ -1004,14 +1010,14 @@
   "audit_table.failedPassword": "Falha ao alterar a senha - tentou-se atualizar a senha do usuário que estava conectado através do OAuth",
   "audit_table.failedWebhookCreate": "Falha ao criar uma webhook - sem permissão do canal",
   "audit_table.failedWebhookDelete": "Falha ao deletar um webhook - condições inapropriadas",
-  "audit_table.headerUpdated": "Atualizado o {channelName} canal/cabeçalho de grupo",
+  "audit_table.headerUpdated": "Atualizado o cabeçalho do canal {channelName}",
   "audit_table.ip": "Endereço de IP",
   "audit_table.licenseRemoved": "Licença removida com sucesso",
   "audit_table.loginAttempt": " (Tentativa de login)",
   "audit_table.loginFailure": " (Falha de login)",
   "audit_table.logout": "Logado fora da sua conta",
   "audit_table.member": "membro",
-  "audit_table.nameUpdated": "Atualizado nome canal/grupo {channelName}",
+  "audit_table.nameUpdated": "Atualizado nome do canal para {channelName}",
   "audit_table.oauthTokenFailed": "Falha ao obter um token de acesso OAuth - {token}",
   "audit_table.revokedAll": "Revogada todas as sessões atuais para a equipe",
   "audit_table.sentEmail": "Enviado um email para {email} para resetar sua senha",
@@ -1030,9 +1036,9 @@
   "audit_table.updateGlobalNotifications": "Atualizado suas definições globais de notificação",
   "audit_table.updatePicture": "Atualizado sua imagem do perfil",
   "audit_table.updatedRol": "Atualizado as função(ões) do usuário para ",
-  "audit_table.userAdded": "Adicionado {username} para o canal/grupo {channelName}",
+  "audit_table.userAdded": "Adicionado {username} no o canal {channelName}",
   "audit_table.userId": "Usuário ID",
-  "audit_table.userRemoved": "Removido {username} canal/grupo {channelName}",
+  "audit_table.userRemoved": "Removido {username} do canal {channelName}",
   "audit_table.verified": "Seu endereço de e-mail foi verificado com suscesso",
   "authorize.access": "Permitir acesso <strong>{appName}</strong>?",
   "authorize.allow": "Permitir",
@@ -1059,28 +1065,25 @@
   "channelHeader.removeFromFavorites": "Remover dos Favoritos",
   "channel_flow.alreadyExist": "Um canal com essa URL já existe",
   "channel_flow.changeUrlDescription": "Alguns caracteres não são permitidos nas URLs e podem ser removidos.",
-  "channel_flow.changeUrlTitle": "Change {term} URL",
-  "channel_flow.channel": "Channel",
-  "channel_flow.create": "Canal Privado",
-  "channel_flow.group": "Group",
+  "channel_flow.changeUrlTitle": "Mudar URL do Canal",
+  "channel_flow.create": "Criar Canal",
   "channel_flow.handleTooShort": "URL do canal precisa ter 2 ou mais caracteres minúsculos alfanuméricos",
   "channel_flow.invalidName": "Nome do Canal Inválido",
-  "channel_flow.set_url_title": "Set {term} URL",
+  "channel_flow.set_url_title": "Definir URL do Canal",
   "channel_header.addMembers": "Adicionar Membros",
   "channel_header.addToFavorites": "Adicionar aos Favoritos",
-  "channel_header.channel": "Channel",
+  "channel_header.channel": "Canal",
   "channel_header.channelHeader": "Editar Cabeçalho do Canal",
-  "channel_header.delete": "Deletar Canal",
+  "channel_header.delete": "Excluir Canal",
   "channel_header.flagged": "Posts Marcados",
-  "channel_header.group": "Group",
   "channel_header.leave": "Deixar o Canal",
   "channel_header.manageMembers": "Gerenciar Membros",
   "channel_header.notificationPreferences": "Preferências de Notificação",
   "channel_header.recentMentions": "Menções Recentes",
   "channel_header.removeFromFavorites": "Remover dos Favoritos",
-  "channel_header.rename": "Renomear Canal",
+  "channel_header.rename": "Renomear o Canal",
   "channel_header.setHeader": "Editar Cabeçalho do Canal",
-  "channel_header.setPurpose": "Edit {term} Purpose",
+  "channel_header.setPurpose": "Editar Propósito do Canal",
   "channel_header.viewInfo": "Ver Informações",
   "channel_header.viewMembers": "Ver Membros",
   "channel_header.webrtc.call": "Iniciar Vídeo Chamada",
@@ -1115,26 +1118,24 @@
   "channel_members_modal.addNew": " Adicionar Novos Membros",
   "channel_members_modal.members": " Membros",
   "channel_modal.cancel": "Cancelar",
-  "channel_modal.channel": "Channel",
   "channel_modal.createNew": "Criar Novo Canal",
-  "channel_modal.descriptionHelp": "Descreva como este {term} pode ser usado.",
+  "channel_modal.descriptionHelp": "Descreva como este canal deve ser utilizado.",
   "channel_modal.displayNameError": "O nome do canal deve ter com 2 ou mais caracteres",
   "channel_modal.edit": "Editar",
-  "channel_modal.group": "Group",
   "channel_modal.header": "Cabeçalho",
   "channel_modal.headerEx": "Ex.: \"[Título do Link](http://example.com)\"",
-  "channel_modal.headerHelp": "Configure o texto que irá aparecer no topo do {term} ao lado do nome {term}. Por exemplo, inclua os links utilizados frequentemente digitando [Link Title](http://example.com).",
-  "channel_modal.modalTitle": "New ",
+  "channel_modal.headerHelp": "Configure o texto que irá aparecer no topo do canal ao lado do nome do canal. Por exemplo, inclua os links utilizados frequentemente digitando [Link Title](http://example.com).",
+  "channel_modal.modalTitle": "Novo Canal",
   "channel_modal.name": "Nome",
   "channel_modal.nameEx": "Ex.: \"Bugs\", \"Marketing\", \"办公室恋情\"",
   "channel_modal.optional": "(opcional)",
-  "channel_modal.privateGroup1": "Criar um novo grupo privado com membros restritos. ",
-  "channel_modal.privateGroup2": "Criar um canal público",
+  "channel_modal.privateGroup1": "Criar um novo canal privado com membros restritos. ",
+  "channel_modal.privateGroup2": "Criar um canal privado",
   "channel_modal.publicChannel1": "Criar um canal público",
   "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})",
@@ -1229,11 +1230,9 @@
   "custom_emoji.search": "Pesquisar Emoji Personalizado",
   "default_channel.purpose": "Poste mensagens aqui que você quer que todos vejam. Todos se tornam automaticamente membros permanentes deste canal quando se juntam à equipe.",
   "delete_channel.cancel": "Cancelar",
-  "delete_channel.channel": "channel",
   "delete_channel.confirm": "Confirmar EXCLUSÃO do Canal",
   "delete_channel.del": "Deletar",
-  "delete_channel.group": "group",
-  "delete_channel.question": "Isto irá apagar o canal da equipe e todo o conteúdo não vai estar mais disponível para os usuários. Você tem certeza de que deseja apagar o {term} {display_name}?",
+  "delete_channel.question": "Isto irá apagar o canal da equipe e todo o conteúdo não vai estar mais disponível para os usuários. Você tem certeza de que deseja apagar o canal {display_name}?",
   "delete_post.cancel": "Cancelar",
   "delete_post.comment": "Comentário",
   "delete_post.confirm": "Confirmar Delete {term}",
@@ -1247,11 +1246,9 @@
   "edit_channel_header_modal.save": "Salvar",
   "edit_channel_header_modal.title": "Editar Cabeçalho para o {channel}",
   "edit_channel_header_modal.title_dm": "Editar cabeçalho",
-  "edit_channel_purpose_modal.body": "Descreva como este {type} deve ser usado. Este texto aparece na lista de canais no menu \"Mais...\" e ajuda os outros a decidir se deseja participar.",
+  "edit_channel_purpose_modal.body": "Descreva como este canal deve ser utilizado. Este texto aparece na lista de canais no menu \"Mais...\" e ajuda os outros a decidir se deseja participar.",
   "edit_channel_purpose_modal.cancel": "Cancelar",
-  "edit_channel_purpose_modal.channel": "Channel",
   "edit_channel_purpose_modal.error": "Este propósito do canal é muito longo, por favor insira um menor",
-  "edit_channel_purpose_modal.group": "Group",
   "edit_channel_purpose_modal.save": "Salvar",
   "edit_channel_purpose_modal.title1": "Editar Propósito",
   "edit_channel_purpose_modal.title2": "Editar Propósito para ",
@@ -1302,12 +1299,14 @@
   "error.not_found.link_message": "Voltar para Mattermost",
   "error.not_found.message": "A página que você estava tentando alcançar não existe",
   "error.not_found.title": "Página não encontrada",
-  "error.not_supported.message": "Navegação privada não é suportado",
-  "error.not_supported.title": "Navegador não suportado",
   "error_bar.expired": "Licença Enterprise está expirada e alguns recursos podem estar desativados. <a href='{link}' target='_blank'>Por favor, renovar.</a>",
   "error_bar.expiring": "Licença Enterprise expirou em {date}. <a href='{link}' target='_blank'>Por favor, renovar.</a>",
   "error_bar.past_grace": "Licença Enterprise está expirada e alguns recursos podem estar desativados. Por favor entre em contato com o Administrador do Sistema para detalhes.",
   "error_bar.preview_mode": "Modo de visualização: Notificações por E-mail não foram configuradas",
+  "error_bar.site_url": "Por favor configure seus {docsLink} usando o {link}",
+  "error_bar.site_url.docsLink": "Site URL",
+  "error_bar.site_url.link": "Console do Sistema",
+  "error_bar.site_url_gitlab": "Por favor configure seus {docsLink} no Console do Sistema ou no gitlab.rb se você estiver utilizando o GitLab Mattermost.",
   "file_attachment.download": "Download",
   "file_info_preview.size": "Tamanho ",
   "file_info_preview.type": "Tipo do arquivo ",
@@ -1542,12 +1541,12 @@
   "intro_messages.channel": "canal",
   "intro_messages.creator": "Este é o início do {name} {type}, criado por {creator} em {date}.",
   "intro_messages.default": "<h4 class='channel-intro__title'>Início de {display_name}</h4><p class='channel-intro__content'><strong>Bem vindo a {display_name}!</strong><br/><br/>Poste mensagens aqui que você quer que todos vejam. Todos se tornam automaticamente membros permanentes deste canal quando se juntam à equipe.</p>",
-  "intro_messages.group": "Canal Privado",
+  "intro_messages.group": "canal privado",
   "intro_messages.invite": "Convidar outras pessoas para este {type}",
   "intro_messages.inviteOthers": "Convide outros para esta equipe",
   "intro_messages.noCreator": "Este é o início do {name} {type}, criado em {date}.",
   "intro_messages.offTopic": "<h4 class=\"channel-intro__title\">Início do {display_name}</h4><p class=\"channel-intro__content\">Este é o início do {display_name}, um canal para conversas não relacionadas ao trabalho<br/></p>",
-  "intro_messages.onlyInvited": " Somente membros convidados podem ver este grupo privado.",
+  "intro_messages.onlyInvited": " Somente membros convidados podem ver este canal privado.",
   "intro_messages.purpose": " O propósito deste {type} é: {purpose}.",
   "intro_messages.setHeader": "Definir um Cabeçalho",
   "intro_messages.teammate": "Este é o início de seu histórico de mensagens com esta equipe. Mensagens diretas e arquivos compartilhados aqui não são mostrados para pessoas fora dessa área.",
@@ -1563,7 +1562,7 @@
   "invite_member.modalButton": "Sim, Descartar",
   "invite_member.modalMessage": "Você tem convites não enviados, você tem certeza que quer descartar eles?",
   "invite_member.modalTitle": "Descartar Convites?",
-  "invite_member.newMember": "Convidar Para Equipe",
+  "invite_member.newMember": "Enviar Email de Convite",
   "invite_member.send": "Enviar Convite",
   "invite_member.send2": "Enviar Convites",
   "invite_member.sending": " Enviando",
@@ -1573,7 +1572,7 @@
   "ldap_signup.length_error": "O nome deve ser de 3 ou mais caracteres até um máximo de 15",
   "ldap_signup.teamName": "Entre o nome da nova equipe",
   "ldap_signup.team_error": "Por favor entre o nome da equipe",
-  "leave_team_modal.desc": "Você será removido de todos os canais públicos e grupos privados.  Se a equipe é privada você não será capaz de se juntar à equipe.  Você tem certeza?",
+  "leave_team_modal.desc": "Você será removido de todos os canais públicos e privados.  Se a equipe é privada você não será capaz de se juntar à equipe.  Você tem certeza?",
   "leave_team_modal.no": "Não",
   "leave_team_modal.title": "Deixar a equipe?",
   "leave_team_modal.yes": "Sim",
@@ -1648,7 +1647,7 @@
   "mobile.account_notifications.threads_mentions": "Menções em tópicos",
   "mobile.account_notifications.threads_start": "Tópicos que eu iniciei",
   "mobile.account_notifications.threads_start_participate": "Tópicos que eu iniciei ou participo",
-  "mobile.channel_info.alertMessageDeleteChannel": "Você tem certeza que quer deixar o {term} {name}?",
+  "mobile.channel_info.alertMessageDeleteChannel": "Você tem certeza que quer deletar o {term} {name}?",
   "mobile.channel_info.alertMessageLeaveChannel": "Você tem certeza que quer deixar o {term} {name}?",
   "mobile.channel_info.alertNo": "Não",
   "mobile.channel_info.alertTitleDeleteChannel": "Deletar {term}",
@@ -1676,7 +1675,7 @@
   "mobile.components.select_server_view.proceed": "Prosseguir",
   "mobile.components.select_server_view.siteUrlPlaceholder": "https://mattermost.example.com",
   "mobile.create_channel": "Criar",
-  "mobile.create_channel.private": "Novo Grupo Privado",
+  "mobile.create_channel.private": "Novo Canal Privado",
   "mobile.create_channel.public": "Novo Canal Público",
   "mobile.custom_list.no_results": "Nenhum Resultado",
   "mobile.edit_post.title": "Editando a Mensagem",
@@ -1724,8 +1723,8 @@
   "more_channels.title": "Mais Canais",
   "more_direct_channels.close": "Fechar",
   "more_direct_channels.message": "Mensagem",
-  "more_direct_channels.new_convo_note": "Isto irá iniciar uma nova conversa. Se você adicionar muitas pessoas, considere em criar um grupo privado.",
-  "more_direct_channels.new_convo_note.full": "Você atingiu o número máximo de pessoas nesta conversa. Considere em criar um grupo privado.",
+  "more_direct_channels.new_convo_note": "Isto irá iniciar uma nova conversa. Se você adicionar muitas pessoas, considere em criar um canal privado.",
+  "more_direct_channels.new_convo_note.full": "Você atingiu o número máximo de pessoas nesta conversa. Considere em criar um canal privado.",
   "more_direct_channels.title": "Mensagens Diretas",
   "msg_typing.areTyping": "{users} e {last} estão digitando...",
   "msg_typing.isTyping": "{user} está digitando...",
@@ -1751,12 +1750,13 @@
   "navbar.viewPinnedPosts": "Visualizar Postagens Fixadas",
   "navbar_dropdown.about": "Sobre o Mattermost",
   "navbar_dropdown.accountSettings": "Definições de Conta",
+  "navbar_dropdown.addMemberToTeam": "Adicionar Membros a Equipe",
   "navbar_dropdown.console": "Console do Sistema",
   "navbar_dropdown.create": "Criar uma Nova Equipe",
   "navbar_dropdown.emoji": "Emoji Personalizado",
   "navbar_dropdown.help": "Ajuda",
   "navbar_dropdown.integrations": "Integrações",
-  "navbar_dropdown.inviteMember": "Convidar Para Equipe",
+  "navbar_dropdown.inviteMember": "Enviar Email de Convite",
   "navbar_dropdown.join": "Junte-se a Outra Equipe",
   "navbar_dropdown.leave": "Sair da Equipe",
   "navbar_dropdown.logout": "Logout",
@@ -1788,6 +1788,7 @@
   "pending_post_actions.cancel": "Cancelar",
   "pending_post_actions.retry": "Tentar novamente",
   "permalink.error.access": "O permalink pertence a uma mensagem deletada ou a um canal o qual você não tem acesso.",
+  "permalink.error.title": "Mensagem Não Localizada",
   "post_attachment.collapse": "Mostrar menos...",
   "post_attachment.more": "Mostrar mais...",
   "post_body.commentedOn": "Comentário da mensagem de {name}: ",
@@ -1892,26 +1893,27 @@
   "setting_upload.noFile": "Nenhum arquivo selecionado.",
   "setting_upload.select": "Selecione o arquivo",
   "sidebar.channels": "Canais",
-  "sidebar.createChannel": "Criar um canal público",
-  "sidebar.createGroup": "Create new group",
+  "sidebar.createChannel": "Criar um novo canal público",
+  "sidebar.createGroup": "Criar um novo canal privado",
   "sidebar.direct": "Mensagens Diretas",
   "sidebar.favorite": "Favoritos",
   "sidebar.more": "Mais",
   "sidebar.moreElips": "Mais...",
   "sidebar.otherMembers": "Fora desta equipe",
-  "sidebar.pg": "Canal Privado",
+  "sidebar.pg": "Canais Privados",
   "sidebar.removeList": "Remover da lista",
-  "sidebar.tutorialScreen1": "<h4>Canais</h4><p><strong>Canais</strong> organizar conversas em diferentes tópicos. Eles estão abertos a todos em sua equipe. Para enviar comunicações privadas utilize <strong>Mensagens Diretas</strong> para uma única pessoa ou <strong>Grupos Privados</strong> para várias pessoas.</p>",
+  "sidebar.tutorialScreen1": "<h4>Canais</h4><p><strong>Canais</strong> organizam conversas em diferentes tópicos. Eles estão abertos a todos em sua equipe. Para enviar comunicações privadas utilize <strong>Mensagens Diretas</strong> para uma única pessoa ou <strong>Canais Privados</strong> para várias pessoas.</p>",
   "sidebar.tutorialScreen2": "<h4>Canais \"{townsquare}\" e \"{offtopic}\"</h4><p>Aqui estão dois canais públicos para começar:</p><p><strong>{townsquare}</strong> é um lugar comunicação de toda equipe. Todo mundo em sua equipe é um membro deste canal.</p><p><strong>{offtopic}</strong> é um lugar para diversão e humor fora dos canais relacionados com o trabalho. Você e sua equipe podem decidir qual outros canais serão criados.</p>",
-  "sidebar.tutorialScreen3": "<h4>Criando e participando de Canais</h4><p>Clique em <strong>\"Mais...\"</strong> para criar um novo canal ou participar de um já existente.</p><p>Você também pode criar um novo canal ou grupo privado ao clicar em <strong>no símbolo \"+\"</strong> ao lado do canal ou grupo privado no cabeçalho.</p>",
+  "sidebar.tutorialScreen3": "<h4>Criando e Participando de Canais</h4><p>Clique em <strong>\"Mais...\"</strong> para criar um novo canal ou participar de um já existente.</p><p>Você também pode criar um novo canal ao clicar <strong>no símbolo \"+\"</strong> ao lado do cabeçalho canal público ou privado.</p>",
   "sidebar.unreadAbove": "Post(s) não lidos acima",
   "sidebar.unreadBelow": "Post(s) não lidos abaixo",
   "sidebar_header.tutorial": "<h4>Menu Principal</h4><p>O <strong>Menu Principal</strong> é onde você pode <strong>Convidar Para Equipe</strong>, acessar sua <strong>Definição de Conta</strong> e ajustar o seu <strong>Tema de Cores</strong>.</p><p>Administradores de equipe podem também acessar suas <strong>Configurações de Equipe</strong> a partir deste menu.</p><p>Administradores de Sistema vão encontrar em <strong>Console do Sistema</strong> opções para administrar todo o sistema.</p>",
   "sidebar_right_menu.accountSettings": "Definições de Conta",
+  "sidebar_right_menu.addMemberToTeam": "Adicionar Membros a Equipe",
   "sidebar_right_menu.console": "Console do Sistema",
   "sidebar_right_menu.flagged": "Posts Marcados",
   "sidebar_right_menu.help": "Ajuda",
-  "sidebar_right_menu.inviteNew": "Convidar Para Equipe",
+  "sidebar_right_menu.inviteNew": "Enviar Email de Convite",
   "sidebar_right_menu.logout": "Logout",
   "sidebar_right_menu.manageMembers": "Gerenciar Membros",
   "sidebar_right_menu.nativeApps": "Download Aplicativos",
@@ -1979,7 +1981,7 @@
   "suggestion.mention.morechannels": "Outros Canais",
   "suggestion.mention.nonmembers": "Não no Canal",
   "suggestion.mention.special": "Menções Especiais",
-  "suggestion.search.private": "Canal Privado",
+  "suggestion.search.private": "Canais Privados",
   "suggestion.search.public": "Canais Públicos",
   "team_export_tab.download": "download",
   "team_export_tab.export": "Exportar",
@@ -2035,7 +2037,7 @@
   "tutorial_intro.mobileAppsLinkText": "PC, Mac, iOS e Android",
   "tutorial_intro.next": "Próximo",
   "tutorial_intro.screenOne": "<h3>Bem vindo ao:</h3><h1>Mattermost</h1><p>Toda comunicação da sua equipe em um só lugar, pesquisas instantâneas disponível em qualquer lugar</p><p>Mantenha sua equipe conectada para ajudá-los a conseguir o que mais importa.</p>",
-  "tutorial_intro.screenTwo": "<h3>Como Mattermost funciona:</h3><p>A comunicação acontece em canais de discussão pública, grupos privados e mensagens diretas.</p><p>Tudo é arquivado e pesquisável a partir de qualquer desktop, laptop ou telefone com suporte a web.</p>",
+  "tutorial_intro.screenTwo": "<h3>Como Mattermost funciona:</h3><p>A comunicação acontece em canais públicos de discussão, canais privados e mensagens diretas.</p><p>Tudo é arquivado e pesquisável a partir de qualquer desktop com suporte a web, laptop ou celular.</p>",
   "tutorial_intro.skip": "Pular o tutorial",
   "tutorial_intro.support": "Precisa de alguma coisa, envie um e-mail para nós no ",
   "tutorial_intro.teamInvite": "Convidar pessoas para equipe",
@@ -2055,7 +2057,7 @@
   "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",
   "user.settings.advance.embed_toggle": "Exibir mostrar/esconder para todas as pre-visualizações",
-  "user.settings.advance.emojipicker": "Ativar a seleção de emoji na caixa de entrada de mensagem",
+  "user.settings.advance.emojipicker": "Ativar o seletor de emoji para reações e na caixa de entrada de mensagem",
   "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Recurso} other {Recursos}} Ativado",
   "user.settings.advance.formattingDesc": "Se ativado, posts serão formatados para criar links, exibir emoji, estilo de texto e adicionar quebra de linhas. Por padrão é definido como ativado. Mudando está configuração será necessário recarregar a página.",
   "user.settings.advance.formattingTitle": "Ativar Formatação de Post",
diff --git a/webapp/i18n/ru.json b/webapp/i18n/ru.json
index a05d0c6e83..d06a5eb2cc 100644
--- a/webapp/i18n/ru.json
+++ b/webapp/i18n/ru.json
@@ -3,17 +3,17 @@
   "about.copyright": "Copyright 2016 Mattermost, Inc. Все права защищены",
   "about.database": "База данных:",
   "about.date": "Дата сборки:",
-  "about.enterpriseEditionLearn": "Узнать больше об Enterprise редакции на ",
+  "about.enterpriseEditionLearn": "Подробнее о редакции Enterprise читайте на ",
   "about.enterpriseEditionSt": "Современное общение в вашей внутренней сети",
-  "about.enterpriseEditione1": "Редакция Enterprise",
+  "about.enterpriseEditione1": "Enterprise Edition",
   "about.hash": "Хэш сборки:",
   "about.hashee": "Хэш сборки EE:",
   "about.licensed": "Лицензия зарегистрирована на:",
   "about.number": "Номер сборки:",
   "about.teamEditionLearn": "Присоединяйтесь к сообществу Mattermost на ",
   "about.teamEditionSt": "Всё общение вашей команды собрано в одном месте, с мгновенным поиском и доступом отовсюду.",
-  "about.teamEditiont0": "Редакция для команд",
-  "about.teamEditiont1": "Редакция Enterprise",
+  "about.teamEditiont0": "Team Edition",
+  "about.teamEditiont1": "Enterprise Edition",
   "about.title": "О Mattermost",
   "about.version": "Версия:",
   "access_history.title": "История доступа",
@@ -22,13 +22,13 @@
   "activity_log.firstTime": "Первая активность: {date}, {time}",
   "activity_log.lastActivity": "Последняя активность: {date}, {time}",
   "activity_log.logout": "Выйти",
-  "activity_log.moreInfo": "Дополнительно",
+  "activity_log.moreInfo": "Подробнее",
   "activity_log.os": "ОС: {os}",
   "activity_log.sessionId": "Идентификатор сессии: {id}",
-  "activity_log.sessionsDescription": "Сессии создаются когда вы входите через новый браузер на устройстве. Они позволяют использовать Mattermost без необходимости повторного входа на протяжении времени установленого Системным Администратором. Если вы хотите выйти раньше, используйте кнопку 'Выход' ниже, чтобы завершить сессию.",
+  "activity_log.sessionsDescription": "Создание сессий происходит при входе с нового браузера или устройства. Они позволяют использовать Mattermost без необходимости повторного входа на протяжении времени установленного Системным Администратором. Если вы хотите завершить сессию, нажмите кнопку 'Выйти'.",
   "activity_log_modal.android": "Android",
-  "activity_log_modal.androidNativeApp": "Приложение Android",
-  "activity_log_modal.desktop": "Нативное приложение для настольного ПК",
+  "activity_log_modal.androidNativeApp": "Приложение для Android",
+  "activity_log_modal.desktop": "Приложение для ПК",
   "activity_log_modal.iphoneNativeApp": "Приложение для iPhone",
   "add_command.autocomplete": "Автодополнение",
   "add_command.autocomplete.help": "(Необязательно) Показывать слэш-команду в списке автодополнения.",
@@ -137,7 +137,8 @@
   "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Выберите, будет ли вебхук отправлен только если первое слово точно совпадает с ключевым словом или если оно хотя бы начинается с него.",
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "Первое слово соответствует слову события полностью",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "Первое слово начинается со слова триггера",
-  "admin.advance.cluster": "Высокая доступность (Beta)",
+  "add_users_to_team.title": "Add New Members To {teamName} Team",
+  "admin.advance.cluster": "High Availability",
   "admin.advance.metrics": "Мониторинг производительности",
   "admin.audits.reload": "Перезагрузить логи активности пользователя",
   "admin.audits.title": "Логи активности пользователя",
@@ -282,6 +283,8 @@
   "admin.email.requireVerificationDescription": "Если истина, для разрешения входа Mattermost требует подтверждения адреса эл. почты после создания учетной записи. Обычно включается в production-системе. Разработчики могут отключить подтверждение адреса эл. почты для упрощения работы.",
   "admin.email.requireVerificationTitle": "Требовать подтверждение адреса электронной почты: ",
   "admin.email.selfPush": "Введите адрес сервиса отправки push-уведомлений вручную",
+  "admin.email.skipServerCertificateVerification.description": "When true, Mattermost will not verify the email server certificate.",
+  "admin.email.skipServerCertificateVerification.title": "Пропустить проверку сертификата:",
   "admin.email.smtpPasswordDescription": " Получите эти данные от администратора, обслуживающего ваш сервер электронной почты.",
   "admin.email.smtpPasswordExample": "Например: \"yourpassword\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.email.smtpPasswordTitle": "Пароль SMTP Сервера:",
@@ -333,6 +336,8 @@
   "admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "командная строка",
   "admin.general.policy.restrictPrivateChannelDeletionDescription": "Установите политики того, кто может удалять публичные каналы. Удалённые каналы могут быть восстановлены из базы данных с помощью {commandLineToolLink}.",
   "admin.general.policy.restrictPrivateChannelDeletionTitle": "Включить возможность удаления публичных каналов для:",
+  "admin.general.policy.restrictPrivateChannelManageMembersDescription": "Set policy on who can add and remove members from private channels.",
+  "admin.general.policy.restrictPrivateChannelManageMembersTitle": "Enable managing of private channel members for:",
   "admin.general.policy.restrictPrivateChannelManagementDescription": "Задайте политики того, кто может создавать, удалять, переименовывать общедоступные каналы и устанавливать для них заголовок или цель.",
   "admin.general.policy.restrictPrivateChannelManagementTitle": "Включить возможность изменять названия публичных каналов для:",
   "admin.general.policy.restrictPublicChannelCreationDescription": "Установите политики того, кто может создавать публичные каналы.",
@@ -506,7 +511,7 @@
   "admin.log.enableDiagnosticsDescription": "Включите функцию отправки отчётов об ошибках и диагностической информации для того, чтобы мы смогли улучшить Mattermost. Прочтите нашу <a href=\"https://about.mattermost.com/default-privacy-policy/\" target='_blank'>политику безопасности.</a>",
   "admin.log.enableWebhookDebugging": "Включить отладку Webhook-ов:",
   "admin.log.enableWebhookDebuggingDescription": "Вы можете установить это значение в false, чтобы отключить отладочное журналирование тел всех запросов входящие вебхуки.",
-  "admin.log.fileDescription": "Обычно значение true в продакшене.   Если true, то файлы журналов записываются в файл журнала, указанный в поле расположение файла ниже.",
+  "admin.log.fileDescription": "Typically set to true in production. When true, logged events are written to the mattermost.log file in the directory specified in the File Log Directory field. The logs are rotated at 10,000 lines and archived to a file in the same directory, and given a name with a datestamp and serial number. For example, mattermost.2017-03-31.001.",
   "admin.log.fileLevelDescription": "Эта настройка определяет уровень детализации, на котором события записываются в лог-файл. ERROR: Записываются только сообщения об ошибках. INFO: Записываются сообщения об ошибках и информация о процессе запуска и инициализации. DEBUG:  Высокодетализированный вывод для отладки разработчиками при решении проблем.",
   "admin.log.fileLevelTitle": "Файловый уровень логирования:",
   "admin.log.fileTitle": "Исходящие журнали в файл: ",
@@ -521,7 +526,7 @@
   "admin.log.formatTitle": "Формат файла:",
   "admin.log.levelDescription": "Эта настройка определяет уровень детализации, на котором события записываются в консоль. ERROR: Записываются только сообщения об ошибках. INFO: Записываются сообщения об ошибках и информация о процессе запуска и инициализации. DEBUG: Высокодетализированный вывод для отладки разработчиками при решении проблем.",
   "admin.log.levelTitle": "Уровень логирования в консоли:",
-  "admin.log.locationDescription": "File to which log files are written. If blank, will be set to ./logs/mattermost, which writes logs to mattermost.log. Log rotation is enabled and every 10,000 lines of log information is written to new files stored in the same directory, for example mattermost.2015-09-23.001, mattermost.2015-09-23.002, and so forth.",
+  "admin.log.locationDescription": "The location of the log files. If blank, they are stored in the ./logs directory. The path that you set must exist and Mattermost must have write permissions in it.",
   "admin.log.locationPlaceholder": "Укажите расположение файла",
   "admin.log.locationTitle": "Каталог с файлом журнала:",
   "admin.log.logSettings": "Настройки журнала",
@@ -691,7 +696,7 @@
   "admin.service.corsTitle": "Разрешить кроссдоменные запросы от:",
   "admin.service.developerDesc": "Когда включено, на красной панели сверху будут показываться ошибки Javascript. Не рекомендуется включать на боевом сервере. ",
   "admin.service.developerTitle": "Включить режим разработчика:",
-  "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
+  "admin.service.enforcMfaTitle": "Принудительная многофакторная аутентификация:",
   "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",
@@ -725,7 +730,7 @@
   "admin.service.sessionCacheDesc": "Продолжительность кеширования сессии в памяти (в минутах).",
   "admin.service.sessionDaysEx": "Например: \"30\"",
   "admin.service.siteURL": "Адрес сайта:",
-  "admin.service.siteURLDescription": "URL-адрес, включая номер порта и протокол, который пользователи используют для доступа к Mattermost. Это поле может быть оставлено пустым, если вы не настраиваете почтовые объединения в <b>Уведомлениях > Электронная почта</b>. Если оставить пустым, URL-адрес автоматически настраивается на основе входящего трафика.",
+  "admin.service.siteURLDescription": "The URL, including port number and protocol, that users will use to access Mattermost. This setting is required.",
   "admin.service.siteURLExample": "Например: \"https://mattermost.example.com:1234\"",
   "admin.service.ssoSessionDays": "Длина сессии SSO (дней):",
   "admin.service.ssoSessionDaysDesc": "Количество дней с последнего ввода пользователем своих учетных данных до истечения срока пользовательской сессии. Если метод аутентификации - SAML или GitLab, пользователь может быть автоматически впущен обратно в Mattermost, если он уже вошел в SAML или GitLab. После изменения этого параметра он вступит в силу после следующего ввода пользователем своих учетных данных.",
@@ -743,11 +748,11 @@
   "admin.service.webhooksTitle": "Включить входящие Webhook'и: ",
   "admin.service.writeTimeout": "Тайм-аут записи:",
   "admin.service.writeTimeoutDescription": "При использовании HTTP (небезопасно) — максимально допустимое время с момента окончания чтения заголовка запроса до окончания записи ответа. В случае с HTTPS — полное время с момента установки соединения до окончания записи ответа.",
-  "admin.sidebar.addTeamSidebar": "Add team from sidebar menu",
+  "admin.sidebar.addTeamSidebar": "Добавить команду из меню боковой панели",
   "admin.sidebar.advanced": "Дополнительно",
   "admin.sidebar.audits": "Аудит",
   "admin.sidebar.authentication": "Аутентификация",
-  "admin.sidebar.cluster": "Высокая доступность (Beta)",
+  "admin.sidebar.cluster": "High Availability",
   "admin.sidebar.compliance": "Соответствие стандартам",
   "admin.sidebar.configuration": "Конфигурация",
   "admin.sidebar.connections": "Соединения",
@@ -784,7 +789,7 @@
   "admin.sidebar.push": "Мобильные Push-уведомления",
   "admin.sidebar.rateLimiting": "Ограничение скорости",
   "admin.sidebar.reports": "ОТЧЁТЫ",
-  "admin.sidebar.rmTeamSidebar": "Remove team from sidebar menu",
+  "admin.sidebar.rmTeamSidebar": "Удалить команду из бокового меню",
   "admin.sidebar.saml": "SAML",
   "admin.sidebar.security": "Безопасность",
   "admin.sidebar.sessions": "Сеансы",
@@ -794,7 +799,7 @@
   "admin.sidebar.statistics": "Статистика команды",
   "admin.sidebar.storage": "Хранилище",
   "admin.sidebar.support": "Право и поддержка",
-  "admin.sidebar.teams": "TEAMS ({count, number})",
+  "admin.sidebar.teams": "КОМАНДЫ ({count, number})",
   "admin.sidebar.users": "Пользователи",
   "admin.sidebar.usersAndTeams": "Пользователи и команды",
   "admin.sidebar.view_statistics": "Статистика системы",
@@ -880,8 +885,8 @@
   "admin.team_analytics.activeUsers": "Активные пользователи с сообщениями",
   "admin.team_analytics.totalPosts": "Всего сообщений",
   "admin.true": "да",
-  "admin.userList.title": "Users for {team}",
-  "admin.userList.title2": "Users for {team} ({count})",
+  "admin.userList.title": "Пользователи {team}",
+  "admin.userList.title2": "Пользователи для команды {team} ({count})",
   "admin.user_item.authServiceEmail": ", <strong>Метод входа:</strong> Email",
   "admin.user_item.authServiceNotEmail": ", <strong>Метод входа:</strong> {service}",
   "admin.user_item.confirmDemoteDescription": "If you demote yourself from the System Admin role and there is not another user with System Admin privileges, you'll need to re-assign a System Admin by accessing the Mattermost server through a terminal and running the following command.",
@@ -895,13 +900,14 @@
   "admin.user_item.makeMember": "Сделать участником",
   "admin.user_item.makeSysAdmin": "Сделать администратором системы",
   "admin.user_item.makeTeamAdmin": "Сделать администратором команды",
+  "admin.user_item.manageTeams": "Manage Teams",
   "admin.user_item.member": "Участник",
   "admin.user_item.mfaNo": ", <strong>MFA</strong>: Нет",
   "admin.user_item.mfaYes": ", <strong>MFA</strong>: Да",
   "admin.user_item.resetMfa": "Удалить MFA",
   "admin.user_item.resetPwd": "Сброс пароля",
   "admin.user_item.switchToEmail": "Переключение на E-Mail/Пароль",
-  "admin.user_item.sysAdmin": "System Admin",
+  "admin.user_item.sysAdmin": "Системный администратор",
   "admin.user_item.teamAdmin": "Team Admin",
   "admin.webrtc.enableDescription": "При выборе Mattermost позволяет совершать <strong>тет-а-тет</strong> видеозвонки. WebRTC звонки доступны в браузерах Chrome и Firefox, а так же в приложениях Mattermost.",
   "admin.webrtc.enableTitle": "Включить Mattermost WebRTC:",
@@ -941,7 +947,7 @@
   "analytics.system.dailyActiveUsers": "Активность пользователей за день",
   "analytics.system.monthlyActiveUsers": "Активность пользователей за месяц",
   "analytics.system.postTypes": "Сообщения, файлы и хештэги",
-  "analytics.system.privateGroups": "Private Groups",
+  "analytics.system.privateGroups": "Покинуть канал",
   "analytics.system.publicChannels": "Публичные Каналы",
   "analytics.system.skippedIntensiveQueries": "Для максимальной производительности некоторая статистика отключена. Вы можете включить её снова в файле конфигурации config.json. Смотрите: <a href='https://docs.mattermost.com/administration/statistics.html' target='_blank'>https://docs.mattermost.com/administration/statistics.html</a>",
   "analytics.system.textPosts": "Только текстовые сообщения",
@@ -961,7 +967,7 @@
   "analytics.system.totalWebsockets": "Соединений Websocket",
   "analytics.team.activeUsers": "Активные пользователи с сообщениями",
   "analytics.team.newlyCreated": "Вновь созданные пользователи",
-  "analytics.team.privateGroups": "Private Groups",
+  "analytics.team.privateGroups": "Покинуть канал",
   "analytics.team.publicChannels": "Публичные каналы",
   "analytics.team.recentActive": "Недавние активные пользователи",
   "analytics.team.recentUsers": "Недавние активные пользователи",
@@ -1059,20 +1065,17 @@
   "channelHeader.removeFromFavorites": "Удалить из избранного",
   "channel_flow.alreadyExist": "Канал с таким URL уже существует",
   "channel_flow.changeUrlDescription": "Некоторые символы не разрешены в URL-адресе и могут быть удалены.",
-  "channel_flow.changeUrlTitle": "Change {term} URL",
-  "channel_flow.channel": "Channel",
+  "channel_flow.changeUrlTitle": "Change Channel URL",
   "channel_flow.create": "Покинуть канал",
-  "channel_flow.group": "Group",
   "channel_flow.handleTooShort": "Ссылка на канал должна быть не короче 2-х буквенных символов",
   "channel_flow.invalidName": "Недопустимое имя канала",
-  "channel_flow.set_url_title": "Set {term} URL",
+  "channel_flow.set_url_title": "Set Channel URL",
   "channel_header.addMembers": "Добавить участников",
   "channel_header.addToFavorites": "Добавить в избранное",
-  "channel_header.channel": "Channel",
+  "channel_header.channel": "Канал",
   "channel_header.channelHeader": "Изменить заголовок канала",
   "channel_header.delete": "Удалить канал...",
   "channel_header.flagged": "Отмеченные сообщения",
-  "channel_header.group": "Group",
   "channel_header.leave": "Покинуть канал",
   "channel_header.manageMembers": "Управление участниками",
   "channel_header.notificationPreferences": "Настройка уведомлений",
@@ -1080,7 +1083,7 @@
   "channel_header.removeFromFavorites": "Удалить из избранного",
   "channel_header.rename": "Переименовать канал",
   "channel_header.setHeader": "Изменить заголовок канала",
-  "channel_header.setPurpose": "Edit {term} Purpose",
+  "channel_header.setPurpose": "Edit Channel Purpose",
   "channel_header.viewInfo": "Информация",
   "channel_header.viewMembers": "Просмотреть список участников",
   "channel_header.webrtc.call": "Видеовызов",
@@ -1115,16 +1118,14 @@
   "channel_members_modal.addNew": " Добавить участников",
   "channel_members_modal.members": "Участники",
   "channel_modal.cancel": "Отмена",
-  "channel_modal.channel": "Channel",
   "channel_modal.createNew": "Создать новый канал",
-  "channel_modal.descriptionHelp": "Опишите, как следует использовать {term}.",
+  "channel_modal.descriptionHelp": "Опишите, как следует использовать этот канал.",
   "channel_modal.displayNameError": "Имя канала должно быть от двух символов",
   "channel_modal.edit": "Редактировать",
-  "channel_modal.group": "Group",
   "channel_modal.header": "Заголовок",
   "channel_modal.headerEx": "Например: \"[Заголовок ссылки](http://example.com)\"",
-  "channel_modal.headerHelp": "Задайте текст, который появится в заголовке {term} рядом с названием {term}. К примеру, вы можете включить часто используемые ссылки, введя [Текст ссылки](http://example.com).",
-  "channel_modal.modalTitle": "New ",
+  "channel_modal.headerHelp": "Задайте текст, который появится в заголовке канала рядом с названием. К примеру, вы можете включить часто используемые ссылки, введя [Текст ссылки](http://example.com).",
+  "channel_modal.modalTitle": "New Channel",
   "channel_modal.name": "Имя",
   "channel_modal.nameEx": "Например: \"Bugs\", \"Маркетинг\", \"客户支持\"",
   "channel_modal.optional": "(необязательно)",
@@ -1134,7 +1135,7 @@
   "channel_modal.publicChannel2": "Создать новый публичный канал. ",
   "channel_modal.purpose": "Назначение",
   "channel_modal.purposeEx": "Например: \"Канал для ошибок и пожеланий\"",
-  "channel_notification.push": "Send mobile push notifications",
+  "channel_notification.push": "Отправить мобильное push-уведомление",
   "channel_notifications.allActivity": "При любой активности",
   "channel_notifications.allUnread": "При любых непрочитанных сообщениях",
   "channel_notifications.globalDefault": "По умолчанию глобально ({notifyLevel})",
@@ -1229,11 +1230,9 @@
   "custom_emoji.search": "Найти кастомные Emoji",
   "default_channel.purpose": "Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.",
   "delete_channel.cancel": "Отмена",
-  "delete_channel.channel": "channel",
   "delete_channel.confirm": "Подтверждение УДАЛЕНИЯ канала",
   "delete_channel.del": "Удалить",
-  "delete_channel.group": "group",
-  "delete_channel.question": "Это удалит канал из команды и все его данные. Вы уверены, что хотите удалить {display_name} {term}?",
+  "delete_channel.question": "Это удалит канал из команды и все его данные. Вы уверены, что хотите удалить канал {display_name}?",
   "delete_post.cancel": "Отмена",
   "delete_post.comment": "Комментарий",
   "delete_post.confirm": "Подтвердите удаление {term}",
@@ -1247,11 +1246,9 @@
   "edit_channel_header_modal.save": "Сохранить",
   "edit_channel_header_modal.title": "Редактировать заголовок {channel}",
   "edit_channel_header_modal.title_dm": "Правка заголовка",
-  "edit_channel_purpose_modal.body": "Опишите, как {type} должен использоваться. Этот текст будет виден окне, после нажатия кнопки \"Еще...\" в списке каналов и поможет другим с выбором.",
+  "edit_channel_purpose_modal.body": "Опишите, как должен использоваться этот канал. Текст будет виден после нажатия кнопки \"Еще...\" в списке каналов и поможет другим пользователям с выбором.",
   "edit_channel_purpose_modal.cancel": "Отмена",
-  "edit_channel_purpose_modal.channel": "Channel",
   "edit_channel_purpose_modal.error": "Назначение канала слишком длинное",
-  "edit_channel_purpose_modal.group": "Group",
   "edit_channel_purpose_modal.save": "Сохранить",
   "edit_channel_purpose_modal.title1": "Редактировать Назначение",
   "edit_channel_purpose_modal.title2": "Редактировать назначение для ",
@@ -1302,12 +1299,14 @@
   "error.not_found.link_message": "Назад в Mattermost",
   "error.not_found.message": "Эта страница не существует",
   "error.not_found.title": "Страница не найдена",
-  "error.not_supported.message": "Приватный просмотр не поддерживается",
-  "error.not_supported.title": "Браузер не поддерживается",
   "error_bar.expired": "Enterprise license is expired and some features may be disabled. <a href='{link}' target='_blank'>Please renew.</a>",
   "error_bar.expiring": "Enterprise license expires on {date}. <a href='{link}' target='_blank'>Please renew.</a>",
   "error_bar.past_grace": "Enterprise license is expired and some features may be disabled. Please contact your System Administrator for details.",
   "error_bar.preview_mode": "Режим просмотра: Email уведомления не настроены",
+  "error_bar.site_url": "Please configure your {docsLink} in the {link}.",
+  "error_bar.site_url.docsLink": "Адрес сайта:",
+  "error_bar.site_url.link": "Системная консоль",
+  "error_bar.site_url_gitlab": "Please configure your {docsLink} in the System Console or in gitlab.rb if you're using GitLab Mattermost.",
   "file_attachment.download": "Скачать",
   "file_info_preview.size": "Размер ",
   "file_info_preview.type": "Тип файла ",
@@ -1542,7 +1541,7 @@
   "intro_messages.channel": "канал",
   "intro_messages.creator": "This is the start of the {name} {type}, created by {creator} on {date}.",
   "intro_messages.default": "<h4 class='channel-intro__title'>Beginning of {display_name}</h4><p class='channel-intro__content'><strong>Welcome to {display_name}!</strong><br/><br/>Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.</p>",
-  "intro_messages.group": "private group",
+  "intro_messages.group": "Покинуть канал",
   "intro_messages.invite": "Пригласить других в {type}",
   "intro_messages.inviteOthers": "Пригласить других в эту команду",
   "intro_messages.noCreator": "Начало общения в {name} {type}, созданная {date}.",
@@ -1563,7 +1562,7 @@
   "invite_member.modalButton": "Да, Отменить",
   "invite_member.modalMessage": "Вы имеете неотправленные приглашения, вы уверены, что хотите отменить их?",
   "invite_member.modalTitle": "Отклонить приглашение?",
-  "invite_member.newMember": "Пригласить в команду",
+  "invite_member.newMember": "Send Email Invite",
   "invite_member.send": "Выслать приглашение",
   "invite_member.send2": "Выслать приглашения",
   "invite_member.sending": " Отправка",
@@ -1648,15 +1647,15 @@
   "mobile.account_notifications.threads_mentions": "Упоминания в тредах",
   "mobile.account_notifications.threads_start": "Ветки начатые мной",
   "mobile.account_notifications.threads_start_participate": "Threads that I start or participate in",
-  "mobile.channel_info.alertMessageDeleteChannel": "Действительно хотите удалить {term}?",
-  "mobile.channel_info.alertMessageLeaveChannel": "Are you sure you want to leave the {term} {name}?",
+  "mobile.channel_info.alertMessageDeleteChannel": "Вы действительно хотите удалить {term} с {name}?",
+  "mobile.channel_info.alertMessageLeaveChannel": "Вы действительно хотите покинуть {term} {name}?",
   "mobile.channel_info.alertNo": "Нет",
   "mobile.channel_info.alertTitleDeleteChannel": "Удалить {term}",
   "mobile.channel_info.alertTitleLeaveChannel": "Покинуть {term}",
   "mobile.channel_info.alertYes": "Да",
-  "mobile.channel_info.privateChannel": "Private Channel",
+  "mobile.channel_info.privateChannel": "Покинуть канал",
   "mobile.channel_info.publicChannel": "Публичные Каналы",
-  "mobile.channel_list.alertMessageLeaveChannel": "Are you sure you want to leave the {term} {name}?",
+  "mobile.channel_list.alertMessageLeaveChannel": "Вы действительно хотите покинуть {term} {name}?",
   "mobile.channel_list.alertNo": "Нет",
   "mobile.channel_list.alertTitleLeaveChannel": "Покинуть {term}",
   "mobile.channel_list.alertYes": "Да",
@@ -1667,7 +1666,7 @@
   "mobile.channel_list.open": "Open {term}",
   "mobile.channel_list.openDM": "Open Direct Message",
   "mobile.channel_list.openGM": "Open Group Message",
-  "mobile.channel_list.privateChannel": "Private Channel",
+  "mobile.channel_list.privateChannel": "Покинуть канал",
   "mobile.channel_list.publicChannel": "Публичные Каналы",
   "mobile.components.channels_list_view.yourChannels": "Ваши каналы:",
   "mobile.components.error_list.dismiss_all": "Dismiss All",
@@ -1676,7 +1675,7 @@
   "mobile.components.select_server_view.proceed": "Продолжить",
   "mobile.components.select_server_view.siteUrlPlaceholder": "https://mattermost.example.com",
   "mobile.create_channel": "Create",
-  "mobile.create_channel.private": "New Private Group",
+  "mobile.create_channel.private": "Покинуть канал",
   "mobile.create_channel.public": "Публичные Каналы",
   "mobile.custom_list.no_results": "No Results",
   "mobile.edit_post.title": "Editing Message",
@@ -1724,8 +1723,8 @@
   "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.new_convo_note": "This will start a new conversation. If you’re adding a lot of people, consider creating a private channel instead.",
+  "more_direct_channels.new_convo_note.full": "You’ve reached the maximum number of people for this conversation. Consider creating a private channel instead.",
   "more_direct_channels.title": "Личные сообщения",
   "msg_typing.areTyping": "{users} и {last} печатают...",
   "msg_typing.isTyping": "{user} печатает...",
@@ -1751,12 +1750,13 @@
   "navbar.viewPinnedPosts": "View Pinned Posts",
   "navbar_dropdown.about": "О Mattermost",
   "navbar_dropdown.accountSettings": "Учетная запись",
+  "navbar_dropdown.addMemberToTeam": "Add Members to Team",
   "navbar_dropdown.console": "Системная консоль",
   "navbar_dropdown.create": "Создать команду",
   "navbar_dropdown.emoji": "Пользовательские смайлы",
   "navbar_dropdown.help": "Помощь",
   "navbar_dropdown.integrations": "Интеграция",
-  "navbar_dropdown.inviteMember": "Пригласить в команду",
+  "navbar_dropdown.inviteMember": "Send Email Invite",
   "navbar_dropdown.join": "Присоединиться к другой команде",
   "navbar_dropdown.leave": "Уйти из команды",
   "navbar_dropdown.logout": "Выйти",
@@ -1788,6 +1788,7 @@
   "pending_post_actions.cancel": "Отмена",
   "pending_post_actions.retry": "Повторить",
   "permalink.error.access": "Постоянная ссылка принадлежит к удалённому сообщению или каналу, к которому у вас нет доступа.",
+  "permalink.error.title": "Message Not Found",
   "post_attachment.collapse": "Скрыть...",
   "post_attachment.more": "Ещё…",
   "post_body.commentedOn": "Прокомментировал {name}{apostrophe} сообщение: ",
@@ -1893,13 +1894,13 @@
   "setting_upload.select": "Выбрать файл",
   "sidebar.channels": "Канал",
   "sidebar.createChannel": "Создать общедоступный канал",
-  "sidebar.createGroup": "Create new group",
-  "sidebar.direct": "Прямые сообщения",
+  "sidebar.createGroup": "Создать общедоступный канал",
+  "sidebar.direct": "Личные сообщения",
   "sidebar.favorite": "Избранные",
   "sidebar.more": "Еще",
   "sidebar.moreElips": "Еще...",
   "sidebar.otherMembers": "За пределами команды",
-  "sidebar.pg": "Private Groups",
+  "sidebar.pg": "Покинуть канал",
   "sidebar.removeList": "Удалить из списка",
   "sidebar.tutorialScreen1": "<h4>Каналы</h4><p><strong>Каналы</strong> предназначены для организации обсуждений на разные темы. Они открыты для всех в вашей команде. Чтобы отправлять приватные сообщения, используйте <strong>личные сообщения</strong> для диалогов или <strong>приватные группы</strong> для бесед.</p>",
   "sidebar.tutorialScreen2": "<h4>Каналы \"{townsquare}\" и \"{offtopic}\"</h4><p>Для начала вам будут доступны два публичных канала:</p><p><strong>{townsquare}</strong> используется для внутрикомандного общения. Каждый из вашей команды является участником этого канала.</p><p><strong>{offtopic}</strong> предназначен для юмора и развлечений отдельно от рабочих каналов. Вы и Ваша команда может выбрать какие другие каналы вам потребуются.</p>",
@@ -1908,10 +1909,11 @@
   "sidebar.unreadBelow": "Непрочтённые сообщения ниже",
   "sidebar_header.tutorial": "<h4>Main Menu</h4><p>The <strong>Main Menu</strong> is where you can <strong>Invite New Members</strong>, access your <strong>Account Settings</strong> and set your <strong>Theme Color</strong>.</p><p>Team administrators can also access their <strong>Team Settings</strong> from this menu.</p><p>System administrators will find a <strong>System Console</strong> option to administrate the entire system.</p>",
   "sidebar_right_menu.accountSettings": "Учетная запись",
+  "sidebar_right_menu.addMemberToTeam": "Add Members to Team",
   "sidebar_right_menu.console": "Системная консоль",
   "sidebar_right_menu.flagged": "Отмеченные сообщения",
   "sidebar_right_menu.help": "Помощь",
-  "sidebar_right_menu.inviteNew": "Пригласить в команду",
+  "sidebar_right_menu.inviteNew": "Send Email Invite",
   "sidebar_right_menu.logout": "Выйти",
   "sidebar_right_menu.manageMembers": "Участники",
   "sidebar_right_menu.nativeApps": "Скачать приложения",
@@ -1979,7 +1981,7 @@
   "suggestion.mention.morechannels": "Другие каналы",
   "suggestion.mention.nonmembers": "Не в канале",
   "suggestion.mention.special": "Специальные функции",
-  "suggestion.search.private": "Private Groups",
+  "suggestion.search.private": "Покинуть канал",
   "suggestion.search.public": "Общедоступные каналы",
   "team_export_tab.download": "cкачать",
   "team_export_tab.export": "Экспорт",
@@ -2055,7 +2057,7 @@
   "upload_overlay.info": "Бросьте сюда файл, чтобы загрузить его.",
   "user.settings.advance.embed_preview": "Для первой веб-ссылки в сообщении показывать предпросмотр содержимого веб-сайта ниже сообщения, если это возможно",
   "user.settings.advance.embed_toggle": "Показывать переключатель для всех встроенных превью",
-  "user.settings.advance.emojipicker": "Enable emoji picker in message input box",
+  "user.settings.advance.emojipicker": "Enable emoji picker for reactions and message input box",
   "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Feature} other {Features}} Enabled",
   "user.settings.advance.formattingDesc": "Если включено, сообщения будут отформатированы с созданием ссылок, показом смайликов, стилями текста и переносами. По-умолчанию, эта настройка включена. Изменение этой настройки потребует обновления страницы.",
   "user.settings.advance.formattingTitle": "Разрешить форматирование сообщений",
diff --git a/webapp/i18n/zh-CN.json b/webapp/i18n/zh-CN.json
index b5c2bd07ea..5c650acc18 100644
--- a/webapp/i18n/zh-CN.json
+++ b/webapp/i18n/zh-CN.json
@@ -86,7 +86,7 @@
   "add_emoji.save": "保存",
   "add_incoming_webhook.cancel": "取消",
   "add_incoming_webhook.channel": "频道",
-  "add_incoming_webhook.channel.help": "接收 webhook 的公开频道或私有组。您必须属于该私有组才能设定webhook。",
+  "add_incoming_webhook.channel.help": "接收 webhook 的公开频道或私有频道。您必须属于该私有频道才能设定 webhook。",
   "add_incoming_webhook.channelRequired": "需要是有效的频道",
   "add_incoming_webhook.description": "描述",
   "add_incoming_webhook.description.help": "传入webhook的简述。",
@@ -137,7 +137,8 @@
   "add_outgoing_webhook.triggerWordsTriggerWhen.help": "选择何时触发传出webhook：信息第一个词符合触发关键字或时以触发关键字开头。",
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "第一个完全符合触发关键字",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "第一字以触发关键字为开头",
-  "admin.advance.cluster": "高可用性 (Beta)",
+  "add_users_to_team.title": "添加新成员到 {teamName} 团队",
+  "admin.advance.cluster": "高可用性",
   "admin.advance.metrics": "性能监视",
   "admin.audits.reload": "重新载入用户活动日志",
   "admin.audits.title": "用户活动日志",
@@ -282,6 +283,8 @@
   "admin.email.requireVerificationDescription": "通常在正式环境中设置为是。当设为是时，Mattermost要求账户创建后先邮件验证通过才能登录。开发人员可以将此字段设置为否，跳过电子邮件验证以加快开发。",
   "admin.email.requireVerificationTitle": "要求电子邮件验证：",
   "admin.email.selfPush": "手动输入推送通知服务位置",
+  "admin.email.skipServerCertificateVerification.description": "当设为是时，Mattermost 将不会验证电子邮件服务器证书。",
+  "admin.email.skipServerCertificateVerification.title": "跳过服务器证书验证：",
   "admin.email.smtpPasswordDescription": "从邮件服务器管理员获得此凭据。",
   "admin.email.smtpPasswordExample": "例如：\"yourpassword\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.email.smtpPasswordTitle": "SMTP服务器密码：",
@@ -328,13 +331,15 @@
   "admin.general.policy.permissionsSystemAdmin": "系统管理员",
   "admin.general.policy.restrictPostDeleteDescription": "设置谁可以删除消息的策略。",
   "admin.general.policy.restrictPostDeleteTitle": "允许哪些用户删除消息：",
-  "admin.general.policy.restrictPrivateChannelCreationDescription": "设置谁可以创建公开频道的策略。",
-  "admin.general.policy.restrictPrivateChannelCreationTitle": "允许创建公开频道：",
+  "admin.general.policy.restrictPrivateChannelCreationDescription": "设置谁可以创建私有频道的策略。",
+  "admin.general.policy.restrictPrivateChannelCreationTitle": "允许创建私有频道：",
   "admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "命令符工具",
-  "admin.general.policy.restrictPrivateChannelDeletionDescription": "设置谁可以删除公共频道的策略。已删除的频道可以使用 {commandLineToolLink} 从数据库中恢复。",
-  "admin.general.policy.restrictPrivateChannelDeletionTitle": "开启删除公开频道：",
-  "admin.general.policy.restrictPrivateChannelManagementDescription": "设置谁可以重命名和设置标题或公共频道用途的策略。",
-  "admin.general.policy.restrictPrivateChannelManagementTitle": "开启公开频道重命名：",
+  "admin.general.policy.restrictPrivateChannelDeletionDescription": "设置谁可以删除私有频道的策略。已删除的频道可以使用 {commandLineToolLink} 从数据库中恢复。",
+  "admin.general.policy.restrictPrivateChannelDeletionTitle": "开启删除私有频道：",
+  "admin.general.policy.restrictPrivateChannelManageMembersDescription": "设置谁可以从私有频道添加和删除成员的策略。",
+  "admin.general.policy.restrictPrivateChannelManageMembersTitle": "允许管理私有频道成员：",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "设置谁可以重命名和设置标题或私有频道用途的策略。",
+  "admin.general.policy.restrictPrivateChannelManagementTitle": "开启私有频道重命名：",
   "admin.general.policy.restrictPublicChannelCreationDescription": "设置谁可以创建公开频道的策略。",
   "admin.general.policy.restrictPublicChannelCreationTitle": "允许创建公开频道：",
   "admin.general.policy.restrictPublicChannelDeletionCommandLineToolLink": "命令符工具",
@@ -342,7 +347,7 @@
   "admin.general.policy.restrictPublicChannelDeletionTitle": "开启删除公开频道：",
   "admin.general.policy.restrictPublicChannelManagementDescription": "设置谁可以重命名和设置标题或公共频道用途的策略。",
   "admin.general.policy.restrictPublicChannelManagementTitle": "开启公开频道重命名：",
-  "admin.general.policy.teamInviteDescription": "设置谁可以用<b>邀请新成员</b>发送邮件邀请他人到团队，或用主菜单的<b>获取团队邀请链接</b>的策略。如果使用了<b>获取团队邀请链接</b>，您可以在用户加入到团队后到<b>团队设定</b> > <b>邀请码</b>废除邀请码。",
+  "admin.general.policy.teamInviteDescription": "设置谁可以用<b>发送邀请邮件</b>发送邮件邀请他人，或用主菜单的<b>获取团队邀请链接</b>以及<b>添加成员到团队</b>的策略。如果使用了<b>获取团队邀请链接</b>，您可以在用户加入到团队后到<b>团队设定</b> > <b>邀请码</b>废除邀请码。",
   "admin.general.policy.teamInviteTitle": "启用发送团队邀请的使用者：",
   "admin.general.privacy": "隐私",
   "admin.general.usersAndTeams": "成员和团队",
@@ -506,7 +511,7 @@
   "admin.log.enableDiagnosticsDescription": "开启此功能将发送错误报告和诊断信息到 Mattermost, Inc. 以帮助提高 Mattermost 的质量和性能。请阅读我们的<a href=\"https://about.mattermost.com/default-privacy-policy/\" target='_blank'>隐私政策</a>了解更多。",
   "admin.log.enableWebhookDebugging": "启用Webhook调试：",
   "admin.log.enableWebhookDebuggingDescription": "您可以设置为false来禁用所有传入的webhook请求主体的调试日志记录。",
-  "admin.log.fileDescription": "通常在正式环境中设置为是。当设置为是时，日志文件写入到下面指定日志文件位置。",
+  "admin.log.fileDescription": "通常在正常环境设为是。当设为是时，事件日志将写入到文件日志目录栏指定的目录下的 mattermost.log 文件。日志将在 10,000 后归档到同一目录下的一个文件并以时间和序列号为命名。例如：mattermost.2017-03-31.001。",
   "admin.log.fileLevelDescription": "此设置确定日志事件写入到控制台的级别详情.ERROR: 只输出错误信息.INFO: 输出错误消息和在启动和初始化的信息.DEBUG: 打印开发者调试问题的细节.",
   "admin.log.fileLevelTitle": "文件日志级别：",
   "admin.log.fileTitle": "日志输出到文件：",
@@ -521,7 +526,7 @@
   "admin.log.formatTitle": "日志文件格式：",
   "admin.log.levelDescription": "此设置确定日志事件写入到控制台的级别详情.ERROR: 只输出错误信息.INFO: 输出错误消息和在启动和初始化的信息.DEBUG: 打印开发者调试问题的细节.",
   "admin.log.levelTitle": "控制台日志级别：",
-  "admin.log.locationDescription": "日志文件写入位置.如果没有设置,默认位置为./logs/mattermost,写入到日志文件mattermost.log.启用日志轮转每10000行的日志信息写入新的文件存储在同一目录, 例如mattermost.2015-09-23.001,mattermost.2015-09-23.002,等等.",
+  "admin.log.locationDescription": "日志文件路径。如果留空，将储存到 ./logs 目录。指定的目录必须已经存在并且 Mattermost 拥有写入权限。",
   "admin.log.locationPlaceholder": "输入你的文件位置",
   "admin.log.locationTitle": "日志文件目录：",
   "admin.log.logSettings": "日志设置",
@@ -691,7 +696,7 @@
   "admin.service.corsTitle": "允许来自以下跨源请求网址：",
   "admin.service.developerDesc": "开启时，Javascript错误将显示在页面顶端红条里。不推荐在正式环境使用。",
   "admin.service.developerTitle": "开启开发者模式：",
-  "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
+  "admin.service.enforcMfaTitle": "强制多重身份验证：",
   "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",
@@ -725,7 +730,7 @@
   "admin.service.sessionCacheDesc": "会话在内存缓存的分钟数。",
   "admin.service.sessionDaysEx": "例如 \"30\"",
   "admin.service.siteURL": "站点网址：",
-  "admin.service.siteURLDescription": "用户访问 Mattermost 的包含端口和协议的网址。此栏可以留空除非您要在<b>通知 > 电子邮件</b>里设置批量邮件。当留空时，网址将自动根据访问请求设定。",
+  "admin.service.siteURLDescription": "用户用来访问 Mattermost 的网址，包括端口和协议。此设定为必须。",
   "admin.service.siteURLExample": "例如 \"https://mattermost.example.com:1234\"",
   "admin.service.ssoSessionDays": "SSO会话时长 (天)：",
   "admin.service.ssoSessionDaysDesc": "从用户上一次输入他们的认证到会话过期的天数。如果验证方式时SAML或GitLab，用户将会自动登入到Mattermost如果他们已经登入到SAML或GitLab。修改此设定后，新的会话时常将在用户下一次输入认证后生效。",
@@ -743,11 +748,11 @@
   "admin.service.webhooksTitle": "启用传出的 Webhooks：",
   "admin.service.writeTimeout": "写入超时：",
   "admin.service.writeTimeoutDescription": "如果使用 HTTP (不安全)，这是从读取请求头结尾到写入完响应最大允许的时间。如果使用 HTTPS，这将是从接受连接到写入完响应的总时间。",
-  "admin.sidebar.addTeamSidebar": "Add team from sidebar menu",
+  "admin.sidebar.addTeamSidebar": "从侧边栏菜单添加团队",
   "admin.sidebar.advanced": "高级",
   "admin.sidebar.audits": "合规性与审计",
   "admin.sidebar.authentication": "验证",
-  "admin.sidebar.cluster": "高可用性 (Beta)",
+  "admin.sidebar.cluster": "高可用性",
   "admin.sidebar.compliance": "合规",
   "admin.sidebar.configuration": "配置",
   "admin.sidebar.connections": "连接",
@@ -784,7 +789,7 @@
   "admin.sidebar.push": "移动推送",
   "admin.sidebar.rateLimiting": "速率限制",
   "admin.sidebar.reports": "报告",
-  "admin.sidebar.rmTeamSidebar": "Remove team from sidebar menu",
+  "admin.sidebar.rmTeamSidebar": "从侧边栏菜单移除团队",
   "admin.sidebar.saml": "SAML",
   "admin.sidebar.security": "安全",
   "admin.sidebar.sessions": "会话",
@@ -794,7 +799,7 @@
   "admin.sidebar.statistics": "团队统计",
   "admin.sidebar.storage": "储存",
   "admin.sidebar.support": "法律和支持",
-  "admin.sidebar.teams": "TEAMS ({count, number})",
+  "admin.sidebar.teams": "团队 ({count, number})",
   "admin.sidebar.users": "用户",
   "admin.sidebar.usersAndTeams": "成员和团队",
   "admin.sidebar.view_statistics": "站点统计",
@@ -880,8 +885,8 @@
   "admin.team_analytics.activeUsers": "有发信息的的正常用户",
   "admin.team_analytics.totalPosts": "信息总数",
   "admin.true": "是",
-  "admin.userList.title": "Users for {team}",
-  "admin.userList.title2": "Users for {team} ({count})",
+  "admin.userList.title": "用户 {team}",
+  "admin.userList.title2": "用户{team} ({count})",
   "admin.user_item.authServiceEmail": "<strong>登入方式：</strong> 电子邮件",
   "admin.user_item.authServiceNotEmail": "<strong>登入方式：</strong> {service}",
   "admin.user_item.confirmDemoteDescription": "如果您从系统管理角色降级且没有另一个用户拥有系统管理员权限，您则需要通过终端访问 Mattermost 服务器并运行以下命令以重新指定一个系统管理员。",
@@ -895,13 +900,14 @@
   "admin.user_item.makeMember": "设置为成员",
   "admin.user_item.makeSysAdmin": "设置为系统管理员",
   "admin.user_item.makeTeamAdmin": "设置为团队管理员",
+  "admin.user_item.manageTeams": "管理团队",
   "admin.user_item.member": "成员",
   "admin.user_item.mfaNo": "<strong>多重验证</strong>：否",
   "admin.user_item.mfaYes": "<strong>多重验证</strong>：是",
   "admin.user_item.resetMfa": "移除多重验证",
   "admin.user_item.resetPwd": "重置密码",
   "admin.user_item.switchToEmail": "切换到电子邮件/密码",
-  "admin.user_item.sysAdmin": "System Admin",
+  "admin.user_item.sysAdmin": "系统管理员",
   "admin.user_item.teamAdmin": "团队管理员",
   "admin.webrtc.enableDescription": "当设为是时，Mattermost 允许<strong>一对一</strong>视频通话。WebRTC 通话可在 Chrome，火狐以及 Mattermost 桌面应用使用。",
   "admin.webrtc.enableTitle": "开启 Mattermost WebRTC：",
@@ -994,8 +1000,8 @@
   "audit_table.attemptedWebhookDelete": "试图删除webhook",
   "audit_table.by": "由 {username}",
   "audit_table.byAdmin": "由管理员",
-  "audit_table.channelCreated": "创建了 {channelName} 频道/组",
-  "audit_table.channelDeleted": "删除了网址为 {url} 的频道/组",
+  "audit_table.channelCreated": "创建了 {channelName} 频道",
+  "audit_table.channelDeleted": "删除了网址为 {url} 的频道",
   "audit_table.establishedDM": "与 {username} 建立了一个私聊频道",
   "audit_table.failedExpiredLicenseAdd": "许可证由于已过期或未开始而无法添加",
   "audit_table.failedInvalidLicenseAdd": "无法添加无效的许可证",
@@ -1004,14 +1010,14 @@
   "audit_table.failedPassword": "修改密码失败 - 试图通过 OAuth 登录的用户更新密码",
   "audit_table.failedWebhookCreate": "创建一个webhook失败-没有频道权限",
   "audit_table.failedWebhookDelete": "删除webhook失败-不合适的条件",
-  "audit_table.headerUpdated": "更新了 {channelName} 频道/组标题",
+  "audit_table.headerUpdated": "更新了 {channelName} 频道标题",
   "audit_table.ip": "IP地址",
   "audit_table.licenseRemoved": "成功删除许可证",
   "audit_table.loginAttempt": " (登录尝试)",
   "audit_table.loginFailure": " (登录失败)",
   "audit_table.logout": "注销你的账户",
   "audit_table.member": "成员",
-  "audit_table.nameUpdated": "更新了 {channelName} 频道/组名称",
+  "audit_table.nameUpdated": "更新了 {channelName} 频道名称",
   "audit_table.oauthTokenFailed": "获取OAuth令牌 - {token}",
   "audit_table.revokedAll": "撤销团队所有当前会话",
   "audit_table.sentEmail": "已发送电子邮件到 {email} 以重置您的密码",
@@ -1030,9 +1036,9 @@
   "audit_table.updateGlobalNotifications": "更新全局通知设置",
   "audit_table.updatePicture": "更新你的个人资料照片",
   "audit_table.updatedRol": "更新用户角色为",
-  "audit_table.userAdded": "已添加 {username} 到 {channelName}频道/组",
+  "audit_table.userAdded": "已添加 {username} 到 {channelName} 频道",
   "audit_table.userId": "用户ID",
-  "audit_table.userRemoved": "已从 {channelName} 频道/组删除 {username}",
+  "audit_table.userRemoved": "已从 {channelName} 频道移除 {username}",
   "audit_table.verified": "您的电子邮件地址验证成功",
   "authorize.access": "允许<strong>{appName}</strong>访问？",
   "authorize.allow": "允许",
@@ -1059,20 +1065,17 @@
   "channelHeader.removeFromFavorites": "从收藏中移除",
   "channel_flow.alreadyExist": "已存在使用该 URL 的频道",
   "channel_flow.changeUrlDescription": "某些字符不允许出现在url中，可能被删除。",
-  "channel_flow.changeUrlTitle": "Change {term} URL",
-  "channel_flow.channel": "Channel",
-  "channel_flow.create": "私有频道",
-  "channel_flow.group": "Group",
+  "channel_flow.changeUrlTitle": "更改频道网址",
+  "channel_flow.create": "创建频道",
   "channel_flow.handleTooShort": "频道网址必须为至少2个小写英文数字字符",
   "channel_flow.invalidName": "无效的频道名称",
-  "channel_flow.set_url_title": "Set {term} URL",
+  "channel_flow.set_url_title": "设置频道网址",
   "channel_header.addMembers": "添加成员",
   "channel_header.addToFavorites": "添加到收藏",
-  "channel_header.channel": "Channel",
+  "channel_header.channel": "频道",
   "channel_header.channelHeader": "编辑频道标题",
   "channel_header.delete": "删除频道",
   "channel_header.flagged": "已标记的信息",
-  "channel_header.group": "Group",
   "channel_header.leave": "离开频道",
   "channel_header.manageMembers": "成员管理",
   "channel_header.notificationPreferences": "消息通知设置",
@@ -1080,7 +1083,7 @@
   "channel_header.removeFromFavorites": "从收藏中移除",
   "channel_header.rename": "重命名频道",
   "channel_header.setHeader": "编辑频道标题",
-  "channel_header.setPurpose": "Edit {term} Purpose",
+  "channel_header.setPurpose": "编辑频道用途",
   "channel_header.viewInfo": "查看信息",
   "channel_header.viewMembers": "查看成员",
   "channel_header.webrtc.call": "开始视频通话",
@@ -1115,26 +1118,24 @@
   "channel_members_modal.addNew": "添加新成员",
   "channel_members_modal.members": " 位成员",
   "channel_modal.cancel": "取消",
-  "channel_modal.channel": "Channel",
   "channel_modal.createNew": "创建新频道",
   "channel_modal.descriptionHelp": "描述此频道如何被使用。",
   "channel_modal.displayNameError": "频道名必须为 2 字或更多",
   "channel_modal.edit": "编辑",
-  "channel_modal.group": "Group",
   "channel_modal.header": "标题",
   "channel_modal.headerEx": "例如：\"[链接标题](http://example.com)\"",
-  "channel_modal.headerHelp": "设定在 {term} 标题里在 {term} 旁边的文字。举例，输入常见链接 [链接标题](http://example.com)。",
-  "channel_modal.modalTitle": "New ",
+  "channel_modal.headerHelp": "设定在频道标题里在频道旁边的文字。举例，输入常见链接 [链接标题](http://example.com)。",
+  "channel_modal.modalTitle": "新建通道",
   "channel_modal.name": "名称",
   "channel_modal.nameEx": "如: \"错误\"，\"营销\"，\"客户支持\"",
   "channel_modal.optional": "(可选)",
-  "channel_modal.privateGroup1": "创建一个具有限制成员资格的私人组。",
-  "channel_modal.privateGroup2": "创建一个公共频道",
+  "channel_modal.privateGroup1": "创建一个具有限制成员资格的私有频道。",
+  "channel_modal.privateGroup2": "创建一个私有频道",
   "channel_modal.publicChannel1": "创建一个公共频道",
   "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}）",
@@ -1227,12 +1228,10 @@
   "custom_emoji.empty": "未找到自定义表情符",
   "custom_emoji.header": "自定义表情符",
   "custom_emoji.search": "搜索自定义表情符",
-  "default_channel.purpose": "Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.",
+  "default_channel.purpose": "发表您想所有人看到的消息。所有人在加入团队时候自动成员此频道的永久成员。",
   "delete_channel.cancel": "取消",
-  "delete_channel.channel": "channel",
   "delete_channel.confirm": "确认删除频道",
   "delete_channel.del": "删除",
-  "delete_channel.group": "group",
   "delete_channel.question": "这会从团队删除此频道并且没有用户可以读取其数据。您确定要删除 {display_name} 频道？",
   "delete_post.cancel": "取消",
   "delete_post.comment": "评论",
@@ -1249,9 +1248,7 @@
   "edit_channel_header_modal.title_dm": "编辑标题",
   "edit_channel_purpose_modal.body": "描述此频道的用途。此文本出现在频道列表的“更多...”菜单中，帮助他人决定是否加入。",
   "edit_channel_purpose_modal.cancel": "取消",
-  "edit_channel_purpose_modal.channel": "Channel",
   "edit_channel_purpose_modal.error": "频道用途过长,请长话短说",
-  "edit_channel_purpose_modal.group": "Group",
   "edit_channel_purpose_modal.save": "保存",
   "edit_channel_purpose_modal.title1": "编辑用途",
   "edit_channel_purpose_modal.title2": "编辑用途",
@@ -1302,12 +1299,14 @@
   "error.not_found.link_message": "返回Mattermost",
   "error.not_found.message": "您访问的页面不存在",
   "error.not_found.title": "页面未找到",
-  "error.not_supported.message": "私隐浏览不支持",
-  "error.not_supported.title": "不支持的浏览器",
   "error_bar.expired": "企业版授权已过期，一些功能已停用。<a href='{link}' target='_blank'>请更新授权。</a>",
   "error_bar.expiring": "企业版授权将于 {date} 过期。<a href='{link}' target='_blank'>请更新授权。</a>",
   "error_bar.past_grace": "企业版授权已过期，一些功能已停用。请联系您的系统管理员了解详情。",
   "error_bar.preview_mode": "预览模式: 未配置邮件通知",
+  "error_bar.site_url": "请在 {link} 配置您的 {docsLink}。",
+  "error_bar.site_url.docsLink": "站点网址：",
+  "error_bar.site_url.link": "系统控制台",
+  "error_bar.site_url_gitlab": "请在系统控制台或 gitlab.rb 配置您的 {docsLink}。",
   "file_attachment.download": "下载",
   "file_info_preview.size": "大小",
   "file_info_preview.type": "文件类型",
@@ -1541,13 +1540,13 @@
   "intro_messages.beginning": "{name} 的开端",
   "intro_messages.channel": "频道",
   "intro_messages.creator": "这是{name}{type}的开端，由{creator}于{date}建立。",
-  "intro_messages.default": "<h4 class='channel-intro__title'>Beginning of {display_name}</h4><p class='channel-intro__content'><strong>Welcome to {display_name}!</strong><br/><br/>Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.</p>",
+  "intro_messages.default": "<h4 class='channel-intro__title'>{display_name}的开始</h4><p class='channel-intro__content'><strong>欢迎来到{display_name}！</strong><br/><br/>发表消息到这给所有人看。所有人加入本团队将自动成为此频道永久成员。</p>",
   "intro_messages.group": "私有频道",
   "intro_messages.invite": "邀请其他人到{type}",
   "intro_messages.inviteOthers": "邀请其他人入组",
   "intro_messages.noCreator": "这是{name}{type}的开端，于{date}建立。",
   "intro_messages.offTopic": "<h4 class=\"channel-intro__title\">{display_name}的开端</h4><p class=\"channel-intro__content\">这是{display_name}的开始,一个用于非工作的频道.<br/></p>",
-  "intro_messages.onlyInvited": "只有受邀的人才能看到这个私有组。",
+  "intro_messages.onlyInvited": "只有受邀的成员才能看到这个私有频道。",
   "intro_messages.purpose": "此{type}的用途是：{purpose}。",
   "intro_messages.setHeader": "设置标题",
   "intro_messages.teammate": "这是您与此团队成员私信记录的开端。在这里的直接消息和文件共享除了在此的人外无法看到。",
@@ -1563,7 +1562,7 @@
   "invite_member.modalButton": "是的,抛弃",
   "invite_member.modalMessage": "你有未寄出的邀请函，您确定你想要放弃它们吗？",
   "invite_member.modalTitle": "丢弃邀请？",
-  "invite_member.newMember": "邀请新成员",
+  "invite_member.newMember": "发送电子邮件邀请",
   "invite_member.send": "发送邀请",
   "invite_member.send2": "邀请函",
   "invite_member.sending": "发送",
@@ -1573,7 +1572,7 @@
   "ldap_signup.length_error": "名称必须为3至15个字母",
   "ldap_signup.teamName": "输入新团队名",
   "ldap_signup.team_error": "请输入团队名",
-  "leave_team_modal.desc": "您将会从所有公共频道和私有组移除。如果团队是私有的，您将无法再加入。您确定吗？",
+  "leave_team_modal.desc": "您将会从所有公共频道和私有频道移除。如果团队是私有的，您将无法再加入。您确定吗？",
   "leave_team_modal.no": "否",
   "leave_team_modal.title": "退出团队？",
   "leave_team_modal.yes": "是",
@@ -1643,44 +1642,44 @@
   "mobile.about.serverVersionNoBuild": "服务端版本：{version}",
   "mobile.account.notifications.email.footer": "当离线或离开超过五分钟",
   "mobile.account_notifications.mentions_footer": "您的用户名 (\"@{username}\") 将永远触发提及。",
-  "mobile.account_notifications.non-case_sensitive_words": "Other non-case sensitive words...",
+  "mobile.account_notifications.non-case_sensitive_words": "其他忽略大小写词...",
   "mobile.account_notifications.reply.header": "发送回复通知给",
-  "mobile.account_notifications.threads_mentions": "Mentions in threads",
-  "mobile.account_notifications.threads_start": "Threads that I start",
-  "mobile.account_notifications.threads_start_participate": "Threads that I start or participate in",
-  "mobile.channel_info.alertMessageDeleteChannel": "您确认要删除{term}{name}？",
-  "mobile.channel_info.alertMessageLeaveChannel": "Are you sure you want to leave the {term} {name}?",
+  "mobile.account_notifications.threads_mentions": "串中的提及",
+  "mobile.account_notifications.threads_start": "我创建的串",
+  "mobile.account_notifications.threads_start_participate": "我创建的或参与的串",
+  "mobile.channel_info.alertMessageDeleteChannel": "您确认要删除{term}的{name}？",
+  "mobile.channel_info.alertMessageLeaveChannel": "您确定要离开{term} {name}？",
   "mobile.channel_info.alertNo": "否",
   "mobile.channel_info.alertTitleDeleteChannel": "删除 {term}",
   "mobile.channel_info.alertTitleLeaveChannel": "离开 {term}",
   "mobile.channel_info.alertYes": "是",
   "mobile.channel_info.privateChannel": "私有频道",
   "mobile.channel_info.publicChannel": "公共频道",
-  "mobile.channel_list.alertMessageLeaveChannel": "Are you sure you want to leave the {term} {name}?",
+  "mobile.channel_list.alertMessageLeaveChannel": "您确定要离开{term} {name}？",
   "mobile.channel_list.alertNo": "否",
   "mobile.channel_list.alertTitleLeaveChannel": "离开 {term}",
   "mobile.channel_list.alertYes": "是",
-  "mobile.channel_list.closeDM": "关闭组消息",
+  "mobile.channel_list.closeDM": "关闭私信",
   "mobile.channel_list.closeGM": "关闭组消息",
   "mobile.channel_list.dm": "私信",
   "mobile.channel_list.gm": "组消息",
   "mobile.channel_list.open": "打开 {term}",
-  "mobile.channel_list.openDM": "关闭组消息",
+  "mobile.channel_list.openDM": "打开私信",
   "mobile.channel_list.openGM": "打开组消息",
   "mobile.channel_list.privateChannel": "私有频道",
   "mobile.channel_list.publicChannel": "公共频道",
   "mobile.components.channels_list_view.yourChannels": "您的频道：",
-  "mobile.components.error_list.dismiss_all": "Dismiss All",
+  "mobile.components.error_list.dismiss_all": "关闭所有",
   "mobile.components.select_server_view.continue": "继续",
   "mobile.components.select_server_view.enterServerUrl": "输入服务器网址",
   "mobile.components.select_server_view.proceed": "继续",
   "mobile.components.select_server_view.siteUrlPlaceholder": "https://mattermost.example.com",
   "mobile.create_channel": "创建",
-  "mobile.create_channel.private": "新私有组",
+  "mobile.create_channel.private": "新私有频道",
   "mobile.create_channel.public": "新公共频道",
   "mobile.custom_list.no_results": "无结果",
   "mobile.edit_post.title": "编辑消息",
-  "mobile.file_upload.camera": "Take Photo or Video",
+  "mobile.file_upload.camera": "拍照或视频",
   "mobile.file_upload.library": "照片库",
   "mobile.file_upload.more": "更多",
   "mobile.loading_channels": "正在加载频道...",
@@ -1690,28 +1689,28 @@
   "mobile.post.cancel": "取消",
   "mobile.post.delete_question": "您确认要删除此消息？",
   "mobile.post.delete_title": "删除消息",
-  "mobile.request.invalid_response": "Received invalid response from the server.",
+  "mobile.request.invalid_response": "从服务器收到了无效回应。",
   "mobile.routes.channelInfo": "信息",
   "mobile.routes.channelInfo.createdBy": "{creator} 创建于 ",
   "mobile.routes.channelInfo.delete_channel": "删除频道",
   "mobile.routes.channelInfo.favorite": "收藏",
   "mobile.routes.channel_members.action": "移除成员",
-  "mobile.routes.channel_members.action_message": "You must select at least one member to remove from the channel.",
-  "mobile.routes.channel_members.action_message_confirm": "Are you sure you want to remove the selected members from the channel?",
+  "mobile.routes.channel_members.action_message": "您必须至少选择一个要移出频道的成员。",
+  "mobile.routes.channel_members.action_message_confirm": "您确定要将选择的成员移出频道？",
   "mobile.routes.channels": "频道",
   "mobile.routes.enterServerUrl": "输入服务器网址",
   "mobile.routes.login": "登录",
   "mobile.routes.loginOptions": "登入选择器",
   "mobile.routes.mfa": "多重验证",
   "mobile.routes.postsList": "信息列表",
-  "mobile.routes.saml": "Single SignOn",
+  "mobile.routes.saml": "单一登入",
   "mobile.routes.selectTeam": "选择团队",
   "mobile.routes.settings": "设置",
-  "mobile.routes.thread": "{channelName} Thread",
-  "mobile.routes.thread_dm": "Direct Message Thread",
+  "mobile.routes.thread": "{channelName} 串",
+  "mobile.routes.thread_dm": "私信串",
   "mobile.routes.user_profile": "个人资料",
   "mobile.routes.user_profile.send_message": "发送消息",
-  "mobile.server_ping_failed": "Cannot connect to the server. Please check your server URL and internet connection.",
+  "mobile.server_ping_failed": "无法连接服务器。请检查您的服务器网址和网络连接。",
   "mobile.server_url.invalid_format": "每个 URL 必须以 http:// 或 https:// 开头",
   "mobile.settings.team_selection": "团队选择",
   "more_channels.close": "关闭",
@@ -1724,8 +1723,8 @@
   "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.new_convo_note": "这将创建新对话。如果你在添加很多用户，请考虑创建私有频道。",
+  "more_direct_channels.new_convo_note.full": "您已达到此对话的最多人数。请考虑创建私有频道。",
   "more_direct_channels.title": "私信",
   "msg_typing.areTyping": "{users}和{last}正在输入...",
   "msg_typing.isTyping": "{user}正在输入...",
@@ -1751,12 +1750,13 @@
   "navbar.viewPinnedPosts": "查看置顶消息",
   "navbar_dropdown.about": "关于Mattermost",
   "navbar_dropdown.accountSettings": "账户设置",
+  "navbar_dropdown.addMemberToTeam": "添加成员到团队",
   "navbar_dropdown.console": "系统控制台",
   "navbar_dropdown.create": "创建一个新的团队",
   "navbar_dropdown.emoji": "自定义表情符",
   "navbar_dropdown.help": "帮助",
   "navbar_dropdown.integrations": "集成",
-  "navbar_dropdown.inviteMember": "邀请新成员",
+  "navbar_dropdown.inviteMember": "发送电子邮件邀请",
   "navbar_dropdown.join": "加入另一个团队",
   "navbar_dropdown.leave": "离开团队",
   "navbar_dropdown.logout": "注销",
@@ -1788,6 +1788,7 @@
   "pending_post_actions.cancel": "取消",
   "pending_post_actions.retry": "重试",
   "permalink.error.access": "此永久链接指向已删除的消息或者您没有权限访问的频道。",
+  "permalink.error.title": "未找到消息",
   "post_attachment.collapse": "收起...",
   "post_attachment.more": "展开...",
   "post_body.commentedOn": "对 {name}{apostrophe} 的信息评论：",
@@ -1892,8 +1893,8 @@
   "setting_upload.noFile": "未选择文件。",
   "setting_upload.select": "选择文件",
   "sidebar.channels": "频道",
-  "sidebar.createChannel": "创建一个公共频道",
-  "sidebar.createGroup": "Create new group",
+  "sidebar.createChannel": "创建公共频道",
+  "sidebar.createGroup": "创建私有频道",
   "sidebar.direct": "私信",
   "sidebar.favorite": "收藏",
   "sidebar.more": "更多",
@@ -1901,17 +1902,18 @@
   "sidebar.otherMembers": "此团队之外",
   "sidebar.pg": "私有频道",
   "sidebar.removeList": "从列表删除",
-  "sidebar.tutorialScreen1": "<h4>频道</h4><p><strong>频道</strong>组织不同主题的会话。他们对您所在团队的每一个人开放。针对单人发送私人消息使用<strong>私信</strong>针对多人使用<strong>私人组</strong>。</p>",
+  "sidebar.tutorialScreen1": "<h4>频道</h4><p><strong>频道</strong>组织不同主题的会话。他们对您所在团队的每一个人开放。针对单人发送私人消息使用<strong>私信</strong>针对多人使用<strong>私有频道</strong>。</p>",
   "sidebar.tutorialScreen2": "<h4>“{townsquare}”和“{offtopic}”频道</h4><p>这里启用了两个公共频道: </p><p><strong>公共频道</strong>是一个团队范围内沟通的地方。团队中的每一个人都是这个频道的一个成员。</p><p><strong>闲聊频道</strong>是一个娱乐幽默与工作无关的频道。您和您的团队可以决定创建其他频道。</p>",
-  "sidebar.tutorialScreen3": "<h4>创建和加入频道</h4><p>点击<strong>“更多...”</strong>创建一个新频道或加入一个现有频道。</p><p>您还可以通过点击频道或私人组旁的<strong>“+”符号</strong>，创建一个新频道或私人组。</p>",
+  "sidebar.tutorialScreen3": "<h4>创建和加入频道</h4><p>点击<strong>“更多...”</strong>创建一个新频道或加入一个现有频道。</p><p>您还可以通过点击频道或私有频道旁的<strong>“+”符号</strong>，创建一个新频道或私有频道标题。</p>",
   "sidebar.unreadAbove": "上面有未读信息",
   "sidebar.unreadBelow": "下面有未读信息",
   "sidebar_header.tutorial": "<h4>主菜单</h4><p><strong>在主菜单中</strong>您可以<strong>邀请新成员</strong>，访问您的<strong>账户设置</strong>和设置您的<strong>主题颜色</strong>。</p><p>团队管理员也能通过此菜单访问他们的<strong>团队设置</strong>。</p><p>系统管理员将找到一个<strong>系统控制台</strong>选项管理整个系统。</p>",
   "sidebar_right_menu.accountSettings": "账户设置",
+  "sidebar_right_menu.addMemberToTeam": "添加成员到团队",
   "sidebar_right_menu.console": "系统控制台",
   "sidebar_right_menu.flagged": "已标记的信息",
   "sidebar_right_menu.help": "帮助",
-  "sidebar_right_menu.inviteNew": "邀请新成员",
+  "sidebar_right_menu.inviteNew": "发送电子邮件邀请",
   "sidebar_right_menu.logout": "注销",
   "sidebar_right_menu.manageMembers": "成员管理",
   "sidebar_right_menu.nativeApps": "下载应用",
@@ -2035,7 +2037,7 @@
   "tutorial_intro.mobileAppsLinkText": "PC, Mac, iOS 以及安卓",
   "tutorial_intro.next": "下一步",
   "tutorial_intro.screenOne": "<h3>欢迎来到：</h3><h1>Mattermost</h1><p>您所有的团队会话都在这里，可在任何地方即时搜索。</p><p>随时和您的团队保持联系，帮助他们完成最重要的事情。</p>",
-  "tutorial_intro.screenTwo": "<h3>Mattermost是如何工作的: </h3><p>交流发生在公共频道，私人组和私信中。</p><p>所有信息都能在任何联网的台式机、笔记本或手机中存档和搜索。</p>",
+  "tutorial_intro.screenTwo": "<h3>Mattermost 是如何工作的：</h3><p>交流发生在公共频道，私有频道和私信中。</p><p>所有信息都能在任何联网的台式机、笔记本或手机中存档和搜索。</p>",
   "tutorial_intro.skip": "跳过教程",
   "tutorial_intro.support": "如有任何需求，请邮件我们到",
   "tutorial_intro.teamInvite": "邀请团队成员",
@@ -2055,7 +2057,7 @@
   "upload_overlay.info": "拖动文件上传。",
   "user.settings.advance.embed_preview": "如果邮件中的第一个网络链接可用，在邮件下方会显示网站内容的预览",
   "user.settings.advance.embed_toggle": "显示切换所有嵌入预览",
-  "user.settings.advance.emojipicker": "在消息输入框开启表情选择器",
+  "user.settings.advance.emojipicker": "开启反应和消息输入栏中表情选择器",
   "user.settings.advance.enabledFeatures": "已启用 {count, number} 项功能",
   "user.settings.advance.formattingDesc": "开启时，文章会显示链接，表情符，格式，以及添加断行。默认下，此选项时开启的。修改此设定需要刷新页面。",
   "user.settings.advance.formattingTitle": "启用帖文格式",
diff --git a/webapp/i18n/zh-TW.json b/webapp/i18n/zh-TW.json
index 9173050057..6eb84dc7bc 100644
--- a/webapp/i18n/zh-TW.json
+++ b/webapp/i18n/zh-TW.json
@@ -86,7 +86,7 @@
   "add_emoji.save": "儲存",
   "add_incoming_webhook.cancel": "取消",
   "add_incoming_webhook.channel": "頻道",
-  "add_incoming_webhook.channel.help": "接收 Webhook 的公開頻道或私人群組。設定 Webhook 時您必須屬於該私人群組。",
+  "add_incoming_webhook.channel.help": "接收 Webhook 內容的公開頻道或私人群組。設定 Webhook 時您必須屬於該私人群組。",
   "add_incoming_webhook.channelRequired": "必須是有效的頻道",
   "add_incoming_webhook.description": "說明",
   "add_incoming_webhook.description.help": "傳入的 Webhook 的敘述。",
@@ -137,7 +137,8 @@
   "add_outgoing_webhook.triggerWordsTriggerWhen.help": "選擇何時觸發傳出的 Webook：訊息的第一個字完全符合觸發關鍵字，或是訊息以觸發關鍵字開頭。",
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "第一個字完全符合觸發關鍵字",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "第一個字以觸發關鍵字為開頭",
-  "admin.advance.cluster": "高可用性 (Beta)",
+  "add_users_to_team.title": "新增成員至團隊 {teamName}",
+  "admin.advance.cluster": "高可用性",
   "admin.advance.metrics": "效能監視",
   "admin.audits.reload": "重新載入使用者活動記錄",
   "admin.audits.title": "使用者活動記錄",
@@ -282,6 +283,8 @@
   "admin.email.requireVerificationDescription": "正式環境通常設為啟用。啟用時 Mattermost 會在帳號建立之後允許登入之前要求驗證電子郵件地址。開發人員可以設為關閉，用以跳過電子郵件驗證加速開發。",
   "admin.email.requireVerificationTitle": "需要驗證電子郵件地址：",
   "admin.email.selfPush": "手動輸入推播通知服務位址",
+  "admin.email.skipServerCertificateVerification.description": "啟用時 Mattermost 將不會驗證電子郵件伺服器憑證。",
+  "admin.email.skipServerCertificateVerification.title": "跳過驗證伺服器憑證：",
   "admin.email.smtpPasswordDescription": " 跟電子郵件管理員取得認證。",
   "admin.email.smtpPasswordExample": "例如：\"您的密碼\"、\"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.email.smtpPasswordTitle": "SMTP 伺服器密碼：",
@@ -328,13 +331,15 @@
   "admin.general.policy.permissionsSystemAdmin": "系統管理員",
   "admin.general.policy.restrictPostDeleteDescription": "設定誰擁有刪除訊息的權限",
   "admin.general.policy.restrictPostDeleteTitle": "允許哪個使用者刪除訊息：",
-  "admin.general.policy.restrictPrivateChannelCreationDescription": "設定誰能建立公開頻道的政策。",
-  "admin.general.policy.restrictPrivateChannelCreationTitle": "允許建立公開頻道：",
+  "admin.general.policy.restrictPrivateChannelCreationDescription": "設定誰能建立私人頻道的政策。",
+  "admin.general.policy.restrictPrivateChannelCreationTitle": "允許建立私人頻道：",
   "admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "命令列工具",
-  "admin.general.policy.restrictPrivateChannelDeletionDescription": "設定誰能刪除公開頻道的政策。被刪除的頻道可以利用 {commandLineToolLink} 從資料庫中還原。",
-  "admin.general.policy.restrictPrivateChannelDeletionTitle": "允許刪除公開頻道：",
-  "admin.general.policy.restrictPrivateChannelManagementDescription": "設定誰能更名公開頻道與設定其標題的政策。",
-  "admin.general.policy.restrictPrivateChannelManagementTitle": "允許更名公開頻道：",
+  "admin.general.policy.restrictPrivateChannelDeletionDescription": "設定誰能刪除私人頻道的政策。被刪除的頻道可以利用 {commandLineToolLink} 從資料庫中還原。",
+  "admin.general.policy.restrictPrivateChannelDeletionTitle": "允許刪除私人頻道：",
+  "admin.general.policy.restrictPrivateChannelManageMembersDescription": "設定誰能新增移除私人頻道成員的政策。",
+  "admin.general.policy.restrictPrivateChannelManageMembersTitle": "允許管理私人頻道成員：",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "設定誰能更名私人頻道與設定其標題的政策。",
+  "admin.general.policy.restrictPrivateChannelManagementTitle": "允許更名私人頻道：",
   "admin.general.policy.restrictPublicChannelCreationDescription": "設定誰能建立公開頻道的政策。",
   "admin.general.policy.restrictPublicChannelCreationTitle": "允許建立公開頻道：",
   "admin.general.policy.restrictPublicChannelDeletionCommandLineToolLink": "命令列工具",
@@ -342,7 +347,7 @@
   "admin.general.policy.restrictPublicChannelDeletionTitle": "允許刪除公開頻道：",
   "admin.general.policy.restrictPublicChannelManagementDescription": "設定誰能更名公開頻道與設定其標題的政策。",
   "admin.general.policy.restrictPublicChannelManagementTitle": "允許更名公開頻道：",
-  "admin.general.policy.teamInviteDescription": "設定誰能用<b>邀請新成員</b>發送邀請郵件或使用在主選單的<b>取得團隊邀請連結</b>來邀請他人加入團隊的原則。如果<b>取得團隊邀請連結</b>被用來分享邀請連結，可以在希望加入的使用者加入團隊之後從<b>團隊設定</b> > <b>邀請碼</b>讓邀請碼過期。",
+  "admin.general.policy.teamInviteDescription": "設定誰能用<b>發送邀請郵件</b>以透過電子郵件邀請新使用者或使用在主選單的<b>取得團隊邀請連結</b>及<b>新增成員至團隊</b>來邀請他人加入團隊的原則。如果<b>取得團隊邀請連結</b>被用來分享邀請連結，可以在希望加入的使用者加入團隊之後從<b>團隊設定</b> > <b>邀請碼</b>讓邀請碼過期。",
   "admin.general.policy.teamInviteTitle": "允許發出團隊邀請的使用者：",
   "admin.general.privacy": "隱私",
   "admin.general.usersAndTeams": "使用者與團隊",
@@ -506,7 +511,7 @@
   "admin.log.enableDiagnosticsDescription": "啟用此功能以傳送錯誤報告以及診斷訊息給 Mattermost 公司用以改進 Mattermost 的效能跟品質。如需關於隱私政策的詳細資訊，請至 <a href=\"https://about.mattermost.com/default-privacy-policy/\" target='_blank'>隱私政策</a>。",
   "admin.log.enableWebhookDebugging": "啟用 Webhook 除錯：",
   "admin.log.enableWebhookDebuggingDescription": "停用這個會停止對於所有傳入的 Webhook 要求內容的除錯記錄。",
-  "admin.log.fileDescription": "正式環境一般為啟用。啟用時，記錄檔案會輸出至下面的檔案位置欄位所指定的位置。",
+  "admin.log.fileDescription": "正式環境通常設為啟用。啟用時被記錄的事件將會被寫入至記錄檔案目錄下的 mattermost.log 檔案。記錄檔會在一萬行時交替並封存至同目錄下，以時間及序號命名該封存檔案。如：mattermost.2017-03-31.001。",
   "admin.log.fileLevelDescription": "此設定決定怎樣的事件才會輸出到記錄檔案。ERROR：只輸出錯誤訊息。INFO：輸出錯誤訊息以及啟動跟初始化前後的訊息。DEBUG：輸出各種細節以便開發者除錯。",
   "admin.log.fileLevelTitle": "檔案記錄等級:",
   "admin.log.fileTitle": "輸出記錄到檔案：",
@@ -521,7 +526,7 @@
   "admin.log.formatTitle": "記錄檔案格式：",
   "admin.log.levelDescription": "本設定決定記錄輸出到控制台的等級，ERROR：只輸出錯誤訊息。INFO：輸出錯誤訊息與啟動到初始化的訊息。 DEBUG：輸出開發時除錯的一切相關訊息。",
   "admin.log.levelTitle": "控制台記錄等級：",
-  "admin.log.locationDescription": "記錄的輸出檔案。若留白則設為 ./logs/mattermost，輸出記錄到 ./logs/mattermost.log 檔案。記錄會自動輪替。每一萬行記錄會寫入同目錄的新檔，例如 mattermost.2015-09-23.001、mattermost.2015-09-23.002 等等。",
+  "admin.log.locationDescription": "記錄檔的位置。如為空，將會儲存在 ./logs 目錄。設定的路徑必須已存在且 Mattermost 必須有寫入的權限。",
   "admin.log.locationPlaceholder": "輸入檔案位置",
   "admin.log.locationTitle": "記錄檔案目錄：",
   "admin.log.logSettings": "記錄檔設定值",
@@ -691,7 +696,7 @@
   "admin.service.corsTitle": "允許來自下列網址的跨站請求：",
   "admin.service.developerDesc": "啟用時，Javascript 錯誤會顯示在使用者界面頂端上的紅色橫欄。不建議在正式環境中使用。",
   "admin.service.developerTitle": "啟用開發者模式：",
-  "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
+  "admin.service.enforcMfaTitle": "強制使用多重要素驗證：",
   "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通訊埠",
@@ -725,7 +730,7 @@
   "admin.service.sessionCacheDesc": "要將工作階段快取在記憶體中多久(分鐘)。",
   "admin.service.sessionDaysEx": "如：\"30\"",
   "admin.service.siteURL": "站台網址：",
-  "admin.service.siteURLDescription": "使用者用來存取 Mattermost 的網址，應包含通訊協定跟連接埠。除非正在<b>通知 > 電子郵件</b>中設定批次郵件，否則此欄位可以留白。留白則會自動根據傳入資料設定。",
+  "admin.service.siteURLDescription": "使用者用來存取 Mattermost 的網址，包含通訊埠與協定。此項為必要設定。",
   "admin.service.siteURLExample": "如：\"https://mattermost.example.com:1234\"",
   "admin.service.ssoSessionDays": "SSO 的工作階段長度(以天計)：",
   "admin.service.ssoSessionDaysDesc": "從使用者最後一次輸入他們的認證到工作階段過期之間的天數。如果認證方式是 SAML 或 GitLab 且他們已經登入 SAML 或 GitLab，使用者將會自動再次登入 Mattermost。修改設定之後新的工作階段長度會在下次使用者輸入認證之後開始生效。",
@@ -743,11 +748,11 @@
   "admin.service.webhooksTitle": "啟用傳出的 Webhook：",
   "admin.service.writeTimeout": "寫入逾時：",
   "admin.service.writeTimeoutDescription": "如果使用 HTTP (不安全)，這是從讀取請求完畢後到寫入回應之間最多所能使用的時間。如果使用 HTTPS，這是從連線被接受後到寫入回應之間最多所能使用的時間。",
-  "admin.sidebar.addTeamSidebar": "Add team from sidebar menu",
+  "admin.sidebar.addTeamSidebar": "從側邊欄選單加入團隊",
   "admin.sidebar.advanced": "進階",
   "admin.sidebar.audits": "規範與審計",
   "admin.sidebar.authentication": "認證",
-  "admin.sidebar.cluster": "高可用性 (Beta)",
+  "admin.sidebar.cluster": "高可用性",
   "admin.sidebar.compliance": "規範",
   "admin.sidebar.configuration": "設定",
   "admin.sidebar.connections": "連線",
@@ -784,7 +789,7 @@
   "admin.sidebar.push": "行動推播",
   "admin.sidebar.rateLimiting": "張貼速率限制",
   "admin.sidebar.reports": "報告",
-  "admin.sidebar.rmTeamSidebar": "Remove team from sidebar menu",
+  "admin.sidebar.rmTeamSidebar": "從側邊欄選單移除團隊",
   "admin.sidebar.saml": "SAML",
   "admin.sidebar.security": "安全",
   "admin.sidebar.sessions": "工作階段",
@@ -794,7 +799,7 @@
   "admin.sidebar.statistics": "團隊統計",
   "admin.sidebar.storage": "儲存區",
   "admin.sidebar.support": "法律與支援",
-  "admin.sidebar.teams": "TEAMS ({count, number})",
+  "admin.sidebar.teams": "團隊 ({count, number})",
   "admin.sidebar.users": "使用者",
   "admin.sidebar.usersAndTeams": "使用者與團隊",
   "admin.sidebar.view_statistics": "系統統計",
@@ -880,8 +885,8 @@
   "admin.team_analytics.activeUsers": "有發文的活躍使用者",
   "admin.team_analytics.totalPosts": "全部發文",
   "admin.true": "是",
-  "admin.userList.title": "Users for {team}",
-  "admin.userList.title2": "Users for {team} ({count})",
+  "admin.userList.title": "{team}的使用者",
+  "admin.userList.title2": "{team} ({count})的使用者",
   "admin.user_item.authServiceEmail": "<strong>登入方式：</strong>電子郵件",
   "admin.user_item.authServiceNotEmail": "<strong>登入方式：</strong>{service}",
   "admin.user_item.confirmDemoteDescription": "如果將自己從系統管理員降級且不存在其它有管理員權限的使用者。則必須以終端機方式存取 Mattermost 伺服器並執行下列命令以重新指定新的系統管理員。",
@@ -895,13 +900,14 @@
   "admin.user_item.makeMember": "設為成員",
   "admin.user_item.makeSysAdmin": "設為系統管理員",
   "admin.user_item.makeTeamAdmin": "設為團隊管理員",
+  "admin.user_item.manageTeams": "管理團隊",
   "admin.user_item.member": "成員",
   "admin.user_item.mfaNo": "<strong>多重要素驗證</strong>：無",
   "admin.user_item.mfaYes": "<strong>多重要素驗證</strong>：是",
   "admin.user_item.resetMfa": "移除多重要素驗證",
   "admin.user_item.resetPwd": "重置我的密碼",
   "admin.user_item.switchToEmail": "切換帳戶到電子郵件地址/密碼",
-  "admin.user_item.sysAdmin": "System Admin",
+  "admin.user_item.sysAdmin": "系統管理",
   "admin.user_item.teamAdmin": "團隊管理員",
   "admin.webrtc.enableDescription": "啟用時，Mattermost 將可以展開<strong>一對一</strong>的視訊通話。WebRTC 通話可在 Chrome, Firefox 和 Mattermost 桌面應用程式上使用。",
   "admin.webrtc.enableTitle": "啟用 Mattermost WebRTC：",
@@ -941,7 +947,7 @@
   "analytics.system.dailyActiveUsers": "每日活躍使用者",
   "analytics.system.monthlyActiveUsers": "每月活躍使用者",
   "analytics.system.postTypes": "發文,檔案與#標籤",
-  "analytics.system.privateGroups": "Private Groups",
+  "analytics.system.privateGroups": "私人頻道",
   "analytics.system.publicChannels": "公開頻道",
   "analytics.system.skippedIntensiveQueries": "部份統計已被停用以獲得最大的效能。可以在 config.json 中重新啟用它們。詳請參閱 <a href='https://docs.mattermost.com/administration/statistics.html' target='_blank'>https://docs.mattermost.com/administration/statistics.html</a>",
   "analytics.system.textPosts": "以純文字發文",
@@ -961,7 +967,7 @@
   "analytics.system.totalWebsockets": "Websocket 連線",
   "analytics.team.activeUsers": "有發文的活躍使用者",
   "analytics.team.newlyCreated": "新建的使用者",
-  "analytics.team.privateGroups": "Private Groups",
+  "analytics.team.privateGroups": "私人頻道",
   "analytics.team.publicChannels": "公開頻道",
   "analytics.team.recentActive": "最近的活躍使用者",
   "analytics.team.recentUsers": "最近的活躍使用者",
@@ -994,8 +1000,8 @@
   "audit_table.attemptedWebhookDelete": "嘗試刪除 Webhook",
   "audit_table.by": "由 {username}",
   "audit_table.byAdmin": "由管理員",
-  "audit_table.channelCreated": "建立 {channelName} 頻道/群組",
-  "audit_table.channelDeleted": "刪除網址為 {url} 的頻道/群組",
+  "audit_table.channelCreated": "建立 {channelName} 頻道",
+  "audit_table.channelDeleted": "刪除網址為 {url} 的頻道",
   "audit_table.establishedDM": "和 {username} 建立直接訊息頻道",
   "audit_table.failedExpiredLicenseAdd": "授權由於過期或未開始，無法新增",
   "audit_table.failedInvalidLicenseAdd": "無法新增無效的授權",
@@ -1004,14 +1010,14 @@
   "audit_table.failedPassword": "無法變更密碼 - 用 OAuth 登入的使用者嘗試更新使用者密碼",
   "audit_table.failedWebhookCreate": "無法建立 Webhook - 不符頻道權限",
   "audit_table.failedWebhookDelete": "無法刪除 Webhook - 不恰當的條件",
-  "audit_table.headerUpdated": "更新 {channelName} 頻道/群組標題",
+  "audit_table.headerUpdated": "更新 {channelName} 頻道標題",
   "audit_table.ip": "IP 位址",
   "audit_table.licenseRemoved": "成功移除授權",
   "audit_table.loginAttempt": " (嘗試登入)",
   "audit_table.loginFailure": " (登入失敗)",
   "audit_table.logout": "登出帳號",
   "audit_table.member": "成員",
-  "audit_table.nameUpdated": "更新 {channelName} 頻道/群組 名稱",
+  "audit_table.nameUpdated": "更新 {channelName} 頻道名稱",
   "audit_table.oauthTokenFailed": "無法取得 OAuth 存取 Token - {token}",
   "audit_table.revokedAll": "撤消團隊現在所有的工作階段",
   "audit_table.sentEmail": "傳送郵件到 {email} 以重設密碼",
@@ -1030,9 +1036,9 @@
   "audit_table.updateGlobalNotifications": "已更新全域通知設定",
   "audit_table.updatePicture": "已更新個人圖像",
   "audit_table.updatedRol": "已更新使用者角色為：",
-  "audit_table.userAdded": "新增用戶 {username} 到 {channelName} 頻道/群組",
+  "audit_table.userAdded": "新增用戶 {username} 到 {channelName} 頻道",
   "audit_table.userId": "使用者 ID",
-  "audit_table.userRemoved": "將用戶 {username} 從 {channelName} 頻道/群組 移除",
+  "audit_table.userRemoved": "將用戶 {username} 從 {channelName} 頻道移除",
   "audit_table.verified": "已確認電子郵件地址",
   "authorize.access": "是否允許 <strong>{appName}</strong> 存取？",
   "authorize.allow": "允許",
@@ -1059,20 +1065,17 @@
   "channelHeader.removeFromFavorites": "從我的最愛中移除",
   "channel_flow.alreadyExist": "該網址的頻道已經存在",
   "channel_flow.changeUrlDescription": "有網址不允許使用的字元時會自動移除。",
-  "channel_flow.changeUrlTitle": "Change {term} URL",
-  "channel_flow.channel": "Channel",
-  "channel_flow.create": "離開頻道",
-  "channel_flow.group": "Group",
+  "channel_flow.changeUrlTitle": "變更頻道網址",
+  "channel_flow.create": "建立頻道",
   "channel_flow.handleTooShort": "頻道網址必須為小寫英數字、至少兩個字元",
   "channel_flow.invalidName": "無效的頻道名稱",
-  "channel_flow.set_url_title": "Set {term} URL",
+  "channel_flow.set_url_title": "設定頻道網址",
   "channel_header.addMembers": "新增成員",
   "channel_header.addToFavorites": "新增至我的最愛",
-  "channel_header.channel": "Channel",
+  "channel_header.channel": "頻道",
   "channel_header.channelHeader": "編輯頻道標題",
-  "channel_header.delete": "刪除頻道...",
+  "channel_header.delete": "刪除頻道",
   "channel_header.flagged": "被標記的訊息",
-  "channel_header.group": "Group",
   "channel_header.leave": "離開頻道",
   "channel_header.manageMembers": "成員管理",
   "channel_header.notificationPreferences": "通知喜好設定",
@@ -1080,7 +1083,7 @@
   "channel_header.removeFromFavorites": "從我的最愛中移除",
   "channel_header.rename": "變更頻道名稱",
   "channel_header.setHeader": "編輯頻道標題",
-  "channel_header.setPurpose": "Edit {term} Purpose",
+  "channel_header.setPurpose": "編輯頻道用途",
   "channel_header.viewInfo": "檢視資訊",
   "channel_header.viewMembers": "檢視成員",
   "channel_header.webrtc.call": "開始視訊通話",
@@ -1115,26 +1118,24 @@
   "channel_members_modal.addNew": " 增加新成員",
   "channel_members_modal.members": " 成員",
   "channel_modal.cancel": "取消",
-  "channel_modal.channel": "Channel",
   "channel_modal.createNew": "建立頻道",
-  "channel_modal.descriptionHelp": "說明{term}如何使用。",
-  "channel_modal.displayNameError": "Channel name must be 2 or more characters",
+  "channel_modal.descriptionHelp": "說明此頻道該如何被使用。",
+  "channel_modal.displayNameError": "頻道名稱必須多於或等於兩個字元",
   "channel_modal.edit": "編輯",
-  "channel_modal.group": "Group",
   "channel_modal.header": "標題",
   "channel_modal.headerEx": "如：\"[連結標題](http://example.com)\"",
-  "channel_modal.headerHelp": "設定除了{term}名字以外還會顯示在{term}標題的文字。舉例來說，可以輸入 [Link Title](http://example.com) 以顯示常用連結。",
-  "channel_modal.modalTitle": "New ",
+  "channel_modal.headerHelp": "設定除了頻道名稱以外還會顯示在頻道標題的文字。舉例來說，可以輸入 [Link Title](http://example.com) 以顯示常用連結。",
+  "channel_modal.modalTitle": "新增頻道",
   "channel_modal.name": "名字",
   "channel_modal.nameEx": "例如：\"Bugs\"、\"市場\"、\"客户支持\"",
   "channel_modal.optional": "(非必須)",
-  "channel_modal.privateGroup1": "建立非開放的私人群組。 ",
-  "channel_modal.privateGroup2": "建立公開頻道",
+  "channel_modal.privateGroup1": "建立非開放的私人頻道。 ",
+  "channel_modal.privateGroup2": "建立私人頻道",
   "channel_modal.publicChannel1": "建立公開頻道",
   "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})",
@@ -1222,18 +1223,16 @@
   "create_team.team_url.required": "此欄位是必需的",
   "create_team.team_url.taken": "此網址<a href='https://docs.mattermost.com/help/getting-started/creating-teams.html#team-url' target='_blank'>以保留字起始</a>或是已被使用。請嘗試其他的網址。",
   "create_team.team_url.teamUrl": "團隊網址",
-  "create_team.team_url.unavailable": "不能使用這網址。請嘗試其他的。",
+  "create_team.team_url.unavailable": "不能使用這網址或是已被使用。請嘗試其他的。",
   "create_team.team_url.webAddress": "為新團隊選取網址：",
   "custom_emoji.empty": "沒有自訂繪文字",
   "custom_emoji.header": "自訂繪文字",
   "custom_emoji.search": "搜尋自訂繪文字",
-  "default_channel.purpose": "Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.",
+  "default_channel.purpose": "在此張貼希望所有人都可以看到的訊息。每個人在加入團隊的時候會自動成為此頻道的永久成員。",
   "delete_channel.cancel": "取消",
-  "delete_channel.channel": "channel",
   "delete_channel.confirm": "請確認刪除頻道",
   "delete_channel.del": "刪除",
-  "delete_channel.group": "group",
-  "delete_channel.question": "這將會從團隊刪除頻道並且禁止所有使用者存取頻道內容。您確定要刪除{display_name}{term}？",
+  "delete_channel.question": "這將會從團隊刪除頻道並且禁止所有使用者存取頻道內容。您確定要刪除{display_name}頻道？",
   "delete_post.cancel": "取消",
   "delete_post.comment": "註解",
   "delete_post.confirm": "請確認刪除{term}",
@@ -1247,11 +1246,9 @@
   "edit_channel_header_modal.save": "儲存",
   "edit_channel_header_modal.title": "修改{channel}的標題",
   "edit_channel_header_modal.title_dm": "修改標題",
-  "edit_channel_purpose_modal.body": "描述 {type} 的用途。這敘述會顯示在頻道列表的\"更多...\"選單當中，其他人可以以此決定要不要加入。",
+  "edit_channel_purpose_modal.body": "描述頻道的用途。這敘述會顯示在頻道列表的\"更多...\"選單當中，其他人可以以此決定要不要加入。",
   "edit_channel_purpose_modal.cancel": "取消",
-  "edit_channel_purpose_modal.channel": "Channel",
   "edit_channel_purpose_modal.error": "頻道用途太長,請長話短說",
-  "edit_channel_purpose_modal.group": "Group",
   "edit_channel_purpose_modal.save": "儲存",
   "edit_channel_purpose_modal.title1": "編輯用途",
   "edit_channel_purpose_modal.title2": "編輯用途。目標：",
@@ -1277,8 +1274,8 @@
   "emoji_list.creator": "建立者",
   "emoji_list.delete": "刪除",
   "emoji_list.delete.confirm.button": "刪除",
-  "emoji_list.delete.confirm.msg": "This action permanently deletes the custom emoji. Are you sure you want to delete it?",
-  "emoji_list.delete.confirm.title": "Delete Custom Emoji",
+  "emoji_list.delete.confirm.msg": "即將永久刪除自訂繪文字。您確定要刪除它嘛？",
+  "emoji_list.delete.confirm.title": "刪除自訂繪文字",
   "emoji_list.empty": "沒有自訂繪文字",
   "emoji_list.header": "自訂繪文字",
   "emoji_list.help": "自訂繪文字對此伺服器上的所有使用者開放。在訊息輸入框輸入 ':' 會叫出繪文字選單。其他使用者可能需要重新讀取頁面才會看見新的繪文字。",
@@ -1287,27 +1284,29 @@
   "emoji_list.name": "名稱",
   "emoji_list.search": "搜尋自訂繪文字",
   "emoji_list.somebody": "其他團隊的某人",
-  "emoji_picker.activity": "Activity",
-  "emoji_picker.custom": "Custom",
-  "emoji_picker.emojiPicker": "Emoji Picker",
-  "emoji_picker.flags": "標記",
-  "emoji_picker.food": "Food",
-  "emoji_picker.nature": "Nature",
-  "emoji_picker.objects": "Objects",
-  "emoji_picker.people": "People",
-  "emoji_picker.recent": "Recently Used",
+  "emoji_picker.activity": "活動",
+  "emoji_picker.custom": "自訂",
+  "emoji_picker.emojiPicker": "繪文字選取器",
+  "emoji_picker.flags": "旗幟",
+  "emoji_picker.food": "食物",
+  "emoji_picker.nature": "自然",
+  "emoji_picker.objects": "物件",
+  "emoji_picker.people": "人物",
+  "emoji_picker.recent": "最近曾使用",
   "emoji_picker.search": "搜尋",
-  "emoji_picker.symbols": "Symbols",
-  "emoji_picker.travel": "Travel",
+  "emoji_picker.symbols": "符號",
+  "emoji_picker.travel": "旅遊",
   "error.not_found.link_message": "回到 Mattermost",
   "error.not_found.message": "您所存取的頁面不存在",
   "error.not_found.title": "找不到頁面",
-  "error.not_supported.message": "不支援隱私瀏覽",
-  "error.not_supported.title": "不支援此瀏覽器",
   "error_bar.expired": "企業版授權已過期，某些功能已被關閉。<a href='{link}' target='_blank'>請由此更新。</a>",
   "error_bar.expiring": "企業版授權將於{date}過期。<a href='{link}' target='_blank'>請由此更新。</a>",
   "error_bar.past_grace": "企業版授權已過期，某些功能已被關閉。詳請聯絡系統管理員。",
   "error_bar.preview_mode": "預覽模式：電子郵件通知尚未設定",
+  "error_bar.site_url": "Please configure your {docsLink} in the {link}.",
+  "error_bar.site_url.docsLink": "站台網址",
+  "error_bar.site_url.link": "系統控制台",
+  "error_bar.site_url_gitlab": "Please configure your {docsLink} in the System Console or in gitlab.rb if you're using GitLab Mattermost.",
   "file_attachment.download": "下載",
   "file_info_preview.size": "大小 ",
   "file_info_preview.type": "檔案類型 ",
@@ -1541,13 +1540,13 @@
   "intro_messages.beginning": "{name}的開頭",
   "intro_messages.channel": "頻道",
   "intro_messages.creator": "這是{name}{type}的開頭，由{creator}建立於{date}。",
-  "intro_messages.default": "<h4 class='channel-intro__title'>Beginning of {display_name}</h4><p class='channel-intro__content'><strong>Welcome to {display_name}!</strong><br/><br/>Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.</p>",
-  "intro_messages.group": "private group",
+  "intro_messages.default": "<h4 class=\"channel-intro__title\">{display_name}的開頭</h4><p class=\"channel-intro__content\"><strong>歡迎來到{display_name}！</strong><br/><br/>在此張貼希望所有人都可以看到的訊息。每個人在加入團隊的時候會自動成為此頻道的永久成員。</p>",
+  "intro_messages.group": "私人頻道",
   "intro_messages.invite": "邀請他人來此{type}",
   "intro_messages.inviteOthers": "邀請他人來此團隊",
   "intro_messages.noCreator": "這是{name}{type}的開頭，建立於{date}。",
   "intro_messages.offTopic": "<h4 class=\"channel-intro__title\">{display_name}的開頭</h4><p class=\"channel-intro__content\">這是{display_name}的最上面，這是個用來聊天的頻道。<br/></p>",
-  "intro_messages.onlyInvited": " 只有受邀請的成員能看見此私人群組",
+  "intro_messages.onlyInvited": " 只有受邀請的成員能看見此私人頻道",
   "intro_messages.purpose": "此{type}的用途為：{purpose}。",
   "intro_messages.setHeader": "設定標題",
   "intro_messages.teammate": "這是您跟這位團隊成員之間直接訊息的起頭。直接訊息跟在這邊分享的檔案除了在此處以外的人都看不到。",
@@ -1563,7 +1562,7 @@
   "invite_member.modalButton": "是，放棄它們",
   "invite_member.modalMessage": "還有尚未寄送的邀請，確定要放棄它們嘛？",
   "invite_member.modalTitle": "放棄邀請？",
-  "invite_member.newMember": "邀請新成員",
+  "invite_member.newMember": "發送電子郵件邀請",
   "invite_member.send": "發送邀請",
   "invite_member.send2": "發送邀請",
   "invite_member.sending": " 傳送中",
@@ -1573,7 +1572,7 @@
   "ldap_signup.length_error": "名稱長度為3到15字元",
   "ldap_signup.teamName": "輸入新團隊名稱",
   "ldap_signup.team_error": "請輸入團隊名稱",
-  "leave_team_modal.desc": "將離開所有的公開頻道與私人群組。如果團隊是私人團隊，將無法重新加入。您確定嘛？",
+  "leave_team_modal.desc": "將離開所有的公開與私人頻道。如果團隊是私人團隊，將無法重新加入。您確定嘛？",
   "leave_team_modal.no": "否",
   "leave_team_modal.title": "離開團隊？",
   "leave_team_modal.yes": "是",
@@ -1636,83 +1635,83 @@
   "mfa.setup.step2": "<strong>步驟二：</strong>使用 Google Authenticator 掃描此 QR 碼或是手動輸入密碼",
   "mfa.setup.step3": "<strong>步驟三：</strong>輸入 Google Authenticator 產生的代碼",
   "mfa.setupTitle": "多重要素驗證設定",
-  "mobile.about.appVersion": "App Version: {version} (Build {number})",
-  "mobile.about.copyright": "版權所有 2016 Mattermost, Inc. 保留所有權利",
-  "mobile.about.database": "Database: {type}",
-  "mobile.about.serverVersion": "Server Version: {version} (Build {number})",
-  "mobile.about.serverVersionNoBuild": "Server Version: {version}",
-  "mobile.account.notifications.email.footer": "When offline or away for more than five minutes",
-  "mobile.account_notifications.mentions_footer": "Your username (\"@{username}\") will always trigger mentions.",
-  "mobile.account_notifications.non-case_sensitive_words": "Other non-case sensitive words...",
-  "mobile.account_notifications.reply.header": "Send reply notifications for",
-  "mobile.account_notifications.threads_mentions": "Mentions in threads",
-  "mobile.account_notifications.threads_start": "Threads that I start",
-  "mobile.account_notifications.threads_start_participate": "Threads that I start or participate in",
-  "mobile.channel_info.alertMessageDeleteChannel": "確定要刪除{term}嘛？",
-  "mobile.channel_info.alertMessageLeaveChannel": "Are you sure you want to leave the {term} {name}?",
+  "mobile.about.appVersion": "應用程式版本：{version} (Build {number})",
+  "mobile.about.copyright": "版權所有 2015-{currentYear} Mattermost, Inc. 保留所有權利",
+  "mobile.about.database": "資料庫：{type}",
+  "mobile.about.serverVersion": "伺服器版本：{version} (Build {number}) ",
+  "mobile.about.serverVersionNoBuild": "伺服器版本：{version}",
+  "mobile.account.notifications.email.footer": "當下線或是離開超過五分鐘時",
+  "mobile.account_notifications.mentions_footer": "您的使用者名稱 (\"@{username}\") 總會觸發提及。",
+  "mobile.account_notifications.non-case_sensitive_words": "其他不區分大小寫的字...",
+  "mobile.account_notifications.reply.header": "發送回覆通知",
+  "mobile.account_notifications.threads_mentions": "被提及的討論串",
+  "mobile.account_notifications.threads_start": "我開啟的討論串",
+  "mobile.account_notifications.threads_start_participate": "我開啟或參與的討論串",
+  "mobile.channel_info.alertMessageDeleteChannel": "確定要刪除名為{name}的{term}嘛？",
+  "mobile.channel_info.alertMessageLeaveChannel": "確定要離開{term} {name} 嘛？",
   "mobile.channel_info.alertNo": "否",
   "mobile.channel_info.alertTitleDeleteChannel": "刪除{term}",
   "mobile.channel_info.alertTitleLeaveChannel": "退出{term}",
   "mobile.channel_info.alertYes": "是",
-  "mobile.channel_info.privateChannel": "Private Channel",
+  "mobile.channel_info.privateChannel": "私人頻道",
   "mobile.channel_info.publicChannel": "公開頻道",
-  "mobile.channel_list.alertMessageLeaveChannel": "Are you sure you want to leave the {term} {name}?",
+  "mobile.channel_list.alertMessageLeaveChannel": "確定要離開{term} {name} 嘛？",
   "mobile.channel_list.alertNo": "否",
   "mobile.channel_list.alertTitleLeaveChannel": "退出{term}",
   "mobile.channel_list.alertYes": "是",
-  "mobile.channel_list.closeDM": "Close Direct Message",
-  "mobile.channel_list.closeGM": "Close Group Message",
+  "mobile.channel_list.closeDM": "關閉直接傳訊",
+  "mobile.channel_list.closeGM": "關閉群組訊息",
   "mobile.channel_list.dm": "直接傳訊",
-  "mobile.channel_list.gm": "Group Message",
-  "mobile.channel_list.open": "Open {term}",
-  "mobile.channel_list.openDM": "Open Direct Message",
-  "mobile.channel_list.openGM": "Open Group Message",
-  "mobile.channel_list.privateChannel": "Private Channel",
+  "mobile.channel_list.gm": "群組訊息",
+  "mobile.channel_list.open": "開啟{term}",
+  "mobile.channel_list.openDM": "開啟直接傳訊",
+  "mobile.channel_list.openGM": "開啟群組訊息",
+  "mobile.channel_list.privateChannel": "私人頻道",
   "mobile.channel_list.publicChannel": "公開頻道",
   "mobile.components.channels_list_view.yourChannels": "您的頻道：",
-  "mobile.components.error_list.dismiss_all": "Dismiss All",
+  "mobile.components.error_list.dismiss_all": "全部關閉",
   "mobile.components.select_server_view.continue": "繼續",
   "mobile.components.select_server_view.enterServerUrl": "輸入伺服器網址",
   "mobile.components.select_server_view.proceed": "繼續",
   "mobile.components.select_server_view.siteUrlPlaceholder": "\"https://mattermost.example.com\"",
-  "mobile.create_channel": "Create",
-  "mobile.create_channel.private": "New Private Group",
-  "mobile.create_channel.public": "公開頻道",
-  "mobile.custom_list.no_results": "No Results",
-  "mobile.edit_post.title": "Editing Message",
-  "mobile.file_upload.camera": "Take Photo or Video",
-  "mobile.file_upload.library": "Photo Library",
+  "mobile.create_channel": "建立",
+  "mobile.create_channel.private": "新的私人頻道",
+  "mobile.create_channel.public": "新的公開頻道",
+  "mobile.custom_list.no_results": "找不到相符的結果",
+  "mobile.edit_post.title": "編輯訊息",
+  "mobile.file_upload.camera": "照相或錄影",
+  "mobile.file_upload.library": "相簿",
   "mobile.file_upload.more": "更多",
-  "mobile.loading_channels": "Loading Channels...",
-  "mobile.loading_members": "Loading Members...",
-  "mobile.loading_posts": "Loading Messages...",
-  "mobile.login_options.choose_title": "Choose your login method",
+  "mobile.loading_channels": "正在載入頻道...",
+  "mobile.loading_members": "正在載入成員...",
+  "mobile.loading_posts": "正在載入訊息...",
+  "mobile.login_options.choose_title": "選擇登入方式",
   "mobile.post.cancel": "取消",
-  "mobile.post.delete_question": "確定要刪除{term}嘛？",
-  "mobile.post.delete_title": "Delete Post",
-  "mobile.request.invalid_response": "Received invalid response from the server.",
-  "mobile.routes.channelInfo": "Info",
-  "mobile.routes.channelInfo.createdBy": "Created by {creator} on ",
-  "mobile.routes.channelInfo.delete_channel": "刪除頻道...",
+  "mobile.post.delete_question": "確定要刪除此訊息嘛？",
+  "mobile.post.delete_title": "刪除訊息",
+  "mobile.request.invalid_response": "從伺服器傳來無效的回應。",
+  "mobile.routes.channelInfo": "相關資訊",
+  "mobile.routes.channelInfo.createdBy": "由 {creator} 建立於",
+  "mobile.routes.channelInfo.delete_channel": "刪除頻道",
   "mobile.routes.channelInfo.favorite": "我的最愛",
   "mobile.routes.channel_members.action": "移除成員",
-  "mobile.routes.channel_members.action_message": "You must select at least one member to remove from the channel.",
-  "mobile.routes.channel_members.action_message_confirm": "Are you sure you want to remove the selected members from the channel?",
+  "mobile.routes.channel_members.action_message": "必須選取至少一位成員以從頻道移除",
+  "mobile.routes.channel_members.action_message_confirm": "您確定要從頻道移除選取的成員？",
   "mobile.routes.channels": "頻道",
   "mobile.routes.enterServerUrl": "輸入伺服器網址",
   "mobile.routes.login": "登入",
-  "mobile.routes.loginOptions": "Login Chooser",
+  "mobile.routes.loginOptions": "登入選擇器",
   "mobile.routes.mfa": "多重要素驗證",
   "mobile.routes.postsList": "文章列表",
-  "mobile.routes.saml": "Single SignOn",
+  "mobile.routes.saml": "單一登入",
   "mobile.routes.selectTeam": "選擇團隊",
-  "mobile.routes.settings": "Settings",
-  "mobile.routes.thread": "{channelName} Thread",
-  "mobile.routes.thread_dm": "Direct Message Thread",
-  "mobile.routes.user_profile": "Profile",
+  "mobile.routes.settings": "設定",
+  "mobile.routes.thread": "{channelName} 討論串",
+  "mobile.routes.thread_dm": "直接傳訊討論串",
+  "mobile.routes.user_profile": "個人檔案",
   "mobile.routes.user_profile.send_message": "發送訊息",
-  "mobile.server_ping_failed": "Cannot connect to the server. Please check your server URL and internet connection.",
-  "mobile.server_url.invalid_format": "開頭必須是 http:// 或 https://",
+  "mobile.server_ping_failed": "無法與伺服器連線。請檢查伺服器網址與網際網路連線。",
+  "mobile.server_url.invalid_format": "網址開頭必須是 http:// 或 https://",
   "mobile.settings.team_selection": "選擇團隊",
   "more_channels.close": "關閉",
   "more_channels.create": "建立頻道",
@@ -1724,8 +1723,8 @@
   "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.new_convo_note": "這會起始新的對話。如果要加入大量的成員，請考慮改成建立新的私人頻道。",
+  "more_direct_channels.new_convo_note.full": "已達到此對話的最大人數。請考慮改成建立新的私人頻道。",
   "more_direct_channels.title": "直接傳訊",
   "msg_typing.areTyping": "{users}跟{last}正在打字...",
   "msg_typing.isTyping": "{user}正在打字...",
@@ -1748,15 +1747,16 @@
   "navbar.toggle1": "切換側邊欄",
   "navbar.toggle2": "切換側邊欄",
   "navbar.viewInfo": "檢視資訊",
-  "navbar.viewPinnedPosts": "View Pinned Posts",
+  "navbar.viewPinnedPosts": "觀看被釘選的訊息",
   "navbar_dropdown.about": "關於 Mattermost",
   "navbar_dropdown.accountSettings": "帳號設定",
+  "navbar_dropdown.addMemberToTeam": "新增成員",
   "navbar_dropdown.console": "系統控制台",
   "navbar_dropdown.create": "建立團隊",
   "navbar_dropdown.emoji": "自訂繪文字",
   "navbar_dropdown.help": "說明",
   "navbar_dropdown.integrations": "整合",
-  "navbar_dropdown.inviteMember": "邀請新成員",
+  "navbar_dropdown.inviteMember": "發送電子郵件邀請",
   "navbar_dropdown.join": "加入其他團隊",
   "navbar_dropdown.leave": "離開團隊",
   "navbar_dropdown.logout": "登出",
@@ -1788,6 +1788,7 @@
   "pending_post_actions.cancel": "取消",
   "pending_post_actions.retry": "重試",
   "permalink.error.access": "此永久連結通往被刪除的訊息或是您沒有觀看權限的頻道。",
+  "permalink.error.title": "找不到訊息",
   "post_attachment.collapse": "收起...",
   "post_attachment.more": "展開...",
   "post_body.commentedOn": "對 {name}{apostrophe} 訊息的註解：",
@@ -1803,11 +1804,11 @@
   "post_info.mobile.flag": "標記",
   "post_info.mobile.unflag": "取消標記",
   "post_info.permalink": "永久網址",
-  "post_info.pin": "Pin to channel",
-  "post_info.pinned": "Pinned",
+  "post_info.pin": "釘選至頻道",
+  "post_info.pinned": "已釘選",
   "post_info.reply": "回覆",
   "post_info.system": "系統",
-  "post_info.unpin": "Un-pin from channel",
+  "post_info.unpin": "解除釘選",
   "post_message_view.edited": "(被編輯過)",
   "posts_view.loadMore": "載入更多訊息",
   "posts_view.newMsg": "新訊息",
@@ -1860,14 +1861,14 @@
   "rhs_root.mobile.flag": "標記",
   "rhs_root.mobile.unflag": "取消標記",
   "rhs_root.permalink": "永久網址",
-  "rhs_root.pin": "Pin to channel",
-  "rhs_root.unpin": "Un-pin from channel",
+  "rhs_root.pin": "釘選至頻道",
+  "rhs_root.unpin": "解除釘選",
   "search_bar.search": "搜尋",
   "search_bar.usage": "<h4>搜尋選項</h4><ul><li><span>用</span><b>\"雙引號\"</b><span>來搜尋語句</span></li><li><span>用</span><b>from:</b><span>來搜尋特定使用者的訊息，用</span><b>in:</b><span>來搜尋特定頻道</span></li></ul>",
   "search_header.results": "搜尋結果",
   "search_header.title2": "最近提及",
   "search_header.title3": "被標記的訊息",
-  "search_header.title4": "Pinned posts in {channelDisplayName}",
+  "search_header.title4": "在{channelDisplayName}的釘選訊息",
   "search_item.direct": "直接訊息 (與{username})",
   "search_item.jump": "跳至",
   "search_results.because": "<ul><li>如果要搜尋部份語句(如搜尋\"rea\"以尋找\"reach\"或\"reaction\")，請在搜尋詞尾附上*。</li><li>為了減少收尋結果，兩個字母的搜尋跟常用字像\"this\"、\"a\"跟\"is\"不會顯示在結果當中。</li></ul>",
@@ -1877,10 +1878,10 @@
   "search_results.usageFlag2": "可以藉由按下位於時間戳記旁邊的這 ",
   "search_results.usageFlag3": " 圖示來標記訊息跟註解。",
   "search_results.usageFlag4": "標記是標注訊息以追蹤後續的功能。您的標記是屬於個人的，不會被其他使用者看到。",
-  "search_results.usagePin1": "There are no pinned messages yet.",
-  "search_results.usagePin2": "All members of this channel can pin important or useful messages.",
-  "search_results.usagePin3": "Pinned messages are visible to all channel members.",
-  "search_results.usagePin4": "To pin a message: Go to the message that you want to pin and click [...] > \"Pin to channel\".",
+  "search_results.usagePin1": "尚未有被釘選的訊息",
+  "search_results.usagePin2": "所有此頻道的成員都可以釘選重要或是有用的訊息。",
+  "search_results.usagePin3": "所有的頻道成員都能看見被釘選的訊息。",
+  "search_results.usagePin4": "釘選訊息：移動到想釘選的訊息，按下 [...] > \"釘選至頻道\"。",
   "setting_item_max.cancel": "取消",
   "setting_item_max.save": "儲存",
   "setting_item_min.edit": "編輯",
@@ -1893,25 +1894,26 @@
   "setting_upload.select": "選取檔案",
   "sidebar.channels": "頻道",
   "sidebar.createChannel": "建立公開頻道",
-  "sidebar.createGroup": "Create new group",
+  "sidebar.createGroup": "建立私人頻道",
   "sidebar.direct": "直接訊息",
   "sidebar.favorite": "我的最愛",
   "sidebar.more": "更多",
   "sidebar.moreElips": "更多...",
   "sidebar.otherMembers": "此團隊以外",
-  "sidebar.pg": "Private Groups",
+  "sidebar.pg": "私人頻道",
   "sidebar.removeList": "從清單中移除",
-  "sidebar.tutorialScreen1": "<h4>頻道</h4><p><strong>頻道</strong>用來展開關於各種話題的對話。頻道對團隊全體都是開放可以任意讀寫的。需要私密通訊時，對單獨一人時使用<strong>直接訊息</strong>，對多人時使用<strong>私人群組</strong>。</p>",
+  "sidebar.tutorialScreen1": "<h4>頻道</h4><p><strong>頻道</strong>用來展開關於各種話題的對話。頻道對團隊全體都是開放可以任意讀寫的。需要私密通訊時，對單獨一人時使用<strong>直接訊息</strong>，對多人時使用<strong>私人頻道</strong>。</p>",
   "sidebar.tutorialScreen2": "<h4>\"{townsquare}\"跟\"{offtopic}\"頻道</h4><p>以下為兩個一開始就建立好的公開頻道：</p><p><strong>{townsquare}</strong>是個給團隊之間溝通的地方，您的團隊全員都是這個頻道的成員。</p><p><strong>{offtopic}</strong>是個放鬆心情、聊與工作無關事情的地方。您和團隊可以決定要建立其他怎樣的頻道。</p>",
-  "sidebar.tutorialScreen3": "<h4>建立和加入頻道</h4><p>按<strong>\"更多...\"</strong>來建立新頻道或是加入現有的頻道。</p><p>您也可以藉由按在頻道或是私人群組標題旁邊的<strong>\"+\"符號</strong>來建立新頻道或是私人群組。</p>",
+  "sidebar.tutorialScreen3": "<h4>建立和加入頻道</h4><p>按<strong>\"更多...\"</strong>來建立新頻道或是加入現有的頻道。</p><p>您也可以藉由按在公開或私人頻道標題旁邊的<strong>\"+\"符號</strong>來建立新的公開或私人頻道。</p>",
   "sidebar.unreadAbove": "上面有未讀訊息",
   "sidebar.unreadBelow": "下面有未讀訊息",
   "sidebar_header.tutorial": "<h4>主選單</h4><p>在<strong>主選單</strong>可以<strong>邀請新成員</strong>，存取<strong>帳號設定</strong>並設定<strong>主題顏色</strong>。</p><p>團隊管理員也可以在此存取<strong>團隊設定</strong>。</p><p>系統管理員會在此看到<strong>系統控制台</strong>以管理整個系統。</p>",
   "sidebar_right_menu.accountSettings": "帳號設定",
+  "sidebar_right_menu.addMemberToTeam": "新增成員",
   "sidebar_right_menu.console": "系統控制台",
   "sidebar_right_menu.flagged": "被標記的訊息",
   "sidebar_right_menu.help": "說明",
-  "sidebar_right_menu.inviteNew": "邀請新成員",
+  "sidebar_right_menu.inviteNew": "發送電子郵件邀請",
   "sidebar_right_menu.logout": "登出",
   "sidebar_right_menu.manageMembers": "成員管理",
   "sidebar_right_menu.nativeApps": "下載應用程式",
@@ -1979,7 +1981,7 @@
   "suggestion.mention.morechannels": "其他頻道",
   "suggestion.mention.nonmembers": "不在頻道中",
   "suggestion.mention.special": "特別提及",
-  "suggestion.search.private": "Private Groups",
+  "suggestion.search.private": "私人頻道",
   "suggestion.search.public": "公開頻道",
   "team_export_tab.download": "下載",
   "team_export_tab.export": "匯出",
@@ -2035,7 +2037,7 @@
   "tutorial_intro.mobileAppsLinkText": "PC, Mac, iOS 與 Android",
   "tutorial_intro.next": "下一步",
   "tutorial_intro.screenOne": "<h3>歡迎來到：</h3><h1>Mattermost</h1><p>您團隊的溝通將可集中在一處、即時可搜尋並隨地都能取用</p><p>讓團隊連結在一起，達成重要的任務。</p>",
-  "tutorial_intro.screenTwo": "<h3>如何運用Mattermost：</h3><p>利用公開頻道、私人群組以及直接訊息來相互溝通。</p><p>所有的內容都會被記錄下來並且可以經由任何可以瀏覽網站的桌機、筆電或手機來搜尋。</p>",
+  "tutorial_intro.screenTwo": "<h3>如何運用Mattermost：</h3><p>利用公開、私人頻道以及直接訊息來相互溝通。</p><p>所有的內容都會被記錄下來並且可以經由任何可以瀏覽網站的桌機、筆電或手機來搜尋。</p>",
   "tutorial_intro.skip": "跳過教學",
   "tutorial_intro.support": "有任何需要，請寄送電子郵件到 ",
   "tutorial_intro.teamInvite": "邀請團隊成員",
@@ -2055,7 +2057,7 @@
   "upload_overlay.info": "將檔案拖曳到這裡上傳。",
   "user.settings.advance.embed_preview": "訊息中第一個網站連結，嘗試顯示網站內容預覽於訊息下方",
   "user.settings.advance.embed_toggle": "內嵌預覽顯示開關",
-  "user.settings.advance.emojipicker": "Enable emoji picker in message input box",
+  "user.settings.advance.emojipicker": "在訊息輸入欄以及回應啟用繪文字選取器",
   "user.settings.advance.enabledFeatures": "已啟用 {count, number} 項功能",
   "user.settings.advance.formattingDesc": "啟用時，文章會顯示連結、顯示繪文字、套用樣式到文字上並自動斷行。此設定預設為開啟。修改此設定後需要重新讀取頁面以生效。",
   "user.settings.advance.formattingTitle": "啟用文章格式設定",
@@ -2233,7 +2235,7 @@
   "user.settings.notifications.desktop.unlimited": "無限制",
   "user.settings.notifications.desktopSounds": "桌面通知音效",
   "user.settings.notifications.email.disabled": "被系統管理員停用",
-  "user.settings.notifications.email.disabled_long": "Email notifications have been disabled by your System Administrator.",
+  "user.settings.notifications.email.disabled_long": "電子郵件通知已被系統管理員停用。",
   "user.settings.notifications.email.everyHour": "每小時",
   "user.settings.notifications.email.everyXMinutes": "每 {count} 分鐘",
   "user.settings.notifications.email.immediately": "立即",
@@ -2278,7 +2280,7 @@
   "user.settings.push_notification.send": "發送行動推播通知",
   "user.settings.push_notification.status": "何時觸發推播通知",
   "user.settings.push_notification.status_info": "只有在上線狀態符合上面的選項時才會發送通知到行動裝置上。",
-  "user.settings.security.active": "Active",
+  "user.settings.security.active": "啟用",
   "user.settings.security.close": "關閉",
   "user.settings.security.currentPassword": "目前的密碼",
   "user.settings.security.currentPasswordError": "請輸入原先的密碼。",
diff --git a/webapp/root.jsx b/webapp/root.jsx
index 0236f380b7..177eb1ec4f 100644
--- a/webapp/root.jsx
+++ b/webapp/root.jsx
@@ -60,6 +60,8 @@ function preRenderSetup(callwhendone) {
     // Make sure the websockets close and reset version
     $(window).on('beforeunload',
          () => {
+             // Turn off to prevent getting stuck in a loop
+             $(window).off('beforeunload');
              BrowserStore.setLastServerVersion('');
              if (UserStore.getCurrentUser()) {
                  AsyncClient.viewChannel('', ChannelStore.getCurrentId() || '');
diff --git a/webapp/routes/route_team.jsx b/webapp/routes/route_team.jsx
index 405762e0ca..e8ef3f4100 100644
--- a/webapp/routes/route_team.jsx
+++ b/webapp/routes/route_team.jsx
@@ -13,7 +13,6 @@ import AppDispatcher from 'dispatcher/app_dispatcher.jsx';
 import Constants from 'utils/constants.jsx';
 const ActionTypes = Constants.ActionTypes;
 import * as AsyncClient from 'utils/async_client.jsx';
-import * as Utils from 'utils/utils.jsx';
 import Client from 'client/web_client.jsx';
 import ChannelStore from 'stores/channel_store.jsx';
 import BrowserStore from 'stores/browser_store.jsx';
@@ -35,7 +34,7 @@ function doChannelChange(state, replace, callback) {
         channel = ChannelStore.getByName(state.params.channel);
 
         if (channel && channel.type === Constants.DM_CHANNEL) {
-            loadNewDMIfNeeded(Utils.getUserIdFromChannelName(channel));
+            loadNewDMIfNeeded(channel.id);
         } else if (channel && channel.type === Constants.GM_CHANNEL) {
             loadNewGMIfNeeded(channel.id);
         }
diff --git a/webapp/sass/layout/_markdown.scss b/webapp/sass/layout/_markdown.scss
index 0b0fd651a4..7df279f5e5 100644
--- a/webapp/sass/layout/_markdown.scss
+++ b/webapp/sass/layout/_markdown.scss
@@ -1,5 +1,8 @@
 @charset 'UTF-8';
 
+.markdown__link {
+}
+
 .markdown__heading {
     font-weight: 700;
     line-height: 1.5;
diff --git a/webapp/sass/layout/_post-right.scss b/webapp/sass/layout/_post-right.scss
index 9282d0d7b5..9772ebc67b 100644
--- a/webapp/sass/layout/_post-right.scss
+++ b/webapp/sass/layout/_post-right.scss
@@ -148,9 +148,8 @@
     -webkit-overflow-scrolling: touch;
     @include flex(1 1 auto);
     overflow: auto;
-    position: relative;
     padding-top: 10px;
-    min-height: 700px;
+    position: relative;
 
     .file-preview__container {
         margin-top: 5px;
diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss
index c1f8d1cf63..6ffb47c2d5 100644
--- a/webapp/sass/layout/_post.scss
+++ b/webapp/sass/layout/_post.scss
@@ -397,6 +397,7 @@
         .custom-textarea {
             -ms-overflow-style: auto;
             overflow: auto;
+            -webkit-overflow-scrolling: touch;
 
             &:not(.custom-textarea--emoji-picker) {
                 padding-right: 43px;
@@ -857,6 +858,7 @@
         // If the last paragraph of an edited post is a paragraph, make it inline-block so that the (edited) indicator can be on the same line as it
         .post-message__text > p:last-child {
             display: inline-block;
+            width: auto;
         }
 
         .post-edited-indicator {
@@ -1123,6 +1125,7 @@
 
         &:after {
             content: '[...]';
+            font-family: 'Open Sans', sans-serif;
             position: relative;
             top: -1px;
         }
diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss
index e47ba26aa5..96fb868433 100644
--- a/webapp/sass/responsive/_mobile.scss
+++ b/webapp/sass/responsive/_mobile.scss
@@ -33,14 +33,9 @@
         .msg-typing {
             display: none;
         }
-    }
 
-    .post-create__container{
-        .post-create-body {
-            .icon__postcontent_picker {
-                display:none;
-                top: -7px;
-            }
+        .icon--emoji-picker {
+            display: none;
         }
     }