diff --git a/assets/base/i18n/de.json b/assets/base/i18n/de.json
index 0714900e6..5de36d4fa 100644
--- a/assets/base/i18n/de.json
+++ b/assets/base/i18n/de.json
@@ -772,7 +772,7 @@
   "admin.permissions.group.teams.description": "Teams erstellen und Mitglieder verwalten.",
   "admin.permissions.group.teams.name": "Teams",
   "admin.permissions.inherited_from": "Vererbt von <a>{name}</a>",
-  "admin.permissions.introBanner": "Berechtigungsschemen setzen die Standard-Berechtigungen für Team-Administratoren, Kanal-Administratoren und alle anderen. Lernen Sie mehr über Berechtigungsschemen in unserer Dokumentation.",
+  "admin.permissions.introBanner": "Permission Schemes set the default permissions for Team Admins, Channel Admins and everyone else. Learn more about permission schemes in our [documentation](!https://about.mattermost.com/default-advanced-permissions).",
   "admin.permissions.loadMoreSchemes": "Mehr Schemen laden",
   "admin.permissions.loadingMoreSchemes": "Lade...",
   "admin.permissions.permission.assign_system_admin_role.description": "Systemadministratoren-Rolle zuweisen",
@@ -858,7 +858,7 @@
   "admin.permissions.permissionsTree.description": "Beschreibung",
   "admin.permissions.permissionsTree.permission": "Berechtigung",
   "admin.permissions.roles.all_users.name": "Alle Mitglieder",
-  "admin.permissions.roles.channel_admin.name": "Kanaladministrator",
+  "admin.permissions.roles.channel_admin.name": "Kanal-Administrator",
   "admin.permissions.roles.channel_user.name": "Kanalbenutzer",
   "admin.permissions.roles.system_admin.name": "Systemadministrator",
   "admin.permissions.roles.system_user.name": "Systembenutzer",
@@ -869,7 +869,7 @@
   "admin.permissions.systemScheme.allMembersTitle": "Alle Mitglieder",
   "admin.permissions.systemScheme.channelAdminsDescription": "Berechtigung für Kanalersteller und alle Benutzer, die zu Kanaladministratoren befördert werden.",
   "admin.permissions.systemScheme.channelAdminsTitle": "Kanaladministratoren",
-  "admin.permissions.systemScheme.introBanner": "Standardberechtigungen für Teamadministratoren, Kanaladministratoren und andere Benutzer einstellen. Dieses Schema wird von allen Team geerbt, außer es wird ein übergeordnetes Teamschema in spezifischen Teams angewendet.",
+  "admin.permissions.systemScheme.introBanner": "Configure the default permissions for Team Admins, Channel Admins and other members. This scheme is inherited by all teams unless a [Team Override Scheme](!https://about.mattermost.com/default-team-override-scheme) is applied in specific teams.",
   "admin.permissions.systemScheme.resetDefaultsButton": "Auf Voreinstellungen zurücksetzen",
   "admin.permissions.systemScheme.resetDefaultsButtonModalBody": "Dies wird alle Auswahlen auf dieser Seite auf ihre Standardeinstellungen zurücksetzen. Sind Sie sicher, dass Sie zurücksetzen möchten?",
   "admin.permissions.systemScheme.resetDefaultsButtonModalTitle": "Auf Voreinstellungen zurücksetzen?",
@@ -879,9 +879,9 @@
   "admin.permissions.systemScheme.teamAdminsDescription": "Berechtigung für Teamersteller und alle Benutzer, die zu Teamadministratoren befördert werden.",
   "admin.permissions.systemScheme.teamAdminsTitle": "Teamadministratoren",
   "admin.permissions.systemSchemeBannerButton": "Schema bearbeiten",
-  "admin.permissions.systemSchemeBannerText": "Standardberechtigungen einstellen, die von allen Team geerbt werden, außer es wird ein übergeordnetes Teamschema angewendet.",
+  "admin.permissions.systemSchemeBannerText": "Set the default permissions inherited by all teams unless a [Team Override Scheme](!https://about.mattermost.com/default-team-override-scheme) is applied.",
   "admin.permissions.systemSchemeBannerTitle": "Systemschema",
-  "admin.permissions.teamOverrideSchemesBannerText": "Verwenden, wenn spezifische Teams Berechtigungsausnahmen vom Systemschema benötigen.",
+  "admin.permissions.teamOverrideSchemesBannerText": "Use when specific teams need permission exceptions to the [System Scheme](!https://about.mattermost.com/default-system-scheme).",
   "admin.permissions.teamOverrideSchemesInProgress": "Migrations-Job läuft. Übergeordnete Teamschemen sind nicht verfügbar, bis der Job-Server die Berechtigungsmigration abgeschlossen hat. Lernen Sie mehr in der {documentationLink}.",
   "admin.permissions.teamOverrideSchemesNewButton": "Neues übergeordnetes Teamschema",
   "admin.permissions.teamOverrideSchemesNoJobsEnabled": "Migrations-Job pausiert: Übergeordnete Teamschemen sind nicht verfügbar, bis der Job-Server die Berechtigungsmigration ausführen kann. Der Job wird automatisch gestartet, wenn der Job-Server aktiviert ist. Lernen Sie mehr in der {documentationLink}.",
@@ -889,7 +889,7 @@
   "admin.permissions.teamOverrideSchemesTitle": "Übergeordnete Teamschemen",
   "admin.permissions.teamScheme": "Teamschema",
   "admin.permissions.teamScheme.addTeams": "Teams hinzufügen",
-  "admin.permissions.teamScheme.introBanner": "Übergeordnete Teamschemen setzen die Berechtigungen für Teamadministratoren, Kanaladministratoren und andere Mitglieder in spezifischen Teams. Benutzen Sie ein übergeordnetes Teamschema, wenn spezifische Teams Berechtigungsausnahmen vom <a href=\"/admin_console/permissions/system-scheme\">Systemschema</a> benötigen.",
+  "admin.permissions.teamScheme.introBanner": "[Team Override Schemes](!https://about.mattermost.com/default-team-override-scheme) set the permissions for Team Admins, Channel Admins and other members in specific teams. Use a Team Override Scheme when specific teams need permission exceptions to the [System Scheme](!https://about.mattermost.com/default-system-scheme).",
   "admin.permissions.teamScheme.noTeams": "Kein Team ausgewählt. Bitte Teams zur Liste hinzufügen.",
   "admin.permissions.teamScheme.removeTeam": "Entfernen",
   "admin.permissions.teamScheme.schemeDescriptionLabel": "Schema-Beschreibung:",
@@ -991,6 +991,10 @@
   "admin.requestButton.loading": " Lädt...",
   "admin.requestButton.requestFailure": "Test-Fehler: {error}",
   "admin.requestButton.requestSuccess": "Test erfolgreich",
+  "admin.reset_email.cancel": "Abbrechen",
+  "admin.reset_email.newEmail": "Neue E-Mail-Adresse",
+  "admin.reset_email.reset": "Zurücksetzen",
+  "admin.reset_email.titleReset": "E-Mail erneut senden",
   "admin.reset_password.cancel": "Abbrechen",
   "admin.reset_password.curentPassword": "Aktuelles Passwort",
   "admin.reset_password.missing_current": "Bitte geben Sie Ihr aktuelles Passwort ein.",
@@ -1192,6 +1196,7 @@
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "ANDERE",
   "admin.sidebar.password": "Passwort",
+  "admin.sidebar.permissions": "Advanced Permissions",
   "admin.sidebar.plugins": "Plugins (Beta)",
   "admin.sidebar.plugins.configuration": "Konfiguration",
   "admin.sidebar.plugins.management": "Verwaltung",
@@ -1330,6 +1335,7 @@
   "admin.user_item.member": "Mitglied",
   "admin.user_item.mfaNo": "<strong>MFA</strong>: Nein",
   "admin.user_item.mfaYes": "<strong>MFA</strong>: Ja",
+  "admin.user_item.resetEmail": "E-Mail erneut senden",
   "admin.user_item.resetMfa": "MFA entfernen",
   "admin.user_item.resetPwd": "Passwort zurücksetzen",
   "admin.user_item.revokeSessions": "Sitzung zurückziehen",
@@ -1759,7 +1765,7 @@
   "edit_post.editPost": "Nachricht bearbeiten...",
   "edit_post.save": "Speichern",
   "edit_post.time_limit_button.for_n_seconds": "⚙ Für {n} Sekunden",
-  "edit_post.time_limit_button.no_limit": "⚙ Jederzeit",
+  "edit_post.time_limit_button.no_limit": "Jederzeit",
   "edit_post.time_limit_modal.description": "Einstellung des Zeitlimits wird auf alle Benutzer angewendet, die die Berechtigung \"Nachricht bearbeiten\" besitzen.",
   "edit_post.time_limit_modal.invalid_time_limit": "Ungültiges Zeitlimit",
   "edit_post.time_limit_modal.option_label_anytime": "Jederzeit",
diff --git a/assets/base/i18n/en.json b/assets/base/i18n/en.json
index f8642183f..0a6d3ec6f 100644
--- a/assets/base/i18n/en.json
+++ b/assets/base/i18n/en.json
@@ -757,7 +757,7 @@
   "admin.permissions.documentationLinkText": "documentation",
   "admin.permissions.group.delete_posts.description": "Delete posts.",
   "admin.permissions.group.delete_posts.name": "Delete Posts",
-  "admin.permissions.group.integrations.description": "Manage Oauth, slash commands, webhooks and emojis.",
+  "admin.permissions.group.integrations.description": "Manage OAuth 2.0, slash commands, webhooks and emoji.",
   "admin.permissions.group.integrations.name": "Integrations & Customizations",
   "admin.permissions.group.posts.description": "Write, edit and delete posts.",
   "admin.permissions.group.posts.name": "Manage Posts",
@@ -771,8 +771,8 @@
   "admin.permissions.group.send_invites.name": "Add Team Members",
   "admin.permissions.group.teams.description": "Create teams and manage members.",
   "admin.permissions.group.teams.name": "Teams",
-  "admin.permissions.inherited_from": "Inherited from <a>{name}</a>",
-  "admin.permissions.introBanner": "Permission Schemes set the default permissions for Team Admins, Channel Admins and everyone else. Learn more about permission schemes in our documentation.",
+  "admin.permissions.inherited_from": "Inherited from <a>{name}</a>.",
+  "admin.permissions.introBanner": "Permission Schemes set the default permissions for Team Admins, Channel Admins and everyone else. Learn more about permission schemes in our [documentation](!https://about.mattermost.com/default-advanced-permissions).",
   "admin.permissions.loadMoreSchemes": "Load more schemes",
   "admin.permissions.loadingMoreSchemes": "Loading...",
   "admin.permissions.permission.assign_system_admin_role.description": "Assign system admin role",
@@ -790,8 +790,8 @@
   "admin.permissions.permission.create_user_access_token.description": "Create user access token",
   "admin.permissions.permission.create_user_access_token.name": "Create user access token",
   "admin.permissions.permission.delete_others_posts.description": "Posts made by other users can be deleted.",
-  "admin.permissions.permission.delete_others_posts.name": "Delete Others Posts",
-  "admin.permissions.permission.delete_post.description": "Authors own posts can be deleted.",
+  "admin.permissions.permission.delete_others_posts.name": "Delete Others' Posts",
+  "admin.permissions.permission.delete_post.description": "Author's own posts can be deleted.",
   "admin.permissions.permission.delete_post.name": "Delete Own Posts",
   "admin.permissions.permission.delete_private_channel.description": "Delete private channels.",
   "admin.permissions.permission.delete_private_channel.name": "Delete Channels",
@@ -809,8 +809,8 @@
   "admin.permissions.permission.list_users_without_team.name": "List users without team",
   "admin.permissions.permission.manage_channel_roles.description": "Manage channel roles",
   "admin.permissions.permission.manage_channel_roles.name": "Manage channel roles",
-  "admin.permissions.permission.manage_emojis.description": "Create and delete custom emojis.",
-  "admin.permissions.permission.manage_emojis.name": "Manage Custom Emojis",
+  "admin.permissions.permission.manage_emojis.description": "Create and delete custom emoji.",
+  "admin.permissions.permission.manage_emojis.name": "Manage Custom Emoji",
   "admin.permissions.permission.manage_jobs.description": "Manage jobs",
   "admin.permissions.permission.manage_jobs.name": "Manage jobs",
   "admin.permissions.permission.manage_oauth.description": "Create, edit and delete OAuth 2.0 application tokens.",
@@ -833,7 +833,7 @@
   "admin.permissions.permission.manage_team.name": "Manage team",
   "admin.permissions.permission.manage_team_roles.description": "Manage team roles",
   "admin.permissions.permission.manage_team_roles.name": "Manage team roles",
-  "admin.permissions.permission.manage_webhooks.description": "Create, edit, and delete incoming and outgoing webhooks",
+  "admin.permissions.permission.manage_webhooks.description": "Create, edit, and delete incoming and outgoing webhooks.",
   "admin.permissions.permission.manage_webhooks.name": "Manage Webhooks",
   "admin.permissions.permission.permanent_delete_user.description": "Permanent delete user",
   "admin.permissions.permission.permanent_delete_user.name": "Permanent delete user",
@@ -857,19 +857,19 @@
   "admin.permissions.permissionsSchemeSummary.deleting": "Deleting...",
   "admin.permissions.permissionsTree.description": "Description",
   "admin.permissions.permissionsTree.permission": "Permission",
-  "admin.permissions.roles.all_users.name": "All members",
-  "admin.permissions.roles.channel_admin.name": "Channel admin",
-  "admin.permissions.roles.channel_user.name": "Channel user",
-  "admin.permissions.roles.system_admin.name": "System admin",
-  "admin.permissions.roles.system_user.name": "System user",
-  "admin.permissions.roles.team_admin.name": "Team admin",
-  "admin.permissions.roles.team_user.name": "Team user",
+  "admin.permissions.roles.all_users.name": "All Members",
+  "admin.permissions.roles.channel_admin.name": "Channel Admin",
+  "admin.permissions.roles.channel_user.name": "Channel User",
+  "admin.permissions.roles.system_admin.name": "System Admin",
+  "admin.permissions.roles.system_user.name": "System User",
+  "admin.permissions.roles.team_admin.name": "Team Admin",
+  "admin.permissions.roles.team_user.name": "Team User",
   "admin.permissions.systemScheme": "System Scheme",
   "admin.permissions.systemScheme.allMembersDescription": "Permissions granted to all members, including administrators and newly created users.",
   "admin.permissions.systemScheme.allMembersTitle": "All Members",
   "admin.permissions.systemScheme.channelAdminsDescription": "Permissions granted to channel creators and any users promoted to Channel Administrator.",
   "admin.permissions.systemScheme.channelAdminsTitle": "Channel Administrators",
-  "admin.permissions.systemScheme.introBanner": "Configure the default permissions for Team Admins, Channel Admins and other members. This scheme is inherited by all teams unless a Team Override Scheme is applied in specific teams.",
+  "admin.permissions.systemScheme.introBanner": "Configure the default permissions for Team Admins, Channel Admins and other members. This scheme is inherited by all teams unless a [Team Override Scheme](!https://about.mattermost.com/default-team-override-scheme) is applied in specific teams.",
   "admin.permissions.systemScheme.resetDefaultsButton": "Reset to Defaults",
   "admin.permissions.systemScheme.resetDefaultsButtonModalBody": "This will reset all selections on this page to their default settings. Are you sure you want to reset?",
   "admin.permissions.systemScheme.resetDefaultsButtonModalTitle": "Reset to Default?",
@@ -879,9 +879,9 @@
   "admin.permissions.systemScheme.teamAdminsDescription": "Permissions granted to team creators and any users promoted to Team Administrator.",
   "admin.permissions.systemScheme.teamAdminsTitle": "Team Administrators",
   "admin.permissions.systemSchemeBannerButton": "Edit Scheme",
-  "admin.permissions.systemSchemeBannerText": "Set the default permissions inherited by all teams unless a Team Override Scheme is applied.",
+  "admin.permissions.systemSchemeBannerText": "Set the default permissions inherited by all teams unless a [Team Override Scheme](!https://about.mattermost.com/default-team-override-scheme) is applied.",
   "admin.permissions.systemSchemeBannerTitle": "System Scheme",
-  "admin.permissions.teamOverrideSchemesBannerText": "Use when specific teams need permission exceptions to the System Scheme.",
+  "admin.permissions.teamOverrideSchemesBannerText": "Use when specific teams need permission exceptions to the [System Scheme](!https://about.mattermost.com/default-system-scheme).",
   "admin.permissions.teamOverrideSchemesInProgress": "Migration job in progress: Team Override Schemes are not available until the job server completes the permissions migration. Learn more in the {documentationLink}.",
   "admin.permissions.teamOverrideSchemesNewButton": "New Team Override Scheme",
   "admin.permissions.teamOverrideSchemesNoJobsEnabled": "Migration job on hold: Team Override Schemes are not available until the job server can execute the permissions migration. The job will be automatically started when the job server is enabled. Learn more in the {documentationLink}.",
@@ -889,7 +889,7 @@
   "admin.permissions.teamOverrideSchemesTitle": "Team Override Schemes",
   "admin.permissions.teamScheme": "Team Scheme",
   "admin.permissions.teamScheme.addTeams": "Add Teams",
-  "admin.permissions.teamScheme.introBanner": "Team Override Schemes set the permissions for Team Admins, Channel Admins and other members in specific teams. Use a Team Override Scheme when specific teams need permission exceptions to the <a href=\"/admin_console/permissions/system-scheme\">System Scheme</a>.",
+  "admin.permissions.teamScheme.introBanner": "[Team Override Schemes](!https://about.mattermost.com/default-team-override-scheme) set the permissions for Team Admins, Channel Admins and other members in specific teams. Use a Team Override Scheme when specific teams need permission exceptions to the [System Scheme](!https://about.mattermost.com/default-system-scheme).",
   "admin.permissions.teamScheme.noTeams": "No team selected. Please add teams to this list.",
   "admin.permissions.teamScheme.removeTeam": "Remove",
   "admin.permissions.teamScheme.schemeDescriptionLabel": "Scheme Description:",
@@ -991,6 +991,10 @@
   "admin.requestButton.loading": " Loading...",
   "admin.requestButton.requestFailure": "Test Failure: {error}",
   "admin.requestButton.requestSuccess": "Test Successful",
+  "admin.reset_email.cancel": "Cancel",
+  "admin.reset_email.newEmail": "New Email",
+  "admin.reset_email.reset": "Reset",
+  "admin.reset_email.titleReset": "Reset Email",
   "admin.reset_password.cancel": "Cancel",
   "admin.reset_password.curentPassword": "Current Password",
   "admin.reset_password.missing_current": "Please enter your current password.",
@@ -1109,7 +1113,7 @@
   "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt Certificate Cache File:",
   "admin.service.letsEncryptCertificateCacheFileDescription": "Certificates retrieved and other data about the Let's Encrypt service will be stored in this file.",
   "admin.service.listenAddress": "Listen Address:",
