summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
Diffstat (limited to 'webapp')
-rw-r--r--webapp/i18n/de.json6
-rw-r--r--webapp/i18n/en.json40
-rw-r--r--webapp/i18n/es.json6
-rw-r--r--webapp/i18n/fr.json6
-rw-r--r--webapp/i18n/ja.json6
-rw-r--r--webapp/i18n/ko.json6
-rw-r--r--webapp/i18n/nl.json6
-rw-r--r--webapp/i18n/pt-BR.json6
-rw-r--r--webapp/i18n/ru.json6
-rw-r--r--webapp/i18n/zh_CN.json6
-rw-r--r--webapp/i18n/zh_TW.json6
11 files changed, 50 insertions, 50 deletions
diff --git a/webapp/i18n/de.json b/webapp/i18n/de.json
index eca1cc365..9184e38df 100644
--- a/webapp/i18n/de.json
+++ b/webapp/i18n/de.json
@@ -338,7 +338,7 @@
"admin.gitlab.userDescription": "Geben Sie https://<your-gitlab-url>/api/v3/user ein. Stellen Sie sicher, dass Sie, abhängig von Ihrer Serverkonfiguration, HTTP oder HTTPS in der URL verwenden.",
"admin.gitlab.userExample": "z.B.: \"https://<ihre-gitlab-url>/api/v3/user\"",
"admin.gitlab.userTitle": "API Endpunkt des Nutzers:",
- "admin.google.EnableHtmlDesc": "<ol><li>Mit Google Account <a target="_blank" href='https://accounts.google.com/login'>anmelden.</li><li>Wechseln Sie zu <a target="_blank" href='https://console.developers.google.com'>https://console.developers.google.com</a>, klicken Sie auf <strong>Zugangsdaten</strong> in der linken Sidebad und geben <strong>Mattermost - <your-company-name></strong> als Projektnamen an.</li><li>Klicken Sie die <strong>OAuth-Zustimmungsbildschirm</strong> Überschrift an und geben <strong>Mattermost</strong> als den <strong>Produktname, der Nutzern gezeigt wird</strong>. Klicken Sie auf <strong>Speichern</strong>.</li><li>Unter der <strong>Anmeldedaten</strong> Überschrift klicken Sie auf <strong>Anmeldedaten erstellen</strong>, wählen <strong>OAuth-Client-ID</strong> aus und selektieren <strong>Webanwendung</strong>.</li><li>Bei den <strong>Einschränkungen</strong> und den <strong>Autorisierte Weiterleitungs-URIs</strong> geben Sie <strong><your-mattermost-url>/signup/google/complete</strong> (zum Beispiel: http://localhost:8065/signup/google/complete) ein. Klicken Sie auf <strong>Erstellen</strong>.</li><li>Speichern Sie die <strong>Client-ID</strong> und den <strong>Clientschlüssel</strong> um später die unteren Felder auszufüllen.</li><li>Abschließend wechseln Sie zu <a target="_blank" href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> und klicken auf <strong>Aktivieren</strong>. Dies kann einige Minuten dauern bis die Änderung durch Googles Systeme propagiert sind.</li><li>Vervollständigen Sie die <strong>Client-ID</strong> und <strong>Clientschlüssel</strong> Felder unten.</li></ol>",
+ "admin.google.EnableHtmlDesc": "<ol><li>Mit Google Account <a target='_blank' href='https://accounts.google.com/login'>anmelden.</li><li>Wechseln Sie zu <a target='_blank' href='https://console.developers.google.com'>https://console.developers.google.com</a>, klicken Sie auf <strong>Zugangsdaten</strong> in der linken Sidebad und geben <strong>Mattermost - <your-company-name></strong> als Projektnamen an.</li><li>Klicken Sie die <strong>OAuth-Zustimmungsbildschirm</strong> Überschrift an und geben <strong>Mattermost</strong> als den <strong>Produktname, der Nutzern gezeigt wird</strong>. Klicken Sie auf <strong>Speichern</strong>.</li><li>Unter der <strong>Anmeldedaten</strong> Überschrift klicken Sie auf <strong>Anmeldedaten erstellen</strong>, wählen <strong>OAuth-Client-ID</strong> aus und selektieren <strong>Webanwendung</strong>.</li><li>Bei den <strong>Einschränkungen</strong> und den <strong>Autorisierte Weiterleitungs-URIs</strong> geben Sie <strong><your-mattermost-url>/signup/google/complete</strong> (zum Beispiel: http://localhost:8065/signup/google/complete) ein. Klicken Sie auf <strong>Erstellen</strong>.</li><li>Speichern Sie die <strong>Client-ID</strong> und den <strong>Clientschlüssel</strong> um später die unteren Felder auszufüllen.</li><li>Abschließend wechseln Sie zu <a target='_blank' href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> und klicken auf <strong>Aktivieren</strong>. Dies kann einige Minuten dauern bis die Änderung durch Googles Systeme propagiert sind.</li><li>Vervollständigen Sie die <strong>Client-ID</strong> und <strong>Clientschlüssel</strong> Felder unten.</li></ol>",
"admin.google.authTitle": "Auth Endpunkt:",
"admin.google.clientIdDescription": "Die Client-ID die Sie bei der Registrierung Ihrer Anwendung bei Google erhalten haben.",
"admin.google.clientIdExample": "z.B.: \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
@@ -512,10 +512,10 @@
"admin.oauth.google": "Google Apps",
"admin.oauth.off": "Anmelden mit OAuth 2.0 Provider nicht erlauben",
"admin.oauth.office365": "Office 365 (Beta)",
- "admin.oauth.providerDescription": "Wenn aktiviert kann Mattermost als OAuth 2.0 Dienst arbeiten. Dies erlaubt Mattermost externe Applikationen über API Aufrufe zu autorisieren. Siehe <a target="_blank" href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">Dokumentation</a> für weitere Informationen.",
+ "admin.oauth.providerDescription": "Wenn aktiviert kann Mattermost als OAuth 2.0 Dienst arbeiten. Dies erlaubt Mattermost externe Applikationen über API Aufrufe zu autorisieren. Siehe <a target='_blank' href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">Dokumentation</a> für weitere Informationen.",
"admin.oauth.providerTitle": "Aktiviere OAuth 2.0 Dienstprovider: ",
"admin.oauth.select": "OAuth 2.0 Service Provider auswählen:",
- "admin.office365.EnableHtmlDesc": "<ol><li>Melden Sie sich in Ihrem <a target="_blank" href='https://login.microsoftonline.com/'>Microsoft oder Office 365</a> Konto an. Stellen Sie sicher das der Account zum selben <a target="_blank" href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>Mandant</a> gehört mit dem sich die Nutzer anmelden können sollen.</li><li>Wechseln Sie zu <a target="_blank" href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, klicken auf <strong>App hinzufügen</strong> und verwenden <strong>Mattermost - <your-company-name></strong> als den Namen der App.</li><li>Unter <strong>Geheime Anwendungsschlüssel</strong> klicken Sie auf <strong>Generiere neues Passwort</strong> und speichern es um die Felder unten später zu vervollständigen.</li><li>Unter <strong>Platform</strong> klicken Sie auf <strong>Plattform hinzufügen</strong>, wählen <strong>Web</strong> und geben <strong><your-mattermost-url>/signup/office365/complete</strong> (zum Beispiel: http://localhost:8065/signup/office365/complete) unter <strong>Umleitungs-URI</strong> ein. Außerdem sollten Sie <strong>Erlaube Implizite Weiterleitung</strong> deaktivieren.</li><li>Abschließend klicken Sie auf <strong>Speichern</strong> und vervollständigen die <strong>Anwendungs-ID</strong> und <strong>geheimer Anwendungsschlüssel</strong> Felder unten.</li></ol>",
+ "admin.office365.EnableHtmlDesc": "<ol><li>Melden Sie sich in Ihrem <a target='_blank' href='https://login.microsoftonline.com/'>Microsoft oder Office 365</a> Konto an. Stellen Sie sicher das der Account zum selben <a target='_blank' href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>Mandant</a> gehört mit dem sich die Nutzer anmelden können sollen.</li><li>Wechseln Sie zu <a target='_blank' href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, klicken auf <strong>App hinzufügen</strong> und verwenden <strong>Mattermost - <your-company-name></strong> als den Namen der App.</li><li>Unter <strong>Geheime Anwendungsschlüssel</strong> klicken Sie auf <strong>Generiere neues Passwort</strong> und speichern es um die Felder unten später zu vervollständigen.</li><li>Unter <strong>Platform</strong> klicken Sie auf <strong>Plattform hinzufügen</strong>, wählen <strong>Web</strong> und geben <strong><your-mattermost-url>/signup/office365/complete</strong> (zum Beispiel: http://localhost:8065/signup/office365/complete) unter <strong>Umleitungs-URI</strong> ein. Außerdem sollten Sie <strong>Erlaube Implizite Weiterleitung</strong> deaktivieren.</li><li>Abschließend klicken Sie auf <strong>Speichern</strong> und vervollständigen die <strong>Anwendungs-ID</strong> und <strong>geheimer Anwendungsschlüssel</strong> Felder unten.</li></ol>",
"admin.office365.authTitle": "Auth Endpunkt:",
"admin.office365.clientIdDescription": "Die Anwendungs-ID die Sie bei der Registrierung Ihrer Anwendung bei Microsoft erhalten haben.",
"admin.office365.clientIdExample": "z.B.: \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index a007b1a1c..c7198817f 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -152,7 +152,7 @@
"admin.authentication.oauth": "OAuth 2.0",
"admin.authentication.saml": "SAML",
"admin.banner.heading": "Note:",
- "admin.cluster.enableDescription": "When true, Mattermost will run in High Availability mode. Please see <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a> to learn more about configuring High Availability for Mattermost.",
+ "admin.cluster.enableDescription": "When true, Mattermost will run in High Availability mode. Please see <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target='_blank'>documentation</a> to learn more about configuring High Availability for Mattermost.",
"admin.cluster.enableTitle": "Enable High Availability Mode:",
"admin.cluster.interNodeListenAddressDesc": "The address the server will listen on for communicating with other servers.",
"admin.cluster.interNodeListenAddressEx": "E.g.: \":8075\"",
@@ -160,9 +160,9 @@
"admin.cluster.interNodeUrlsDesc": "The internal/private URLs of all the Mattermost servers separated by commas.",
"admin.cluster.interNodeUrlsEx": "E.g.: \"http://10.10.10.30, http://10.10.10.31\"",
"admin.cluster.interNodeUrlsTitle": "Inter-Node URLs:",
- "admin.cluster.loadedFrom": "This configuration file was loaded from Node ID {clusterId}. Please see the Troubleshooting Guide in our <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a> if you are accessing the System Console through a load balancer and experiencing issues.",
+ "admin.cluster.loadedFrom": "This configuration file was loaded from Node ID {clusterId}. Please see the Troubleshooting Guide in our <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target='_blank'>documentation</a> if you are accessing the System Console through a load balancer and experiencing issues.",
"admin.cluster.noteDescription": "Changing properties in this section will require a server restart before taking effect. When High Availability mode is enabled, the System Console is set to read-only and can only be changed from the configuration file.",
- "admin.cluster.should_not_change": "WARNING: These settings may not sync with the other servers in the cluster. High Availability inter-node communication will not start until you modify the config.json to be identical on all servers and restart Mattermost. Please see the <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a> on how to add or remove a server from the cluster. If you are accessing the System Console through a load balancer and experiencing issues, please see the Troubleshooting Guide in our <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a>.",
+ "admin.cluster.should_not_change": "WARNING: These settings may not sync with the other servers in the cluster. High Availability inter-node communication will not start until you modify the config.json to be identical on all servers and restart Mattermost. Please see the <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target='_blank'>documentation</a> on how to add or remove a server from the cluster. If you are accessing the System Console through a load balancer and experiencing issues, please see the Troubleshooting Guide in our <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target='_blank'>documentation</a>.",
"admin.cluster.status_table.config_hash": "Config File MD5",
"admin.cluster.status_table.hostname": "Hostname",
"admin.cluster.status_table.id": "Node ID",
@@ -175,10 +175,10 @@
"admin.compliance.directoryTitle": "Compliance Report Directory:",
"admin.compliance.enableDailyDesc": "When true, Mattermost will generate a daily compliance report.",
"admin.compliance.enableDailyTitle": "Enable Daily Report:",
- "admin.compliance.enableDesc": "When true, Mattermost allows compliance reporting from the <strong>Compliance and Auditing</strong> tab. See <a href=\"https://docs.mattermost.com/administration/compliance.html\" target=\"_blank\">documentation</a> to learn more.",
+ "admin.compliance.enableDesc": "When true, Mattermost allows compliance reporting from the <strong>Compliance and Auditing</strong> tab. See <a href=\"https://docs.mattermost.com/administration/compliance.html\" target='_blank'>documentation</a> to learn more.",
"admin.compliance.enableTitle": "Enable Compliance Reporting:",
"admin.compliance.false": "false",
- "admin.compliance.noLicense": "<h4 class=\"banner__heading\">Note:</h4><p>Compliance is an enterprise feature. Your current license does not support Compliance. Click <a href=\"http://mattermost.com\" target=\"_blank\">here</a> for information and pricing on enterprise licenses.</p>",
+ "admin.compliance.noLicense": "<h4 class=\"banner__heading\">Note:</h4><p>Compliance is an enterprise feature. Your current license does not support Compliance. Click <a href=\"http://mattermost.com\" target='_blank'>here</a> for information and pricing on enterprise licenses.</p>",
"admin.compliance.save": "Save",
"admin.compliance.saving": "Saving Config...",
"admin.compliance.title": "Compliance Settings",
@@ -233,7 +233,7 @@
"admin.customization.support": "Legal and Support",
"admin.database.title": "Database Settings",
"admin.developer.title": "Developer Settings",
- "admin.email.agreeHPNS": " I understand and accept the Mattermost Hosted Push Notification Service <a href=\"https://about.mattermost.com/hpns-terms/\" target=\"_blank\">Terms of Service</a> and <a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">Privacy Policy</a>.",
+ "admin.email.agreeHPNS": " I understand and accept the Mattermost Hosted Push Notification Service <a href=\"https://about.mattermost.com/hpns-terms/\" target='_blank'>Terms of Service</a> and <a href=\"https://about.mattermost.com/hpns-privacy/\" target='_blank'>Privacy Policy</a>.",
"admin.email.allowEmailSignInDescription": "When true, Mattermost allows users to sign in using their email and password.",
"admin.email.allowEmailSignInTitle": "Enable sign-in with email: ",
"admin.email.allowSignupDescription": "When true, Mattermost allows team creation and account signup using email and password. This value should be false only when you want to limit signup to a single-sign-on service like OAuth or AD/LDAP.",
@@ -241,7 +241,7 @@
"admin.email.allowUsernameSignInDescription": "When true, Mattermost allows users to sign in using their username and password. This setting is typically only used when email verification is disabled.",
"admin.email.allowUsernameSignInTitle": "Enable sign-in with username: ",
"admin.email.connectionSecurityTest": "Test Connection",
- "admin.email.easHelp": "Learn more about compiling and deploying your own mobile apps from an <a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target=\"_blank\">Enterprise App Store</a>.",
+ "admin.email.easHelp": "Learn more about compiling and deploying your own mobile apps from an <a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target='_blank'>Enterprise App Store</a>.",
"admin.email.emailFail": "Connection unsuccessful: {error}",
"admin.email.emailSuccess": "No errors were reported while sending an email. Please check your inbox to make sure.",
"admin.email.enableEmailBatching.clusterEnabled": "Email batching cannot be enabled when High Availability mode is enabled.",
@@ -254,9 +254,9 @@
"admin.email.inviteSaltExample": "E.g.: \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
"admin.email.inviteSaltTitle": "Email Invite Salt:",
"admin.email.mhpns": "Use encrypted, production-quality HPNS connection to iOS and Android apps",
- "admin.email.mhpnsHelp": "Download <a href=\"https://itunes.apple.com/us/app/mattermost/id984966508?mt=8\" target=\"_blank\">Mattermost iOS app</a> from iTunes. Download <a href=\"https://play.google.com/store/apps/details?id=com.mattermost.mattermost&hl=en\" target=\"_blank\">Mattermost Android app</a> from Google Play. Learn more about <a href=\"http://docs.mattermost.com/deployment/push.html#hosted-push-notifications-service-hpns\" target=\"_blank\">HPNS</a>.",
+ "admin.email.mhpnsHelp": "Download <a href=\"https://itunes.apple.com/us/app/mattermost/id984966508?mt=8\" target='_blank'>Mattermost iOS app</a> from iTunes. Download <a href=\"https://play.google.com/store/apps/details?id=com.mattermost.mattermost&hl=en\" target='_blank'>Mattermost Android app</a> from Google Play. Learn more about <a href=\"http://docs.mattermost.com/deployment/push.html#hosted-push-notifications-service-hpns\" target='_blank'>HPNS</a>.",
"admin.email.mtpns": "Use iOS and Android apps on iTunes and Google Play with TPNS",
- "admin.email.mtpnsHelp": "Download <a href=\"https://itunes.apple.com/us/app/mattermost/id984966508?mt=8\" target=\"_blank\">Mattermost iOS app</a> from iTunes. Download <a href=\"https://play.google.com/store/apps/details?id=com.mattermost.mattermost&hl=en\" target=\"_blank\">Mattermost Android app</a> from Google Play. Learn more about <a href=\"http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns\" target=\"_blank\">TPNS</a>.",
+ "admin.email.mtpnsHelp": "Download <a href=\"https://itunes.apple.com/us/app/mattermost/id984966508?mt=8\" target='_blank'>Mattermost iOS app</a> from iTunes. Download <a href=\"https://play.google.com/store/apps/details?id=com.mattermost.mattermost&hl=en\" target='_blank'>Mattermost Android app</a> from Google Play. Learn more about <a href=\"http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns\" target='_blank'>TPNS</a>.",
"admin.email.nofificationOrganizationExample": "Ex. \"© ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA\"",
"admin.email.notificationDisplayDescription": "Display name on email account used when sending notification emails from Mattermost.",
"admin.email.notificationDisplayExample": "Ex: \"Mattermost Notification\", \"System\", \"No-Reply\"",
@@ -275,7 +275,7 @@
"admin.email.pushContentTitle": "Push Notification Contents:",
"admin.email.pushDesc": "Typically set to true in production. When true, Mattermost attempts to send iOS and Android push notifications through the push notification server.",
"admin.email.pushOff": "Do not send push notifications",
- "admin.email.pushOffHelp": "Please see <a href=\"http://docs.mattermost.com/deployment/push.html#push-notifications-and-mobile-devices\" target=\"_blank\">documentation on push notifications</a> to learn more about setup options.",
+ "admin.email.pushOffHelp": "Please see <a href=\"http://docs.mattermost.com/deployment/push.html#push-notifications-and-mobile-devices\" target='_blank'>documentation on push notifications</a> to learn more about setup options.",
"admin.email.pushServerDesc": "Location of Mattermost push notification service you can set up behind your firewall using https://github.com/mattermost/push-proxy. For testing you can use http://push-test.mattermost.com, which connects to the sample Mattermost iOS app in the public Apple AppStore. Please do not use test service for production deployments.",
"admin.email.pushServerEx": "E.g.: \"http://push-test.mattermost.com\"",
"admin.email.pushServerTitle": "Push Notification Server:",
@@ -344,7 +344,7 @@
"admin.gitlab.userDescription": "Enter https://<your-gitlab-url>/api/v3/user. Make sure you use HTTP or HTTPS in your URL depending on your server configuration.",
"admin.gitlab.userExample": "E.g.: \"https://<your-gitlab-url>/api/v3/user\"",
"admin.gitlab.userTitle": "User API Endpoint:",
- "admin.google.EnableHtmlDesc": "<ol><li><a target=\"_blank\" href='https://accounts.google.com/login'>Log in</a> to your Google account.</li><li>Go to <a target=\"_blank\" href='https://console.developers.google.com'>https://console.developers.google.com</a>, click <strong>Credentials</strong> in the left hand sidebar and enter \"Mattermost - your-company-name\" as the <strong>Project Name</strong>, then click <strong>Create</strong>.</li><li>Click the <strong>OAuth consent screen</strong> header and enter \"Mattermost\" as the <strong>Product name shown to users</strong>, then click <strong>Save</strong>.</li><li>Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.</li><li>Under <strong>Restrictions</strong> and <strong>Authorized redirect URIs</strong> enter <strong>your-mattermost-url/signup/google/complete</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.</li><li>Paste the <strong>Client ID</strong> and <strong>Client Secret</strong> to the fields below, then click <strong>Save</strong>.</li><li>Finally, go to <a target=\"_blank\" href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> and click <strong>Enable</strong>. This might take a few minutes to propagate through Google's systems.</li></ol>",
+ "admin.google.EnableHtmlDesc": "<ol><li><a target='_blank' href='https://accounts.google.com/login'>Log in</a> to your Google account.</li><li>Go to <a target='_blank' href='https://console.developers.google.com'>https://console.developers.google.com</a>, click <strong>Credentials</strong> in the left hand sidebar and enter \"Mattermost - your-company-name\" as the <strong>Project Name</strong>, then click <strong>Create</strong>.</li><li>Click the <strong>OAuth consent screen</strong> header and enter \"Mattermost\" as the <strong>Product name shown to users</strong>, then click <strong>Save</strong>.</li><li>Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.</li><li>Under <strong>Restrictions</strong> and <strong>Authorized redirect URIs</strong> enter <strong>your-mattermost-url/signup/google/complete</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.</li><li>Paste the <strong>Client ID</strong> and <strong>Client Secret</strong> to the fields below, then click <strong>Save</strong>.</li><li>Finally, go to <a target='_blank' href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> and click <strong>Enable</strong>. This might take a few minutes to propagate through Google's systems.</li></ol>",
"admin.google.authTitle": "Auth Endpoint:",
"admin.google.clientIdDescription": "The Client ID you received when registering your application with Google.",
"admin.google.clientIdExample": "E.g.: \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
@@ -437,7 +437,7 @@
"admin.ldap.nicknameAttrDesc": "(Optional) The attribute in the AD/LDAP server that will be used to populate the nickname of users in Mattermost. When set, users will not be able to edit their nickname, since it is synchronized with the LDAP server. When left blank, users can set their own nickname in Account Settings.",
"admin.ldap.nicknameAttrEx": "E.g.: \"nickname\"",
"admin.ldap.nicknameAttrTitle": "Nickname Attribute:",
- "admin.ldap.noLicense": "<h4 class=\"banner__heading\">Note:</h4><p>AD/LDAP is an enterprise feature. Your current license does not support AD/LDAP. Click <a href=\"http://mattermost.com\" target=\"_blank\">here</a> for information and pricing on enterprise licenses.</p>",
+ "admin.ldap.noLicense": "<h4 class=\"banner__heading\">Note:</h4><p>AD/LDAP is an enterprise feature. Your current license does not support AD/LDAP. Click <a href=\"http://mattermost.com\" target='_blank'>here</a> for information and pricing on enterprise licenses.</p>",
"admin.ldap.portDesc": "The port Mattermost will use to connect to the AD/LDAP server. Default is 389.",
"admin.ldap.portEx": "E.g.: \"389\"",
"admin.ldap.portTitle": "AD/LDAP Port:",
@@ -473,12 +473,12 @@
"admin.license.title": "Edition and License",
"admin.license.type": "License: ",
"admin.license.upload": "Upload",
- "admin.license.uploadDesc": "Upload a license key for Mattermost Enterprise Edition to upgrade this server. <a href=\"http://mattermost.com\" target=\"_blank\">Visit us online</a> to learn more about the benefits of Enterprise Edition or to purchase a key.",
+ "admin.license.uploadDesc": "Upload a license key for Mattermost Enterprise Edition to upgrade this server. <a href=\"http://mattermost.com\" target='_blank'>Visit us online</a> to learn more about the benefits of Enterprise Edition or to purchase a key.",
"admin.license.uploading": "Uploading License...",
"admin.log.consoleDescription": "Typically set to false in production. Developers may set this field to true to output log messages to console based on the console level option. If true, server writes messages to the standard output stream (stdout).",
"admin.log.consoleTitle": "Output logs to console: ",
"admin.log.enableDiagnostics": "Enable Diagnostics and Error Reporting:",
- "admin.log.enableDiagnosticsDescription": "Enable this feature to improve the quality and performance of Mattermost by sending error reporting and diagnostic information to Mattermost, Inc. Read our <a href=\"https://about.mattermost.com/default-privacy-policy/\" target=\"_blank\">privacy policy</a> to learn more.",
+ "admin.log.enableDiagnosticsDescription": "Enable this feature to improve the quality and performance of Mattermost by sending error reporting and diagnostic information to Mattermost, Inc. Read our <a href=\"https://about.mattermost.com/default-privacy-policy/\" target='_blank'>privacy policy</a> to learn more.",
"admin.log.enableWebhookDebugging": "Enable Webhook Debugging:",
"admin.log.enableWebhookDebuggingDescription": "You can set this to false to disable the debug logging of all incoming webhook request bodies.",
"admin.log.fileDescription": "Typically set to true in production. When true, log files are written to the log file specified in file location field below.",
@@ -502,7 +502,7 @@
"admin.log.logSettings": "Log Settings",
"admin.logs.reload": "Reload",
"admin.logs.title": "Server Logs",
- "admin.metrics.enableDescription": "When true, Mattermost will enable performance monitoring collection and profiling. Please see <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target=\"_blank\">documentation</a> to learn more about configuring performance monitoring for Mattermost.",
+ "admin.metrics.enableDescription": "When true, Mattermost will enable performance monitoring collection and profiling. Please see <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>documentation</a> to learn more about configuring performance monitoring for Mattermost.",
"admin.metrics.enableTitle": "Enable Performance Monitoring:",
"admin.metrics.listenAddressDesc": "The address the server will listen on to expose performance metrics.",
"admin.metrics.listenAddressEx": "Ex \":8067\"",
@@ -518,10 +518,10 @@
"admin.oauth.google": "Google Apps",
"admin.oauth.off": "Do not allow sign-in via an OAuth 2.0 provider",
"admin.oauth.office365": "Office 365 (Beta)",
- "admin.oauth.providerDescription": "When true, Mattermost can act as an OAuth 2.0 service provider allowing Mattermost to authorize API requests from external applications. See <a target=\"_blank\" href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">documentation</a> to learn more.",
+ "admin.oauth.providerDescription": "When true, Mattermost can act as an OAuth 2.0 service provider allowing Mattermost to authorize API requests from external applications. See <a target='_blank' href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">documentation</a> to learn more.",
"admin.oauth.providerTitle": "Enable OAuth 2.0 Service Provider: ",
"admin.oauth.select": "Select OAuth 2.0 service provider:",
- "admin.office365.EnableHtmlDesc": "<ol><li><a target=\"_blank\" href='https://login.microsoftonline.com/'>Log in</a> to your Microsoft or Office 365 account. Make sure it's the account on the same <a target=\"_blank\" href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>tenant</a> that you would like users to log in with.</li><li>Go to <a target=\"_blank\" href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, click <strong>Go to app list</strong> > <strong>Add an app</strong> and use \"Mattermost - your-company-name\" as the <strong>Application Name</strong>.</li><li>Under <strong>Application Secrets</strong>, click <strong>Generate New Password</strong> and paste it to the <strong>Application Secret Password</strong> field below.</li><li>Under <strong>Platforms</strong>, click <strong>Add Platform</strong>, choose <strong>Web</strong> and enter <strong>your-mattermost-url/signup/office365/complete</strong> (example: http://localhost:8065/signup/office365/complete) under <strong>Redirect URIs</strong>. Also uncheck <strong>Allow Implicit Flow</strong>.</li><li>Finally, click <strong>Save</strong> and then paste the <strong>Application ID</strong> below.</li></ol>",
+ "admin.office365.EnableHtmlDesc": "<ol><li><a target='_blank' href='https://login.microsoftonline.com/'>Log in</a> to your Microsoft or Office 365 account. Make sure it's the account on the same <a target='_blank' href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>tenant</a> that you would like users to log in with.</li><li>Go to <a target='_blank' href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, click <strong>Go to app list</strong> > <strong>Add an app</strong> and use \"Mattermost - your-company-name\" as the <strong>Application Name</strong>.</li><li>Under <strong>Application Secrets</strong>, click <strong>Generate New Password</strong> and paste it to the <strong>Application Secret Password</strong> field below.</li><li>Under <strong>Platforms</strong>, click <strong>Add Platform</strong>, choose <strong>Web</strong> and enter <strong>your-mattermost-url/signup/office365/complete</strong> (example: http://localhost:8065/signup/office365/complete) under <strong>Redirect URIs</strong>. Also uncheck <strong>Allow Implicit Flow</strong>.</li><li>Finally, click <strong>Save</strong> and then paste the <strong>Application ID</strong> below.</li></ol>",
"admin.office365.authTitle": "Auth Endpoint:",
"admin.office365.clientIdDescription": "The Application/Client ID you received when registering your application with Microsoft.",
"admin.office365.clientIdExample": "E.g.: \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
@@ -658,10 +658,10 @@
"admin.service.developerTitle": "Enable Developer Mode: ",
"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.",
+ "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.",
"admin.service.googleExample": "E.g.: \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
"admin.service.googleTitle": "Google API Key:",
- "admin.service.iconDescription": "When true, webhooks, slash commands and other integrations, such as <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>, will be allowed to change the profile picture they post with. Note: Combined with allowing integrations to override usernames, users may be able to perform phishing attacks by attempting to impersonate other users.",
+ "admin.service.iconDescription": "When true, webhooks, slash commands and other integrations, such as <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target='_blank'>Zapier</a>, will be allowed to change the profile picture they post with. Note: Combined with allowing integrations to override usernames, users may be able to perform phishing attacks by attempting to impersonate other users.",
"admin.service.iconTitle": "Enable integrations to override profile picture icons:",
"admin.service.insecureTlsDesc": "When true, any outgoing HTTPS requests will accept unverified, self-signed certificates. For example, outgoing webhooks to a server with a self-signed TLS certificate, using any domain, will be allowed. Note that this makes these connections susceptible to man-in-the-middle attacks.",
"admin.service.insecureTlsTitle": "Enable Insecure Outgoing Connections: ",
@@ -680,7 +680,7 @@
"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.",
"admin.service.outWebhooksTitle": "Enable Outgoing Webhooks: ",
- "admin.service.overrideDescription": "When true, webhooks, slash commands and other integrations, such as <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>, will be allowed to change the username they are posting as. Note: Combined with allowing integrations to override profile picture icons, users may be able to perform phishing attacks by attempting to impersonate other users.",
+ "admin.service.overrideDescription": "When true, webhooks, slash commands and other integrations, such as <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target='_blank'>Zapier</a>, will be allowed to change the username they are posting as. Note: Combined with allowing integrations to override profile picture icons, users may be able to perform phishing attacks by attempting to impersonate other users.",
"admin.service.overrideTitle": "Enable integrations to override usernames:",
"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.",
diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json
index c50a4b3c7..f13bfb9d6 100644
--- a/webapp/i18n/es.json
+++ b/webapp/i18n/es.json
@@ -338,7 +338,7 @@
"admin.gitlab.userDescription": "Ingresar <tu-url-de-gitlab>/api/v3/user. Asegurate que si utilizas HTTPS o HTTPS tus URLS sean correctas.",
"admin.gitlab.userExample": "Ej \"https://<tu-url-de-gitlab>/api/v3/user\"",
"admin.gitlab.userTitle": "URL para obtener datos de usuario:",
- "admin.google.EnableHtmlDesc": "<ol><li><a target="_blank" href='https://accounts.google.com/login'>Inicia sesión</a> con tu cuenta de Google.</li><li>Dirigete a <a target="_blank" href='https://console.developers.google.com'>https://console.developers.google.com</a>, haz clic en <strong>Credenciales</strong> en la barra lateral izquierda e ingresa \"Mattermost - el-nombre-de-tu-empresa\" como el <strong>Nombre del Proyecto</strong>, luego haz clic en <strong>Crear</strong>.</li><li>Haz clic en el encabezado de <strong>Pantalla de autorización de OAuth</strong> e ingresa \"Mattermost\" como el <strong>Nombre de producto mostrado a los usuarios</strong>, luego haz clic en <strong>Guardar</strong>.</li><li>En el encabezado de <strong>Credenciales</strong>, haz clic en <strong>Crear credenciales</strong>, escoge <strong>ID de cliente de OAuth</strong> y selecciona <strong>Web</strong>.</li><li>En <strong>Restricciones</strong> y <strong>URIs de redireccionamiento autorizados</strong> ingresa <strong>tu-url-de-mattermost/signup/google/complete</strong> (ejemplo: http://localhost:8065/signup/google/complete). Haz clic en <strong>Crear</strong>.</li><li>Pega el <strong>ID de Cliente</strong> y el <strong>Secreto de Cliente</strong> en los campos que se encuentran en la parte inferior, luego haz clic en <strong>Guardar</strong>.</li><li>Finalmente, dirigete a <a target="_blank" href='https://console.developers.google.com/apis/plus/overview'>Google+ API</a> y haz clic en <strong>Habilitar</strong>. Puede que esta acción tome unos minutos en propagarse por los sistemas de Google.</li></ol>",
+ "admin.google.EnableHtmlDesc": "<ol><li><a target='_blank' href='https://accounts.google.com/login'>Inicia sesión</a> con tu cuenta de Google.</li><li>Dirigete a <a target='_blank' href='https://console.developers.google.com'>https://console.developers.google.com</a>, haz clic en <strong>Credenciales</strong> en la barra lateral izquierda e ingresa \"Mattermost - el-nombre-de-tu-empresa\" como el <strong>Nombre del Proyecto</strong>, luego haz clic en <strong>Crear</strong>.</li><li>Haz clic en el encabezado de <strong>Pantalla de autorización de OAuth</strong> e ingresa \"Mattermost\" como el <strong>Nombre de producto mostrado a los usuarios</strong>, luego haz clic en <strong>Guardar</strong>.</li><li>En el encabezado de <strong>Credenciales</strong>, haz clic en <strong>Crear credenciales</strong>, escoge <strong>ID de cliente de OAuth</strong> y selecciona <strong>Web</strong>.</li><li>En <strong>Restricciones</strong> y <strong>URIs de redireccionamiento autorizados</strong> ingresa <strong>tu-url-de-mattermost/signup/google/complete</strong> (ejemplo: http://localhost:8065/signup/google/complete). Haz clic en <strong>Crear</strong>.</li><li>Pega el <strong>ID de Cliente</strong> y el <strong>Secreto de Cliente</strong> en los campos que se encuentran en la parte inferior, luego haz clic en <strong>Guardar</strong>.</li><li>Finalmente, dirigete a <a target='_blank' href='https://console.developers.google.com/apis/plus/overview'>Google+ API</a> y haz clic en <strong>Habilitar</strong>. Puede que esta acción tome unos minutos en propagarse por los sistemas de Google.</li></ol>",
"admin.google.authTitle": "URL para autentificación:",
"admin.google.clientIdDescription": "El ID de Cliente que recibiste al registrar la aplicación con Google.",
"admin.google.clientIdExample": "Ej.: \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
@@ -512,10 +512,10 @@
"admin.oauth.google": "Google Apps",
"admin.oauth.off": "No permitir el inicio de sesión por medio de un proveedor de OAuth 2.0",
"admin.oauth.office365": "Office 365 (Beta)",
- "admin.oauth.providerDescription": "Cuando es verdadero, Mattermost puede actuar como un proveedor de servicios de OAuth 2.0 permitiendo a que Mattermost autorice las solicitudes de API de aplicaciones externas. Ver la<a target="_blank" href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">documentación</a> para obtener más información.",
+ "admin.oauth.providerDescription": "Cuando es verdadero, Mattermost puede actuar como un proveedor de servicios de OAuth 2.0 permitiendo a que Mattermost autorice las solicitudes de API de aplicaciones externas. Ver la<a target='_blank' href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">documentación</a> para obtener más información.",
"admin.oauth.providerTitle": "Habilitar el Proveedor de Servicios de OAuth 2.0: ",
"admin.oauth.select": "Selecciona un proveedor de servicio de OAuth 2.0",
- "admin.office365.EnableHtmlDesc": "<ol><li><a target="_blank" href='https://login.microsoftonline.com/'>Inicia sesión</a> con tu cuenta de Microsoft u Office 365. Asegura que la cuenta sea un <a target="_blank" href='https://msdn.microsoft.com/es-es/library/azure/jj573650.aspx#Anchor_0'>inquilino de Azure AD</a> para que los usuarios puedan iniciar sesión.</li><li>Dirígete a <a target="_blank" href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>. haz clic en <strong>Ir a la lista de aplicaciones</strong> > <strong>Agregar una aplicación</strong> y utiliza \"Mattermost - el-nombre-de-tu-empresa\" como el <strong>Nombre de la aplicación</strong>.</li><li>Bajo <strong>Secretos de aplicación</strong>, haz clic en <strong>Generar nueva contraseña</strong> y pegala en el campo inferior <strong>Contraseña Secreta de la Aplicación</strong>.</li><li>Bajo <strong>Plataformas</strong>, haz clic en <strong>Agregar plataforma</strong>, selecciona <strong>Web</strong> e ingresa <strong>url-de-tu-mattermost/signup/office365/complete</strong> (ejemplo: http://localhost:8065/signup/office365/complete) en <strong>URI de redireccionamiento</strong>. Tambíen desmarca <strong>Permitir flujo implícito</strong>.</li><li>Finalmente, haz clic en <strong>Guardar</strong> y pega el <strong>ID de aplicación</strong> en el campo inferior.</li></ol>",
+ "admin.office365.EnableHtmlDesc": "<ol><li><a target='_blank' href='https://login.microsoftonline.com/'>Inicia sesión</a> con tu cuenta de Microsoft u Office 365. Asegura que la cuenta sea un <a target='_blank' href='https://msdn.microsoft.com/es-es/library/azure/jj573650.aspx#Anchor_0'>inquilino de Azure AD</a> para que los usuarios puedan iniciar sesión.</li><li>Dirígete a <a target='_blank' href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>. haz clic en <strong>Ir a la lista de aplicaciones</strong> > <strong>Agregar una aplicación</strong> y utiliza \"Mattermost - el-nombre-de-tu-empresa\" como el <strong>Nombre de la aplicación</strong>.</li><li>Bajo <strong>Secretos de aplicación</strong>, haz clic en <strong>Generar nueva contraseña</strong> y pegala en el campo inferior <strong>Contraseña Secreta de la Aplicación</strong>.</li><li>Bajo <strong>Plataformas</strong>, haz clic en <strong>Agregar plataforma</strong>, selecciona <strong>Web</strong> e ingresa <strong>url-de-tu-mattermost/signup/office365/complete</strong> (ejemplo: http://localhost:8065/signup/office365/complete) en <strong>URI de redireccionamiento</strong>. Tambíen desmarca <strong>Permitir flujo implícito</strong>.</li><li>Finalmente, haz clic en <strong>Guardar</strong> y pega el <strong>ID de aplicación</strong> en el campo inferior.</li></ol>",
"admin.office365.authTitle": "URL para autentificación:",
"admin.office365.clientIdDescription": "El ID de Aplicación/Cliente que recibiste al registrar la aplicación con Microsoft.",
"admin.office365.clientIdExample": "Ej.: \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
diff --git a/webapp/i18n/fr.json b/webapp/i18n/fr.json
index 37cf3648d..d2cf6e6db 100644
--- a/webapp/i18n/fr.json
+++ b/webapp/i18n/fr.json
@@ -338,7 +338,7 @@
"admin.gitlab.userDescription": "Saisissez https://<your-gitlab-url>/api/v3/user. Veillez à saisir HTTP ou HTTPS dans l'URL suivant votre configuration.",
"admin.gitlab.userExample": "Ex. : \"https://<your-gitlab-url>/api/v3/user\"",
"admin.gitlab.userTitle": "URL de l'API (User API endpoint) :",
- "admin.google.EnableHtmlDesc": "<ol><li><a target="_blank" href='https://accounts.google.com/login'>Conectez-vous</a> à votre compte Google.</li><li>Allez à <a target="_blank" href='https://console.developers.google.com'>https://console.developers.google.com</a>, cliquez sur <strong>Credentials</strong> dans la barre latérale de gauche et saisissez \"Mattermost - votre-nom-d-entreprise\" comme <strong>Project Name</strong>, puis cliquez sur <strong>Create</strong>.</li><li>Cliquez sur l'entête <strong>OAuth consent screen</strong> et saisissez \"Mattermost\" comme <strong>Product name shown to users</strong>, puis cliquez sur <strong>Save</strong>.</li><li>Sous l'entête <strong>Credentials</strong>, cliquez <strong>Create credentials</strong>, choisissez <strong>OAuth client ID</strong> et sélectionnez <strong>Web Application</strong>.</li><li>Dans <strong>Restrictions</strong> et <strong>Authorized redirect URIs</strong> saisissez <strong>votre-url-mattermost/signup/google/complete</strong> (exemple: http://localhost:8065/signup/google/complete). Cliquez sur <strong>Create</strong>.</li><li>Collez le <strong>Client ID</strong> et le <strong>Client Secret</strong> dans les champs ci-dessous, puis cliquez sur <strong>Save</strong>.</li><li>Enfin, allez dans <a target="_blank" href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> et cliquez sur <strong>Enable</strong>. Ceci peut prendre plusieurs minutes pour se propager dans les systèmes de Google.</li></ol>",
+ "admin.google.EnableHtmlDesc": "<ol><li><a target='_blank' href='https://accounts.google.com/login'>Conectez-vous</a> à votre compte Google.</li><li>Allez à <a target='_blank' href='https://console.developers.google.com'>https://console.developers.google.com</a>, cliquez sur <strong>Credentials</strong> dans la barre latérale de gauche et saisissez \"Mattermost - votre-nom-d-entreprise\" comme <strong>Project Name</strong>, puis cliquez sur <strong>Create</strong>.</li><li>Cliquez sur l'entête <strong>OAuth consent screen</strong> et saisissez \"Mattermost\" comme <strong>Product name shown to users</strong>, puis cliquez sur <strong>Save</strong>.</li><li>Sous l'entête <strong>Credentials</strong>, cliquez <strong>Create credentials</strong>, choisissez <strong>OAuth client ID</strong> et sélectionnez <strong>Web Application</strong>.</li><li>Dans <strong>Restrictions</strong> et <strong>Authorized redirect URIs</strong> saisissez <strong>votre-url-mattermost/signup/google/complete</strong> (exemple: http://localhost:8065/signup/google/complete). Cliquez sur <strong>Create</strong>.</li><li>Collez le <strong>Client ID</strong> et le <strong>Client Secret</strong> dans les champs ci-dessous, puis cliquez sur <strong>Save</strong>.</li><li>Enfin, allez dans <a target='_blank' href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> et cliquez sur <strong>Enable</strong>. Ceci peut prendre plusieurs minutes pour se propager dans les systèmes de Google.</li></ol>",
"admin.google.authTitle": "URL d'authentification (auth endpoint) :",
"admin.google.clientIdDescription": "Le Client ID que vous avez reçu lorsque vous avez enregistré l'application avec Google.",
"admin.google.clientIdExample": "Ex. : \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
@@ -512,10 +512,10 @@
"admin.oauth.google": "Google Apps",
"admin.oauth.off": "Ne pas autoriser la connexion à travers un fournisseur OAuth 2.0",
"admin.oauth.office365": "Office 365 (Beta)",
- "admin.oauth.providerDescription": "Si activé, Mattermost peut se comporter comme un fournisseur de service OAuth 2.0 permettant à Mattermost d'autoriser les requêtes d'API provenant des applications tierces. Voir la <a target="_blank" href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">documentation</a> pour en apprendre davantage.",
+ "admin.oauth.providerDescription": "Si activé, Mattermost peut se comporter comme un fournisseur de service OAuth 2.0 permettant à Mattermost d'autoriser les requêtes d'API provenant des applications tierces. Voir la <a target='_blank' href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">documentation</a> pour en apprendre davantage.",
"admin.oauth.providerTitle": "Activer le fournisseur de service OAuth 2.0 :",
"admin.oauth.select": "Choisissez un fournisseur de service OAuth 2.0 :",
- "admin.office365.EnableHtmlDesc": "<ol><li><a target="_blank" href='https://login.microsoftonline.com/'>Connectez-vous</a> à votre compte Microsoft ou Office 365. Veuillez vous assurer que le compte est sur le même <a target="_blank" href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>tenant</a> que celui avec lequel vous voulez connecter vos utilisateurs.</li><li>Allez à <a target="_blank" href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, cliquez sur <strong>Go to app list</strong> > <strong>Add an app</strong> et utilisez \"Mattermost - votre-nom-d-entreprise\" comme <strong>Application Name</strong>.</li><li>Dans <strong>Application Secrets</strong>, cliquez sur <strong>Generate New Password</strong> et collez-le en-dessous dans le champ <strong>Application Secret Password</strong>.</li><li>Sous <strong>Platforms</strong>, cliquez sur <strong>Add Platform</strong>, choisissez <strong>Web</strong> et saisissez <strong>votre-url-mattermost/signup/office365/complete</strong> (exemple: http://localhost:8065/signup/office365/complete) sous <strong>Redirect URIs</strong>. Décochez aussi <strong>Allow Implicit Flow</strong>.</li><li>Enfin, cliquez sur <strong>Save</strong> et collez l'<strong>Application ID</strong> ci-dessous.</li></ol>",
+ "admin.office365.EnableHtmlDesc": "<ol><li><a target='_blank' href='https://login.microsoftonline.com/'>Connectez-vous</a> à votre compte Microsoft ou Office 365. Veuillez vous assurer que le compte est sur le même <a target='_blank' href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>tenant</a> que celui avec lequel vous voulez connecter vos utilisateurs.</li><li>Allez à <a target='_blank' href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, cliquez sur <strong>Go to app list</strong> > <strong>Add an app</strong> et utilisez \"Mattermost - votre-nom-d-entreprise\" comme <strong>Application Name</strong>.</li><li>Dans <strong>Application Secrets</strong>, cliquez sur <strong>Generate New Password</strong> et collez-le en-dessous dans le champ <strong>Application Secret Password</strong>.</li><li>Sous <strong>Platforms</strong>, cliquez sur <strong>Add Platform</strong>, choisissez <strong>Web</strong> et saisissez <strong>votre-url-mattermost/signup/office365/complete</strong> (exemple: http://localhost:8065/signup/office365/complete) sous <strong>Redirect URIs</strong>. Décochez aussi <strong>Allow Implicit Flow</strong>.</li><li>Enfin, cliquez sur <strong>Save</strong> et collez l'<strong>Application ID</strong> ci-dessous.</li></ol>",
"admin.office365.authTitle": "URL d'authentification (auth endpoint) :",
"admin.office365.clientIdDescription": "L'Application/Client ID que vous avez reçu lorsque vous avez enregistré l'application avec Microsoft.",
"admin.office365.clientIdExample": "Ex. : \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
diff --git a/webapp/i18n/ja.json b/webapp/i18n/ja.json
index d5d6e0ba0..12c5d8465 100644
--- a/webapp/i18n/ja.json
+++ b/webapp/i18n/ja.json
@@ -338,7 +338,7 @@
"admin.gitlab.userDescription": "https://<your-gitlab-url>/api/v3/user を入力してください。サーバーの設定によりHTTPかHTTPSかは異なりますので注意してください。",
"admin.gitlab.userExample": "例: \"https://<your-gitlab-url>/api/v3/user\"",
"admin.gitlab.userTitle": "ユーザーAPIエンドポイント:",
- "admin.google.EnableHtmlDesc": "<ol><li>あなたのGoogleアカウントに<a target="_blank" href='https://accounts.google.com/login'>ログイン</a>します。</li><li><a target="_blank" href='https://console.developers.google.com'>https://console.developers.google.com</a>へ行き、左サイドバーの<strong>認証情報</strong>をクリックし、<strong>認証情報を作成</strong>をクリックした後、<strong>プロジェクト名</strong>として\"Mattermost - 会社名\"を入力します。</li><li>ヘッダー部の<strong>OAuth同意画面</strong>をクリックし、<strong>ユーザーに表示するサービス名</strong>として\"Mattermost\"を入力し、<strong>保存</strong>をクリックします。</li><li>ヘッダー部の<strong>認証情報</strong>で、<strong>認証情報を作成</strong>をクリックし、<strong>OAuthクライアント ID</strong>を選び、<strong>ウェブアプリケーション</strong>を選択します。</li><li><strong>制限事項</strong>の<strong>承認済みのリダイレクト URI</strong>で<strong>your-mattermost-url/signup/google/complete</strong>(例: http://localhost:8065/signup/google/complete)を入力します。<strong>作成</strong>クリックします。</li><li><strong>クライアントID</strong>と<strong>クライアントシークレット</strong>を下記にペーストし、<strong>保存</strong>をクリックします。</li><li>最後に、<a target="_blank" href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a>へ行き、<strong>有効にする</strong>をクリックします。Googleのシステムに伝播するのに数分かかります。</li></ol>",
+ "admin.google.EnableHtmlDesc": "<ol><li>あなたのGoogleアカウントに<a target='_blank' href='https://accounts.google.com/login'>ログイン</a>します。</li><li><a target='_blank' href='https://console.developers.google.com'>https://console.developers.google.com</a>へ行き、左サイドバーの<strong>認証情報</strong>をクリックし、<strong>認証情報を作成</strong>をクリックした後、<strong>プロジェクト名</strong>として\"Mattermost - 会社名\"を入力します。</li><li>ヘッダー部の<strong>OAuth同意画面</strong>をクリックし、<strong>ユーザーに表示するサービス名</strong>として\"Mattermost\"を入力し、<strong>保存</strong>をクリックします。</li><li>ヘッダー部の<strong>認証情報</strong>で、<strong>認証情報を作成</strong>をクリックし、<strong>OAuthクライアント ID</strong>を選び、<strong>ウェブアプリケーション</strong>を選択します。</li><li><strong>制限事項</strong>の<strong>承認済みのリダイレクト URI</strong>で<strong>your-mattermost-url/signup/google/complete</strong>(例: http://localhost:8065/signup/google/complete)を入力します。<strong>作成</strong>クリックします。</li><li><strong>クライアントID</strong>と<strong>クライアントシークレット</strong>を下記にペーストし、<strong>保存</strong>をクリックします。</li><li>最後に、<a target='_blank' href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a>へ行き、<strong>有効にする</strong>をクリックします。Googleのシステムに伝播するのに数分かかります。</li></ol>",
"admin.google.authTitle": "認証エンドポイント:",
"admin.google.clientIdDescription": "Googleにアプリケーションを登録したときに受け取るクライアントIDです。",
"admin.google.clientIdExample": "例: \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
@@ -512,10 +512,10 @@
"admin.oauth.google": "Google Apps",
"admin.oauth.off": "OAuth 2.0プロバイダーを通じてのサインインは許可されていません",
"admin.oauth.office365": "Office 365(ベータ版)",
- "admin.oauth.providerDescription": "有効な場合、MattermostはOAuth 2.0サービスプロバイダーとして働き、外部のアプリケーションからのAPIリクエストを認証することできます。詳細は、<a target="_blank" href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">説明文書</a>を参照してください。",
+ "admin.oauth.providerDescription": "有効な場合、MattermostはOAuth 2.0サービスプロバイダーとして働き、外部のアプリケーションからのAPIリクエストを認証することできます。詳細は、<a target='_blank' href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">説明文書</a>を参照してください。",
"admin.oauth.providerTitle": "OAuth 2.0サービスプロバイダーを有効にする: ",
"admin.oauth.select": "OAuth 2.0サービスプロバーダーを選択する:",
- "admin.office365.EnableHtmlDesc": "<ol><li>Microsoftアカウント、もしくはOffice365アカウントに<a target="_blank" href='https://login.microsoftonline.com/'>ログイン</a>します。そのアカウントが、ユーザーにログインさせたい<a target="_blank" href='https://msdn.microsoft.com/ja-jp/library/azure/jj573650.aspx#Anchor_0'>テナント</a>と同じテナントであることを確認してください。</li><li><a target="_blank" href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>へ行き、<strong>アプリの追加</strong>をクリックし、<strong>アプリケーションの名前</strong>として\"Mattermost - 会社名\"を使用してください。</li><li><strong>アプリケーション シークレット</strong>の下にある<strong>新しいパスワードを生成</strong>をクリックし、表示されるパスワードを下記の<strong>アプリケーション秘密パスワード</strong>欄に貼り付けてください。</li><li><strong>プラットフォーム</strong>の下にある<strong>プラットフォームの追加</strong>をクリックし、<strong>ウェブ</strong>を選択した後、<strong>リダイレクト URI</strong>に<strong>your-mattermost-url/signup/office365/complete</strong>(例: http://localhost:8065/signup/office365/complete)を入力してください。また、<strong>暗黙的フローを許可する</strong>のチェックを外してください。</li><li>最後に<strong>保存</strong>をクリックして、<strong>アプリケーション ID</strong>を下記の欄に貼り付けてください。</li></ol>",
+ "admin.office365.EnableHtmlDesc": "<ol><li>Microsoftアカウント、もしくはOffice365アカウントに<a target='_blank' href='https://login.microsoftonline.com/'>ログイン</a>します。そのアカウントが、ユーザーにログインさせたい<a target='_blank' href='https://msdn.microsoft.com/ja-jp/library/azure/jj573650.aspx#Anchor_0'>テナント</a>と同じテナントであることを確認してください。</li><li><a target='_blank' href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>へ行き、<strong>アプリの追加</strong>をクリックし、<strong>アプリケーションの名前</strong>として\"Mattermost - 会社名\"を使用してください。</li><li><strong>アプリケーション シークレット</strong>の下にある<strong>新しいパスワードを生成</strong>をクリックし、表示されるパスワードを下記の<strong>アプリケーション秘密パスワード</strong>欄に貼り付けてください。</li><li><strong>プラットフォーム</strong>の下にある<strong>プラットフォームの追加</strong>をクリックし、<strong>ウェブ</strong>を選択した後、<strong>リダイレクト URI</strong>に<strong>your-mattermost-url/signup/office365/complete</strong>(例: http://localhost:8065/signup/office365/complete)を入力してください。また、<strong>暗黙的フローを許可する</strong>のチェックを外してください。</li><li>最後に<strong>保存</strong>をクリックして、<strong>アプリケーション ID</strong>を下記の欄に貼り付けてください。</li></ol>",
"admin.office365.authTitle": "認証エンドポイント:",
"admin.office365.clientIdDescription": "Microsoftにアプリケーションを登録したときに受け取るアプリケーションID/クライアントIDです。",
"admin.office365.clientIdExample": "例 \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
diff --git a/webapp/i18n/ko.json b/webapp/i18n/ko.json
index 5811158cd..5baf6f856 100644
--- a/webapp/i18n/ko.json
+++ b/webapp/i18n/ko.json
@@ -338,7 +338,7 @@
"admin.gitlab.userDescription": "GitLab 연동을 위해 다음 URL https://<your-gitlab-url>/api/v3/user 을 입력하십시오. 서버 설정에 따라 HTTP와 HTTPS 중 올바른 것을 사용하여야 합니다.",
"admin.gitlab.userExample": "예시 \"https://<your-gitlab-url>/api/v3/user\"",
"admin.gitlab.userTitle": "사용자 API 엔드포인트:",
- "admin.google.EnableHtmlDesc": "<ol><li><a target="_blank" href='https://accounts.google.com/login'>Log in</a> to your Google account.</li><li>Go to <a target="_blank" href='https://console.developers.google.com'>https://console.developers.google.com</a>, click <strong>Credentials</strong> in the left hand sidebar and enter \"Mattermost - your-company-name\" as the <strong>Project Name</strong>, then click <strong>Create</strong>.</li><li>Click the <strong>OAuth consent screen</strong> header and enter \"Mattermost\" as the <strong>Product name shown to users</strong>, then click <strong>Save</strong>.</li><li>Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.</li><li>Under <strong>Restrictions</strong> and <strong>Authorized redirect URIs</strong> enter <strong>your-mattermost-url/signup/google/complete</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.</li><li>Paste the <strong>Client ID</strong> and <strong>Client Secret</strong> to the fields below, then click <strong>Save</strong>.</li><li>Finally, go to <a target="_blank" href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> and click <strong>Enable</strong>. This might take a few minutes to propagate through Google's systems.</li></ol>",
+ "admin.google.EnableHtmlDesc": "<ol><li><a target='_blank' href='https://accounts.google.com/login'>Log in</a> to your Google account.</li><li>Go to <a target='_blank' href='https://console.developers.google.com'>https://console.developers.google.com</a>, click <strong>Credentials</strong> in the left hand sidebar and enter \"Mattermost - your-company-name\" as the <strong>Project Name</strong>, then click <strong>Create</strong>.</li><li>Click the <strong>OAuth consent screen</strong> header and enter \"Mattermost\" as the <strong>Product name shown to users</strong>, then click <strong>Save</strong>.</li><li>Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.</li><li>Under <strong>Restrictions</strong> and <strong>Authorized redirect URIs</strong> enter <strong>your-mattermost-url/signup/google/complete</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.</li><li>Paste the <strong>Client ID</strong> and <strong>Client Secret</strong> to the fields below, then click <strong>Save</strong>.</li><li>Finally, go to <a target='_blank' href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> and click <strong>Enable</strong>. This might take a few minutes to propagate through Google's systems.</li></ol>",
"admin.google.authTitle": "Auth Endpoint:",
"admin.google.clientIdDescription": "The Client ID you received when registering your application with Google.",
"admin.google.clientIdExample": "예시 \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
@@ -512,10 +512,10 @@
"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 Mattermost to authorize API requests from external applications. See <a target="_blank" href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">documentation</a> to learn more.",
+ "admin.oauth.providerDescription": "When true, Mattermost can act as an OAuth 2.0 service provider allowing Mattermost to authorize API requests from external applications. See <a target='_blank' href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">documentation</a> to learn more.",
"admin.oauth.providerTitle": "OAuth 2.0 서비스 제공자: ",
"admin.oauth.select": "Select OAuth 2.0 service provider:",
- "admin.office365.EnableHtmlDesc": "<ol><li>여러분의 마이크로소프트 또는 오피스 365 계정에 <a target="_blank" href='https://login.microsoftonline.com/'>로그인</a> 하십시요. 로그인하는 계정은 <a target="_blank" href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>테넌트</a>의 >계정과 동일해야 합니다.</li><li><a target="_blank" href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>을 방문하셔서, <strong>Go to app list</strong>의 <strong>Add an app</strong>를 클릭한 다음 \"Mattermost - 여러분의 회사 이름\"을 <strong>어플리케이션 이름</strong>으로 사용하십시요. </li><li><strong>Application Secrets</strong>에서, <strong>Generate New Password</strong>를 클릭한 다음 아래<strong>Application Secret Password</strong> 필드에 그 값을 복사하여 붙여넣으십시요.</li><li><strong>Platforms</strong>에서, <strong>Add Platform</strong>을 클릭한 다음, <strong>Web</strong>을 선택하고 <strong>your-mattermost-url/signup/office365/complete</strong> (예시: http://localhost:8065/signup/office365/complete)을 <strong>Redirect URIs</strong>에 기입하십시요. 또한 <strong>Allow Implicit Flow</strong>의 체크를 해제하십시요.</li><li>마지막으로, <strong>Save</strong>를 클릭한 다음 아래의 <strong>Application ID</strong>붙여넣으십시요.</li></ol>",
+ "admin.office365.EnableHtmlDesc": "<ol><li>여러분의 마이크로소프트 또는 오피스 365 계정에 <a target='_blank' href='https://login.microsoftonline.com/'>로그인</a> 하십시요. 로그인하는 계정은 <a target='_blank' href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>테넌트</a>의 >계정과 동일해야 합니다.</li><li><a target='_blank' href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>을 방문하셔서, <strong>Go to app list</strong>의 <strong>Add an app</strong>를 클릭한 다음 \"Mattermost - 여러분의 회사 이름\"을 <strong>어플리케이션 이름</strong>으로 사용하십시요. </li><li><strong>Application Secrets</strong>에서, <strong>Generate New Password</strong>를 클릭한 다음 아래<strong>Application Secret Password</strong> 필드에 그 값을 복사하여 붙여넣으십시요.</li><li><strong>Platforms</strong>에서, <strong>Add Platform</strong>을 클릭한 다음, <strong>Web</strong>을 선택하고 <strong>your-mattermost-url/signup/office365/complete</strong> (예시: http://localhost:8065/signup/office365/complete)을 <strong>Redirect URIs</strong>에 기입하십시요. 또한 <strong>Allow Implicit Flow</strong>의 체크를 해제하십시요.</li><li>마지막으로, <strong>Save</strong>를 클릭한 다음 아래의 <strong>Application ID</strong>붙여넣으십시요.</li></ol>",
"admin.office365.authTitle": "인증 엔드포인트:",
"admin.office365.clientIdDescription": "The Application/Client ID you received when registering your application with Microsoft.",
"admin.office365.clientIdExample": "예시 \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
diff --git a/webapp/i18n/nl.json b/webapp/i18n/nl.json
index ddda039fa..1725ce62c 100644
--- a/webapp/i18n/nl.json
+++ b/webapp/i18n/nl.json
@@ -338,7 +338,7 @@
"admin.gitlab.userDescription": "Geef https://<your-gitlab-url>/api/v3/user. Zorg ervoor dat u HTTP of HTTPS in de URL gebruikt, afhankelijk van de configuratie van uw server.",
"admin.gitlab.userExample": "Bijv.: \"https://<your-gitlab-url>/api/v3/user\"",
"admin.gitlab.userTitle": "Gebruikers API eindpunt:",
- "admin.google.EnableHtmlDesc": "<ol><li><a target="_blank" href='https://accounts.google.com/login'>Inloggen</a> op uw Google account.</li><li>Ga naar <a target="_blank" href='https://console.developers.google.com'>https://console.developers.google.com</a>, klik op <strong>Credentials</strong> in het linker menu en voer \"Mattermost - uw-bedrijfsnaam\" in als <strong>Project Name</strong>, klik daarna op <strong>Create</strong>.</li><li>Klik op <strong>OAuth consent screen</strong> en voer \"Mattermost\" in als <strong>Product name shown to users</strong>, klik daarna op <strong>Save</strong>.</li><li>Onder de kop <strong>Credentials</strong>, klik <strong>Create credentials</strong>, kies <strong>OAuth client ID</strong> en selecteer <strong>Web Application</strong>.</li><li>Onder <strong>Restrictions</strong> en <strong>Authorized redirect URIs</strong> voer in <strong>jouw-mattermost-url/signup/google/complete</strong> (bijv.: http://localhost:8065/signup/google/complete). Klik <strong>Create</strong>.</li><li>Plak de <strong>Client ID</strong> en <strong>Client Secret</strong> in onderstaande velden, klik daarna op <strong>Save</strong>.</li><li>Als laatste stap, ga naar <a target="_blank" href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> en klik <strong>Enable</strong>. Het kan een aantal minuten duren voordat het de systemen van Google actief is.</li></ol>",
+ "admin.google.EnableHtmlDesc": "<ol><li><a target='_blank' href='https://accounts.google.com/login'>Inloggen</a> op uw Google account.</li><li>Ga naar <a target='_blank' href='https://console.developers.google.com'>https://console.developers.google.com</a>, klik op <strong>Credentials</strong> in het linker menu en voer \"Mattermost - uw-bedrijfsnaam\" in als <strong>Project Name</strong>, klik daarna op <strong>Create</strong>.</li><li>Klik op <strong>OAuth consent screen</strong> en voer \"Mattermost\" in als <strong>Product name shown to users</strong>, klik daarna op <strong>Save</strong>.</li><li>Onder de kop <strong>Credentials</strong>, klik <strong>Create credentials</strong>, kies <strong>OAuth client ID</strong> en selecteer <strong>Web Application</strong>.</li><li>Onder <strong>Restrictions</strong> en <strong>Authorized redirect URIs</strong> voer in <strong>jouw-mattermost-url/signup/google/complete</strong> (bijv.: http://localhost:8065/signup/google/complete). Klik <strong>Create</strong>.</li><li>Plak de <strong>Client ID</strong> en <strong>Client Secret</strong> in onderstaande velden, klik daarna op <strong>Save</strong>.</li><li>Als laatste stap, ga naar <a target='_blank' href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> en klik <strong>Enable</strong>. Het kan een aantal minuten duren voordat het de systemen van Google actief is.</li></ol>",
"admin.google.authTitle": "Auth Eindpunt:",
"admin.google.clientIdDescription": "Het Client ID wat je hebt ontvangen bij het registreren van je applicatie bij Google.",
"admin.google.clientIdExample": "Bijv.: \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
@@ -512,10 +512,10 @@
"admin.oauth.google": "Google Apps",
"admin.oauth.off": "Sta niet toe in te loggen via een OAuth 2.0 provider",
"admin.oauth.office365": "Office 365 (Beta)",
- "admin.oauth.providerDescription": "When true, Mattermost can act as an OAuth 2.0 service provider allowing Mattermost to authorize API requests from external applications. See <a target="_blank" href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">documentation</a> to learn more.",
+ "admin.oauth.providerDescription": "When true, Mattermost can act as an OAuth 2.0 service provider allowing Mattermost to authorize API requests from external applications. See <a target='_blank' href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">documentation</a> to learn more.",
"admin.oauth.providerTitle": "Aanzetten van OAuth 2.0 Service Provider:",
"admin.oauth.select": "Selecteer OAuth 2.0 service provider:",
- "admin.office365.EnableHtmlDesc": "<ol><li><a target="_blank" href='https://login.microsoftonline.com/'>Log in</a> to your Microsoft or Office 365 account. Make sure it's the account on the same <a target="_blank" href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>tenant</a> that you would like users to log in with.</li><li>Go to <a target="_blank" href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, click <strong>Go to app list</strong> > <strong>Add an app</strong> and use \"Mattermost - your-company-name\" as the <strong>Application Name</strong>.</li><li>Under <strong>Application Secrets</strong>, click <strong>Generate New Password</strong> and paste it to the <strong>Application Secret Password</strong> field below.</li><li>Under <strong>Platforms</strong>, click <strong>Add Platform</strong>, choose <strong>Web</strong> and enter <strong>your-mattermost-url/signup/office365/complete</strong> (example: http://localhost:8065/signup/office365/complete) under <strong>Redirect URIs</strong>. Also uncheck <strong>Allow Implicit Flow</strong>.</li><li>Finally, click <strong>Save</strong> and then paste the <strong>Application ID</strong> below.</li></ol>",
+ "admin.office365.EnableHtmlDesc": "<ol><li><a target='_blank' href='https://login.microsoftonline.com/'>Log in</a> to your Microsoft or Office 365 account. Make sure it's the account on the same <a target='_blank' href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>tenant</a> that you would like users to log in with.</li><li>Go to <a target='_blank' href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, click <strong>Go to app list</strong> > <strong>Add an app</strong> and use \"Mattermost - your-company-name\" as the <strong>Application Name</strong>.</li><li>Under <strong>Application Secrets</strong>, click <strong>Generate New Password</strong> and paste it to the <strong>Application Secret Password</strong> field below.</li><li>Under <strong>Platforms</strong>, click <strong>Add Platform</strong>, choose <strong>Web</strong> and enter <strong>your-mattermost-url/signup/office365/complete</strong> (example: http://localhost:8065/signup/office365/complete) under <strong>Redirect URIs</strong>. Also uncheck <strong>Allow Implicit Flow</strong>.</li><li>Finally, click <strong>Save</strong> and then paste the <strong>Application ID</strong> below.</li></ol>",
"admin.office365.authTitle": "Auth Eindpunt:",
"admin.office365.clientIdDescription": "Het Spplicatie/Client ID wat je hebt ontvangen bij het registreren van je applicatie bij Microsoft.",
"admin.office365.clientIdExample": "Bijv.: \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
diff --git a/webapp/i18n/pt-BR.json b/webapp/i18n/pt-BR.json
index 9ed1ebf75..ed9d032f3 100644
--- a/webapp/i18n/pt-BR.json
+++ b/webapp/i18n/pt-BR.json
@@ -338,7 +338,7 @@
"admin.gitlab.userDescription": "Digite https://<sua-url-gitlab>/api/v3/user. Certifique-se de usar HTTP ou HTTPS na sua URL dependendo da configuração de seu servidor.",
"admin.gitlab.userExample": "Ex.: \"https://<sua-url-gitlab>/api/v3/user\"",
"admin.gitlab.userTitle": "API Usuário Endpoint:",
- "admin.google.EnableHtmlDesc": "<ol><li><a target="_blank" href='https://accounts.google.com/login'>Log in</a> to sua conta Google.</li><li>Ir para <a target="_blank" href='https://console.developers.google.com'>https://console.developers.google.com</a>, clique <strong>Credenciais</strong> na barra lateral esquerda e digite \"Mattermost - nome-da-sua-empresa\" como o <strong>Nome do Projeto</strong>, então clique <strong>Criar</strong>.</li><li>Clique no título <strong>tela de consentimento OAuth</strong> e digite \"Mattermost\" como o <strong>nome do Produto exibido para os usuários</strong>, então clique <strong>Salvar</strong>.</li><li>Dentro do título <strong>Credenciais</strong>, clique <strong>Criar credenciais</strong>, escolha <strong>ID do cliente OAuth</strong> e selecione <strong>Aplicação da Web</strong>.</li><li>Dentro de <strong>Restrições</strong> e <strong>URIs de redirecionamento autorizados</strong> digite <strong>sua-url-mattermost/signup/google/complete</strong> (exemplo: http://localhost:8065/signup/google/complete). Clique <strong>Criar</strong>.</li><li>Cole <strong>ID do Cliente</strong> e <strong>Chave Secreta do Cliente</strong> nos campos abaixo, então clique <strong>Salvar</strong>.</li><li>Finalmente, vá para <a target="_blank" href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> e clique <strong>Ativar</strong>. Isto pode levar alguns minutos para propagar através do si sistema do Google.</li></ol>",
+ "admin.google.EnableHtmlDesc": "<ol><li><a target='_blank' href='https://accounts.google.com/login'>Log in</a> to sua conta Google.</li><li>Ir para <a target='_blank' href='https://console.developers.google.com'>https://console.developers.google.com</a>, clique <strong>Credenciais</strong> na barra lateral esquerda e digite \"Mattermost - nome-da-sua-empresa\" como o <strong>Nome do Projeto</strong>, então clique <strong>Criar</strong>.</li><li>Clique no título <strong>tela de consentimento OAuth</strong> e digite \"Mattermost\" como o <strong>nome do Produto exibido para os usuários</strong>, então clique <strong>Salvar</strong>.</li><li>Dentro do título <strong>Credenciais</strong>, clique <strong>Criar credenciais</strong>, escolha <strong>ID do cliente OAuth</strong> e selecione <strong>Aplicação da Web</strong>.</li><li>Dentro de <strong>Restrições</strong> e <strong>URIs de redirecionamento autorizados</strong> digite <strong>sua-url-mattermost/signup/google/complete</strong> (exemplo: http://localhost:8065/signup/google/complete). Clique <strong>Criar</strong>.</li><li>Cole <strong>ID do Cliente</strong> e <strong>Chave Secreta do Cliente</strong> nos campos abaixo, então clique <strong>Salvar</strong>.</li><li>Finalmente, vá para <a target='_blank' href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> e clique <strong>Ativar</strong>. Isto pode levar alguns minutos para propagar através do si sistema do Google.</li></ol>",
"admin.google.authTitle": "Autenticação Endpoint:",
"admin.google.clientIdDescription": "A ID do Cliente que você recebeu quando registrou sua aplicação com o Google.",
"admin.google.clientIdExample": "Ex.: \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
@@ -512,10 +512,10 @@
"admin.oauth.google": "Google Apps",
"admin.oauth.off": "Não é permitido login via um provedor OAuth 2.0",
"admin.oauth.office365": "Office 365 (Beta)",
- "admin.oauth.providerDescription": "Quando verdadeiro, Mattermost pode atuar como um provedor de serviço OAuth 2.0 permitindo que o Mattermost autorize requisições de API de aplicações externas. Veja a <a target="_blank" href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">documentação</a> para saber mais.",
+ "admin.oauth.providerDescription": "Quando verdadeiro, Mattermost pode atuar como um provedor de serviço OAuth 2.0 permitindo que o Mattermost autorize requisições de API de aplicações externas. Veja a <a target='_blank' href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">documentação</a> para saber mais.",
"admin.oauth.providerTitle": "Ativar Provedor de Serviço OAuth 2.0: ",
"admin.oauth.select": "Selecione provedor de serviço OAuth 2.0:",
- "admin.office365.EnableHtmlDesc": "<ol><li><a target="_blank" href='https://login.microsoftonline.com/'>Log in</a> na sua conta Microsoft ou Office 365. Certifique-se que esta conta é do mesmo <a target="_blank" href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>tenant</a> que você gostaria que os usuários entrassem.</li><li>Vá para <a target="_blank" href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, clique <strong>Ir para lista de aplicativo</strong> > <strong>Adicionar um aplicativo</strong> e use \"Mattermost - nome-da-sua-empresa\" como <strong>Nome da Aplicação</strong>.</li><li>Dentro de <strong>Segredos do Aplicativo</strong>, clique <strong>Gerar Nova Senha</strong> copie e cole no campo abaixo <strong>Aplicativo Senha Secreta</strong>.</li><li>Dentro de <strong>Plataformas</strong>, clique <strong>Adicionar Plataforma</strong>, escolha <strong>Web</strong> e digite <strong>url-da-sua-empresa/signup/office365/complete</strong> (exemplo: http://localhost:8065/signup/office365/complete) dentro de <strong>Redirecionar URIs</strong>. Também desmarque <strong>Permitir Fluxo Implícito</strong>.</li><li>Finalmente, clique <strong>Salvar</strong> e então copie e cole no campo abaixo <strong>ID da Aplicação</strong>.</li></ol>",
+ "admin.office365.EnableHtmlDesc": "<ol><li><a target='_blank' href='https://login.microsoftonline.com/'>Log in</a> na sua conta Microsoft ou Office 365. Certifique-se que esta conta é do mesmo <a target='_blank' href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>tenant</a> que você gostaria que os usuários entrassem.</li><li>Vá para <a target='_blank' href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, clique <strong>Ir para lista de aplicativo</strong> > <strong>Adicionar um aplicativo</strong> e use \"Mattermost - nome-da-sua-empresa\" como <strong>Nome da Aplicação</strong>.</li><li>Dentro de <strong>Segredos do Aplicativo</strong>, clique <strong>Gerar Nova Senha</strong> copie e cole no campo abaixo <strong>Aplicativo Senha Secreta</strong>.</li><li>Dentro de <strong>Plataformas</strong>, clique <strong>Adicionar Plataforma</strong>, escolha <strong>Web</strong> e digite <strong>url-da-sua-empresa/signup/office365/complete</strong> (exemplo: http://localhost:8065/signup/office365/complete) dentro de <strong>Redirecionar URIs</strong>. Também desmarque <strong>Permitir Fluxo Implícito</strong>.</li><li>Finalmente, clique <strong>Salvar</strong> e então copie e cole no campo abaixo <strong>ID da Aplicação</strong>.</li></ol>",
"admin.office365.authTitle": "Autenticação Endpoint:",
"admin.office365.clientIdDescription": "O Aplicativo/ID do Cliente que você recebeu quando registrou seu aplicativo com a Microsoft.",
"admin.office365.clientIdExample": "Ex.: \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
diff --git a/webapp/i18n/ru.json b/webapp/i18n/ru.json
index ee68819d3..539ca8385 100644
--- a/webapp/i18n/ru.json
+++ b/webapp/i18n/ru.json
@@ -338,7 +338,7 @@
"admin.gitlab.userDescription": "Введите https://<your-gitlab-url>/api/v3/user. Убедитесь, используете ли вы HTTP или HTTPS в своем URL-адресе в соответствии с настройками своего сервера.",
"admin.gitlab.userExample": "Например: \"https://<your-gitlab-url>/api/v3/user\"",
"admin.gitlab.userTitle": "Конечная точка пользовательского API:",
- "admin.google.EnableHtmlDesc": "<ol><li><a target="_blank" href='https://accounts.google.com/login'>Войдите</a> в свою учетную запись Google.</li><li>Перейдите к <a target="_blank" href='https://console.developers.google.com'>https://console.developers.google.com</a>, нажмите <strong>Учетные данные</strong> в боковой панели слева и введите \"Mattermost - имя-вашей-компании\" в качестве <strong>Названия проекта</strong>, затем нажмите <strong>Создать</strong>.</li><li>Нажмите на заголовок <strong>окно запроса доступа OAuth</strong> и введите \"Mattermost\" в качестве <strong>Названия продукта, которое видят пользователи</strong>, затем нажмите <strong>Сохранить</strong>.</li><li>Под заголовком <strong>Учетные данные</strong> нажмите <strong>Создать учетные данные</strong>, выберите <strong>Идентификатор клиента OAuth</strong> и выберите <strong>Веб приложение</strong>.</li><li>Под <strong>Ограничения</strong> и <strong>Разрешенные URI перенаправления</strong> введите <strong>url-вашего-mattermost/signup/google/complete</strong> (пример: http://localhost:8065/signup/google/complete). Нажмите <strong>Создать</strong>.</li><li>Вставьте <strong>идентификатор клиента</strong> и <strong>секрет клиента</strong> в поля ниже, затем нажмите <strong>Сохранить</strong>.</li><li>Наконец, перейдите в <a target="_blank" href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> и нажмите <strong>Включить</strong>. Может потребоваться несколько минут для передачи через системы Google.</li></ol>",
+ "admin.google.EnableHtmlDesc": "<ol><li><a target='_blank' href='https://accounts.google.com/login'>Войдите</a> в свою учетную запись Google.</li><li>Перейдите к <a target='_blank' href='https://console.developers.google.com'>https://console.developers.google.com</a>, нажмите <strong>Учетные данные</strong> в боковой панели слева и введите \"Mattermost - имя-вашей-компании\" в качестве <strong>Названия проекта</strong>, затем нажмите <strong>Создать</strong>.</li><li>Нажмите на заголовок <strong>окно запроса доступа OAuth</strong> и введите \"Mattermost\" в качестве <strong>Названия продукта, которое видят пользователи</strong>, затем нажмите <strong>Сохранить</strong>.</li><li>Под заголовком <strong>Учетные данные</strong> нажмите <strong>Создать учетные данные</strong>, выберите <strong>Идентификатор клиента OAuth</strong> и выберите <strong>Веб приложение</strong>.</li><li>Под <strong>Ограничения</strong> и <strong>Разрешенные URI перенаправления</strong> введите <strong>url-вашего-mattermost/signup/google/complete</strong> (пример: http://localhost:8065/signup/google/complete). Нажмите <strong>Создать</strong>.</li><li>Вставьте <strong>идентификатор клиента</strong> и <strong>секрет клиента</strong> в поля ниже, затем нажмите <strong>Сохранить</strong>.</li><li>Наконец, перейдите в <a target='_blank' href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> и нажмите <strong>Включить</strong>. Может потребоваться несколько минут для передачи через системы Google.</li></ol>",
"admin.google.authTitle": "Конечная точка авторизации:",
"admin.google.clientIdDescription": "Идентификатор клиента, полученный при регистрации вашего приложения в Google.",
"admin.google.clientIdExample": "Например: \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
@@ -512,10 +512,10 @@
"admin.oauth.google": "Google Apps",
"admin.oauth.off": "Запретить вход через OAuth 2.0 поставщика",
"admin.oauth.office365": "Office 365 (Бета)",
- "admin.oauth.providerDescription": "Когда ИСТИНА, Mattermost может выступать в качестве сервис провайдера OAuth 2.0, позволяя Mattermost предоставлять API запросов авторизации для внешних приложений. Смотрите <a target="_blank" href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">документацию</a> для подробностей.",
+ "admin.oauth.providerDescription": "Когда ИСТИНА, Mattermost может выступать в качестве сервис провайдера OAuth 2.0, позволяя Mattermost предоставлять API запросов авторизации для внешних приложений. Смотрите <a target='_blank' href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">документацию</a> для подробностей.",
"admin.oauth.providerTitle": "Включить поставщика услуг OAuth 2.0:",
"admin.oauth.select": "Выбрать OAuth 2.0 провайдера:",
- "admin.office365.EnableHtmlDesc": "<ol><li><a target="_blank" href='https://login.microsoftonline.com/'>Войдите</a> в свою учетную запись Microsoft или Office 365. Убедитесь, что эта учетная запись принадлежит тому же <a target="_blank" href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>арендатору</a>, через которого вы хотели бы позволить пользователям вход.</li><li>Перейдите к <a target="_blank" href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, нажмите <strong>Перейти к списку приложений</strong> > <strong>Добавить приложение</strong> и используйте \"Mattermost - имя-вашей-компании\" в качестве <strong>Названия приложения</strong>.</li><li>Под <strong>Секретами приложения</strong> нажмите <strong>Создать новый пароль</strong> и вставьте его в поле <strong>Секретный пароль приложения</strong> ниже.</li><li>Под <strong>Платформами</strong> нажмите <strong>Добавление платформы</strong>, выберите <strong>Веб</strong> и введите <strong>url-вашего-mattermost/signup/office365/complete</strong> (пример: http://localhost:8065/signup/office365/complete) под <strong>URI перенаправления</strong>. Также снимите отметку с <strong>Разрешить неявный поток</strong>.</li><li>Наконец, нажмите <strong>Сохранить</strong>, а затем вставьте <strong>Код приложения</strong> ниже.</li></ol>",
+ "admin.office365.EnableHtmlDesc": "<ol><li><a target='_blank' href='https://login.microsoftonline.com/'>Войдите</a> в свою учетную запись Microsoft или Office 365. Убедитесь, что эта учетная запись принадлежит тому же <a target='_blank' href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>арендатору</a>, через которого вы хотели бы позволить пользователям вход.</li><li>Перейдите к <a target='_blank' href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, нажмите <strong>Перейти к списку приложений</strong> > <strong>Добавить приложение</strong> и используйте \"Mattermost - имя-вашей-компании\" в качестве <strong>Названия приложения</strong>.</li><li>Под <strong>Секретами приложения</strong> нажмите <strong>Создать новый пароль</strong> и вставьте его в поле <strong>Секретный пароль приложения</strong> ниже.</li><li>Под <strong>Платформами</strong> нажмите <strong>Добавление платформы</strong>, выберите <strong>Веб</strong> и введите <strong>url-вашего-mattermost/signup/office365/complete</strong> (пример: http://localhost:8065/signup/office365/complete) под <strong>URI перенаправления</strong>. Также снимите отметку с <strong>Разрешить неявный поток</strong>.</li><li>Наконец, нажмите <strong>Сохранить</strong>, а затем вставьте <strong>Код приложения</strong> ниже.</li></ol>",
"admin.office365.authTitle": "Конечная точка авторизации:",
"admin.office365.clientIdDescription": "Идентификатор приложения/клиента, полученный при регистрации вашего приложения в Microsoft.",
"admin.office365.clientIdExample": "Например: \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
diff --git a/webapp/i18n/zh_CN.json b/webapp/i18n/zh_CN.json
index 5fef8a28d..17d27b5d0 100644
--- a/webapp/i18n/zh_CN.json
+++ b/webapp/i18n/zh_CN.json
@@ -338,7 +338,7 @@
"admin.gitlab.userDescription": "输入 https://<your-gitlab-url>/api/v3/user。根据于您的服务器设定而决定网址中使用HTTP或HTTPS。",
"admin.gitlab.userExample": "例如 \"https://<your-gitlab-url>/api/v3/user\"",
"admin.gitlab.userTitle": "用户API 端点：",
- "admin.google.EnableHtmlDesc": "<ol><li><a target="_blank" href='https://accounts.google.com/login'>登入</a>到您的谷歌帐号。</li><li>到<a target="_blank" href='https://console.developers.google.com'>https://console.developers.google.com</a>，在左边导航点击<strong>凭证</strong>后输入\"Mattermost - your-company-name\"为<strong>项目名</strong>，然后点击<strong>创建</strong>。</li><li>点击<strong>OAuth 同意页面</strong>标题并输入\"Mattermost\" 做为<strong>显示给用户的产品名</strong>，然后点击<strong>保存</strong>。</li><li>在<strong>凭证</strong>标题下，点击<strong>创建凭证</strong>，选择<strong>OAuth客户端ID</strong>并选择<strong>网页应用</strong>。</li><li>在<strong>限制</strong>和<strong>经认可的重指向网址</strong>下输入<strong>your-mattermost-url/signup/google/complete</strong> (例: http://localhost:8065/signup/google/complete)。点击<strong>创建</strong>。</li><li>粘贴<strong>客户端ID</strong>和<strong>客户端秘密</strong>到以下栏，然后点击<strong>保存</strong>。</li><li>最后，到<a target="_blank" href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a>并点击<strong>启用</strong>。这可能需要几分钟时间让谷歌服务器同步数据。</li></ol>",
+ "admin.google.EnableHtmlDesc": "<ol><li><a target='_blank' href='https://accounts.google.com/login'>登入</a>到您的谷歌帐号。</li><li>到<a target='_blank' href='https://console.developers.google.com'>https://console.developers.google.com</a>，在左边导航点击<strong>凭证</strong>后输入\"Mattermost - your-company-name\"为<strong>项目名</strong>，然后点击<strong>创建</strong>。</li><li>点击<strong>OAuth 同意页面</strong>标题并输入\"Mattermost\" 做为<strong>显示给用户的产品名</strong>，然后点击<strong>保存</strong>。</li><li>在<strong>凭证</strong>标题下，点击<strong>创建凭证</strong>，选择<strong>OAuth客户端ID</strong>并选择<strong>网页应用</strong>。</li><li>在<strong>限制</strong>和<strong>经认可的重指向网址</strong>下输入<strong>your-mattermost-url/signup/google/complete</strong> (例: http://localhost:8065/signup/google/complete)。点击<strong>创建</strong>。</li><li>粘贴<strong>客户端ID</strong>和<strong>客户端秘密</strong>到以下栏，然后点击<strong>保存</strong>。</li><li>最后，到<a target='_blank' href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a>并点击<strong>启用</strong>。这可能需要几分钟时间让谷歌服务器同步数据。</li></ol>",
"admin.google.authTitle": "认证端点：",
"admin.google.clientIdDescription": "您在谷歌注册您的应用时收到的客户端ID。",
"admin.google.clientIdExample": "例如 \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
@@ -512,10 +512,10 @@
"admin.oauth.google": "Google Apps",
"admin.oauth.off": "不允许通过 OAuth 2.0 提供商登入",
"admin.oauth.office365": "Office 365 (Beta)",
- "admin.oauth.providerDescription": "当设为是时，Mattermost 可以做为 OAuth 2.0 服务提供商允许 Mattermost 给外部应用 API 请求授权。参见<a target="_blank" href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">文档</a>了解更多。",
+ "admin.oauth.providerDescription": "当设为是时，Mattermost 可以做为 OAuth 2.0 服务提供商允许 Mattermost 给外部应用 API 请求授权。参见<a target='_blank' href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">文档</a>了解更多。",
"admin.oauth.providerTitle": "启动 OAuth 2.0 服务提供商：",
"admin.oauth.select": "选择 OAuth 2.0 服务提供商：",
- "admin.office365.EnableHtmlDesc": "<ol><li><a target="_blank" href='https://login.microsoftonline.com/'>登入</a>到您的微软或Office 365帐号。确定是和您想让用户登入的同一个<a target="_blank" href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>租户</a>。</li><li>到<a target="_blank" href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>，点击<strong>转到应用列表</strong> > <strong>添加应用</strong>然后用\"Mattermost - your-company-name\"做为<strong>应用名</strong>。</li><li>在<strong>应用秘密</strong>下，点击<strong>生成新密码</strong>后粘贴到以下<strong>应用密码</strong>栏。</li><li>在<strong>平台</strong>下，点击<strong>添加平台</strong>，选择<strong>网页</strong>并在<strong>重指向网址</strong>下输入<strong>your-mattermost-url/signup/office365/complete</strong> (例: http://localhost:8065/signup/office365/complete)。同时反选择<strong>允许隐含流程</strong>。</li><li>最后，点击<strong>保存</strong>并粘贴<strong>应用ID</strong>到下方。</li></ol>",
+ "admin.office365.EnableHtmlDesc": "<ol><li><a target='_blank' href='https://login.microsoftonline.com/'>登入</a>到您的微软或Office 365帐号。确定是和您想让用户登入的同一个<a target='_blank' href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>租户</a>。</li><li>到<a target='_blank' href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>，点击<strong>转到应用列表</strong> > <strong>添加应用</strong>然后用\"Mattermost - your-company-name\"做为<strong>应用名</strong>。</li><li>在<strong>应用秘密</strong>下，点击<strong>生成新密码</strong>后粘贴到以下<strong>应用密码</strong>栏。</li><li>在<strong>平台</strong>下，点击<strong>添加平台</strong>，选择<strong>网页</strong>并在<strong>重指向网址</strong>下输入<strong>your-mattermost-url/signup/office365/complete</strong> (例: http://localhost:8065/signup/office365/complete)。同时反选择<strong>允许隐含流程</strong>。</li><li>最后，点击<strong>保存</strong>并粘贴<strong>应用ID</strong>到下方。</li></ol>",
"admin.office365.authTitle": "认证端点：",
"admin.office365.clientIdDescription": "您在微软注册您的应用时收到的应用/客户端ID。",
"admin.office365.clientIdExample": "例如 \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
diff --git a/webapp/i18n/zh_TW.json b/webapp/i18n/zh_TW.json
index 558afc574..767a29526 100644
--- a/webapp/i18n/zh_TW.json
+++ b/webapp/i18n/zh_TW.json
@@ -338,7 +338,7 @@
"admin.gitlab.userDescription": "輸入 https://<your-gitlab-url>/api/v3/user。請根據伺服器設定選擇 HTTP 或 HTTPS。",
"admin.gitlab.userExample": "如：\"https://<your-gitlab-url>/api/v3/user\"",
"admin.gitlab.userTitle": "使用者 API 端點：",
- "admin.google.EnableHtmlDesc": "<ol><li><a target="_blank" href='https://accounts.google.com/login'>登入</a> Google帳號。</li><li>前往 <a target="_blank" href='https://console.developers.google.com'>https://console.developers.google.com</a>，按左側邊列的<strong>憑證</strong>並輸入\"Mattermost - 您的公司名稱\"作為<strong>專案名稱</strong>，按<strong>建立</strong>。</li><li>按 <strong>OAuth 同意畫面</strong> 標題並輸入 \"Mattermost\" 作為 <strong>向使用者顯示的產品名稱</strong>。 按 <strong>儲存</strong> 。</li><li>在 <strong>憑證</strong> 標題下，按 <strong>建立憑證</strong>，選擇 <strong>OAuth 用戶端 ID</strong> 並選擇 <strong>網路應用程式</strong>。</li><li>在 <strong>限制</strong> 的 <strong>已授權的重新導向 URI</strong> 中輸入 <strong>您的 Mattermost 網址/signup/google/complete</strong> (如： http://localhost:8065/signup/google/complete)。 按 <strong>建立</strong>。</li><li>將 <strong>用戶端 ID</strong> 跟 <strong>用戶端密鑰</strong> 貼至下面的欄位，按下<strong>儲存</strong>。</li><li>最後，前往 <a target="_blank" href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> 並按 <strong>啟用</strong>。這可能需要花上幾分鐘以在 Google 的系統完成散佈。</li></ol>",
+ "admin.google.EnableHtmlDesc": "<ol><li><a target='_blank' href='https://accounts.google.com/login'>登入</a> Google帳號。</li><li>前往 <a target='_blank' href='https://console.developers.google.com'>https://console.developers.google.com</a>，按左側邊列的<strong>憑證</strong>並輸入\"Mattermost - 您的公司名稱\"作為<strong>專案名稱</strong>，按<strong>建立</strong>。</li><li>按 <strong>OAuth 同意畫面</strong> 標題並輸入 \"Mattermost\" 作為 <strong>向使用者顯示的產品名稱</strong>。 按 <strong>儲存</strong> 。</li><li>在 <strong>憑證</strong> 標題下，按 <strong>建立憑證</strong>，選擇 <strong>OAuth 用戶端 ID</strong> 並選擇 <strong>網路應用程式</strong>。</li><li>在 <strong>限制</strong> 的 <strong>已授權的重新導向 URI</strong> 中輸入 <strong>您的 Mattermost 網址/signup/google/complete</strong> (如： http://localhost:8065/signup/google/complete)。 按 <strong>建立</strong>。</li><li>將 <strong>用戶端 ID</strong> 跟 <strong>用戶端密鑰</strong> 貼至下面的欄位，按下<strong>儲存</strong>。</li><li>最後，前往 <a target='_blank' href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> 並按 <strong>啟用</strong>。這可能需要花上幾分鐘以在 Google 的系統完成散佈。</li></ol>",
"admin.google.authTitle": "認證端點：",
"admin.google.clientIdDescription": "在 Google 註冊應用程式時收到的用戶端 ID。",
"admin.google.clientIdExample": "如：\"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
@@ -512,10 +512,10 @@
"admin.oauth.google": "Google Apps",
"admin.oauth.off": "不允許經由 OAuth 2.0 提供者登入",
"admin.oauth.office365": "Office 365 (Beta)",
- "admin.oauth.providerDescription": "啟用時，Mattermost 將可以作為一個 OAuth 2.0 服務提供者以授權外部應用程式的 API 要求。詳請參閱<a target="_blank" href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">文件</a>。",
+ "admin.oauth.providerDescription": "啟用時，Mattermost 將可以作為一個 OAuth 2.0 服務提供者以授權外部應用程式的 API 要求。詳請參閱<a target='_blank' href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">文件</a>。",
"admin.oauth.providerTitle": "啟用 OAuth 2.0 服務提供者：",
"admin.oauth.select": "選擇 OAuth 2.0 服務提供者：",
- "admin.office365.EnableHtmlDesc": "<ol><li><a target="_blank" href='https://login.microsoftonline.com/'>登入</a> Microsoft 或 Office 365 帳號。請確定該帳號跟其他使用者的登入帳號在同一個<a target="_blank" href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>租用戶</a>下。</li><li>前往 <a target="_blank" href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>，按 <strong>前往應用程式列表</strong> > <strong>新增應用程式</strong> 並用 \"Mattermost - 您的公司名稱\" 作為<strong>應用程式名稱</strong>。</li><li>在 <strong>應用程式密碼</strong> 下，按 <strong>產生新密碼</strong> 並黏貼至底下的<strong>應用程式密碼</strong>欄位。</li><li>在 <strong>平台</strong> 下，按 <strong>新增平台</strong> 選擇 <strong>Web</strong> 並在 <strong>重新導向 URI</strong> 欄位輸入 <strong>您的-mattermost-網址/signup/office365/complete</strong> (如：http://localhost:8065/signup/office365/complete)。同時取消 <strong>允許隱含流程</strong>。</li><li>最後，按下 <strong>儲存</strong> 並貼上底下的<strong>應用程式識別碼</strong>欄位。</li></ol>",
+ "admin.office365.EnableHtmlDesc": "<ol><li><a target='_blank' href='https://login.microsoftonline.com/'>登入</a> Microsoft 或 Office 365 帳號。請確定該帳號跟其他使用者的登入帳號在同一個<a target='_blank' href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>租用戶</a>下。</li><li>前往 <a target='_blank' href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>，按 <strong>前往應用程式列表</strong> > <strong>新增應用程式</strong> 並用 \"Mattermost - 您的公司名稱\" 作為<strong>應用程式名稱</strong>。</li><li>在 <strong>應用程式密碼</strong> 下，按 <strong>產生新密碼</strong> 並黏貼至底下的<strong>應用程式密碼</strong>欄位。</li><li>在 <strong>平台</strong> 下，按 <strong>新增平台</strong> 選擇 <strong>Web</strong> 並在 <strong>重新導向 URI</strong> 欄位輸入 <strong>您的-mattermost-網址/signup/office365/complete</strong> (如：http://localhost:8065/signup/office365/complete)。同時取消 <strong>允許隱含流程</strong>。</li><li>最後，按下 <strong>儲存</strong> 並貼上底下的<strong>應用程式識別碼</strong>欄位。</li></ol>",
"admin.office365.authTitle": "認證端點：",
"admin.office365.clientIdDescription": "在 Microsoft 註冊應用程式時收到的應用程式/用戶端識別碼。",
"admin.office365.clientIdExample": "如：\"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-04 19:34:18 +0000