translations PR 20161128 (#4666)

11 files changed, 246 insertions, 146 deletions

diff --git a/webapp/i18n/de.json b/webapp/i18n/de.json
index f4db655dc..733eeb999 100644
--- a/webapp/i18n/de.json
+++ b/webapp/i18n/de.json
@@ -73,7 +73,7 @@
   "add_emoji.header": "Hinzufügen",
   "add_emoji.image": "Bild",
   "add_emoji.image.button": "Auswählen",
-  "add_emoji.image.help": "Wählen Sie ein Bild für Ihren Emoji aus. Das Bild kann eine gif, png oder jpeg-Datei sein. Die maximale Größe beträgt 64 KB und 128 x 128 pixel.",
+  "add_emoji.image.help": "Choose the image for your emoji. The image can be a gif, png, or jpeg file with a max size of 1 MB. Dimensions will automatically resize to fit 128 by 128 pixels but keeping aspect ratio.",
   "add_emoji.imageRequired": "Für das Emoji ist ein Bild erforderlich",
   "add_emoji.name": "Name",
   "add_emoji.name.help": "Wählen Sie einen Namen für Ihren Emoji. Der Name darf maximal 64 Zeichen lang sein und kann aus Kleinbuchstaben, Zahlen und den Symbolen '-' und '_' bestehen.",
@@ -137,6 +137,7 @@
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "Erstes Wort entspricht exakt einem Auslösewort",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "Erstes Wort startet mit dem Auslösewort",
   "admin.advance.cluster": "High Availability (Beta)",
+  "admin.advance.metrics": "Performance Monitoring (Beta)",
   "admin.audits.reload": "Benutzeraktivitäten Log neuladen",
   "admin.audits.title": "Benutzeraktivitäten Log",
   "admin.authentication.email": "E-Mail Authentisierung",
@@ -495,6 +496,11 @@
   "admin.log.logSettings": "Protokoll-Einstellungen",
   "admin.logs.reload": "Erneut laden",
   "admin.logs.title": "Serverprotokoll",
+  "admin.metrics.enableDescription": "When true, Mattermost will enable performance monitoring collection and profiling. Please see <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target=\"_blank\">documentation</a> to learn more about configuring performance monitoring for Mattermost.",
+  "admin.metrics.enableTitle": "Performance Monitoring aktivieren",
+  "admin.metrics.listenAddressDesc": "The address the server will listen on to expose performance metrics.",
+  "admin.metrics.listenAddressEx": "z.B.: \":8065\"",
+  "admin.metrics.listenAddressTitle": "Empfangs-Adresse:",
   "admin.nav.help": "Hilfe",
   "admin.nav.logout": "Abmelden",
   "admin.nav.report": "Fehler melden",
@@ -725,6 +731,7 @@
   "admin.sidebar.logging": "Protokollierung",
   "admin.sidebar.login": "Anmelden",
   "admin.sidebar.logs": "Protokolle",
+  "admin.sidebar.metrics": "Performance Monitoring (Beta)",
   "admin.sidebar.nativeAppLinks": "Mattermost App Links",
   "admin.sidebar.notifications": "Benachrichtigungen",
   "admin.sidebar.oauth": "OAuth 2.0",
@@ -800,6 +807,9 @@
   "admin.team.maxChannelsDescription": "Maximale Anzahl an Kanälen pro Team, inklusive aktiven und gelöschten Kanälen.",
   "admin.team.maxChannelsExample": "z.B.: \"100\"",
   "admin.team.maxChannelsTitle": "Maximal Kanäle pro Team:",
+  "admin.team.maxNotificationsPerChannelDescription": "Maximum total number of users in a channel before users typing messages, @all, @here, and @channel no longer send notifications because of performance.",
+  "admin.team.maxNotificationsPerChannelExample": "z.B.: \"1000\"",
+  "admin.team.maxNotificationsPerChannelTitle": "Max Notifications Per Channel:",
   "admin.team.maxUsersDescription": "Maximale Anzahl an Benutzern pro Team, inklusive Aktive und Inaktive Benutzer.",
   "admin.team.maxUsersExample": "z.B.: \"25\"",
   "admin.team.maxUsersTitle": "Max Benutzer pro Team:",
@@ -1020,7 +1030,7 @@
   "channel_header.viewInfo": "Info anzeigen",
   "channel_header.viewMembers": "Zeige Mitglieder",
   "channel_header.webrtc.call": "Videoanruf starten",
-  "channel_header.webrtc.offline": "The user is offline",
+  "channel_header.webrtc.offline": "Der Benutzer ist offline",
   "channel_header.webrtc.unavailable": "Neuer Anruf nicht möglich bis ihr bestehender Anruf beendet ist",
   "channel_info.about": "Über",
   "channel_info.close": "Schließen",
@@ -1121,7 +1131,7 @@
   "claim.oauth_to_email.switchTo": "Wechsel von {type} auf E-Mail-Adresse und Passwort",
   "claim.oauth_to_email.title": "Von {type} Account auf E-Mail wechseln",
   "confirm_modal.cancel": "Abbrechen",
-  "connecting_screen": "Verbindungen",
+  "connecting_screen": "Verbindung wird aufgebaut",
   "create_comment.addComment": "Kommentar hinzufügen...",
   "create_comment.comment": "Kommentar hinzufügen",
   "create_comment.commentLength": "Kommentarlänge muss weniger als {max} Zeichen lang sein.",
@@ -1133,7 +1143,7 @@
   "create_post.shortcutsNotSupported": "Tastenkürzel werden auf Ihrem Gerät nicht unterstützt.",
   "create_post.tutorialTip": "<h4>Nachrichten senden</h4><p>Geben Sie hier Ihre Nachricht ein und drücken Sie <strong>Enter</strong> um sie senden.</p><p>Klicken Sie den <strong>Anhang</strong> Button um ein Bild oder eine Datei hochzuladen.</p>",
   "create_post.write": "Schreiben Sie eine Nachricht...",
-  "create_team.agreement": "Wenn Sie die Erstellung Ihres Accounts fortsetzen und {siteName} nutzen, verstehen Sie sich mit unseren <a href='/static/help/terms.html'>Nutzungsbedingungen</a> und <a href='/static/help/privacy.html'>Datenschutzbedingungen</a> einverstanden. Wenn Sie nicht zustimmen, dürfen Sie {siteName} nicht nutzen.",
+  "create_team.agreement": "Wenn Sie die Erstellung Ihres Accounts fortsetzen und {siteName} nutzen, verstehen Sie sich mit unseren <a href={TermsOfServiceLink}>Nutzungsbedingungen</a> und <a href={PrivacyPolicyLink}>Datenschutzbedingungen</a> einverstanden. Wenn Sie nicht zustimmen, dürfen Sie {siteName} nicht nutzen.",
   "create_team.display_name.back": "Zurück zum vorherigem Schritt",
   "create_team.display_name.charLength": "Der Name muss mindestens 2 Zeichen und darf maximal 15 Zeichen lang sein",
   "create_team.display_name.nameHelp": "Benennen Sie Ihr Team in jeglicher Sprache. Ihr Teamname wird in Menüs und Überschriften angezeigt.",
@@ -1141,7 +1151,7 @@
   "create_team.display_name.required": "Dieses Feld ist erforderlich",
   "create_team.display_name.teamName": "Teamname",
   "create_team.team_url.back": "Zurück zum vorigen Schritt",
-  "create_team.team_url.charLength": "Der Name muss mindestens 2 Zeichen und darf maximal 15 Zeichen lang sein",
+  "create_team.team_url.charLength": "Der Name muss mindestens {min} und darf maximal {max} Zeichen lang sein",
   "create_team.team_url.creatingTeam": "Erstelle Team...",
   "create_team.team_url.finish": "Fertigstellen",
   "create_team.team_url.hint": "<li>Kurz und gut merkbar ist von Vorteil</li><li>Nur Kleinbuchstaben, Ziffern und Bindestriche verwenden</li><li>Es muss mit einem Buchstaben begonnen werden und darf nicht mit einem Bindestrich enden.</li>",
@@ -1181,7 +1191,7 @@
   "edit_channel_purpose_modal.save": "Speichern",
   "edit_channel_purpose_modal.title1": "Zweck bearbeiten",
   "edit_channel_purpose_modal.title2": "Zweck bearbeiten für ",
-  "edit_command.save": "Update",
+  "edit_command.save": "Aktualisieren",
   "edit_post.cancel": "Abbrechen",
   "edit_post.edit": "{title} bearbeiten",
   "edit_post.editPost": "Nachricht bearbeiten...",
@@ -1235,7 +1245,7 @@
   "filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 Mitglieder} one {Mitglied} other {Mitglieder}} von {total} insgesamt",
   "filtered_user_list.member": "Mitglied",
   "filtered_user_list.search": "Mit Eingabe beginnen um zu suchen",
-  "filtered_user_list.searchButton": "Suche",
+  "filtered_user_list.searchButton": "Suchen",
   "filtered_user_list.show": "Filter:",
   "filtered_user_list.team_only": "Mitglieder dieses Teams",
   "find_team.email": "E-Mail",
@@ -1440,7 +1450,7 @@
   "intro_messages.anyMember": " Jedes Mitglied kann diesem Kanal beitreten und folgen.",
   "intro_messages.beginning": "Start von {name}",
   "intro_messages.channel": "Kanal",
-  "intro_messages.creator": "Dies ist der Start von {type} {name}, erstellt am {date}.",
+  "intro_messages.creator": "Dies ist der Start von {type} {name}, erstellt durch {creator} am {date}.",
   "intro_messages.default": "<h4 class='channel-intro__title'>Start von {display_name}</h4><p class='channel-intro__content'><strong>Willkommen zu {display_name}!</strong><br/><br/>Dies ist der erste Kanal den Teammitglieder sehen sobald sie sich registrieren - verwenden Sie Ihn um Nachrichten zu senden die jeder wissen sollte.</p>",
   "intro_messages.group": "Private Gruppe",
   "intro_messages.invite": "Laden Sie andere zu {type} ein",
@@ -1636,10 +1646,10 @@
   "rhs_header.backToFlaggedTooltip": "Zurück zu markierten Nachrichten",
   "rhs_header.backToResultsTooltip": "Zurück zu den Suchergebnissen",
   "rhs_header.closeSidebarTooltip": "Sidebar schließen",
-  "rhs_header.closeTooltip": "Sidebar schließen",
+  "rhs_header.closeTooltip": "Seitenleiste schließen",
   "rhs_header.details": "Nachrichtendetails",
   "rhs_header.expandSidebarTooltip": "Sidebar erweitern",
-  "rhs_header.expandTooltip": "Sidebar verkleinern",
+  "rhs_header.expandTooltip": "Seitenleiste verkleinern",
   "rhs_header.shrinkSidebarTooltip": "Sidebar verkleinern",
   "rhs_root.del": "Löschen",
   "rhs_root.direct": "Direktnachricht",
@@ -1822,9 +1832,9 @@
   "tutorial_tip.out": "Diese Tipps deaktivieren.",
   "tutorial_tip.seen": "Wurde bereits angezeigt? ",
   "update_command.cancel": "Abbrechen",
-  "update_command.confirm": "Slash-Befehl hinzufügen",
+  "update_command.confirm": "Slash-Befehl bearbeiten",
   "update_command.question": "Your changes may break the existing slash command. Are you sure you would like to update it?",
-  "update_command.update": "Update",
+  "update_command.update": "Aktualisieren",
   "upload_overlay.info": "Datei zum Hochladen hier ablegen.",
   "user.settings.advance.embed_preview": "Zeige experimentelle Vorschauen von Linkinhalten, sofern verfügbar",
   "user.settings.advance.embed_toggle": "Zeige Umschalter für alle eingebetteten Vorschauen",
@@ -2098,7 +2108,7 @@
   "user.settings.security.viewHistory": "Zeige Zugriffshistorie",
   "user_list.notFound": "Keine Benutzer gefunden",
   "user_profile.webrtc.call": "Videoanruf starten",
-  "user_profile.webrtc.offline": "The user is offline",
+  "user_profile.webrtc.offline": "Der Benutzer ist offline",
   "user_profile.webrtc.unavailable": "Neuer Anruf nicht möglich bis ihr bestehender Anruf beendet ist",
   "view_image.loading": "Laden ",
   "view_image_popover.download": "Herunterladen",
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 1334c7358..55ee0c2ad 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -146,11 +146,6 @@
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML",
   "admin.banner.heading": "Note:",
-  "admin.metrics.enableTitle": "Enable Performance Monitoring:",
-  "admin.metrics.enableDescription": "When true, Mattermost will enable performance monitoring collection and profiling. Please see <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target=\"_blank\">documentation</a> to learn more about configuring performance monitoring for Mattermost.",
-  "admin.metrics.listenAddressTitle": "Listen Address:",
-  "admin.metrics.listenAddressEx": "Ex \":8067\"",
-  "admin.metrics.listenAddressDesc": "The address the server will listen on to expose performance metrics.",
   "admin.cluster.enableDescription": "When true, Mattermost will run in High Availability mode. Please see <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a> to learn more about configuring High Availability for Mattermost.",
   "admin.cluster.enableTitle": "Enable High Availability Mode:",
   "admin.cluster.interNodeListenAddressDesc": "The address the server will listen on for communicating with other servers.",
@@ -501,6 +496,11 @@
   "admin.log.logSettings": "Log Settings",
   "admin.logs.reload": "Reload",
   "admin.logs.title": "Server Logs",
+  "admin.metrics.enableDescription": "When true, Mattermost will enable performance monitoring collection and profiling. Please see <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target=\"_blank\">documentation</a> to learn more about configuring performance monitoring for Mattermost.",
+  "admin.metrics.enableTitle": "Enable Performance Monitoring:",
+  "admin.metrics.listenAddressDesc": "The address the server will listen on to expose performance metrics.",
+  "admin.metrics.listenAddressEx": "Ex \":8067\"",
+  "admin.metrics.listenAddressTitle": "Listen Address:",
   "admin.nav.help": "Help",
   "admin.nav.logout": "Logout",
   "admin.nav.report": "Report a Problem",
@@ -708,7 +708,6 @@
   "admin.sidebar.audits": "Compliance and Auditing",
   "admin.sidebar.authentication": "Authentication",
   "admin.sidebar.cluster": "High Availability (Beta)",
-  "admin.sidebar.metrics": "Performance Monitoring (Beta)",
   "admin.sidebar.compliance": "Compliance",
   "admin.sidebar.configuration": "Configuration",
   "admin.sidebar.connections": "Connections",
@@ -732,6 +731,7 @@
   "admin.sidebar.logging": "Logging",
   "admin.sidebar.login": "Login",
   "admin.sidebar.logs": "Logs",
+  "admin.sidebar.metrics": "Performance Monitoring (Beta)",
   "admin.sidebar.nativeAppLinks": "Mattermost App Links",
   "admin.sidebar.notifications": "Notifications",
   "admin.sidebar.oauth": "OAuth 2.0",
@@ -807,9 +807,9 @@
   "admin.team.maxChannelsDescription": "Maximum total number of channels per team, including both active and deleted channels.",
   "admin.team.maxChannelsExample": "Ex \"100\"",
   "admin.team.maxChannelsTitle": "Max Channels Per Team:",
-  "admin.team.maxNotificationsPerChannelTitle" : "Max Notifications Per Channel:",
-  "admin.team.maxNotificationsPerChannelExample" : "Ex \"1000\"",
-  "admin.team.maxNotificationsPerChannelDescription" : "Maximum total number of users in a channel before users typing messages, @all, @here, and @channel no longer send notifications because of performance.",
+  "admin.team.maxNotificationsPerChannelDescription": "Maximum total number of users in a channel before users typing messages, @all, @here, and @channel no longer send notifications because of performance.",
+  "admin.team.maxNotificationsPerChannelExample": "Ex \"1000\"",
+  "admin.team.maxNotificationsPerChannelTitle": "Max Notifications Per Channel:",
   "admin.team.maxUsersDescription": "Maximum total number of users per team, including both active and inactive users.",
   "admin.team.maxUsersExample": "E.g.: \"25\"",
   "admin.team.maxUsersTitle": "Max Users Per Team:",
diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json
index 4bbd1439e..bcc000380 100644
--- a/webapp/i18n/es.json
+++ b/webapp/i18n/es.json
@@ -73,7 +73,7 @@
   "add_emoji.header": "Agregar",
   "add_emoji.image": "Imagen",
   "add_emoji.image.button": "Seleccionar",
-  "add_emoji.image.help": "Selecciona la imagen para tu emoticon. La imagen puede ser un archivo gif, png o jpeg con un tamaño máximo de 64KB y una dimensión de hasta 128 x 128 pixels.",
+  "add_emoji.image.help": "Selecciona la imagen del emoticon. La imagen puede ser un archivo gif, png o jpeg con un tamaño máximo de 1 MB. Las dimensiones de se ajustarán automáticamente a 128 por 128 píxeles, pero manteniendo la relación de aspecto.",
   "add_emoji.imageRequired": "Se require una imagen para el emoticon",
   "add_emoji.name": "Nombre",
   "add_emoji.name.help": "Elige un nombre para tu emoticon hecho de hasta 64 caracteres que consisten en letras minúsculas, números y los símbolos '-' y '_'.",
@@ -137,6 +137,7 @@
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "La primera palabra coincide exactamente con una palabra que desencadena la acción",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "La primera palabra empieza con una palabra que desencadena la acción",
   "admin.advance.cluster": "Alta Disponibilidad (Beta)",
+  "admin.advance.metrics": "Monitoreo de Desempeño (Beta)",
   "admin.audits.reload": "Recargar",
   "admin.audits.title": "Auditorías del Servidor",
   "admin.authentication.email": "Correo Electrónico",
@@ -495,6 +496,11 @@
   "admin.log.logSettings": "Configuración de registro",
   "admin.logs.reload": "Recargar",
   "admin.logs.title": "Servidor de registros",
+  "admin.metrics.enableDescription": "Cuando es verdadero, Mattermost habilitará el monitoreo de desempeño, la recolección y la elaboración de perfiles. Por favor, consulta la <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target=\"_blank\">documentación</a> para obtener más información acerca de la configuración del monitoreo del rendimiento para Mattermost.",
+  "admin.metrics.enableTitle": "Habilitar el Monitoreo de Desempeño:",
+  "admin.metrics.listenAddressDesc": "La dirección del servidor que escuchará para mostrar las métricas de rendimiento.",
+  "admin.metrics.listenAddressEx": "Ej \":8067\"",
+  "admin.metrics.listenAddressTitle": "Dirección de escucha:",
   "admin.nav.help": "Ayuda",
   "admin.nav.logout": "Cerrar sesión",
   "admin.nav.report": "Reportar problema",
@@ -725,6 +731,7 @@
   "admin.sidebar.logging": "Registros",
   "admin.sidebar.login": "Inicio de Sesión",
   "admin.sidebar.logs": "Registros",
+  "admin.sidebar.metrics": "Monitoreo de Desempeño (Beta)",
   "admin.sidebar.nativeAppLinks": "Enlaces de Mattermost App",
   "admin.sidebar.notifications": "Notificaciones",
   "admin.sidebar.oauth": "OAuth 2.0",
@@ -800,6 +807,9 @@
   "admin.team.maxChannelsDescription": "Máximo número total de canales por equipo, incluyendo canales activos y borrados.",
   "admin.team.maxChannelsExample": "Ej \"100\"",
   "admin.team.maxChannelsTitle": "Max Canales Por Equipo:",
+  "admin.team.maxNotificationsPerChannelDescription": "Cantidad máxima de usuarios en un canal para que las notificaciones de \"escribiendo un mensaje\", @all, @here y @channel no sean enviadas para mejorar el rendimiento.",
+  "admin.team.maxNotificationsPerChannelExample": "Ej \"1000\"",
+  "admin.team.maxNotificationsPerChannelTitle": "Cantidad Max de Notificaciones por Canal:",
   "admin.team.maxUsersDescription": "Número máximo de usuarios por equipo, incluyendo usuarios activos e inactivos.",
   "admin.team.maxUsersExample": "Ej.: \"25\"",
   "admin.team.maxUsersTitle": "Máximo de usuarios por equipo:",
diff --git a/webapp/i18n/fr.json b/webapp/i18n/fr.json
index be9d844c6..a9e8a17ab 100644
--- a/webapp/i18n/fr.json
+++ b/webapp/i18n/fr.json
@@ -73,7 +73,7 @@
   "add_emoji.header": "Ajouter",
   "add_emoji.image": "Image",
   "add_emoji.image.button": "Sélectionner",
-  "add_emoji.image.help": "Choisissez une image pour votre emoji. L'image peut être au format gif, png ou jpeg, doit faire moins de 64Ko et au maximum 128x128 pixels.",
+  "add_emoji.image.help": "Choose the image for your emoji. The image can be a gif, png, or jpeg file with a max size of 1 MB. Dimensions will automatically resize to fit 128 by 128 pixels but keeping aspect ratio.",
   "add_emoji.imageRequired": "Une image est requise pour l'emoji",
   "add_emoji.name": "Nom",
   "add_emoji.name.help": "Choisissez un nom pour votre emoji de 64 caractères au maximum, constitué de lettres minuscules, nombres et '-' ou '_'.",
@@ -137,6 +137,7 @@
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "Premier mot correspond exactement à un mot déclencheur",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "Le premier mot commence avec un mot déclencheur",
   "admin.advance.cluster": "Haute disponibilité (Bêta)",
+  "admin.advance.metrics": "Performance Monitoring (Beta)",
   "admin.audits.reload": "Recharger les logs de l'activité utilisateur",
   "admin.audits.title": "Activité de l'utilisateur",
   "admin.authentication.email": "Authentification email",
@@ -495,6 +496,11 @@
   "admin.log.logSettings": "Configuration du journal (log)",
   "admin.logs.reload": "Recharger",
   "admin.logs.title": "Journaux du serveur",
+  "admin.metrics.enableDescription": "When true, Mattermost will enable performance monitoring collection and profiling. Please see <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target=\"_blank\">documentation</a> to learn more about configuring performance monitoring for Mattermost.",
+  "admin.metrics.enableTitle": "Enable Performance Monitoring:",
+  "admin.metrics.listenAddressDesc": "The address the server will listen on to expose performance metrics.",
+  "admin.metrics.listenAddressEx": "Exemple : \":8065\"",
+  "admin.metrics.listenAddressTitle": "Adresse IP du serveur :",
   "admin.nav.help": "Aide",
   "admin.nav.logout": "Se déconnecter",
   "admin.nav.report": "Signaler un problème",
@@ -725,6 +731,7 @@
   "admin.sidebar.logging": "Enregistrement",
   "admin.sidebar.login": "S’identifier",
   "admin.sidebar.logs": "Journaux",
+  "admin.sidebar.metrics": "Performance Monitoring (Beta)",
   "admin.sidebar.nativeAppLinks": "Liens des applications Mattermost",
   "admin.sidebar.notifications": "Notifications",
   "admin.sidebar.oauth": "OAuth 2.0",
@@ -800,6 +807,9 @@
   "admin.team.maxChannelsDescription": "Nombre maximum de canaux par équipe, incluant les canaux actifs et supprimés.",
   "admin.team.maxChannelsExample": "Ex.: \"100\"",
   "admin.team.maxChannelsTitle": "Nombre maximum de canaux par équipe :",
+  "admin.team.maxNotificationsPerChannelDescription": "Maximum total number of users in a channel before users typing messages, @all, @here, and @channel no longer send notifications because of performance.",
+  "admin.team.maxNotificationsPerChannelExample": "Exemple : \"10000\"",
+  "admin.team.maxNotificationsPerChannelTitle": "Max Notifications Per Channel:",
   "admin.team.maxUsersDescription": "Nombre maximum d'utilisateurs par équipe, actifs et inactifs.",
   "admin.team.maxUsersExample": "Ex.: \"25\"",
   "admin.team.maxUsersTitle": "Nombre max. d'utilisateurs par équipe :",
diff --git a/webapp/i18n/ja.json b/webapp/i18n/ja.json
index 03a64e401..a9264babc 100644
--- a/webapp/i18n/ja.json
+++ b/webapp/i18n/ja.json
@@ -73,7 +73,7 @@
   "add_emoji.header": "追加",
   "add_emoji.image": "画像",
   "add_emoji.image.button": "選択",
-  "add_emoji.image.help": "絵文字の画像を選択してください。画像ファイルはgif, png, jpegのいずれかの形式で64KB以下、128x128ピクセル以内としてください。",
+  "add_emoji.image.help": "Choose the image for your emoji. The image can be a gif, png, or jpeg file with a max size of 1 MB. Dimensions will automatically resize to fit 128 by 128 pixels but keeping aspect ratio.",
   "add_emoji.imageRequired": "絵文字の画像は必須です。",
   "add_emoji.name": "名前",
   "add_emoji.name.help": "あなたの作成した絵文字の名前を設定してください。英小文字、数字、記号('-'と'_'のみ)を使用し、64文字以内にしてください。",
@@ -137,6 +137,7 @@
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "最初の単語がトリガーワードと正確に一致する",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "最初の単語がトリガーワードで始まる",
   "admin.advance.cluster": "高可用(ベータ版)",
+  "admin.advance.metrics": "Performance Monitoring (Beta)",
   "admin.audits.reload": "再読み込み",
   "admin.audits.title": "ユーザーのアクティビティー",
   "admin.authentication.email": "電子メールアドレス認証",
@@ -298,13 +299,13 @@
   "admin.general.configuration": "設定",
   "admin.general.localization": "言語",
   "admin.general.localization.availableLocalesDescription": "アカウント設定でユーザーが利用可能な言語を設定してください（空欄にすると全てのサポート済み言語が利用可能になります）。手作業で新しい言語を追加する場合、この設定を保存する前に<strong>デフォルトのクライアント言語</strong>を追加しなくてはいけません。<br /><br />翻訳を手伝っていただけますか？ 是非、<a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a>に参加してください。",
-  "admin.general.localization.availableLocalesNoResults": "No results found",
-  "admin.general.localization.availableLocalesNotPresent": "The default client language must be included in the available list",
+  "admin.general.localization.availableLocalesNoResults": "結果が見付かりません",
+  "admin.general.localization.availableLocalesNotPresent": "デフォルトのクライアント言語は利用可能な言語リストに含まれている必要があります",
   "admin.general.localization.availableLocalesTitle": "利用可能な言語:",
   "admin.general.localization.clientLocaleDescription": "新規作成ユーザーやログインしていない時に使用するデフォルト言語を選択してください。",
-  "admin.general.localization.clientLocaleTitle": "デフォルトのクライアントの言語:",
+  "admin.general.localization.clientLocaleTitle": "デフォルトのクライアント言語:",
   "admin.general.localization.serverLocaleDescription": "システムメッセージとログで使用するデフォルト言語を選択してください。変更を適用するにはサーバーを再起動させる必要があります。",
-  "admin.general.localization.serverLocaleTitle": "デフォルトのサーバーの言語:",
+  "admin.general.localization.serverLocaleTitle": "デフォルトのサーバー言語:",
   "admin.general.log": "ログ",
   "admin.general.policy": "ポリシー",
   "admin.general.policy.permissionsAdmin": "チーム管理者とシステム管理者",
@@ -495,6 +496,11 @@
   "admin.log.logSettings": "LDAPの設定",
   "admin.logs.reload": "再読み込み",
   "admin.logs.title": "サーバーログ",
+  "admin.metrics.enableDescription": "When true, Mattermost will enable performance monitoring collection and profiling. Please see <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target=\"_blank\">documentation</a> to learn more about configuring performance monitoring for Mattermost.",
+  "admin.metrics.enableTitle": "Enable Performance Monitoring:",
+  "admin.metrics.listenAddressDesc": "The address the server will listen on to expose performance metrics.",
+  "admin.metrics.listenAddressEx": "例: \":8065\"",
+  "admin.metrics.listenAddressTitle": "接続待ちアドレス:",
   "admin.nav.help": "ヘルプ",
   "admin.nav.logout": "ログアウト",
   "admin.nav.report": "問題を報告する",
@@ -725,6 +731,7 @@
   "admin.sidebar.logging": "ログ",
   "admin.sidebar.login": "ログイン",
   "admin.sidebar.logs": "ログ",
+  "admin.sidebar.metrics": "Performance Monitoring (Beta)",
   "admin.sidebar.nativeAppLinks": "Mattermostアプリリンク",
   "admin.sidebar.notifications": "通知",
   "admin.sidebar.oauth": "OAuth 2.0",
@@ -800,6 +807,9 @@
   "admin.team.maxChannelsDescription": "チーム毎のチャンネル数合計の最大値です。アクティブなチャンネルと削除済みのチャンネルの両方が数えられます。",
   "admin.team.maxChannelsExample": "例 \"100\"",
   "admin.team.maxChannelsTitle": "チーム毎の最大チャンネル数:",
+  "admin.team.maxNotificationsPerChannelDescription": "Maximum total number of users in a channel before users typing messages, @all, @here, and @channel no longer send notifications because of performance.",
+  "admin.team.maxNotificationsPerChannelExample": "例: \"10000\"",
+  "admin.team.maxNotificationsPerChannelTitle": "Max Notifications Per Channel:",
   "admin.team.maxUsersDescription": "チーム毎のユーザー数合計の最大値です。有効なユーザーと無効なユーザーの両方が数えられます。",
   "admin.team.maxUsersExample": "例: \"25\"",
   "admin.team.maxUsersTitle": "チーム毎の最大ユーザー数:",
@@ -818,7 +828,7 @@
   "admin.team.siteNameDescription": "ログイン画面とユーザーインターフェースで表示されるサービス名です。",
   "admin.team.siteNameExample": "例: \"Mattermost\"",
   "admin.team.siteNameTitle": "サイト名:",
-  "admin.team.teamCreationDescription": "無効にしている場合、システム管理者だけがチームを作成できます。",
+  "admin.team.teamCreationDescription": "無効な場合、システム管理者だけがチームを作成できます。",
   "admin.team.teamCreationTitle": "チーム作成を有効にする: ",
   "admin.team.upload": "アップロードする",
   "admin.team.uploadDesc": "ログイン画面にカスタム画像を追加することで、ユーザー体験をカスタマイズできます。2MB以下の画像を推奨します。",
@@ -1121,7 +1131,7 @@
   "claim.oauth_to_email.switchTo": "{type}を電子メールアドレスとパスワードでのログインに切り替える",
   "claim.oauth_to_email.title": "{type}アカウントを電子メールアドレスに切り替える",
   "confirm_modal.cancel": "キャンセル",
-  "connecting_screen": "接続",
+  "connecting_screen": "接続中",
   "create_comment.addComment": "コメントを追加する…",
   "create_comment.comment": "コメントを追加する",
   "create_comment.commentLength": "コメントの長さは{max}文字以下にしてください。",
@@ -2054,7 +2064,7 @@
   "user.settings.security.ldap": "AD/LDAP",
   "user.settings.security.loginGitlab": "GitLabでログインしました",
   "user.settings.security.loginLdap": "AD/LDAPでログインする",
-  "user.settings.security.loginSaml": "GitLabでログインしました",
+  "user.settings.security.loginSaml": "SAMLでログインしました",
   "user.settings.security.logoutActiveSessions": "アクティブなセッションを見てログアウトする",
   "user.settings.security.method": "サインイン方法",
   "user.settings.security.newPassword": "新しいパスワード",
@@ -2085,7 +2095,7 @@
   "user.settings.security.passwordLdapCantUpdate": "AD/LDAPでログインしています。パスワードは更新できません。",
   "user.settings.security.passwordMatchError": "あなたの入力した新しいパスワードが一致しません。",
   "user.settings.security.passwordMinLength": "最小の長さが不正です。プレビューを表示できません。",
-  "user.settings.security.passwordSamlCantUpdate": "この欄はあなたのログインプロバイダーで使用されます。変更したい場合、ログインプロバイダーに通じて変更してください。",
+  "user.settings.security.passwordSamlCantUpdate": "この欄はあなたのログインプロバイダーで使用されます。変更したい場合、ログインプロバイダーを通じて変更してください。",
   "user.settings.security.retypePassword": "新しいパスワードをもう一度入力してください",
   "user.settings.security.saml": "SAML",
   "user.settings.security.switchEmail": "電子メールアドレスとパスワードでのログインに切り替える",
diff --git a/webapp/i18n/ko.json b/webapp/i18n/ko.json
index 235750e70..4c4e018d3 100644
--- a/webapp/i18n/ko.json
+++ b/webapp/i18n/ko.json
@@ -73,7 +73,7 @@
   "add_emoji.header": "추가",
   "add_emoji.image": "이미지",
   "add_emoji.image.button": "선택",
-  "add_emoji.image.help": "이모티콘으로 사용할 이미지를 선택하세요. gif, png, jpg 이미지를 사용할 수 있으며, 너비:128px, 높이:128px, 64KB를 초과할 수 없습니다.",
+  "add_emoji.image.help": "Choose the image for your emoji. The image can be a gif, png, or jpeg file with a max size of 1 MB. Dimensions will automatically resize to fit 128 by 128 pixels but keeping aspect ratio.",
   "add_emoji.imageRequired": "이모티콘 이미지가 필요합니다.",
   "add_emoji.name": "이름",
   "add_emoji.name.help": "이모티콘 이름으로 64글자 이하 영문 소문자, 숫자, 특수문자 '-' 와 '_'를 사용할 수 있습니다.",
@@ -137,6 +137,7 @@
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "First word matches a trigger word exactly",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "First word starts with a trigger word",
   "admin.advance.cluster": "고 가용성 (베타)",
+  "admin.advance.metrics": "Performance Monitoring (Beta)",
   "admin.audits.reload": "사용자 활동 기록 새로고침",
   "admin.audits.title": "사용자 활동 기록",
   "admin.authentication.email": "이메일 인증",
@@ -495,6 +496,11 @@
   "admin.log.logSettings": "로그 설정",
   "admin.logs.reload": "새로 고침",
   "admin.logs.title": "서버 로그",
+  "admin.metrics.enableDescription": "When true, Mattermost will enable performance monitoring collection and profiling. Please see <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target=\"_blank\">documentation</a> to learn more about configuring performance monitoring for Mattermost.",
+  "admin.metrics.enableTitle": "Enable Performance Monitoring:",
+  "admin.metrics.listenAddressDesc": "The address the server will listen on to expose performance metrics.",
+  "admin.metrics.listenAddressEx": "Ex \":8065\"",
+  "admin.metrics.listenAddressTitle": "Listen Address:",
   "admin.nav.help": "도움말",
   "admin.nav.logout": "로그아웃",
   "admin.nav.report": "문제 보고",
@@ -725,6 +731,7 @@
   "admin.sidebar.logging": "로그",
   "admin.sidebar.login": "로그인",
   "admin.sidebar.logs": "서버 로그 보기",
+  "admin.sidebar.metrics": "Performance Monitoring (Beta)",
   "admin.sidebar.nativeAppLinks": "Mattermost 애플리케이션 링크",
   "admin.sidebar.notifications": "알림",
   "admin.sidebar.oauth": "OAuth 2.0",
@@ -800,6 +807,9 @@
   "admin.team.maxChannelsDescription": "Maximum total number of users per team, including both active and inactive users.",
   "admin.team.maxChannelsExample": "예시 \"100\"",
   "admin.team.maxChannelsTitle": "팀 당 최대 채널: ",
+  "admin.team.maxNotificationsPerChannelDescription": "Maximum total number of users in a channel before users typing messages, @all, @here, and @channel no longer send notifications because of performance.",
+  "admin.team.maxNotificationsPerChannelExample": "Ex \"10000\"",
+  "admin.team.maxNotificationsPerChannelTitle": "Max Notifications Per Channel:",
   "admin.team.maxUsersDescription": "Maximum total number of users per team, including both active and inactive users.",
   "admin.team.maxUsersExample": "예시 \"25\"",
   "admin.team.maxUsersTitle": "팀 최대 인원:",
@@ -1005,7 +1015,7 @@
   "channel_flow.set_url_title": "{term} URL 설정",
   "channel_header.addToFavorites": "즐겨찾기에 추가",
   "channel_header.channel": "채널",
-  "channel_header.channelHeader": "채널 헤더 설정...",
+  "channel_header.channelHeader": "채널 헤더 설정",
   "channel_header.delete": "{term} 삭제...",
   "channel_header.flagged": "중요 메시지",
   "channel_header.group": "그룹",
@@ -1054,7 +1064,7 @@
   "channel_modal.edit": "편집",
   "channel_modal.group": "그룹",
   "channel_modal.header": "헤더",
-  "channel_modal.headerHelp": "{term} 상단 이름 옆에 표시될 텍스트를 입력하세요. 예를 들면, 다음과 같이 자주 사용되는 링크를 등록할 수 있습니다. [Link Title](http://example.com).",
+  "channel_modal.headerHelp": "{term} 상단 이름 옆에 표시될 텍스트를 입력하세요. 예를 들면, 다음과 같이 자주 사용되는 링크를 등록할 수 있습니다. [링크](http://example.com).",
   "channel_modal.modalTitle": "새로운 ",
   "channel_modal.name": "이름",
   "channel_modal.nameEx": "예시: \"버그\", \"마케팅\", \"고객지원\"",
@@ -1976,7 +1986,7 @@
   "user.settings.notifications.close": "닫기",
   "user.settings.notifications.comments": "답글 알림",
   "user.settings.notifications.commentsAny": "등록하거나 답변했던 모든 스레드의 답변에 대해 알림",
-  "user.settings.notifications.commentsInfo": "In addition to notifications for when you're mentioned, select if you would like to receive notifications on reply threads.",
+  "user.settings.notifications.commentsInfo": "답글에 대한 알림 옵션을 선택해주세요.",
   "user.settings.notifications.commentsNever": "사용 안함",
   "user.settings.notifications.commentsRoot": "등록한 모든 스레드의 답변에 대해 알림",
   "user.settings.notifications.desktop": "알림 받기",
@@ -2005,7 +2015,7 @@
   "user.settings.notifications.email.never": "사용 안함",
   "user.settings.notifications.email.send": "알림 받기",
   "user.settings.notifications.emailBatchingInfo": "Notifications received over the time period selected are combined and sent in a single email.",
-  "user.settings.notifications.emailInfo": "Email notifications are sent for mentions and direct messages after you’ve been offline for more than 60 seconds or away from {siteName} for more than 5 minutes.",
+  "user.settings.notifications.emailInfo": "이메일 알림은 멘션 혹은 개인 메세지를 받았을때, 당신이 {siteName}로부터 오프라인 상태로 60초가 지났거나 자리비움상태로 5분 이상 지났을때 알림이 갑니다.",
   "user.settings.notifications.emailNotifications": "이메일 알림",
   "user.settings.notifications.header": "알림",
   "user.settings.notifications.info": "데스크탑 알림은 Firefox, Safari, Chrome 브라우저에서 사용할 수 있습니다.",
diff --git a/webapp/i18n/nl.json b/webapp/i18n/nl.json
index e8de7f491..75bf3e092 100644
--- a/webapp/i18n/nl.json
+++ b/webapp/i18n/nl.json
@@ -73,7 +73,7 @@
   "add_emoji.header": "Toevoegen",
   "add_emoji.image": "Afbeelding",
   "add_emoji.image.button": "Selecteer",
-  "add_emoji.image.help": "Kies de afbeelding voor je emoji. De afbeelding kan een gif-, png- of jpeg- bestand zijn, met een maximale bestandsgrootte van 64 KB en een maximale resolutie van 128x128 pixels.",
+  "add_emoji.image.help": "Choose the image for your emoji. The image can be a gif, png, or jpeg file with a max size of 1 MB. Dimensions will automatically resize to fit 128 by 128 pixels but keeping aspect ratio.",
   "add_emoji.imageRequired": "Een afbeelding is verplicht voor de emoji",
   "add_emoji.name": "Naam",
   "add_emoji.name.help": "Kies een naam voor je emoji, van maximaal 64 karakters met kleine letters, cijfers en de symbolen '-' en '_'.",
@@ -137,6 +137,7 @@
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "Eerste trigger woord komt exact overeen",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "Eerste woord start met een trigger woord",
   "admin.advance.cluster": "High Availability (Beta)",
+  "admin.advance.metrics": "Performance Monitoring (Beta)",
   "admin.audits.reload": "Laad de gebruikeractiviteit logs opnieuw",
   "admin.audits.title": "Gebruiker activiteits logs",
   "admin.authentication.email": "Email authenticatie",
@@ -495,6 +496,11 @@
   "admin.log.logSettings": "Log instellingen",
   "admin.logs.reload": "Herladen",
   "admin.logs.title": "Server Logs",
+  "admin.metrics.enableDescription": "When true, Mattermost will enable performance monitoring collection and profiling. Please see <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target=\"_blank\">documentation</a> to learn more about configuring performance monitoring for Mattermost.",
+  "admin.metrics.enableTitle": "Enable Performance Monitoring:",
+  "admin.metrics.listenAddressDesc": "The address the server will listen on to expose performance metrics.",
+  "admin.metrics.listenAddressEx": "Bijv. \":8065\"",
+  "admin.metrics.listenAddressTitle": "Luister Adres:",
   "admin.nav.help": "Help",
   "admin.nav.logout": "Afmelden",
   "admin.nav.report": "Een probleem melden",
@@ -725,6 +731,7 @@
   "admin.sidebar.logging": "Loggen",
   "admin.sidebar.login": "Login",
   "admin.sidebar.logs": "Logs",
+  "admin.sidebar.metrics": "Performance Monitoring (Beta)",
   "admin.sidebar.nativeAppLinks": "Mattermost App Links",
   "admin.sidebar.notifications": "Meldingen",
   "admin.sidebar.oauth": "OAuth 2.0",
@@ -800,6 +807,9 @@
   "admin.team.maxChannelsDescription": "Maximum aantal gebruikers per team, inclusief actieve en niet-actieve gebruikers.",
   "admin.team.maxChannelsExample": "Bijv. \"100\"",
   "admin.team.maxChannelsTitle": "Max Channels Per Team:",
+  "admin.team.maxNotificationsPerChannelDescription": "Maximum total number of users in a channel before users typing messages, @all, @here, and @channel no longer send notifications because of performance.",
+  "admin.team.maxNotificationsPerChannelExample": "Bijv. \"10000\"",
+  "admin.team.maxNotificationsPerChannelTitle": "Max Notifications Per Channel:",
   "admin.team.maxUsersDescription": "Maximum aantal gebruikers per team, inclusief actieve en niet-actieve gebruikers.",
   "admin.team.maxUsersExample": "Bijv.: \"25\"",
   "admin.team.maxUsersTitle": "Maximaal aantal gebruikers per team:",
@@ -1955,7 +1965,7 @@
   "user.settings.languages.promote": "Selecteer welke taal Mattermost moet weergeven in de gebruikersinterface.<br /><br />Wil je helpen met vertalen? Word lid van de <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a>.",
   "user.settings.mfa.add": "Toevoegen van MFA aan jouw account",
   "user.settings.mfa.addHelp": "Je kan een smartphone gebaseerde token verplichten, naast jouw wachtwoord, om in te loggen op Mattermost.<br/><br/>Om dit aan te zetten, download Google Authenticator van <a target='_blank' href='https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8'>iTunes</a> of <a target='_blank' href='https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en'>Google Play</a>voor jouw telefoon, dan <br/><br/>1. Klik op de <strong>Voeg MFA aan jouw account</strong> knop erboven.<br/>2. Gebruik Google Authenticator om de QR code te scannen die verschijnt.<br/>3. Type het Token wat gegenereerd is door Google Authenticator en druk <strong>Opslaan</strong><br/><br/>Wanneer je inlogt, zal wirden gevraagd naar een token van Google Authenticator naast jouw reguliere inlog gegevens. ",
-  "user.settings.mfa.addHelpQr": "Please scan the QR code with the Google Authenticator app on your smartphone and fill in the token with one provided by the app. If you are unable to scan the code, you can maunally enter the secret provided.",
+  "user.settings.mfa.addHelpQr": "Please scan the QR code with the Google Authenticator app on your smartphone and fill in the token with one provided by the app. If you are unable to scan the code, you can manually enter the secret provided.",
   "user.settings.mfa.enterToken": "Token (enkel nummers)",
   "user.settings.mfa.qrCode": "Streepjescode",
   "user.settings.mfa.remove": "Verwijderen van MFA van jouw account",
diff --git a/webapp/i18n/pt-BR.json b/webapp/i18n/pt-BR.json
index a32782259..be6c82db3 100644
--- a/webapp/i18n/pt-BR.json
+++ b/webapp/i18n/pt-BR.json
@@ -73,7 +73,7 @@
   "add_emoji.header": "Adicionar",
   "add_emoji.image": "Imagem",
   "add_emoji.image.button": "Selecionar",
-  "add_emoji.image.help": "Escolha a imagem para o seu emoji. A imagem pode ser em um arquivo gif, png or jpeg com tamanho máximo de 64 KB and dimensões de até 128 por 128 pixels.",
+  "add_emoji.image.help": "Escolha a imagem para o seu emoji. A imagem pode ser um gif, png ou jpeg com tamanho máximo de 1 MB. As dimensões serão automaticamente redimensionadas para encaixar em 128 por 128 pixels mas mantendo a relação de aspecto.",
   "add_emoji.imageRequired": "Uma imagem é necessária para o emoji",
   "add_emoji.name": "Nome",
   "add_emoji.name.help": "Escolha um nome para o seu emoji que pode ter até 64 letras minúsculas, números, e símbolos '-' e '_'.",
@@ -137,6 +137,7 @@
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "Primeira palavra corresponde exatamente a uma palavra gatilho",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "Primeira palavra começa com uma palavra gatilho",
   "admin.advance.cluster": "Alta Disponibilidade (Beta)",
+  "admin.advance.metrics": "Monitoramento de Performance (Beta)",
   "admin.audits.reload": "Recarregar",
   "admin.audits.title": "Atividade de Usuário",
   "admin.authentication.email": "Autenticação Email",
@@ -298,8 +299,8 @@
   "admin.general.configuration": "Configuração",
   "admin.general.localization": "Regionalização",
   "admin.general.localization.availableLocalesDescription": "Defina qual idioma está disponível para os usuários em Configurações de Conta (deixe este campo em branco para ter todos os idiomas disponíveis). Se você está adicionando novos idiomas manualmente, o <strong>Idioma Padrão do Cliente</strong> precisa ser adicionado antes de salvar esta configuração.<br /><br />Gostaria de ajudar com tradução? Junte-se ao <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> para contribuir.",
-  "admin.general.localization.availableLocalesNoResults": "No results found",
-  "admin.general.localization.availableLocalesNotPresent": "The default client language must be included in the available list",
+  "admin.general.localization.availableLocalesNoResults": "Nenhum resultado encontrado",
+  "admin.general.localization.availableLocalesNotPresent": "O idioma padrão deve ser incluído na lista",
   "admin.general.localization.availableLocalesTitle": "Idiomas Disponíveis:",
   "admin.general.localization.clientLocaleDescription": "Linguagem padrão para os novos usuários criados e páginas onde o usuário não esteja logado.",
   "admin.general.localization.clientLocaleTitle": "Idioma Padrão do Cliente:",
@@ -350,7 +351,7 @@
   "admin.image.amazonS3BucketDescription": "Nome selecionado para o seu S3 bucket in AWS.",
   "admin.image.amazonS3BucketExample": "Ex.: \"mattermost-media\"",
   "admin.image.amazonS3BucketTitle": "Amazon S3 Bucket:",
-  "admin.image.amazonS3EndpointDescription": "Hostname of your S3 Compatible Storage provider. Defaults to `s3.amazonaws.com`.",
+  "admin.image.amazonS3EndpointDescription": "Nome do host provedor de armazenamento compatível com S3. O padrão é `s3.amazonaws.com`.",
   "admin.image.amazonS3EndpointTitle": "Amazon S3 Endpoint:",
   "admin.image.amazonS3IdDescription": "Obter essa credencial do seu administrador Amazon EC2.",
   "admin.image.amazonS3IdExample": "Ex.: \"AKIADTOVBGERKLCBV\"",
@@ -358,8 +359,8 @@
   "admin.image.amazonS3RegionDescription": "Região AWS selecionada para a criação do seu S3 bucket.",
   "admin.image.amazonS3RegionExample": "Ex.: \"us-east-1\"",
   "admin.image.amazonS3RegionTitle": "Amazon S3 Region:",
-  "admin.image.amazonS3SSLDescription": "When false, allow insecure connections to Amazon S3. Defaults to secure connections only.",
-  "admin.image.amazonS3SSLTitle": "Enable Secure Amazon S3 Connections:",
+  "admin.image.amazonS3SSLDescription": "Quando falso, permite conexões inseguras com Amazon S3. Padrão conexões seguras somente.",
+  "admin.image.amazonS3SSLTitle": "Ativar Conexões Seguras com Amazon S3:",
   "admin.image.amazonS3SecretDescription": "Obter essa credencial do seu administrador Amazon EC2.",
   "admin.image.amazonS3SecretExample": "Ex.: \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.image.amazonS3SecretTitle": "Amazon S3 Secret Access Key:",
@@ -495,6 +496,11 @@
   "admin.log.logSettings": "Configurações de Log",
   "admin.logs.reload": "Recarregar",
   "admin.logs.title": "Log do Servidor",
+  "admin.metrics.enableDescription": "Quando verdadeiro, Mattermost irá habilitar a coleta do monitoramento de performance e profiling. Por favor verifique <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target=\"_blank\">documentação</a> para ler mais sobre como configurar o monitoramento de performance para Mattermost.",
+  "admin.metrics.enableTitle": "Habilitar Monitoramento de Performance:",
+  "admin.metrics.listenAddressDesc": "O endereço que o servidor irá escutar para expor as métricas de performance.",
+  "admin.metrics.listenAddressEx": "Ex \":8067\"",
+  "admin.metrics.listenAddressTitle": "Endereço à escutar:",
   "admin.nav.help": "Ajuda",
   "admin.nav.logout": "Sair",
   "admin.nav.report": "Relatar um Problema",
@@ -644,8 +650,8 @@
   "admin.service.corsTitle": "Permitir requisição cross-origin de:",
   "admin.service.developerDesc": "Quando verdadeiro, erros Javascript são mostrados em uma barra vermelha no topo da interface de usuário. Não recomendado para uso em produção. ",
   "admin.service.developerTitle": "Ativar o Modo Desenvolvedor: ",
-  "admin.service.forward80To443": "Forward port 80 to 443:",
-  "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443",
+  "admin.service.forward80To443": "Redirecionamento porta 80 para 443:",
+  "admin.service.forward80To443Description": "Redirecionar todo trafego inseguro da porta 80 para porta segura 443",
   "admin.service.googleDescription": "Defina esta chave para permitir a exibição de títulos para pré-visualizações de vídeo do YouTube embutidos. Sem a chave, pré-visualizações do YouTube ainda serão criadas com base em hiperlinks que aparecem nas mensagens ou comentários, mas eles não vão mostrar o título do vídeo. Veja o <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a> para instruções sobre como obter uma chave.",
   "admin.service.googleExample": "Ex.: \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
   "admin.service.googleTitle": "Google API Key:",
@@ -655,8 +661,8 @@
   "admin.service.insecureTlsTitle": "Ativar Conexões de Saída Inseguras: ",
   "admin.service.integrationAdmin": "Restringir gerenciamento de integrações aos Administradores:",
   "admin.service.integrationAdminDesc": "Quando verdadeiro, webhooks e comandos slash podem somente ser criados, editados e visualizados pelos Administradores de Equipe e Sistema, e aplicações OAuth 2.0 pelos Administradores de Sistema. Integrações estão disponíveis para todos os usuários depois delas terem sido criadas pelo Administrador.",
-  "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt Certificate Cache File:",
-  "admin.service.letsEncryptCertificateCacheFileDescription": "Certificates retrieved and other data about the Let's Encrypt service will be stored in this file.",
+  "admin.service.letsEncryptCertificateCacheFile": "Arquivo de Cache de Certificado Let's Encrypt:",
+  "admin.service.letsEncryptCertificateCacheFileDescription": "Os certificados obtidos e outros dados sobre o serviço Let's Encrypt serão armazenados nesse arquivo.",
   "admin.service.listenAddress": "Endereço à Escutar:",
   "admin.service.listenDescription": "O endereço e a porta à qual se ligar e ouvir. Especificando \":8065\" irá ligar-se a todas as interfaces de rede. Especificando \"127.0.0.1:8065\" só irá ligar à interface de rede com esse endereço IP. Se você escolher uma porta de um nível mais baixo (chamadas de \"portas do sistema\" ou \"portas conhecidas\", na faixa de 0-1023), você deve ter permissões para se ligar a essa porta. No Linux, você pode usar: \"sudo setcap cap_net_bind_service=+ep ./bin/platform\" para permitir o Mattermost vincular a portas conhecidas.",
   "admin.service.listenExample": "Ex.: \":8065\"",
@@ -668,8 +674,8 @@
   "admin.service.outWebhooksTitle": "Ativar Webhooks Saída: ",
   "admin.service.overrideDescription": "Quando verdadeiro, webhooks, comandos slash e outras integrações, como <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>, terão permissão para mudar o nome do usuário dos posts. Nota: Combinado com a permissão de integrações para substituir foto do perfil, os usuários podem ser capazes de realizar ataques de phishing ao tentar passar por outros usuários.",
   "admin.service.overrideTitle": "Permitir que integrações sobrescrevam o nome do usuário:",
-  "admin.service.readTimeout": "Read Timeout:",
-  "admin.service.readTimeoutDescription": "Maximum time allowed from when the connection is accepted to when the request body is fully read.",
+  "admin.service.readTimeout": "Tempo limite de escrita:",
+  "admin.service.readTimeoutDescription": "Tempo máximo permitido desde quando a conexão é aceita até quando o corpo da solicitação é totalmente lido.",
   "admin.service.securityDesc": "Quando verdadeiro, os Administradores de Sistema são notificados por e-mail se uma relevante correção de segurança foi anunciado nos últimos 12 horas. Requer o e-mail para ser ativado.",
   "admin.service.securityTitle": "Ativar Alertas de Segurança: ",
   "admin.service.segmentDescription": "Segment.com é um serviço online que pode opcionalmente ser usado para rastrear detalhes das estatísticas do sistema. Você pode obter uma chave criando uma conta gratuita em Segment.com.",
@@ -685,18 +691,18 @@
   "admin.service.ssoSessionDaysDesc": "O número de dias desde a última vez que um usuário entrou suas credenciais para expirar a sessão do usuário. Se o método de autenticação é SAML ou GitLab, o usuário pode automaticamente ser registrado novamente no Mattermost se já estiver conectado ao SAML ou GitLab. Depois de alterar essa configuração, a configuração terá efeito após a próxima vez que o usuário digitar suas credenciais.",
   "admin.service.testingDescription": "Quando verdadeiro, comando slash /loadtest está habilitado para carregar contas e teste, dados e formatação de texto. Mudar isso exigirá um reinício do servidor antes que tenha efeito.",
   "admin.service.testingTitle": "Ativar Comandos Teste: ",
-  "admin.service.tlsCertFile": "TLS Certificate File:",
-  "admin.service.tlsCertFileDescription": "The certificate file to use.",
-  "admin.service.tlsKeyFile": "TLS Key File:",
-  "admin.service.tlsKeyFileDescription": "The private key file to use.",
-  "admin.service.useLetsEncrypt": "Use Let's Encrypt:",
-  "admin.service.useLetsEncryptDescription": "Enable the automatic retreval of certificates from the Let's Encrypt. The certificate will be retrieved when a client attempts to connect from a new domain. This will work with multiple domains.",
+  "admin.service.tlsCertFile": "Arquivo de Certificado TLS:",
+  "admin.service.tlsCertFileDescription": "O arquivo do certificado a ser usado.",
+  "admin.service.tlsKeyFile": "Arquivo da Chave TLS:",
+  "admin.service.tlsKeyFileDescription": "O arquivo da chave privada a ser usado.",
+  "admin.service.useLetsEncrypt": "Usar Let's Encrypt:",
+  "admin.service.useLetsEncryptDescription": "Ativar a recuperação automática de certificados do Let's Encrypt. O certificado será recuperado quando um cliente tentar se conectar de um novo domínio. Isso funcionará com vários domínios.",
   "admin.service.webSessionDays": "Tamanho da sessão AD/LDAP e email (dias):",
   "admin.service.webSessionDaysDesc": "O número de dias desde a última vez que um usuário entrou suas credenciais para expirar a sessão do usuário. Depois de alterar essa configuração, a nova duração da sessão terá efeito após a próxima vez que o usuário digitar suas credenciais.",
   "admin.service.webhooksDescription": "Quando verdadeiro, webhooks de entrada serão permitidos. Para ajudar combater ataques de phishing, todas as postagens por webhook serão marcadas com uma etiqueta BOT. Veja a <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>documentação</a> para saber mais.",
   "admin.service.webhooksTitle": "Ativar Webhooks Entrada: ",
-  "admin.service.writeTimeout": "Write Timeout:",
-  "admin.service.writeTimeoutDescription": "If using HTTP (insecure), this is the maximum time allowed from the end of reading the request headers until the response is written. If using HTTPS, it is the total time from when the connection is accepted until the response is written.",
+  "admin.service.writeTimeout": "Tempo limite de gravação:",
+  "admin.service.writeTimeoutDescription": "Se estiver usando HTTP (inseguro), este é o tempo máximo permitido desde o final da leitura dos cabeçalhos de solicitação até que a resposta seja escrita. Se estiver usando HTTPS, é o tempo total de quando a conexão é aceita até que a resposta seja escrita.",
   "admin.sidebar.addTeamSidebar": "Adicionar equipe do menu lateral",
   "admin.sidebar.advanced": "Avançado",
   "admin.sidebar.audits": "Conformidade e Auditoria",
@@ -725,6 +731,7 @@
   "admin.sidebar.logging": "Acesso",
   "admin.sidebar.login": "Login",
   "admin.sidebar.logs": "Logs",
+  "admin.sidebar.metrics": "Monitoramento de Performance (Beta)",
   "admin.sidebar.nativeAppLinks": "Links Aplicativo Mattermost",
   "admin.sidebar.notifications": "Notificações",
   "admin.sidebar.oauth": "OAuth 2.0",
@@ -800,6 +807,9 @@
   "admin.team.maxChannelsDescription": "Número máximo total de canais por equipe, incluindo ambos canais ativos e inativos.",
   "admin.team.maxChannelsExample": "Ex \"100\"",
   "admin.team.maxChannelsTitle": "Máximo Canais Por Equipe:",
+  "admin.team.maxNotificationsPerChannelDescription": "Número total máximo de usuários em um canal antes de os usuários digitarem as mensagens, @all, @here e @channel não será enviado notificações por motivos de performance.",
+  "admin.team.maxNotificationsPerChannelExample": "Ex \"1000\"",
+  "admin.team.maxNotificationsPerChannelTitle": "Máximo de Notificações por Canal",
   "admin.team.maxUsersDescription": "Número máximo total de usuários por equipe, incluindo ambos usuários ativos e inativos.",
   "admin.team.maxUsersExample": "Ex.: \"25\"",
   "admin.team.maxUsersTitle": "Máximo Usuários Por Equipe:",
@@ -1121,7 +1131,7 @@
   "claim.oauth_to_email.switchTo": "Trocar {type} para email e senha",
   "claim.oauth_to_email.title": "Trocar Conta {type} para E-mail",
   "confirm_modal.cancel": "Cancelar",
-  "connecting_screen": "Conexões",
+  "connecting_screen": "Conectando",
   "create_comment.addComment": "Adicionar um comentário...",
   "create_comment.comment": "Adicionar Comentário",
   "create_comment.commentLength": "Tamanho dos comentários precisa ter menos de {max} caracteres.",
@@ -1632,7 +1642,7 @@
   "rhs_comment.mobile.flag": "Marcar",
   "rhs_comment.mobile.unflag": "Desmarcar",
   "rhs_comment.permalink": "Permalink",
-  "rhs_header.backToCallTooltip": "Back to Call",
+  "rhs_header.backToCallTooltip": "Voltar para Chamada",
   "rhs_header.backToFlaggedTooltip": "Voltar para Posts Marcados",
   "rhs_header.backToResultsTooltip": "Voltar para os Resultados da Pesquisa",
   "rhs_header.closeSidebarTooltip": "Fechar a Barra Lateral",
@@ -1955,7 +1965,7 @@
   "user.settings.languages.promote": "Escolha qual idioma Mattermost exibirá a interface do usuário.<br /><br />Gostaria de ajudar com as traduções? Junte-se ao <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> para contribuir.",
   "user.settings.mfa.add": "Adicionar MFA para sua conta",
   "user.settings.mfa.addHelp": "Você pode exigir um token gerado por um smartphone, além da sua senha, para entrar no Mattermost.<br/><br/>Para ativar, faça download no seu smartphone do Google Authenticator no <a target='_blank' href='https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8'>iTunes</a> ou <a target='_blank' href='https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en'>Google Play</a>, em seguida,<br/><br/>1. Clique no botão acima<strong>Adicionar MFA para sua conta</strong>.<br/>2. Use o Google Authenticator para escanear o QR code que aparece ou digite a chave manualmente.<br/>3. Digite o Token gerado pelo Google Authenticator e clique em <strong>Salvar</strong>.<br/><br/>Quando logar, você será solicitado a digitar um token do Google Authenticator, além de suas credenciais regulares.",
-  "user.settings.mfa.addHelpQr": "Por favor escanei o código QR com o aplicativo Google Authenticator no smartphone e preencha com o token fornecido pelo aplicativo. Se você não conseguir escanear o código, você pode manualmente inserir a chave fornecida.",
+  "user.settings.mfa.addHelpQr": "Por favor escaneie o código QR com o aplicativo Google Authenticator no smartphone e preencha com o token fornecido pelo aplicativo. Se você não conseguir escanear o código, você pode manualmente inserir a chave fornecida.",
   "user.settings.mfa.enterToken": "Token (somente números)",
   "user.settings.mfa.qrCode": "Código de Barra",
   "user.settings.mfa.remove": "Remover MFA da sua conta",
diff --git a/webapp/i18n/ru.json b/webapp/i18n/ru.json
index 3977aec5c..cb5a723ad 100644
--- a/webapp/i18n/ru.json
+++ b/webapp/i18n/ru.json
@@ -73,7 +73,7 @@
   "add_emoji.header": "Добавить",
   "add_emoji.image": "Изображение",
   "add_emoji.image.button": "Выбрать",
-  "add_emoji.image.help": "Выберите изображение для вашего смайлика. Изображение может быть в формате gif, png или jpeg, размером до 64KB и разрешением до 128 на 128 пикселей.",
+  "add_emoji.image.help": "Choose the image for your emoji. The image can be a gif, png, or jpeg file with a max size of 1 MB. Dimensions will automatically resize to fit 128 by 128 pixels but keeping aspect ratio.",
   "add_emoji.imageRequired": "Требуется изображение для смайлика",
   "add_emoji.name": "Имя",
   "add_emoji.name.help": "Выберите имя для смайлика, длиной до 64 символов, используя буквы, цифры и символы '-' и '_'.",
@@ -137,6 +137,7 @@
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "Первое слово соответствует слову события полностью",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "Первое слово начинается со слова триггера",
   "admin.advance.cluster": "Высокая доступность (Beta)",
+  "admin.advance.metrics": "Мониторинг производительности (бета)",
   "admin.audits.reload": "Перезагрузить логи активности пользователя",
   "admin.audits.title": "Логи активности пользователя",
   "admin.authentication.email": "Аутентификация по Email",
@@ -298,7 +299,7 @@
   "admin.general.configuration": "Параметры",
   "admin.general.localization": "Локализация",
   "admin.general.localization.availableLocalesDescription": "Выберите, какие языки будут доступны пользователям в Настройках учетной записи (оставьте это поле пустым, чтобы сделать доступными все поддерживаемые языки). Если вы вручную добавляете новые языки, <strong>Язык клиента по умолчанию</strong> должен быть добавлен до сохранения этой настройки.<br /><br />Желаете помочь с переводами? Присоединяйтесь к <a href='http://translate.mattermost.com/' target='_blank'>серверу переводов Mattermost</a>, чтобы внести свой вклад.",
-  "admin.general.localization.availableLocalesNoResults": "No results found",
+  "admin.general.localization.availableLocalesNoResults": "Ничего не найдено",
   "admin.general.localization.availableLocalesNotPresent": "The default client language must be included in the available list",
   "admin.general.localization.availableLocalesTitle": "Доступные языки:",
   "admin.general.localization.clientLocaleDescription": "Язык по умолчанию для новых пользователей и страниц при первом входе в систему.",
@@ -495,6 +496,11 @@
   "admin.log.logSettings": "Настройки журнала",
   "admin.logs.reload": "Перезагрузить",
   "admin.logs.title": "Серверные логи",
+  "admin.metrics.enableDescription": "When true, Mattermost will enable performance monitoring collection and profiling. Please see <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target=\"_blank\">documentation</a> to learn more about configuring performance monitoring for Mattermost.",
+  "admin.metrics.enableTitle": "Включить мониторинг производительности",
+  "admin.metrics.listenAddressDesc": "The address the server will listen on to expose performance metrics.",
+  "admin.metrics.listenAddressEx": "Например: \":8067\"",
+  "admin.metrics.listenAddressTitle": "Прослушиваемый адрес:",
   "admin.nav.help": "Помощь",
   "admin.nav.logout": "Выйти",
   "admin.nav.report": "Сообщить об ошибке",
@@ -644,8 +650,8 @@
   "admin.service.corsTitle": "Разрешить кроссдоменные запросы от:",
   "admin.service.developerDesc": "Когда включено, на красной панели сверху будут показываться ошибки Javascript. Не рекомендуется включать на боевом сервере.",
   "admin.service.developerTitle": "Включить режим разработчика:",
-  "admin.service.forward80To443": "Forward port 80 to 443:",
-  "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443",
+  "admin.service.forward80To443": "Перенаправить 80 порт на 443:",
+  "admin.service.forward80To443Description": "Перенаправляет весь незащищённый трафик с 80 порта на 443",
   "admin.service.googleDescription": "Задайте этот ключ, чтобы включить отображение подписей к предпросмотрам встроенных YouTube-видео. Без этого ключа предпросмотры YouTube-видео по прежнему будут создаваться на основе гиперссылок, появляющихся в сообщениях или комментариях, но название видео отображаться не будет. Посмотрите <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a>, для того чтобы узнать, как получить ключ.",
   "admin.service.googleExample": "Например: 7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV",
   "admin.service.googleTitle": "Ключ Google API:",
@@ -668,7 +674,7 @@
   "admin.service.outWebhooksTitle": "Разрешить исходящие вебхуки: ",
   "admin.service.overrideDescription": "Если истина, вебхукам, слэш-командам и прочим интеграциям, таким как <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>, будет позволено менять имя пользователя, от имени которого они создают посты. Замечание: совместно с предоставлением интеграциям права переопределять иконки изображений профиля, пользователи могут получить возможность выполнять фишинговые атаки, пытаясь выдать себя за других пользователей.",
   "admin.service.overrideTitle": "Разрешить интеграциям переопределять имена:",
-  "admin.service.readTimeout": "Read Timeout:",
+  "admin.service.readTimeout": "Тайм-аут чтения:",
   "admin.service.readTimeoutDescription": "Maximum time allowed from when the connection is accepted to when the request body is fully read.",
   "admin.service.securityDesc": "Если включено, администратор системы получит уведомление о выходе новых обновлений безопасности анонсированных за 12 часов. Потребует включение email.",
   "admin.service.securityTitle": "Включить оповещения безопасности: ",
@@ -685,17 +691,17 @@
   "admin.service.ssoSessionDaysDesc": "Количество дней с последнего ввода пользователем своих учетных данных до истечения срока пользовательской сессии. Если метод аутентификации - SAML или GitLab, пользователь может быть автоматически впущен обратно в Mattermost, если он уже вошел в SAML или GitLab. После изменения этого параметра он вступит в силу после следующего ввода пользователем своих учетных данных.",
   "admin.service.testingDescription": "Если истина, становится доступна слэш-команда /loadtest, предназначенная для загрузки тестовых учетных записей, данных и форматирования текста. Изменение этого параметра требует перезагрузки сервера для вступления в силу.",
   "admin.service.testingTitle": "Разрешить команды тестирования: ",
-  "admin.service.tlsCertFile": "TLS Certificate File:",
+  "admin.service.tlsCertFile": "Файл сертификата TLS:",
   "admin.service.tlsCertFileDescription": "The certificate file to use.",
-  "admin.service.tlsKeyFile": "TLS Key File:",
+  "admin.service.tlsKeyFile": "Файл ключа TLS:",
   "admin.service.tlsKeyFileDescription": "The private key file to use.",
-  "admin.service.useLetsEncrypt": "Use Let's Encrypt:",
+  "admin.service.useLetsEncrypt": "Использовать Let's Encrypt:",
   "admin.service.useLetsEncryptDescription": "Enable the automatic retreval of certificates from the Let's Encrypt. The certificate will be retrieved when a client attempts to connect from a new domain. This will work with multiple domains.",
   "admin.service.webSessionDays": "Продолжительность сессии AD/LDAP и электронной почты (в днях):",
   "admin.service.webSessionDaysDesc": "Количество дней с последнего ввода пользователем своих учетных данных до истечения срока пользовательской сессии. После изменения этого параметра, новая продолжительность сессии вступит в силу после следующего ввода пользователями своих учетных данных.",
   "admin.service.webhooksDescription": "Если истина, входящие вебхуки будут разрешены. В целях борьбы с фишинговыми атаками, все посты от имени вебхуков будут помечены тэгом БОТ. Смотрите <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>документацию</a>, чтобы узнать больше.",
   "admin.service.webhooksTitle": "Включить входящие Webhook'и: ",
-  "admin.service.writeTimeout": "Write Timeout:",
+  "admin.service.writeTimeout": "Тайм-аут записи:",
   "admin.service.writeTimeoutDescription": "If using HTTP (insecure), this is the maximum time allowed from the end of reading the request headers until the response is written. If using HTTPS, it is the total time from when the connection is accepted until the response is written.",
   "admin.sidebar.addTeamSidebar": "Добавить команду из меню боковой панели",
   "admin.sidebar.advanced": "Дополнительно",
@@ -725,6 +731,7 @@
   "admin.sidebar.logging": "Журналирование",
   "admin.sidebar.login": "Login",
   "admin.sidebar.logs": "Журналы",
+  "admin.sidebar.metrics": "Мониторинг производительности (бета)",
   "admin.sidebar.nativeAppLinks": "Ссылки на приложения Mattermost",
   "admin.sidebar.notifications": "Уведомления",
   "admin.sidebar.oauth": "OAuth 2.0",
@@ -759,7 +766,7 @@
   "admin.sql.keyTitle": "At Rest Encrypt Key:",
   "admin.sql.maxConnectionsDescription": "Максимально количество неактивных соединений, которые остаются открытыми для базы данных.",
   "admin.sql.maxConnectionsExample": "Например: \"10\"",
-  "admin.sql.maxConnectionsTitle": "Maximum Idle Connections:",
+  "admin.sql.maxConnectionsTitle": "Максимальное число неактивных (idle) соединений:",
   "admin.sql.maxOpenDescription": "Максимально количество неактивных соединений, которые остаются открытыми для базы данных.",
   "admin.sql.maxOpenExample": "Например: \"10\"",
   "admin.sql.maxOpenTitle": "Максимальное число открытых соединений:",
@@ -800,6 +807,9 @@
   "admin.team.maxChannelsDescription": "Максимальное количество каналов на команду, включая активные и удалённые.",
   "admin.team.maxChannelsExample": "Например: \"100\"",
   "admin.team.maxChannelsTitle": "Максимальное количество каналов на команду:",
+  "admin.team.maxNotificationsPerChannelDescription": "Maximum total number of users in a channel before users typing messages, @all, @here, and @channel no longer send notifications because of performance.",
+  "admin.team.maxNotificationsPerChannelExample": "Например: \"1000\"",
+  "admin.team.maxNotificationsPerChannelTitle": "Max Notifications Per Channel:",
   "admin.team.maxUsersDescription": "Максимальное количество пользователей на команду.",
   "admin.team.maxUsersExample": "Например: \"25\"",
   "admin.team.maxUsersTitle": "Максимальное количество пользователей в команде:",
@@ -977,7 +987,7 @@
   "authorize.title": "<strong>{appName}</strong> желает подключиться к вашей <strong>Mattermost</strong> учетной записи",
   "backstage_list.search": "Поиск",
   "backstage_navbar.backToMattermost": "Возврат к {siteName}",
-  "backstage_sidebar.emoji": "Пользовательские смайлы",
+  "backstage_sidebar.emoji": "Пользовательские эмодзи",
   "backstage_sidebar.integrations": "Интеграция",
   "backstage_sidebar.integrations.commands": "Cлэш-команды",
   "backstage_sidebar.integrations.incoming_webhooks": "Входящие Webhook'и",
@@ -1020,7 +1030,7 @@
   "channel_header.viewInfo": "Информация",
   "channel_header.viewMembers": "Просмотреть список участников",
   "channel_header.webrtc.call": "Видеовызов",
-  "channel_header.webrtc.offline": "The user is offline",
+  "channel_header.webrtc.offline": "Пользователь не в сети",
   "channel_header.webrtc.unavailable": "Новый вызов недоступен до завершения текущего вызова",
   "channel_info.about": "О канале",
   "channel_info.close": "Закрыть",
@@ -1121,7 +1131,7 @@
   "claim.oauth_to_email.switchTo": "Перейти с {type} к использованию e-mail и пароля",
   "claim.oauth_to_email.title": "Switch {type} Account to Email",
   "confirm_modal.cancel": "Отмена",
-  "connecting_screen": "Подключения",
+  "connecting_screen": "Подключение",
   "create_comment.addComment": "Добавить комментарий...",
   "create_comment.comment": "Добавить комментарий",
   "create_comment.commentLength": "Длина комментария должна быть меньше {max} символов.",
@@ -1181,7 +1191,7 @@
   "edit_channel_purpose_modal.save": "Сохранить",
   "edit_channel_purpose_modal.title1": "Редактировать Назначение",
   "edit_channel_purpose_modal.title2": "Редактировать назначение для ",
-  "edit_command.save": "Update",
+  "edit_command.save": "Обновить",
   "edit_post.cancel": "Отмена",
   "edit_post.edit": "Редактировать {title}",
   "edit_post.editPost": "Редактировать сообщение...",
@@ -1387,7 +1397,7 @@
   "installed_integrations.client_id": "ID клиента: <strong>{clientId}</strong>",
   "installed_integrations.client_secret": "Secret Клиента: <strong>{clientSecret}</strong>",
   "installed_integrations.content_type": "Content-Type: {contentType}",
-  "installed_integrations.creation": "Created by {creator} on {createAt, date, full}",
+  "installed_integrations.creation": "Создано {creator} в {createAt, date, full}",
   "installed_integrations.delete": "Удалить",
   "installed_integrations.edit": "Редактировать",
   "installed_integrations.hideSecret": "Скрыть Secret",
@@ -1676,7 +1686,7 @@
   "sidebar.createChannel": "Создать канал",
   "sidebar.createGroup": "Создать группу",
   "sidebar.direct": "Прямые сообщения",
-  "sidebar.favorite": "Favorites",
+  "sidebar.favorite": "Избранные",
   "sidebar.more": "Еще",
   "sidebar.moreElips": "Еще...",
   "sidebar.otherMembers": "За пределами команды",
@@ -1710,7 +1720,7 @@
   "signup.title": "Создать аккаунт с помощью:",
   "signup_team.choose": "Ваши команды: ",
   "signup_team.createTeam": "Или создайте команду",
-  "signup_team.disabled": "Team creation has been disabled.  Please contact an administrator for access.",
+  "signup_team.disabled": "Создание команд отключено.  Пожалуйста, свяжитесь с администратором для получения данной возможности.",
   "signup_team.join_open": "Команды, к которым вы можете присоединиться:",
   "signup_team.noTeams": "There are no teams included in the Team Directory and team creation has been disabled.",
   "signup_team.no_open_teams": "Нет комманд доступных для входа. Пожалуйста, получите приглашение у администратора.",
@@ -1718,7 +1728,7 @@
   "signup_team.no_teams": "Не было создано ни одной команды. Свяжитесь с Вашим администратором.",
   "signup_team.no_teams_canCreate": "Нет ни одной команды. Вы можете создать её, нажав на кнопку \"Создать команду\".",
   "signup_team.none": "No team creation method has been enabled.  Please contact an administrator for access.",
-  "signup_team_complete.completed": "You've already completed the signup process for this invitation or this invitation has expired.",
+  "signup_team_complete.completed": "Вы уже завершили процесс регистрации или срок приглашения уже истёк.",
   "signup_team_confirm.checkEmail": "Please check your email: <strong>{email}</strong><br />Your email contains a link to set up your team",
   "signup_team_confirm.title": "Регистрация завершена",
   "signup_team_system_console": "Перейти в системную консоль",
@@ -1744,7 +1754,7 @@
   "signup_user_completed.signIn": "Щёлкните здесь для входа.",
   "signup_user_completed.userHelp": "Username must begin with a letter, and contain between {min} to {max} lowercase characters made up of numbers, letters, and the symbols '.', '-' and '_'",
   "signup_user_completed.usernameLength": "Username must begin with a letter, and contain between {min} to {max} lowercase characters made up of numbers, letters, and the symbols '.', '-' and '_'.",
-  "signup_user_completed.validEmail": "Please enter a valid email address",
+  "signup_user_completed.validEmail": "Пожалуйста, введите корректный адрес электронной почты",
   "signup_user_completed.welcome": "Добро пожаловать:",
   "signup_user_completed.whatis": "Ваш адрес электронной почты?",
   "signup_user_completed.withLdap": "С вашими AD/LDAP учетными данными",
@@ -1769,7 +1779,7 @@
   "team_export_tab.exportTeam": "Экспортировать вашу команду",
   "team_export_tab.exporting": " Экспортирование...",
   "team_export_tab.ready": " Готово для ",
-  "team_export_tab.unable": " Unable to export: {error}",
+  "team_export_tab.unable": " Невозможно экспортировать: {error}",
   "team_import_tab.failure": " Ошибка импорта: ",
   "team_import_tab.import": "Импорт",
   "team_import_tab.importHelp": "<p>Для импорта команды из Slack перейдите в Slack > Настройки команды > Импорт/Экспорт данных > Экспорт > Начать экспорт. Slack не позволяет экспортировать файлы, изображения, личные группы и личные сообщения. Поэтому из Slack в Mattermost будут импортированы только текстовые сообщения из публичных каналов вашей команды в Slack.</p><p>Импорт из Slack в Mattermost находится в состоянии 'Бета'. Посты Slack-ботов пока не импортируются.</p>",
@@ -1781,7 +1791,7 @@
   "team_member_modal.members": "Участники {team}",
   "team_members_dropdown.confirmDemoteDescription": "If you demote yourself from the System Admin role and there is not another user with System Admin privileges, you'll need to re-assign a System Admin by accessing the Mattermost server through a terminal and running the following command.",
   "team_members_dropdown.confirmDemoteRoleTitle": "Confirm demotion from System Admin role",
-  "team_members_dropdown.confirmDemotion": "Confirm Demotion",
+  "team_members_dropdown.confirmDemotion": "Подтвердить понижение",
   "team_members_dropdown.confirmDemotionCmd": "platform -assign_role -team_name=\"yourteam\" -email=\"name@yourcompany.com\" -role=\"system_admin\"",
   "team_members_dropdown.inactive": "Неактивен",
   "team_members_dropdown.leave_team": "Удалить из команды",
@@ -1816,7 +1826,7 @@
   "tutorial_intro.skip": "Пропустить обучение",
   "tutorial_intro.support": "Need anything, just email us at ",
   "tutorial_intro.teamInvite": "Invite teammates",
-  "tutorial_intro.whenReady": " when you’re ready.",
+  "tutorial_intro.whenReady": " когда будете готовы.",
   "tutorial_tip.next": "Далее",
   "tutorial_tip.ok": "Хорошо",
   "tutorial_tip.out": "Opt out of these tips.",
@@ -1824,13 +1834,13 @@
   "update_command.cancel": "Отмена",
   "update_command.confirm": "Добавить слэш-команду",
   "update_command.question": "Your changes may break the existing slash command. Are you sure you would like to update it?",
-  "update_command.update": "Update",
-  "upload_overlay.info": "Drop a file to upload it.",
+  "update_command.update": "Обновить",
+  "upload_overlay.info": "Бросьте сюда файл, чтобы загрузить его.",
   "user.settings.advance.embed_preview": "Показывать \"экспериментальный\" превью в ссылках, когда доступно",
   "user.settings.advance.embed_toggle": "Show toggle for all embed previews",
   "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Feature} other {Features}} Enabled",
   "user.settings.advance.formattingDesc": "If enabled, posts will be formatted to create links, show emoji, style the text, and add line breaks. By default, this setting is enabled. Changing this setting requires the page to be refreshed.",
-  "user.settings.advance.formattingTitle": "Enable Post Formatting",
+  "user.settings.advance.formattingTitle": "Разрешить форматирование сообщений",
   "user.settings.advance.joinLeaveDesc": "Если данная опция включена, будут отображаться системные сообщения о входе и выходе пользователей из канала. Если данная опция выключена, системные сообщения о входе и выходе из канала будут скрыты. Сообщения будут отображаться когда вы добавлены в канал, так что вы можете получать уведомления.",
   "user.settings.advance.joinLeaveTitle": "Включить сообщения входа/выхода",
   "user.settings.advance.markdown_preview": "Show markdown preview option in message input box",
@@ -1858,7 +1868,7 @@
   "user.settings.custom_theme.mentionHighlightBg": "Mention Highlight BG",
   "user.settings.custom_theme.mentionHighlightLink": "Mention Highlight Link",
   "user.settings.custom_theme.newMessageSeparator": "New Message Separator",
-  "user.settings.custom_theme.onlineIndicator": "Online Indicator",
+  "user.settings.custom_theme.onlineIndicator": "Статус",
   "user.settings.custom_theme.sidebarBg": "Sidebar BG",
   "user.settings.custom_theme.sidebarHeaderBg": "Sidebar Header BG",
   "user.settings.custom_theme.sidebarHeaderTextColor": "Sidebar Header Text",
@@ -1955,7 +1965,7 @@
   "user.settings.languages.promote": "Выберите язык отображения пользовательского интерфейса Mattermost.<br /><br />Хотите помочь с переводами? Присоединяйтесь к <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> и внесите свой вклад.",
   "user.settings.mfa.add": "Добавить MFA в ваш аккаунт",
   "user.settings.mfa.addHelp": "You can require a smartphone-based token, in addition to your password, to sign into Mattermost.<br/><br/>To enable, download Google Authenticator from <a target='_blank' href='https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8'>iTunes</a> or <a target='_blank' href='https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en'>Google Play</a> for your phone, then<br/><br/>1. Click the <strong>Add MFA to your account</strong> button above.<br/>2. Use Google Authenticator to scan the QR code that appears.<br/>3. Type in the Token generated by Google Authenticator and click <strong>Save</strong>.<br/><br/>When logging in, you will be asked to enter a token from Google Authenticator in addition to your regular credentials.",
-  "user.settings.mfa.addHelpQr": "Please scan the QR code with the Google Authenticator app on your smartphone and fill in the token with one provided by the app. If you are unable to scan the code, you can maunally enter the secret provided.",
+  "user.settings.mfa.addHelpQr": "Please scan the QR code with the Google Authenticator app on your smartphone and fill in the token with one provided by the app. If you are unable to scan the code, you can manually enter the secret provided.",
   "user.settings.mfa.enterToken": "Token (numbers only)",
   "user.settings.mfa.qrCode": "Штрихкод",
   "user.settings.mfa.remove": "Удалить MFA из вашего аккаунта",
@@ -2052,9 +2062,9 @@
   "user.settings.security.google": "Google",
   "user.settings.security.lastUpdated": "Последние изменения: {date} в {time}",
   "user.settings.security.ldap": "AD/LDAP",
-  "user.settings.security.loginGitlab": "Вход выполнен через Gitlab",
+  "user.settings.security.loginGitlab": "Вход выполнен с помощью GitLab",
   "user.settings.security.loginLdap": "Вход выполнен через AD/LDAP",
-  "user.settings.security.loginSaml": "Вход выполнен через Gitlab",
+  "user.settings.security.loginSaml": "Вход выполнен с помощью SAML",
   "user.settings.security.logoutActiveSessions": "Просмотр и завершение активных сессий",
   "user.settings.security.method": "Методы входа",
   "user.settings.security.newPassword": "Новый пароль",
@@ -2098,7 +2108,7 @@
   "user.settings.security.viewHistory": "Просмотр истории доступа",
   "user_list.notFound": "Пользователи не найдены",
   "user_profile.webrtc.call": "Видеовызов",
-  "user_profile.webrtc.offline": "The user is offline",
+  "user_profile.webrtc.offline": "Пользователь не в сети",
   "user_profile.webrtc.unavailable": "Новый вызов недоступен до завершения текущего",
   "view_image.loading": "Загрузка ",
   "view_image_popover.download": "Скачать",
diff --git a/webapp/i18n/zh_CN.json b/webapp/i18n/zh_CN.json
index 6a32eff4f..ad0dff723 100644
--- a/webapp/i18n/zh_CN.json
+++ b/webapp/i18n/zh_CN.json
@@ -73,7 +73,7 @@
   "add_emoji.header": "添加",
   "add_emoji.image": "图像",
   "add_emoji.image.button": "选择",
-  "add_emoji.image.help": "为您的颜文字选择图片。图片可以是gif、png或jpeg档案，大小请在64KB以下，长宽请控制在128*128像素或以内。",
+  "add_emoji.image.help": "Choose the image for your emoji. The image can be a gif, png, or jpeg file with a max size of 1 MB. Dimensions will automatically resize to fit 128 by 128 pixels but keeping aspect ratio.",
   "add_emoji.imageRequired": "表情符号需要个图片",
   "add_emoji.name": "名称",
   "add_emoji.name.help": "选择一个多达64个小写字母，数字以及符号 '-' 和 '_' 字符组成的用户名用于表情符号。",
@@ -137,6 +137,7 @@
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "第一个完全符合触发关键字",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "第一字以触发关键字为开头",
   "admin.advance.cluster": "高可用性 (Beta)",
+  "admin.advance.metrics": "Performance Monitoring (Beta)",
   "admin.audits.reload": "重新载入用户活动日志",
   "admin.audits.title": "用户活动日志",
   "admin.authentication.email": "邮件验证",
@@ -298,8 +299,8 @@
   "admin.general.configuration": "配置",
   "admin.general.localization": "本地化",
   "admin.general.localization.availableLocalesDescription": "设置用户在帐号设置可用的语言（留空将可用所有语言）。如果您手动添加新语言，必须在保存钱先添加<strong>默认客户端语言</strong>。<br /><br />想要帮忙翻译吗？加入<a href='http://translate.mattermost.com/' target='_blank'>Mattermost 翻译服务器</a>。",
-  "admin.general.localization.availableLocalesNoResults": "No results found",
-  "admin.general.localization.availableLocalesNotPresent": "The default client language must be included in the available list",
+  "admin.general.localization.availableLocalesNoResults": "未找到结果",
+  "admin.general.localization.availableLocalesNotPresent": "默认客户端语言必须包含在可用列表里",
   "admin.general.localization.availableLocalesTitle": "可用的语言：",
   "admin.general.localization.clientLocaleDescription": "新创建的用户以及未登入的用户的默认语言。",
   "admin.general.localization.clientLocaleTitle": "默认客户端语言：",
@@ -350,16 +351,16 @@
   "admin.image.amazonS3BucketDescription": "您在AWS S3 存储桶中的名字。",
   "admin.image.amazonS3BucketExample": "例如 \"mattermost-media\"",
   "admin.image.amazonS3BucketTitle": "Amazon S3 存储桶：",
-  "admin.image.amazonS3EndpointDescription": "Hostname of your S3 Compatible Storage provider. Defaults to `s3.amazonaws.com`.",
-  "admin.image.amazonS3EndpointTitle": "Amazon S3 Endpoint:",
+  "admin.image.amazonS3EndpointDescription": "您的 S3 兼容储存提供商的主机名称。默认为 `s3.amazonaws.com`。",
+  "admin.image.amazonS3EndpointTitle": "亚马逊 S3 连接点：",
   "admin.image.amazonS3IdDescription": "从您的Amazon EC2管理员获得此证书。",
   "admin.image.amazonS3IdExample": "例如 \"AKIADTOVBGERKLCBV\"",
   "admin.image.amazonS3IdTitle": "Amazon S3 访问密钥 ID：",
   "admin.image.amazonS3RegionDescription": "您创建S3 存储桶选中的AWS区域。",
   "admin.image.amazonS3RegionExample": "例如 \"us-east-1\"",
   "admin.image.amazonS3RegionTitle": "Amazon S3区域：",
-  "admin.image.amazonS3SSLDescription": "When false, allow insecure connections to Amazon S3. Defaults to secure connections only.",
-  "admin.image.amazonS3SSLTitle": "Enable Secure Amazon S3 Connections:",
+  "admin.image.amazonS3SSLDescription": "当设为否时，允许创建非安全连接到亚马逊 S3。默认只允许安全连接。",
+  "admin.image.amazonS3SSLTitle": "开启安全亚马逊 S3 连接：",
   "admin.image.amazonS3SecretDescription": "从你的Amazon EC2管理员获得此证书。",
   "admin.image.amazonS3SecretExample": "例如 \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.image.amazonS3SecretTitle": "Amazon S3 秘密访问密钥：",
@@ -495,6 +496,11 @@
   "admin.log.logSettings": "日志设置",
   "admin.logs.reload": "重载",
   "admin.logs.title": "服务器日志",
+  "admin.metrics.enableDescription": "When true, Mattermost will enable performance monitoring collection and profiling. Please see <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target=\"_blank\">documentation</a> to learn more about configuring performance monitoring for Mattermost.",
+  "admin.metrics.enableTitle": "Enable Performance Monitoring:",
+  "admin.metrics.listenAddressDesc": "The address the server will listen on to expose performance metrics.",
+  "admin.metrics.listenAddressEx": "例如 \":8065\"",
+  "admin.metrics.listenAddressTitle": "监听地址：",
   "admin.nav.help": "帮助",
   "admin.nav.logout": "注销",
   "admin.nav.report": "报告问题",
@@ -644,8 +650,8 @@
   "admin.service.corsTitle": "允许来自以下跨源请求网址：",
   "admin.service.developerDesc": "开启时，Javascript错误将显示在页面顶端红条里。不推荐在正式环境使用。",
   "admin.service.developerTitle": "开启开发者模式：",
-  "admin.service.forward80To443": "Forward port 80 to 443:",
-  "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443",
+  "admin.service.forward80To443": "映射端口 80 到 443:",
+  "admin.service.forward80To443Description": "映射所有非安全流量从端口 80 到安全端口 443",
   "admin.service.googleDescription": "设置此钥匙以开启内嵌YouTube视频预览。如果没有此钥匙，YouTube预览仍然会在消息或评论中显示但不会显示视频标题。参见<a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a>教程以获得钥匙。",
   "admin.service.googleExample": "例如 \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
   "admin.service.googleTitle": "Google API 钥匙：",
@@ -655,7 +661,7 @@
   "admin.service.insecureTlsTitle": "启用不安全的对外连接：",
   "admin.service.integrationAdmin": "限制只有管理员能管理整合：",
   "admin.service.integrationAdminDesc": "当设为是时，webhhoks 和斜杠命令只由团队和系统管理员可以创建、修改和查看，同时只有系统管理员可以操作 OAuth 2.0 应用。整合在管理员创建后所有人可以使用。",
-  "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt Certificate Cache File:",
+  "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt 证书缓存文件：",
   "admin.service.letsEncryptCertificateCacheFileDescription": "Certificates retrieved and other data about the Let's Encrypt service will be stored in this file.",
   "admin.service.listenAddress": "监听地址：",
   "admin.service.listenDescription": "绑定和监听的地址和端口。指定 \":8065\" 将会绑定所有网络接口。指定 \"127.0.0.1:8065\" 将只绑定拥有此 IP 的网络接口。如果您选择一个低级端口 (叫 \"system ports\" 或 \"well-known ports\" 于 0-1023 之间)，您必须要拥有权限才能绑定到此端口。在 Linux 上您可以使用：\"sudo setcap cap_net_bind_service=+ep ./bin/platform\" 以允许 Mattermost 绑定知名端口。",
@@ -668,7 +674,7 @@
   "admin.service.outWebhooksTitle": "启用对外 Webhooks：",
   "admin.service.overrideDescription": "当设为是时，webhooks、斜杠命令以及其他整合比如 <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a> 会允许修改发出信息的用户名。注意：和允许整合覆盖头像配合将可能造成用户被钓鱼攻击。",
   "admin.service.overrideTitle": "允许整合覆盖用户名：",
-  "admin.service.readTimeout": "Read Timeout:",
+  "admin.service.readTimeout": "读取超时：",
   "admin.service.readTimeoutDescription": "Maximum time allowed from when the connection is accepted to when the request body is fully read.",
   "admin.service.securityDesc": "当设置为是时，如果在过去12小时内有发布安全修正将会发送通知给系统管理员。需要启用电子邮件。",
   "admin.service.securityTitle": "启用安全警报：",
@@ -685,17 +691,17 @@
   "admin.service.ssoSessionDaysDesc": "从用户上一次输入他们的认证到会话过期的天数。如果验证方式时SAML或GitLab，用户将会自动登入到Mattermost如果他们已经登入到SAML或GitLab。修改此设定后，新的会话时常将在用户下一次输入认证后生效。",
   "admin.service.testingDescription": "当设为是时，/loadtest 斜杠命令能载入测试账号，数据和文字格式。修改这个设置需要重启服务器才能生效。",
   "admin.service.testingTitle": "启动测试指令：",
-  "admin.service.tlsCertFile": "TLS Certificate File:",
-  "admin.service.tlsCertFileDescription": "The certificate file to use.",
-  "admin.service.tlsKeyFile": "TLS Key File:",
+  "admin.service.tlsCertFile": "TLS 证书文件：",
+  "admin.service.tlsCertFileDescription": "使用的证书文件。",
+  "admin.service.tlsKeyFile": "TLS 密钥文件：",
   "admin.service.tlsKeyFileDescription": "The private key file to use.",
-  "admin.service.useLetsEncrypt": "Use Let's Encrypt:",
+  "admin.service.useLetsEncrypt": "使用 Let's Encrypt：",
   "admin.service.useLetsEncryptDescription": "Enable the automatic retreval of certificates from the Let's Encrypt. The certificate will be retrieved when a client attempts to connect from a new domain. This will work with multiple domains.",
   "admin.service.webSessionDays": "AD/LDAP 和电子邮件的会话时长 (天)：",
   "admin.service.webSessionDaysDesc": "从用户上一次输入他们的认证到会话过期的天数。修改此设定后，新的会话时常将在用户下一次输入认证后生效。",
   "admin.service.webhooksDescription": "设为是时，允许传入webhooks。为了避免钓鱼攻击，所有webhooks的帖文会标上BOT标签。参见 <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>文档</a> 了解详情。",
   "admin.service.webhooksTitle": "启用传出的 Webhooks：",
-  "admin.service.writeTimeout": "Write Timeout:",
+  "admin.service.writeTimeout": "写入超时：",
   "admin.service.writeTimeoutDescription": "If using HTTP (insecure), this is the maximum time allowed from the end of reading the request headers until the response is written. If using HTTPS, it is the total time from when the connection is accepted until the response is written.",
   "admin.sidebar.addTeamSidebar": "从侧边栏菜单添加团队",
   "admin.sidebar.advanced": "高级",
@@ -725,6 +731,7 @@
   "admin.sidebar.logging": "日志",
   "admin.sidebar.login": "登录",
   "admin.sidebar.logs": "日志",
+  "admin.sidebar.metrics": "Performance Monitoring (Beta)",
   "admin.sidebar.nativeAppLinks": "Mattermost 应用链接",
   "admin.sidebar.notifications": "通知",
   "admin.sidebar.oauth": "OAuth 2.0",
@@ -800,6 +807,9 @@
   "admin.team.maxChannelsDescription": "每个团队最多频道数，包括活动的和已删除的频道。",
   "admin.team.maxChannelsExample": "例如 \"100\"",
   "admin.team.maxChannelsTitle": "每团队最多频道数：",
+  "admin.team.maxNotificationsPerChannelDescription": "Maximum total number of users in a channel before users typing messages, @all, @here, and @channel no longer send notifications because of performance.",
+  "admin.team.maxNotificationsPerChannelExample": "例如\"10000\"",
+  "admin.team.maxNotificationsPerChannelTitle": "Max Notifications Per Channel:",
   "admin.team.maxUsersDescription": "每个团队最多用户数，包括启用的和停用的用户。",
   "admin.team.maxUsersExample": "例如 \"25\"",
   "admin.team.maxUsersTitle": "每个团队最多用户数：",
@@ -1121,7 +1131,7 @@
   "claim.oauth_to_email.switchTo": "切换{type}为邮箱和密码",
   "claim.oauth_to_email.title": "切换{type}账户为邮箱",
   "confirm_modal.cancel": "取消",
-  "connecting_screen": "连接",
+  "connecting_screen": "正在连接",
   "create_comment.addComment": "添加一个评论...",
   "create_comment.comment": "添加评论",
   "create_comment.commentLength": "评论长度至少{max}字符。",
@@ -1632,7 +1642,7 @@
   "rhs_comment.mobile.flag": "标记",
   "rhs_comment.mobile.unflag": "取消标记",
   "rhs_comment.permalink": "永久链接",
-  "rhs_header.backToCallTooltip": "Back to Call",
+  "rhs_header.backToCallTooltip": "回到通话",
   "rhs_header.backToFlaggedTooltip": "回到已标记的信息",
   "rhs_header.backToResultsTooltip": "回到搜索结果",
   "rhs_header.closeSidebarTooltip": "关闭侧栏",
diff --git a/webapp/i18n/zh_TW.json b/webapp/i18n/zh_TW.json
index 976088710..73d9aef77 100644
--- a/webapp/i18n/zh_TW.json
+++ b/webapp/i18n/zh_TW.json
@@ -73,7 +73,7 @@
   "add_emoji.header": "新增",
   "add_emoji.image": "圖片",
   "add_emoji.image.button": "選擇",
-  "add_emoji.image.help": "為繪文字選擇圖片。圖片可以是gif、png或jpeg檔案，大小請在64KB以下，長寬請在128像素以內。",
+  "add_emoji.image.help": "為繪文字選取圖片。圖片格式為 gif、png 或 jpeg，檔案大小不超過 1 MB。尺寸會在保持長寬比下自動調整為符合 128x128 像素。",
   "add_emoji.imageRequired": "繪文字需要圖片",
   "add_emoji.name": "名字",
   "add_emoji.name.help": "為繪文字選擇名稱，名稱以最多64個小寫英數字跟'-'和'_'組成。",
@@ -137,6 +137,7 @@
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "第一個字完全符合觸發關鍵字",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "第一個字以觸發關鍵字為開頭",
   "admin.advance.cluster": "高可用性 (Beta)",
+  "admin.advance.metrics": "效能監視 (Beta)",
   "admin.audits.reload": "重新載入使用者活動記錄",
   "admin.audits.title": "使用者活動記錄",
   "admin.authentication.email": "電子郵件認證",
@@ -298,8 +299,8 @@
   "admin.general.configuration": "設定",
   "admin.general.localization": "語言",
   "admin.general.localization.availableLocalesDescription": "設定在帳號設定中使用者可以使用哪些語言 (留空則為全部支援的語言) 。如果要手動增加新語言，必須包含<strong>預設的用戶端語言</strong>在內。<br/><br/>想要幫忙翻譯嘛？加入 <a href='http://translate.mattermost.com/' target='_blank'>Mattermost 翻譯伺服器</a> 來幫忙。",
-  "admin.general.localization.availableLocalesNoResults": "No results found",
-  "admin.general.localization.availableLocalesNotPresent": "The default client language must be included in the available list",
+  "admin.general.localization.availableLocalesNoResults": "找不到任何資料",
+  "admin.general.localization.availableLocalesNotPresent": "用戶端的預設語言必須包含在可用語言中",
   "admin.general.localization.availableLocalesTitle": "可用語言：",
   "admin.general.localization.clientLocaleDescription": "新建使用者及未登入頁面的預設語言。",
   "admin.general.localization.clientLocaleTitle": "預設的用戶端語言：",
@@ -350,16 +351,16 @@
   "admin.image.amazonS3BucketDescription": "輸入 AWS S3 儲存貯體的名稱.",
   "admin.image.amazonS3BucketExample": "如：\"mattermost-media\"",
   "admin.image.amazonS3BucketTitle": "Amazon S3 儲存貯體：",
-  "admin.image.amazonS3EndpointDescription": "Hostname of your S3 Compatible Storage provider. Defaults to `s3.amazonaws.com`.",
-  "admin.image.amazonS3EndpointTitle": "Amazon S3 Endpoint:",
+  "admin.image.amazonS3EndpointDescription": "相容於 S3 的儲存提供者的主機名稱。預設為`s3.amazonaws.com`。",
+  "admin.image.amazonS3EndpointTitle": "Amazon S3 端點：",
   "admin.image.amazonS3IdDescription": "從 Amazon EC2 管理員取得認證。",
   "admin.image.amazonS3IdExample": "如：\"AKIADTOVBGERKLCBV\"",
   "admin.image.amazonS3IdTitle": "Amazon S3 存取金鑰識別碼：",
   "admin.image.amazonS3RegionDescription": "選擇建立 S3 儲存貯體時選用的 AWS 區域。",
   "admin.image.amazonS3RegionExample": "如：\"us-east-1\"",
   "admin.image.amazonS3RegionTitle": "Amazon S3 區域：",
-  "admin.image.amazonS3SSLDescription": "When false, allow insecure connections to Amazon S3. Defaults to secure connections only.",
-  "admin.image.amazonS3SSLTitle": "Enable Secure Amazon S3 Connections:",
+  "admin.image.amazonS3SSLDescription": "關閉時，允許不安全的連線至 Amazon S3。預設為只允許安全連線。",
+  "admin.image.amazonS3SSLTitle": "啟用 Amazon S3 安全連線：",
   "admin.image.amazonS3SecretDescription": "從 Amazon EC2 管理員取得認證。",
   "admin.image.amazonS3SecretExample": "如：\"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.image.amazonS3SecretTitle": "Amazon S3 Secret 存取金鑰：",
@@ -495,6 +496,11 @@
   "admin.log.logSettings": "記錄檔設定值",
   "admin.logs.reload": "重新載入",
   "admin.logs.title": "主機記錄",
+  "admin.metrics.enableDescription": "啟用時，Mattermost 會啟用效能監視的收集與分析。詳細如何設定 Mattermost 的效能監視，請參閱<a href=\"http://docs.mattermost.com/deployment/metrics.html\" target=\"_blank\">文件</a>。",
+  "admin.metrics.enableTitle": "啟用效能監視：",
+  "admin.metrics.listenAddressDesc": "伺服器將監聽以公開效能計量值的位址。",
+  "admin.metrics.listenAddressEx": "例如：\":8067\"",
+  "admin.metrics.listenAddressTitle": "監聽位址：",
   "admin.nav.help": "說明",
   "admin.nav.logout": "登出",
   "admin.nav.report": "回報錯誤",
@@ -644,8 +650,8 @@
   "admin.service.corsTitle": "允許來自下列網址的跨站請求：",
   "admin.service.developerDesc": "啟用時，Javascript 錯誤會顯示在使用者界面頂端上的紅色橫欄。不建議在正式環境中使用。",
   "admin.service.developerTitle": "啟用開發者模式：",
-  "admin.service.forward80To443": "Forward port 80 to 443:",
-  "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443",
+  "admin.service.forward80To443": "轉送80通訊埠至443：",
+  "admin.service.forward80To443Description": "轉送所有經由80通訊埠的不安全連線至安全的443通訊埠",
   "admin.service.googleDescription": "設定此金鑰以啟用顯示內嵌預覽 YouTube 影片的標題。即使沒有金鑰，訊息或註解有連結一樣會建立 YouTube 影片預覽，但是這些預覽無法顯示影片標題。請看 <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a> 的指示以取得金鑰。",
   "admin.service.googleExample": "例：\"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
   "admin.service.googleTitle": "Google API 金鑰：",
@@ -655,8 +661,8 @@
   "admin.service.insecureTlsTitle": "啟用不安全的對外連線：",
   "admin.service.integrationAdmin": "限制只有管理員能管理外部整合：",
   "admin.service.integrationAdminDesc": "啟用時，Webhook 跟斜線命令將只有團隊與系統管理員能夠建立、編輯跟觀看，OAuth 2.0 應用程式將只有系統管理員能夠操作。外部整合在被管理員建立之後將會對所有使用者開放。",
-  "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt Certificate Cache File:",
-  "admin.service.letsEncryptCertificateCacheFileDescription": "Certificates retrieved and other data about the Let's Encrypt service will be stored in this file.",
+  "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt 憑證快取檔案：",
+  "admin.service.letsEncryptCertificateCacheFileDescription": "取得的憑證以及其他關於 Let's Encrypt 服務的資料將會儲存於這個檔案。",
   "admin.service.listenAddress": "監聽位址：",
   "admin.service.listenDescription": "綁定並監聽的位址與通訊埠。輸入\":8065\"會跟所有的網路界面綁定。輸入\"127.0.0.1:8065\"會僅與擁有該 IP 位址的網路界面綁定。如果選取了較低的通訊埠(稱為\"系統通訊埠\"或是\"常見通訊埠\"，介於 0 到 1023 之間)，您必須擁有與該通訊埠綁定的權限。在 Linux 上可以用 \"sudo setcap cap_net_bind_service=+ep ./bin/platform\" 來允許 Mattermost 與那些通訊埠綁定。",
   "admin.service.listenExample": "如：\":8065\"",
@@ -668,8 +674,8 @@
   "admin.service.outWebhooksTitle": "啟用傳出的 Webhook：",
   "admin.service.overrideDescription": "啟用時，將允許 Webhook 以及斜線命令還有其他整合功能 (如 <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>) 修改發文時的使用者名稱。註：此功能跟允許覆蓋圖示並用時有導致釣魚攻擊的可能性。",
   "admin.service.overrideTitle": "允許外部整合功能置換使用者名稱：",
-  "admin.service.readTimeout": "Read Timeout:",
-  "admin.service.readTimeoutDescription": "Maximum time allowed from when the connection is accepted to when the request body is fully read.",
+  "admin.service.readTimeout": "讀取逾時：",
+  "admin.service.readTimeoutDescription": "從連線被接受後到請求主體被完整的讀取之間最多所能使用的時間。",
   "admin.service.securityDesc": "啟用時，如果過去12小時內有發布相關的安全性修正，將會寄發通知信給系統管理者。需要啟用電子郵件功能。",
   "admin.service.securityTitle": "啟用安全性示警: ",
   "admin.service.segmentDescription": "Segment.com 是個可以用來追蹤詳細系統使用狀況的線上服務。您可以在 Segment.com 註冊一個免費帳號以獲取金鑰。",
@@ -685,18 +691,18 @@
   "admin.service.ssoSessionDaysDesc": "從使用者最後一次輸入他們的認證到工作階段過期之間的天數。如果認證方式是 SAML 或 GitLab 且他們已經登入 SAML 或 GitLab，使用者將會自動再次登入 Mattermost。修改設定之後新的工作階段長度會在下次使用者輸入認證之後開始生效。",
   "admin.service.testingDescription": "啟用時，將啟用 /loadtest 斜線命令，該命令會載入測試帳號、資料以及文字格式。修改此項需要重啟伺服器以生效。",
   "admin.service.testingTitle": "啟用測試指令：",
-  "admin.service.tlsCertFile": "TLS Certificate File:",
-  "admin.service.tlsCertFileDescription": "The certificate file to use.",
-  "admin.service.tlsKeyFile": "TLS Key File:",
-  "admin.service.tlsKeyFileDescription": "The private key file to use.",
-  "admin.service.useLetsEncrypt": "Use Let's Encrypt:",
-  "admin.service.useLetsEncryptDescription": "Enable the automatic retreval of certificates from the Let's Encrypt. The certificate will be retrieved when a client attempts to connect from a new domain. This will work with multiple domains.",
+  "admin.service.tlsCertFile": "TLS 憑證檔案：",
+  "admin.service.tlsCertFileDescription": "TLS 將使用的憑證檔案。",
+  "admin.service.tlsKeyFile": "TLS 金鑰檔案：",
+  "admin.service.tlsKeyFileDescription": "TLS 將使用的私有金鑰檔案。",
+  "admin.service.useLetsEncrypt": "使用 Let's Encrypt：",
+  "admin.service.useLetsEncryptDescription": "啟用自動擷取 Let's Encrypt 的憑證。將會在來自新網域的用戶端嘗試連線時擷取憑證。此功能可以跟多個網域同時運作。",
   "admin.service.webSessionDays": "AD/LDAP 和電子郵件的工作階段長度(以天計)：",
   "admin.service.webSessionDaysDesc": "從使用者最後一次輸入他們的認證到工作階段過期之間的天數。修改設定之後新的工作階段長度會在下次使用者輸入認證之後開始生效。",
   "admin.service.webhooksDescription": "啟用時，允許傳入的 Webhook。為了避免釣魚攻擊，所有來自 Webhook 的貼文都會被標上 BOT 標籤。請參閱<a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>文件</a>。",
   "admin.service.webhooksTitle": "啟用傳出的 Webhook：",
-  "admin.service.writeTimeout": "Write Timeout:",
-  "admin.service.writeTimeoutDescription": "If using HTTP (insecure), this is the maximum time allowed from the end of reading the request headers until the response is written. If using HTTPS, it is the total time from when the connection is accepted until the response is written.",
+  "admin.service.writeTimeout": "寫入逾時：",
+  "admin.service.writeTimeoutDescription": "如果使用 HTTP (不安全)，這是從讀取請求完畢後到寫入回應之間最多所能使用的時間。如果使用 HTTPS，這是從連線被接受後到寫入回應之間最多所能使用的時間。",
   "admin.sidebar.addTeamSidebar": "從側邊欄選單加入團隊",
   "admin.sidebar.advanced": "進階",
   "admin.sidebar.audits": "規範與審計",
@@ -725,6 +731,7 @@
   "admin.sidebar.logging": "記錄",
   "admin.sidebar.login": "登入",
   "admin.sidebar.logs": "記錄",
+  "admin.sidebar.metrics": "效能監視(Beta)",
   "admin.sidebar.nativeAppLinks": "Mattermost 應用程式連結",
   "admin.sidebar.notifications": "通知",
   "admin.sidebar.oauth": "OAuth 2.0",
@@ -800,6 +807,9 @@
   "admin.team.maxChannelsDescription": "每個團隊最大頻道數，包含啟用跟被刪除的頻道。",
   "admin.team.maxChannelsExample": "如：\"100\"",
   "admin.team.maxChannelsTitle": "團隊最大頻道數：",
+  "admin.team.maxNotificationsPerChannelDescription": "頻道使用者人數在超過此數量後，由於效能考量，使用者輸入訊息、@all、@here 以及 @channel 將不再發送通知。",
+  "admin.team.maxNotificationsPerChannelExample": "例如 \"1000\"",
+  "admin.team.maxNotificationsPerChannelTitle": "單一頻道最大通知數：",
   "admin.team.maxUsersDescription": "每個團隊最大人數，包含活躍與不活躍的使用者。",
   "admin.team.maxUsersExample": "如：\"25\"",
   "admin.team.maxUsersTitle": "每個團隊最大人數：",
@@ -1020,7 +1030,7 @@
   "channel_header.viewInfo": "檢視資訊",
   "channel_header.viewMembers": "檢視成員",
   "channel_header.webrtc.call": "開始視訊通話",
-  "channel_header.webrtc.offline": "The user is offline",
+  "channel_header.webrtc.offline": "使用者離線中",
   "channel_header.webrtc.unavailable": "在當前通訊結束前不能建立新的通訊",
   "channel_info.about": "關於",
   "channel_info.close": "關閉",
@@ -1121,7 +1131,7 @@
   "claim.oauth_to_email.switchTo": "切換 {type} 至電子郵件地址及密碼",
   "claim.oauth_to_email.title": "由 {type} 帳號切換成電子郵件地址",
   "confirm_modal.cancel": "取消",
-  "connecting_screen": "連線",
+  "connecting_screen": "連線中",
   "create_comment.addComment": "新增註解...",
   "create_comment.comment": "新增註解",
   "create_comment.commentLength": "註解長度請少於 {max} 字元。",
@@ -1133,7 +1143,7 @@
   "create_post.shortcutsNotSupported": "此裝置不支援鍵盤快速鍵。",
   "create_post.tutorialTip": "<h4>發送訊息</h4><p>在這邊輸入訊息並按下 <strong>Enter</strong> 來發文。</p><p>按下<strong>附件</strong>按鈕來上傳圖片或是檔案。</p>",
   "create_post.write": "輸入訊息...",
-  "create_team.agreement": "一旦建立帳號使用{siteName}，即表示您同意<a href='/static/help/terms.html'>服務條款</a>以及<a href='/static/help/privacy.html'>隱私政策</a>。如果您不同意，請停止使用{siteName}。",
+  "create_team.agreement": "一旦建立帳號使用{siteName}，即表示您同意<a href={TermsOfServiceLink}>服務條款</a>以及<a href={PrivacyPolicyLink}>隱私政策</a>。如果您不同意，請停止使用{siteName}。",
   "create_team.display_name.back": "回到上一步",
   "create_team.display_name.charLength": "名稱長度為2到15字元",
   "create_team.display_name.nameHelp": "團隊可以用任何語言取名。團隊名稱將會顯示在選單跟畫面上方。",
@@ -1141,7 +1151,7 @@
   "create_team.display_name.required": "此欄位是必需的",
   "create_team.display_name.teamName": "團隊名稱",
   "create_team.team_url.back": "回到上一步",
-  "create_team.team_url.charLength": "名稱長度為2到15字元",
+  "create_team.team_url.charLength": "名稱長度為{min}到{max}字元",
   "create_team.team_url.creatingTeam": "建立團隊中...",
   "create_team.team_url.finish": "完成",
   "create_team.team_url.hint": "<li>短且好記憶是最好的</li><li>請用小寫英字母、數字及連接號(-)</li><li>請以小寫英字母開頭，請不要以連接號結尾</li>",
@@ -1181,7 +1191,7 @@
   "edit_channel_purpose_modal.save": "儲存",
   "edit_channel_purpose_modal.title1": "編輯用途",
   "edit_channel_purpose_modal.title2": "編輯用途。目標：",
-  "edit_command.save": "Update",
+  "edit_command.save": "更新",
   "edit_post.cancel": "取消",
   "edit_post.edit": "修改 {title}",
   "edit_post.editPost": "修改訊息...",
@@ -1440,7 +1450,7 @@
   "intro_messages.anyMember": " 任何成員可以加入並閱讀此頻道。",
   "intro_messages.beginning": "{name}的開頭",
   "intro_messages.channel": "頻道",
-  "intro_messages.creator": "這是{name}{type}的開頭，建立於{date}。",
+  "intro_messages.creator": "這是{name}{type}的開頭，由{creator}建立於{date}。",
   "intro_messages.default": "<h4 class='channel-intro__title'>{display_name}的開頭</h4><p class='channel-intro__content'><strong>歡迎來到{display_name}！</strong><br/><br/>這裡是團隊成員加入後的第一個頻道。善用這邊來發布所有人都應該知道的新事項。</p>",
   "intro_messages.group": "私有群組",
   "intro_messages.invite": "邀請他人來此{type}",
@@ -1448,7 +1458,7 @@
   "intro_messages.noCreator": "這是{name}{type}的開頭，建立於{date}。",
   "intro_messages.offTopic": "<h4 class=\"channel-intro__title\">{display_name}的開頭</h4><p class=\"channel-intro__content\">這是{display_name}的最上面，這是個用來聊天的頻道。<br/></p>",
   "intro_messages.onlyInvited": " 只有受邀請的成員能看見此私人群組",
-  "intro_messages.purpose": " This {type}'s purpose is: {purpose}.",
+  "intro_messages.purpose": "此{type}的用途為：{purpose}。",
   "intro_messages.setHeader": "設定標題",
   "intro_messages.teammate": "這是您跟這位團隊成員之間直接訊息的起頭。直接訊息跟在這邊分享的檔案除了在此處以外的人都看不到。",
   "invite_member.addAnother": "增加其他人",
@@ -1585,7 +1595,7 @@
   "password_send.description": "輸入註冊的電子郵件地址以重設密碼。",
   "password_send.email": "電子郵件地址",
   "password_send.error": "請輸入一個有效的電子郵件地址",
-  "password_send.link": "If the account exists, a password reset email will be sent to: <br/><b>{email}</b><br/><br/>",
+  "password_send.link": "如果該帳號存在，將會發送一封密碼重置郵件至：<br/><b>{email}</b><br/><br/>",
   "password_send.reset": "重置我的密碼",
   "password_send.title": "密碼重設",
   "pdf_preview.max_pages": "請下載以閱讀更多頁",
@@ -1632,7 +1642,7 @@
   "rhs_comment.mobile.flag": "標記",
   "rhs_comment.mobile.unflag": "取消標記",
   "rhs_comment.permalink": "永久網址",
-  "rhs_header.backToCallTooltip": "Back to Call",
+  "rhs_header.backToCallTooltip": "回到通話",
   "rhs_header.backToFlaggedTooltip": "回到被標記的訊息",
   "rhs_header.backToResultsTooltip": "回到搜尋結果",
   "rhs_header.closeSidebarTooltip": "關閉側邊欄",
@@ -1822,9 +1832,9 @@
   "tutorial_tip.out": "不要顯示提示。",
   "tutorial_tip.seen": "曾經看過這個嘛？",
   "update_command.cancel": "取消",
-  "update_command.confirm": "新增斜線命令",
-  "update_command.question": "Your changes may break the existing slash command. Are you sure you would like to update it?",
-  "update_command.update": "Update",
+  "update_command.confirm": "編輯斜線命令",
+  "update_command.question": "變更可能會導致現有的斜線命令無法使用。您確定要更新嘛？",
+  "update_command.update": "更新",
   "upload_overlay.info": "將檔案拖曳到這裡上傳。",
   "user.settings.advance.embed_preview": "可以使用時，顯示實驗性的連結內容預覽",
   "user.settings.advance.embed_toggle": "內嵌預覽顯示開關",
@@ -2054,7 +2064,7 @@
   "user.settings.security.ldap": "AD/LDAP",
   "user.settings.security.loginGitlab": "已經由 GitLab 登入",
   "user.settings.security.loginLdap": "已經由 AD/LDAP 登入",
-  "user.settings.security.loginSaml": "已經由 GitLab 登入",
+  "user.settings.security.loginSaml": "已經由 SAML 登入",
   "user.settings.security.logoutActiveSessions": "觀看並登出使用中的工作階段",
   "user.settings.security.method": "登入方式",
   "user.settings.security.newPassword": "新密碼",
@@ -2098,7 +2108,7 @@
   "user.settings.security.viewHistory": "檢視存取紀錄",
   "user_list.notFound": "找不到任何使用者",
   "user_profile.webrtc.call": "開始視訊通話",
-  "user_profile.webrtc.offline": "The user is offline",
+  "user_profile.webrtc.offline": "使用者離線中",
   "user_profile.webrtc.unavailable": "在當前通訊結束前不能建立新的通訊",
   "view_image.loading": "載入中",
   "view_image_popover.download": "下載",