-  "admin.service.listenDescription": "The address and port to which to bind and listen. Specifying \":8065\" will bind to all network interfaces. Specifying \"127.0.0.1:8065\" will only bind to the network interface having that IP address. If you choose a port of a lower level (called \"system ports\" or \"well-known ports\", in the range of 0-1023), you must have permissions to bind to that port. On Linux you can use: \"sudo setcap cap_net_bind_service=+ep ./bin/platform\" to allow Mattermost to bind to well-known ports.",
+  "admin.service.listenDescription": "The address and port to which to bind and listen. Specifying \":8065\" will bind to all network interfaces. Specifying \"127.0.0.1:8065\" will only bind to the network interface having that IP address. If you choose a port of a lower level (called \"system ports\" or \"well-known ports\", in the range of 0-1023), you must have permissions to bind to that port. On Linux you can use: \"sudo setcap cap_net_bind_service=+ep ./bin/mattermost\" to allow Mattermost to bind to well-known ports.",
   "admin.service.listenExample": "E.g.: \":8065\"",
   "admin.service.mfaDesc": "When true, users with AD/LDAP or email login can add multi-factor authentication to their account using Google Authenticator.",
   "admin.service.mfaTitle": "Enable Multi-factor Authentication:",
@@ -1192,6 +1196,7 @@
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "OTHER",
   "admin.sidebar.password": "Password",
+  "admin.sidebar.permissions": "Advanced Permissions",
   "admin.sidebar.plugins": "Plugins (Beta)",
   "admin.sidebar.plugins.configuration": "Configuration",
   "admin.sidebar.plugins.management": "Management",
@@ -1330,6 +1335,7 @@
   "admin.user_item.member": "Member",
   "admin.user_item.mfaNo": "<strong>MFA</strong>: No",
   "admin.user_item.mfaYes": "<strong>MFA</strong>: Yes",
+  "admin.user_item.resetEmail": "Reset Email",
   "admin.user_item.resetMfa": "Remove MFA",
   "admin.user_item.resetPwd": "Reset Password",
   "admin.user_item.revokeSessions": "Revoke Sessions",
@@ -1758,8 +1764,8 @@
   "edit_post.edit": "Edit {title}",
   "edit_post.editPost": "Edit the post...",
   "edit_post.save": "Save",
-  "edit_post.time_limit_button.for_n_seconds": "⚙ For {n} seconds",
-  "edit_post.time_limit_button.no_limit": "⚙ Anytime",
+  "edit_post.time_limit_button.for_n_seconds": "For {n} seconds",
+  "edit_post.time_limit_button.no_limit": "Anytime",
   "edit_post.time_limit_modal.description": "Setting a time limit applies to all users who have the \"Edit Post\" permissions in any permission scheme.",
   "edit_post.time_limit_modal.invalid_time_limit": "Invalid time limit",
   "edit_post.time_limit_modal.option_label_anytime": "Anytime",
@@ -1955,7 +1961,7 @@
   "help.formatting.headings2Example": "Large Heading\n-------------",
   "help.formatting.headingsExample": "## Large Heading\n### Smaller Heading\n#### Even Smaller Heading",
   "help.formatting.images": "## In-line Images\n\nCreate in-line images using an `!` followed by the alt text in square brackets and the link in normal brackets. Add hover text by placing it in quotes after the link.",
-  "help.formatting.imagesExample": "![alt text](link \"hover text\")\n\nand\n\n[![Build Status](https://travis-ci.org/mattermost/platform.svg?branch=master)](https://travis-ci.org/mattermost/platform) [![Github](https://assets-cdn.github.com/favicon.ico)](https://github.com/mattermost/platform)",
+  "help.formatting.imagesExample": "![alt text](link \"hover text\")\n\nand\n\n[![Build Status](https://travis-ci.org/mattermost/mattermost-server.svg?branch=master)](https://travis-ci.org/mattermost/mattermost-server) [![Github](https://assets-cdn.github.com/favicon.ico)](https://github.com/mattermost/mattermost-server)",
   "help.formatting.inline": "## In-line Code\n\nCreate in-line monospaced font by surrounding it with backticks.",
   "help.formatting.intro": "Markdown makes it easy to format messages. Type a message as you normally would, and use these rules to render it with special formatting.",
   "help.formatting.lines": "## Lines\n\nCreate a line by using three `*`, `_`, or `-`.",
diff --git a/assets/base/i18n/es.json b/assets/base/i18n/es.json
index b096c22b3..831323c4a 100644
--- a/assets/base/i18n/es.json
+++ b/assets/base/i18n/es.json
@@ -757,7 +757,7 @@
   "admin.permissions.documentationLinkText": "documentación",
   "admin.permissions.group.delete_posts.description": "Eliminar Mensajes.",
   "admin.permissions.group.delete_posts.name": "Eliminar Mensajes",
-  "admin.permissions.group.integrations.description": "Gestionar Oauth, comandos de barra, webhooks y emoticonos.",
+  "admin.permissions.group.integrations.description": "Gestionar OAuth 2.0, comandos de barra, webhooks y emoticonos.",
   "admin.permissions.group.integrations.name": "Integraciones y Personalizaciones",
   "admin.permissions.group.posts.description": "Escribir, editar y borrar mensajes.",
   "admin.permissions.group.posts.name": "Gestionar Mensajes",
@@ -772,7 +772,7 @@
   "admin.permissions.group.teams.description": "Crear equipos y gestionar miembros.",
   "admin.permissions.group.teams.name": "Equipos",
   "admin.permissions.inherited_from": "Heredado de <a>{name}</a>",
-  "admin.permissions.introBanner": "Los esquemas de permisos establecen los permisos predefinidos para Administradores de Equipo, Administradores de Canal y el todos los demás. Puedes aprender más sobre los esquemas de permisos en nuestra documentación.",
+  "admin.permissions.introBanner": "Los Esquemas de Permisos establecen los permisos predeterminados para Administradores de Equipo, Administradores de Canales y a todos los demás. Aprende más acerca de los esquemas de permiso en nuestra [documentación](!https://about.mattermost.com/default-advanced-permissions).",
   "admin.permissions.loadMoreSchemes": "Cargar más esquemas",
   "admin.permissions.loadingMoreSchemes": "Cargando...",
   "admin.permissions.permission.assign_system_admin_role.description": "Asignar rol de administrador del sistema",
@@ -858,18 +858,18 @@
   "admin.permissions.permissionsTree.description": "Descripción",
   "admin.permissions.permissionsTree.permission": "Permiso",
   "admin.permissions.roles.all_users.name": "Todos los miembros",
-  "admin.permissions.roles.channel_admin.name": "Administrador del canal",
+  "admin.permissions.roles.channel_admin.name": "Administrador del Canal",
   "admin.permissions.roles.channel_user.name": "Usuario del canal",
-  "admin.permissions.roles.system_admin.name": "Administrador del sistema",
+  "admin.permissions.roles.system_admin.name": "Administrador del Sistema",
   "admin.permissions.roles.system_user.name": "Usuario del sistema",
-  "admin.permissions.roles.team_admin.name": "Administrador del equipo",
+  "admin.permissions.roles.team_admin.name": "Administrador de Equipo",
   "admin.permissions.roles.team_user.name": "Usuario del equipo",
   "admin.permissions.systemScheme": "Esquema de Sistema",
   "admin.permissions.systemScheme.allMembersDescription": "Permisos concedidos a todos los miembros, incluyendo administradores y nuevos usuarios.",
   "admin.permissions.systemScheme.allMembersTitle": "Todos los miembros",
   "admin.permissions.systemScheme.channelAdminsDescription": "Permisos concedidos a los creadores de un canal y a cualquier usuario promocionado a Administrador del Canal.",
   "admin.permissions.systemScheme.channelAdminsTitle": "Administradores de Canal",
-  "admin.permissions.systemScheme.introBanner": "Configurar los permisos predeterminados para Administradores de Equipo, Administradores de Canal y otros miembros. Este esquema es heredado por todos los equipos a menos que se aplique un Esquema Sobrescrito de Equipo.",
+  "admin.permissions.systemScheme.introBanner": "Configurar los permisos predeterminados para los Administradores de Equipo, Administradores de Canales y otros miembros. Este esquema es heredado por todos los equipos, a menos que se aplique un [Reemplazo de Esquema de Equipo](!https://about.mattermost.com/default-team-override-scheme) en equipos específicos.",
   "admin.permissions.systemScheme.resetDefaultsButton": "Restablecer a predeterminados",
   "admin.permissions.systemScheme.resetDefaultsButtonModalBody": "Esto restablecerá todas los valores de esta página a su configuración predeterminada. ¿Estás seguro de que los quieres restablecer?",
   "admin.permissions.systemScheme.resetDefaultsButtonModalTitle": "¿Restablecer a predeterminados?",
@@ -879,9 +879,9 @@
   "admin.permissions.systemScheme.teamAdminsDescription": "Permisos concedidos a creadores de equipo y a cualquier usuario promocionado a Administrador del Equipo.",
   "admin.permissions.systemScheme.teamAdminsTitle": "Administradores del Equipo",
   "admin.permissions.systemSchemeBannerButton": "Editar Esquema",
-  "admin.permissions.systemSchemeBannerText": "Establecer los permisos predeterminados heredados por todos los equipos menos aquellos que tenga un Esquema Sobrescrito de Equipo.",
+  "admin.permissions.systemSchemeBannerText": "Establecer los permisos predeterminados a ser heredados por todos los equipos, a menos que un [Reemplazo de Esquema de Equipo](!https://about.mattermost.com/default-team-override-scheme) sea aplicado.",
   "admin.permissions.systemSchemeBannerTitle": "Esquemas del sistema",
-  "admin.permissions.teamOverrideSchemesBannerText": "Usarlo cuando equipos específicos necesitan excepciones a los permisos del Esquema del Sistema.",
+  "admin.permissions.teamOverrideSchemesBannerText": "Utilizado cuando los equipos necesitan excepciones a los permisos del [Esquema del Sistema](!https://about.mattermost.com/default-system-scheme).",
   "admin.permissions.teamOverrideSchemesInProgress": "Tarea de migración en progreso: Los Esquemas Sobrescritos de Equipo no están disponibles hasta que la tarea de migración de permisos haya sido completada por el servidor. Aprende más en la documentación {documentationLink}.",
   "admin.permissions.teamOverrideSchemesNewButton": "Nuevo Esquema Sobrescrito de Equipo",
   "admin.permissions.teamOverrideSchemesNoJobsEnabled": "Tarea de migración en espera: Los Esquemas Sobrescritos de Equipo no están disponibles hasta que la tarea de migración de permisos haya podido ser ejecutada por el servidor. La tarea se iniciará automáticamente cuando el servidor de tareas este habilitado. Aprenda más en la documentación {documentationLink}.",
@@ -889,7 +889,7 @@
   "admin.permissions.teamOverrideSchemesTitle": "Esquemas Sobrescritos de Equipo",
   "admin.permissions.teamScheme": "Esquema de equipo",
   "admin.permissions.teamScheme.addTeams": "Añadir Equipos",
-  "admin.permissions.teamScheme.introBanner": "Los Esquemas Sobrescritos de Equipo establecen los permisos para Administradores de Equipo, Administradores de Canal y otros miembros en equipos especificos. Usa un Esquema Sobrescrito de Equipo cuando equipos especificos necesitan excepciones a los permisos del <a href=\"/admin_console/permissions/system-scheme\">Esquema del Sistema</a>.",
+  "admin.permissions.teamScheme.introBanner": "[Reemplazo de Esquema de Equipo](!https://about.mattermost.com/default-team-override-scheme) establece los permisos para Administradores de Equipo, Administradores de Canales y otros miembros en un equipo específico. Utiliza el Reemplazo de Esquema de Equipo cuando un equipo específico necesita excepciones a los permisos del [Esquema del Sistema](!https://about.mattermost.com/default-system-scheme).",
   "admin.permissions.teamScheme.noTeams": "No hay equipos seleccionados. Por favor, añade equipos a esta lista.",
   "admin.permissions.teamScheme.removeTeam": "Quitar",
   "admin.permissions.teamScheme.schemeDescriptionLabel": "Descripción del Esquema:",
@@ -991,6 +991,10 @@
   "admin.requestButton.loading": " Cargando...",
   "admin.requestButton.requestFailure": "Prueba Fallida: {error}",
   "admin.requestButton.requestSuccess": "Prueba realizada con éxito",
+  "admin.reset_email.cancel": "Cancelar",
+  "admin.reset_email.newEmail": "Nuevo correo electrónico",
+  "admin.reset_email.reset": "Restablecer",
+  "admin.reset_email.titleReset": "Restablecer Correo Electrónico",
   "admin.reset_password.cancel": "Cancelar",
   "admin.reset_password.curentPassword": "Contraseña Actual",
   "admin.reset_password.missing_current": "Por favor introduce tu contraseña actual.",
@@ -1192,6 +1196,7 @@
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "OTROS",
   "admin.sidebar.password": "Contraseña",
+  "admin.sidebar.permissions": "Permisos Avanzados",
   "admin.sidebar.plugins": "Complementos (Beta)",
   "admin.sidebar.plugins.configuration": "Configuración",
   "admin.sidebar.plugins.management": "Administración",
@@ -1330,6 +1335,7 @@
   "admin.user_item.member": "Miembro",
   "admin.user_item.mfaNo": "<strong>MFA</strong>: No",
   "admin.user_item.mfaYes": "<strong>MFA</strong>: Sí",
+  "admin.user_item.resetEmail": "Restablecer Correo Electrónico",
   "admin.user_item.resetMfa": "Quitar MFA",
   "admin.user_item.resetPwd": "Reiniciar Contraseña",
   "admin.user_item.revokeSessions": "Revocar Sesiones",
@@ -1758,8 +1764,8 @@
   "edit_post.edit": "Editar {title}",
   "edit_post.editPost": "Editar el mensaje...",
   "edit_post.save": "Guardar",
-  "edit_post.time_limit_button.for_n_seconds": "⚙ Durante {n} segundos",
-  "edit_post.time_limit_button.no_limit": "⚙ En cualquier momento",
+  "edit_post.time_limit_button.for_n_seconds": "Durante {n} segundos",
+  "edit_post.time_limit_button.no_limit": "Cualquier momento",
   "edit_post.time_limit_modal.description": "Establecer un límite de tiempo afecta a todos los usuarios que tenga permisos para \"Editar Mensaje\" en cualquier esquema.",
   "edit_post.time_limit_modal.invalid_time_limit": "Límite de tiempo invalido",
   "edit_post.time_limit_modal.option_label_anytime": "Cualquier momento",
diff --git a/assets/base/i18n/fr.json b/assets/base/i18n/fr.json
index 8be51177f..e7dff1e12 100644
--- a/assets/base/i18n/fr.json
+++ b/assets/base/i18n/fr.json
@@ -772,7 +772,7 @@
   "admin.permissions.group.teams.description": "Créer des équipes et gérer les membres.",
   "admin.permissions.group.teams.name": "Équipes",
   "admin.permissions.inherited_from": "Hérité de <a>{name}</a>",
-  "admin.permissions.introBanner": "Les schémas de permissions définissent les permissions par défaut pour les administrateurs d'équipes, les administrateurs de canal et tout autre utilisateur. Consultez la documentation pour en savoir plus sur les schémas de permissions.",
+  "admin.permissions.introBanner": "Permission Schemes set the default permissions for Team Admins, Channel Admins and everyone else. Learn more about permission schemes in our [documentation](!https://about.mattermost.com/default-advanced-permissions).",
   "admin.permissions.loadMoreSchemes": "Charger plus de schémas de permissions",
   "admin.permissions.loadingMoreSchemes": "Chargement…",
   "admin.permissions.permission.assign_system_admin_role.description": "Attribue un rôle d'administrateur système",
@@ -869,7 +869,7 @@
   "admin.permissions.systemScheme.allMembersTitle": "Tous les membres",
   "admin.permissions.systemScheme.channelAdminsDescription": "Permissions accordées aux créateurs de canaux et à tous les utilisateurs promus au rôle d'administrateur de canal.",
   "admin.permissions.systemScheme.channelAdminsTitle": "Administrateurs de canal",
-  "admin.permissions.systemScheme.introBanner": "Configure les permissions par défaut pour les administrateurs d'équipe, les administrateurs de canal et les autres membres. Ce schéma de permission est hérité par toutes les équipes à moins qu'une équipe applique un schéma personnalisé.",
+  "admin.permissions.systemScheme.introBanner": "Configure the default permissions for Team Admins, Channel Admins and other members. This scheme is inherited by all teams unless a [Team Override Scheme](!https://about.mattermost.com/default-team-override-scheme) is applied in specific teams.",
   "admin.permissions.systemScheme.resetDefaultsButton": "Réinitialiser aux paramètres par défaut",
   "admin.permissions.systemScheme.resetDefaultsButtonModalBody": "Permet de réinitialiser toutes les sélections de cette page sur les paramètres par défaut. Voulez-vous vraiment lancer la réinitialisation ?",
   "admin.permissions.systemScheme.resetDefaultsButtonModalTitle": "Réinitialiser aux paramètres par défaut ?",
@@ -879,9 +879,9 @@
   "admin.permissions.systemScheme.teamAdminsDescription": "Autorisations accordées aux créateurs d'équipes ou tout utilisateur promu administrateur d'équipe.",
   "admin.permissions.systemScheme.teamAdminsTitle": "Administrateurs d'équipe",
   "admin.permissions.systemSchemeBannerButton": "Modifier le schéma de permissions",
-  "admin.permissions.systemSchemeBannerText": "Définit les permissions par défaut héritées par toutes les équipes à moins qu'une équipe applique un schéma personnalisé.",
+  "admin.permissions.systemSchemeBannerText": "Set the default permissions inherited by all teams unless a [Team Override Scheme](!https://about.mattermost.com/default-team-override-scheme) is applied.",
   "admin.permissions.systemSchemeBannerTitle": "Schéma système de persmissions",
-  "admin.permissions.teamOverrideSchemesBannerText": "A n'utiliser que lorsque des équipes spécifiques ont besoin d'exceptions aux permissions définies par le schéma système de permissions.",
+  "admin.permissions.teamOverrideSchemesBannerText": "Use when specific teams need permission exceptions to the [System Scheme](!https://about.mattermost.com/default-system-scheme).",
   "admin.permissions.teamOverrideSchemesInProgress": "Tâche de migration en cours : les schémas de permissions personnalisés ne sont pas disponibles jusqu'à ce que le serveur de tâches termine la migration des permissions. Pour en savoir plus, référez-vous à notre {documentationLink}.",
   "admin.permissions.teamOverrideSchemesNewButton": "Nouveau schéma de permissions personnalisé",
   "admin.permissions.teamOverrideSchemesNoJobsEnabled": "Tâche de migration suspendue : les schémas de permissions personnalisés ne sont pas disponibles jusqu'à ce que le serveur de tâches termine la migration des permissions. La tâche sera redémarrée automatiquement dés que le serveur de tâche sera lui-même démarré. Pour en savoir plus, référez-vous à notre {documentationLink}.",
@@ -889,7 +889,7 @@
   "admin.permissions.teamOverrideSchemesTitle": "Schémas de permissions personnalisés",
   "admin.permissions.teamScheme": "Schéma de permissions",
   "admin.permissions.teamScheme.addTeams": "Ajouter des équipes",
