translations PR 20161212 (#4774)

11 files changed, 284 insertions, 87 deletions

diff --git a/webapp/i18n/de.json b/webapp/i18n/de.json
index 9184e38df..e2ef3b7ba 100644
--- a/webapp/i18n/de.json
+++ b/webapp/i18n/de.json
@@ -501,6 +501,9 @@
   "admin.metrics.listenAddressDesc": "The address the server will listen on to expose performance metrics.",
   "admin.metrics.listenAddressEx": "z.B.: \":8067\"",
   "admin.metrics.listenAddressTitle": "Empfangs-Adresse:",
+  "admin.mfa.bannerDesc": "Multi-factor authentication is only available for accounts with LDAP and email login methods. If there are users on your system with other login methods, it is recommended you set up multi-factor authentication directly with the SSO or SAML provider.",
+  "admin.mfa.cluster": "High",
+  "admin.mfa.title": "Multi-factor Authentication",
   "admin.nav.help": "Hilfe",
   "admin.nav.logout": "Abmelden",
   "admin.nav.report": "Fehler melden",
@@ -650,6 +653,8 @@
   "admin.service.corsTitle": "Erlaube Cross Origin Requests von:",
   "admin.service.developerDesc": "Wenn wahr werden Javascript Fehler in einer roten Zeile im oberen Bereich des Interfaces angezeigt. Nicht empfohlen für Produktivumgebungen. ",
   "admin.service.developerTitle": "Aktiviere Entwickler Modus: ",
+  "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
+  "admin.service.enforceMfaDesc": "When true, users on the system will be required to set up [multi-factor authentication]. Any logged in users will be redirected to the multi-factor authentication setup page until they successfully add MFA to their account.<br/><br/>It is recommended you turn on enforcement during non-peak hours, when people are less likely to be using the system. New users will be required to set up multi-factor authentication when they first sign up. After set up, users will not be able to remove multi-factor authentication unless enforcement is disabled.<br/><br/>Please note that multi-factor authentication is only available for accounts with LDAP and email login methods. Mattermost will not enforce multi-factor authentication for other login methods. If there are users on your system using other login methods, it is recommended you set up and enforce multi-factor authentication directly with the SSO or SAML provider.",
   "admin.service.forward80To443": "Port 80 auf 443 weiterleiten:",
   "admin.service.forward80To443Description": "Leitet alle unsicheren Anfragen von Port 80 auf den sicheren Port 443 um",
   "admin.service.googleDescription": "Diesen Key setzen um den Titel von eingebetteten YouTube Videovorschauen anzeigen zu lassen. Ohne den Schlüssel werden YouTube Vorschauen basierend auf den Hyperlinks in Nachrichten und Kommentaren erstellt, sie werden aber nicht den Video Titel enthalten. Sehen Sie sich das <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a> für eine Anleitung, wie Sie an den Schlüssel kommen, an.",
@@ -1534,6 +1539,19 @@
   "member_list.noUsersAdd": "Keine Benutzer zum Hinzufügen.",
   "members_popover.msg": "Nachricht",
   "members_popover.title": "Mitglieder",
+  "mfa.confirm.complete": "<strong>Set up complete!</strong>",
+  "mfa.confirm.okay": "Okay",
+  "mfa.confirm.secure": "Your account is now secure. Next time you sign in, you will be asked to enter a code from the Google Authenticator app on your phone.",
+  "mfa.setup.badCode": "Invalid code. If this issue persists, contact your System Administrator.",
+  "mfa.setup.code": "MFA Code",
+  "mfa.setup.codeError": "Please enter the code from Google Authenticator.",
+  "mfa.setup.required": "<strong>Multi-factor authentication is required on {siteName}.</strong>",
+  "mfa.setup.save": "Save",
+  "mfa.setup.secret": "Secret: {secret}",
+  "mfa.setup.step1": "<strong>Step 1: </strong>On your phone, 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>",
+  "mfa.setup.step2": "<strong>Step 2: </strong>Use Google Authenticator to scan this QR code, or manually type in the secret key",
+  "mfa.setup.step3": "<strong>Step 3: </strong>Enter the code generated by Google Authenticator",
+  "mfa.setupTitle": "Multi-factor Authentication Setup",
   "mobile.components.channels_list_view.yourChannels": "Ihre Kanäle:",
   "mobile.components.select_server_view.enterServerUrl": "Geben Sie die Server-URL ein",
   "mobile.components.select_server_view.proceed": "Fortfahren",
@@ -1985,6 +2003,8 @@
   "user.settings.mfa.qrCode": "QR-Code",
   "user.settings.mfa.remove": "MFA von Ihrem Zugang entfernen",
   "user.settings.mfa.removeHelp": "Entfernen des MFA multi-factor authentication bedeutet das Sie nicht länger einen zusätzlichen Zugangs-Token für die Anmeldung benötigen.",
+  "user.settings.mfa.requiredHelp": "Multi-factor authentication is required on this server. Resetting is only recommended when you need to switch code generation to a new mobile device. You will be required to set it up again immediately.",
+  "user.settings.mfa.reset": "Reset MFA on your account",
   "user.settings.mfa.secret": "Schlüssel",
   "user.settings.mfa.title": "Multi-Faktor Authentifizierung einschalten",
   "user.settings.modal.advanced": "Erweitert",
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 4eb0aa33b..556987ee4 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -136,12 +136,6 @@
   "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Choose when to trigger the outgoing webhook; if the first word of a message matches a Trigger Word exactly, or if it starts with a Trigger Word.",
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "First word matches a trigger word exactly",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "First word starts with a trigger word",
-  "admin.mfa.title": "Multi-factor Authentication",
-  "admin.mfa.bannerDesc": "Multi-factor authentication is only available for accounts with LDAP and email login methods. If there are users on your system with other login methods, it is recommended you set up multi-factor authentication directly with the SSO or SAML provider.",
-  "admin.mfa.cluster": "High",
-  "admin.mfa.cluster": "High",
-  "admin.mfa.cluster": "High",
-  "admin.mfa.cluster": "High",
   "admin.advance.cluster": "High Availability (Beta)",
   "admin.advance.metrics": "Performance Monitoring (Beta)",
   "admin.audits.reload": "Reload User Activity Logs",
@@ -510,6 +504,9 @@
   "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.mfa.bannerDesc": "Multi-factor authentication is only available for accounts with LDAP and email login methods. If there are users on your system with other login methods, it is recommended you set up multi-factor authentication directly with the SSO or SAML provider.",
+  "admin.mfa.cluster": "High",
+  "admin.mfa.title": "Multi-factor Authentication",
   "admin.nav.help": "Help",
   "admin.nav.logout": "Logout",
   "admin.nav.report": "Report a Problem",
@@ -662,6 +659,8 @@
   "admin.service.corsTitle": "Enable cross-origin requests from:",
   "admin.service.developerDesc": "When true, Javascript errors are shown in a red bar at the top of the user interface. Not recommended for use in production. ",
   "admin.service.developerTitle": "Enable Developer Mode: ",
+  "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
+  "admin.service.enforceMfaDesc": "When true, users on the system will be required to set up [multi-factor authentication]. Any logged in users will be redirected to the multi-factor authentication setup page until they successfully add MFA to their account.<br/><br/>It is recommended you turn on enforcement during non-peak hours, when people are less likely to be using the system. New users will be required to set up multi-factor authentication when they first sign up. After set up, users will not be able to remove multi-factor authentication unless enforcement is disabled.<br/><br/>Please note that multi-factor authentication is only available for accounts with LDAP and email login methods. Mattermost will not enforce multi-factor authentication for other login methods. If there are users on your system using other login methods, it is recommended you set up and enforce multi-factor authentication directly with the SSO or SAML provider.",
   "admin.service.forward80To443": "Forward port 80 to 443:",
   "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443",
   "admin.service.googleDescription": "Set this key to enable the display of titles for embedded YouTube video previews. Without the key, YouTube previews will still be created based on hyperlinks appearing in messages or comments but they will not show the video title. View a <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target='_blank'>Google Developers Tutorial</a> for instructions on how to obtain a key.",
@@ -680,8 +679,6 @@
   "admin.service.listenExample": "E.g.: \":8065\"",
   "admin.service.mfaDesc": "When true, users will be given the option to add multi-factor authentication to their account. They will need a smartphone and an authenticator app such as Google Authenticator.",
   "admin.service.mfaTitle": "Enable Multi-factor Authentication:",
-  "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
-  "admin.service.enforceMfaDesc": "When true, users on the system will be required to set up [multi-factor authentication]. Any logged in users will be redirected to the multi-factor authentication setup page until they successfully add MFA to their account.<br/><br/>It is recommended you turn on enforcement during non-peak hours, when people are less likely to be using the system. New users will be required to set up multi-factor authentication when they first sign up. After set up, users will not be able to remove multi-factor authentication unless enforcement is disabled.<br/><br/>Please note that multi-factor authentication is only available for accounts with LDAP and email login methods. Mattermost will not enforce multi-factor authentication for other login methods. If there are users on your system using other login methods, it is recommended you set up and enforce multi-factor authentication directly with the SSO or SAML provider.",
   "admin.service.mobileSessionDays": "Session length mobile (days):",
   "admin.service.mobileSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. After changing this setting, the new session length will take effect after the next time the user enters their credentials.",
   "admin.service.outWebhooksDesc": "When true, outgoing webhooks will be allowed. See <a href='http://docs.mattermost.com/developer/webhooks-outgoing.html' target='_blank'>documentation</a> to learn more.",
@@ -1550,6 +1547,19 @@
   "member_list.noUsersAdd": "No users to add.",
   "members_popover.msg": "Message",
   "members_popover.title": "Members",
+  "mfa.confirm.complete": "<strong>Set up complete!</strong>",
+  "mfa.confirm.okay": "Okay",
+  "mfa.confirm.secure": "Your account is now secure. Next time you sign in, you will be asked to enter a code from the Google Authenticator app on your phone.",
+  "mfa.setup.badCode": "Invalid code. If this issue persists, contact your System Administrator.",
+  "mfa.setup.code": "MFA Code",
+  "mfa.setup.codeError": "Please enter the code from Google Authenticator.",
+  "mfa.setup.required": "<strong>Multi-factor authentication is required on {siteName}.</strong>",
+  "mfa.setup.save": "Save",
+  "mfa.setup.secret": "Secret: {secret}",
+  "mfa.setup.step1": "<strong>Step 1: </strong>On your phone, 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>",
+  "mfa.setup.step2": "<strong>Step 2: </strong>Use Google Authenticator to scan this QR code, or manually type in the secret key",
+  "mfa.setup.step3": "<strong>Step 3: </strong>Enter the code generated by Google Authenticator",
+  "mfa.setupTitle": "Multi-factor Authentication Setup",
   "mobile.components.channels_list_view.yourChannels": "Your channels:",
   "mobile.components.select_server_view.enterServerUrl": "Enter Server URL",
   "mobile.components.select_server_view.proceed": "Proceed",
@@ -2009,24 +2019,11 @@
   "user.settings.mfa.enterToken": "Token (numbers only)",
   "user.settings.mfa.qrCode": "Bar Code",
   "user.settings.mfa.remove": "Remove MFA from your account",
-  "user.settings.mfa.reset": "Reset MFA on your account",
   "user.settings.mfa.removeHelp": "Removing multi-factor authentication means you will no longer require a phone-based passcode to sign-in to your account.",
   "user.settings.mfa.requiredHelp": "Multi-factor authentication is required on this server. Resetting is only recommended when you need to switch code generation to a new mobile device. You will be required to set it up again immediately.",
+  "user.settings.mfa.reset": "Reset MFA on your account",
   "user.settings.mfa.secret": "Secret",
   "user.settings.mfa.title": "Multi-factor Authentication",
-  "mfa.setupTitle": "Multi-factor Authentication Setup",
-  "mfa.setup.codeError": "Please enter the code from Google Authenticator.",
-  "mfa.setup.badCode": "Invalid code. If this issue persists, contact your System Administrator.",
-  "mfa.setup.required": "<strong>Multi-factor authentication is required on {siteName}.</strong>",
-  "mfa.setup.step1": "<strong>Step 1: </strong>On your phone, 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>",
-  "mfa.setup.step2": "<strong>Step 2: </strong>Use Google Authenticator to scan this QR code, or manually type in the secret key",
-  "mfa.setup.secret": "Secret: {secret}",
-  "mfa.setup.step3": "<strong>Step 3: </strong>Enter the code generated by Google Authenticator",
-  "mfa.setup.code": "MFA Code",
-  "mfa.setup.save": "Save",
-  "mfa.confirm.complete": "<strong>Set up complete!</strong>",
-  "mfa.confirm.secure": "Your account is now secure. Next time you sign in, you will be asked to enter a code from the Google Authenticator app on your phone.",
-  "mfa.confirm.okay": "Okay",
   "user.settings.modal.advanced": "Advanced",
   "user.settings.modal.confirmBtns": "Yes, Discard",
   "user.settings.modal.confirmMsg": "You have unsaved changes, are you sure you want to discard them?",
diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json
index f13bfb9d6..36f0bda97 100644
--- a/webapp/i18n/es.json
+++ b/webapp/i18n/es.json
@@ -501,6 +501,9 @@
   "admin.metrics.listenAddressDesc": "La dirección del servidor que escuchará para mostrar las métricas de rendimiento.",
   "admin.metrics.listenAddressEx": "Ej \":8067\"",
   "admin.metrics.listenAddressTitle": "Dirección de escucha:",
+  "admin.mfa.bannerDesc": "Multi-factor authentication is only available for accounts with LDAP and email login methods. If there are users on your system with other login methods, it is recommended you set up multi-factor authentication directly with the SSO or SAML provider.",
+  "admin.mfa.cluster": "High",
+  "admin.mfa.title": "Multi-factor Authentication",
   "admin.nav.help": "Ayuda",
   "admin.nav.logout": "Cerrar sesión",
   "admin.nav.report": "Reportar problema",
@@ -650,6 +653,8 @@
   "admin.service.corsTitle": "Habilitar la procedencia de las solicitudes cruzadas de:",
   "admin.service.developerDesc": "Cuando es verdadero, los errores de Javascript se muestran en una barra roja en la parte superior de la interfaz de usuario. No se recomienda su uso en producción. ",
   "admin.service.developerTitle": "Habilitar modo de Desarrollador: ",
+  "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
+  "admin.service.enforceMfaDesc": "When true, users on the system will be required to set up [multi-factor authentication]. Any logged in users will be redirected to the multi-factor authentication setup page until they successfully add MFA to their account.<br/><br/>It is recommended you turn on enforcement during non-peak hours, when people are less likely to be using the system. New users will be required to set up multi-factor authentication when they first sign up. After set up, users will not be able to remove multi-factor authentication unless enforcement is disabled.<br/><br/>Please note that multi-factor authentication is only available for accounts with LDAP and email login methods. Mattermost will not enforce multi-factor authentication for other login methods. If there are users on your system using other login methods, it is recommended you set up and enforce multi-factor authentication directly with the SSO or SAML provider.",
   "admin.service.forward80To443": "Redirigir el puerto 80 a 443:",
   "admin.service.forward80To443Description": "Redirige todo el trafico inseguro del puerto 80 al puerto seguro 443",
   "admin.service.googleDescription": "Establece esta clave para mostrar los títulos de los vídeos de YouTube incorporado en las previsualizaciones. Sin la clave, las previsualizaciones de YouTube igual serán creadas en base a los enlaces que aparecen en los mensajes o comentarios, pero no se mostrará el título de vídeo. Ve el <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Tutorial para Desarrolladores de Google</a> para ver las instrucciones sobre cómo obtener una clave.",
@@ -1534,6 +1539,19 @@
   "member_list.noUsersAdd": "No hay usuarios que agregar.",
   "members_popover.msg": "Mensaje",
   "members_popover.title": "Miembros",
+  "mfa.confirm.complete": "<strong>Set up complete!</strong>",
+  "mfa.confirm.okay": "Okay",
+  "mfa.confirm.secure": "Your account is now secure. Next time you sign in, you will be asked to enter a code from the Google Authenticator app on your phone.",
+  "mfa.setup.badCode": "Invalid code. If this issue persists, contact your System Administrator.",
+  "mfa.setup.code": "MFA Code",
+  "mfa.setup.codeError": "Please enter the code from Google Authenticator.",
+  "mfa.setup.required": "<strong>Multi-factor authentication is required on {siteName}.</strong>",
+  "mfa.setup.save": "Save",
+  "mfa.setup.secret": "Secret: {secret}",
+  "mfa.setup.step1": "<strong>Step 1: </strong>On your phone, 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>",
+  "mfa.setup.step2": "<strong>Step 2: </strong>Use Google Authenticator to scan this QR code, or manually type in the secret key",
+  "mfa.setup.step3": "<strong>Step 3: </strong>Enter the code generated by Google Authenticator",
+  "mfa.setupTitle": "Multi-factor Authentication Setup",
   "mobile.components.channels_list_view.yourChannels": "Tus canales:",
   "mobile.components.select_server_view.enterServerUrl": "URL del servidor",
   "mobile.components.select_server_view.proceed": "Continuar",
@@ -1985,6 +2003,8 @@
   "user.settings.mfa.qrCode": "Código QR",
   "user.settings.mfa.remove": "Remover MFA de tu cuenta",
   "user.settings.mfa.removeHelp": "Al remover la autenticación de múltples factores hará que tu cuenta sea vulnerable a ataques.",
+  "user.settings.mfa.requiredHelp": "Multi-factor authentication is required on this server. Resetting is only recommended when you need to switch code generation to a new mobile device. You will be required to set it up again immediately.",
+  "user.settings.mfa.reset": "Reset MFA on your account",
   "user.settings.mfa.secret": "Clave Secreta:",
   "user.settings.mfa.title": "Habilitar Autenticación de Múltiples Factores:",
   "user.settings.modal.advanced": "Avanzada",
diff --git a/webapp/i18n/fr.json b/webapp/i18n/fr.json
index d2cf6e6db..dbbdfb43d 100644
--- a/webapp/i18n/fr.json
+++ b/webapp/i18n/fr.json
@@ -501,6 +501,9 @@
   "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.mfa.bannerDesc": "Multi-factor authentication is only available for accounts with LDAP and email login methods. If there are users on your system with other login methods, it is recommended you set up multi-factor authentication directly with the SSO or SAML provider.",
+  "admin.mfa.cluster": "High",
+  "admin.mfa.title": "Multi-factor Authentication",
   "admin.nav.help": "Aide",
   "admin.nav.logout": "Se déconnecter",
   "admin.nav.report": "Signaler un problème",
@@ -650,6 +653,8 @@
   "admin.service.corsTitle": "Autoriser les requêtes cross-origin depuis :",
   "admin.service.developerDesc": "Si activé, les erreurs Javascript sont affichées dans une barre en haut de l'interface. Ceci n'est pas recommandé sur un serveur de production. ",
   "admin.service.developerTitle": "Activer le mode développeur : ",
+  "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
+  "admin.service.enforceMfaDesc": "When true, users on the system will be required to set up [multi-factor authentication]. Any logged in users will be redirected to the multi-factor authentication setup page until they successfully add MFA to their account.<br/><br/>It is recommended you turn on enforcement during non-peak hours, when people are less likely to be using the system. New users will be required to set up multi-factor authentication when they first sign up. After set up, users will not be able to remove multi-factor authentication unless enforcement is disabled.<br/><br/>Please note that multi-factor authentication is only available for accounts with LDAP and email login methods. Mattermost will not enforce multi-factor authentication for other login methods. If there are users on your system using other login methods, it is recommended you set up and enforce multi-factor authentication directly with the SSO or SAML provider.",
   "admin.service.forward80To443": "Forward port 80 to 443:",
   "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443",
   "admin.service.googleDescription": "Définissez cette clé pour activer l'affichage des titres pour les aperçus de vidéos YouTube. Sans la clé, les aperçus YouTube seront créés à partir des liens apparaissant des messages ou commentaires mais ils ne montreront pas le titre de la vidéo. Regardez un <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">tutoriel Google Developers</a> pour des instructions sur l'obtention d'une clé.",
@@ -1534,6 +1539,19 @@
   "member_list.noUsersAdd": "Aucun utilisateur à ajouter.",
   "members_popover.msg": "Message",
   "members_popover.title": "Membres",
+  "mfa.confirm.complete": "<strong>Set up complete!</strong>",
+  "mfa.confirm.okay": "Okay",
+  "mfa.confirm.secure": "Your account is now secure. Next time you sign in, you will be asked to enter a code from the Google Authenticator app on your phone.",
+  "mfa.setup.badCode": "Invalid code. If this issue persists, contact your System Administrator.",
+  "mfa.setup.code": "MFA Code",
+  "mfa.setup.codeError": "Please enter the code from Google Authenticator.",
+  "mfa.setup.required": "<strong>Multi-factor authentication is required on {siteName}.</strong>",
+  "mfa.setup.save": "Save",
+  "mfa.setup.secret": "Secret: {secret}",
+  "mfa.setup.step1": "<strong>Step 1: </strong>On your phone, 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>",
+  "mfa.setup.step2": "<strong>Step 2: </strong>Use Google Authenticator to scan this QR code, or manually type in the secret key",
+  "mfa.setup.step3": "<strong>Step 3: </strong>Enter the code generated by Google Authenticator",
+  "mfa.setupTitle": "Multi-factor Authentication Setup",
   "mobile.components.channels_list_view.yourChannels": "Vos canaux :",
   "mobile.components.select_server_view.enterServerUrl": "Spécifiez l'URL du serveur",
   "mobile.components.select_server_view.proceed": "Continuer",
@@ -1985,6 +2003,8 @@
   "user.settings.mfa.qrCode": "Code barre",
   "user.settings.mfa.remove": "Retirer l’authentification à facteurs multiples",
   "user.settings.mfa.removeHelp": "Retirer l’authentification multi-facteur signifie que vous n’aurez plus besoin d'un code d'accès basé sur un téléphone pour vous connecter à votre compte.",
+  "user.settings.mfa.requiredHelp": "Multi-factor authentication is required on this server. Resetting is only recommended when you need to switch code generation to a new mobile device. You will be required to set it up again immediately.",
+  "user.settings.mfa.reset": "Reset MFA on your account",
   "user.settings.mfa.secret": "Clé secrète :",
   "user.settings.mfa.title": "Activité l’authentification multi-facteurs:",
   "user.settings.modal.advanced": "Options avancées",
diff --git a/webapp/i18n/ja.json b/webapp/i18n/ja.json
index 12c5d8465..b6bd39713 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": "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.image.help": "絵文字に対する画像を選択してください。画像は最大1MBのgif, png, jpegファイルを指定できます。サイズはアスペクト比を保持した状態で128 x 128ピクセルに自動的にリサイズされます。",
   "add_emoji.imageRequired": "絵文字の画像は必須です。",
   "add_emoji.name": "名前",
   "add_emoji.name.help": "あなたの作成した絵文字の名前を設定してください。英小文字、数字、記号('-'と'_'のみ)を使用し、64文字以内にしてください。",
@@ -137,7 +137,7 @@
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "最初の単語がトリガーワードと正確に一致する",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "最初の単語がトリガーワードで始まる",
   "admin.advance.cluster": "高可用(ベータ版)",
-  "admin.advance.metrics": "Performance Monitoring (Beta)",
+  "admin.advance.metrics": "パフォーマンスモニタリング (ベータ版)",
   "admin.audits.reload": "再読み込み",
   "admin.audits.title": "ユーザーのアクティビティー",
   "admin.authentication.email": "電子メールアドレス認証",
@@ -351,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アクセスキーID:",
   "admin.image.amazonS3RegionDescription": "AWS S3バケットを作成した際に選択したリージョンを指定します。",
   "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秘密アクセスキー:",
@@ -415,15 +415,15 @@
   "admin.ldap.firstnameAttrDesc": "(オプション) Mattermostのユーザーの名前(ファーストネーム)を設定するために使用されるAD/LDAPサーバーの属性です。設定された場合、この属性はLDAPサーバーと同期されるため、ユーザーは名前(ファーストネーム)を編集することはできません。空欄のままにした場合、ユーザーはアカウントの設定で自身の名前(ファーストネーム)を設定できます。",
   "admin.ldap.firstnameAttrEx": "例: \"givenName\"",
   "admin.ldap.firstnameAttrTitle": "名前(ファーストネーム)の属性値",
-  "admin.ldap.idAttrDesc": "Mattermostで重複なくユーザーを認識するために使用されるAD/LDAPの属性値です。AD/LDAPのこの属性値は変更されないものあるべきであり、ユーザー名やユーザーIDを使用します。この項目が変更されると、新しいMattermostアカウントが古いアカウントとは独立して作成されます。この値は、Mattermostのログイン画面の「AD/LDAPユーザー名」欄に入力します。通常、この属性値は、上の「ユーザー名属性値」欄と同じです。あなたのチームがdomain\\usernameの形式を他のサービスにAD/LDAPを使ってログインするのに使用している場合には、サイト間の一貫性を維持するためこの項目にはdomain\\username形式を使ってください。",
+  "admin.ldap.idAttrDesc": "Mattermostで重複なくユーザーを認識するために使用されるAD/LDAPサーバーの属性です。AD/LDAPのこの属性値は変更されない値であるべきであり、ユーザー名やユーザーIDを使用します。この項目が変更されると、新しいMattermostアカウントが古いアカウントとは独立して作成されます。この値は、Mattermostのログイン画面の「AD/LDAPユーザー名」欄に入力します。通常、この属性値は、上の「ユーザー名の属性値」欄と同じです。あなたのチームがdomain\\\\usernameの形式を他のサービスにAD/LDAPを使ってログインするのに使用している場合には、サイト間の一貫性を維持するためこの項目にはdomain\\\\username形式を使ってください。",
   "admin.ldap.idAttrEx": "例: \"sAMAccountName\"",
   "admin.ldap.idAttrTitle": "ID属性値: ",
   "admin.ldap.lastnameAttrDesc": "(オプション) Mattermostのユーザーの苗字(ラストネーム)を設定するために使用されるAD/LDAPサーバーの属性です。設定された場合、この属性はLDAPサーバーと同期されるため、ユーザーは苗字(ラストネーム)を編集することはできません。空欄のままにした場合、ユーザーはアカウントの設定で自身の苗字(ラストネーム)を設定できます。",
   "admin.ldap.lastnameAttrEx": "例: \"sn\"",
   "admin.ldap.lastnameAttrTitle": "苗字(ラストネーム)の属性値:",
   "admin.ldap.ldap_test_button": "AD/LDAPテスト",
-  "admin.ldap.loginNameDesc": "ログインページのログイン欄に表示されるプレイスホルダーテキストを設定します。\"AD/LDAP Username\"がデフォルトです。",
-  "admin.ldap.loginNameEx": "例: \"AD/LDAP Username\"",
+  "admin.ldap.loginNameDesc": "ログインページのログイン欄に表示されるプレイスホルダーテキストを設定します。\"AD/LDAPユーザー名\"がデフォルトです。",
+  "admin.ldap.loginNameEx": "例: \"AD/LDAPユーザー名\"",
   "admin.ldap.loginNameTitle": "ログインフィールド名:",
   "admin.ldap.maxPageSizeEx": "例: \"2000\"",
   "admin.ldap.maxPageSizeHelpText": "MattermostサーバーがAD/LDAPサーバーへ一度にリクエストする最大ユーザー数。0を指定した場合、制限しません。",
@@ -496,11 +496,14 @@
   "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.enableDescription": "有効な場合、Mattermostはパフォーマンスのモニタリングやプロファイリングが有効になります。Mattermostのパフォーマンスモニタリングの設定について、詳しくは<a href=\"http://docs.mattermost.com/deployment/metrics.html\" target=\"_blank\">documentation</a>を参照してください。",
+  "admin.metrics.enableTitle": "パフォーマンスモニタリングを有効にする:",
+  "admin.metrics.listenAddressDesc": "パフォーマンスメトリクスの公開先のサーバーが接続待ちをするアドレスです。",
   "admin.metrics.listenAddressEx": "例: \":8067\"",
   "admin.metrics.listenAddressTitle": "接続待ちアドレス:",
+  "admin.mfa.bannerDesc": "Multi-factor authentication is only available for accounts with LDAP and email login methods. If there are users on your system with other login methods, it is recommended you set up multi-factor authentication directly with the SSO or SAML provider.",
+  "admin.mfa.cluster": "High",
+  "admin.mfa.title": "Multi-factor Authentication",
   "admin.nav.help": "ヘルプ",
   "admin.nav.logout": "ログアウト",
   "admin.nav.report": "問題を報告する",
@@ -650,8 +653,10 @@
   "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.enforcMfaTitle": "Enforce Multi-factor Authentication:",
+  "admin.service.enforceMfaDesc": "When true, users on the system will be required to set up [multi-factor authentication]. Any logged in users will be redirected to the multi-factor authentication setup page until they successfully add MFA to their account.<br/><br/>It is recommended you turn on enforcement during non-peak hours, when people are less likely to be using the system. New users will be required to set up multi-factor authentication when they first sign up. After set up, users will not be able to remove multi-factor authentication unless enforcement is disabled.<br/><br/>Please note that multi-factor authentication is only available for accounts with LDAP and email login methods. Mattermost will not enforce multi-factor authentication for other login methods. If there are users on your system using other login methods, it is recommended you set up and enforce multi-factor authentication directly with the SSO or SAML provider.",
+  "admin.service.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キー:",
@@ -661,8 +666,8 @@
   "admin.service.insecureTlsTitle": "安全ではない外向きの接続を有効にする: ",
   "admin.service.integrationAdmin": "統合機能の管理を管理者のみに制限する:",
   "admin.service.integrationAdminDesc": "有効な場合、ウェブフックとスラッシュコマンドはチーム管理者とシステム管理者のみが、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": "使用するIPアドレスとポート番号を設定します。\":8065\"と入力することで全てのインターフェイスのIPアドレスでアクセスを待ちます。\"127.0.0.1:8065\"と指定することで、一つのIPアドレスでアクセスを待ちます。\"システムポート\"や\"ウェルノウンポート\"と呼ばれる 0～1023 までの範囲のポート番号を選んだ場合、そのポートを使用する権限が必要になります。Linuxでは、Mattermostがウェルノウンポートを使用するために \"sudo setcap cap_net_bind_service=+ep ./bin/platform\" を利用することができます。",
   "admin.service.listenExample": "例: \":8065\"",
@@ -674,8 +679,8 @@
   "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.readTimeoutDescription": "Maximum time allowed from when the connection is accepted to when the request body is fully read.",
+  "admin.service.readTimeout": "Readタイムアウト:",
+  "admin.service.readTimeoutDescription": "コネクションが受け付けられてからリクエストボディが全て読み込まれるまでの上限となる時間",
   "admin.service.securityDesc": "有効な場合、システム管理者は関係のあるセキュリティー修正が発生した場合、12時間以内に電子メールでお知らせを受信できます。電子メールが有効になっている必要があります。",
   "admin.service.securityTitle": "セキュリティー通知を有効にする: ",
   "admin.service.segmentDescription": "システムの詳細な利用状況を追跡するオンラインサービスであるSegment.comを利用することができます。Segment.comに無料で利用登録し、キーを入手してください。",
@@ -691,18 +696,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": "使用される非公開鍵ファイル",
+  "admin.service.useLetsEncrypt": "Let's Encryptを使用する:",
+  "admin.service.useLetsEncryptDescription": "Let's Encryptからの証明書自動検出を有効にします。証明書はクライアントが新しいドメインから接続しようとした場合に検出されます。これは複数のドメインで動作します。",
   "admin.service.webSessionDays": "AD/LDAPと電子メールのセッション維持期間 (日数):",
   "admin.service.webSessionDaysDesc": "ユーザーが最後に認証情報を入力してから、そのユーザーのセッションが期限切れとなるまでの日数です。この設定を変更した後の新しいセッション維持期間は、次にユーザーが認証情報を入力してから有効になります。",
   "admin.service.webhooksDescription": "有効な場合、内向きのウェブフックが使用できます。フィッシング攻撃対策のため、ウェブフックからの投稿にはBOTタグが表示されます。詳しくは<a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>説明文書</a>を参照してください。",
   "admin.service.webhooksTitle": "内向きのウェブフックを有効にする: ",
-  "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": "Writeタイムアウト:",
+  "admin.service.writeTimeoutDescription": "HTTP(安全でない)を使用している場合、これはリクエストヘッダーの読み込みが完了してからレスポンスが書き込まれるまでの上限となる時間です。HTTPSを使用している場合、接続が受け付けられてからレスポンスが書き込まれるまでの合計時間です。",
   "admin.sidebar.addTeamSidebar": "サイドバーメニューからチームを追加する",
   "admin.sidebar.advanced": "詳細",
   "admin.sidebar.audits": "コンプライアンスと監査",
@@ -731,7 +736,7 @@
   "admin.sidebar.logging": "ログ",
   "admin.sidebar.login": "ログイン",
   "admin.sidebar.logs": "ログ",
-  "admin.sidebar.metrics": "Performance Monitoring (Beta)",
+  "admin.sidebar.metrics": "パフォーマンスモニタリング (ベータ版)",
   "admin.sidebar.nativeAppLinks": "Mattermostアプリリンク",
   "admin.sidebar.notifications": "通知",
   "admin.sidebar.oauth": "OAuth 2.0",
@@ -807,9 +812,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.maxNotificationsPerChannelDescription": "パフォーマンスの問題によりユーザーがメッセージ、@all、@here、@channelを入力してもが通知を送信されなくなるチャンネル内のユーザーの最大数です。",
   "admin.team.maxNotificationsPerChannelExample": "例 \"1000\"",
-  "admin.team.maxNotificationsPerChannelTitle": "Max Notifications Per Channel:",
+  "admin.team.maxNotificationsPerChannelTitle": "チャンネルごとの最大通知数:",
   "admin.team.maxUsersDescription": "チーム毎のユーザー数合計の最大値です。有効なユーザーと無効なユーザーの両方が数えられます。",
   "admin.team.maxUsersExample": "例: \"25\"",
   "admin.team.maxUsersTitle": "チーム毎の最大ユーザー数:",
@@ -1139,14 +1144,14 @@
   "create_comment.file": "ファイルのアップロード",
   "create_comment.files": "複数ファイルのアップロード",
   "create_post.comment": "コメント",
-  "create_post.error_message": "Your message is too long. Character count: {length}/{limit}",
+  "create_post.error_message": "メッセージが長すぎます。文字数: {length}/{limit}",
   "create_post.post": "投稿",
   "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={TermsOfServiceLink}>使用条件</a>と<a href={PrivacyPolicyLink}>プライバシーポリシー</a>に同意してください。同意できない場合は{siteName}は使用できません。",
   "create_team.display_name.back": "前のステップに戻る",
-  "create_team.display_name.charLength": "Name must be {min} or more characters up to a maximum of {max}. You can add a longer team description later.",
+  "create_team.display_name.charLength": "名前は{min}文字以上の{max}文字以下にしてください。後でより長いチームの説明を追加することができます。",
   "create_team.display_name.nameHelp": "チーム名はどんな言語でも使うことができます。チーム名はメニューと画面上部に表示されます。",
   "create_team.display_name.next": "次へ",
   "create_team.display_name.required": "この項目は必須です",
@@ -1264,7 +1269,7 @@
   "general_tab.codeTitle": "招待コード",
   "general_tab.dirDisabled": "チーム一覧が無効になっています。システム管理者にシステムコンソールのチームの設定でチーム一覧を有効化するように依頼してください。",
   "general_tab.dirOff": "このシステムでは、チーム一覧は無効になっています。",
-  "general_tab.emptyDescription": "Click 'Edit' to add a team description.",
+  "general_tab.emptyDescription": "チームの説明を追加するには「編集する」をクリックしてください。",
   "general_tab.includeDirDesc": "ホームページのチーム一覧にチーム名が表示され、サインインページへのリンクが提供されます。",
   "general_tab.includeDirTitle": "チーム一覧に追加する",
   "general_tab.no": "いいえ",
@@ -1272,8 +1277,8 @@
   "general_tab.openInviteTitle": "このサーバーにアカウントを持つ全てのユーザーが、このチームに参加できるようにする",
   "general_tab.regenerate": "再生成する",
   "general_tab.required": "この項目は必須です",
-  "general_tab.teamDescription": "Team Description",
-  "general_tab.teamDescriptionInfo": "Team description provides additional information to help users select the right team. Maximum of 50 characters.",
+  "general_tab.teamDescription": "チームの説明",
+  "general_tab.teamDescriptionInfo": "チームの説明はユーザーが正しいチームを選択しやすいよう追加の情報を提供します。最大50文字です。",
   "general_tab.teamName": "チーム名",
   "general_tab.teamNameInfo": "サインイン画面とサイドバーの左上に表示されるチームの名称を設定します。",
   "general_tab.title": "全般の設定",
@@ -1371,7 +1376,7 @@
   "help.mentioning.mentions": "## @Mention\n特定のチームメンバーの注意を惹きたい場合は@mentionを使用してください。",
   "help.mentioning.recent": "## 最近のあなたについての投稿\n最も最近のあなたについての投稿を検索するためには検索ボックスの隣の`@`をクリックしてください。画面右部の検索結果**ジャンプする**をクリックすると、その投稿のメッセージのチャンネルと場所にジャンプします。",
   "help.mentioning.title": "# チームメイトについての投稿を作成する\n_____",
-  "help.mentioning.triggers": "## 誰かについての投稿となる単語\n@ユーザー名 と @チャンネル による通知に加え、**アカウント設定** > **通知** > **誰かについての投稿となる単語**で通知のトリガーとなる単語をカスタマイズできます。デフォルトでは名前(ファーストネーム)での通知を受け取ることができますが、入力ボックスにカンマ区切りで通知を受ける単語を追加できます。これは「面接」や「マーケティング」などの特定の話題に関する全ての投稿の通知を受けたい場合に役立ちます。",
+  "help.mentioning.triggers": "## 誰かについての投稿となる単語\n@ユーザー名 と @チャンネル による通知に加え、**アカウント設定** > **通知** > **あなたについての投稿となる単語**で通知のトリガーとなる単語をカスタマイズできます。デフォルトでは名前(ファーストネーム)での通知を受け取ることができますが、入力ボックスにカンマ区切りで通知を受ける単語を追加できます。これは「面接」や「マーケティング」などの特定の話題に関する全ての投稿の通知を受けたい場合に役立ちます。",
   "help.mentioning.username": "#### @ユーザー名\nチームメイトへの投稿通知を送るためにユーザー名に加えて記号`@`を使うことで彼らについての投稿をすることができます。\n\n投稿するチームメンバーのリストを表示するには`@`を入力してください。リストをフィルターするには、ユーザー名か名前(ファーストネーム)か苗字(ラストネーム)かニックネームどれかの最初の数文字を入力してください。**↑**と**↓**キーでリスト全体をスクロールすることができ、**ENTER**を押すと投稿対象のユーザーを選択できます。一度選択されると、ユーザー名は自動的にフルネームかニックネームに置き換わります。\n以下の例では**alice**へチャンネルとメッセージが通知される特別な投稿通知を送信します。もし**alice**がMattermostから離れていて、かつ[電子メール通知](http://docs.mattermost.com/help/getting-started/configuring-notifications.html#email-notifications)をオンにしていた場合、彼女はメッセージテキストが添えられた電子メール通知を受け取ることになります。",
   "help.mentioning.usernameCont": "あなたが投稿対象としたユーザーがチャンネルに属していなかった場合、それを知らせるシステムメッセージが投稿されます。これはそのメッセージのトリガーとなった人だけに見える一時的なメッセージです。投稿対象のユーザーをチャンネルに追加するには、チャンネル名のドロップダウンメニューから**メンバーを追加する**を選択します。",
   "help.mentioning.usernameExample": "@alice 君の面接の新しい志望者はどうだった?",
@@ -1462,7 +1467,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": "他の人を追加する",
@@ -1534,6 +1539,19 @@
   "member_list.noUsersAdd": "ユーザーは追加されません。",
   "members_popover.msg": "メッセージ",
   "members_popover.title": "メンバー",
+  "mfa.confirm.complete": "<strong>Set up complete!</strong>",
+  "mfa.confirm.okay": "Okay",
+  "mfa.confirm.secure": "Your account is now secure. Next time you sign in, you will be asked to enter a code from the Google Authenticator app on your phone.",
+  "mfa.setup.badCode": "Invalid code. If this issue persists, contact your System Administrator.",
+  "mfa.setup.code": "MFA Code",
+  "mfa.setup.codeError": "Please enter the code from Google Authenticator.",
+  "mfa.setup.required": "<strong>Multi-factor authentication is required on {siteName}.</strong>",
+  "mfa.setup.save": "Save",
+  "mfa.setup.secret": "Secret: {secret}",
+  "mfa.setup.step1": "<strong>Step 1: </strong>On your phone, 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>",
+  "mfa.setup.step2": "<strong>Step 2: </strong>Use Google Authenticator to scan this QR code, or manually type in the secret key",
+  "mfa.setup.step3": "<strong>Step 3: </strong>Enter the code generated by Google Authenticator",
+  "mfa.setupTitle": "Multi-factor Authentication Setup",
   "mobile.components.channels_list_view.yourChannels": "あなたのチャンネル:",
   "mobile.components.select_server_view.enterServerUrl": "サーバーURLを入力してください",
   "mobile.components.select_server_view.proceed": "続行する",
@@ -1599,7 +1617,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": "より多くのページを読むためにダウンロードする",
@@ -1624,11 +1642,11 @@
   "post_info.reply": "返信する",
   "posts_view.loadMore": "もっとメッセージを読み込む",
   "posts_view.newMsg": "新しいメッセージ",
-  "posts_view.newMsgBelow": "{count} new {count, plural, one {message} other {messages}} below",
-  "reaction.clickToAdd": "(click to add)",
-  "reaction.clickToRemove": "(click to remove)",
-  "reaction.multipleReacted": "<b>{users} and {lastUser}</b> reacted with <b>:{emojiName}:</b>",
-  "reaction.oneReacted": "<b>{user}</b> reacted with <b>:{emojiName}:</b>",
+  "posts_view.newMsgBelow": "以下に {count} new {count, plural, one {message} other {messages}}",
+  "reaction.clickToAdd": "(クリックして追加する)",
+  "reaction.clickToRemove": "(クリックして削除する)",
+  "reaction.multipleReacted": "<b>{users} と{lastUser}</b>が<b>:{emojiName}:</b>とリアクションしました",
+  "reaction.oneReacted": "<b>{user}</b>が<b>:{emojiName}:</b>とリアクションしました",
   "reaction.you": "あなた",
   "removed_channel.channelName": "チャンネル",
   "removed_channel.from": "以下から削除する ",
@@ -1652,7 +1670,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": "サイドバーを閉じる",
@@ -1795,9 +1813,9 @@
   "team_import_tab.importHelpDocsLink": "説明文書",
   "team_import_tab.importHelpExportInstructions": "Slack > Team Settings > Import/Export Data > Export > Start Export",
   "team_import_tab.importHelpExporterLink": "Slack Advanced Exporter",
-  "team_import_tab.importHelpLine1": "Slack import to Mattermost supports importing of messages in your Slack team's public channels.",
-  "team_import_tab.importHelpLine2": "To import a team from Slack, go to {exportInstructions}. See {uploadDocsLink} to learn more.",
-  "team_import_tab.importHelpLine3": "To import posts with attached files, see {slackAdvancedExporterLink} for details.",
+  "team_import_tab.importHelpLine1": "MattermostのSlackインポート機能はSlackチームの公開チャンネルにある発言のインポートをサポートしています。",
+  "team_import_tab.importHelpLine2": "Slackからチームをインポートするには、{exportInstructions}へ移動してください。詳しくは {uploadDocsLink} を参照してください。",
+  "team_import_tab.importHelpLine3": "添付ファイルのある投稿をインポートするには、 {slackAdvancedExporterLink} を参照してください。",
   "team_import_tab.importSlack": "Slackからインポート(ベータ版)",
   "team_import_tab.importing": " インポートしています…",
   "team_import_tab.successful": " インポートに成功しました: ",
@@ -1848,7 +1866,7 @@
   "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.question": "あなたの変更により既存のコマンドが動作しなくなる恐れがあります。本当に更新しますか？",
   "update_command.update": "更新",
   "upload_overlay.info": "ファイルをアップロードするためにドラッグアンドドロップします。",
   "user.settings.advance.embed_preview": "利用可能な場合、リンク先の内容を試験的にプレビューする",
@@ -1979,12 +1997,14 @@
   "user.settings.languages.change": "インターフェイスの言語を変更する",
   "user.settings.languages.promote": "ユーザーインターフェイスでMattermostが表示する言語を選択してください。<br /><br />翻訳を手伝っていただけますか？ 是非、<a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a>に参加してください。",
   "user.settings.mfa.add": "MFAをあなたのアカウントに追加する",
-  "user.settings.mfa.addHelp": "Mattermostにサインインするのに、パスワードに加え、スマートフォンを使ったトークンの入力を要求することができます。<br/><br/>有効にするには、あなたのスマートフォンに<a target='_blank' href='https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8'>iTunes</a>または<a target='_blank' href='https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en'>Google Play</a>から、Google Authenticatorをダウンロードしてください。<br/><br/>1. 上の<strong>MFAをアカウントに追加する</strong>ボタンを押してください。<br/>2. 表示されるQRコードをGoogle Authenticatorでスキャンするか秘密情報を手入力してください。<br/>3. Google Authenticatorの生成したトークンを入力し、<strong>保存</strong>ボタンを押してください。<br/><br/>ログインする際には、通常の認証情報に加え、Google Authenticatorの生成するトークンが求められます。",
+  "user.settings.mfa.addHelp": "Mattermostにサインインするために、パスワードに加えてスマートフォンを使ったトークンの入力を要求することができます。<br/><br/>有効にするには、あなたのスマートフォンに<a target='_blank' href='https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8'>iTunes</a>または<a target='_blank' href='https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en'>Google Play</a>から、Google Authenticatorをダウンロードしてください。<br/><br/>1. 上の<strong>MFAをあなたのアカウントに追加する</strong>ボタンを押してください。<br/>2. 表示されるQRコードをGoogle Authenticatorでスキャンするか秘密情報を手入力してください。<br/>3. Google Authenticatorの生成したトークンを入力し、<strong>保存</strong>ボタンを押してください。<br/><br/>ログインする際には、通常の認証情報に加え、Google Authenticatorの生成するトークンが求められます。",
   "user.settings.mfa.addHelpQr": "スマートフォンのGoogle AuthenticatorアプリでQRコードをスキャンし、アプリから提供されるトークンを入力してください。コードをスキャンできない場合、秘密情報を手入力することができます。",
   "user.settings.mfa.enterToken": "トークン(メンバーのみ)",
   "user.settings.mfa.qrCode": "QRコード",
   "user.settings.mfa.remove": "あなたのアカウントからMFAを削除する",
   "user.settings.mfa.removeHelp": "多要素認証を削除すると、サインインする際にスマートフォンを使ったパスコードの入力は不要になります。",
+  "user.settings.mfa.requiredHelp": "Multi-factor authentication is required on this server. Resetting is only recommended when you need to switch code generation to a new mobile device. You will be required to set it up again immediately.",
+  "user.settings.mfa.reset": "Reset MFA on your account",
   "user.settings.mfa.secret": "秘密情報",
   "user.settings.mfa.title": "多要素認証",
   "user.settings.modal.advanced": "詳細",
@@ -2012,7 +2032,7 @@
   "user.settings.notifications.desktop.allSoundForever": "全てのアクティビティーについて、通知音有りで無期限に表示します",
   "user.settings.notifications.desktop.allSoundTimed": "全てのアクティビティーについて、通知音有りで{seconds}秒間表示します",
   "user.settings.notifications.desktop.duration": "通知持続時間",
-  "user.settings.notifications.desktop.durationInfo": "Sets how long desktop notifications will remain on screen when using Firefox or Chrome. Desktop notifications in Edge and Safari can only stay on screen for a maximum of 5 seconds.",
+  "user.settings.notifications.desktop.durationInfo": "FirefoxかChromeを使用している場合のデスクトップ通知が画面に残る時間を設定してください。EdgeとSafariでのデスクトップ通知は最大5秒間表示されます。",
   "user.settings.notifications.desktop.mentionsFirefoxForever": "あなたについての投稿とダイレクトメッセージについて無期限に表示します",
   "user.settings.notifications.desktop.mentionsFirefoxTimed": "あなたについての投稿とダイレクトメッセージについて{seconds}秒間表示します",
   "user.settings.notifications.desktop.mentionsNoSoundForever": "あなたについての投稿とダイレクトメッセージについて、通知音無しで無期限に表示します",
@@ -2033,7 +2053,7 @@
   "user.settings.notifications.emailInfo": "あなたについての投稿とダイレクトメッセージに関して、電子メール通知を送ります。{siteName}から5分間以上離れている場合に送ります。",
   "user.settings.notifications.emailNotifications": "電子メール通知",
   "user.settings.notifications.header": "通知",
-  "user.settings.notifications.info": "Desktop notifications are available on Edge, Firefox, Safari, Chrome and Mattermost Desktop Apps.",
+  "user.settings.notifications.info": "デスクトップ通知はEdge、Firefox、Safari、Chrome、Mattermostデスクトップアプリで利用できます。",
   "user.settings.notifications.never": "通知しない",
   "user.settings.notifications.noWords": "設定された単語はありません",
   "user.settings.notifications.off": "オフ",
@@ -2045,7 +2065,7 @@
   "user.settings.notifications.sensitiveUsername": "あなたのユーザー名は、大文字小文字を区別せず\"{username}\"です",
   "user.settings.notifications.sensitiveWords": "他の単語をカンマで区切って入力してください。大文字小文字は区別されません:",
   "user.settings.notifications.soundConfig": "ブラウザーの設定画面で、通知音について設定してください",
-  "user.settings.notifications.sounds_info": "Notification sounds are available on IE11, Edge, Safari, Chrome and Mattermost Desktop Apps.",
+  "user.settings.notifications.sounds_info": "通知音はIE11、Edge、Safari、Chrome、Mattermostデスクトップアプリで利用できます。",
   "user.settings.notifications.teamWide": "チーム全体についての「@all」",
   "user.settings.notifications.title": "通知の設定",
   "user.settings.notifications.wordsTrigger": "あなたについての投稿となる単語",
diff --git a/webapp/i18n/ko.json b/webapp/i18n/ko.json
index 5baf6f856..b2ce919ba 100644
--- a/webapp/i18n/ko.json
+++ b/webapp/i18n/ko.json
@@ -501,6 +501,9 @@
   "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.mfa.bannerDesc": "Multi-factor authentication is only available for accounts with LDAP and email login methods. If there are users on your system with other login methods, it is recommended you set up multi-factor authentication directly with the SSO or SAML provider.",
+  "admin.mfa.cluster": "High",
+  "admin.mfa.title": "Multi-factor Authentication",
   "admin.nav.help": "도움말",
   "admin.nav.logout": "로그아웃",
   "admin.nav.report": "문제 보고",
@@ -650,6 +653,8 @@
   "admin.service.corsTitle": "CORS 요청 허용:",
   "admin.service.developerDesc": "When true, Javascript errors are shown in a red bar at the top of the user interface. Not recommended for use in production. ",
   "admin.service.developerTitle": "개발자 모드: ",
+  "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
+  "admin.service.enforceMfaDesc": "When true, users on the system will be required to set up [multi-factor authentication]. Any logged in users will be redirected to the multi-factor authentication setup page until they successfully add MFA to their account.<br/><br/>It is recommended you turn on enforcement during non-peak hours, when people are less likely to be using the system. New users will be required to set up multi-factor authentication when they first sign up. After set up, users will not be able to remove multi-factor authentication unless enforcement is disabled.<br/><br/>Please note that multi-factor authentication is only available for accounts with LDAP and email login methods. Mattermost will not enforce multi-factor authentication for other login methods. If there are users on your system using other login methods, it is recommended you set up and enforce multi-factor authentication directly with the SSO or SAML provider.",
   "admin.service.forward80To443": "Forward port 80 to 443:",
   "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443",
   "admin.service.googleDescription": "Set this key to enable the display of titles for embedded YouTube video previews. Without the key, YouTube previews will still be created based on hyperlinks appearing in messages or comments but they will not show the video title. View a <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a> for instructions on how to obtain a key.",
@@ -1534,6 +1539,19 @@
   "member_list.noUsersAdd": "추가할 유저가 없습니다.",
   "members_popover.msg": "메시지",
   "members_popover.title": "회원",
+  "mfa.confirm.complete": "<strong>Set up complete!</strong>",
+  "mfa.confirm.okay": "Okay",
+  "mfa.confirm.secure": "Your account is now secure. Next time you sign in, you will be asked to enter a code from the Google Authenticator app on your phone.",
+  "mfa.setup.badCode": "Invalid code. If this issue persists, contact your System Administrator.",
+  "mfa.setup.code": "MFA Code",
+  "mfa.setup.codeError": "Please enter the code from Google Authenticator.",
+  "mfa.setup.required": "<strong>Multi-factor authentication is required on {siteName}.</strong>",
+  "mfa.setup.save": "Save",
+  "mfa.setup.secret": "Secret: {secret}",
+  "mfa.setup.step1": "<strong>Step 1: </strong>On your phone, 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>",
+  "mfa.setup.step2": "<strong>Step 2: </strong>Use Google Authenticator to scan this QR code, or manually type in the secret key",
+  "mfa.setup.step3": "<strong>Step 3: </strong>Enter the code generated by Google Authenticator",
+  "mfa.setupTitle": "Multi-factor Authentication Setup",
   "mobile.components.channels_list_view.yourChannels": "Your channels:",
   "mobile.components.select_server_view.enterServerUrl": "Enter Server URL",
   "mobile.components.select_server_view.proceed": "Proceed",
@@ -1985,6 +2003,8 @@
   "user.settings.mfa.qrCode": "바코드",
   "user.settings.mfa.remove": "Remove MFA from your account",
   "user.settings.mfa.removeHelp": "Removing multi-factor authentication means you will no longer require a phone-based passcode to sign-in to your account.",
+  "user.settings.mfa.requiredHelp": "Multi-factor authentication is required on this server. Resetting is only recommended when you need to switch code generation to a new mobile device. You will be required to set it up again immediately.",
+  "user.settings.mfa.reset": "Reset MFA on your account",
   "user.settings.mfa.secret": "보안",
   "user.settings.mfa.title": "Enable Multi-factor Authentication:",
   "user.settings.modal.advanced": "고급",
diff --git a/webapp/i18n/nl.json b/webapp/i18n/nl.json
index 1725ce62c..1b832c2f5 100644
--- a/webapp/i18n/nl.json
+++ b/webapp/i18n/nl.json
@@ -501,6 +501,9 @@
   "admin.metrics.listenAddressDesc": "The address the server will listen on to expose performance metrics.",
   "admin.metrics.listenAddressEx": "Bijv. \":8065\"",
   "admin.metrics.listenAddressTitle": "Luister Adres:",
+  "admin.mfa.bannerDesc": "Multi-factor authentication is only available for accounts with LDAP and email login methods. If there are users on your system with other login methods, it is recommended you set up multi-factor authentication directly with the SSO or SAML provider.",
+  "admin.mfa.cluster": "High",
+  "admin.mfa.title": "Multi-factor Authentication",
   "admin.nav.help": "Help",
   "admin.nav.logout": "Afmelden",
   "admin.nav.report": "Een probleem melden",
@@ -650,6 +653,8 @@
   "admin.service.corsTitle": "Cross-origin Requests toestaan van:",
   "admin.service.developerDesc": "Javascript fout worden weergeven in een rode bar boven in de user interface. Niet aangeraden voor productie.",
   "admin.service.developerTitle": "Developer mode inschakelen: ",
+  "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
+  "admin.service.enforceMfaDesc": "When true, users on the system will be required to set up [multi-factor authentication]. Any logged in users will be redirected to the multi-factor authentication setup page until they successfully add MFA to their account.<br/><br/>It is recommended you turn on enforcement during non-peak hours, when people are less likely to be using the system. New users will be required to set up multi-factor authentication when they first sign up. After set up, users will not be able to remove multi-factor authentication unless enforcement is disabled.<br/><br/>Please note that multi-factor authentication is only available for accounts with LDAP and email login methods. Mattermost will not enforce multi-factor authentication for other login methods. If there are users on your system using other login methods, it is recommended you set up and enforce multi-factor authentication directly with the SSO or SAML provider.",
   "admin.service.forward80To443": "Forward port 80 to 443:",
   "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443",
   "admin.service.googleDescription": "Zet deze sleutel om de titel van ingevoegde Youtube video's te tonen. Zonder deze sleutel zullen Youtube previews nog steeds gemaakt worden op basis van links die in berichten en reacties worden geplaatst, maar er word geen titel getoond. Bekijken een <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a> voor instructies over hoe deze sleutel te krijgen.",
@@ -1534,6 +1539,19 @@
   "member_list.noUsersAdd": "Geen gebruikers om toe te voegen.",
   "members_popover.msg": "Bericht",
   "members_popover.title": " Leden",
+  "mfa.confirm.complete": "<strong>Set up complete!</strong>",
+  "mfa.confirm.okay": "Okay",
+  "mfa.confirm.secure": "Your account is now secure. Next time you sign in, you will be asked to enter a code from the Google Authenticator app on your phone.",
+  "mfa.setup.badCode": "Invalid code. If this issue persists, contact your System Administrator.",
+  "mfa.setup.code": "MFA Code",
+  "mfa.setup.codeError": "Please enter the code from Google Authenticator.",
+  "mfa.setup.required": "<strong>Multi-factor authentication is required on {siteName}.</strong>",
+  "mfa.setup.save": "Save",
+  "mfa.setup.secret": "Secret: {secret}",
+  "mfa.setup.step1": "<strong>Step 1: </strong>On your phone, 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>",
+  "mfa.setup.step2": "<strong>Step 2: </strong>Use Google Authenticator to scan this QR code, or manually type in the secret key",
+  "mfa.setup.step3": "<strong>Step 3: </strong>Enter the code generated by Google Authenticator",
+  "mfa.setupTitle": "Multi-factor Authentication Setup",
   "mobile.components.channels_list_view.yourChannels": "Your channels:",
   "mobile.components.select_server_view.enterServerUrl": "Enter Server URL",
   "mobile.components.select_server_view.proceed": "Proceed",
@@ -1985,6 +2003,8 @@
   "user.settings.mfa.qrCode": "Streepjescode",
   "user.settings.mfa.remove": "Verwijderen van MFA van jouw account",
   "user.settings.mfa.removeHelp": "Verwijderen van multi-factor autenticatie betekent dat je niet langer verplicht een telefoon gebaseerde toegangscode nodig hebt om in te loggen op jouw account. ",
+  "user.settings.mfa.requiredHelp": "Multi-factor authentication is required on this server. Resetting is only recommended when you need to switch code generation to a new mobile device. You will be required to set it up again immediately.",
+  "user.settings.mfa.reset": "Reset MFA on your account",
   "user.settings.mfa.secret": "Geheim:",
   "user.settings.mfa.title": "Multi-factor Authenticatie:",
   "user.settings.modal.advanced": "Geavanceerd",
diff --git a/webapp/i18n/pt-BR.json b/webapp/i18n/pt-BR.json
index ed9d032f3..87f0bb52a 100644
--- a/webapp/i18n/pt-BR.json
+++ b/webapp/i18n/pt-BR.json
@@ -501,6 +501,9 @@
   "admin.metrics.listenAddressDesc": "O endereço que o servidor irá escutar para expor as métricas de performance.",
   "admin.metrics.listenAddressEx": "Ex \":8067\"",
   "admin.metrics.listenAddressTitle": "Endereço à escutar:",
+  "admin.mfa.bannerDesc": "Multi-factor authentication is only available for accounts with LDAP and email login methods. If there are users on your system with other login methods, it is recommended you set up multi-factor authentication directly with the SSO or SAML provider.",
+  "admin.mfa.cluster": "High",
+  "admin.mfa.title": "Multi-factor Authentication",
   "admin.nav.help": "Ajuda",
   "admin.nav.logout": "Sair",
   "admin.nav.report": "Relatar um Problema",
@@ -650,6 +653,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.enforcMfaTitle": "Enforce Multi-factor Authentication:",
+  "admin.service.enforceMfaDesc": "When true, users on the system will be required to set up [multi-factor authentication]. Any logged in users will be redirected to the multi-factor authentication setup page until they successfully add MFA to their account.<br/><br/>It is recommended you turn on enforcement during non-peak hours, when people are less likely to be using the system. New users will be required to set up multi-factor authentication when they first sign up. After set up, users will not be able to remove multi-factor authentication unless enforcement is disabled.<br/><br/>Please note that multi-factor authentication is only available for accounts with LDAP and email login methods. Mattermost will not enforce multi-factor authentication for other login methods. If there are users on your system using other login methods, it is recommended you set up and enforce multi-factor authentication directly with the SSO or SAML provider.",
   "admin.service.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.",
@@ -1534,6 +1539,19 @@
   "member_list.noUsersAdd": "Nenhum usuário para adicionar.",
   "members_popover.msg": "Mensagem",
   "members_popover.title": "Membros",
+  "mfa.confirm.complete": "<strong>Set up complete!</strong>",
+  "mfa.confirm.okay": "Okay",
+  "mfa.confirm.secure": "Your account is now secure. Next time you sign in, you will be asked to enter a code from the Google Authenticator app on your phone.",
+  "mfa.setup.badCode": "Invalid code. If this issue persists, contact your System Administrator.",
+  "mfa.setup.code": "MFA Code",
+  "mfa.setup.codeError": "Please enter the code from Google Authenticator.",
+  "mfa.setup.required": "<strong>Multi-factor authentication is required on {siteName}.</strong>",
+  "mfa.setup.save": "Save",
+  "mfa.setup.secret": "Secret: {secret}",
+  "mfa.setup.step1": "<strong>Step 1: </strong>On your phone, 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>",
+  "mfa.setup.step2": "<strong>Step 2: </strong>Use Google Authenticator to scan this QR code, or manually type in the secret key",
+  "mfa.setup.step3": "<strong>Step 3: </strong>Enter the code generated by Google Authenticator",
+  "mfa.setupTitle": "Multi-factor Authentication Setup",
   "mobile.components.channels_list_view.yourChannels": "Seus canais:",
   "mobile.components.select_server_view.enterServerUrl": "Informe a URL do servidor",
   "mobile.components.select_server_view.proceed": "Prosseguir",
@@ -1624,7 +1642,7 @@
   "post_info.reply": "Responder",
   "posts_view.loadMore": "Carregar mais mensagens",
   "posts_view.newMsg": "Novas Mensagens",
-  "posts_view.newMsgBelow": "{count} new {count, plural, one {message} other {messages}} below",
+  "posts_view.newMsgBelow": "{count} {count, plural, one {nova mensagem} other {novas mensagens}} abaixo",
   "reaction.clickToAdd": "(clique para adicionar)",
   "reaction.clickToRemove": "(clique para remover)",
   "reaction.multipleReacted": "<b>{users} e {lastUser}</b> reagiram com <b>:{emojiName}:</b>",
@@ -1985,6 +2003,8 @@
   "user.settings.mfa.qrCode": "Código de Barra",
   "user.settings.mfa.remove": "Remover MFA da sua conta",
   "user.settings.mfa.removeHelp": "Remoção da autenticação multi-fator significa que você não vai mais exigir um código de acesso baseado no telefone para fazer login na sua conta.",
+  "user.settings.mfa.requiredHelp": "Multi-factor authentication is required on this server. Resetting is only recommended when you need to switch code generation to a new mobile device. You will be required to set it up again immediately.",
+  "user.settings.mfa.reset": "Reset MFA on your account",
   "user.settings.mfa.secret": "Chave",
   "user.settings.mfa.title": "Autenticação Multi-Fator",
   "user.settings.modal.advanced": "Avançado",
diff --git a/webapp/i18n/ru.json b/webapp/i18n/ru.json
index 539ca8385..7ed342d49 100644
--- a/webapp/i18n/ru.json
+++ b/webapp/i18n/ru.json
@@ -300,7 +300,7 @@
   "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": "Ничего не найдено",
-  "admin.general.localization.availableLocalesNotPresent": "The default client language must be included in the available list",
+  "admin.general.localization.availableLocalesNotPresent": "Язык клиента по умолчанию должен быть включён в список доступных языков",
   "admin.general.localization.availableLocalesTitle": "Доступные языки:",
   "admin.general.localization.clientLocaleDescription": "Язык по умолчанию для новых пользователей и страниц при первом входе в систему.",
   "admin.general.localization.clientLocaleTitle": "Язык клиента по умолчанию:",
@@ -415,7 +415,7 @@
   "admin.ldap.firstnameAttrDesc": "(Опционально) Этот атрибут для AD/LDAP сервера который будет использоваться для заполнения имени пользователя в Mattermost. Если он установлен, пользователи не смогут редактировать свои имена т.к. они будут синхронизироваться с LDAP сервером. Если атрибут не заполнен, пользователи смогут изменить их собственные имена в Настройках пользователя.",
   "admin.ldap.firstnameAttrEx": "Например: \"givenName\"",
   "admin.ldap.firstnameAttrTitle": "Атрибут имени",
-  "admin.ldap.idAttrDesc": "Атрибут LDAP, который будет использоваться в качестве уникального идентификатора. Укажите атрибут, значение которого не будет меняться, например имя пользователя или его uid. Если значение этого атрибута изменится, в Mattermost будет создана новая учетная запись, не имеющая к старой никакого отношения. Значение этого атрибута используется в поле “Имя пользователя LDAP“ на странице входа в Mattermost. В большинстве случаев это тот же атрибут, что используется в качестве \"Атрибута имени пользователя\" выше. Если ваша команда обычно использует учетные записи в стиле домен\\\\пользователь для входа в другие сервисы с использованием LDAP, вы можете указать это же значение и здесь, для сохранения единообразия.",
+  "admin.ldap.idAttrDesc": "Атрибут AD/LDAP, который будет использоваться в качестве уникального идентификатора в Mattermost. Укажите атрибут, значение которого не будет меняться, например имя пользователя или его идентификатор. Если значение этого атрибута изменится, в Mattermost будет создана новая учетная запись, не имеющая к старой никакого отношения. Значение этого атрибута используется в поле \"Имя пользователя AD/LDAP\" на странице входа в Mattermost. В большинстве случаев это тот же атрибут, что используется в качестве \"Атрибута имени пользователя\" выше. Если ваша команда обычно использует учетные записи в стиле домен\\\\пользователь для входа в другие сервисы с использованием AD/LDAP, вы можете указать это же значение и здесь, для сохранения единообразия.",
   "admin.ldap.idAttrEx": "Например: \"sAMAccountName\"",
   "admin.ldap.idAttrTitle": "ID атрибут:",
   "admin.ldap.lastnameAttrDesc": "(Опционально) Этот атрибут для AD/LDAP сервера который будет использоваться для заполнения фамилии пользователя в Mattermost. Если он установлен, пользователи не смогут редактировать свои фамилии т.к. они будут синхронизироваться с LDAP сервером. Если атрибут не заполнен, пользователи смогут изменить их собственные фамилии в Настройках пользователя.",
@@ -501,6 +501,9 @@
   "admin.metrics.listenAddressDesc": "The address the server will listen on to expose performance metrics.",
   "admin.metrics.listenAddressEx": "Например: \":8067\"",
   "admin.metrics.listenAddressTitle": "Прослушиваемый адрес:",
+  "admin.mfa.bannerDesc": "Multi-factor authentication is only available for accounts with LDAP and email login methods. If there are users on your system with other login methods, it is recommended you set up multi-factor authentication directly with the SSO or SAML provider.",
+  "admin.mfa.cluster": "High",
+  "admin.mfa.title": "Multi-factor Authentication",
   "admin.nav.help": "Помощь",
   "admin.nav.logout": "Выйти",
   "admin.nav.report": "Сообщить об ошибке",
@@ -650,6 +653,8 @@
   "admin.service.corsTitle": "Разрешить кроссдоменные запросы от:",
   "admin.service.developerDesc": "Когда включено, на красной панели сверху будут показываться ошибки Javascript. Не рекомендуется включать на боевом сервере.",
   "admin.service.developerTitle": "Включить режим разработчика:",
+  "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
+  "admin.service.enforceMfaDesc": "When true, users on the system will be required to set up [multi-factor authentication]. Any logged in users will be redirected to the multi-factor authentication setup page until they successfully add MFA to their account.<br/><br/>It is recommended you turn on enforcement during non-peak hours, when people are less likely to be using the system. New users will be required to set up multi-factor authentication when they first sign up. After set up, users will not be able to remove multi-factor authentication unless enforcement is disabled.<br/><br/>Please note that multi-factor authentication is only available for accounts with LDAP and email login methods. Mattermost will not enforce multi-factor authentication for other login methods. If there are users on your system using other login methods, it is recommended you set up and enforce multi-factor authentication directly with the SSO or SAML provider.",
   "admin.service.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>, для того чтобы узнать, как получить ключ.",
@@ -662,7 +667,7 @@
   "admin.service.integrationAdmin": "Ограничить управление интеграцией для администраторов:",
   "admin.service.integrationAdminDesc": "Если истина, вебхуки и слэш-команды могут быть созданы, изменены и просмотрены только командными и системными админами, а приложения 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.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\"",
@@ -809,7 +814,7 @@
   "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.maxNotificationsPerChannelTitle": "Максимальное количество уведомлений на канал:",
   "admin.team.maxUsersDescription": "Максимальное количество пользователей на команду.",
   "admin.team.maxUsersExample": "Например: \"25\"",
   "admin.team.maxUsersTitle": "Максимальное количество пользователей в команде:",
@@ -1214,7 +1219,7 @@
   "emoji_list.creator": "Автор",
   "emoji_list.delete": "Удалить",
   "emoji_list.empty": "Не найдено загруженного эмодзи",
-  "emoji_list.header": "Пользовательские смайлы",
+  "emoji_list.header": "Пользовательские эмодзи",
   "emoji_list.help": "Пользовательские смайлы доступны для всех на вашем сервере. Введите ':' в окне сообщения, чтобы открыть меню выбора смайла. Другим пользователям, возможно, потребуется обновить страницу, прежде чем появятся новые смайлы.",
   "emoji_list.help2": "Совет: Если вы добавите #, ## или ### в начале строки со смайлом, то получите смайл большего размера. Чтобы попробовать, отправьте сообщение: '# :smile:'.",
   "emoji_list.image": "Изображения",
@@ -1226,7 +1231,7 @@
   "error.not_found.title": "Страница не найдена",
   "error.not_supported.message": "Приватный просмотр не поддерживается",
   "error.not_supported.title": "Браузер не поддерживается",
-  "error_bar.expired": "Enterprise license has expired; you have 15 days from expiry to renew the license, please contact commercial@mattermost.com for details",
+  "error_bar.expired": "Корпоративная лицензия истекла; у вас есть 15 дней, чтобы обновить лицензию. Свяжитесь с commercial@mattermost.com для получения деталей",
   "error_bar.expiring": "Корпоративная лицензия истекает {date}. Чтобы продлить вашу лицензию, свяжитесь с commercial@mattermost.com",
   "error_bar.past_grace": "Enterprise license has expired, please contact your System Administrator for details",
   "error_bar.preview_mode": "Режим просмотра: Email уведомления не настроены",
@@ -1431,7 +1436,7 @@
   "installed_oauth_apps.trusted.no": "Нет",
   "installed_oauth_apps.trusted.yes": "Да",
   "installed_outgoing_webhooks.add": "Добавить исходящий Webhook",
-  "installed_outgoing_webhooks.empty": "No outgoing webhooks found",
+  "installed_outgoing_webhooks.empty": "Не обнаружено исходящих вебхуков",
   "installed_outgoing_webhooks.header": "Исходящие Webhook'и",
   "installed_outgoing_webhooks.help": "Создание исходящих webhook URL для использования c внешними интеграцями. Пожалуйста, смотрите {link}, чтобы узнать больше.",
   "installed_outgoing_webhooks.helpLink": "документация",
@@ -1492,7 +1497,7 @@
   "leave_team_modal.title": "Покинуть команду?",
   "leave_team_modal.yes": "Да",
   "loading_screen.loading": "Загрузка",
-  "login.changed": " Sign-in method changed successfully",
+  "login.changed": " Метод входа успешно изменён",
   "login.create": "Создать сейчас",
   "login.createTeam": "Создать команду",
   "login.createTeamAdminOnly": "Эта опция доступна только для системных администраторов и не видна другим пользователям.",
@@ -1534,6 +1539,19 @@
   "member_list.noUsersAdd": "Нет пользователей для добавления.",
   "members_popover.msg": "Сообщение",
   "members_popover.title": "Участники",
+  "mfa.confirm.complete": "<strong>Set up complete!</strong>",
+  "mfa.confirm.okay": "Okay",
+  "mfa.confirm.secure": "Your account is now secure. Next time you sign in, you will be asked to enter a code from the Google Authenticator app on your phone.",
+  "mfa.setup.badCode": "Invalid code. If this issue persists, contact your System Administrator.",
+  "mfa.setup.code": "MFA Code",
+  "mfa.setup.codeError": "Please enter the code from Google Authenticator.",
+  "mfa.setup.required": "<strong>Multi-factor authentication is required on {siteName}.</strong>",
+  "mfa.setup.save": "Save",
+  "mfa.setup.secret": "Secret: {secret}",
+  "mfa.setup.step1": "<strong>Step 1: </strong>On your phone, 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>",
+  "mfa.setup.step2": "<strong>Step 2: </strong>Use Google Authenticator to scan this QR code, or manually type in the secret key",
+  "mfa.setup.step3": "<strong>Step 3: </strong>Enter the code generated by Google Authenticator",
+  "mfa.setupTitle": "Multi-factor Authentication Setup",
   "mobile.components.channels_list_view.yourChannels": "Ваши каналы:",
   "mobile.components.select_server_view.enterServerUrl": "Enter Server URL",
   "mobile.components.select_server_view.proceed": "Продолжить",
@@ -1746,7 +1764,7 @@
   "signup_user_completed.chooseUser": "Выберите имя:",
   "signup_user_completed.create": "Создать аккаунт",
   "signup_user_completed.emailHelp": "Требуется реальный адрес электронной почты для регистрации аккаунта",
-  "signup_user_completed.emailIs": "Your email address is <strong>{email}</strong>. You'll use this address to sign in to {siteName}.",
+  "signup_user_completed.emailIs": "Ваша электронная почта <strong>{email}</strong>. Используйте ее для входа в {siteName}.",
   "signup_user_completed.expired": "You've already completed the signup process for this invitation or this invitation has expired.",
   "signup_user_completed.gitlab": "через GitLab",
   "signup_user_completed.google": "через Google",
@@ -1869,15 +1887,15 @@
   "user.settings.advance.title": "Дополнительные параметры",
   "user.settings.advance.webrtc_preview": "Включить возможность совершать и принимать WebRTC звонки.",
   "user.settings.custom_theme.awayIndicator": "Индикатор отсутствия",
-  "user.settings.custom_theme.buttonBg": "Button BG",
-  "user.settings.custom_theme.buttonColor": "Button Text",
+  "user.settings.custom_theme.buttonBg": "Фон кнопки",
+  "user.settings.custom_theme.buttonColor": "Цвет кнопки",
   "user.settings.custom_theme.centerChannelBg": "Center Channel BG",
   "user.settings.custom_theme.centerChannelColor": "Center Channel Text",
   "user.settings.custom_theme.centerChannelTitle": "Center Channel Styles",
   "user.settings.custom_theme.codeTheme": "Цветовая схема",
   "user.settings.custom_theme.copyPaste": "Copy and paste to share theme colors:",
   "user.settings.custom_theme.linkButtonTitle": "Link and Button Styles",
-  "user.settings.custom_theme.linkColor": "Link Color",
+  "user.settings.custom_theme.linkColor": "Цвет ссылки",
   "user.settings.custom_theme.mentionBj": "Mention Jewel BG",
   "user.settings.custom_theme.mentionColor": "Mention Jewel Text",
   "user.settings.custom_theme.mentionHighlightBg": "Mention Highlight BG",
@@ -1985,6 +2003,8 @@
   "user.settings.mfa.qrCode": "Штрихкод",
   "user.settings.mfa.remove": "Удалить MFA из вашего аккаунта",
   "user.settings.mfa.removeHelp": "Removing multi-factor authentication means you will no longer require a phone-based passcode to sign-in to your account.",
+  "user.settings.mfa.requiredHelp": "Multi-factor authentication is required on this server. Resetting is only recommended when you need to switch code generation to a new mobile device. You will be required to set it up again immediately.",
+  "user.settings.mfa.reset": "Reset MFA on your account",
   "user.settings.mfa.secret": "Secret:",
   "user.settings.mfa.title": "Включить многофакторную аутентификацию",
   "user.settings.modal.advanced": "Дополнительно",
@@ -2046,7 +2066,7 @@
   "user.settings.notifications.sensitiveWords": "Другие независящие от регистра слова, разделенные запятыми:",
   "user.settings.notifications.soundConfig": "Пожалуйста, настройте звуковые уведомления в настройках браузера",
   "user.settings.notifications.sounds_info": "Notification sounds are available on IE11, Edge, Safari, Chrome and Mattermost Desktop Apps.",
-  "user.settings.notifications.teamWide": "Team-wide mentions \"@all\"",
+  "user.settings.notifications.teamWide": "Упоминания команды \"@all\"",
   "user.settings.notifications.title": "Настройки уведомлений",
   "user.settings.notifications.wordsTrigger": "Ключевые слова для упоминаний",
   "user.settings.push_notification.allActivity": "При любой активности",
diff --git a/webapp/i18n/zh_CN.json b/webapp/i18n/zh_CN.json
index 17d27b5d0..047a2e941 100644
--- a/webapp/i18n/zh_CN.json
+++ b/webapp/i18n/zh_CN.json
@@ -501,6 +501,9 @@
   "admin.metrics.listenAddressDesc": "服务端监听的地址以公开性能指标数据。",
   "admin.metrics.listenAddressEx": "例如 \":8067\"",
   "admin.metrics.listenAddressTitle": "监听地址：",
+  "admin.mfa.bannerDesc": "Multi-factor authentication is only available for accounts with LDAP and email login methods. If there are users on your system with other login methods, it is recommended you set up multi-factor authentication directly with the SSO or SAML provider.",
+  "admin.mfa.cluster": "High",
+  "admin.mfa.title": "Multi-factor Authentication",
   "admin.nav.help": "帮助",
   "admin.nav.logout": "注销",
   "admin.nav.report": "报告问题",
@@ -650,6 +653,8 @@
   "admin.service.corsTitle": "允许来自以下跨源请求网址：",
   "admin.service.developerDesc": "开启时，Javascript错误将显示在页面顶端红条里。不推荐在正式环境使用。",
   "admin.service.developerTitle": "开启开发者模式：",
+  "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
+  "admin.service.enforceMfaDesc": "When true, users on the system will be required to set up [multi-factor authentication]. Any logged in users will be redirected to the multi-factor authentication setup page until they successfully add MFA to their account.<br/><br/>It is recommended you turn on enforcement during non-peak hours, when people are less likely to be using the system. New users will be required to set up multi-factor authentication when they first sign up. After set up, users will not be able to remove multi-factor authentication unless enforcement is disabled.<br/><br/>Please note that multi-factor authentication is only available for accounts with LDAP and email login methods. Mattermost will not enforce multi-factor authentication for other login methods. If there are users on your system using other login methods, it is recommended you set up and enforce multi-factor authentication directly with the SSO or SAML provider.",
   "admin.service.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>教程以获得钥匙。",
@@ -1534,6 +1539,19 @@
   "member_list.noUsersAdd": "没有用户可添加。",
   "members_popover.msg": "消息",
   "members_popover.title": "成员",
+  "mfa.confirm.complete": "<strong>Set up complete!</strong>",
+  "mfa.confirm.okay": "Okay",
+  "mfa.confirm.secure": "Your account is now secure. Next time you sign in, you will be asked to enter a code from the Google Authenticator app on your phone.",
+  "mfa.setup.badCode": "Invalid code. If this issue persists, contact your System Administrator.",
+  "mfa.setup.code": "MFA Code",
+  "mfa.setup.codeError": "Please enter the code from Google Authenticator.",
+  "mfa.setup.required": "<strong>Multi-factor authentication is required on {siteName}.</strong>",
+  "mfa.setup.save": "Save",
+  "mfa.setup.secret": "Secret: {secret}",
+  "mfa.setup.step1": "<strong>Step 1: </strong>On your phone, 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>",
+  "mfa.setup.step2": "<strong>Step 2: </strong>Use Google Authenticator to scan this QR code, or manually type in the secret key",
+  "mfa.setup.step3": "<strong>Step 3: </strong>Enter the code generated by Google Authenticator",
+  "mfa.setupTitle": "Multi-factor Authentication Setup",
   "mobile.components.channels_list_view.yourChannels": "您的频道：",
   "mobile.components.select_server_view.enterServerUrl": "输入服务器网址",
   "mobile.components.select_server_view.proceed": "继续",
@@ -1985,6 +2003,8 @@
   "user.settings.mfa.qrCode": "条形码",
   "user.settings.mfa.remove": "从您的账户中删除多重验证",
   "user.settings.mfa.removeHelp": "删除多重验证意味着您不再需要基于手机的密码来登入您的帐号。",
+  "user.settings.mfa.requiredHelp": "Multi-factor authentication is required on this server. Resetting is only recommended when you need to switch code generation to a new mobile device. You will be required to set it up again immediately.",
+  "user.settings.mfa.reset": "Reset MFA on your account",
   "user.settings.mfa.secret": "秘钥：",
   "user.settings.mfa.title": "启用多重验证：",
   "user.settings.modal.advanced": "高级",
diff --git a/webapp/i18n/zh_TW.json b/webapp/i18n/zh_TW.json
index 767a29526..c7bc6d2be 100644
--- a/webapp/i18n/zh_TW.json
+++ b/webapp/i18n/zh_TW.json
@@ -501,6 +501,9 @@
   "admin.metrics.listenAddressDesc": "伺服器將監聽以公開效能計量值的位址。",
   "admin.metrics.listenAddressEx": "例如：\":8067\"",
   "admin.metrics.listenAddressTitle": "監聽位址：",
+  "admin.mfa.bannerDesc": "Multi-factor authentication is only available for accounts with LDAP and email login methods. If there are users on your system with other login methods, it is recommended you set up multi-factor authentication directly with the SSO or SAML provider.",
+  "admin.mfa.cluster": "High",
+  "admin.mfa.title": "Multi-factor Authentication",
   "admin.nav.help": "說明",
   "admin.nav.logout": "登出",
   "admin.nav.report": "回報錯誤",
@@ -650,6 +653,8 @@
   "admin.service.corsTitle": "允許來自下列網址的跨站請求：",
   "admin.service.developerDesc": "啟用時，Javascript 錯誤會顯示在使用者界面頂端上的紅色橫欄。不建議在正式環境中使用。",
   "admin.service.developerTitle": "啟用開發者模式：",
+  "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
+  "admin.service.enforceMfaDesc": "When true, users on the system will be required to set up [multi-factor authentication]. Any logged in users will be redirected to the multi-factor authentication setup page until they successfully add MFA to their account.<br/><br/>It is recommended you turn on enforcement during non-peak hours, when people are less likely to be using the system. New users will be required to set up multi-factor authentication when they first sign up. After set up, users will not be able to remove multi-factor authentication unless enforcement is disabled.<br/><br/>Please note that multi-factor authentication is only available for accounts with LDAP and email login methods. Mattermost will not enforce multi-factor authentication for other login methods. If there are users on your system using other login methods, it is recommended you set up and enforce multi-factor authentication directly with the SSO or SAML provider.",
   "admin.service.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> 的指示以取得金鑰。",
@@ -1534,6 +1539,19 @@
   "member_list.noUsersAdd": "沒有可增加的使用者。",
   "members_popover.msg": "訊息",
   "members_popover.title": "成員",
+  "mfa.confirm.complete": "<strong>Set up complete!</strong>",
+  "mfa.confirm.okay": "Okay",
+  "mfa.confirm.secure": "Your account is now secure. Next time you sign in, you will be asked to enter a code from the Google Authenticator app on your phone.",
+  "mfa.setup.badCode": "Invalid code. If this issue persists, contact your System Administrator.",
+  "mfa.setup.code": "MFA Code",
+  "mfa.setup.codeError": "Please enter the code from Google Authenticator.",
+  "mfa.setup.required": "<strong>Multi-factor authentication is required on {siteName}.</strong>",
+  "mfa.setup.save": "Save",
+  "mfa.setup.secret": "Secret: {secret}",
+  "mfa.setup.step1": "<strong>Step 1: </strong>On your phone, 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>",
+  "mfa.setup.step2": "<strong>Step 2: </strong>Use Google Authenticator to scan this QR code, or manually type in the secret key",
+  "mfa.setup.step3": "<strong>Step 3: </strong>Enter the code generated by Google Authenticator",
+  "mfa.setupTitle": "Multi-factor Authentication Setup",
   "mobile.components.channels_list_view.yourChannels": "您的頻道：",
   "mobile.components.select_server_view.enterServerUrl": "輸入伺服器網址",
   "mobile.components.select_server_view.proceed": "繼續",
@@ -1985,6 +2003,8 @@
   "user.settings.mfa.qrCode": "條碼",
   "user.settings.mfa.remove": "從您的帳號移除多重要素驗證",
   "user.settings.mfa.removeHelp": "刪除多重因子認證後將不再需要一個基於手機的密碼以登入帳戶。",
+  "user.settings.mfa.requiredHelp": "Multi-factor authentication is required on this server. Resetting is only recommended when you need to switch code generation to a new mobile device. You will be required to set it up again immediately.",
+  "user.settings.mfa.reset": "Reset MFA on your account",
   "user.settings.mfa.secret": "密碼",
   "user.settings.mfa.title": "多重要素驗證",
   "user.settings.modal.advanced": "進階",