MM-10617 Fixed checking if a link is an image

translations PR 20180430 (#1648 )
2018-05-17 14:59:14 -04:00 · 2018-05-01 10:16:21 -03:00
15 changed files with 595 additions and 92 deletions
--- a/app/utils/url.js
+++ b/app/utils/url.js
@@ -3,8 +3,9 @@

 import {latinise} from './latinise.js';

+import {Files} from 'mattermost-redux/constants';
+
 const ytRegex = /(?:http|https):\/\/(?:www\.|m\.)?(?:(?:youtube\.com\/(?:(?:v\/)|(?:(?:watch|embed\/watch)(?:\/|.*v=))|(?:embed\/)|(?:user\/[^/]+\/u\/[0-9]\/)))|(?:youtu\.be\/))([^#&?]*)/;
-const imgRegex = /.+\/(.+\.(?:jpg|gif|bmp|png|jpeg))(?:\?.*)?$/i;

 export function isValidUrl(url = '') {
    const regex = /^https?:\/\//i;
@@ -42,8 +43,20 @@ export function isYoutubeLink(link) {
 }

 export function isImageLink(link) {
-    const match = link.trim().match(imgRegex);
-    return Boolean(match && match[1]);
+    let linkWithoutQuery = link;
+    if (link.indexOf('?') !== -1) {
+        linkWithoutQuery = linkWithoutQuery.split('?')[0];
+    }
+
+    for (let i = 0; i < Files.IMAGE_TYPES.length; i++) {
+        const imageType = Files.IMAGE_TYPES[i];
+
+        if (linkWithoutQuery.endsWith('.' + imageType) || linkWithoutQuery.endsWith('=' + imageType)) {
+            return true;
+        }
+    }
+
+    return false;
 }

 // Converts the protocol of a link (eg. http, ftp) to be lower case since
--- a/assets/base/i18n/de.json
+++ b/assets/base/i18n/de.json
@@ -436,6 +436,27 @@
  "admin.email.smtpUsernameTitle": "SMTP-Server-Benutzername:",
  "admin.email.testing": "Überprüfen...",
  "admin.false": "falsch",
+  "admin.field_names.allowBannerDismissal": "Allow banner dismissal",
+  "admin.field_names.bannerColor": "Banner color",
+  "admin.field_names.bannerText": "Banner text",
+  "admin.field_names.bannerTextColor": "Banner text color",
+  "admin.field_names.enableBanner": "Enable Announcement banner",
+  "admin.field_names.enableCommands": "Enable Custom Slash Commands",
+  "admin.field_names.enableConfirmNotificationsToChannel": "Show @channel and @all confirmation dialog",
+  "admin.field_names.enableIncomingWebhooks": "Enable Incomming Webhooks",
+  "admin.field_names.enableOAuthServiceProvider": "Enable OAuth 2.0 Service Provider",
+  "admin.field_names.enableOutgoingWebhooks": "Enable Outgoing Webhooks",
+  "admin.field_names.enablePostIconOverride": "Enable integrations to override profile picture icons",
+  "admin.field_names.enablePostUsernameOverride": "Enable integrations to override usernames",
+  "admin.field_names.enableUserAccessTokens": "Enable Personal Access Tokens",
+  "admin.field_names.enableUserCreation": "Enable Account Creation",
+  "admin.field_names.maxChannelsPerTeam": "Max Channels Per Team",
+  "admin.field_names.maxNotificationsPerChannel": "Max Notifications Per Channel",
+  "admin.field_names.maxUsersPerTeam": "Max Users Per Team",
+  "admin.field_names.postEditTimeLimit": "Edit post time limit",
+  "admin.field_names.restrictCreationToDomains": "Restrict account creation to specified email domains",
+  "admin.field_names.restrictDirectMessage": "Enable users to open Direct Message channels with",
+  "admin.field_names.teammateNameDisplay": "Teammate Name Display",
  "admin.file.enableFileAttachments": "Dateiaustausch erlauben:",
  "admin.file.enableFileAttachmentsDesc": "Wenn falsch, wird der Dateiaustausch auf dem Server deaktiviert. Alle Datei- und Bild-Uploads sind über alle Clients hinweg, inklusive Mobilgeräten, verboten.",
  "admin.file.enableMobileDownloadDesc": "Wenn falsch, werden Datei-Downloads in mobilen Apps deaktiviert. Benutzer können immer noch Dateien über einen mobilen Browser herunterladen.",
@@ -1252,6 +1273,7 @@
  "api.channel.delete_channel.archived": "{username} hat den Kanal archiviert.",
  "api.channel.join_channel.post_and_forget": "{username} ist dem Kanal beigetreten.",
  "api.channel.leave.left": "{username} hat den Kanal verlassen.",
+  "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} hat den Kanalanzeigenamen aktualisiert von: {old} auf: {new}",
  "api.channel.post_update_channel_header_message_and_forget.removed": "{username} hat die Kanalüberschrift entfernt (war: {old})",
  "api.channel.post_update_channel_header_message_and_forget.updated_from": "{username} hat die Kanalüberschrift aktualisiert von: {old} auf: {new}",
@@ -1356,6 +1378,7 @@
  "channel_header.addToFavorites": "Zu Favoriten hinzufügen",
  "channel_header.channelHeader": "Kanalüberschrift bearbeiten",
  "channel_header.channelMembers": "Mitglieder",
+  "channel_header.convert": "Convert to Private Channel",
  "channel_header.delete": "Kanal löschen",
  "channel_header.directchannel.you": "{displayname} (Sie) ",
  "channel_header.flagged": "Markierte Nachrichten",
@@ -1486,6 +1509,12 @@
  "claim.oauth_to_email.title": "Von {type}-Konto auf E-Mail wechseln",
  "confirm_modal.cancel": "Abbrechen",
  "connecting_screen": "Verbindung wird aufgebaut",
+  "convert_channel.cancel": "No, cancel",
+  "convert_channel.confirm": "Yes, convert to private channel",
+  "convert_channel.question1": "When you convert <strong>{display_name}</strong> to a private channel, history and membership are preserved. Publicly shared files remain accessible to anyone with the link. Membership in a private channel is by invitation only.",
+  "convert_channel.question2": "The change is permanent and cannot be undone.",
+  "convert_channel.question3": "Are you sure you want to convert <strong>{display_name}</strong> to a private channel?",
+  "convert_channel.title": "Convert {display_name} to a private channel?",
  "copy_url_context_menu.getChannelLink": "Link kopieren",
  "create_comment.addComment": "Kommentar hinzufügen...",
  "create_comment.comment": "Kommentar hinzufügen",
@@ -1600,6 +1629,7 @@
  "emoji_picker.search": "Suche",
  "emoji_picker.searchResults": "Suchergebnisse",
  "emoji_picker.symbols": "Symbole",
+  "ent.cluster.save_config_with_roles.error": "The following configuration settings cannot be saved when High Availability is enabled and the System Console is in read-only mode: {keys}.",
  "error.generic.link": "Zurück zu {siteName}",
  "error.generic.link_message": "Zurück zu {siteName}",
  "error.generic.message": "Ein Fehler ist aufgetreten.",
@@ -2509,6 +2539,7 @@
  "setting_picture.cancel": "Abbrechen",
  "setting_picture.help.profile": "Ein Bild im BMP, JPG oder PNG-Format hochladen.",
  "setting_picture.help.team": "Laden Sie ein Teamsymbol im BMP-, JPG oder PNG-Format hoch.",
+  "setting_picture.remove": "Remove this icon",
  "setting_picture.save": "Speichern",
  "setting_picture.select": "Auswählen",
  "setting_upload.import": "Importieren",
@@ -2668,6 +2699,10 @@
  "suggestion.mention.unread.channels": "Ungelesene Kanäle",
  "suggestion.search.private": "Private Kanäle",
  "suggestion.search.public": "Öffentliche Kanäle",
+  "system_notice.body.api3": "If you’ve created or installed integrations in the last two years, find out how <a href=\"https://about.mattermost.com/default-apiv3-deprecation-guide\" target=\"_blank\">upcoming changes</a> may affect them.",
+  "system_notice.dont_show": "Don't show again",
+  "system_notice.remind_me": "Remind me later",
+  "system_notice.title": "<strong>System Message</strong><br>from Mattermost",
  "system_users_list.count": "{count, number} {count, plural, one {Benutzer} other {Benutzer}}",
  "system_users_list.countPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 Mitglieder} one {Mitglied} other {Mitglieder}} von {total, number} insgesamt",
  "system_users_list.countSearch": "{count, number} {count, plural, one {Benutzer} other {Benutzer}} von {total, number} total",
@@ -2933,7 +2968,7 @@
  "user.settings.notifications.desktop.title": "Desktop-Benachrichtigungen",
  "user.settings.notifications.desktop.unlimited": "Unbegrenzt",
  "user.settings.notifications.desktopSounds": "Töne der Desktop-Benachrichtigungen",
-  "user.settings.notifications.email.disabled": "Deaktiviert durch den Systemadministrator",
+  "user.settings.notifications.email.disabled": "Email notifications are not enabled",
  "user.settings.notifications.email.disabled_long": "E-Mail-Benachrichtigungen wurden vom Systemadministrator deaktiviert.",
  "user.settings.notifications.email.everyHour": "Jede Stunde",
  "user.settings.notifications.email.everyXMinutes": "{count, plural, one {Jede Minute} other {Alle {count, number} Minuten}}",
@@ -2966,8 +3001,8 @@
  "user.settings.push_notification.allActivityOffline": "Für alle Aktivitäten wenn offline",
  "user.settings.push_notification.allActivityOnline": "Für alle Aktivitäten wenn online, abwesend oder offline",
  "user.settings.push_notification.away": "Abwesend oder offline",
-  "user.settings.push_notification.disabled": "Deaktiviert durch den Systemadministrator",
-  "user.settings.push_notification.disabled_long": "Push-Benachrichtigungen sind nicht aktiviert. Kontaktieren Sie ihren Systemadministrator.",
+  "user.settings.push_notification.disabled": "Push notifications are not enabled",
+  "user.settings.push_notification.disabled_long": "E-Mail-Benachrichtigungen wurden vom Systemadministrator deaktiviert.",
  "user.settings.push_notification.info": "Benachrichtigungen werden zu Ihrem Smartphone gesendet, sobald es in Mattermost eine neue Benachrichtigung gibt.",
  "user.settings.push_notification.off": "Aus",
  "user.settings.push_notification.offline": "Offline",
--- a/assets/base/i18n/en.json
+++ b/assets/base/i18n/en.json
@@ -436,6 +436,27 @@
  "admin.email.smtpUsernameTitle": "SMTP Server Username:",
  "admin.email.testing": "Testing...",
  "admin.false": "false",
+  "admin.field_names.allowBannerDismissal": "Allow banner dismissal",
+  "admin.field_names.bannerColor": "Banner color",
+  "admin.field_names.bannerText": "Banner text",
+  "admin.field_names.bannerTextColor": "Banner text color",
+  "admin.field_names.enableBanner": "Enable Announcement banner",
+  "admin.field_names.enableCommands": "Enable Custom Slash Commands",
+  "admin.field_names.enableConfirmNotificationsToChannel": "Show @channel and @all confirmation dialog",
+  "admin.field_names.enableIncomingWebhooks": "Enable Incomming Webhooks",
+  "admin.field_names.enableOAuthServiceProvider": "Enable OAuth 2.0 Service Provider",
+  "admin.field_names.enableOutgoingWebhooks": "Enable Outgoing Webhooks",
+  "admin.field_names.enablePostIconOverride": "Enable integrations to override profile picture icons",
+  "admin.field_names.enablePostUsernameOverride": "Enable integrations to override usernames",
+  "admin.field_names.enableUserAccessTokens": "Enable Personal Access Tokens",
+  "admin.field_names.enableUserCreation": "Enable Account Creation",
+  "admin.field_names.maxChannelsPerTeam": "Max Channels Per Team",
+  "admin.field_names.maxNotificationsPerChannel": "Max Notifications Per Channel",
+  "admin.field_names.maxUsersPerTeam": "Max Users Per Team",
+  "admin.field_names.postEditTimeLimit": "Edit post time limit",
+  "admin.field_names.restrictCreationToDomains": "Restrict account creation to specified email domains",
+  "admin.field_names.restrictDirectMessage": "Enable users to open Direct Message channels with",
+  "admin.field_names.teammateNameDisplay": "Teammate Name Display",
  "admin.file.enableFileAttachments": "Allow File Sharing:",
  "admin.file.enableFileAttachmentsDesc": "When false, disables file sharing on the server. All file and image uploads on messages are forbidden across clients and devices, including mobile.",
  "admin.file.enableMobileDownloadDesc": "When false, disables file downloads on mobile apps. Users can still download files from a mobile web browser.",
@@ -1252,6 +1273,7 @@
  "api.channel.delete_channel.archived": "{username} archived the channel.",
  "api.channel.join_channel.post_and_forget": "{username} joined the channel.",
  "api.channel.leave.left": "{username} left the channel.",
+  "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} updated the channel display name from: {old} to: {new}",
  "api.channel.post_update_channel_header_message_and_forget.removed": "{username} removed the channel header (was: {old})",
  "api.channel.post_update_channel_header_message_and_forget.updated_from": "{username} updated the channel header from: {old} to: {new}",
@@ -1356,6 +1378,7 @@
  "channel_header.addToFavorites": "Add to Favorites",
  "channel_header.channelHeader": "Edit Channel Header",
  "channel_header.channelMembers": "Members",
+  "channel_header.convert": "Convert to Private Channel",
  "channel_header.delete": "Delete Channel",
  "channel_header.directchannel.you": "{displayname} (you) ",
  "channel_header.flagged": "Flagged Posts",
@@ -1486,6 +1509,12 @@
  "claim.oauth_to_email.title": "Switch {type} Account to Email",
  "confirm_modal.cancel": "Cancel",
  "connecting_screen": "Connecting",
+  "convert_channel.cancel": "No, cancel",
+  "convert_channel.confirm": "Yes, convert to private channel",
+  "convert_channel.question1": "When you convert <strong>{display_name}</strong> to a private channel, history and membership are preserved. Publicly shared files remain accessible to anyone with the link. Membership in a private channel is by invitation only.",
+  "convert_channel.question2": "The change is permanent and cannot be undone.",
+  "convert_channel.question3": "Are you sure you want to convert <strong>{display_name}</strong> to a private channel?",
+  "convert_channel.title": "Convert {display_name} to a private channel?",
  "copy_url_context_menu.getChannelLink": "Copy Link",
  "create_comment.addComment": "Add a comment...",
  "create_comment.comment": "Add Comment",
@@ -1600,6 +1629,7 @@
  "emoji_picker.search": "Search",
  "emoji_picker.searchResults": "Search Results",
  "emoji_picker.symbols": "Symbols",
+  "ent.cluster.save_config_with_roles.error": "The following configuration settings cannot be saved when High Availability is enabled and the System Console is in read-only mode: {keys}.",
  "error.generic.link": "Back to {siteName}",
  "error.generic.link_message": "Back to {siteName}",
  "error.generic.message": "An error has occurred.",
@@ -2508,7 +2538,8 @@
  "setting_item_min.edit": "Edit",
  "setting_picture.cancel": "Cancel",
  "setting_picture.help.profile": "Upload a picture in BMP, JPG or PNG format.",
-  "setting_picture.help.team": "Upload a team icon in BMP, JPG or PNG format.",
+  "setting_picture.help.team": "Upload a team icon in BMP, JPG or PNG format.<br>Square images with a solid background color are recommended.",
+  "setting_picture.remove": "Remove this icon",
  "setting_picture.save": "Save",
  "setting_picture.select": "Select",
  "setting_upload.import": "Import",
@@ -2668,6 +2699,10 @@
  "suggestion.mention.unread.channels": "Unread Channels",
  "suggestion.search.private": "Private Channels",
  "suggestion.search.public": "Public Channels",
+  "system_notice.body.api3": "If you’ve created or installed integrations in the last two years, find out how <a href=\"https://about.mattermost.com/default-apiv3-deprecation-guide\" target=\"_blank\">upcoming changes</a> may affect them.",
+  "system_notice.dont_show": "Don't show again",
+  "system_notice.remind_me": "Remind me later",
+  "system_notice.title": "<strong>System Message</strong><br>from Mattermost",
  "system_users_list.count": "{count, number} {count, plural, one {user} other {users}}",
  "system_users_list.countPage": "{startCount, number} - {endCount, number} {count, plural, one {user} other {users}} of {total, number} total",
  "system_users_list.countSearch": "{count, number} {count, plural, one {user} other {users}} of {total, number} total",
@@ -2933,8 +2968,8 @@
  "user.settings.notifications.desktop.title": "Desktop notifications",
  "user.settings.notifications.desktop.unlimited": "Unlimited",
  "user.settings.notifications.desktopSounds": "Desktop notification sounds",
-  "user.settings.notifications.email.disabled": "Disabled by System Administrator",
-  "user.settings.notifications.email.disabled_long": "Email notifications have been disabled by your System Administrator.",
+  "user.settings.notifications.email.disabled": "Email notifications are not enabled",
+  "user.settings.notifications.email.disabled_long": "Email notifications have not been enabled by your System Administrator.",
  "user.settings.notifications.email.everyHour": "Every hour",
  "user.settings.notifications.email.everyXMinutes": "Every {count, plural, one {minute} other {{count, number} minutes}}",
  "user.settings.notifications.email.immediately": "Immediately",
@@ -2966,8 +3001,8 @@
  "user.settings.push_notification.allActivityOffline": "For all activity when offline",
  "user.settings.push_notification.allActivityOnline": "For all activity when online, away or offline",
  "user.settings.push_notification.away": "Away or offline",
-  "user.settings.push_notification.disabled": "Disabled by System Administrator",
-  "user.settings.push_notification.disabled_long": "Push Notifications are not enabled. Contact your System Administrator.",
+  "user.settings.push_notification.disabled": "Push notifications are not enabled",
+  "user.settings.push_notification.disabled_long": "Push notifications have not been enabled by your System Administrator.",
  "user.settings.push_notification.info": "Notification alerts are pushed to your mobile device when there is activity in Mattermost.",
  "user.settings.push_notification.off": "Off",
  "user.settings.push_notification.offline": "Offline",
--- a/assets/base/i18n/es.json
+++ b/assets/base/i18n/es.json
@@ -362,7 +362,7 @@
  "admin.elasticsearch.usernameDescription": "(Opcional) El nombre de usuario para autenticarse en el servidor de Elasticsearch.",
  "admin.elasticsearch.usernameExample": "Ej.: \"elastic\"",
  "admin.elasticsearch.usernameTitle": "Nombre de usuario del Servidor:",
-  "admin.email.agreeHPNS": " Comprendo y acepto los <a href=\"https://about.mattermost.com/hpns-terms/\" target='_blank'>Términos de Servicio</a> y <a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">Políticas de Privacidad</a> del Servicio Alojado de Notificaciones Push de Mattermost.",
+  "admin.email.agreeHPNS": " Comprendo y acepto los <a href=\"https://about.mattermost.com/hpns-terms/\" target='_blank'>Términos de Servicio</a> y <a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">Políticas de Privacidad</a> del Servicio Alojado de Notificaciones a Dispositivos Móviles de Mattermost.",
  "admin.email.allowEmailSignInDescription": "Cuando es verdadero, Mattermost permite a los usuarios iniciar sesión utilizando el correo electrónico y contraseña.",
  "admin.email.allowEmailSignInTitle": "Habilitar el inicio de sesión con el correo electrónico: ",
  "admin.email.allowSignupDescription": "Cuando es en verdadero, Mattermost permite la creación de equipos y cuentas utilizando el correo electrónico y contraseña.  Este valor debe estar en falso sólo cuando quieres limitar el inicio de sesión a través de servicios tipo AD/LDAP, SAML o GitLab.",
@@ -408,18 +408,18 @@
  "admin.email.passwordSaltDescription": "Un salt de 32-caracteres es añadido a la firma de correos para restablecer la contraseña. Aleatoriamente generado en la instalación. Haz clic en \"Regenerar\" para crear un nuevo salt.",
  "admin.email.passwordSaltExample": "Ej.: \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
  "admin.email.passwordSaltTitle": "Resetear el Salt para las contraseñas:",
-  "admin.email.pushContentDesc": "\"Enviar descripción genérica con sólo el nombre del remitente\" incluye únicamente el nombre de la persona que envió el mensaje en la notificación push, sin información del nombre del canal o contenido del mensaje. <br /><br />\"Enviar descripción genérica con el nombre de usuario y canal\" incluye en nombre de la persona que envió el mensaje y en que canal fue enviado, pero no incluye el texto del mensaje.<br /><br />\"Enviar el mensaje completo\" incluye un extracto del mensaje en la notificación push, el cual puede contener información confidencial enviada en el mensaje. Si tu Servicio de Notificaciones Push está fuera de tu cortafuegos, es *Altamente recomendado* que está opción sea utilizada bajo el protocolo \"https\" para cifrar la conexión.",
+  "admin.email.pushContentDesc": "\"Enviar descripción genérica con sólo el nombre del remitente\" incluye únicamente el nombre de la persona que envió el mensaje en la notificación a los dispositivos móviles, sin información del nombre del canal o contenido del mensaje. <br /><br />\"Enviar descripción genérica con el nombre de usuario y canal\" incluye en nombre de la persona que envió el mensaje y en que canal fue enviado, pero no incluye el texto del mensaje.<br /><br />\"Enviar el mensaje completo\" incluye un extracto del mensaje en la notificación a los dispositivos móviles, el cual puede contener información confidencial enviada en el mensaje. Si tu Servicio de Notificaciones a Dispositivos Móviles está fuera de tu cortafuegos, es *Altamente recomendado* que está opción sea utilizada bajo el protocolo \"https\" para cifrar la conexión.",
  "admin.email.pushContentTitle": "Contenido de las Notificaciones:",
  "admin.email.pushDesc": "Normalmente se asigna como verdadero en producción. Cuando está en verdadero, Mattermost intenta enviar notificaciones a dispositivos iOS y Android a través del servidor de notificaciones.",
-  "admin.email.pushOff": "No enviar notificaciones push",
-  "admin.email.pushOffHelp": "Por favor revisa la <a href=\"https://about.mattermost.com/default-mobile-push-notifications\" target='_blank'>documentación sobre notificaciones push</a> para conocer sobre las opciones de configuración.",
-  "admin.email.pushServerDesc": "Ubicación del servicio de notificaciones push de Mattermost, puedes ubicarlo detras de un cortafuego utilizando https://github.com/mattermost/push-proxy. Para realizar pruebas puedes utilizar https://push-test.mattermost.com, el cual conecta con la ap de ejemplo de Mattermost en iOS publicada en el Apple AppStore. Por favor no utilices este servicio en producción.",
+  "admin.email.pushOff": "No enviar notificaciones a dispositivos móviles",
+  "admin.email.pushOffHelp": "Por favor revisa la <a href=\"https://about.mattermost.com/default-mobile-push-notifications\" target='_blank'>documentación sobre notificaciones a dispositivos móviles</a> para conocer sobre las opciones de configuración.",
+  "admin.email.pushServerDesc": "Ubicación del servicio de notificaciones a dispositivos móviles de Mattermost, puedes ubicarlo detrás de un cortafuego utilizando https://github.com/mattermost/push-proxy. Para realizar pruebas puedes utilizar https://push-test.mattermost.com, el cual conecta con la app de ejemplo de Mattermost en iOS publicada en el Apple AppStore. Por favor no utilices este servicio en producción.",
  "admin.email.pushServerEx": "Ej.: \"https://push-test.mattermost.com\"",
  "admin.email.pushServerTitle": "Servidor de Notificaciones:",
-  "admin.email.pushTitle": "Habilitar las Notificaciones Push: ",
+  "admin.email.pushTitle": "Habilitar las Notificaciones a Dispositivos Móviles: ",
  "admin.email.requireVerificationDescription": "Normalmente asignado como verdadero en producción. Cuando es verdadero, Mattermost requiere una verificación del correo electrónico después de crear la cuenta y antes de iniciar sesión por primera vez. Los desarrolladores pude que quieran dejar esta opción en falso para evitar la necesidad de verificar correos y así desarrollar más rápido.",
  "admin.email.requireVerificationTitle": "Require verificación de correo electrónico: ",
-  "admin.email.selfPush": "Ingresar manualmente la ubicación del Servicio de Notificaciones Push",
+  "admin.email.selfPush": "Ingresar manualmente la ubicación del Servicio de Notificaciones a Dispositivos Móviles",
  "admin.email.skipServerCertificateVerification.description": "Cuando es verdadero, Mattermost no verificará el certificado del servidor de correos.",
  "admin.email.skipServerCertificateVerification.title": "Omitir la Verificación del Certificado del Servidor:",
  "admin.email.smtpPasswordDescription": "La contraseña asociada con el nombre de usuario SMTP.",
@@ -436,6 +436,27 @@
  "admin.email.smtpUsernameTitle": "Nombre de usuario del Servidor SMTP:",
  "admin.email.testing": "Probando...",
  "admin.false": "falso",
+  "admin.field_names.allowBannerDismissal": "Allow banner dismissal",
+  "admin.field_names.bannerColor": "Banner color",
+  "admin.field_names.bannerText": "Banner text",
+  "admin.field_names.bannerTextColor": "Banner text color",
+  "admin.field_names.enableBanner": "Enable Announcement banner",
+  "admin.field_names.enableCommands": "Enable Custom Slash Commands",
+  "admin.field_names.enableConfirmNotificationsToChannel": "Show @channel and @all confirmation dialog",
+  "admin.field_names.enableIncomingWebhooks": "Enable Incomming Webhooks",
+  "admin.field_names.enableOAuthServiceProvider": "Enable OAuth 2.0 Service Provider",
+  "admin.field_names.enableOutgoingWebhooks": "Enable Outgoing Webhooks",
+  "admin.field_names.enablePostIconOverride": "Enable integrations to override profile picture icons",
+  "admin.field_names.enablePostUsernameOverride": "Enable integrations to override usernames",
+  "admin.field_names.enableUserAccessTokens": "Enable Personal Access Tokens",
+  "admin.field_names.enableUserCreation": "Enable Account Creation",
+  "admin.field_names.maxChannelsPerTeam": "Max Channels Per Team",
+  "admin.field_names.maxNotificationsPerChannel": "Max Notifications Per Channel",
+  "admin.field_names.maxUsersPerTeam": "Max Users Per Team",
+  "admin.field_names.postEditTimeLimit": "Edit post time limit",
+  "admin.field_names.restrictCreationToDomains": "Restrict account creation to specified email domains",
+  "admin.field_names.restrictDirectMessage": "Enable users to open Direct Message channels with",
+  "admin.field_names.teammateNameDisplay": "Teammate Name Display",
  "admin.file.enableFileAttachments": "Permitir el Intercambio de Archivos:",
  "admin.file.enableFileAttachmentsDesc": "Cuando es falso, desactiva el intercambio de archivos en el servidor. Cargar archivos o imágenes en los mensajes están prohibidas a través de los clientes y dispositivos, incluyendo móviles.",
  "admin.file.enableMobileDownloadDesc": "Cuando es falso, se deshabilita la descarga de archivos en las aplicaciones móviles. Los usuarios pueden descargar archivos desde un navegador web para móviles.",
@@ -730,7 +751,7 @@
  "admin.nav.switch": "Seleccionar Equipo",
  "admin.nav.troubleshootingForum": "Foro de resolución de problemas",
  "admin.notifications.email": "Correo electrónico",
-  "admin.notifications.push": "Push a Móvil",
+  "admin.notifications.push": "Notificaciones a Dispositivos Móvil",
  "admin.notifications.title": "Configuracón de Notificaciones",
  "admin.oauth.gitlab": "GitLab",
  "admin.oauth.google": "Google Apps",
@@ -947,7 +968,7 @@
  "admin.service.insecureTlsTitle": "Habilitar Conexiones de Salida Inseguras: ",
  "admin.service.integrationAdmin": "Restringir la gestión de las integraciones a los Administradores:",
  "admin.service.integrationAdminDesc": "Cuando es verdadero, los webhooks y comandos de barra sólo se pueden crear, editar y visualizar por los Administradores de Equipo y Sistema, y las aplicaciones de OAuth 2.0 por Administradores de sistemas. Las integraciones están disponibles para todos los usuarios después de haber sido creadas por el Administrador.",
-  "admin.service.internalConnectionsDesc": "En los entornos de pruebas, tales como cuando se desarrolla integraciones localmente en un computador de desarrollo, utilice este ajuste para especificar los dominios, direcciones IP, o notaciones CIDR para permitir las conexiones internas. <b>No se recomienda para su uso en producción</b>, ya que esto puede permitir a un usuario extraer datos confidenciales de su servidor o de la red interna.<br /><br />Por defecto, URLs suministradas por el usuario, tales como los utilizados por metadatos de Open Graph, webhooks, o comandos de barra no se podrán conectarse a direcciones IP reservadas incluyendo loopback o direcciones locales utilizadadas para las redes internas. Las direcciones URL para las notificaciones Push, OAuth 2.0 y WebRTC son de confianza y no se ven afectadas por este ajuste.",
+  "admin.service.internalConnectionsDesc": "En los entornos de pruebas, tales como cuando se desarrolla integraciones localmente en un computador de desarrollo, utilice este ajuste para especificar los dominios, direcciones IP, o notaciones CIDR para permitir las conexiones internas. <b>No se recomienda para su uso en producción</b>, ya que esto puede permitir a un usuario extraer datos confidenciales de su servidor o de la red interna.<br /><br />Por defecto, URLs suministradas por el usuario, tales como los utilizados por metadatos de Open Graph, Webhooks, o comandos de barra no se podrán conectarse a direcciones IP reservadas incluyendo loopback o direcciones locales utilizadas para las redes internas. Las direcciones URL para las notificaciones a dispositivos móviles, OAuth 2.0 y WebRTC son de confianza y no se ven afectadas por este ajuste.",
  "admin.service.internalConnectionsEx": "webhooks.internal.example.com 127.0.0.1 10.0.16.0/28",
  "admin.service.internalConnectionsTitle": "Permitir conexiones internas no son de confianza: ",
  "admin.service.letsEncryptCertificateCacheFile": "Archivo de Caché de Let's Encrypt:",
@@ -1041,7 +1062,7 @@
  "admin.sidebar.policy": "Política",
  "admin.sidebar.privacy": "Privacidad",
  "admin.sidebar.publicLinks": "Enlaces Públicos",
-  "admin.sidebar.push": "Push a Móvil",
+  "admin.sidebar.push": "Notificación a Móviles",
  "admin.sidebar.rateLimiting": "Límite de Velocidad",
  "admin.sidebar.reports": "INFORMES",
  "admin.sidebar.saml": "SAML 2.0",
@@ -1252,6 +1273,7 @@
  "api.channel.delete_channel.archived": "{username} archivó el canal.",
  "api.channel.join_channel.post_and_forget": "{username} se ha unido al canal.",
  "api.channel.leave.left": "{username} abandonó el canal.",
+  "api.channel.post_convert_channel_to_private.updated_from": "{username} convirtió el canal de público a privado",
  "api.channel.post_update_channel_displayname_message_and_forget.updated_from": "{username} ha actualizado el nombre del canal de: {old} a: {new}",
  "api.channel.post_update_channel_header_message_and_forget.removed": "{username} removió el encabezado del canal (era: {old})",
  "api.channel.post_update_channel_header_message_and_forget.updated_from": "{username} ha actualizado el encabezado del canal de: {old} a: {new}",
@@ -1356,6 +1378,7 @@
  "channel_header.addToFavorites": "Añadir a favoritos",
  "channel_header.channelHeader": "Editar encabezado del canal",
  "channel_header.channelMembers": "Miembros",
+  "channel_header.convert": "Convertir a Canal Privado",
  "channel_header.delete": "Borrar Canal",
  "channel_header.directchannel.you": "{displayname} (tu) ",
  "channel_header.flagged": "Mensajes Marcados",
@@ -1425,7 +1448,7 @@
  "channel_modal.purposeEx": "Ej: \"Un canal para describir errores y mejoras\"",
  "channel_notifications.allActivity": "Para toda actividad",
  "channel_notifications.globalDefault": "Predeterminada ({notifyLevel})",
-  "channel_notifications.muteChannel.help": "Silenciar apaga las notificaciones de escritorio, correo electrónico y push para este canal. El canal no será marcado como sin leer a menos que seas mencionado.",
+  "channel_notifications.muteChannel.help": "Silenciar apaga las notificaciones de escritorio, correo electrónico y dispositivos móviles para este canal. El canal no será marcado como sin leer a menos que seas mencionado.",
  "channel_notifications.muteChannel.off.desc": "El canal no está silenciado",
  "channel_notifications.muteChannel.off.title": "Apagado",
  "channel_notifications.muteChannel.on.desc": "El canal está silenciado",
@@ -1434,9 +1457,9 @@
  "channel_notifications.never": "Nunca",
  "channel_notifications.onlyMentions": "Sólo para menciones",
  "channel_notifications.override": "Seleccionar una opción diferente a \"Predeterminada\" anulará las configuraciones globales de notificación. Las notificaciones de Escritorio están disponibles para Firefox, Safari, y Chrome.",
-  "channel_notifications.overridePush": "Seleccionando una opción diferente a \"Predeterminada\" sustituirá la configuración globar para las notitificaciones push a móviles fijados en la configuración de la cuenta.",
+  "channel_notifications.overridePush": "Seleccionando una opción diferente a \"Predeterminada\" sustituirá la configuración global para las notificaciones a dispositivos móviles fijados en la configuración de la cuenta.",
  "channel_notifications.preferences": "Preferencias de Notificación para ",
-  "channel_notifications.push": "Enviar notificaciones push móviles",
+  "channel_notifications.push": "Enviar notificaciones a dispositivos móviles",
  "channel_notifications.sendDesktop": "Enviar notificaciones de escritorio",
  "channel_select.placeholder": "--- Selecciona un canal ---",
  "channel_switch_modal.deactivated": "Desactivado",
@@ -1486,6 +1509,12 @@
  "claim.oauth_to_email.title": "Cambiar la cuenta de {type} a Correo Electrónico",
  "confirm_modal.cancel": "Cancelar",
  "connecting_screen": "Conectando",
+  "convert_channel.cancel": "No, cancelar",
+  "convert_channel.confirm": "Sí, convertir a canal privado",
+  "convert_channel.question1": "Al convertir <strong>{display_name}</strong> a un canal privado, la historía y sus miembros son preservados. Los archivos que fueron compartidos públicamente serán accesibles para todos utilizando el link. La membresía a este canal será únicamente por invitación.",
+  "convert_channel.question2": "Este cambio es permanente y no puede deshacerse.",
+  "convert_channel.question3": "¿Estás seguro de querer convertir <strong>{display_name}</strong> a un canal privado?",
+  "convert_channel.title": "¿Convertir {display_name} a un canal privado?",
  "copy_url_context_menu.getChannelLink": "Copiar Enlace",
  "create_comment.addComment": "Agregar un comentario...",
  "create_comment.comment": "Agregar Comentario",
@@ -1600,6 +1629,7 @@
  "emoji_picker.search": "Buscar",
  "emoji_picker.searchResults": "Resultados de la Búsqueda",
  "emoji_picker.symbols": "Símbolos",
+  "ent.cluster.save_config_with_roles.error": "The following configuration settings cannot be saved when High Availability is enabled and the System Console is in read-only mode: {keys}.",
  "error.generic.link": "Volver a {siteName}",
  "error.generic.link_message": "Volver a {siteName}",
  "error.generic.message": "Ha ocurrido un error.",
@@ -2176,8 +2206,8 @@
  "mobile.notification_settings_mobile.no_sound": "Ninguno",
  "mobile.notification_settings_mobile.push_activity": "ENVIAR NOTIFICACIONES",
  "mobile.notification_settings_mobile.push_activity_android": "Enviar notificaciones",
-  "mobile.notification_settings_mobile.push_status": "ACTIVA LAS NOTIFICACIONES PUSH CUANDO",
-  "mobile.notification_settings_mobile.push_status_android": "Activa las notificaciones push cuando",
+  "mobile.notification_settings_mobile.push_status": "ACTIVA LAS NOTIFICACIONES A DISPOSITIVOS MÓVILES CUANDO",
+  "mobile.notification_settings_mobile.push_status_android": "Activa las notificaciones a dispositivos móviles cuando",
  "mobile.notification_settings_mobile.sound": "Sonido",
  "mobile.notification_settings_mobile.sounds_title": "Sonido de la notificación",
  "mobile.notification_settings_mobile.test": "Notificación de prueba",
@@ -2509,6 +2539,7 @@
  "setting_picture.cancel": "Cancelar",
  "setting_picture.help.profile": "Sube un icono para el equipo en formato BMP, JPG o PNG.",
  "setting_picture.help.team": "Sube un icono para el equipo en formato BMP, JPG o PNG.",
+  "setting_picture.remove": "Remove this icon",
  "setting_picture.save": "Guardar",
  "setting_picture.select": "Selecciona",
  "setting_upload.import": "Importar",
@@ -2668,6 +2699,10 @@
  "suggestion.mention.unread.channels": "Canales sin Leer",
  "suggestion.search.private": "Canales Privados",
  "suggestion.search.public": "Canales Públicos",
+  "system_notice.body.api3": "Si creaste o instalaste una integración en los últimos dos años, averigua como <a href=\"https://about.mattermost.com/default-apiv3-deprecation-guide\" target=\"_blank\">los nuevos cambios</a> pueden afectar dichas integraciones.",
+  "system_notice.dont_show": "No volver a mostrar",
+  "system_notice.remind_me": "Recordármelo más tarde",
+  "system_notice.title": "<strong>Mensaje del Sistema</strong><br>proveniente de Mattermost",
  "system_users_list.count": "{count, number} {count, plural, one {usuario} other {usuarios}}",
  "system_users_list.countPage": "{startCount, number} - {endCount, number} {count, plural, one {usuario} other {usuarios}} de {total, number} total",
  "system_users_list.countSearch": "{count, number} {count, plural, one {usuario} other {usuarios}} de {total, number} total",
@@ -2933,8 +2968,8 @@
  "user.settings.notifications.desktop.title": "Notificaciones de escritorio",
  "user.settings.notifications.desktop.unlimited": "Ilimitada",
  "user.settings.notifications.desktopSounds": "Sonidos de notificación de escritorio",
-  "user.settings.notifications.email.disabled": "Deshabilitado por el Administrador de Sistema",
-  "user.settings.notifications.email.disabled_long": "Las notificaciones por correo electrónico han sido deshabilitadas por tu Administrador del Sistema.",
+  "user.settings.notifications.email.disabled": "Las notificaciones de correo electrónico no están habilitadas",
+  "user.settings.notifications.email.disabled_long": "Las notificaciones por correo electrónico no han sido habilitadas por tu Administrador del Sistema.",
  "user.settings.notifications.email.everyHour": "Cada hora",
  "user.settings.notifications.email.everyXMinutes": "Cada {count, plural, one {minuto} other {{count, number} minutos}}",
  "user.settings.notifications.email.immediately": "Inmediatamente",
@@ -2951,8 +2986,8 @@
  "user.settings.notifications.off": "Apagado",
  "user.settings.notifications.on": "Encendido",
  "user.settings.notifications.onlyMentions": "Sólo para menciones y mensajes directos",
-  "user.settings.notifications.push": "Notificaciones push móvil",
-  "user.settings.notifications.push_notification.status": "Activa las notificaciones push cuando",
+  "user.settings.notifications.push": "Notificaciones a dispositivos móviles",
+  "user.settings.notifications.push_notification.status": "Activa las notificaciones a dispositivos móviles cuando",
  "user.settings.notifications.sensitiveName": "Tu nombre con distinción de mayúsculas \"{first_name}\"",
  "user.settings.notifications.sensitiveUsername": "Tu nombre de usuario sin distinción de mayúsculas \"{username}\"",
  "user.settings.notifications.sensitiveWords": "Otras palabras sin distinción de mayúsculas, separadas por comas:",
@@ -2966,8 +3001,8 @@
  "user.settings.push_notification.allActivityOffline": "Para toda la actividad cuando esté desconectado",
  "user.settings.push_notification.allActivityOnline": "De toda la actividad cuando esté en línea, ausente o desconectado",
  "user.settings.push_notification.away": "Ausente o desconectado",
-  "user.settings.push_notification.disabled": "Inhabilitado por el Administrador de Sistema",
-  "user.settings.push_notification.disabled_long": "Las notificaciones Push no están habilitadas. Contacta a tu Administrador de Sistema.",
+  "user.settings.push_notification.disabled": "Notificaciones móviles no están habilitadas",
+  "user.settings.push_notification.disabled_long": "Las notificaciones a dispositivos móviles no han sido habilitadas por tu Administrador del Sistema.",
  "user.settings.push_notification.info": "Se enviarán notificaciones a tu dispositivo móvil cuando haya actividad en Mattermost.",
  "user.settings.push_notification.off": "Apagado",
  "user.settings.push_notification.offline": "Desconectado",
@@ -2976,8 +3011,8 @@
  "user.settings.push_notification.onlyMentionsAway": "Para las menciones y mensajes directos cuando esté ausente o desconectado",
  "user.settings.push_notification.onlyMentionsOffline": "Para las menciones y mensajes directos cuando esté desconectado",
  "user.settings.push_notification.onlyMentionsOnline": "Para las menciones y mensajes directos cuando esté en línea, ausente o desconectado",
-  "user.settings.push_notification.send": "Enviar notificaciones push móvil",
-  "user.settings.push_notification.status": "Activa las notificaciones push cuando",
+  "user.settings.push_notification.send": "Enviar notificaciones a dispositivos móviles",
+  "user.settings.push_notification.status": "Activa las notificaciones a dispositivos móviles cuando",
  "user.settings.push_notification.status_info": "Las alertas de notificación sólo son enviadas a tu dispositivo móvil cuando tu estatus coincide con la selección anterior.",
  "user.settings.security.active": "Activo",
  "user.settings.security.close": "Cerrar",
--- a/assets/base/i18n/fr.json
+++ b/assets/base/i18n/fr.json
@@ -436,6 +436,27 @@
  "admin.email.smtpUsernameTitle": "Nom d'utilisateur du serveur SMTP :",
  "admin.email.testing": "Essai en cours...",
  "admin.false": "non",
+  "admin.field_names.allowBannerDismissal": "Allow banner dismissal",
+  "admin.field_names.bannerColor": "Banner color",
+  "admin.field_names.bannerText": "Banner text",
+  "admin.field_names.bannerTextColor": "Banner text color",
+  "admin.field_names.enableBanner": "Enable Announcement banner",
+  "admin.field_names.enableCommands": "Enable Custom Slash Commands",
+  "admin.field_names.enableConfirmNotificationsToChannel": "Show @channel and @all confirmation dialog",
+  "admin.field_names.enableIncomingWebhooks": "Enable Incomming Webhooks",
+  "admin.field_names.enableOAuthServiceProvider": "Enable OAuth 2.0 Service Provider",
+  "admin.field_names.enableOutgoingWebhooks": "Enable Outgoing Webhooks",
+  "admin.field_names.enablePostIconOverride": "Enable integrations to override profile picture icons",
+  "admin.field_names.enablePostUsernameOverride": "Enable integrations to override usernames",
+  "admin.field_names.enableUserAccessTokens": "Enable Personal Access Tokens",
+  "admin.field_names.enableUserCreation": "Enable Account Creation",
+  "admin.field_names.maxChannelsPerTeam": "Max Channels Per Team",
+  "admin.field_names.maxNotificationsPerChannel": "Max Notifications Per Channel",
+  "admin.field_names.maxUsersPerTeam": "Max Users Per Team",
+  "admin.field_names.postEditTimeLimit": "Edit post time limit",
+  "admin.field_names.restrictCreationToDomains": "Restrict account creation to specified email domains",
+  "admin.field_names.restrictDirectMessage": "Enable users to open Direct Message channels with",
+  "admin.field_names.teammateNameDisplay": "Teammate Name Display",
  "admin.file.enableFileAttachments": "Autoriser le partage de fichiers :",
  "admin.file.enableFileAttachmentsDesc": "Lorsque désactivé, le partage de fichiers sur le serveur est désactivé. Tout ajout de fichiers et d'images aux messages est interdit sur l'ensemble des clients et des périphériques, et ce, y compris les clients mobiles.",
  "admin.file.enableMobileDownloadDesc": "Lorsque désactivé, les téléchargements de fichiers sur des applications mobiles sont désactivés. Les utilisateurs peuvent toujours télécharger des fichiers à partir d'un navigateur web mobile.",
@@ -1252,6 +1273,7 @@
  "api.channel.delete_channel.archived": "{username} a archivé le canal.",
  "api.channel.join_channel.post_and_forget": "{username} a rejoint le canal.",
  "api.channel.leave.left": "{username} a quitté le canal.",
+  "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} a mis à jour le nom d'affichage du canal de: {old} à: {new}",
  "api.channel.post_update_channel_header_message_and_forget.removed": "{username} a supprimé l'entête du canal (précédemment: {old})",
  "api.channel.post_update_channel_header_message_and_forget.updated_from": "{username} a mis à jour l'entête du canal de : {old} en : {new}",
@@ -1356,6 +1378,7 @@
  "channel_header.addToFavorites": "Ajouter aux favoris",
  "channel_header.channelHeader": "Éditer l'entête du canal",
  "channel_header.channelMembers": "Membres",
+  "channel_header.convert": "Convert to Private Channel",
  "channel_header.delete": "Supprimer le canal",
  "channel_header.directchannel.you": "{displayname} (vous) ",
  "channel_header.flagged": "Messages marqués d'un indicateur",
@@ -1486,6 +1509,12 @@
  "claim.oauth_to_email.title": "Basculer la connexion de type {type} vers l'utilisation d'une adresse e-mail",
  "confirm_modal.cancel": "Annuler",
  "connecting_screen": "Connexion en cours",
+  "convert_channel.cancel": "No, cancel",
+  "convert_channel.confirm": "Yes, convert to private channel",
+  "convert_channel.question1": "When you convert <strong>{display_name}</strong> to a private channel, history and membership are preserved. Publicly shared files remain accessible to anyone with the link. Membership in a private channel is by invitation only.",
+  "convert_channel.question2": "The change is permanent and cannot be undone.",
+  "convert_channel.question3": "Are you sure you want to convert <strong>{display_name}</strong> to a private channel?",
+  "convert_channel.title": "Convert {display_name} to a private channel?",
  "copy_url_context_menu.getChannelLink": "Copier l'URL",
  "create_comment.addComment": "Commenter...",
  "create_comment.comment": "Ajouter un commentaire",
@@ -1600,6 +1629,7 @@
  "emoji_picker.search": "Rechercher",
  "emoji_picker.searchResults": "Résultats de la recherche",
  "emoji_picker.symbols": "Symboles",
+  "ent.cluster.save_config_with_roles.error": "The following configuration settings cannot be saved when High Availability is enabled and the System Console is in read-only mode: {keys}.",
  "error.generic.link": "Retour à {siteName}",
  "error.generic.link_message": "Retour à {siteName}",
  "error.generic.message": "Une erreur s'est produite.",
@@ -2508,7 +2538,8 @@
  "setting_item_min.edit": "Modifier",
  "setting_picture.cancel": "Annuler",
  "setting_picture.help.profile": "Upload a picture in BMP, JPG or PNG format.",
-  "setting_picture.help.team": "Upload a team icon in BMP, JPG or PNG format.",
+  "setting_picture.help.team": "Upload a team icon in BMP, JPG or PNG format.<br>Square images with a solid background color are recommended.",
+  "setting_picture.remove": "Remove this icon",
  "setting_picture.save": "Enregistrer",
  "setting_picture.select": "Sélectionner",
  "setting_upload.import": "Importer",
@@ -2668,6 +2699,10 @@
  "suggestion.mention.unread.channels": "Unread Channels",
  "suggestion.search.private": "Canaux privés",
  "suggestion.search.public": "Canaux publics",
+  "system_notice.body.api3": "If you’ve created or installed integrations in the last two years, find out how <a href=\"https://about.mattermost.com/default-apiv3-deprecation-guide\" target=\"_blank\">upcoming changes</a> may affect them.",
+  "system_notice.dont_show": "Don't show again",
+  "system_notice.remind_me": "Remind me later",
+  "system_notice.title": "<strong>System Message</strong><br>from Mattermost",
  "system_users_list.count": "{count, number} {count, plural, one {utilisateur} other {utilisateurs}}",
  "system_users_list.countPage": "{startCount, number} - {endCount, number} {count, plural, one {utilisateur} other {utilisateurs}} d'un total de {total, number}",
  "system_users_list.countSearch": "{count, number} {count, plural, one {utilisateur} other {utilisateurs}} d'un total de {total, number}",
@@ -2933,7 +2968,7 @@
  "user.settings.notifications.desktop.title": "Notifications de bureau",
  "user.settings.notifications.desktop.unlimited": "Illimité",
  "user.settings.notifications.desktopSounds": "Sons des notifications de bureau",
-  "user.settings.notifications.email.disabled": "Désactivé par l'administrateur système",
+  "user.settings.notifications.email.disabled": "Email notifications are not enabled",
  "user.settings.notifications.email.disabled_long": "Les e-mails de notification ont été désactivés par votre administrateur système.",
  "user.settings.notifications.email.everyHour": "Toutes les heures",
  "user.settings.notifications.email.everyXMinutes": "{count, plural, one {Chaque minute} other {Toutes les {count, number} minutes}}",
@@ -2966,8 +3001,8 @@
  "user.settings.push_notification.allActivityOffline": "Pour toutes les activités lorsque vous etes en déplacement ou hors ligne",
  "user.settings.push_notification.allActivityOnline": "Pour toutes les activités lorsque vous etes en déplacement ou hors ligne",
  "user.settings.push_notification.away": "Absent ou hors ligne",
-  "user.settings.push_notification.disabled": "Désactivé par l'administrateur système",
-  "user.settings.push_notification.disabled_long": "Push Notifications are not enabled. Contact your System Administrator.",
+  "user.settings.push_notification.disabled": "Push notifications are not enabled",
+  "user.settings.push_notification.disabled_long": "Les e-mails de notification ont été désactivés par votre administrateur système.",
  "user.settings.push_notification.info": "Les alertes de notification sont envoyées à votre appareil mobile quand il y a de l’activité dans Mattermost.",
  "user.settings.push_notification.off": "Désactivé",
  "user.settings.push_notification.offline": "Hors ligne",
--- a/assets/base/i18n/it.json
+++ b/assets/base/i18n/it.json
@@ -92,7 +92,7 @@
  "add_emoji.save": "Salva",
  "add_incoming_webhook.cancel": "Cancella",
  "add_incoming_webhook.channel": "Canale",
-  "add_incoming_webhook.channel.help": "Canale pubblico o privato che riceve i contenuti del webhook. Si deve essere membri del gruppo privato per impostare il webhook.",
+  "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.channelRequired": "Un canale valido è richiesto",
  "add_incoming_webhook.description": "Descrizione",
  "add_incoming_webhook.description.help": "Descrizione del webhook in ingresso.",
@@ -436,6 +436,27 @@
  "admin.email.smtpUsernameTitle": "Nome utente server SMTP:",
  "admin.email.testing": "Verifica in corso...",
  "admin.false": "falso",
+  "admin.field_names.allowBannerDismissal": "Allow banner dismissal",
+  "admin.field_names.bannerColor": "Banner color",
+  "admin.field_names.bannerText": "Banner text",
+  "admin.field_names.bannerTextColor": "Banner text color",
+  "admin.field_names.enableBanner": "Enable Announcement banner",
+  "admin.field_names.enableCommands": "Enable Custom Slash Commands",
+  "admin.field_names.enableConfirmNotificationsToChannel": "Show @channel and @all confirmation dialog",
+  "admin.field_names.enableIncomingWebhooks": "Enable Incomming Webhooks",
+  "admin.field_names.enableOAuthServiceProvider": "Enable OAuth 2.0 Service Provider",
+  "admin.field_names.enableOutgoingWebhooks": "Enable Outgoing Webhooks",
+  "admin.field_names.enablePostIconOverride": "Enable integrations to override profile picture icons",
+  "admin.field_names.enablePostUsernameOverride": "Enable integrations to override usernames",
+  "admin.field_names.enableUserAccessTokens": "Enable Personal Access Tokens",
+  "admin.field_names.enableUserCreation": "Enable Account Creation",
+  "admin.field_names.maxChannelsPerTeam": "Max Channels Per Team",
+  "admin.field_names.maxNotificationsPerChannel": "Max Notifications Per Channel",
+  "admin.field_names.maxUsersPerTeam": "Max Users Per Team",
+  "admin.field_names.postEditTimeLimit": "Edit post time limit",
+  "admin.field_names.restrictCreationToDomains": "Restrict account creation to specified email domains",
+  "admin.field_names.restrictDirectMessage": "Enable users to open Direct Message channels with",
+  "admin.field_names.teammateNameDisplay": "Teammate Name Display",
  "admin.file.enableFileAttachments": "Consenti Condivisione File:",
  "admin.file.enableFileAttachmentsDesc": "Se falso, disattiva la possibilità di condividere file su questo server. Tutti i file e le immagini caricati nei messaggi saranno bloccati su tutti i client e dispositivi, inclusi i dispositivi mobili.",
  "admin.file.enableMobileDownloadDesc": "Se falso, disattiva il download dei file sulle app per smartphone. Gli utente potranno ancora scaricare i file dal browser web mobile.",
@@ -690,7 +711,7 @@
  "admin.log.locationPlaceholder": "Immetti la posizione del tuo file",
  "admin.log.locationTitle": "Cartella file di log:",
  "admin.log.logSettings": "Impostazioni di Log",
-  "admin.log.noteDescription": "Changing properties other than <a href=\"#EnableWebhookDebugging\">Enable Webhook Debugging</a> and <a href=\"#EnableDiagnostics\">Enable Diagnostics and Error Reporting</a> in this section will require a server restart before taking effect.",
+  "admin.log.noteDescription": "Modificare le proprietà diverse da <a href=\"#EnableWebhookDebugging\">Attiva debug webhook</a> e <a href=\"#EnableDiagnostics\">Attiva diagnosi e reportistica</a> in questa sezione richiede un riavvio del server",
  "admin.logs.bannerDesc": "Per cercare gli utenti tramite ID utente o token di accesso, andare in Reportistica > Utenti ed incollare l'ID nel campo di ricerca.",
  "admin.logs.next": "Prossimo",
  "admin.logs.prev": "Precedente",
@@ -1236,7 +1257,7 @@
  "analytics.system.totalReadDbConnections": "Connessioni al database di replica",
  "analytics.system.totalSessions": "Sessioni totali",
  "analytics.system.totalTeams": "Gruppi totali",
-  "analytics.system.totalUsers": "Utenti attivi mensilmente",
+  "analytics.system.totalUsers": "Totale utenti attivi",
  "analytics.system.totalWebsockets": "Connessioni WebSocket",
  "analytics.team.activeUsers": "Utenti Attivi Con Pubblicazioni",
  "analytics.team.newlyCreated": "Utenti Creati Recentemente",
@@ -1247,11 +1268,12 @@
  "analytics.team.recentUsers": "Utenti Attivi Recentemente",
  "analytics.team.title": "Statistiche gruppo per {team}",
  "analytics.team.totalPosts": "Pubblicazioni totali",
-  "analytics.team.totalUsers": "Utenti attivi mensilmente",
+  "analytics.team.totalUsers": "Totale utenti attivi",
  "api.channel.add_member.added": "{addedUsername} aggiunto al canale da {username}.",
  "api.channel.delete_channel.archived": "{username} ha archiviato il canale.",
  "api.channel.join_channel.post_and_forget": "{username} è entrato nel canale.",
  "api.channel.leave.left": "{username} ha lasciato il canale.",
+  "api.channel.post_convert_channel_to_private.updated_from": "{username} ha convertito il canale da pubblico a privato",
  "api.channel.post_update_channel_displayname_message_and_forget.updated_from": "{username} ha aggiornato il nome del canale da: {old} a: {new}",
  "api.channel.post_update_channel_header_message_and_forget.removed": "{username} ha rimosso l'intestazione del canale (era: {old})",
  "api.channel.post_update_channel_header_message_and_forget.updated_from": "{username} ha aggiornato il titolo del canale da: {old} a: {new}",
@@ -1356,6 +1378,7 @@
  "channel_header.addToFavorites": "Aggiungi a preferiti",
  "channel_header.channelHeader": "Modifica titolo canale",
  "channel_header.channelMembers": "Membri",
+  "channel_header.convert": "Converti a Canale Privato",
  "channel_header.delete": "Elimina Canale",
  "channel_header.directchannel.you": "{displayname} (tu) ",
  "channel_header.flagged": "Pubblicazioni segnati",
@@ -1486,6 +1509,12 @@
  "claim.oauth_to_email.title": "Cambia account {type} a Email",
  "confirm_modal.cancel": "Cancella",
  "connecting_screen": "Connessione",
+  "convert_channel.cancel": "No, annulla",
+  "convert_channel.confirm": "Sì, converti a canale privato",
+  "convert_channel.question1": "Quando si converte <strong>{display_name}</strong> a canale privato, la storia e i membri vengono conservati. I file condivisi pubblicamente rimango accessibili a chiunque abbia il link. L'ingresso in un canale privato avviene solo previo invito.",
+  "convert_channel.question2": "Questa modifica è permanente e non può essere cancellata.",
+  "convert_channel.question3": "Procedere con la conversione di <strong>{display_name}</strong> a canale privato?",
+  "convert_channel.title": "Convertire {display_name} a canale privato?",
  "copy_url_context_menu.getChannelLink": "Copia collegamento",
  "create_comment.addComment": "Aggiungi un commento...",
  "create_comment.comment": "Aggiungi commento",
@@ -1600,6 +1629,7 @@
  "emoji_picker.search": "Ricerca",
  "emoji_picker.searchResults": "Risultati di Ricerca",
  "emoji_picker.symbols": "Simboli",
+  "ent.cluster.save_config_with_roles.error": "The following configuration settings cannot be saved when High Availability is enabled and the System Console is in read-only mode: {keys}.",
  "error.generic.link": "Torna a {siteName}",
  "error.generic.link_message": "Torna a {siteName}",
  "error.generic.message": "Si è verificato un errore.",
@@ -2270,8 +2300,8 @@
  "mobile.share_extension.cancel": "Annulla",
  "mobile.share_extension.channel": "Canale",
  "mobile.share_extension.error_close": "Chiudi",
-  "mobile.share_extension.error_message": "An error has occurred while using the share extension.",
-  "mobile.share_extension.error_title": "Extension Error",
+  "mobile.share_extension.error_message": "Si è verificato un errore durante l'utilizzo dell'estensione di condivisione.",
+  "mobile.share_extension.error_title": "Errore Estensione",
  "mobile.share_extension.send": "Invia",
  "mobile.share_extension.team": "Gruppo",
  "mobile.suggestion.members": "Membri",
@@ -2316,11 +2346,11 @@
  "multiselect.placeholder": "Cercare ed aggiungere membri",
  "navbar.addMembers": "Aggiungi Membro",
  "navbar.click": "Clicca qui",
-  "navbar.clickToAddHeader": "{clickHere} to add one.",
+  "navbar.clickToAddHeader": "{clickHere} per aggiungerne uno.",
  "navbar.delete": "Elimina Canale...",
  "navbar.leave": "Elimina Canale",
  "navbar.manageMembers": "Amministra Membri",
-  "navbar.noHeader": "No channel header yet.",
+  "navbar.noHeader": "Intestazione canale non ancora definita.",
  "navbar.preferences": "Preferenze delle Notifiche",
  "navbar.rename": "Rinomina Canale...",
  "navbar.setHeader": "Imposta Intstazione Canale...",
@@ -2509,6 +2539,7 @@
  "setting_picture.cancel": "Cancella",
  "setting_picture.help.profile": "Carica un'immagine in formato BMP, JPG o PNG.",
  "setting_picture.help.team": "Carica un'immagine del gruppo in formato BMP, JPG o PNG.",
+  "setting_picture.remove": "Remove this icon",
  "setting_picture.save": "Salva",
  "setting_picture.select": "Seleziona",
  "setting_upload.import": "Importa",
@@ -2668,6 +2699,10 @@
  "suggestion.mention.unread.channels": "Canali non letti",
  "suggestion.search.private": "Canali privati",
  "suggestion.search.public": "Canali Pubblici",
+  "system_notice.body.api3": "Se hai creato o installato delle integrazioni negli ultimi due anni, scopri come i <a href=\"https://about.mattermost.com/default-apiv3-deprecation-guide\" target=\"_blank\">prossimi aggiornamenti</a> possono influenzarle.",
+  "system_notice.dont_show": "Non visualizzare di nuovo",
+  "system_notice.remind_me": "Ricordamelo più tardi",
+  "system_notice.title": "<strong>Messaggio di Sistema</strong><br>da Mattermost",
  "system_users_list.count": "{count, number} {count, plural, one {user} other {users}}",
  "system_users_list.countPage": "{startCount, number} - {endCount, number} {count, plural, one {user} other {users}} of {total, number} total",
  "system_users_list.countSearch": "{count, number} {count, plural, one {user} other {users}} of {total, number} total",
@@ -2933,8 +2968,8 @@
  "user.settings.notifications.desktop.title": "Notifiche desktop",
  "user.settings.notifications.desktop.unlimited": "Illimitata",
  "user.settings.notifications.desktopSounds": "Suoni di notifica desktop",
-  "user.settings.notifications.email.disabled": "Disabilitato dall'Amministratore di Sistema",
-  "user.settings.notifications.email.disabled_long": "Le notifiche email sono state disabilitate dall'Amministratore di Sistema.",
+  "user.settings.notifications.email.disabled": "Le notifiche email non sono attive",
+  "user.settings.notifications.email.disabled_long": "Le notifiche email non sono state abilitate dall'Amministratore di Sistema.",
  "user.settings.notifications.email.everyHour": "Ogni ora",
  "user.settings.notifications.email.everyXMinutes": "Ogni {count, plural, one {minute} other {{count, number} minuti}}",
  "user.settings.notifications.email.immediately": "Immediatamente",
@@ -2966,8 +3001,8 @@
  "user.settings.push_notification.allActivityOffline": "Per tutte le attività quando offline",
  "user.settings.push_notification.allActivityOnline": "Per tutte le attività quando online, lontano o offline",
  "user.settings.push_notification.away": "Lontano o offline",
-  "user.settings.push_notification.disabled": "Disabilitato dall'Amministratore di Sistema",
-  "user.settings.push_notification.disabled_long": "Le notifiche Push sono disattivate. Contatta il tuo Amministratore di Sistema.",
+  "user.settings.push_notification.disabled": "Le notifiche push non sono attive",
+  "user.settings.push_notification.disabled_long": "Le notifiche push non sono state abilitate dall'Amministratore di Sistema.",
  "user.settings.push_notification.info": "Le notifiche sono inviate al tuo dispositivo mobile quando c'è attività su Mattermost.",
  "user.settings.push_notification.off": "Disattivo",
  "user.settings.push_notification.offline": "Offline",
@@ -3092,7 +3127,7 @@
  "view_image.loading": "Caricamento ",
  "view_image_popover.download": "Scarica",
  "view_image_popover.file": "File {count, number} di {total, number}",
-  "view_image_popover.open": "Open",
+  "view_image_popover.open": "Apri",
  "view_image_popover.publicLink": "Prendi collegamento pubblico",
  "web.footer.about": "Riguardo a",
  "web.footer.help": "Aiuto",
--- a/assets/base/i18n/ja.json
+++ b/assets/base/i18n/ja.json
@@ -92,7 +92,7 @@
  "add_emoji.save": "保存",
  "add_incoming_webhook.cancel": "キャンセル",
  "add_incoming_webhook.channel": "チャンネル",
-  "add_incoming_webhook.channel.help": "ウェブフックのペイロードを受け取る公開チャンネル・非公開チャンネルです。非公開チャンネルにウェブフックを設定する時は、そのチャンネルに所属していなければなりません。",
+  "add_incoming_webhook.channel.help": "ウェブフックのペイロードを受け取るデフォルトの公開チャンネル・非公開チャンネルです。非公開チャンネルにウェブフックを設定する時は、そのチャンネルに所属していなければなりません。",
  "add_incoming_webhook.channelRequired": "有効なチャンネルが必要です",
  "add_incoming_webhook.description": "説明",
  "add_incoming_webhook.description.help": "内向きのウェブフックについての説明です。",
@@ -436,6 +436,27 @@
  "admin.email.smtpUsernameTitle": "SMTPサーバーのユーザー名:",
  "admin.email.testing": "テストしています…",
  "admin.false": "無効",
+  "admin.field_names.allowBannerDismissal": "Allow banner dismissal",
+  "admin.field_names.bannerColor": "Banner color",
+  "admin.field_names.bannerText": "Banner text",
+  "admin.field_names.bannerTextColor": "Banner text color",
+  "admin.field_names.enableBanner": "Enable Announcement banner",
+  "admin.field_names.enableCommands": "Enable Custom Slash Commands",
+  "admin.field_names.enableConfirmNotificationsToChannel": "Show @channel and @all confirmation dialog",
+  "admin.field_names.enableIncomingWebhooks": "Enable Incomming Webhooks",
+  "admin.field_names.enableOAuthServiceProvider": "Enable OAuth 2.0 Service Provider",
+  "admin.field_names.enableOutgoingWebhooks": "Enable Outgoing Webhooks",
+  "admin.field_names.enablePostIconOverride": "Enable integrations to override profile picture icons",
+  "admin.field_names.enablePostUsernameOverride": "Enable integrations to override usernames",
+  "admin.field_names.enableUserAccessTokens": "Enable Personal Access Tokens",
+  "admin.field_names.enableUserCreation": "Enable Account Creation",
+  "admin.field_names.maxChannelsPerTeam": "Max Channels Per Team",
+  "admin.field_names.maxNotificationsPerChannel": "Max Notifications Per Channel",
+  "admin.field_names.maxUsersPerTeam": "Max Users Per Team",
+  "admin.field_names.postEditTimeLimit": "Edit post time limit",
+  "admin.field_names.restrictCreationToDomains": "Restrict account creation to specified email domains",
+  "admin.field_names.restrictDirectMessage": "Enable users to open Direct Message channels with",
+  "admin.field_names.teammateNameDisplay": "Teammate Name Display",
  "admin.file.enableFileAttachments": "ファイル共有を許可する:",
  "admin.file.enableFileAttachmentsDesc": "無効な場合、このサーバーではファイル共有が無効になります。メッセージへのファイルや画像のアップロードは、モバイルを含むクライアント-デバイス間で許可されません。",
  "admin.file.enableMobileDownloadDesc": "無効な場合、モバイルアプリでのファイルダウンロードが無効になります。ユーザーはモバイルウェブブラウザーからであればファイルダウンロードが可能です。",
@@ -1236,7 +1257,7 @@
  "analytics.system.totalReadDbConnections": "レプリカDB接続",
  "analytics.system.totalSessions": "総セッション数",
  "analytics.system.totalTeams": "総チーム数",
-  "analytics.system.totalUsers": "月次アクティブユーザー",
+  "analytics.system.totalUsers": "総アクティブユーザー",
  "analytics.system.totalWebsockets": "ウェブソケット接続",
  "analytics.team.activeUsers": "投稿実績のあるアクティブユーザー",
  "analytics.team.newlyCreated": "新規作成ユーザー数",
@@ -1247,11 +1268,12 @@
  "analytics.team.recentUsers": "最近のアクティブユーザー数",
  "analytics.team.title": "{team}チームの使用統計",
  "analytics.team.totalPosts": "総投稿数",
-  "analytics.team.totalUsers": "月次アクティブユーザー",
+  "analytics.team.totalUsers": "総アクティブユーザー",
  "api.channel.add_member.added": "{addedUsername} は {username} によってチャンネルに追加されました。",
  "api.channel.delete_channel.archived": "{username} がチャンネルをアーカイブしました。",
  "api.channel.join_channel.post_and_forget": "{username} がチャンネルに参加しました。",
  "api.channel.leave.left": "{username} がチャンネルから脱退しました。",
+  "api.channel.post_convert_channel_to_private.updated_from": "{username}は公開チャンネルを非公開チャンネルに変更しました",
  "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} へ更新しました",
@@ -1356,6 +1378,7 @@
  "channel_header.addToFavorites": "お気に入りに追加する",
  "channel_header.channelHeader": "チャンネルヘッダーを編集する",
  "channel_header.channelMembers": "メンバー",
+  "channel_header.convert": "非公開チャンネルに変更する",
  "channel_header.delete": "チャンネルを削除する",
  "channel_header.directchannel.you": "{displayname} (あなた) ",
  "channel_header.flagged": "フラグの立てられた投稿",
@@ -1486,6 +1509,12 @@
  "claim.oauth_to_email.title": "{type}アカウントを電子メールアドレスに切り替える",
  "confirm_modal.cancel": "キャンセル",
  "connecting_screen": "接続中",
+  "convert_channel.cancel": "変更を取り消す",
+  "convert_channel.confirm": "非公開チャンネルに変更する",
+  "convert_channel.question1": "<strong>{display_name}</strong>を非公開チャンネルに変更する際、履歴やメンバーシップは変更されません。全体に共有されたファイルはリンクを知る誰もがアクセス可能なままになります。非公開チャンネルへのメンバーの追加は招待によってのみ可能です。",
+  "convert_channel.question2": "変更を元に戻すことはできません。",
+  "convert_channel.question3": "<strong>{display_name}</strong>を非公開チャンネルに変更してよろしいですか？",
+  "convert_channel.title": "{display_name}を非公開チャンネルに変更しますか？",
  "copy_url_context_menu.getChannelLink": "リンクをコピーする",
  "create_comment.addComment": "コメントを追加する…",
  "create_comment.comment": "コメントを追加する",
@@ -1600,6 +1629,7 @@
  "emoji_picker.search": "検索",
  "emoji_picker.searchResults": "検索結果",
  "emoji_picker.symbols": "シンボル",
+  "ent.cluster.save_config_with_roles.error": "The following configuration settings cannot be saved when High Availability is enabled and the System Console is in read-only mode: {keys}.",
  "error.generic.link": "{siteName}に戻る",
  "error.generic.link_message": "{siteName}に戻る",
  "error.generic.message": "エラーが発生しました。",
@@ -2509,6 +2539,7 @@
  "setting_picture.cancel": "キャンセル",
  "setting_picture.help.profile": "BMP、JPG、PNGフォーマットの画像をアップロードしてください。",
  "setting_picture.help.team": "BMP、JPG、PNGフォーマットのチームアイコンをアップロードしてください。",
+  "setting_picture.remove": "Remove this icon",
  "setting_picture.save": "保存する",
  "setting_picture.select": "選択する",
  "setting_upload.import": "インポートする",
@@ -2668,6 +2699,10 @@
  "suggestion.mention.unread.channels": "未読チャンネル",
  "suggestion.search.private": "非公開チャンネル",
  "suggestion.search.public": "公開チャンネル",
+  "system_notice.body.api3": "過去２年間に統合機能を作成もしくはインストールしている場合、<a href=\"https://about.mattermost.com/default-apiv3-deprecation-guide\" target=\"_blank\">今後行われる変更</a>によるそれら統合機能への影響について確認してください。",
+  "system_notice.dont_show": "次回以降は表示しない",
+  "system_notice.remind_me": "後で知らせる",
+  "system_notice.title": "<strong>システムメッセージ</strong><br>Mattermostから",
  "system_users_list.count": "{count, number} {count, plural, one {user} other {users}}",
  "system_users_list.countPage": "{startCount, number} - {endCount, number} {count, plural, one {user} other {users}} of {total, number} 合計",
  "system_users_list.countSearch": "{count, number} {count, plural, one {user} other {users}} of {total, number} 合計",
@@ -2933,8 +2968,8 @@
  "user.settings.notifications.desktop.title": "デスクトップ通知",
  "user.settings.notifications.desktop.unlimited": "無期限",
  "user.settings.notifications.desktopSounds": "デスクトップ通知音",
-  "user.settings.notifications.email.disabled": "管理者によって無効化されています",
-  "user.settings.notifications.email.disabled_long": "電子メール通知はシステム管理者によって無効にされています。",
+  "user.settings.notifications.email.disabled": "電子メール通知は有効化されていません",
+  "user.settings.notifications.email.disabled_long": "電子メール通知はシステム管理者によって有効化されていません。",
  "user.settings.notifications.email.everyHour": "1時間毎",
  "user.settings.notifications.email.everyXMinutes": "{count, plural, one {minute} other {{count, number} minutes}}ごと",
  "user.settings.notifications.email.immediately": "すぐに",
@@ -2966,8 +3001,8 @@
  "user.settings.push_notification.allActivityOffline": "オフライン時の全てのアクティビティーについて",
  "user.settings.push_notification.allActivityOnline": "オンライン、離席中もしくはオフライン時の全てのアクティビティーについて",
  "user.settings.push_notification.away": "離席中もしくはオフライン",
-  "user.settings.push_notification.disabled": "管理者によって無効化されています",
-  "user.settings.push_notification.disabled_long": "プッシュ通知は有効になっていません。システム管理者に問い合わせてください。",
+  "user.settings.push_notification.disabled": "プッシュ通知は有効化されていません",
+  "user.settings.push_notification.disabled_long": "プッシュ通知はシステム管理者によって有効化されていません。",
  "user.settings.push_notification.info": "Mattermostにアクティビティーがあると、あなたのモバイル端末に通知がプッシュされます。",
  "user.settings.push_notification.off": "オフ",
  "user.settings.push_notification.offline": "オフライン",
--- a/assets/base/i18n/ko.json
+++ b/assets/base/i18n/ko.json
@@ -4,13 +4,13 @@
  "about.copyright": "Copyright 2015 - {currentYear} Mattermost, Inc. All rights reserved",
  "about.database": "데이터베이스:",
  "about.date": "빌드 일자:",
-  "about.dbversion": "Database Schema Version:",
+  "about.dbversion": "데이터베이스 스키마 버전",
  "about.enterpriseEditionLearn": "엔터프라이즈 에디션에 대한 자세한 정보 ",
  "about.enterpriseEditionSt": "방화벽 안에 구축 가능한 현대적인 커뮤니케이션 플랫폼",
  "about.enterpriseEditione1": "엔터프라이즈 에디션",
  "about.hash": "빌드 해쉬:",
  "about.hashee": "EE 빌드 해쉬:",
-  "about.hashwebapp": "Webapp Build Hash:",
+  "about.hashwebapp": "Webapp 빌드 해쉬",
  "about.licensed": "다음 사용자에게 허가되었습니다:",
  "about.notice": "Mattermost <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>플랫폼</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>데스크탑 앱</a>, <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>모바일 앱</a>은 오픈소스 소프트웨어를 사용해 만들어졌습니다.",
  "about.number": "빌드 넘버:",
@@ -19,7 +19,7 @@
  "about.teamEditiont0": "팀 에디션",
  "about.teamEditiont1": "엔터프라이즈 에디션",
  "about.title": "Mattermost에 대하여",
-  "about.version": "Mattermost Version:",
+  "about.version": "Mattermost 버전",
  "access_history.title": "접근 기록",
  "activity_log.activeSessions": "활성 세션",
  "activity_log.browser": "브라우저: {browser}",
@@ -436,6 +436,27 @@
  "admin.email.smtpUsernameTitle": "SMTP 서버 사용자명:",
  "admin.email.testing": "테스트 중...",
  "admin.false": "비활성화",
+  "admin.field_names.allowBannerDismissal": "Allow banner dismissal",
+  "admin.field_names.bannerColor": "Banner color",
+  "admin.field_names.bannerText": "Banner text",
+  "admin.field_names.bannerTextColor": "Banner text color",
+  "admin.field_names.enableBanner": "Enable Announcement banner",
+  "admin.field_names.enableCommands": "Enable Custom Slash Commands",
+  "admin.field_names.enableConfirmNotificationsToChannel": "Show @channel and @all confirmation dialog",
+  "admin.field_names.enableIncomingWebhooks": "Enable Incomming Webhooks",
+  "admin.field_names.enableOAuthServiceProvider": "Enable OAuth 2.0 Service Provider",
+  "admin.field_names.enableOutgoingWebhooks": "Enable Outgoing Webhooks",
+  "admin.field_names.enablePostIconOverride": "Enable integrations to override profile picture icons",
+  "admin.field_names.enablePostUsernameOverride": "Enable integrations to override usernames",
+  "admin.field_names.enableUserAccessTokens": "Enable Personal Access Tokens",
+  "admin.field_names.enableUserCreation": "Enable Account Creation",
+  "admin.field_names.maxChannelsPerTeam": "Max Channels Per Team",
+  "admin.field_names.maxNotificationsPerChannel": "Max Notifications Per Channel",
+  "admin.field_names.maxUsersPerTeam": "Max Users Per Team",
+  "admin.field_names.postEditTimeLimit": "Edit post time limit",
+  "admin.field_names.restrictCreationToDomains": "Restrict account creation to specified email domains",
+  "admin.field_names.restrictDirectMessage": "Enable users to open Direct Message channels with",
+  "admin.field_names.teammateNameDisplay": "Teammate Name Display",
  "admin.file.enableFileAttachments": "파일 공유:",
  "admin.file.enableFileAttachmentsDesc": "When false, disables file sharing on the server. All file and image uploads on messages are forbidden across clients and devices, including mobile.",
  "admin.file.enableMobileDownloadDesc": "When false, disables file downloads on mobile apps. Users can still download files from a mobile web browser.",
@@ -1252,6 +1273,7 @@
  "api.channel.delete_channel.archived": "{username}님이 채널을 얼렸습니다.",
  "api.channel.join_channel.post_and_forget": "{username}님이 채널에 들어왔습니다.",
  "api.channel.leave.left": "{username}님이 채널을 나갔습니다.",
+  "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}(으)로 변경했습니다.",
@@ -1356,6 +1378,7 @@
  "channel_header.addToFavorites": "즐겨찾기에 추가",
  "channel_header.channelHeader": "채널 헤더 설정",
  "channel_header.channelMembers": "멤버",
+  "channel_header.convert": "Convert to Private Channel",
  "channel_header.delete": "채널 삭제",
  "channel_header.directchannel.you": "{displayname} (you) ",
  "channel_header.flagged": "중요 메시지",
@@ -1486,6 +1509,12 @@
  "claim.oauth_to_email.title": "Switch {type} Account to Email",
  "confirm_modal.cancel": "취소",
  "connecting_screen": "연결 중",
+  "convert_channel.cancel": "No, cancel",
+  "convert_channel.confirm": "Yes, convert to private channel",
+  "convert_channel.question1": "When you convert <strong>{display_name}</strong> to a private channel, history and membership are preserved. Publicly shared files remain accessible to anyone with the link. Membership in a private channel is by invitation only.",
+  "convert_channel.question2": "The change is permanent and cannot be undone.",
+  "convert_channel.question3": "Are you sure you want to convert <strong>{display_name}</strong> to a private channel?",
+  "convert_channel.title": "Convert {display_name} to a private channel?",
  "copy_url_context_menu.getChannelLink": "링크 복사",
  "create_comment.addComment": "답글 달기...",
  "create_comment.comment": "답글 달기",
@@ -1600,6 +1629,7 @@
  "emoji_picker.search": "검색",
  "emoji_picker.searchResults": "검색 결과",
  "emoji_picker.symbols": "기호",
+  "ent.cluster.save_config_with_roles.error": "The following configuration settings cannot be saved when High Availability is enabled and the System Console is in read-only mode: {keys}.",
  "error.generic.link": "{siteName}(으)로 돌아가기",
  "error.generic.link_message": "{siteName}(으)로 돌아가기",
  "error.generic.message": "오류가 발생했습니다.",
@@ -2508,7 +2538,8 @@
  "setting_item_min.edit": "편집",
  "setting_picture.cancel": "취소",
  "setting_picture.help.profile": "Upload a picture in BMP, JPG or PNG format.",
-  "setting_picture.help.team": "Upload a team icon in BMP, JPG or PNG format.",
+  "setting_picture.help.team": "Upload a team icon in BMP, JPG or PNG format.<br>Square images with a solid background color are recommended.",
+  "setting_picture.remove": "Remove this icon",
  "setting_picture.save": "저장",
  "setting_picture.select": "선택",
  "setting_upload.import": "가져오기",
@@ -2668,6 +2699,10 @@
  "suggestion.mention.unread.channels": "Unread Channels",
  "suggestion.search.private": "비공개 채널",
  "suggestion.search.public": "공개 채널",
+  "system_notice.body.api3": "If you’ve created or installed integrations in the last two years, find out how <a href=\"https://about.mattermost.com/default-apiv3-deprecation-guide\" target=\"_blank\">upcoming changes</a> may affect them.",
+  "system_notice.dont_show": "Don't show again",
+  "system_notice.remind_me": "Remind me later",
+  "system_notice.title": "<strong>System Message</strong><br>from Mattermost",
  "system_users_list.count": "{count, number} {count, plural, one {user} other {users}}",
  "system_users_list.countPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 members} one {member} other {members}} of {total} total",
  "system_users_list.countSearch": "{startCount, number} - {endCount, number} {count, plural, =0 {0 members} one {member} other {members}} of {total} total",
@@ -2933,7 +2968,7 @@
  "user.settings.notifications.desktop.title": "데스크탑 알림",
  "user.settings.notifications.desktop.unlimited": "제한 없음",
  "user.settings.notifications.desktopSounds": "데스크탑 알림음",
-  "user.settings.notifications.email.disabled": "시스템 관리자에 의해 비활성화 됨",
+  "user.settings.notifications.email.disabled": "Email notifications are not enabled",
  "user.settings.notifications.email.disabled_long": "시스템 관리자가 메일알림을 비활성화하였습니다.",
  "user.settings.notifications.email.everyHour": "매 시간마다",
  "user.settings.notifications.email.everyXMinutes": "Every {count, plural, one {minute} other {{count, number} minutes}}",
@@ -2966,8 +3001,8 @@
  "user.settings.push_notification.allActivityOffline": "오프라인일 때의 모든 활동",
  "user.settings.push_notification.allActivityOnline": "온라인, 오프라인, 자리비움 상태의 모든 활동",
  "user.settings.push_notification.away": "오프라인이거나 자리비움",
-  "user.settings.push_notification.disabled": "시스템 관리자에 의해 비활성화 됨",
-  "user.settings.push_notification.disabled_long": "Push Notifications are not enabled. Contact your System Administrator.",
+  "user.settings.push_notification.disabled": "Push notifications are not enabled",
+  "user.settings.push_notification.disabled_long": "시스템 관리자가 메일알림을 비활성화하였습니다.",
  "user.settings.push_notification.info": "지정한 활동에 대해서만 모바일 푸시 알림을 받습니다.",
  "user.settings.push_notification.off": "끄기",
  "user.settings.push_notification.offline": "오프라인",
--- a/assets/base/i18n/nl.json
+++ b/assets/base/i18n/nl.json
@@ -436,6 +436,27 @@
  "admin.email.smtpUsernameTitle": "SMTP server gebruikersnaam:",
  "admin.email.testing": "Testen...",
  "admin.false": "uitgeschakeld",
+  "admin.field_names.allowBannerDismissal": "Allow banner dismissal",
+  "admin.field_names.bannerColor": "Banner color",
+  "admin.field_names.bannerText": "Banner text",
+  "admin.field_names.bannerTextColor": "Banner text color",
+  "admin.field_names.enableBanner": "Enable Announcement banner",
+  "admin.field_names.enableCommands": "Enable Custom Slash Commands",
+  "admin.field_names.enableConfirmNotificationsToChannel": "Show @channel and @all confirmation dialog",
+  "admin.field_names.enableIncomingWebhooks": "Enable Incomming Webhooks",
+  "admin.field_names.enableOAuthServiceProvider": "Enable OAuth 2.0 Service Provider",
+  "admin.field_names.enableOutgoingWebhooks": "Enable Outgoing Webhooks",
+  "admin.field_names.enablePostIconOverride": "Enable integrations to override profile picture icons",
+  "admin.field_names.enablePostUsernameOverride": "Enable integrations to override usernames",
+  "admin.field_names.enableUserAccessTokens": "Enable Personal Access Tokens",
+  "admin.field_names.enableUserCreation": "Enable Account Creation",
+  "admin.field_names.maxChannelsPerTeam": "Max Channels Per Team",
+  "admin.field_names.maxNotificationsPerChannel": "Max Notifications Per Channel",
+  "admin.field_names.maxUsersPerTeam": "Max Users Per Team",
+  "admin.field_names.postEditTimeLimit": "Edit post time limit",
+  "admin.field_names.restrictCreationToDomains": "Restrict account creation to specified email domains",
+  "admin.field_names.restrictDirectMessage": "Enable users to open Direct Message channels with",
+  "admin.field_names.teammateNameDisplay": "Teammate Name Display",
  "admin.file.enableFileAttachments": "Allow File Sharing:",
  "admin.file.enableFileAttachmentsDesc": "When false, disables file sharing on the server. All file and image uploads on messages are forbidden across clients and devices, including mobile.",
  "admin.file.enableMobileDownloadDesc": "When false, disables file downloads on mobile apps. Users can still download files from a mobile web browser.",
@@ -1252,6 +1273,7 @@
  "api.channel.delete_channel.archived": "{username} archived the channel.",
  "api.channel.join_channel.post_and_forget": "{username} joined the channel.",
  "api.channel.leave.left": "{username} left the channel.",
+  "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} updated the channel display name from: {old} to: {new}",
  "api.channel.post_update_channel_header_message_and_forget.removed": "{username} removed the channel header (was: {old})",
  "api.channel.post_update_channel_header_message_and_forget.updated_from": "{username} updated the channel header from: {old} to: {new}",
@@ -1356,6 +1378,7 @@
  "channel_header.addToFavorites": "Add to Favorites",
  "channel_header.channelHeader": "Edit Channel Header",
  "channel_header.channelMembers": " Leden",
+  "channel_header.convert": "Convert to Private Channel",
  "channel_header.delete": "Verwijder kanaal...",
  "channel_header.directchannel.you": "{displayname} (jij) ",
  "channel_header.flagged": "Gemarkeerde Berichten",
@@ -1486,6 +1509,12 @@
  "claim.oauth_to_email.title": "Wissen {type} account naar e-mail",
  "confirm_modal.cancel": "Annuleren",
  "connecting_screen": "Verbindingen",
+  "convert_channel.cancel": "No, cancel",
+  "convert_channel.confirm": "Yes, convert to private channel",
+  "convert_channel.question1": "When you convert <strong>{display_name}</strong> to a private channel, history and membership are preserved. Publicly shared files remain accessible to anyone with the link. Membership in a private channel is by invitation only.",
+  "convert_channel.question2": "The change is permanent and cannot be undone.",
+  "convert_channel.question3": "Are you sure you want to convert <strong>{display_name}</strong> to a private channel?",
+  "convert_channel.title": "Convert {display_name} to a private channel?",
  "copy_url_context_menu.getChannelLink": "Kopieer link",
  "create_comment.addComment": "Voeg commentaar toe...",
  "create_comment.comment": "Voeg commentaar toe",
@@ -1600,6 +1629,7 @@
  "emoji_picker.search": "Zoeken",
  "emoji_picker.searchResults": "Zoekresultaten",
  "emoji_picker.symbols": "Symbols",
+  "ent.cluster.save_config_with_roles.error": "The following configuration settings cannot be saved when High Availability is enabled and the System Console is in read-only mode: {keys}.",
  "error.generic.link": "Terug naar {siteName}",
  "error.generic.link_message": "Terug naar {siteName}",
  "error.generic.message": "An error has occurred.",
@@ -2508,7 +2538,8 @@
  "setting_item_min.edit": "Bewerken",
  "setting_picture.cancel": "Annuleren",
  "setting_picture.help.profile": "Upload a picture in BMP, JPG or PNG format.",
-  "setting_picture.help.team": "Upload a team icon in BMP, JPG or PNG format.",
+  "setting_picture.help.team": "Upload a team icon in BMP, JPG or PNG format.<br>Square images with a solid background color are recommended.",
+  "setting_picture.remove": "Remove this icon",
  "setting_picture.save": "Opslaan",
  "setting_picture.select": "Selecteer",
  "setting_upload.import": "Importeer",
@@ -2668,6 +2699,10 @@
  "suggestion.mention.unread.channels": "Unread Channels",
  "suggestion.search.private": "Verlaat kanaal",
  "suggestion.search.public": "Publieke kanalen",
+  "system_notice.body.api3": "If you’ve created or installed integrations in the last two years, find out how <a href=\"https://about.mattermost.com/default-apiv3-deprecation-guide\" target=\"_blank\">upcoming changes</a> may affect them.",
+  "system_notice.dont_show": "Don't show again",
+  "system_notice.remind_me": "Remind me later",
+  "system_notice.title": "<strong>System Message</strong><br>from Mattermost",
  "system_users_list.count": "{count, number} {count, plural, one {user} other {users}}",
  "system_users_list.countPage": "{startCount, number} - {endCount, number} {count, plural, one {user} other {users}} of {total, number} total",
  "system_users_list.countSearch": "{count, number} {count, plural, one {user} other {users}} of {total, number} total",
@@ -2933,8 +2968,8 @@
  "user.settings.notifications.desktop.title": "Desktop Notificaties",
  "user.settings.notifications.desktop.unlimited": "Ongelimiteerd",
  "user.settings.notifications.desktopSounds": "Desktop meldings-geluid",
-  "user.settings.notifications.email.disabled": "Uitgeschakeld door de systeembeheerder",
-  "user.settings.notifications.email.disabled_long": "Email notifications have been disabled by your System Administrator.",
+  "user.settings.notifications.email.disabled": "Email notifications are not enabled",
+  "user.settings.notifications.email.disabled_long": "Email notifications have not been enabled by your System Administrator.",
  "user.settings.notifications.email.everyHour": "Elk uur",
  "user.settings.notifications.email.everyXMinutes": "Iedere  {count, plural, one {minute} other {{count, number} minutes}}",
  "user.settings.notifications.email.immediately": "Onmiddellijk",
@@ -2966,8 +3001,8 @@
  "user.settings.push_notification.allActivityOffline": "Voor alle activiteit wanneer offline",
  "user.settings.push_notification.allActivityOnline": "Voor alle activiteit wanneer online, afwezig of offline",
  "user.settings.push_notification.away": "Afwezig of offline",
-  "user.settings.push_notification.disabled": "Uitgeschakeld door de systeembeheerder",
-  "user.settings.push_notification.disabled_long": "Push Notifications are not enabled. Contact your System Administrator.",
+  "user.settings.push_notification.disabled": "Push notifications are not enabled",
+  "user.settings.push_notification.disabled_long": "Push notifications have not been enabled by your System Administrator.",
  "user.settings.push_notification.info": "Meldingen worden verstuurd naar uw mobiele apparaat wanneer er activiteit is in Mattermost.",
  "user.settings.push_notification.off": "Uit",
  "user.settings.push_notification.offline": "Offline",
--- a/assets/base/i18n/pl.json
+++ b/assets/base/i18n/pl.json
@@ -436,6 +436,27 @@
  "admin.email.smtpUsernameTitle": "Nazwa użytkownika SMTP:",
  "admin.email.testing": "Testowanie...",
  "admin.false": "fałsz",
+  "admin.field_names.allowBannerDismissal": "Allow banner dismissal",
+  "admin.field_names.bannerColor": "Banner color",
+  "admin.field_names.bannerText": "Banner text",
+  "admin.field_names.bannerTextColor": "Banner text color",
+  "admin.field_names.enableBanner": "Enable Announcement banner",
+  "admin.field_names.enableCommands": "Enable Custom Slash Commands",
+  "admin.field_names.enableConfirmNotificationsToChannel": "Show @channel and @all confirmation dialog",
+  "admin.field_names.enableIncomingWebhooks": "Enable Incomming Webhooks",
+  "admin.field_names.enableOAuthServiceProvider": "Enable OAuth 2.0 Service Provider",
+  "admin.field_names.enableOutgoingWebhooks": "Enable Outgoing Webhooks",
+  "admin.field_names.enablePostIconOverride": "Enable integrations to override profile picture icons",
+  "admin.field_names.enablePostUsernameOverride": "Enable integrations to override usernames",
+  "admin.field_names.enableUserAccessTokens": "Enable Personal Access Tokens",
+  "admin.field_names.enableUserCreation": "Enable Account Creation",
+  "admin.field_names.maxChannelsPerTeam": "Max Channels Per Team",
+  "admin.field_names.maxNotificationsPerChannel": "Max Notifications Per Channel",
+  "admin.field_names.maxUsersPerTeam": "Max Users Per Team",
+  "admin.field_names.postEditTimeLimit": "Edit post time limit",
+  "admin.field_names.restrictCreationToDomains": "Restrict account creation to specified email domains",
+  "admin.field_names.restrictDirectMessage": "Enable users to open Direct Message channels with",
+  "admin.field_names.teammateNameDisplay": "Teammate Name Display",
  "admin.file.enableFileAttachments": "Allow File Sharing:",
  "admin.file.enableFileAttachmentsDesc": "When false, disables file sharing on the server. All file and image uploads on messages are forbidden across clients and devices, including mobile.",
  "admin.file.enableMobileDownloadDesc": "When false, disables file downloads on mobile apps. Users can still download files from a mobile web browser.",
@@ -1252,6 +1273,7 @@
  "api.channel.delete_channel.archived": "{username} zarchiwizował kanał.",
  "api.channel.join_channel.post_and_forget": "{username} dołączył do kanału.",
  "api.channel.leave.left": "{username} opuścił kanał.",
+  "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} zmienia nazwę kanału z: {old} na: {new}",
  "api.channel.post_update_channel_header_message_and_forget.removed": "{username} usunął nagłówek kanału (był: {old})",
  "api.channel.post_update_channel_header_message_and_forget.updated_from": "{username} zaktualizował nagłówek kanału z: {old} na: {new}",
@@ -1356,6 +1378,7 @@
  "channel_header.addToFavorites": "Dodaj do ulubionych",
  "channel_header.channelHeader": "Edytuj nagłówek kanału",
  "channel_header.channelMembers": "Użytkownicy",
+  "channel_header.convert": "Convert to Private Channel",
  "channel_header.delete": "Usuń kanał",
  "channel_header.directchannel.you": "{displayname} (you) ",
  "channel_header.flagged": "Oznaczone posty",
@@ -1486,6 +1509,12 @@
  "claim.oauth_to_email.title": "Przełącz konto {type} na e-mail",
  "confirm_modal.cancel": "Anuluj",
  "connecting_screen": "Łączenie",
+  "convert_channel.cancel": "No, cancel",
+  "convert_channel.confirm": "Yes, convert to private channel",
+  "convert_channel.question1": "When you convert <strong>{display_name}</strong> to a private channel, history and membership are preserved. Publicly shared files remain accessible to anyone with the link. Membership in a private channel is by invitation only.",
+  "convert_channel.question2": "The change is permanent and cannot be undone.",
+  "convert_channel.question3": "Are you sure you want to convert <strong>{display_name}</strong> to a private channel?",
+  "convert_channel.title": "Convert {display_name} to a private channel?",
  "copy_url_context_menu.getChannelLink": "Kopiuj odnośnik",
  "create_comment.addComment": "Dodaj komentarz...",
  "create_comment.comment": "Dodaj komentarz",
@@ -1600,6 +1629,7 @@
  "emoji_picker.search": "Znajdź",
  "emoji_picker.searchResults": "Wyniki wyszukiwania",
  "emoji_picker.symbols": "Symbole",
+  "ent.cluster.save_config_with_roles.error": "The following configuration settings cannot be saved when High Availability is enabled and the System Console is in read-only mode: {keys}.",
  "error.generic.link": "Wróć do {siteName}",
  "error.generic.link_message": "Wróć do {siteName}",
  "error.generic.message": "Wystąpił błąd.",
@@ -2508,7 +2538,8 @@
  "setting_item_min.edit": "Edycja",
  "setting_picture.cancel": "Anuluj",
  "setting_picture.help.profile": "Upload a picture in BMP, JPG or PNG format.",
-  "setting_picture.help.team": "Upload a team icon in BMP, JPG or PNG format.",
+  "setting_picture.help.team": "Upload a team icon in BMP, JPG or PNG format.<br>Square images with a solid background color are recommended.",
+  "setting_picture.remove": "Remove this icon",
  "setting_picture.save": "Zapisz",
  "setting_picture.select": "Wybierz",
  "setting_upload.import": "Zaimportuj",
@@ -2668,6 +2699,10 @@
  "suggestion.mention.unread.channels": "Unread Channels",
  "suggestion.search.private": "Kanały prywatne",
  "suggestion.search.public": "Kanały publiczne",
+  "system_notice.body.api3": "If you’ve created or installed integrations in the last two years, find out how <a href=\"https://about.mattermost.com/default-apiv3-deprecation-guide\" target=\"_blank\">upcoming changes</a> may affect them.",
+  "system_notice.dont_show": "Don't show again",
+  "system_notice.remind_me": "Remind me later",
+  "system_notice.title": "<strong>System Message</strong><br>from Mattermost",
  "system_users_list.count": "{count, number} {count, plural, one {użytkownik} other {użytkowników}}",
  "system_users_list.countPage": "{startCount, number} - {endCount, number} {count, plural, one {użytkownik} other {użytkowników}} z {total, number} razem",
  "system_users_list.countSearch": "{count, number} {count, plural, one {użytkownik} other {użytkowników}} z {total, number} razem",
@@ -2933,7 +2968,7 @@
  "user.settings.notifications.desktop.title": "Powiadomienia na pulpicie",
  "user.settings.notifications.desktop.unlimited": "Bez ograniczeń",
  "user.settings.notifications.desktopSounds": "Dźwięk powiadomień",
-  "user.settings.notifications.email.disabled": "Wyłączone przez Administratora systemu",
+  "user.settings.notifications.email.disabled": "Email notifications are not enabled",
  "user.settings.notifications.email.disabled_long": "Powiadomienia e-mail zostały wyłączone przez administratora systemu.",
  "user.settings.notifications.email.everyHour": "Co godzinę",
  "user.settings.notifications.email.everyXMinutes": "Co {count, plural, one {minute} other {{count, number} minut}}",
@@ -2966,8 +3001,8 @@
  "user.settings.push_notification.allActivityOffline": "Dla wszystkich aktywności gdy offline",
  "user.settings.push_notification.allActivityOnline": "Dla wszystkich aktywności gdy online, offline lub zaraz wracam",
  "user.settings.push_notification.away": "Zaraz wracam lub offline",
-  "user.settings.push_notification.disabled": "Wyłączone przez Administratora",
-  "user.settings.push_notification.disabled_long": "Push Notifications are not enabled. Contact your System Administrator.",
+  "user.settings.push_notification.disabled": "Push notifications are not enabled",
+  "user.settings.push_notification.disabled_long": "Powiadomienia e-mail zostały wyłączone przez administratora systemu.",
  "user.settings.push_notification.info": "Powiadomienia są wysyłane do twojego urządzenia gdy coś się dzieje w Mattermost.",
  "user.settings.push_notification.off": "Wyłączone",
  "user.settings.push_notification.offline": "Offline",
--- a/assets/base/i18n/pt-BR.json
+++ b/assets/base/i18n/pt-BR.json
@@ -436,6 +436,27 @@
  "admin.email.smtpUsernameTitle": "Nome do Usuário do Servidor de SMTP:",
  "admin.email.testing": "Testando...",
  "admin.false": "falso",
+  "admin.field_names.allowBannerDismissal": "Allow banner dismissal",
+  "admin.field_names.bannerColor": "Banner color",
+  "admin.field_names.bannerText": "Banner text",
+  "admin.field_names.bannerTextColor": "Banner text color",
+  "admin.field_names.enableBanner": "Enable Announcement banner",
+  "admin.field_names.enableCommands": "Enable Custom Slash Commands",
+  "admin.field_names.enableConfirmNotificationsToChannel": "Show @channel and @all confirmation dialog",
+  "admin.field_names.enableIncomingWebhooks": "Enable Incomming Webhooks",
+  "admin.field_names.enableOAuthServiceProvider": "Enable OAuth 2.0 Service Provider",
+  "admin.field_names.enableOutgoingWebhooks": "Enable Outgoing Webhooks",
+  "admin.field_names.enablePostIconOverride": "Enable integrations to override profile picture icons",
+  "admin.field_names.enablePostUsernameOverride": "Enable integrations to override usernames",
+  "admin.field_names.enableUserAccessTokens": "Enable Personal Access Tokens",
+  "admin.field_names.enableUserCreation": "Enable Account Creation",
+  "admin.field_names.maxChannelsPerTeam": "Max Channels Per Team",
+  "admin.field_names.maxNotificationsPerChannel": "Max Notifications Per Channel",
+  "admin.field_names.maxUsersPerTeam": "Max Users Per Team",
+  "admin.field_names.postEditTimeLimit": "Edit post time limit",
+  "admin.field_names.restrictCreationToDomains": "Restrict account creation to specified email domains",
+  "admin.field_names.restrictDirectMessage": "Enable users to open Direct Message channels with",
+  "admin.field_names.teammateNameDisplay": "Teammate Name Display",
  "admin.file.enableFileAttachments": "Permitir Compartilhamento de Arquivo:",
  "admin.file.enableFileAttachmentsDesc": "Quando falso, desativa o compartilhamento de arquivos no servidor. Todos os carregamentos de arquivos e imagens em mensagens são proibidos entre clientes e dispositivos, incluindo dispositivos móveis.",
  "admin.file.enableMobileDownloadDesc": "Quando falso, desabilita downloads de arquivos em aplicativos para dispositivos móveis. Os usuários ainda podem baixar arquivos de um navegador da Web móvel.",
@@ -1252,6 +1273,7 @@
  "api.channel.delete_channel.archived": "{username} arquivou o canal.",
  "api.channel.join_channel.post_and_forget": "{username} juntou-se ao canal.",
  "api.channel.leave.left": "{username} deixou o canal.",
+  "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} atualizou o nome de exibição do canal de: {old} para: {new}",
  "api.channel.post_update_channel_header_message_and_forget.removed": "{username} removeu o cabeçalho do canal (era: {old})",
  "api.channel.post_update_channel_header_message_and_forget.updated_from": "{username} atualizou o cabeçalho do canal de: {old} para: {new}",
@@ -1356,6 +1378,7 @@
  "channel_header.addToFavorites": "Adicionar aos Favoritos",
  "channel_header.channelHeader": "Editar Cabeçalho do Canal",
  "channel_header.channelMembers": "Membros",
+  "channel_header.convert": "Convert to Private Channel",
  "channel_header.delete": "Excluir Canal",
  "channel_header.directchannel.you": "{displayname} (você) ",
  "channel_header.flagged": "Posts Marcados",
@@ -1486,6 +1509,12 @@
  "claim.oauth_to_email.title": "Trocar Conta {type} para E-mail",
  "confirm_modal.cancel": "Cancelar",
  "connecting_screen": "Conectando",
+  "convert_channel.cancel": "No, cancel",
+  "convert_channel.confirm": "Yes, convert to private channel",
+  "convert_channel.question1": "When you convert <strong>{display_name}</strong> to a private channel, history and membership are preserved. Publicly shared files remain accessible to anyone with the link. Membership in a private channel is by invitation only.",
+  "convert_channel.question2": "The change is permanent and cannot be undone.",
+  "convert_channel.question3": "Are you sure you want to convert <strong>{display_name}</strong> to a private channel?",
+  "convert_channel.title": "Convert {display_name} to a private channel?",
  "copy_url_context_menu.getChannelLink": "Copiar Link",
  "create_comment.addComment": "Adicionar um comentário...",
  "create_comment.comment": "Adicionar Comentário",
@@ -1600,6 +1629,7 @@
  "emoji_picker.search": "Buscar",
  "emoji_picker.searchResults": "Resultados da Pesquisa",
  "emoji_picker.symbols": "Símbolos",
+  "ent.cluster.save_config_with_roles.error": "The following configuration settings cannot be saved when High Availability is enabled and the System Console is in read-only mode: {keys}.",
  "error.generic.link": "Voltar para {siteName}",
  "error.generic.link_message": "Voltar para {siteName}",
  "error.generic.message": "Ocorreu um erro.",
@@ -2509,6 +2539,7 @@
  "setting_picture.cancel": "Cancelar",
  "setting_picture.help.profile": "Enviar uma imagem nos formatos BMP, JPG ou PNG.",
  "setting_picture.help.team": "Enviar uma imagem para ícone da equipe nos formatos BMP, JPG ou PNG.",
+  "setting_picture.remove": "Remove this icon",
  "setting_picture.save": "Salvar",
  "setting_picture.select": "Selecionar",
  "setting_upload.import": "Importar",
@@ -2668,6 +2699,10 @@
  "suggestion.mention.unread.channels": "Canais não Lidos",
  "suggestion.search.private": "Canais Privados",
  "suggestion.search.public": "Canais Públicos",
+  "system_notice.body.api3": "If you’ve created or installed integrations in the last two years, find out how <a href=\"https://about.mattermost.com/default-apiv3-deprecation-guide\" target=\"_blank\">upcoming changes</a> may affect them.",
+  "system_notice.dont_show": "Don't show again",
+  "system_notice.remind_me": "Remind me later",
+  "system_notice.title": "<strong>System Message</strong><br>from Mattermost",
  "system_users_list.count": "{count, number} {count, plural, one {usuário} other {usuários}}",
  "system_users_list.countPage": "{startCount, number} - {endCount, number} {count, plural, one {usuário} other {usuários}} de {total, number} no total",
  "system_users_list.countSearch": "{count, number} {count, plural, one {usuário} other {usuários}} de {total, number} no total",
@@ -2933,7 +2968,7 @@
  "user.settings.notifications.desktop.title": "Notificação no desktop",
  "user.settings.notifications.desktop.unlimited": "Ilimitado",
  "user.settings.notifications.desktopSounds": "Som de notificação no desktop",
-  "user.settings.notifications.email.disabled": "Desativado pelo Administrador do Sistema",
+  "user.settings.notifications.email.disabled": "Email notifications are not enabled",
  "user.settings.notifications.email.disabled_long": "As notificações por e-mail foram desativadas pelo Administrador do Sistema.",
  "user.settings.notifications.email.everyHour": "A cada hora",
  "user.settings.notifications.email.everyXMinutes": "A cada {count, plural, one {minuto} other {{count, number} minutos}}",
@@ -2966,8 +3001,8 @@
  "user.settings.push_notification.allActivityOffline": "Para toda atividade quando desconectado",
  "user.settings.push_notification.allActivityOnline": "Para toda atividade quando conectado, ausente ou desconectado",
  "user.settings.push_notification.away": "Ausente ou desconectado",
-  "user.settings.push_notification.disabled": "Desativado pelo Administrador do Sistema",
-  "user.settings.push_notification.disabled_long": "Notificações push não estão ativas. Entre em contado com o Administrador do Sistema.",
+  "user.settings.push_notification.disabled": "Push notifications are not enabled",
+  "user.settings.push_notification.disabled_long": "As notificações por e-mail foram desativadas pelo Administrador do Sistema.",
  "user.settings.push_notification.info": "Alertas de notificação são enviados para o seu dispositivo móvel quando há atividade no Mattermost.",
  "user.settings.push_notification.off": "Desligado",
  "user.settings.push_notification.offline": "Desconectado",
--- a/assets/base/i18n/ru.json
+++ b/assets/base/i18n/ru.json
@@ -436,6 +436,27 @@
  "admin.email.smtpUsernameTitle": "Имя пользователя SMTP:",
  "admin.email.testing": "Проверка...",
  "admin.false": "нет",
+  "admin.field_names.allowBannerDismissal": "Allow banner dismissal",
+  "admin.field_names.bannerColor": "Banner color",
+  "admin.field_names.bannerText": "Banner text",
+  "admin.field_names.bannerTextColor": "Banner text color",
+  "admin.field_names.enableBanner": "Enable Announcement banner",
+  "admin.field_names.enableCommands": "Enable Custom Slash Commands",
+  "admin.field_names.enableConfirmNotificationsToChannel": "Show @channel and @all confirmation dialog",
+  "admin.field_names.enableIncomingWebhooks": "Enable Incomming Webhooks",
+  "admin.field_names.enableOAuthServiceProvider": "Enable OAuth 2.0 Service Provider",
+  "admin.field_names.enableOutgoingWebhooks": "Enable Outgoing Webhooks",
+  "admin.field_names.enablePostIconOverride": "Enable integrations to override profile picture icons",
+  "admin.field_names.enablePostUsernameOverride": "Enable integrations to override usernames",
+  "admin.field_names.enableUserAccessTokens": "Enable Personal Access Tokens",
+  "admin.field_names.enableUserCreation": "Enable Account Creation",
+  "admin.field_names.maxChannelsPerTeam": "Max Channels Per Team",
+  "admin.field_names.maxNotificationsPerChannel": "Max Notifications Per Channel",
+  "admin.field_names.maxUsersPerTeam": "Max Users Per Team",
+  "admin.field_names.postEditTimeLimit": "Edit post time limit",
+  "admin.field_names.restrictCreationToDomains": "Restrict account creation to specified email domains",
+  "admin.field_names.restrictDirectMessage": "Enable users to open Direct Message channels with",
+  "admin.field_names.teammateNameDisplay": "Teammate Name Display",
  "admin.file.enableFileAttachments": "Разрешить общий доступ к файлам:",
  "admin.file.enableFileAttachmentsDesc": "Если выключено, отключает совместное использование файлов на сервере. Все загрузки файлов и изображений в сообщениях запрещены для клиентов и устройств, включая мобильные.",
  "admin.file.enableMobileDownloadDesc": "Если выключено, отключается загрузка файлов в мобильном приложении. Пользователи всё равно могут загружать файлы с помощью мобильного браузера.",
@@ -1252,6 +1273,7 @@
  "api.channel.delete_channel.archived": "{username} произвёл архивирование канала.",
  "api.channel.join_channel.post_and_forget": "{username} присоединился к каналу.",
  "api.channel.leave.left": "{username} покинул канал.",
+  "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}",
@@ -1356,6 +1378,7 @@
  "channel_header.addToFavorites": "Добавить в избранное",
  "channel_header.channelHeader": "Изменить заголовок канала",
  "channel_header.channelMembers": "Участники",
+  "channel_header.convert": "Convert to Private Channel",
  "channel_header.delete": "Удалить канал",
  "channel_header.directchannel.you": "{displayname} (you) ",
  "channel_header.flagged": "Отмеченные сообщения",
@@ -1486,6 +1509,12 @@
  "claim.oauth_to_email.title": "Переключить аккаунт {type} на E-Mail",
  "confirm_modal.cancel": "Отмена",
  "connecting_screen": "Подключение",
+  "convert_channel.cancel": "No, cancel",
+  "convert_channel.confirm": "Yes, convert to private channel",
+  "convert_channel.question1": "When you convert <strong>{display_name}</strong> to a private channel, history and membership are preserved. Publicly shared files remain accessible to anyone with the link. Membership in a private channel is by invitation only.",
+  "convert_channel.question2": "The change is permanent and cannot be undone.",
+  "convert_channel.question3": "Are you sure you want to convert <strong>{display_name}</strong> to a private channel?",
+  "convert_channel.title": "Convert {display_name} to a private channel?",
  "copy_url_context_menu.getChannelLink": "Скопировать ссылку",
  "create_comment.addComment": "Добавить комментарий...",
  "create_comment.comment": "Добавить комментарий",
@@ -1600,6 +1629,7 @@
  "emoji_picker.search": "Поиск",
  "emoji_picker.searchResults": "Результаты поиска",
  "emoji_picker.symbols": "Символы",
+  "ent.cluster.save_config_with_roles.error": "The following configuration settings cannot be saved when High Availability is enabled and the System Console is in read-only mode: {keys}.",
  "error.generic.link": "Возврат к {siteName}",
  "error.generic.link_message": "Возврат к {siteName}",
  "error.generic.message": "Произошла ошибка.",
@@ -2508,7 +2538,8 @@
  "setting_item_min.edit": "Изменить",
  "setting_picture.cancel": "Отмена",
  "setting_picture.help.profile": "Upload a picture in BMP, JPG or PNG format.",
-  "setting_picture.help.team": "Upload a team icon in BMP, JPG or PNG format.",
+  "setting_picture.help.team": "Upload a team icon in BMP, JPG or PNG format.<br>Square images with a solid background color are recommended.",
+  "setting_picture.remove": "Remove this icon",
  "setting_picture.save": "Сохранить",
  "setting_picture.select": "Выбрать",
  "setting_upload.import": "Импорт",
@@ -2668,6 +2699,10 @@
  "suggestion.mention.unread.channels": "Unread Channels",
  "suggestion.search.private": "Приватные каналы",
  "suggestion.search.public": "Общедоступные каналы",
+  "system_notice.body.api3": "If you’ve created or installed integrations in the last two years, find out how <a href=\"https://about.mattermost.com/default-apiv3-deprecation-guide\" target=\"_blank\">upcoming changes</a> may affect them.",
+  "system_notice.dont_show": "Don't show again",
+  "system_notice.remind_me": "Remind me later",
+  "system_notice.title": "<strong>System Message</strong><br>from Mattermost",
  "system_users_list.count": "{count, number} {count, plural, one {user} other {users}}",
  "system_users_list.countPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 участников} one {участник} few {участника} other {участников}} из {total}",
  "system_users_list.countSearch": "{startCount, number} - {endCount, number} {count, plural, =0 {0 участников} one {участник} few {участника} other {участников}} из {total}",
@@ -2933,8 +2968,8 @@
  "user.settings.notifications.desktop.title": "Оповещения на рабочий стол",
  "user.settings.notifications.desktop.unlimited": "Неограниченно",
  "user.settings.notifications.desktopSounds": "Звуковые оповещения на рабочий стол",
-  "user.settings.notifications.email.disabled": "Отключено администратором",
-  "user.settings.notifications.email.disabled_long": "Email notifications have been disabled by your System Administrator.",
+  "user.settings.notifications.email.disabled": "Email notifications are not enabled",
+  "user.settings.notifications.email.disabled_long": "Email notifications have not been enabled by your System Administrator.",
  "user.settings.notifications.email.everyHour": "Каждый час",
  "user.settings.notifications.email.everyXMinutes": "Каждые {count, plural, one {minute} other {{count, number} minutes}}",
  "user.settings.notifications.email.immediately": "Немедленно",
@@ -2966,8 +3001,8 @@
  "user.settings.push_notification.allActivityOffline": "Для всей активности когда оффлайн",
  "user.settings.push_notification.allActivityOnline": "Для всей активности когда онлайн, отошел или оффлайн",
  "user.settings.push_notification.away": "Отсутствует или не в сети",
-  "user.settings.push_notification.disabled": "Отключено системным администратором",
-  "user.settings.push_notification.disabled_long": "Push Notifications are not enabled. Contact your System Administrator.",
+  "user.settings.push_notification.disabled": "Push notifications are not enabled",
+  "user.settings.push_notification.disabled_long": "Push notifications have not been enabled by your System Administrator.",
  "user.settings.push_notification.info": "Notification alerts are pushed to your mobile device when there is activity in Mattermost.",
  "user.settings.push_notification.off": "Выкл",
  "user.settings.push_notification.offline": "Не в сети",
--- a/assets/base/i18n/tr.json
+++ b/assets/base/i18n/tr.json
@@ -436,6 +436,27 @@
  "admin.email.smtpUsernameTitle": "SMTP Sunucu Kullanıcı Adı:",
  "admin.email.testing": "Sınanıyor...",
  "admin.false": "yanlış",
+  "admin.field_names.allowBannerDismissal": "Allow banner dismissal",
+  "admin.field_names.bannerColor": "Banner color",
+  "admin.field_names.bannerText": "Banner text",
+  "admin.field_names.bannerTextColor": "Banner text color",
+  "admin.field_names.enableBanner": "Enable Announcement banner",
+  "admin.field_names.enableCommands": "Enable Custom Slash Commands",
+  "admin.field_names.enableConfirmNotificationsToChannel": "Show @channel and @all confirmation dialog",
+  "admin.field_names.enableIncomingWebhooks": "Enable Incomming Webhooks",
+  "admin.field_names.enableOAuthServiceProvider": "Enable OAuth 2.0 Service Provider",
+  "admin.field_names.enableOutgoingWebhooks": "Enable Outgoing Webhooks",
+  "admin.field_names.enablePostIconOverride": "Enable integrations to override profile picture icons",
+  "admin.field_names.enablePostUsernameOverride": "Enable integrations to override usernames",
+  "admin.field_names.enableUserAccessTokens": "Enable Personal Access Tokens",
+  "admin.field_names.enableUserCreation": "Enable Account Creation",
+  "admin.field_names.maxChannelsPerTeam": "Max Channels Per Team",
+  "admin.field_names.maxNotificationsPerChannel": "Max Notifications Per Channel",
+  "admin.field_names.maxUsersPerTeam": "Max Users Per Team",
+  "admin.field_names.postEditTimeLimit": "Edit post time limit",
+  "admin.field_names.restrictCreationToDomains": "Restrict account creation to specified email domains",
+  "admin.field_names.restrictDirectMessage": "Enable users to open Direct Message channels with",
+  "admin.field_names.teammateNameDisplay": "Teammate Name Display",
  "admin.file.enableFileAttachments": "Dosya Paylaşılabilsin:",
  "admin.file.enableFileAttachmentsDesc": "Bu seçenek devre dışı bırakıldığında, sunucu üzerinde dosya paylaşımı yapılamaz. İletilere yüklenmiş dosya ve görsellere mobil aygıtlar dahil olmak üzere hiç bir istemci ve aygıt tarafından erişilemez.",
  "admin.file.enableMobileDownloadDesc": "Bu seçenek devre dışı bırakıldığında, dosyalar mobil uygulamalardan indirilemez. Ancak kullanıcılar dosyaları mobil web tarayıcılar üzerinden indirebilir.",
@@ -1252,6 +1273,7 @@
  "api.channel.delete_channel.archived": "{username} kanalı arşivledi.",
  "api.channel.join_channel.post_and_forget": "{username} kanala katıldı.",
  "api.channel.leave.left": "{username} kanaldan ayrıldı.",
+  "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} eski kanal adını {new} olarak değiştirdi",
  "api.channel.post_update_channel_header_message_and_forget.removed": "{username} kanal başlığını kaldırdı (önceki: {old})",
  "api.channel.post_update_channel_header_message_and_forget.updated_from": "{username}, {old} eski kanal başlığını {new} olarak değiştirdi",
@@ -1356,6 +1378,7 @@
  "channel_header.addToFavorites": "Beğendiklerime Ekle",
  "channel_header.channelHeader": "Kanal Başlığını Düzenle",
  "channel_header.channelMembers": "Üyeler",
+  "channel_header.convert": "Convert to Private Channel",
  "channel_header.delete": "Kanalı Sil",
  "channel_header.directchannel.you": "{displayname} (siz) ",
  "channel_header.flagged": "İşaretlenmiş İletiler",
@@ -1486,6 +1509,12 @@
  "claim.oauth_to_email.title": "{type} hesabını e-posta olarak değiştir",
  "confirm_modal.cancel": "İptal",
  "connecting_screen": "Bağlanıyor",
+  "convert_channel.cancel": "No, cancel",
+  "convert_channel.confirm": "Yes, convert to private channel",
+  "convert_channel.question1": "When you convert <strong>{display_name}</strong> to a private channel, history and membership are preserved. Publicly shared files remain accessible to anyone with the link. Membership in a private channel is by invitation only.",
+  "convert_channel.question2": "The change is permanent and cannot be undone.",
+  "convert_channel.question3": "Are you sure you want to convert <strong>{display_name}</strong> to a private channel?",
+  "convert_channel.title": "Convert {display_name} to a private channel?",
  "copy_url_context_menu.getChannelLink": "Bağlantıyı Kopyala",
  "create_comment.addComment": "Yorum yazın...",
  "create_comment.comment": "Yorum Yazın",
@@ -1600,6 +1629,7 @@
  "emoji_picker.search": "Arama",
  "emoji_picker.searchResults": "Arama Sonuçları",
  "emoji_picker.symbols": "Simgeler",
+  "ent.cluster.save_config_with_roles.error": "The following configuration settings cannot be saved when High Availability is enabled and the System Console is in read-only mode: {keys}.",
  "error.generic.link": "{siteName} Sitesine Geri Dön",
  "error.generic.link_message": "{siteName} Sitesine Geri Dön",
  "error.generic.message": "Bir sorun çıktı.",
@@ -2509,6 +2539,7 @@
  "setting_picture.cancel": "İptal",
  "setting_picture.help.profile": "BMP, JPG ya da PNG biçiminde bir görsel yükleyin.",
  "setting_picture.help.team": "BMP, JPG ya da PNG biçiminde bir takım simgesi yükleyin.",
+  "setting_picture.remove": "Remove this icon",
  "setting_picture.save": "Kaydet",
  "setting_picture.select": "Seçin",
  "setting_upload.import": "İçe Aktar",
@@ -2668,6 +2699,10 @@
  "suggestion.mention.unread.channels": "Okunmamış Kanallar",
  "suggestion.search.private": "Özel Kanallar",
  "suggestion.search.public": "Herkese Açık Kanallar",
+  "system_notice.body.api3": "If you’ve created or installed integrations in the last two years, find out how <a href=\"https://about.mattermost.com/default-apiv3-deprecation-guide\" target=\"_blank\">upcoming changes</a> may affect them.",
+  "system_notice.dont_show": "Don't show again",
+  "system_notice.remind_me": "Remind me later",
+  "system_notice.title": "<strong>System Message</strong><br>from Mattermost",
  "system_users_list.count": "{count, number} {count, plural, bir {user} diğer {users}}",
  "system_users_list.countPage": "{startCount, number} - {endCount, number} {count, plural, one {user} other {users}} / {total, number}",
  "system_users_list.countSearch": "{count, number} {count, plural, one {user} other {users}} / {total, number}",
@@ -2933,7 +2968,7 @@
  "user.settings.notifications.desktop.title": "Masaüstü Bildirimleri",
  "user.settings.notifications.desktop.unlimited": "Sınırsız",
  "user.settings.notifications.desktopSounds": "Masaüstü bildirimi sesi",
-  "user.settings.notifications.email.disabled": "Sistem yöneticisi tarafından devre dışı bırakılmış",
+  "user.settings.notifications.email.disabled": "Email notifications are not enabled",
  "user.settings.notifications.email.disabled_long": "E-posta bildirimleri sistem yöneticiniz tarafından devre dışı bırakılmış.",
  "user.settings.notifications.email.everyHour": "Saat başı",
  "user.settings.notifications.email.everyXMinutes": "Her {count, plural, bir {minute} diğer {{count, number} minutes}}",
@@ -2966,8 +3001,8 @@
  "user.settings.push_notification.allActivityOffline": "Çevrimdışı iken tüm işlemler için",
  "user.settings.push_notification.allActivityOnline": "Çevrimiçi, uzakta ya da çevrimdışı iken tüm işlemler için",
  "user.settings.push_notification.away": "Uzakta ya da çevrimdışı",
-  "user.settings.push_notification.disabled": "Sistem yöneticisi tarafından devre dışı bırakılmış",
-  "user.settings.push_notification.disabled_long": "Anında Bildirimler devre dışı bırakılmış. Sistem Yöneticiniz ile görüşün.",
+  "user.settings.push_notification.disabled": "Push notifications are not enabled",
+  "user.settings.push_notification.disabled_long": "E-posta bildirimleri sistem yöneticiniz tarafından devre dışı bırakılmış.",
  "user.settings.push_notification.info": "Bildirim uyarıları Mattermost işlemleri yapıldığında mobil aygıtınıza iletilir.",
  "user.settings.push_notification.off": "Kapalı",
  "user.settings.push_notification.offline": "Çevrimdışı",
--- a/assets/base/i18n/zh-CN.json
+++ b/assets/base/i18n/zh-CN.json
@@ -436,6 +436,27 @@
  "admin.email.smtpUsernameTitle": "SMTP服务器用户名：",
  "admin.email.testing": "测试中...",
  "admin.false": "否",
+  "admin.field_names.allowBannerDismissal": "Allow banner dismissal",
+  "admin.field_names.bannerColor": "Banner color",
+  "admin.field_names.bannerText": "Banner text",
+  "admin.field_names.bannerTextColor": "Banner text color",
+  "admin.field_names.enableBanner": "Enable Announcement banner",
+  "admin.field_names.enableCommands": "Enable Custom Slash Commands",
+  "admin.field_names.enableConfirmNotificationsToChannel": "Show @channel and @all confirmation dialog",
+  "admin.field_names.enableIncomingWebhooks": "Enable Incomming Webhooks",
+  "admin.field_names.enableOAuthServiceProvider": "Enable OAuth 2.0 Service Provider",
+  "admin.field_names.enableOutgoingWebhooks": "Enable Outgoing Webhooks",
+  "admin.field_names.enablePostIconOverride": "Enable integrations to override profile picture icons",
+  "admin.field_names.enablePostUsernameOverride": "Enable integrations to override usernames",
+  "admin.field_names.enableUserAccessTokens": "Enable Personal Access Tokens",
+  "admin.field_names.enableUserCreation": "Enable Account Creation",
+  "admin.field_names.maxChannelsPerTeam": "Max Channels Per Team",
+  "admin.field_names.maxNotificationsPerChannel": "Max Notifications Per Channel",
+  "admin.field_names.maxUsersPerTeam": "Max Users Per Team",
+  "admin.field_names.postEditTimeLimit": "Edit post time limit",
+  "admin.field_names.restrictCreationToDomains": "Restrict account creation to specified email domains",
+  "admin.field_names.restrictDirectMessage": "Enable users to open Direct Message channels with",
+  "admin.field_names.teammateNameDisplay": "Teammate Name Display",
  "admin.file.enableFileAttachments": "允许文件共享：",
  "admin.file.enableFileAttachmentsDesc": "当设为否时，文件共享将在本服务器停用。所有消息里上传的文件和图片将在所有客户端和设备禁止访问。",
  "admin.file.enableMobileDownloadDesc": "当设为否时，将禁止使用移动应用下载文件。用户将仍可以使用移动网页浏览器下载。",
@@ -1252,6 +1273,7 @@
  "api.channel.delete_channel.archived": "{username} 归档了频道。",
  "api.channel.join_channel.post_and_forget": "{username} 加入了频道。",
  "api.channel.leave.left": "{username} 离开了频道。",
+  "api.channel.post_convert_channel_to_private.updated_from": "{username} 将频道从公开转换成私有",
  "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}",
@@ -1356,6 +1378,7 @@
  "channel_header.addToFavorites": "添加到收藏",
  "channel_header.channelHeader": "编辑频道标题",
  "channel_header.channelMembers": "成员",
+  "channel_header.convert": "转换至私有频道",
  "channel_header.delete": "删除频道",
  "channel_header.directchannel.you": "{displayname} (您) ",
  "channel_header.flagged": "已标记的信息",
@@ -1486,6 +1509,12 @@
  "claim.oauth_to_email.title": "切换{type}账户为邮箱",
  "confirm_modal.cancel": "取消",
  "connecting_screen": "正在连接",
+  "convert_channel.cancel": "不，取消",
+  "convert_channel.confirm": "是的，转换到私有频道",
+  "convert_channel.question1": "When you convert <strong>{display_name}</strong> to a private channel, history and membership are preserved. Publicly shared files remain accessible to anyone with the link. Membership in a private channel is by invitation only.",
+  "convert_channel.question2": "此变更是永久的且不能撤销。",
+  "convert_channel.question3": "您确定要转换<strong>{display_name}</strong>为私有频道吗？",
+  "convert_channel.title": "转换 {display_name} 成私有频道？",
  "copy_url_context_menu.getChannelLink": "复制链接",
  "create_comment.addComment": "添加一个评论...",
  "create_comment.comment": "添加评论",
@@ -1600,6 +1629,7 @@
  "emoji_picker.search": "搜索",
  "emoji_picker.searchResults": "搜索结果",
  "emoji_picker.symbols": "符号",
+  "ent.cluster.save_config_with_roles.error": "The following configuration settings cannot be saved when High Availability is enabled and the System Console is in read-only mode: {keys}.",
  "error.generic.link": "返回到 {siteName}",
  "error.generic.link_message": "返回到 {siteName}",
  "error.generic.message": "发生了错误。",
@@ -2509,6 +2539,7 @@
  "setting_picture.cancel": "取消",
  "setting_picture.help.profile": "上传一个以 BMP、JPG 或 PNG 格式的图片。",
  "setting_picture.help.team": "上传一个以 BMP、JPG 或 PNG 格式的团队图标。",
+  "setting_picture.remove": "Remove this icon",
  "setting_picture.save": "保存",
  "setting_picture.select": "选择",
  "setting_upload.import": "导入",
@@ -2668,6 +2699,10 @@
  "suggestion.mention.unread.channels": "未读频道",
  "suggestion.search.private": "私有频道",
  "suggestion.search.public": "公共频道",
+  "system_notice.body.api3": "If you’ve created or installed integrations in the last two years, find out how <a href=\"https://about.mattermost.com/default-apiv3-deprecation-guide\" target=\"_blank\">upcoming changes</a> may affect them.",
+  "system_notice.dont_show": "不再显示",
+  "system_notice.remind_me": "稍后提醒",
+  "system_notice.title": "来自 Mattermost 的<strong>系统消息</strong><br>",
  "system_users_list.count": "{count, number} 位用户",
  "system_users_list.countPage": "{startCount, number} - {endCount, number} {count} 位用户，共 {total, number} 位",
  "system_users_list.countSearch": "{count, number} 位用户，共 {total, number}",
@@ -2933,8 +2968,8 @@
  "user.settings.notifications.desktop.title": "桌面通知",
  "user.settings.notifications.desktop.unlimited": "无限制",
  "user.settings.notifications.desktopSounds": "桌面通知声音",
-  "user.settings.notifications.email.disabled": "被系统管理员禁用",
-  "user.settings.notifications.email.disabled_long": "您的系统管理员已禁用邮件通知。",
+  "user.settings.notifications.email.disabled": "邮件通知未开启",
+  "user.settings.notifications.email.disabled_long": "您的系统管理员未开启用邮件通知。",
  "user.settings.notifications.email.everyHour": "每小时",
  "user.settings.notifications.email.everyXMinutes": "每 {count} 分钟",
  "user.settings.notifications.email.immediately": "立刻",
@@ -2966,8 +3001,8 @@
  "user.settings.push_notification.allActivityOffline": "所有离线时的活动",
  "user.settings.push_notification.allActivityOnline": "所有在线，离开或离线时的活动",
  "user.settings.push_notification.away": "离开或离线",
-  "user.settings.push_notification.disabled": "被系统管理员禁用",
-  "user.settings.push_notification.disabled_long": "推送未开启。联系您的系统管理员。",
+  "user.settings.push_notification.disabled": "推送通知未开启",
+  "user.settings.push_notification.disabled_long": "您的系统管理员未开启推送通知。",
  "user.settings.push_notification.info": "当 Mattermost 有活动时会推送通知到您的移动设备。",
  "user.settings.push_notification.off": "关闭",
  "user.settings.push_notification.offline": "离线",
--- a/assets/base/i18n/zh-TW.json
+++ b/assets/base/i18n/zh-TW.json
@@ -436,6 +436,27 @@
  "admin.email.smtpUsernameTitle": "SMTP 伺服器使用者名稱：",
  "admin.email.testing": "測試中...",
  "admin.false": "否",
+  "admin.field_names.allowBannerDismissal": "Allow banner dismissal",
+  "admin.field_names.bannerColor": "Banner color",
+  "admin.field_names.bannerText": "Banner text",
+  "admin.field_names.bannerTextColor": "Banner text color",
+  "admin.field_names.enableBanner": "Enable Announcement banner",
+  "admin.field_names.enableCommands": "Enable Custom Slash Commands",
+  "admin.field_names.enableConfirmNotificationsToChannel": "Show @channel and @all confirmation dialog",
+  "admin.field_names.enableIncomingWebhooks": "Enable Incomming Webhooks",
+  "admin.field_names.enableOAuthServiceProvider": "Enable OAuth 2.0 Service Provider",
+  "admin.field_names.enableOutgoingWebhooks": "Enable Outgoing Webhooks",
+  "admin.field_names.enablePostIconOverride": "Enable integrations to override profile picture icons",
+  "admin.field_names.enablePostUsernameOverride": "Enable integrations to override usernames",
+  "admin.field_names.enableUserAccessTokens": "Enable Personal Access Tokens",
+  "admin.field_names.enableUserCreation": "Enable Account Creation",
+  "admin.field_names.maxChannelsPerTeam": "Max Channels Per Team",
+  "admin.field_names.maxNotificationsPerChannel": "Max Notifications Per Channel",
+  "admin.field_names.maxUsersPerTeam": "Max Users Per Team",
+  "admin.field_names.postEditTimeLimit": "Edit post time limit",
+  "admin.field_names.restrictCreationToDomains": "Restrict account creation to specified email domains",
+  "admin.field_names.restrictDirectMessage": "Enable users to open Direct Message channels with",
+  "admin.field_names.teammateNameDisplay": "Teammate Name Display",
  "admin.file.enableFileAttachments": "允許檔案分享：",
  "admin.file.enableFileAttachmentsDesc": "停用時，關閉此伺服器的檔案分享。所有的用戶端與裝置將禁止附加檔案及圖片於訊息，包括行動裝置。",
  "admin.file.enableMobileDownloadDesc": "停用時，關閉行動裝置 App 的檔案下載。使用者依然可以由行動裝置的網頁瀏覽器下載檔案。",
@@ -1252,6 +1273,7 @@
  "api.channel.delete_channel.archived": "{username} 已封存頻道。",
  "api.channel.join_channel.post_and_forget": "{username} 已加入頻道。",
  "api.channel.leave.left": "{username} 已離開頻道。",
+  "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}",
@@ -1356,6 +1378,7 @@
  "channel_header.addToFavorites": "新增至我的最愛",
  "channel_header.channelHeader": "編輯頻道標題",
  "channel_header.channelMembers": "成員",
+  "channel_header.convert": "Convert to Private Channel",
  "channel_header.delete": "刪除頻道",
  "channel_header.directchannel.you": "{displayname} (你) ",
  "channel_header.flagged": "被標記的訊息",
@@ -1486,6 +1509,12 @@
  "claim.oauth_to_email.title": "由 {type} 帳號切換成電子郵件地址",
  "confirm_modal.cancel": "取消",
  "connecting_screen": "連線中",
+  "convert_channel.cancel": "No, cancel",
+  "convert_channel.confirm": "Yes, convert to private channel",
+  "convert_channel.question1": "When you convert <strong>{display_name}</strong> to a private channel, history and membership are preserved. Publicly shared files remain accessible to anyone with the link. Membership in a private channel is by invitation only.",
+  "convert_channel.question2": "The change is permanent and cannot be undone.",
+  "convert_channel.question3": "Are you sure you want to convert <strong>{display_name}</strong> to a private channel?",
+  "convert_channel.title": "Convert {display_name} to a private channel?",
  "copy_url_context_menu.getChannelLink": "複製連結",
  "create_comment.addComment": "新增註解...",
  "create_comment.comment": "新增註解",
@@ -1600,6 +1629,7 @@
  "emoji_picker.search": "搜尋",
  "emoji_picker.searchResults": "搜尋結果",
  "emoji_picker.symbols": "符號",
+  "ent.cluster.save_config_with_roles.error": "The following configuration settings cannot be saved when High Availability is enabled and the System Console is in read-only mode: {keys}.",
  "error.generic.link": "回到 {siteName}",
  "error.generic.link_message": "回到 {siteName}",
  "error.generic.message": "發生錯誤。",
@@ -2509,6 +2539,7 @@
  "setting_picture.cancel": "取消",
  "setting_picture.help.profile": "上傳格式為 BMP、JPG 或 PNG 的圖片",
  "setting_picture.help.team": "上傳格式為 BMP、JPG 或 PNG 的團隊標誌",
+  "setting_picture.remove": "Remove this icon",
  "setting_picture.save": "儲存",
  "setting_picture.select": "選擇",
  "setting_upload.import": "匯入",
@@ -2668,6 +2699,10 @@
  "suggestion.mention.unread.channels": "有未讀訊息的頻道",
  "suggestion.search.private": "私人頻道",
  "suggestion.search.public": "公開頻道",
+  "system_notice.body.api3": "If you’ve created or installed integrations in the last two years, find out how <a href=\"https://about.mattermost.com/default-apiv3-deprecation-guide\" target=\"_blank\">upcoming changes</a> may affect them.",
+  "system_notice.dont_show": "Don't show again",
+  "system_notice.remind_me": "Remind me later",
+  "system_notice.title": "<strong>System Message</strong><br>from Mattermost",
  "system_users_list.count": "{count, number}使用者",
  "system_users_list.countPage": "{total, number}位中{startCount, number} - {endCount, number}位使用者",
  "system_users_list.countSearch": "{total, number}位中{count, number}位使用者",
@@ -2933,7 +2968,7 @@
  "user.settings.notifications.desktop.title": "桌面通知",
  "user.settings.notifications.desktop.unlimited": "無限制",
  "user.settings.notifications.desktopSounds": "桌面通知音效",
-  "user.settings.notifications.email.disabled": "被系統管理員停用",
+  "user.settings.notifications.email.disabled": "Email notifications are not enabled",
  "user.settings.notifications.email.disabled_long": "電子郵件通知已被系統管理員停用。",
  "user.settings.notifications.email.everyHour": "每小時",
  "user.settings.notifications.email.everyXMinutes": "每 {count} 分鐘",
@@ -2966,8 +3001,8 @@
  "user.settings.push_notification.allActivityOffline": "離線時的所有活動",
  "user.settings.push_notification.allActivityOnline": "線上、離開或離線時的所有活動",
  "user.settings.push_notification.away": "離開或離線",
-  "user.settings.push_notification.disabled": "被系統管理員停用",
-  "user.settings.push_notification.disabled_long": "沒有啟用推播通知。請聯絡系統管理員。",
+  "user.settings.push_notification.disabled": "Push notifications are not enabled",
+  "user.settings.push_notification.disabled_long": "電子郵件通知已被系統管理員停用。",
  "user.settings.push_notification.info": "當 Mattermost 有活動時會推發通知提醒到您的行動裝置。",
  "user.settings.push_notification.off": "關閉",
  "user.settings.push_notification.offline": "離線",
Author	SHA1	Message	Date
Harrison Healey	7b32fc16c0	MM-10617 Fixed checking if a link is an image	2018-05-17 14:59:14 -04:00
Elias Nahum	bb2df059fc	translations PR 20180430 (#1648 )	2018-05-01 10:16:21 -03:00