-  "admin.permissions.teamScheme.introBanner": "Les schémas de permissions personnalisés définissent les permissions pour les administrateurs d'équipe, les administrateurs de canal et tous les autres membres d'équipes spécifiques. Utilisez un schéma de permissions personnalisé lorsque des équipes spécifiques ont besoin d'exceptions aux permissions définies par le <a href=\"/admin_console/permissions/system-scheme\">schéma système de permissions</a>.",
+  "admin.permissions.teamScheme.introBanner": "[Team Override Schemes](!https://about.mattermost.com/default-team-override-scheme) set the permissions for Team Admins, Channel Admins and other members in specific teams. Use a Team Override Scheme when specific teams need permission exceptions to the [System Scheme](!https://about.mattermost.com/default-system-scheme).",
   "admin.permissions.teamScheme.noTeams": "Aucune équipe sélectionnée. Veuillez ajouter des équipes à la liste.",
   "admin.permissions.teamScheme.removeTeam": "Supprimer",
   "admin.permissions.teamScheme.schemeDescriptionLabel": "Description du schéma de permissions :",
@@ -991,6 +991,10 @@
   "admin.requestButton.loading": " Chargement…",
   "admin.requestButton.requestFailure": "Erreur de test : {error}",
   "admin.requestButton.requestSuccess": "Test effectué avec succès",
+  "admin.reset_email.cancel": "Annuler",
+  "admin.reset_email.newEmail": "Nouvelle adresse e‑mail",
+  "admin.reset_email.reset": "Réinitialiser",
+  "admin.reset_email.titleReset": "Renvoyer l'e-mail",
   "admin.reset_password.cancel": "Annuler",
   "admin.reset_password.curentPassword": "Mot de passe actuel",
   "admin.reset_password.missing_current": "Veuillez spécifier votre mot de passe actuel.",
@@ -1192,6 +1196,7 @@
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "AUTRES",
   "admin.sidebar.password": "Mot de passe",
+  "admin.sidebar.permissions": "Advanced Permissions",
   "admin.sidebar.plugins": "Plugins (Beta)",
   "admin.sidebar.plugins.configuration": "Configuration",
   "admin.sidebar.plugins.management": "Gestion",
@@ -1330,6 +1335,7 @@
   "admin.user_item.member": "Membre",
   "admin.user_item.mfaNo": "<strong>MFA</strong> : Non",
   "admin.user_item.mfaYes": "<strong>MFA</strong> : Oui",
+  "admin.user_item.resetEmail": "Renvoyer l'e-mail",
   "admin.user_item.resetMfa": "supprimer l’identification à facteurs-multiples",
   "admin.user_item.resetPwd": "Réinitialiser le mot de passe",
   "admin.user_item.revokeSessions": "Révoquer les sessions",
@@ -1759,7 +1765,7 @@
   "edit_post.editPost": "Modifier le message...",
   "edit_post.save": "Enregistrer",
   "edit_post.time_limit_button.for_n_seconds": "⚙ Pour {n} secondes",
-  "edit_post.time_limit_button.no_limit": "⚙ N'importe quand",
+  "edit_post.time_limit_button.no_limit": "N'importe quand",
   "edit_post.time_limit_modal.description": "Définir un délai s'applique à tous les utilisateurs qui ont la permission d'« Editer des messages » et ce, quelque soit le schéma de permissions.",
   "edit_post.time_limit_modal.invalid_time_limit": "Limite de temps invalide",
   "edit_post.time_limit_modal.option_label_anytime": "N'importe quand",
diff --git a/assets/base/i18n/it.json b/assets/base/i18n/it.json
index faf92be2a..51ad9318e 100644
--- a/assets/base/i18n/it.json
+++ b/assets/base/i18n/it.json
@@ -15,7 +15,7 @@
   "about.notice": "Mattermost è stato possibile grazie al software open source usato dalla nostra <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>piattaforma</a>, dall'app <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a> e dalle app <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>mobile</a>.",
   "about.number": "Numero di compilazione:",
   "about.teamEditionLearn": "Entra nella comunità Mattermost su ",
-  "about.teamEditionSt": "Tutte le tue comunicazioni in un posto, instantaneamente ricercabili e accessibili ovunque.",
+  "about.teamEditionSt": "Tutte le tue comunicazioni in un posto, istantaneamente ricercabili e accessibili ovunque.",
   "about.teamEditiont0": "Edizione Gruppo",
   "about.teamEditiont1": "Edizione Enterprise",
   "about.title": "Informazioni su Mattermost",
@@ -90,7 +90,7 @@
   "add_emoji.preview": "Anteprima",
   "add_emoji.preview.sentence": "Questa è una frase contenente {image}.",
   "add_emoji.save": "Salva",
-  "add_incoming_webhook.cancel": "Cancella",
+  "add_incoming_webhook.cancel": "Annulla",
   "add_incoming_webhook.channel": "Canale",
   "add_incoming_webhook.channel.help": "Il canale predefinito pubblico o privato che riceve i contenuti del webhook. Si deve essere membri del gruppo privato per impostare il webhook.",
   "add_incoming_webhook.channelLocked": "Blocca in questo canale",
@@ -128,7 +128,7 @@
   "add_outgoing_webhook.callbackUrls.help": "L'URL a cui inviare i messaggi. Se l'URL è privato, aggiungerlo come {link}.",
   "add_outgoing_webhook.callbackUrls.helpLinkText": "connessione interna certificata",
   "add_outgoing_webhook.callbackUrlsRequired": "Sono richiesti uno o più URL di callback",
-  "add_outgoing_webhook.cancel": "Cancella",
+  "add_outgoing_webhook.cancel": "Annulla",
   "add_outgoing_webhook.channel": "Canale",
   "add_outgoing_webhook.channel.help": "Canale pubblico che invia i dati al webhook. Opzionale se viene specificata almeno una parola scatenante.",
   "add_outgoing_webhook.contentType.help1": "Scegliere il content type con cui verrà inviata la richiesta.",
@@ -757,7 +757,7 @@
   "admin.permissions.documentationLinkText": "documentazione",
   "admin.permissions.group.delete_posts.description": "Elimina pubblicazioni.",
   "admin.permissions.group.delete_posts.name": "Elimina Pubblicazioni",
-  "admin.permissions.group.integrations.description": "Gestisci Oauth, comandi slash, webhook e emoji.",
+  "admin.permissions.group.integrations.description": "Gestisci OAuth 2.0, comandi slash, webhook e emoji.",
   "admin.permissions.group.integrations.name": "Integrazioni e Personalizzazioni",
   "admin.permissions.group.posts.description": "Scrivi, modifica e cancella pubblicazioni.",
   "admin.permissions.group.posts.name": "Gestisci Pubblicazioni",
@@ -772,7 +772,7 @@
   "admin.permissions.group.teams.description": "Crea gruppi e gestisce membri.",
   "admin.permissions.group.teams.name": "Gruppi",
   "admin.permissions.inherited_from": "Ereditato da <a>{name}</a>",
-  "admin.permissions.introBanner": "Gli Schemi di Permessi impostano i permessi di default per gli Amministratori di Gruppo, gli Amministratori di Canale e chiunque altro. Scopri di più sugli schemi di permessi nella nostra documentazione.",
+  "admin.permissions.introBanner": "Gli Schemi di Permesso impostano i permessi di default per gli Amministratori di Gruppo, gli Amministratori di Canale e chiunque altro. Scopri di più sugli schemi di permesso nella [documentation](!https://about.mattermost.com/default-advanced-permissions).",
   "admin.permissions.loadMoreSchemes": "Carica più schemi",
   "admin.permissions.loadingMoreSchemes": "Caricamento...",
   "admin.permissions.permission.assign_system_admin_role.description": "Assegna ruolo di amministratore di sistema",
@@ -790,7 +790,7 @@
   "admin.permissions.permission.create_user_access_token.description": "Crea token di accesso",
   "admin.permissions.permission.create_user_access_token.name": "Crea token di accesso",
   "admin.permissions.permission.delete_others_posts.description": "Si possono eliminare pubblicazioni di altri utenti.",
-  "admin.permissions.permission.delete_others_posts.name": "Elimina Vecchie Pubblicazioni",
+  "admin.permissions.permission.delete_others_posts.name": "Elimina Altre Pubblicazioni",
   "admin.permissions.permission.delete_post.description": "Si possono eliminare le proprie pubblicazioni.",
   "admin.permissions.permission.delete_post.name": "Cancella proprie pubblicazioni",
   "admin.permissions.permission.delete_private_channel.description": "Elimina canali privati.",
@@ -857,9 +857,9 @@
   "admin.permissions.permissionsSchemeSummary.deleting": "Eliminazione in corso...",
   "admin.permissions.permissionsTree.description": "Descrizione",
   "admin.permissions.permissionsTree.permission": "Permesso",
-  "admin.permissions.roles.all_users.name": "Tutti i mebri",
+  "admin.permissions.roles.all_users.name": "Tutti i membri",
   "admin.permissions.roles.channel_admin.name": "Amministratore di canale",
-  "admin.permissions.roles.channel_user.name": "Canale utente",
+  "admin.permissions.roles.channel_user.name": "Utente di canale",
   "admin.permissions.roles.system_admin.name": "Amministratore di Sistema",
   "admin.permissions.roles.system_user.name": "Utente di sistema",
   "admin.permissions.roles.team_admin.name": "Amministratore di Gruppo",
@@ -869,7 +869,7 @@
   "admin.permissions.systemScheme.allMembersTitle": "Tutti i membri",
   "admin.permissions.systemScheme.channelAdminsDescription": "Permessi garantiti ai creatori del canale e a tutti gli utenti promossi ad Amministratori di Canale.",
   "admin.permissions.systemScheme.channelAdminsTitle": "Amministratori di Canale",
-  "admin.permissions.systemScheme.introBanner": "Configura i permessi predefiniti per gli Amministratori di Gruppo, gli Amministratori di Canale e gli altri membri. Questo schema viene ereditato da tutti i gruppi a meno che Sovrascrivi Schema Gruppo non sia applicato ai gruppi specificati.",
+  "admin.permissions.systemScheme.introBanner": "Configura i permessi predefiniti per gli Amministratori di Gruppo, gli Amministratori di Canale e gli altri membri. Questo schema viene ereditato da tutti i gruppi a meno che non presentino un [Team Override Scheme](!https://about.mattermost.com/default-team-override-scheme).",
   "admin.permissions.systemScheme.resetDefaultsButton": "Ripristinare i valori predefiniti",
   "admin.permissions.systemScheme.resetDefaultsButtonModalBody": "Questa operazione ripristinerà tutte le selezioni in questa pagina ai valori predefiniti. Sicuro di voler continuare?",
   "admin.permissions.systemScheme.resetDefaultsButtonModalTitle": "Ripristinare i valori predefiniti?",
@@ -879,9 +879,9 @@
   "admin.permissions.systemScheme.teamAdminsDescription": "Permessi garantiti ai creatori del gruppo e a tutti gli utenti promossi ad Amministratori di Gruppo.",
   "admin.permissions.systemScheme.teamAdminsTitle": "Amministratori di Gruppo",
   "admin.permissions.systemSchemeBannerButton": "Modifica Schema",
-  "admin.permissions.systemSchemeBannerText": "Imposta i permessi predefiniti ereditati da tutti gli altri gruppi che non specificano Sovrascrivi Schema Gruppo.",
+  "admin.permissions.systemSchemeBannerText": "Imposta i permessi predefiniti ereditati da tutti i gruppi a meno che non presentino un [Team Override Scheme](!https://about.mattermost.com/default-team-override-scheme).",
   "admin.permissions.systemSchemeBannerTitle": "Schema di Sistema",
-  "admin.permissions.teamOverrideSchemesBannerText": "Utilizzando quando il gruppo necessita di permessi diversi da quelli dello Schema di Sistema.",
+  "admin.permissions.teamOverrideSchemesBannerText": "Usato quando specifici gruppi necessitano di permessi straordinari non definiti dallo [System Scheme](!https://about.mattermost.com/default-system-scheme).",
   "admin.permissions.teamOverrideSchemesInProgress": "Lavoro di migrazione in corso: Sovrascrivi Schema Gruppo non è disponibile fino a quando il lavoro non completa la migrazione dei permessi. Scropri di più su {documentationLink}.",
   "admin.permissions.teamOverrideSchemesNewButton": "Nuovo Sovrascrivi Schema Gruppo",
   "admin.permissions.teamOverrideSchemesNoJobsEnabled": "Lavoro di migrazione in sospeso: Sovrascrivi Schema Gruppo non è disponibile fino a quando il lavoro di migrazione dei permessi non viene eseguito. Il lavoro verrà avviato automaticamente quando il server dei lavoro verrà attivato. Scopri di più su {documentationLink}.",
@@ -889,7 +889,7 @@
   "admin.permissions.teamOverrideSchemesTitle": "Sovrascritture Schemi Gruppo",
   "admin.permissions.teamScheme": "Schema di Gruppo",
   "admin.permissions.teamScheme.addTeams": "Aggiungi Gruppi",
-  "admin.permissions.teamScheme.introBanner": "Sovrascrivi Schemi Gruppo imposta i permessi per gli Amministratori di Gruppo, per gli Amministratori di Canale e gli altri membri dei gruppi specificati. Utilizzare Sovrascrivi Schemi Gruppo quando i gruppi specificati necessitato di permessi diversi da quelli dello <a href=\"/admin_console/permissions/system-scheme\">Schema di Sistema</a>.",
+  "admin.permissions.teamScheme.introBanner": "[Team Override Schemes](!https://about.mattermost.com/default-team-override-scheme) imposta i permessi per gli Amministratori di Gruppo, gli Amministratori di Canale e gli altri membri di specifici gruppi. Utilizzare la Sovrascrittura dello Schema di Gruppo quando gruppi specifici necessitano di permessi straordinari non definiti dallo [System Scheme](!https://about.mattermost.com/default-system-scheme).",
   "admin.permissions.teamScheme.noTeams": "Nessun gruppo selezionato. Aggiungere i gruppi a questa lista.",
   "admin.permissions.teamScheme.removeTeam": "Rimuovi",
   "admin.permissions.teamScheme.schemeDescriptionLabel": "Descrizione Schema:",
@@ -991,6 +991,10 @@
   "admin.requestButton.loading": "Caricamento...",
   "admin.requestButton.requestFailure": "Errore: {error}",
   "admin.requestButton.requestSuccess": "Test eseguito con successo",
+  "admin.reset_email.cancel": "Annulla",
+  "admin.reset_email.newEmail": "Nuovo indirizzo email",
+  "admin.reset_email.reset": "Azzera",
+  "admin.reset_email.titleReset": "Email re inviata",
   "admin.reset_password.cancel": "Annulla",
   "admin.reset_password.curentPassword": "Password attuale",
   "admin.reset_password.missing_current": "Inserisci la tua password.",
@@ -1192,6 +1196,7 @@
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "ALTRI",
   "admin.sidebar.password": "Password",
+  "admin.sidebar.permissions": "Permessi Avanzati",
   "admin.sidebar.plugins": "Plugin (Beta)",
   "admin.sidebar.plugins.configuration": "Configurazione",
   "admin.sidebar.plugins.management": "Gestione",
@@ -1330,6 +1335,7 @@
   "admin.user_item.member": "Membro",
   "admin.user_item.mfaNo": "<strong>AMF</strong>: No",
   "admin.user_item.mfaYes": "<strong>AMF</strong>: Sì",
+  "admin.user_item.resetEmail": "Email re inviata",
   "admin.user_item.resetMfa": "Rimuovi AMF",
   "admin.user_item.resetPwd": "Reimposta password",
   "admin.user_item.revokeSessions": "Revoca Sessioni",
@@ -1732,7 +1738,7 @@
   "delete_post.comment": "Commento",
   "delete_post.confirm": "Conferma la cancellazione di {term}",
   "delete_post.del": "Cancella",
-  "delete_post.post": "Spedisci",
+  "delete_post.post": "Pubblicazione",
   "delete_post.question": "Sei sicuro di voler eliminare questo {term}?",
   "delete_post.warning": "Questa pubblicazione ha {count, number} {count, plural, one {comment} other {comments}}.",
   "discard_changes_modal.leave": "Si, Scarta",
@@ -1759,7 +1765,7 @@
   "edit_post.editPost": "Modifica post...",
   "edit_post.save": "Salva",
   "edit_post.time_limit_button.for_n_seconds": "⚙ Per {n} secondi",
-  "edit_post.time_limit_button.no_limit": "⚙ In qualunque momento",
+  "edit_post.time_limit_button.no_limit": "Sempre",
   "edit_post.time_limit_modal.description": "Imposta un periodo di tempo valido per tutti gli utenti con il permesso \"Modifica Pubblicazioni\" in qualsiasi schema di permessi.",
   "edit_post.time_limit_modal.invalid_time_limit": "Limite di tempo non valido",
   "edit_post.time_limit_modal.option_label_anytime": "Sempre",
diff --git a/assets/base/i18n/ja.json b/assets/base/i18n/ja.json
index f63d7f831..a339070f8 100644
--- a/assets/base/i18n/ja.json
+++ b/assets/base/i18n/ja.json
@@ -757,7 +757,7 @@
   "admin.permissions.documentationLinkText": "説明文書",
   "admin.permissions.group.delete_posts.description": "投稿を削除。",
   "admin.permissions.group.delete_posts.name": "投稿の削除",
-  "admin.permissions.group.integrations.description": "Oauth、スラッシュコマンド、ウェブフック、絵文字の管理。",
+  "admin.permissions.group.integrations.description": "OAuth 2.0、スラッシュコマンド、ウェブフック、絵文字の管理。",
   "admin.permissions.group.integrations.name": "統合機能とカスタマイズ",
   "admin.permissions.group.posts.description": "投稿の作成、編集、削除。",
   "admin.permissions.group.posts.name": "投稿の管理",
@@ -772,7 +772,7 @@
   "admin.permissions.group.teams.description": "チームの作成とメンバーの管理。",
   "admin.permissions.group.teams.name": "チーム",
   "admin.permissions.inherited_from": "<a>{name}</a>から継承",
-  "admin.permissions.introBanner": "権限スキームがチーム管理者、チャンネル管理者、その他すべてのユーザーへデフォルトの権限を設定しました。権限スキームについて、詳しくは説明文書を参照してください。",
+  "admin.permissions.introBanner": "権限スキームがチーム管理者、チャンネル管理者とのそのほかの全員にデフォルトの権限を設定します。権限スキームについて詳しくは[説明文書](!https://about.mattermost.com/default-advanced-permissions)を確認してください。",
   "admin.permissions.loadMoreSchemes": "追加でスキームを読み込む",
   "admin.permissions.loadingMoreSchemes": "読み込み中…",
   "admin.permissions.permission.assign_system_admin_role.description": "システム管理者にする",
@@ -790,8 +790,8 @@
   "admin.permissions.permission.create_user_access_token.description": "ユーザーアクセストークンを作成する",
   "admin.permissions.permission.create_user_access_token.name": "ユーザーアクセストークンを作成する",
   "admin.permissions.permission.delete_others_posts.description": "他のユーザーによって作成された投稿を削除できる。",
