translations PR 20161212 (#4774)

1 files changed, 19 insertions, 22 deletions

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?",