diff --git a/webapp/components/admin_console/localization_settings.jsx b/webapp/components/admin_console/localization_settings.jsx
index c8d20c7fdf..a9a0a8044b 100644
--- a/webapp/components/admin_console/localization_settings.jsx
+++ b/webapp/components/admin_console/localization_settings.jsx
@@ -6,7 +6,7 @@ import React from 'react';
import * as I18n from 'i18n/i18n.jsx';
import AdminSettings from './admin_settings.jsx';
-import {FormattedMessage} from 'react-intl';
+import {FormattedMessage, FormattedHTMLMessage} from 'react-intl';
import SettingsGroup from './settings_group.jsx';
import DropdownSetting from './dropdown_setting.jsx';
import MultiSelectSetting from './multiselect_settings.jsx';
@@ -112,9 +112,9 @@ export default class LocalizationSettings extends AdminSettings {
selected={this.state.availableLocales}
onChange={this.handleChange}
helpText={
-
}
noResultText={
diff --git a/webapp/components/user_settings/manage_languages.jsx b/webapp/components/user_settings/manage_languages.jsx
index a624824624..ed82bc666b 100644
--- a/webapp/components/user_settings/manage_languages.jsx
+++ b/webapp/components/user_settings/manage_languages.jsx
@@ -8,7 +8,7 @@ import * as I18n from 'i18n/i18n.jsx';
import * as GlobalActions from 'actions/global_actions.jsx';
import Constants from 'utils/constants.jsx';
-import {FormattedMessage} from 'react-intl';
+import {FormattedMessage, FormattedHTMLMessage} from 'react-intl';
import React from 'react';
@@ -99,6 +99,13 @@ export default class ManageLanguage extends React.Component {
{serverError}
+
+
+
+
);
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index f53d8d0054..837249894b 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -263,7 +263,7 @@
"admin.files.storage": "Storage",
"admin.general.configuration": "Configuration",
"admin.general.localization": "Localization",
- "admin.general.localization.availableLocalesDescription": "Determines which languages are available for users in Account Settings. (Leave it blank to have all supported languages available)",
+ "admin.general.localization.availableLocalesDescription": "Set which languages are available for users in Account Settings (leave this field blank to have all supported languages available).
Would like to help with translations? Join the Mattermost Translation Server to contribute.",
"admin.general.localization.availableLocalesTitle": "Available Languages:",
"admin.general.localization.clientLocaleDescription": "Default language for newly created users and pages where the user hasn't logged in.",
"admin.general.localization.clientLocaleTitle": "Default Client Language:",
@@ -459,6 +459,8 @@
"admin.oauth.google": "Google Apps",
"admin.oauth.off": "Do not allow sign-in via an OAuth 2.0 provider",
"admin.oauth.office365": "Office 365",
+ "admin.oauth.providerDescription": "When true, Mattermost can act as an OAuth 2.0 service provider allowing external applications to authorize API requests to Mattermost.",
+ "admin.oauth.providerTitle": "Enable OAuth 2.0 Service Provider: ",
"admin.oauth.select": "Select OAuth 2.0 service provider:",
"admin.office365.EnableHtmlDesc": "- Log in to your Microsoft or Office 365 account. Make sure it's the account on the same tenant that you would like users to log in with.
- Go to https://apps.dev.microsoft.com, click Add an app and use Mattermost - as the application name.
- Under Application Secrets, click Generate New Password and save it to later complete the field below.
- Under Platforms, click Add Platform, choose Web and enter /signup/office365/complete (example: http://localhost:8065/signup/office365/complete) under Redirect URIs. Also uncheck Allow Implicit Flow.
- Finally, click Save and complete the Application ID and Application Secret Password fields below.
",
"admin.office365.authTitle": "Auth Endpoint:",
@@ -470,8 +472,6 @@
"admin.office365.clientSecretTitle": "Application Secret Password:",
"admin.office365.tokenTitle": "Token Endpoint:",
"admin.office365.userTitle": "User API Endpoint:",
- "admin.oauth.providerDescription": "When true, Mattermost can act as an OAuth 2.0 service provider allowing Mattermost to authorize API requests from external applications.",
- "admin.oauth.providerTitle": "Enable OAuth 2.0 Service Provider: ",
"admin.password.lowercase": "At least one lowercase letter",
"admin.password.minimumLength": "Minimum Password Length:",
"admin.password.minimumLengthDescription": "Minimum number of characters required for a valid password. Must be a whole number greater than or equal to {min} and less than or equal to {max}.",
@@ -1712,6 +1712,7 @@
"user.settings.import_theme.submit": "Submit",
"user.settings.import_theme.submitError": "Invalid format, please try copying and pasting in again.",
"user.settings.languages.change": "Change interface language",
+ "user.settings.languages.promote": "Select which language Mattermost displays in the user interface.
Would like to help with translations? Join the Mattermost Translation Server to contribute.",
"user.settings.mfa.add": "Add MFA to your account",
"user.settings.mfa.addHelp": "You can require a smartphone-based token, in addition to your password, to sign into Mattermost.
To enable, download Google Authenticator from iTunes or Google Play for your phone, then
1. Click the Add MFA to your account button above.
2. Use Google Authenticator to scan the QR code that appears.
3. Type in the Token generated by Google Authenticator and click Save.
When logging in, you will be asked to enter a token from Google Authenticator in addition to your regular credentials.",
"user.settings.mfa.addHelpQr": "Please scan the bar code with the Google Authenticator app on your smartphone and fill in the token with one provided by the app.",