-  "admin.permissions.permission.delete_others_posts.name": "他者投稿の削除",
-  "admin.permissions.permission.delete_post.description": "自身の投稿を削除できる。",
+  "admin.permissions.permission.delete_others_posts.name": "他者の投稿の削除",
+  "admin.permissions.permission.delete_post.description": "自身の投稿を削除可能。",
   "admin.permissions.permission.delete_post.name": "自身の投稿の削除",
   "admin.permissions.permission.delete_private_channel.description": "非公開チャンネルの削除。",
   "admin.permissions.permission.delete_private_channel.name": "チャンネル削除",
@@ -810,7 +810,7 @@
   "admin.permissions.permission.manage_channel_roles.description": "チャンネルの役割の管理",
   "admin.permissions.permission.manage_channel_roles.name": "チャンネルの役割の管理",
   "admin.permissions.permission.manage_emojis.description": "カスタム絵文字の作成と削除。",
-  "admin.permissions.permission.manage_emojis.name": "カスタム絵文字管理",
+  "admin.permissions.permission.manage_emojis.name": "カスタム絵文字の管理",
   "admin.permissions.permission.manage_jobs.description": "ジョブ管理",
   "admin.permissions.permission.manage_jobs.name": "ジョブ管理",
   "admin.permissions.permission.manage_oauth.description": "OAuth2.0アプリケーショントークンの作成、編集、削除。",
@@ -865,31 +865,31 @@
   "admin.permissions.roles.team_admin.name": "チーム管理者",
   "admin.permissions.roles.team_user.name": "チームユーザー",
   "admin.permissions.systemScheme": "システムスキーム",
-  "admin.permissions.systemScheme.allMembersDescription": "管理者や新しく作成されたユーザーを含むすべてのユーザーに権限を付与しました。",
+  "admin.permissions.systemScheme.allMembersDescription": "管理者や新しく作成されたユーザーを含むすべてのユーザーに付与される権限。",
   "admin.permissions.systemScheme.allMembersTitle": "すべてのメンバー",
-  "admin.permissions.systemScheme.channelAdminsDescription": "チャンネル作成者やチャンネル管理者となったユーザーに権限を付与しました。",
+  "admin.permissions.systemScheme.channelAdminsDescription": "チャンネル作成者やチャンネル管理者となったユーザーに付与される権限。",
   "admin.permissions.systemScheme.channelAdminsTitle": "チャンネル管理者",
-  "admin.permissions.systemScheme.introBanner": "チーム管理者やチャンネル管理者やその他のメンバーへデフォルトの権限を設定します。チーム上書きスキームがチームに適用されない限り、このスキームはすべてのチームに継承されます。",
+  "admin.permissions.systemScheme.introBanner": "チーム管理者、チャンネル管理者とその他のメンバーのデフォルトの権限を設定します。このスキームは[チーム上書きスキーム](!https://about.mattermost.com/default-team-override-scheme)が適用されない限り、全チームに継承されます。",
   "admin.permissions.systemScheme.resetDefaultsButton": "デフォルト設定に戻す",
   "admin.permissions.systemScheme.resetDefaultsButtonModalBody": "このページで選択した全ての項目がデフォルト設定にリセットされます。本当にリセットしますか？",
   "admin.permissions.systemScheme.resetDefaultsButtonModalTitle": "デフォルト設定にリセットしますか？",
   "admin.permissions.systemScheme.resetDefaultsConfirmationButton": "はい、リセットします",
-  "admin.permissions.systemScheme.systemAdminsDescription": "システム管理者に全権限を付与しました。",
+  "admin.permissions.systemScheme.systemAdminsDescription": "システム管理者に付与された全権限。",
   "admin.permissions.systemScheme.systemAdminsTitle": "システム管理者",
-  "admin.permissions.systemScheme.teamAdminsDescription": "チーム作成者とチーム管理者となったユーザーに権限を付与しました。",
+  "admin.permissions.systemScheme.teamAdminsDescription": "チーム作成者とチーム管理者となったユーザーに付与される権限。",
   "admin.permissions.systemScheme.teamAdminsTitle": "チーム管理者",
   "admin.permissions.systemSchemeBannerButton": "スキームを編集する",
-  "admin.permissions.systemSchemeBannerText": "チーム上書きスキームが適用されない限り、すべてのチームが継承するデフォルトの権限を設定します。",
+  "admin.permissions.systemSchemeBannerText": "[チーム上書きスキーム](!https://about.mattermost.com/default-team-override-scheme)が適用されない限り、全チームに継承されるデフォルトの権限を設定します。",
   "admin.permissions.systemSchemeBannerTitle": "システムスキーム",
-  "admin.permissions.teamOverrideSchemesBannerText": "特定のチームがシステムスキームに対して例外となる権限を必要とする場合に使用します。",
+  "admin.permissions.teamOverrideSchemesBannerText": "特定のチームが[システムスキーム](!https://about.mattermost.com/default-system-scheme)とは異なる権限設定を必要とする場合に使用します。",
   "admin.permissions.teamOverrideSchemesInProgress": "移行ジョブが進行中です: チーム上書きスキームは権限移行が完了するまで利用できません。詳しくは {documentationLink} を参照してください。",
   "admin.permissions.teamOverrideSchemesNewButton": "新しいチーム上書きスキーム",
   "admin.permissions.teamOverrideSchemesNoJobsEnabled": "移行ジョブが保留中です: チーム上書きスキームはジョブサーバーが権限移行処理を実行可能になるまで利用できません。ジョブサーバーが有効になると自動でジョブが開始されます。詳しくは {documentationLink} を参照してください。",
-  "admin.permissions.teamOverrideSchemesNoSchemes": "チーム上書きスキームが作成されませんでした。",
+  "admin.permissions.teamOverrideSchemesNoSchemes": "チーム上書きスキームが作成されていません。",
   "admin.permissions.teamOverrideSchemesTitle": "チーム上書きスキーム",
   "admin.permissions.teamScheme": "チームスキーム",
   "admin.permissions.teamScheme.addTeams": "チームの追加",
-  "admin.permissions.teamScheme.introBanner": "チーム上書きスキームは特定のチームのチーム管理者、チャンネル管理者や他のメンバーへの権限を設定します。特定のチームが<a href=\"/admin_console/permissions/system-scheme\">システムスキーム</a>に対して例外となる権限を必要とする場合にチーム上書きスキームを使用します。",
+  "admin.permissions.teamScheme.introBanner": "[チーム上書きスキーム](!https://about.mattermost.com/default-team-override-scheme)は特定のチームのチーム管理者、チャンネル管理者、その他のメンバーの権限を設定します。特定のチームが[システムスキーム](!https://about.mattermost.com/default-system-scheme)とは異なる権限を必要とする場合にチーム上書きスキームを使用します。",
   "admin.permissions.teamScheme.noTeams": "チームが選択されていません。このリストにチームを追加してください。",
   "admin.permissions.teamScheme.removeTeam": "削除",
   "admin.permissions.teamScheme.schemeDescriptionLabel": "スキームの説明:",
@@ -991,6 +991,10 @@
   "admin.requestButton.loading": " 読み込み中…",
   "admin.requestButton.requestFailure": "テストが失敗しました: {error}",
   "admin.requestButton.requestSuccess": "テストが成功しました",
+  "admin.reset_email.cancel": "キャンセル",
+  "admin.reset_email.newEmail": "新しい電子メールアドレス",
+  "admin.reset_email.reset": "リセット",
+  "admin.reset_email.titleReset": "電子メールを再送信する",
   "admin.reset_password.cancel": "キャンセル",
   "admin.reset_password.curentPassword": "現在のパスワード",
   "admin.reset_password.missing_current": "現在のパスワードを入力してください。",
@@ -1192,6 +1196,7 @@
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "その他",
   "admin.sidebar.password": "パスワード",
+  "admin.sidebar.permissions": "高度な権限管理",
   "admin.sidebar.plugins": "プラグイン(ベータ版)",
   "admin.sidebar.plugins.configuration": "設定",
   "admin.sidebar.plugins.management": "管理",
@@ -1330,6 +1335,7 @@
   "admin.user_item.member": "メンバー",
   "admin.user_item.mfaNo": "<strong>多要素認証</strong>: 使用しない",
   "admin.user_item.mfaYes": "<strong>多要素認証</strong>: 使用する",
+  "admin.user_item.resetEmail": "電子メールを再送信する",
   "admin.user_item.resetMfa": "多要素認証を削除する",
   "admin.user_item.resetPwd": "パスワードを初期化する",
   "admin.user_item.revokeSessions": "セッションを破棄する",
@@ -1758,8 +1764,8 @@
   "edit_post.edit": "{title}を編集する",
   "edit_post.editPost": "投稿を編集する…",
   "edit_post.save": "保存する",
-  "edit_post.time_limit_button.for_n_seconds": "⚙ {n} 秒間",
-  "edit_post.time_limit_button.no_limit": "⚙ いつでも",
+  "edit_post.time_limit_button.for_n_seconds": "{n} 秒間",
+  "edit_post.time_limit_button.no_limit": "いつでも",
   "edit_post.time_limit_modal.description": "\"投稿の編集\"権限を持つすべてのユーザーに適用される時間制限の設定です。",
   "edit_post.time_limit_modal.invalid_time_limit": "不正な時間制限",
   "edit_post.time_limit_modal.option_label_anytime": "いつでも",
diff --git a/assets/base/i18n/ko.json b/assets/base/i18n/ko.json
index 73dd14089..0e7316ae1 100644
--- a/assets/base/i18n/ko.json
+++ b/assets/base/i18n/ko.json
@@ -757,7 +757,7 @@
   "admin.permissions.documentationLinkText": "문서",
   "admin.permissions.group.delete_posts.description": "Delete posts.",
   "admin.permissions.group.delete_posts.name": "Delete Posts",
-  "admin.permissions.group.integrations.description": "Manage Oauth, slash commands, webhooks and emojis.",
+  "admin.permissions.group.integrations.description": "Manage OAuth 2.0, slash commands, webhooks and emoji.",
   "admin.permissions.group.integrations.name": "Integrations & Customizations",
   "admin.permissions.group.posts.description": "Write, edit and delete posts.",
   "admin.permissions.group.posts.name": "Manage Posts",
@@ -771,8 +771,8 @@
   "admin.permissions.group.send_invites.name": "모든 팀 회원",
   "admin.permissions.group.teams.description": "Create teams and manage members.",
   "admin.permissions.group.teams.name": "서비스 약관",
-  "admin.permissions.inherited_from": "Inherited from <a>{name}</a>",
-  "admin.permissions.introBanner": "Permission Schemes set the default permissions for Team Admins, Channel Admins and everyone else. Learn more about permission schemes in our documentation.",
+  "admin.permissions.inherited_from": "Inherited from <a>{name}</a>.",
+  "admin.permissions.introBanner": "Permission Schemes set the default permissions for Team Admins, Channel Admins and everyone else. Learn more about permission schemes in our [documentation](!https://about.mattermost.com/default-advanced-permissions).",
   "admin.permissions.loadMoreSchemes": "Load more schemes",
   "admin.permissions.loadingMoreSchemes": "로딩 중...",
   "admin.permissions.permission.assign_system_admin_role.description": "Assign system admin role",
@@ -790,8 +790,8 @@
   "admin.permissions.permission.create_user_access_token.description": "Create user access token",
   "admin.permissions.permission.create_user_access_token.name": "Create user access token",
   "admin.permissions.permission.delete_others_posts.description": "Posts made by other users can be deleted.",
-  "admin.permissions.permission.delete_others_posts.name": "Delete Others Posts",
-  "admin.permissions.permission.delete_post.description": "Authors own posts can be deleted.",
+  "admin.permissions.permission.delete_others_posts.name": "Delete Others' Posts",
+  "admin.permissions.permission.delete_post.description": "Author's own posts can be deleted.",
   "admin.permissions.permission.delete_post.name": "Delete Own Posts",
   "admin.permissions.permission.delete_private_channel.description": "비공개 채널 삭제",
   "admin.permissions.permission.delete_private_channel.name": "비공개 채널 삭제",
@@ -809,7 +809,7 @@
   "admin.permissions.permission.list_users_without_team.name": "List users without team",
   "admin.permissions.permission.manage_channel_roles.description": "Manage channel roles",
   "admin.permissions.permission.manage_channel_roles.name": "Manage channel roles",
-  "admin.permissions.permission.manage_emojis.description": "Create and delete custom emojis.",
+  "admin.permissions.permission.manage_emojis.description": "Create and delete custom emoji.",
   "admin.permissions.permission.manage_emojis.name": "커스텀 이모지 관리",
   "admin.permissions.permission.manage_jobs.description": "Manage jobs",
   "admin.permissions.permission.manage_jobs.name": "Manage jobs",
@@ -833,7 +833,7 @@
   "admin.permissions.permission.manage_team.name": "Manage team",
   "admin.permissions.permission.manage_team_roles.description": "Manage team roles",
   "admin.permissions.permission.manage_team_roles.name": "Manage team roles",
-  "admin.permissions.permission.manage_webhooks.description": "Create, edit, and delete incoming and outgoing webhooks",
+  "admin.permissions.permission.manage_webhooks.description": "Create, edit, and delete incoming and outgoing webhooks.",
   "admin.permissions.permission.manage_webhooks.name": "Manage Webhooks",
   "admin.permissions.permission.permanent_delete_user.description": "Permanent delete user",
   "admin.permissions.permission.permanent_delete_user.name": "Permanent delete user",
@@ -857,19 +857,19 @@
   "admin.permissions.permissionsSchemeSummary.deleting": "Deleting...",
   "admin.permissions.permissionsTree.description": "설명",
   "admin.permissions.permissionsTree.permission": "Permission",
-  "admin.permissions.roles.all_users.name": "일반 멤버",
+  "admin.permissions.roles.all_users.name": "멤버 추가",
   "admin.permissions.roles.channel_admin.name": "채널 관리자",
-  "admin.permissions.roles.channel_user.name": "Channel user",
+  "admin.permissions.roles.channel_user.name": "채널 URL",
   "admin.permissions.roles.system_admin.name": "시스템 관리자",
-  "admin.permissions.roles.system_user.name": "System user",
+  "admin.permissions.roles.system_user.name": "System User",
   "admin.permissions.roles.team_admin.name": "팀 관리자",
-  "admin.permissions.roles.team_user.name": "Team user",
+  "admin.permissions.roles.team_user.name": "Team User",
   "admin.permissions.systemScheme": "System Scheme",
   "admin.permissions.systemScheme.allMembersDescription": "Permissions granted to all members, including administrators and newly created users.",
   "admin.permissions.systemScheme.allMembersTitle": "멤버 추가",
   "admin.permissions.systemScheme.channelAdminsDescription": "Permissions granted to channel creators and any users promoted to Channel Administrator.",
   "admin.permissions.systemScheme.channelAdminsTitle": "Channel Administrators",
-  "admin.permissions.systemScheme.introBanner": "Configure the default permissions for Team Admins, Channel Admins and other members. This scheme is inherited by all teams unless a Team Override Scheme is applied in specific teams.",
+  "admin.permissions.systemScheme.introBanner": "Configure the default permissions for Team Admins, Channel Admins and other members. This scheme is inherited by all teams unless a [Team Override Scheme](!https://about.mattermost.com/default-team-override-scheme) is applied in specific teams.",
   "admin.permissions.systemScheme.resetDefaultsButton": "Reset to Defaults",
   "admin.permissions.systemScheme.resetDefaultsButtonModalBody": "This will reset all selections on this page to their default settings. Are you sure you want to reset?",
   "admin.permissions.systemScheme.resetDefaultsButtonModalTitle": "Reset to Default?",
@@ -879,9 +879,9 @@
   "admin.permissions.systemScheme.teamAdminsDescription": "Permissions granted to team creators and any users promoted to Team Administrator.",
   "admin.permissions.systemScheme.teamAdminsTitle": "Team Administrators",
   "admin.permissions.systemSchemeBannerButton": "Edit Scheme",
-  "admin.permissions.systemSchemeBannerText": "Set the default permissions inherited by all teams unless a Team Override Scheme is applied.",
+  "admin.permissions.systemSchemeBannerText": "Set the default permissions inherited by all teams unless a [Team Override Scheme](!https://about.mattermost.com/default-team-override-scheme) is applied.",
   "admin.permissions.systemSchemeBannerTitle": "System Scheme",
-  "admin.permissions.teamOverrideSchemesBannerText": "Use when specific teams need permission exceptions to the System Scheme.",
+  "admin.permissions.teamOverrideSchemesBannerText": "Use when specific teams need permission exceptions to the [System Scheme](!https://about.mattermost.com/default-system-scheme).",
   "admin.permissions.teamOverrideSchemesInProgress": "Migration job in progress: Team Override Schemes are not available until the job server completes the permissions migration. Learn more in the {documentationLink}.",
   "admin.permissions.teamOverrideSchemesNewButton": "New Team Override Scheme",
   "admin.permissions.teamOverrideSchemesNoJobsEnabled": "Migration job on hold: Team Override Schemes are not available until the job server can execute the permissions migration. The job will be automatically started when the job server is enabled. Learn more in the {documentationLink}.",
@@ -889,7 +889,7 @@
   "admin.permissions.teamOverrideSchemesTitle": "Team Override Schemes",
   "admin.permissions.teamScheme": "Team Scheme",
   "admin.permissions.teamScheme.addTeams": "Add Teams",
-  "admin.permissions.teamScheme.introBanner": "Team Override Schemes set the permissions for Team Admins, Channel Admins and other members in specific teams. Use a Team Override Scheme when specific teams need permission exceptions to the <a href=\"/admin_console/permissions/system-scheme\">System Scheme</a>.",
+  "admin.permissions.teamScheme.introBanner": "[Team Override Schemes](!https://about.mattermost.com/default-team-override-scheme) set the permissions for Team Admins, Channel Admins and other members in specific teams. Use a Team Override Scheme when specific teams need permission exceptions to the [System Scheme](!https://about.mattermost.com/default-system-scheme).",
   "admin.permissions.teamScheme.noTeams": "No team selected. Please add teams to this list.",
   "admin.permissions.teamScheme.removeTeam": "제거",
   "admin.permissions.teamScheme.schemeDescriptionLabel": "Scheme Description:",
@@ -991,6 +991,10 @@
   "admin.requestButton.loading": " 로딩 중...",
   "admin.requestButton.requestFailure": "테스트 실패: {error}",
   "admin.requestButton.requestSuccess": "테스트 성공",
+  "admin.reset_email.cancel": "취소",
+  "admin.reset_email.newEmail": "New Email",
+  "admin.reset_email.reset": "Reset",
+  "admin.reset_email.titleReset": "다시 보내기",
   "admin.reset_password.cancel": "취소",
   "admin.reset_password.curentPassword": "현재 비밀번호",
   "admin.reset_password.missing_current": "현재 비밀번호를 입력해주세요.",
@@ -1192,6 +1196,7 @@
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "기타",
   "admin.sidebar.password": "패스워드",
+  "admin.sidebar.permissions": "Advanced Permissions",
   "admin.sidebar.plugins": "플러그인 (베타)",
   "admin.sidebar.plugins.configuration": "설정",
   "admin.sidebar.plugins.management": "Management",
@@ -1330,6 +1335,7 @@
   "admin.user_item.member": "회원",
   "admin.user_item.mfaNo": ", <strong>MFA</strong>: 아니요",
   "admin.user_item.mfaYes": ", <strong>MFA</strong>: 예",
+  "admin.user_item.resetEmail": "다시 보내기",
   "admin.user_item.resetMfa": "MFA 제거",
   "admin.user_item.resetPwd": "패스워드 리셋",
   "admin.user_item.revokeSessions": "Revoke Sessions",
@@ -1758,8 +1764,8 @@
   "edit_post.edit": "{title} 편집",
   "edit_post.editPost": "글 편집하기...",
   "edit_post.save": "저장",
-  "edit_post.time_limit_button.for_n_seconds": "⚙ For {n} seconds",
-  "edit_post.time_limit_button.no_limit": "⚙ Anytime",
+  "edit_post.time_limit_button.for_n_seconds": "For {n} seconds",
+  "edit_post.time_limit_button.no_limit": "Anytime",
   "edit_post.time_limit_modal.description": "Setting a time limit applies to all users who have the \"Edit Post\" permissions in any permission scheme.",
   "edit_post.time_limit_modal.invalid_time_limit": "Invalid time limit",
   "edit_post.time_limit_modal.option_label_anytime": "Anytime",
diff --git a/assets/base/i18n/nl.json b/assets/base/i18n/nl.json
index 1674be52e..f595411af 100644
--- a/assets/base/i18n/nl.json
+++ b/assets/base/i18n/nl.json
@@ -757,7 +757,7 @@
   "admin.permissions.documentationLinkText": "documentatie",
   "admin.permissions.group.delete_posts.description": "Delete posts.",
   "admin.permissions.group.delete_posts.name": "Delete Posts",
-  "admin.permissions.group.integrations.description": "Manage Oauth, slash commands, webhooks and emojis.",
+  "admin.permissions.group.integrations.description": "Manage OAuth 2.0, slash commands, webhooks and emoji.",
   "admin.permissions.group.integrations.name": "Integrations & Customizations",
   "admin.permissions.group.posts.description": "Write, edit and delete posts.",
   "admin.permissions.group.posts.name": "Manage Posts",
@@ -771,8 +771,8 @@
   "admin.permissions.group.send_invites.name": "Alle teamleden",
   "admin.permissions.group.teams.description": "Create teams and manage members.",
   "admin.permissions.group.teams.name": "Termen",
-  "admin.permissions.inherited_from": "Inherited from <a>{name}</a>",
-  "admin.permissions.introBanner": "Permission Schemes set the default permissions for Team Admins, Channel Admins and everyone else. Learn more about permission schemes in our documentation.",
+  "admin.permissions.inherited_from": "Inherited from <a>{name}</a>.",
+  "admin.permissions.introBanner": "Permission Schemes set the default permissions for Team Admins, Channel Admins and everyone else. Learn more about permission schemes in our [documentation](!https://about.mattermost.com/default-advanced-permissions).",
   "admin.permissions.loadMoreSchemes": "Load more schemes",
   "admin.permissions.loadingMoreSchemes": "Laden...",
   "admin.permissions.permission.assign_system_admin_role.description": "Assign system admin role",
@@ -790,8 +790,8 @@
   "admin.permissions.permission.create_user_access_token.description": "Create user access token",
   "admin.permissions.permission.create_user_access_token.name": "Create user access token",
   "admin.permissions.permission.delete_others_posts.description": "Posts made by other users can be deleted.",
-  "admin.permissions.permission.delete_others_posts.name": "Delete Others Posts",
-  "admin.permissions.permission.delete_post.description": "Authors own posts can be deleted.",
+  "admin.permissions.permission.delete_others_posts.name": "Delete Others' Posts",
+  "admin.permissions.permission.delete_post.description": "Author's own posts can be deleted.",
   "admin.permissions.permission.delete_post.name": "Delete Own Posts",
   "admin.permissions.permission.delete_private_channel.description": "Maak een publiek kanaal",
   "admin.permissions.permission.delete_private_channel.name": "Verwijder kanaal...",
@@ -809,7 +809,7 @@
   "admin.permissions.permission.list_users_without_team.name": "List users without team",
   "admin.permissions.permission.manage_channel_roles.description": "Manage channel roles",
   "admin.permissions.permission.manage_channel_roles.name": "Manage channel roles",
-  "admin.permissions.permission.manage_emojis.description": "Create and delete custom emojis.",
+  "admin.permissions.permission.manage_emojis.description": "Create and delete custom emoji.",
   "admin.permissions.permission.manage_emojis.name": "Aangepaste emoji inschakelen:",
   "admin.permissions.permission.manage_jobs.description": "Manage jobs",
   "admin.permissions.permission.manage_jobs.name": "Manage jobs",
@@ -833,7 +833,7 @@
   "admin.permissions.permission.manage_team.name": "Manage team",
   "admin.permissions.permission.manage_team_roles.description": "Manage team roles",
   "admin.permissions.permission.manage_team_roles.name": "Manage team roles",
-  "admin.permissions.permission.manage_webhooks.description": "Create, edit, and delete incoming and outgoing webhooks",
+  "admin.permissions.permission.manage_webhooks.description": "Create, edit, and delete incoming and outgoing webhooks.",
   "admin.permissions.permission.manage_webhooks.name": "Manage Webhooks",
   "admin.permissions.permission.permanent_delete_user.description": "Permanent delete user",
   "admin.permissions.permission.permanent_delete_user.name": "Permanent delete user",
@@ -858,18 +858,18 @@
   "admin.permissions.permissionsTree.description": "Omschrijving",
   "admin.permissions.permissionsTree.permission": "Permission",
   "admin.permissions.roles.all_users.name": "Leden toevoegen",
-  "admin.permissions.roles.channel_admin.name": "Channel admin",
-  "admin.permissions.roles.channel_user.name": "Channel user",
+  "admin.permissions.roles.channel_admin.name": "Channel Admin",
+  "admin.permissions.roles.channel_user.name": "Kanaal URL:",
   "admin.permissions.roles.system_admin.name": "Systeem beheerder",
-  "admin.permissions.roles.system_user.name": "System user",
+  "admin.permissions.roles.system_user.name": "System User",
   "admin.permissions.roles.team_admin.name": "Team beheerder",
-  "admin.permissions.roles.team_user.name": "Team user",
+  "admin.permissions.roles.team_user.name": "Team User",
   "admin.permissions.systemScheme": "System Scheme",
   "admin.permissions.systemScheme.allMembersDescription": "Permissions granted to all members, including administrators and newly created users.",
   "admin.permissions.systemScheme.allMembersTitle": "Leden toevoegen",
   "admin.permissions.systemScheme.channelAdminsDescription": "Permissions granted to channel creators and any users promoted to Channel Administrator.",
   "admin.permissions.systemScheme.channelAdminsTitle": "Channel Administrators",
-  "admin.permissions.systemScheme.introBanner": "Configure the default permissions for Team Admins, Channel Admins and other members. This scheme is inherited by all teams unless a Team Override Scheme is applied in specific teams.",
+  "admin.permissions.systemScheme.introBanner": "Configure the default permissions for Team Admins, Channel Admins and other members. This scheme is inherited by all teams unless a [Team Override Scheme](!https://about.mattermost.com/default-team-override-scheme) is applied in specific teams.",
   "admin.permissions.systemScheme.resetDefaultsButton": "Reset to Defaults",
   "admin.permissions.systemScheme.resetDefaultsButtonModalBody": "This will reset all selections on this page to their default settings. Are you sure you want to reset?",
   "admin.permissions.systemScheme.resetDefaultsButtonModalTitle": "Reset to Default?",
@@ -879,9 +879,9 @@
   "admin.permissions.systemScheme.teamAdminsDescription": "Permissions granted to team creators and any users promoted to Team Administrator.",
   "admin.permissions.systemScheme.teamAdminsTitle": "Team Administrators",
   "admin.permissions.systemSchemeBannerButton": "Edit Scheme",
-  "admin.permissions.systemSchemeBannerText": "Set the default permissions inherited by all teams unless a Team Override Scheme is applied.",
+  "admin.permissions.systemSchemeBannerText": "Set the default permissions inherited by all teams unless a [Team Override Scheme](!https://about.mattermost.com/default-team-override-scheme) is applied.",
   "admin.permissions.systemSchemeBannerTitle": "System Scheme",
-  "admin.permissions.teamOverrideSchemesBannerText": "Use when specific teams need permission exceptions to the System Scheme.",
+  "admin.permissions.teamOverrideSchemesBannerText": "Use when specific teams need permission exceptions to the [System Scheme](!https://about.mattermost.com/default-system-scheme).",
   "admin.permissions.teamOverrideSchemesInProgress": "Migration job in progress: Team Override Schemes are not available until the job server completes the permissions migration. Learn more in the {documentationLink}.",
   "admin.permissions.teamOverrideSchemesNewButton": "New Team Override Scheme",
   "admin.permissions.teamOverrideSchemesNoJobsEnabled": "Migration job on hold: Team Override Schemes are not available until the job server can execute the permissions migration. The job will be automatically started when the job server is enabled. Learn more in the {documentationLink}.",
@@ -889,7 +889,7 @@
   "admin.permissions.teamOverrideSchemesTitle": "Team Override Schemes",
   "admin.permissions.teamScheme": "Team Scheme",
   "admin.permissions.teamScheme.addTeams": "Add Teams",
-  "admin.permissions.teamScheme.introBanner": "Team Override Schemes set the permissions for Team Admins, Channel Admins and other members in specific teams. Use a Team Override Scheme when specific teams need permission exceptions to the <a href=\"/admin_console/permissions/system-scheme\">System Scheme</a>.",
+  "admin.permissions.teamScheme.introBanner": "[Team Override Schemes](!https://about.mattermost.com/default-team-override-scheme) set the permissions for Team Admins, Channel Admins and other members in specific teams. Use a Team Override Scheme when specific teams need permission exceptions to the [System Scheme](!https://about.mattermost.com/default-system-scheme).",
   "admin.permissions.teamScheme.noTeams": "No team selected. Please add teams to this list.",
   "admin.permissions.teamScheme.removeTeam": "Verwijderen",
   "admin.permissions.teamScheme.schemeDescriptionLabel": "Scheme Description:",
@@ -991,6 +991,10 @@
   "admin.requestButton.loading": "Laden...",
   "admin.requestButton.requestFailure": "Sync Mislukt: {error}",
   "admin.requestButton.requestSuccess": "Installatie Succesvol",
+  "admin.reset_email.cancel": "Annuleren",
+  "admin.reset_email.newEmail": "New Email",
+  "admin.reset_email.reset": "Reset",
+  "admin.reset_email.titleReset": "Email opnieuw sturen",
   "admin.reset_password.cancel": "Annuleren",
   "admin.reset_password.curentPassword": "Huidig wachtwoord",
   "admin.reset_password.missing_current": "Voer uw huidige wachtwoord in",
@@ -1109,7 +1113,7 @@
   "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt Certificate Cache File:",
   "admin.service.letsEncryptCertificateCacheFileDescription": "Certificates retrieved and other data about the Let's Encrypt service will be stored in this file.",
   "admin.service.listenAddress": "Luister Adres:",
-  "admin.service.listenDescription": "The address and port to which to bind and listen. Specifying \":8065\" will bind to all network interfaces. Specifying \"127.0.0.1:8065\" will only bind to the network interface having that IP address. If you choose a port of a lower level (called \"system ports\" or \"well-known ports\", in the range of 0-1023), you must have permissions to bind to that port. On Linux you can use: \"sudo setcap cap_net_bind_service=+ep ./bin/platform\" to allow Mattermost to bind to well-known ports.",
+  "admin.service.listenDescription": "The address and port to which to bind and listen. Specifying \":8065\" will bind to all network interfaces. Specifying \"127.0.0.1:8065\" will only bind to the network interface having that IP address. If you choose a port of a lower level (called \"system ports\" or \"well-known ports\", in the range of 0-1023), you must have permissions to bind to that port. On Linux you can use: \"sudo setcap cap_net_bind_service=+ep ./bin/mattermost\" to allow Mattermost to bind to well-known ports.",
   "admin.service.listenExample": "Bijv.: \":8065\"",
   "admin.service.mfaDesc": "When true, users with AD/LDAP or email login can add multi-factor authentication to their account using Google Authenticator.",
   "admin.service.mfaTitle": "Aanzetten multi-factor authenticatie:",
@@ -1192,6 +1196,7 @@
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "ANDERE",
   "admin.sidebar.password": "Wachtwoord",
+  "admin.sidebar.permissions": "Advanced Permissions",
   "admin.sidebar.plugins": "Plugins (Beta)",
   "admin.sidebar.plugins.configuration": "Configuratie",
   "admin.sidebar.plugins.management": "Management",
@@ -1330,6 +1335,7 @@
   "admin.user_item.member": "Lid",
   "admin.user_item.mfaNo": ", <strong>MFA</strong>: Nee",
   "admin.user_item.mfaYes": ", <strong>MFA</strong>: Ja",
+  "admin.user_item.resetEmail": "Email opnieuw sturen",
   "admin.user_item.resetMfa": "Verwijder MFA",
   "admin.user_item.resetPwd": "Reset wachtwoord",
   "admin.user_item.revokeSessions": "Revoke Sessions",
@@ -1758,8 +1764,8 @@
   "edit_post.edit": "{title} bewerken",
   "edit_post.editPost": "Bewerk het bericht...",
   "edit_post.save": "Opslaan",
-  "edit_post.time_limit_button.for_n_seconds": "⚙ For {n} seconds",
-  "edit_post.time_limit_button.no_limit": "⚙ Anytime",
+  "edit_post.time_limit_button.for_n_seconds": "For {n} seconds",
+  "edit_post.time_limit_button.no_limit": "Anytime",
   "edit_post.time_limit_modal.description": "Setting a time limit applies to all users who have the \"Edit Post\" permissions in any permission scheme.",
   "edit_post.time_limit_modal.invalid_time_limit": "Invalid time limit",
   "edit_post.time_limit_modal.option_label_anytime": "Anytime",
diff --git a/assets/base/i18n/pl.json b/assets/base/i18n/pl.json
index ddd2042f9..058eb1759 100644
--- a/assets/base/i18n/pl.json
+++ b/assets/base/i18n/pl.json
@@ -757,7 +757,7 @@
   "admin.permissions.documentationLinkText": "dokumentacja",
   "admin.permissions.group.delete_posts.description": "Usuń wiadomość",
   "admin.permissions.group.delete_posts.name": "Usuń wiadomość",
-  "admin.permissions.group.integrations.description": "Manage Oauth, slash commands, webhooks and emojis.",
+  "admin.permissions.group.integrations.description": "Manage OAuth 2.0, slash commands, webhooks and emoji.",
   "admin.permissions.group.integrations.name": "Integrations & Customizations",
   "admin.permissions.group.posts.description": "Write, edit and delete posts.",
   "admin.permissions.group.posts.name": "Zarządzaj rolami",
@@ -771,8 +771,8 @@
   "admin.permissions.group.send_invites.name": "Wszyscy członkowie zespołu",
   "admin.permissions.group.teams.description": "Create teams and manage members.",
   "admin.permissions.group.teams.name": "Zespoły",
-  "admin.permissions.inherited_from": "Inherited from <a>{name}</a>",
-  "admin.permissions.introBanner": "Permission Schemes set the default permissions for Team Admins, Channel Admins and everyone else. Learn more about permission schemes in our documentation.",
+  "admin.permissions.inherited_from": "Inherited from <a>{name}</a>.",
+  "admin.permissions.introBanner": "Permission Schemes set the default permissions for Team Admins, Channel Admins and everyone else. Learn more about permission schemes in our [documentation](!https://about.mattermost.com/default-advanced-permissions).",
   "admin.permissions.loadMoreSchemes": "Load more schemes",
   "admin.permissions.loadingMoreSchemes": "Ładowanie...",
   "admin.permissions.permission.assign_system_admin_role.description": "Assign system admin role",
@@ -790,8 +790,8 @@
   "admin.permissions.permission.create_user_access_token.description": "Create user access token",
   "admin.permissions.permission.create_user_access_token.name": "Create user access token",
   "admin.permissions.permission.delete_others_posts.description": "Posts made by other users can be deleted.",
-  "admin.permissions.permission.delete_others_posts.name": "Delete Others Posts",
-  "admin.permissions.permission.delete_post.description": "Authors own posts can be deleted.",
+  "admin.permissions.permission.delete_others_posts.name": "Delete Others' Posts",
+  "admin.permissions.permission.delete_post.description": "Author's own posts can be deleted.",
   "admin.permissions.permission.delete_post.name": "Usuń wiadomość",
   "admin.permissions.permission.delete_private_channel.description": "Stwórz nowy kanał prywatny",
   "admin.permissions.permission.delete_private_channel.name": "Usuń kanał",
@@ -809,7 +809,7 @@
   "admin.permissions.permission.list_users_without_team.name": "List users without team",
   "admin.permissions.permission.manage_channel_roles.description": "Manage channel roles",
   "admin.permissions.permission.manage_channel_roles.name": "Manage channel roles",
-  "admin.permissions.permission.manage_emojis.description": "Create and delete custom emojis.",
+  "admin.permissions.permission.manage_emojis.description": "Create and delete custom emoji.",
   "admin.permissions.permission.manage_emojis.name": "Włącz własne emotikony:",
   "admin.permissions.permission.manage_jobs.description": "Zarządzaj rolami",
   "admin.permissions.permission.manage_jobs.name": "Zarządzaj rolami",
@@ -833,7 +833,7 @@
   "admin.permissions.permission.manage_team.name": "Zarządzaj Zespołami",
   "admin.permissions.permission.manage_team_roles.description": "Manage team roles",
   "admin.permissions.permission.manage_team_roles.name": "Manage team roles",
-  "admin.permissions.permission.manage_webhooks.description": "Create, edit, and delete incoming and outgoing webhooks",
+  "admin.permissions.permission.manage_webhooks.description": "Create, edit, and delete incoming and outgoing webhooks.",
   "admin.permissions.permission.manage_webhooks.name": "Manage Webhooks",
   "admin.permissions.permission.permanent_delete_user.description": "Permanent delete user",
   "admin.permissions.permission.permanent_delete_user.name": "Permanent delete user",
@@ -859,17 +859,17 @@
   "admin.permissions.permissionsTree.permission": "Permission",
   "admin.permissions.roles.all_users.name": "Dodaj użytkowników",
   "admin.permissions.roles.channel_admin.name": "Administrator kanału",
-  "admin.permissions.roles.channel_user.name": "Channel user",
+  "admin.permissions.roles.channel_user.name": "URL Kanału",
   "admin.permissions.roles.system_admin.name": "Administrator Systemu",
-  "admin.permissions.roles.system_user.name": "System user",
+  "admin.permissions.roles.system_user.name": "System User",
   "admin.permissions.roles.team_admin.name": "Administrator zespołu",
-  "admin.permissions.roles.team_user.name": "Team user",
+  "admin.permissions.roles.team_user.name": "Team User",
   "admin.permissions.systemScheme": "System Scheme",
   "admin.permissions.systemScheme.allMembersDescription": "Permissions granted to all members, including administrators and newly created users.",
   "admin.permissions.systemScheme.allMembersTitle": "Dodaj użytkowników",
   "admin.permissions.systemScheme.channelAdminsDescription": "Permissions granted to channel creators and any users promoted to Channel Administrator.",
   "admin.permissions.systemScheme.channelAdminsTitle": "Channel Administrators",
-  "admin.permissions.systemScheme.introBanner": "Configure the default permissions for Team Admins, Channel Admins and other members. This scheme is inherited by all teams unless a Team Override Scheme is applied in specific teams.",
+  "admin.permissions.systemScheme.introBanner": "Configure the default permissions for Team Admins, Channel Admins and other members. This scheme is inherited by all teams unless a [Team Override Scheme](!https://about.mattermost.com/default-team-override-scheme) is applied in specific teams.",
   "admin.permissions.systemScheme.resetDefaultsButton": "Reset to Defaults",
   "admin.permissions.systemScheme.resetDefaultsButtonModalBody": "This will reset all selections on this page to their default settings. Are you sure you want to reset?",
   "admin.permissions.systemScheme.resetDefaultsButtonModalTitle": "Reset to Default?",
@@ -879,9 +879,9 @@
   "admin.permissions.systemScheme.teamAdminsDescription": "Permissions granted to team creators and any users promoted to Team Administrator.",
   "admin.permissions.systemScheme.teamAdminsTitle": "Team Administrators",
   "admin.permissions.systemSchemeBannerButton": "Edit Scheme",
-  "admin.permissions.systemSchemeBannerText": "Set the default permissions inherited by all teams unless a Team Override Scheme is applied.",
+  "admin.permissions.systemSchemeBannerText": "Set the default permissions inherited by all teams unless a [Team Override Scheme](!https://about.mattermost.com/default-team-override-scheme) is applied.",
   "admin.permissions.systemSchemeBannerTitle": "System Scheme",
-  "admin.permissions.teamOverrideSchemesBannerText": "Use when specific teams need permission exceptions to the System Scheme.",
+  "admin.permissions.teamOverrideSchemesBannerText": "Use when specific teams need permission exceptions to the [System Scheme](!https://about.mattermost.com/default-system-scheme).",
   "admin.permissions.teamOverrideSchemesInProgress": "Migration job in progress: Team Override Schemes are not available until the job server completes the permissions migration. Learn more in the {documentationLink}.",
   "admin.permissions.teamOverrideSchemesNewButton": "New Team Override Scheme",
   "admin.permissions.teamOverrideSchemesNoJobsEnabled": "Migration job on hold: Team Override Schemes are not available until the job server can execute the permissions migration. The job will be automatically started when the job server is enabled. Learn more in the {documentationLink}.",
@@ -889,7 +889,7 @@
   "admin.permissions.teamOverrideSchemesTitle": "Team Override Schemes",
   "admin.permissions.teamScheme": "Team Scheme",
   "admin.permissions.teamScheme.addTeams": "Add Teams",
-  "admin.permissions.teamScheme.introBanner": "Team Override Schemes set the permissions for Team Admins, Channel Admins and other members in specific teams. Use a Team Override Scheme when specific teams need permission exceptions to the <a href=\"/admin_console/permissions/system-scheme\">System Scheme</a>.",
+  "admin.permissions.teamScheme.introBanner": "[Team Override Schemes](!https://about.mattermost.com/default-team-override-scheme) set the permissions for Team Admins, Channel Admins and other members in specific teams. Use a Team Override Scheme when specific teams need permission exceptions to the [System Scheme](!https://about.mattermost.com/default-system-scheme).",
   "admin.permissions.teamScheme.noTeams": "No team selected. Please add teams to this list.",
   "admin.permissions.teamScheme.removeTeam": "Usuń",
   "admin.permissions.teamScheme.schemeDescriptionLabel": "Scheme Description:",
@@ -991,6 +991,10 @@
   "admin.requestButton.loading": " Ładowanie...",
   "admin.requestButton.requestFailure": "Niepowodzenie testu: {error}",
   "admin.requestButton.requestSuccess": "Test zakończony sukcesem",
+  "admin.reset_email.cancel": "Anuluj",
+  "admin.reset_email.newEmail": "Nowy e-mail",
+  "admin.reset_email.reset": "Reset",
+  "admin.reset_email.titleReset": "Wyślij ponownie e-mail",
   "admin.reset_password.cancel": "Anuluj",
   "admin.reset_password.curentPassword": "Bieżące hasło",
   "admin.reset_password.missing_current": "Proszę podać obecne hasło.",
@@ -1192,6 +1196,7 @@
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "INNE",
   "admin.sidebar.password": "Hasło",
+  "admin.sidebar.permissions": "Advanced Permissions",
   "admin.sidebar.plugins": "Plugins (Beta)",
   "admin.sidebar.plugins.configuration": "Konfiguracja",
   "admin.sidebar.plugins.management": "Management",
@@ -1330,6 +1335,7 @@
   "admin.user_item.member": "Użytkownik",
   "admin.user_item.mfaNo": "<strong>MFA</strong>: Nie",
   "admin.user_item.mfaYes": "<strong>MFA</strong>: Tak",
+  "admin.user_item.resetEmail": "Wyślij ponownie e-mail",
   "admin.user_item.resetMfa": "Usuń MFA",
   "admin.user_item.resetPwd": "Zresetuj hasło",
   "admin.user_item.revokeSessions": "Revoke Sessions",
@@ -1758,7 +1764,7 @@
   "edit_post.edit": "Edytuj {title}",
   "edit_post.editPost": "Edytuj post...",
   "edit_post.save": "Zapisz",
-  "edit_post.time_limit_button.for_n_seconds": "⚙ For {n} seconds",
+  "edit_post.time_limit_button.for_n_seconds": "For {n} seconds",
   "edit_post.time_limit_button.no_limit": "Kiedykolwiek",
   "edit_post.time_limit_modal.description": "Setting a time limit applies to all users who have the \"Edit Post\" permissions in any permission scheme.",
   "edit_post.time_limit_modal.invalid_time_limit": "Invalid time limit",
@@ -1955,7 +1961,7 @@
   "help.formatting.headings2Example": "Duży nagłówek\n-------------",
   "help.formatting.headingsExample": "## Duży nagłówek\n### Mniejszy nagłówek\n#### Jeszcze mniejszy nagłówek",
   "help.formatting.images": "## In-line Images\n\nCreate in-line images using an `!` followed by the alt text in square brackets and the link in normal brackets. Add hover text by placing it in quotes after the link.",
-  "help.formatting.imagesExample": "![alt text](link \"hover text\")\n\nand\n\n[![Build Status](https://travis-ci.org/mattermost/platform.svg?branch=master)](https://travis-ci.org/mattermost/platform) [![Github](https://assets-cdn.github.com/favicon.ico)](https://github.com/mattermost/platform)",
+  "help.formatting.imagesExample": "![alt text](link \"hover text\")\n\nand\n\n[![Build Status](https://travis-ci.org/mattermost/mattermost-server.svg?branch=master)](https://travis-ci.org/mattermost/mattermost-server) [![Github](https://assets-cdn.github.com/favicon.ico)](https://github.com/mattermost/mattermost-server)",
   "help.formatting.inline": "## In-line Code\n\nCreate in-line monospaced font by surrounding it with backticks.",
   "help.formatting.intro": "Markdown makes it easy to format messages. Type a message as you normally would, and use these rules to render it with special formatting.",
   "help.formatting.lines": "## Linie \n\nUtwórz linię, używając trzech `*`, `_` lub` -`.",
diff --git a/assets/base/i18n/pt-BR.json b/assets/base/i18n/pt-BR.json
index 7e6736c27..6c0b566ef 100644
--- a/assets/base/i18n/pt-BR.json
+++ b/assets/base/i18n/pt-BR.json
@@ -772,7 +772,7 @@
   "admin.permissions.group.teams.description": "Criar equipes e gerenciar membros.",
   "admin.permissions.group.teams.name": "Equipes",
   "admin.permissions.inherited_from": "Herdado de <a>{name}</a>",
-  "admin.permissions.introBanner": "Esquemas de Permissão definem as permissões padrão para administradores de equipe, administradores de canal e todos os outros. Saiba mais sobre os esquemas de permissão em nossa documentação.",
+  "admin.permissions.introBanner": "Permission Schemes set the default permissions for Team Admins, Channel Admins and everyone else. Learn more about permission schemes in our [documentation](!https://about.mattermost.com/default-advanced-permissions).",
   "admin.permissions.loadMoreSchemes": "Carregar mais esquemas",
   "admin.permissions.loadingMoreSchemes": "Carregando...",
   "admin.permissions.permission.assign_system_admin_role.description": "Atribuir função de admin do sistema",
@@ -857,19 +857,19 @@
   "admin.permissions.permissionsSchemeSummary.deleting": "Excluindo...",
   "admin.permissions.permissionsTree.description": "Descrição",
   "admin.permissions.permissionsTree.permission": "Permissão",
-  "admin.permissions.roles.all_users.name": "Todos os membros",
-  "admin.permissions.roles.channel_admin.name": "Administrador de canal",
+  "admin.permissions.roles.all_users.name": "Todos os Membros",
+  "admin.permissions.roles.channel_admin.name": "Administrador de Canal",
   "admin.permissions.roles.channel_user.name": "Usuário de canal",
   "admin.permissions.roles.system_admin.name": "Admin do Sistema",
   "admin.permissions.roles.system_user.name": "Usuários do sistema",
-  "admin.permissions.roles.team_admin.name": "Admin de equipe",
+  "admin.permissions.roles.team_admin.name": "Admin Equipe",
   "admin.permissions.roles.team_user.name": "Usuário de equipe",
   "admin.permissions.systemScheme": "Esquema do Sistema",
   "admin.permissions.systemScheme.allMembersDescription": "Permissões concedidas a todos os membros, incluindo administradores e usuários recém-criados.",
   "admin.permissions.systemScheme.allMembersTitle": "Todos os Membros",
   "admin.permissions.systemScheme.channelAdminsDescription": "Permissões concedidas a criadores de canais e quaisquer usuários promovidos a Administrador de Canal.",
   "admin.permissions.systemScheme.channelAdminsTitle": "Administradores de Canal",
-  "admin.permissions.systemScheme.introBanner": "Configure as permissões padrão para Administradores de Equipe, Administradores de Canais e outros membros. Este esquema é herdado por todas as equipes, a menos que um Esquema de Substituição de Equipe seja aplicado em equipes específicas.",
+  "admin.permissions.systemScheme.introBanner": "Configure the default permissions for Team Admins, Channel Admins and other members. This scheme is inherited by all teams unless a [Team Override Scheme](!https://about.mattermost.com/default-team-override-scheme) is applied in specific teams.",
   "admin.permissions.systemScheme.resetDefaultsButton": "Restaurar para o padrão",
   "admin.permissions.systemScheme.resetDefaultsButtonModalBody": "Isso redefinirá todas as seleções nesta página para as configurações padrão. Tem certeza de que deseja redefinir?",
   "admin.permissions.systemScheme.resetDefaultsButtonModalTitle": "Restaurar para Padrão?",
@@ -879,9 +879,9 @@
   "admin.permissions.systemScheme.teamAdminsDescription": "Permissões concedidas para criadores de equipes e qualquer usuário promovido a Administrador de Equipe.",
   "admin.permissions.systemScheme.teamAdminsTitle": "Administradores de Equipe",
   "admin.permissions.systemSchemeBannerButton": "Editar Esquema",
-  "admin.permissions.systemSchemeBannerText": "Define as permissões padrão herdada por todas as equipes a menos que um Esquema de Substituição de Equipe seja aplicado.",
+  "admin.permissions.systemSchemeBannerText": "Set the default permissions inherited by all teams unless a [Team Override Scheme](!https://about.mattermost.com/default-team-override-scheme) is applied.",
   "admin.permissions.systemSchemeBannerTitle": "Esquema do Sistema",
-  "admin.permissions.teamOverrideSchemesBannerText": "Use quando equipes específicas precisarem de exceções de permissão para o Esquema do Sistema.",
+  "admin.permissions.teamOverrideSchemesBannerText": "Use when specific teams need permission exceptions to the [System Scheme](!https://about.mattermost.com/default-system-scheme).",
   "admin.permissions.teamOverrideSchemesInProgress": "Tarefa de migração em progresso: Esquema de Substituição de Equipe não estão disponíveis até a tarefa de migração de permissões no servidor estar completa. Saiba mais em {documentationLink}.",
   "admin.permissions.teamOverrideSchemesNewButton": "Novo Esquema de Substituição de Equipe",
   "admin.permissions.teamOverrideSchemesNoJobsEnabled": "Tarefa de migração em espera: Esquema de Substituição de Equipe não estão disponíveis até que a tarefa de migração de permissões possa ser executada no servidor. Saiba mais em {documentationLink}.",
@@ -889,7 +889,7 @@
   "admin.permissions.teamOverrideSchemesTitle": "Esquema de substituição de equipe",
   "admin.permissions.teamScheme": "Esquema de Equipe",
   "admin.permissions.teamScheme.addTeams": "Adicionar Equipes",
-  "admin.permissions.teamScheme.introBanner": "Esquemas de Substituição de Equipe define as permissões para Administradores de Equipe, Administradores de Canal e outros membros específicos nas esquipes. Use um Esquema de Substituição de Equipe em <a href=\"/admin_console/permissions/system-scheme\">Esquema do Sistema</a> quando equipes específicas necessitam de permissões excepcionais.",
+  "admin.permissions.teamScheme.introBanner": "[Team Override Schemes](!https://about.mattermost.com/default-team-override-scheme) set the permissions for Team Admins, Channel Admins and other members in specific teams. Use a Team Override Scheme when specific teams need permission exceptions to the [System Scheme](!https://about.mattermost.com/default-system-scheme).",
   "admin.permissions.teamScheme.noTeams": "Nenhuma equipe selecionada. Por favor adicione equipes a esta lista.",
   "admin.permissions.teamScheme.removeTeam": "Remover",
   "admin.permissions.teamScheme.schemeDescriptionLabel": "Descrição do Esquema:",
@@ -991,6 +991,10 @@
   "admin.requestButton.loading": " Carregando...",
   "admin.requestButton.requestFailure": "Falha de Teste: {error}",
   "admin.requestButton.requestSuccess": "Teste bem Sucedido",
+  "admin.reset_email.cancel": "Cancelar",
+  "admin.reset_email.newEmail": "Novo Email",
+  "admin.reset_email.reset": "Restaurar",
+  "admin.reset_email.titleReset": "Re-enviar Email",
   "admin.reset_password.cancel": "Cancelar",
   "admin.reset_password.curentPassword": "Senha Atual",
   "admin.reset_password.missing_current": "Por favor digite sua senha atual.",
@@ -1192,6 +1196,7 @@
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "OUTROS",
   "admin.sidebar.password": "Senha",
+  "admin.sidebar.permissions": "Advanced Permissions",
   "admin.sidebar.plugins": "Plugins (Beta)",
   "admin.sidebar.plugins.configuration": "Configuração",
   "admin.sidebar.plugins.management": "Gerenciamento",
@@ -1330,6 +1335,7 @@
   "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.resetEmail": "Re-enviar Email",
   "admin.user_item.resetMfa": "Remover MFA",
   "admin.user_item.resetPwd": "Redefinir Senha",
   "admin.user_item.revokeSessions": "Revogar as Sessões",
@@ -1759,7 +1765,7 @@
   "edit_post.editPost": "Editar o post...",
   "edit_post.save": "Salvar",
   "edit_post.time_limit_button.for_n_seconds": "⚙ Por {n} segundos.",
-  "edit_post.time_limit_button.no_limit": "⚙ A qualquer hora",
+  "edit_post.time_limit_button.no_limit": "A qualquer hora",
   "edit_post.time_limit_modal.description": "A definição de um limite de tempo se aplica a todos os usuários que possuem as permissões de \"Editar postagem\" em qualquer esquema de permissão.",
   "edit_post.time_limit_modal.invalid_time_limit": "Tempo limite inválido",
   "edit_post.time_limit_modal.option_label_anytime": "A qualquer hora",
diff --git a/assets/base/i18n/ru.json b/assets/base/i18n/ru.json
index 5562e38bb..d7f52dfd5 100644
--- a/assets/base/i18n/ru.json
+++ b/assets/base/i18n/ru.json
@@ -757,7 +757,7 @@
   "admin.permissions.documentationLinkText": "документация",
   "admin.permissions.group.delete_posts.description": "Удалить пост",
   "admin.permissions.group.delete_posts.name": "Удалить пост",
-  "admin.permissions.group.integrations.description": "Manage Oauth, slash commands, webhooks and emojis.",
+  "admin.permissions.group.integrations.description": "Manage OAuth 2.0, slash commands, webhooks and emoji.",
   "admin.permissions.group.integrations.name": "Integrations & Customizations",
   "admin.permissions.group.posts.description": "Write, edit and delete posts.",
   "admin.permissions.group.posts.name": "Управление ролями",
@@ -771,8 +771,8 @@
   "admin.permissions.group.send_invites.name": "Все участники команды",
   "admin.permissions.group.teams.description": "Create teams and manage members.",
   "admin.permissions.group.teams.name": "Команды",
-  "admin.permissions.inherited_from": "Inherited from <a>{name}</a>",
-  "admin.permissions.introBanner": "Permission Schemes set the default permissions for Team Admins, Channel Admins and everyone else. Learn more about permission schemes in our documentation.",
+  "admin.permissions.inherited_from": "Inherited from <a>{name}</a>.",
+  "admin.permissions.introBanner": "Permission Schemes set the default permissions for Team Admins, Channel Admins and everyone else. Learn more about permission schemes in our [documentation](!https://about.mattermost.com/default-advanced-permissions).",
   "admin.permissions.loadMoreSchemes": "Load more schemes",
   "admin.permissions.loadingMoreSchemes": "Загрузка...",
   "admin.permissions.permission.assign_system_admin_role.description": "Assign system admin role",
@@ -790,8 +790,8 @@
   "admin.permissions.permission.create_user_access_token.description": "Create user access token",
   "admin.permissions.permission.create_user_access_token.name": "Create user access token",
   "admin.permissions.permission.delete_others_posts.description": "Posts made by other users can be deleted.",
-  "admin.permissions.permission.delete_others_posts.name": "Delete Others Posts",
-  "admin.permissions.permission.delete_post.description": "Authors own posts can be deleted.",
+  "admin.permissions.permission.delete_others_posts.name": "Delete Others' Posts",
+  "admin.permissions.permission.delete_post.description": "Author's own posts can be deleted.",
   "admin.permissions.permission.delete_post.name": "Удалить пост",
   "admin.permissions.permission.delete_private_channel.description": "Создать приватный канал",
   "admin.permissions.permission.delete_private_channel.name": "Удалить канал",
@@ -809,7 +809,7 @@
   "admin.permissions.permission.list_users_without_team.name": "List users without team",
   "admin.permissions.permission.manage_channel_roles.description": "Manage channel roles",
   "admin.permissions.permission.manage_channel_roles.name": "Manage channel roles",
-  "admin.permissions.permission.manage_emojis.description": "Create and delete custom emojis.",
+  "admin.permissions.permission.manage_emojis.description": "Create and delete custom emoji.",
   "admin.permissions.permission.manage_emojis.name": "Включить пользовательские смайлы:",
   "admin.permissions.permission.manage_jobs.description": "Управление ролями",
   "admin.permissions.permission.manage_jobs.name": "Управление ролями",
@@ -833,7 +833,7 @@
   "admin.permissions.permission.manage_team.name": "Управление командами",
   "admin.permissions.permission.manage_team_roles.description": "Manage team roles",
   "admin.permissions.permission.manage_team_roles.name": "Manage team roles",
-  "admin.permissions.permission.manage_webhooks.description": "Create, edit, and delete incoming and outgoing webhooks",
+  "admin.permissions.permission.manage_webhooks.description": "Create, edit, and delete incoming and outgoing webhooks.",
   "admin.permissions.permission.manage_webhooks.name": "Manage Webhooks",
   "admin.permissions.permission.permanent_delete_user.description": "Permanent delete user",
   "admin.permissions.permission.permanent_delete_user.name": "Permanent delete user",
@@ -859,17 +859,17 @@
   "admin.permissions.permissionsTree.permission": "Permission",
   "admin.permissions.roles.all_users.name": "Добавить участников",
   "admin.permissions.roles.channel_admin.name": "Администратор канала",
-  "admin.permissions.roles.channel_user.name": "Channel user",
+  "admin.permissions.roles.channel_user.name": "Адрес канала",
   "admin.permissions.roles.system_admin.name": "Администратор системы",
-  "admin.permissions.roles.system_user.name": "System user",
+  "admin.permissions.roles.system_user.name": "System User",
   "admin.permissions.roles.team_admin.name": "Team Admin",
-  "admin.permissions.roles.team_user.name": "Team user",
+  "admin.permissions.roles.team_user.name": "Team User",
   "admin.permissions.systemScheme": "System Scheme",
   "admin.permissions.systemScheme.allMembersDescription": "Permissions granted to all members, including administrators and newly created users.",
   "admin.permissions.systemScheme.allMembersTitle": "Добавить участников",
   "admin.permissions.systemScheme.channelAdminsDescription": "Permissions granted to channel creators and any users promoted to Channel Administrator.",
   "admin.permissions.systemScheme.channelAdminsTitle": "Channel Administrators",
-  "admin.permissions.systemScheme.introBanner": "Configure the default permissions for Team Admins, Channel Admins and other members. This scheme is inherited by all teams unless a Team Override Scheme is applied in specific teams.",
+  "admin.permissions.systemScheme.introBanner": "Configure the default permissions for Team Admins, Channel Admins and other members. This scheme is inherited by all teams unless a [Team Override Scheme](!https://about.mattermost.com/default-team-override-scheme) is applied in specific teams.",
   "admin.permissions.systemScheme.resetDefaultsButton": "Reset to Defaults",
   "admin.permissions.systemScheme.resetDefaultsButtonModalBody": "This will reset all selections on this page to their default settings. Are you sure you want to reset?",
   "admin.permissions.systemScheme.resetDefaultsButtonModalTitle": "Reset to Default?",
@@ -879,9 +879,9 @@
   "admin.permissions.systemScheme.teamAdminsDescription": "Permissions granted to team creators and any users promoted to Team Administrator.",
   "admin.permissions.systemScheme.teamAdminsTitle": "Team Administrators",
   "admin.permissions.systemSchemeBannerButton": "Edit Scheme",
-  "admin.permissions.systemSchemeBannerText": "Set the default permissions inherited by all teams unless a Team Override Scheme is applied.",
+  "admin.permissions.systemSchemeBannerText": "Set the default permissions inherited by all teams unless a [Team Override Scheme](!https://about.mattermost.com/default-team-override-scheme) is applied.",
   "admin.permissions.systemSchemeBannerTitle": "System Scheme",
-  "admin.permissions.teamOverrideSchemesBannerText": "Use when specific teams need permission exceptions to the System Scheme.",
+  "admin.permissions.teamOverrideSchemesBannerText": "Use when specific teams need permission exceptions to the [System Scheme](!https://about.mattermost.com/default-system-scheme).",
   "admin.permissions.teamOverrideSchemesInProgress": "Migration job in progress: Team Override Schemes are not available until the job server completes the permissions migration. Learn more in the {documentationLink}.",
   "admin.permissions.teamOverrideSchemesNewButton": "New Team Override Scheme",
   "admin.permissions.teamOverrideSchemesNoJobsEnabled": "Migration job on hold: Team Override Schemes are not available until the job server can execute the permissions migration. The job will be automatically started when the job server is enabled. Learn more in the {documentationLink}.",
@@ -889,7 +889,7 @@
   "admin.permissions.teamOverrideSchemesTitle": "Team Override Schemes",
   "admin.permissions.teamScheme": "Team Scheme",
   "admin.permissions.teamScheme.addTeams": "Add Teams",
-  "admin.permissions.teamScheme.introBanner": "Team Override Schemes set the permissions for Team Admins, Channel Admins and other members in specific teams. Use a Team Override Scheme when specific teams need permission exceptions to the <a href=\"/admin_console/permissions/system-scheme\">System Scheme</a>.",
+  "admin.permissions.teamScheme.introBanner": "[Team Override Schemes](!https://about.mattermost.com/default-team-override-scheme) set the permissions for Team Admins, Channel Admins and other members in specific teams. Use a Team Override Scheme when specific teams need permission exceptions to the [System Scheme](!https://about.mattermost.com/default-system-scheme).",
   "admin.permissions.teamScheme.noTeams": "No team selected. Please add teams to this list.",
   "admin.permissions.teamScheme.removeTeam": "Удалить",
   "admin.permissions.teamScheme.schemeDescriptionLabel": "Scheme Description:",
@@ -991,6 +991,10 @@
   "admin.requestButton.loading": " Загрузка…",
   "admin.requestButton.requestFailure": "Сбой теста: {error}",
   "admin.requestButton.requestSuccess": "Тестирование успешно завершено",
+  "admin.reset_email.cancel": "Отмена",
+  "admin.reset_email.newEmail": "Новый адрес электронной почты",
+  "admin.reset_email.reset": "Reset",
+  "admin.reset_email.titleReset": "Отправить ещё раз",
   "admin.reset_password.cancel": "Отмена",
   "admin.reset_password.curentPassword": "Текущий пароль",
   "admin.reset_password.missing_current": "Введите текущий пароль",
@@ -1192,6 +1196,7 @@
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "ДРУГИЕ",
   "admin.sidebar.password": "Пароль",
+  "admin.sidebar.permissions": "Advanced Permissions",
   "admin.sidebar.plugins": "Plugins (Beta)",
   "admin.sidebar.plugins.configuration": "Параметры",
   "admin.sidebar.plugins.management": "Управление",
@@ -1330,6 +1335,7 @@
   "admin.user_item.member": "Участник",
   "admin.user_item.mfaNo": ", <strong>MFA</strong>: Нет",
   "admin.user_item.mfaYes": ", <strong>MFA</strong>: Да",
+  "admin.user_item.resetEmail": "Отправить ещё раз",
   "admin.user_item.resetMfa": "Удалить MFA",
   "admin.user_item.resetPwd": "Сброс пароля",
   "admin.user_item.revokeSessions": "Revoke Sessions",
@@ -1415,8 +1421,8 @@
   "api.channel.post_convert_channel_to_private.updated_from": "{username} converted the channel from public to private",
   "api.channel.post_update_channel_displayname_message_and_forget.updated_from": "{username} сменил отображаемое имя канала с {old} на {new}",
   "api.channel.post_update_channel_header_message_and_forget.removed": "{username} удалил заголовок канала (было: {old})",
-  "api.channel.post_update_channel_header_message_and_forget.updated_from": "{username} изменил заголовок канала с {old} на {new}",
-  "api.channel.post_update_channel_header_message_and_forget.updated_to": "{username} изменил заголовок канала на {new}",
+  "api.channel.post_update_channel_header_message_and_forget.updated_from": "{username} изменил(а) заголовок канала с {old} на {new}",
+  "api.channel.post_update_channel_header_message_and_forget.updated_to": "{username} изменил(а) заголовок канала на {new}",
   "api.channel.remove_member.removed": "{removedUsername} был удалён с канала",
   "api.team.add_member.added": "{addedUsername} добавлен в канал участником {username}",
   "api.team.join_team.post_and_forget": "{username} присоединился к каналу.",
@@ -1649,11 +1655,11 @@
   "combined_system_message.added_to_channel.many_expanded": "{users} and {lastUser} were <b>added to the channel</b> by {actor}.",
   "combined_system_message.added_to_channel.one": "{firstUser} <b>added to the channel</b> by {actor}.",
   "combined_system_message.added_to_channel.one_you": "You were <b>added to the channel</b> by {actor}.",
-  "combined_system_message.added_to_channel.two": "{firstUser} and {secondUser} <b>added to the channel</b> by {actor}.",
+  "combined_system_message.added_to_channel.two": "{firstUser} и {secondUser} <b>добавлены в команду пользователем</b> {actor}.",
   "combined_system_message.added_to_team.many_expanded": "{users} and {lastUser} were <b>added to the team</b> by {actor}.",
   "combined_system_message.added_to_team.one": "{firstUser} <b>added to the team</b> by {actor}.",
   "combined_system_message.added_to_team.one_you": "You were <b>added to the team</b> by {actor}.",
-  "combined_system_message.added_to_team.two": "{firstUser} and {secondUser} <b>added to the team</b> by {actor}.",
+  "combined_system_message.added_to_team.two": "{firstUser} и {secondUser} <b>добавлены в команду пользователем</b> {actor}.",
   "combined_system_message.joined_channel.many_expanded": "{users} and {lastUser} <b>joined the channel</b>.",
   "combined_system_message.joined_channel.one": "{firstUser} <b> присоединился(-лась) к команде.</b>.",
   "combined_system_message.joined_channel.two": "{firstUser} and {secondUser} <b>joined the channel</b>.",
@@ -1758,7 +1764,7 @@
   "edit_post.edit": "Редактировать {title}",
   "edit_post.editPost": "Редактировать сообщение...",
   "edit_post.save": "Сохранить",
-  "edit_post.time_limit_button.for_n_seconds": "⚙ For {n} seconds",
+  "edit_post.time_limit_button.for_n_seconds": "For {n} seconds",
   "edit_post.time_limit_button.no_limit": "Время не указано",
   "edit_post.time_limit_modal.description": "Setting a time limit applies to all users who have the \"Edit Post\" permissions in any permission scheme.",
   "edit_post.time_limit_modal.invalid_time_limit": "Invalid time limit",
diff --git a/assets/base/i18n/tr.json b/assets/base/i18n/tr.json
index 1b77046dd..11fbd4eb0 100644
--- a/assets/base/i18n/tr.json
+++ b/assets/base/i18n/tr.json
@@ -757,7 +757,7 @@
   "admin.permissions.documentationLinkText": "belgeler",
   "admin.permissions.group.delete_posts.description": "İletileri sil.",
   "admin.permissions.group.delete_posts.name": "İletileri Sil",
-  "admin.permissions.group.integrations.description": "OAuth, bölü komutları, web bağlantıları ve duygu ifadeleri yönetimi.",
+  "admin.permissions.group.integrations.description": "OAuth 2.0, bölü komutları, web bağlantıları ve duygu ifadeleri yönetimi.",
   "admin.permissions.group.integrations.name": "Bütünleştirme ve Özelleştirmeler",
   "admin.permissions.group.posts.description": "İleti yazma, düzenleme ve silme işlemleri.",
   "admin.permissions.group.posts.name": "İleti Yönetimi",
@@ -771,8 +771,8 @@
   "admin.permissions.group.send_invites.name": "Takım Üyeleri Ekle",
   "admin.permissions.group.teams.description": "Takım ekleme ve üye yönetimi.",
   "admin.permissions.group.teams.name": "Takımlar",
-  "admin.permissions.inherited_from": "<a>{name}</a> üzerinden devir alındı",
-  "admin.permissions.introBanner": "İzin Şemaları, Takım Yöneticileri, Kanal Yöneticileri ve diğer herkes için varsayılan izinleri belirler. İzin şemaları hakkında ayrıntılı bilgi almak için belgelere bakabilirsiniz.",
+  "admin.permissions.inherited_from": "<a>{name}</a> üzerinden devir alındı.",
+  "admin.permissions.introBanner": "Takım Yöneticileri, Kanal Yöneticileri ve herkes için varsayılan izinleri belirleyen İzin Şemaları. İzin şemaları hakkında ayrıntılı bilgi almak için [belgeler] bölümüne bakabilirsiniz (!https://about.mattermost.com/default-advanced-permissions).",
   "admin.permissions.loadMoreSchemes": "Başka şemalar yükle",
   "admin.permissions.loadingMoreSchemes": "Yükleniyor...",
   "admin.permissions.permission.assign_system_admin_role.description": "Sistem yöneticisi rolü ata",
@@ -833,7 +833,7 @@
   "admin.permissions.permission.manage_team.name": "Takımlar Yönetilebilsin",
   "admin.permissions.permission.manage_team_roles.description": "Bu seçenek etkinleştirildiğinde, takım rolleri yönetilebilir",
   "admin.permissions.permission.manage_team_roles.name": "Takım Rolleri Yönetilebilsin",
-  "admin.permissions.permission.manage_webhooks.description": "Bu seçenek etkinleştirildiğinde, gelen ve giden web bağlantıları eklenebilir, düzenlenebilir ve silinebilir",
+  "admin.permissions.permission.manage_webhooks.description": "Bu seçenek etkinleştirildiğinde, gelen ve giden web bağlantıları eklenebilir, düzenlenebilir ve silinebilir.",
   "admin.permissions.permission.manage_webhooks.name": "Web Bağlantıları Yönetilebilsin",
   "admin.permissions.permission.permanent_delete_user.description": "Bu seçenek etkinleştirildiğinde, kullanıcı kalıcı olarak silinebilir",
   "admin.permissions.permission.permanent_delete_user.name": "Kalıcı Olarak Kullanıcı Silinebilsin",
@@ -857,7 +857,7 @@
   "admin.permissions.permissionsSchemeSummary.deleting": "Siliniyor...",
   "admin.permissions.permissionsTree.description": "Açıklama",
   "admin.permissions.permissionsTree.permission": "İzin",
-  "admin.permissions.roles.all_users.name": "Tüm üyeler",
+  "admin.permissions.roles.all_users.name": "Tüm Üyeler",
   "admin.permissions.roles.channel_admin.name": "Kanal Yöneticisi",
   "admin.permissions.roles.channel_user.name": "Kanal Kullanıcısı",
   "admin.permissions.roles.system_admin.name": "Sistem Yöneticisi",
@@ -869,7 +869,7 @@
   "admin.permissions.systemScheme.allMembersTitle": "Tüm Üyeler",
   "admin.permissions.systemScheme.channelAdminsDescription": "Kanal oluşturucularına ve Kanal Yöneticiliğine yükseltilmiş diğer kullanıcılara verilmiş izinler.",
   "admin.permissions.systemScheme.channelAdminsTitle": "Kanal Yöneticileri",
-  "admin.permissions.systemScheme.introBanner": "Takım Yöneticileri, Kanal Yöneticileri ve diğer üyeler için varsayılan izinleri yapılandırın. Takım Değiştirme Şeması uygulanmış belirli takımlar dışında bu şema tüm takımlar tarafından devir alınır.",
+  "admin.permissions.systemScheme.introBanner": "Takım Yöneticileri, Kanal Yöneticileri ve diğer üyeler için varsayılan izinleri yapılandırın. Bu şema belirli takımlara uygulanan bir [Takım Değişiklik Şeması] (!https://about.mattermost.com/default-team-override-scheme) olmadıkça tüm takımlar tarafından devir alınır.",
   "admin.permissions.systemScheme.resetDefaultsButton": "Varsayılan Değerlere Sıfırla",
   "admin.permissions.systemScheme.resetDefaultsButtonModalBody": "Bu işlem bu sayfadaki tüm seçenekleri varsayılan değerlerine sıfırlar. Seçenekleri varsayılan değerlere sıfırlamak istediğinize emin misiniz?",
   "admin.permissions.systemScheme.resetDefaultsButtonModalTitle": "Varsayılan değerlere sıfırlansın mı?",
@@ -879,9 +879,9 @@
   "admin.permissions.systemScheme.teamAdminsDescription": "Takım oluşturucuları ve Takım Yöneticiliğine yükseltilmiş diğer kullanıcılara verilmiş izinler.",
   "admin.permissions.systemScheme.teamAdminsTitle": "Takım Yöneticileri",
   "admin.permissions.systemSchemeBannerButton": "Şemayı Düzenle",
-  "admin.permissions.systemSchemeBannerText": "Takım Değiştirme Şeması uygulanmamış takımlara uygulanacak varsayılan izinleri ayarlayın.",
+  "admin.permissions.systemSchemeBannerText": "Belirli takımlara uygulanan bir [Takım Değişiklik Şeması] (!https://about.mattermost.com/default-team-override-scheme) olmadıkça tüm takımlar tarafından devir alınacak varsayılan izinleri ayarlayın.",
   "admin.permissions.systemSchemeBannerTitle": "Sistem Şeması",
-  "admin.permissions.teamOverrideSchemesBannerText": "Belirli takımlar için Sistem Şeması dışında izinler verilmesi gerektiğinde bu seçeneği kullanın.",
+  "admin.permissions.teamOverrideSchemesBannerText": "Belirli takımlar için [Sistem Şeması](!https://about.mattermost.com/default-system-scheme) dışında izin ayrıcalıkları gerektiğinde kullanabilirsiniz.",
   "admin.permissions.teamOverrideSchemesInProgress": "Aktarım işlemi sürüyor: Görev sunucusu izin aktarımı işlemini tamamlayana kadar Takım Değişikliği Şemaları kullanılamaz. Ayrıntılı bilgi almak için {documentationLink} bağlantısına bakabilirsiniz.",
   "admin.permissions.teamOverrideSchemesNewButton": "Yeni Takım Değişikliği Şeması",
   "admin.permissions.teamOverrideSchemesNoJobsEnabled": "Aktarım işlemi bekliyor: Görev sunucusu izin aktarımı işlemini yürütüne kadar Takım Değişikliği Şemaları kullanılamaz. Görev sunucusu etkinleştirildiğinde görev otomatik olarak başlatılacak. Ayrıntılı bilgi almak için {documentationLink} bağlantısına bakabilirsiniz.",
@@ -889,7 +889,7 @@
   "admin.permissions.teamOverrideSchemesTitle": "Takım Değişikliği Şemaları",
   "admin.permissions.teamScheme": "Takım Şeması",
   "admin.permissions.teamScheme.addTeams": "Takım Ekle",
-  "admin.permissions.teamScheme.introBanner": "Takım Değişikliği Şemaları, belirli takımlardaki Takım Yöneticileri, Kanal Yöneticileri ve diğer üyeler için izinleri belirler. Belirli takımlar için <a href=\"/admin_console/permissions/system-scheme\">Sistem Şeması</a> dışında izinler verilmesi gerektiğinde bu seçeneği kullanın.",
+  "admin.permissions.teamScheme.introBanner": "Takım Yöneticileri, Kanal Yöneticileri ve belirli takımlardaki diğer üyeler için izinleri [Takım Değişiklik Şemaları](!https://about.mattermost.com/default-team-override-scheme) ile ayarlayın. Belirli takımlar için [Sistem Şeması](!https://about.mattermost.com/default-system-scheme) dışında izin ayrıcalıkları gerektiğinde kullanabilirsiniz.",
   "admin.permissions.teamScheme.noTeams": "Herhangi bir takım seçilmemiş. Lütfen bu listeye takımlar ekleyin.",
   "admin.permissions.teamScheme.removeTeam": "Sil",
   "admin.permissions.teamScheme.schemeDescriptionLabel": "Şema Açıklaması:",
@@ -991,6 +991,10 @@
   "admin.requestButton.loading": " Yükleniyor...",
   "admin.requestButton.requestFailure": "Sınama Başarısız: {error}",
   "admin.requestButton.requestSuccess": "Sınama Başarılı",
+  "admin.reset_email.cancel": "İptal",
+  "admin.reset_email.newEmail": "Yeni E-posta",
+  "admin.reset_email.reset": "Sıfırla",
+  "admin.reset_email.titleReset": "E-postayı Yeniden Gönder",
   "admin.reset_password.cancel": "İptal",
   "admin.reset_password.curentPassword": "Geçerli Parola",
   "admin.reset_password.missing_current": "Lütfen geçerli parolanızı yazın.",
@@ -1192,6 +1196,7 @@
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "DİĞER",
   "admin.sidebar.password": "Parola",
+  "admin.sidebar.permissions": "Gelişmiş İzinler",
   "admin.sidebar.plugins": "Uygulama Ekleri (Beta)",
   "admin.sidebar.plugins.configuration": "Ayarlar",
   "admin.sidebar.plugins.management": "Yönetim",
@@ -1330,6 +1335,7 @@
   "admin.user_item.member": "Üye",
   "admin.user_item.mfaNo": "<strong>ÇAKD</strong>: Hayır",
   "admin.user_item.mfaYes": "<strong>ÇAKD</strong>: Evet",
+  "admin.user_item.resetEmail": "E-postayı Yeniden Gönder",
   "admin.user_item.resetMfa": "ÇAKD Kaldırılsın",
   "admin.user_item.resetPwd": "Parolayı Sıfırla",
   "admin.user_item.revokeSessions": "Oturumları Kapat",
@@ -1758,8 +1764,8 @@
   "edit_post.edit": "{title} düzenle",
   "edit_post.editPost": "İletiyi düzenle...",
   "edit_post.save": "Kaydet",
-  "edit_post.time_limit_button.for_n_seconds": "⚙ {n} saniye için",
-  "edit_post.time_limit_button.no_limit": "⚙ her zaman",
+  "edit_post.time_limit_button.for_n_seconds": "{n} saniye için",
+  "edit_post.time_limit_button.no_limit": "Her zaman",
   "edit_post.time_limit_modal.description": "Ayarlanan zaman sınırı herhangi bir izin şemasındaki \"İleti Düzenleme\" iznine sahip tüm kullanıcılar için geçerli olur.",
   "edit_post.time_limit_modal.invalid_time_limit": "Zaman sınırı geçersiz",
   "edit_post.time_limit_modal.option_label_anytime": "Her zaman",
@@ -1955,7 +1961,7 @@
   "help.formatting.headings2Example": "Büyük Başlık\n-------------",
   "help.formatting.headingsExample": "## Büyük Başlık\n### Daha Küçük Başlık\n#### Daha da Küçük Başlık",
   "help.formatting.images": "## Satır Arası Görseller\n\nKöşeli parantez içindeki alt metinden sonra `!` yazarak satır arası görseller oluşturabilirsiniz. Bağlantıdan sonra tırnak içinde bağlantı üzerine gelinince görüntülenecek metni yazın.",
-  "help.formatting.imagesExample": "![alt text](link \"üzerine gelme metni\")\n\nve\n\n[![Build Status](https://travis-ci.org/mattermost/platform.svg?branch=master)](https://travis-ci.org/mattermost/platform) [![Github](https://assets-cdn.github.com/favicon.ico)](https://github.com/mattermost/platform)",
+  "help.formatting.imagesExample": "![alt text](link \"üzerine gelme metni\")\n\nve\n\n[![Yapım Durumu](https://travis-ci.org/mattermost/platform.svg?branch=master)](https://travis-ci.org/mattermost/platform) [![Github](https://assets-cdn.github.com/favicon.ico)](https://github.com/mattermost/platform)",
   "help.formatting.inline": "## Satır Arası Kodu\n\nSola yatık tırnak arasına alarak eş aralıklı yazı türü oluşturabilirsiniz.",
   "help.formatting.intro": "Kod imlerini kullanmak iletileri kolayca biçimlendirmenizi sağlar. İletiyi normal şekilde yazın ve özel olarak biçimlendirmek için bu kuralları kullanın.",
   "help.formatting.lines": "## Satırlar\n\n`*`, `_` ya da `-` kullanarak bir satır oluşturun.",
diff --git a/assets/base/i18n/zh-CN.json b/assets/base/i18n/zh-CN.json
index cb9acf5dd..c9b338c9f 100644
--- a/assets/base/i18n/zh-CN.json
+++ b/assets/base/i18n/zh-CN.json
@@ -772,7 +772,7 @@
   "admin.permissions.group.teams.description": "创建团队和管理成员。",
   "admin.permissions.group.teams.name": "团队",
   "admin.permissions.inherited_from": "从<a>{name}</a>继承",
-  "admin.permissions.introBanner": "设定团队管理员、频道管理员以及其他人的默认权限的权限方案。详情参阅文档。",
+  "admin.permissions.introBanner": "Permission Schemes set the default permissions for Team Admins, Channel Admins and everyone else. Learn more about permission schemes in our [documentation](!https://about.mattermost.com/default-advanced-permissions).",
   "admin.permissions.loadMoreSchemes": "加载更多方案",
   "admin.permissions.loadingMoreSchemes": "加载中...",
   "admin.permissions.permission.assign_system_admin_role.description": "指派系统管理员角色",
@@ -869,7 +869,7 @@
   "admin.permissions.systemScheme.allMembersTitle": "所有成员",
   "admin.permissions.systemScheme.channelAdminsDescription": "已给予权限至频道创建者以及任何频道管理员。",
   "admin.permissions.systemScheme.channelAdminsTitle": "频道管理员",
-  "admin.permissions.systemScheme.introBanner": "设定团队管理员、频道管理员以及其他成员的默认权限。此方案将被所有团队继承除非团队覆盖方案已设定。",
+  "admin.permissions.systemScheme.introBanner": "Configure the default permissions for Team Admins, Channel Admins and other members. This scheme is inherited by all teams unless a [Team Override Scheme](!https://about.mattermost.com/default-team-override-scheme) is applied in specific teams.",
   "admin.permissions.systemScheme.resetDefaultsButton": "重置至默认",
   "admin.permissions.systemScheme.resetDefaultsButtonModalBody": "这将重置此页面的所有选择。您确定要重置吗？",
   "admin.permissions.systemScheme.resetDefaultsButtonModalTitle": "重置至默认？",
@@ -879,9 +879,9 @@
   "admin.permissions.systemScheme.teamAdminsDescription": "已给予权限至频道创建者以及任何频道管理员。",
   "admin.permissions.systemScheme.teamAdminsTitle": "团读管理员",
   "admin.permissions.systemSchemeBannerButton": "编辑方案",
-  "admin.permissions.systemSchemeBannerText": "设定将被所有团队继承的默认权限除非团队覆盖方案已设定。",
+  "admin.permissions.systemSchemeBannerText": "Set the default permissions inherited by all teams unless a [Team Override Scheme](!https://about.mattermost.com/default-team-override-scheme) is applied.",
   "admin.permissions.systemSchemeBannerTitle": "系统方案",
-  "admin.permissions.teamOverrideSchemesBannerText": "当指定团队需要系统方案特例时使用。",
+  "admin.permissions.teamOverrideSchemesBannerText": "Use when specific teams need permission exceptions to the [System Scheme](!https://about.mattermost.com/default-system-scheme).",
   "admin.permissions.teamOverrideSchemesInProgress": "数据转移任务进行中：团队覆盖方案在任务服务器完成转移权限前不可用。参阅 {documentationLink} 了解详情。",
   "admin.permissions.teamOverrideSchemesNewButton": "新团队覆盖方案",
   "admin.permissions.teamOverrideSchemesNoJobsEnabled": "数据转移任务暂停中：团队覆盖方案在任务服务器可以转移权限前不可用。任务将在任务服务器开启后自动开始运行。参阅 {documentationLink} 了解详情。",
@@ -889,7 +889,7 @@
   "admin.permissions.teamOverrideSchemesTitle": "团队覆盖方案",
   "admin.permissions.teamScheme": "团队方案",
   "admin.permissions.teamScheme.addTeams": "团加团队",
-  "admin.permissions.teamScheme.introBanner": "团队覆盖方案设定权限到团队管理员、频道管理员以及其他指定团队的成员。使用团队覆盖方案当指定的团队需要<a href=\"/admin_console/permissions/system-scheme\">系统方案</a>权限特例。",
+  "admin.permissions.teamScheme.introBanner": "[Team Override Schemes](!https://about.mattermost.com/default-team-override-scheme) set the permissions for Team Admins, Channel Admins and other members in specific teams. Use a Team Override Scheme when specific teams need permission exceptions to the [System Scheme](!https://about.mattermost.com/default-system-scheme).",
   "admin.permissions.teamScheme.noTeams": "未选择团队。请添加团队到此列表。",
   "admin.permissions.teamScheme.removeTeam": "移除",
   "admin.permissions.teamScheme.schemeDescriptionLabel": "方案描述：",
@@ -991,6 +991,10 @@
   "admin.requestButton.loading": " 加载中...",
   "admin.requestButton.requestFailure": "测试失败：{error}",
   "admin.requestButton.requestSuccess": "测试成功",
+  "admin.reset_email.cancel": "取消",
+  "admin.reset_email.newEmail": "新建邮箱地址",
+  "admin.reset_email.reset": "复位",
+  "admin.reset_email.titleReset": "发送电子邮件",
   "admin.reset_password.cancel": "取消",
   "admin.reset_password.curentPassword": "当前密码",
   "admin.reset_password.missing_current": "请输入您当前密码。",
@@ -1192,6 +1196,7 @@
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "其他",
   "admin.sidebar.password": "密码",
+  "admin.sidebar.permissions": "高级权限",
   "admin.sidebar.plugins": "插件 (Beta)",
   "admin.sidebar.plugins.configuration": "配置",
   "admin.sidebar.plugins.management": "管理",
@@ -1330,6 +1335,7 @@
   "admin.user_item.member": "成员",
   "admin.user_item.mfaNo": "<strong>多重验证</strong>：否",
   "admin.user_item.mfaYes": "<strong>多重验证</strong>：是",
+  "admin.user_item.resetEmail": "发送电子邮件",
   "admin.user_item.resetMfa": "移除多重验证",
   "admin.user_item.resetPwd": "重置密码",
   "admin.user_item.revokeSessions": "吊销会话",
@@ -1759,7 +1765,7 @@
   "edit_post.editPost": "编辑信息...",
   "edit_post.save": "保存",
   "edit_post.time_limit_button.for_n_seconds": "⚙ {n} 秒",
-  "edit_post.time_limit_button.no_limit": "⚙ 随时",
+  "edit_post.time_limit_button.no_limit": "随时",
   "edit_post.time_limit_modal.description": "设定时限将应用到任何拥有 \"编辑消息\" 权限的权限方案的用户。",
   "edit_post.time_limit_modal.invalid_time_limit": "无效的时间限制",
   "edit_post.time_limit_modal.option_label_anytime": "随时",
diff --git a/assets/base/i18n/zh-TW.json b/assets/base/i18n/zh-TW.json
index 03e6b13d4..3d05bbb00 100644
--- a/assets/base/i18n/zh-TW.json
+++ b/assets/base/i18n/zh-TW.json
@@ -772,7 +772,7 @@
   "admin.permissions.group.teams.description": "建立團隊與管理成員。",
   "admin.permissions.group.teams.name": "團隊",
   "admin.permissions.inherited_from": "繼承自<a>{name}</a>",
-  "admin.permissions.introBanner": "權限配置為團隊管理員、頻道管理員以及其他人設定預設權限。詳情請參閱文件。",
+  "admin.permissions.introBanner": "Permission Schemes set the default permissions for Team Admins, Channel Admins and everyone else. Learn more about permission schemes in our [documentation](!https://about.mattermost.com/default-advanced-permissions).",
   "admin.permissions.loadMoreSchemes": "讀取更多配置",
   "admin.permissions.loadingMoreSchemes": "載入中…",
   "admin.permissions.permission.assign_system_admin_role.description": "指派系統管理員角色",
@@ -869,7 +869,7 @@
   "admin.permissions.systemScheme.allMembersTitle": "全體成員",
   "admin.permissions.systemScheme.channelAdminsDescription": "授予頻道建立者以及頻道管理員的權限。",
   "admin.permissions.systemScheme.channelAdminsTitle": "頻道管理員",
-  "admin.permissions.systemScheme.introBanner": "設定團隊、頻道管理員以及其他成員的預設權限。此設定將被所有的團隊承襲，除非該團隊有使用團隊覆蓋配置。",
+  "admin.permissions.systemScheme.introBanner": "Configure the default permissions for Team Admins, Channel Admins and other members. This scheme is inherited by all teams unless a [Team Override Scheme](!https://about.mattermost.com/default-team-override-scheme) is applied in specific teams.",
   "admin.permissions.systemScheme.resetDefaultsButton": "重置為預設值",
   "admin.permissions.systemScheme.resetDefaultsButtonModalBody": "在此頁所有被選取的將被重置回預設值。請確認要重置。",
   "admin.permissions.systemScheme.resetDefaultsButtonModalTitle": "重置為預設值？",
@@ -879,9 +879,9 @@
   "admin.permissions.systemScheme.teamAdminsDescription": "授予團隊建立者以及團隊管理員的權限。",
   "admin.permissions.systemScheme.teamAdminsTitle": "團隊管理員",
   "admin.permissions.systemSchemeBannerButton": "編輯配置",
-  "admin.permissions.systemSchemeBannerText": "設定預設權限，其將被所有的團隊承襲，除非該團隊有使用團隊覆蓋配置。",
+  "admin.permissions.systemSchemeBannerText": "Set the default permissions inherited by all teams unless a [Team Override Scheme](!https://about.mattermost.com/default-team-override-scheme) is applied.",
   "admin.permissions.systemSchemeBannerTitle": "系統配置",
-  "admin.permissions.teamOverrideSchemesBannerText": "當特定團隊需要系統配置的權限特例時使用。",
+  "admin.permissions.teamOverrideSchemesBannerText": "Use when specific teams need permission exceptions to the [System Scheme](!https://about.mattermost.com/default-system-scheme).",
   "admin.permissions.teamOverrideSchemesInProgress": "移轉工作執行中：在權限移轉完成前無法使用團隊覆蓋配置。詳情請參閱{documentationLink}。",
   "admin.permissions.teamOverrideSchemesNewButton": "新團隊覆蓋配置",
   "admin.permissions.teamOverrideSchemesNoJobsEnabled": "移轉工作暫停中：在工作伺服器可以執行權限移轉前無法使用團隊覆蓋配置。此工作將會在啟用工作伺服器時自動開始。詳情請參閱{documentationLink}。",
@@ -889,7 +889,7 @@
   "admin.permissions.teamOverrideSchemesTitle": "團隊覆蓋配置",
   "admin.permissions.teamScheme": "團隊配置",
   "admin.permissions.teamScheme.addTeams": "新增團隊",
-  "admin.permissions.teamScheme.introBanner": "團隊覆蓋配置設定特定團隊當中的團隊、頻道管理員以及其他成員的權限。當特定團隊需要<a href=\"/admin_console/permissions/system-scheme\">系統配置</a>的權限特例時使用。 ",
+  "admin.permissions.teamScheme.introBanner": "[Team Override Schemes](!https://about.mattermost.com/default-team-override-scheme) set the permissions for Team Admins, Channel Admins and other members in specific teams. Use a Team Override Scheme when specific teams need permission exceptions to the [System Scheme](!https://about.mattermost.com/default-system-scheme).",
   "admin.permissions.teamScheme.noTeams": "尚未選取團隊。請新增團隊至此列表。",
   "admin.permissions.teamScheme.removeTeam": "移除",
   "admin.permissions.teamScheme.schemeDescriptionLabel": "配置敘述：",
@@ -991,6 +991,10 @@
   "admin.requestButton.loading": " 載入中...",
   "admin.requestButton.requestFailure": "測試失敗：{error}",
   "admin.requestButton.requestSuccess": "測試成功",
+  "admin.reset_email.cancel": "取消",
+  "admin.reset_email.newEmail": "新的電子郵件",
+  "admin.reset_email.reset": "重置",
+  "admin.reset_email.titleReset": "重新發送電子郵件",
   "admin.reset_password.cancel": "取消",
   "admin.reset_password.curentPassword": "目前的密碼",
   "admin.reset_password.missing_current": "請輸入目前的密碼。",
@@ -1192,6 +1196,7 @@
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "其它",
   "admin.sidebar.password": "密碼",
+  "admin.sidebar.permissions": "Advanced Permissions",
   "admin.sidebar.plugins": "模組 (Beta)",
   "admin.sidebar.plugins.configuration": "設定",
   "admin.sidebar.plugins.management": "管理",
@@ -1330,6 +1335,7 @@
   "admin.user_item.member": "成員",
   "admin.user_item.mfaNo": "<strong>多重要素驗證</strong>：無",
   "admin.user_item.mfaYes": "<strong>多重要素驗證</strong>：是",
+  "admin.user_item.resetEmail": "重新發送電子郵件",
   "admin.user_item.resetMfa": "移除多重要素驗證",
   "admin.user_item.resetPwd": "重置我的密碼",
   "admin.user_item.revokeSessions": "撤銷工作階段",
@@ -1759,7 +1765,7 @@
   "edit_post.editPost": "修改訊息...",
   "edit_post.save": "儲存",
   "edit_post.time_limit_button.for_n_seconds": "⚙ 保留{n}秒",
-  "edit_post.time_limit_button.no_limit": "⚙ 任何時間",
+  "edit_post.time_limit_button.no_limit": "任何時間",
   "edit_post.time_limit_modal.description": "對在任意權限配置當中擁有編輯訊息權限的所有使用者設定時間限制。",
   "edit_post.time_limit_modal.invalid_time_limit": "無效的時間限制",
   "edit_post.time_limit_modal.option_label_anytime": "任何時間",