diff options
| -rw-r--r-- | webapp/components/admin_console/oauth_settings.jsx | 4 | ||||
| -rw-r--r-- | webapp/components/post_view/components/new_message_indicator.jsx | 9 | ||||
| -rw-r--r-- | webapp/components/rhs_comment.jsx | 38 | ||||
| -rw-r--r-- | webapp/components/rhs_root_post.jsx | 32 | ||||
| -rw-r--r-- | webapp/i18n/de.json | 6 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 6 | ||||
| -rw-r--r-- | webapp/i18n/es.json | 6 | ||||
| -rw-r--r-- | webapp/i18n/fr.json | 6 | ||||
| -rw-r--r-- | webapp/i18n/ja.json | 6 | ||||
| -rw-r--r-- | webapp/i18n/ko.json | 6 | ||||
| -rw-r--r-- | webapp/i18n/nl.json | 6 | ||||
| -rw-r--r-- | webapp/i18n/pt-BR.json | 6 | ||||
| -rw-r--r-- | webapp/i18n/ru.json | 6 | ||||
| -rw-r--r-- | webapp/i18n/zh_CN.json | 6 | ||||
| -rw-r--r-- | webapp/i18n/zh_TW.json | 6 | ||||
| -rw-r--r-- | webapp/sass/layout/_post.scss | 84 | ||||
| -rw-r--r-- | webapp/sass/responsive/_mobile.scss | 5 | ||||
| -rw-r--r-- | webapp/utils/utils.jsx | 7 |
18 files changed, 127 insertions, 118 deletions
diff --git a/webapp/components/admin_console/oauth_settings.jsx b/webapp/components/admin_console/oauth_settings.jsx index 716889401..9a86abfa0 100644 --- a/webapp/components/admin_console/oauth_settings.jsx +++ b/webapp/components/admin_console/oauth_settings.jsx @@ -385,7 +385,7 @@ export default class OAuthSettings extends AdminSettings { helpText = ( <FormattedHTMLMessage id='admin.google.EnableHtmlDesc' - defaultMessage='<ol><li><a href="https://accounts.google.com/login">Log in</a> to your Google account.</li><li>Go to <a 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 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>' + defaultMessage='<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>' /> ); } else if (this.state.oauthType === Constants.OFFICE365_SERVICE) { @@ -393,7 +393,7 @@ export default class OAuthSettings extends AdminSettings { helpText = ( <FormattedHTMLMessage id='admin.office365.EnableHtmlDesc' - defaultMessage='<ol><li><a 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 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 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>' + defaultMessage='<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>' /> ); } diff --git a/webapp/components/post_view/components/new_message_indicator.jsx b/webapp/components/post_view/components/new_message_indicator.jsx index 35a299462..f9bd17bd7 100644 --- a/webapp/components/post_view/components/new_message_indicator.jsx +++ b/webapp/components/post_view/components/new_message_indicator.jsx @@ -21,7 +21,7 @@ export default class NewMessageIndicator extends React.Component { } } render() { - let className = 'nav-pills__unread-indicator-bottom'; + let className = 'new-messages__button'; if (this.state.visible > 0) { className += ' visible'; } @@ -31,20 +31,19 @@ export default class NewMessageIndicator extends React.Component { return ( <div className={className} - onClick={this.props.onClick} onTransitionEnd={this.setRendered.bind(this)} ref='indicator' > - <span> + <div onClick={this.props.onClick}> <i - className='fa fa-arrow-circle-o-down' + className='fa fa-angle-down' /> <FormattedMessage id='posts_view.newMsgBelow' defaultMessage='{count} new {count, plural, one {message} other {messages}} below' values={{count: this.props.newMessages}} /> - </span> + </div> </div> ); } diff --git a/webapp/components/rhs_comment.jsx b/webapp/components/rhs_comment.jsx index 8b5d56c01..c699fb353 100644 --- a/webapp/components/rhs_comment.jsx +++ b/webapp/components/rhs_comment.jsx @@ -166,49 +166,49 @@ export default class RhsComment extends React.Component { </li> ); - if (isOwner) { + if (isOwner || isAdmin) { dropdownContents.push( <li role='presentation' - key='edit-button' + key='delete-button' > <a href='#' role='menuitem' - data-toggle='modal' - data-target='#edit_post' - data-refocusid='#reply_textbox' - data-title={Utils.localizeMessage('rhs_comment.comment', 'Comment')} - data-message={post.message} - data-postid={post.id} - data-channelid={post.channel_id} + onClick={(e) => { + e.preventDefault(); + GlobalActions.showDeletePostModal(post, 0); + }} > <FormattedMessage - id='rhs_comment.edit' - defaultMessage='Edit' + id='rhs_comment.del' + defaultMessage='Delete' /> </a> </li> ); } - if (isOwner || isAdmin) { + if (isOwner) { dropdownContents.push( <li role='presentation' - key='delete-button' + key='edit-button' > <a href='#' role='menuitem' - onClick={(e) => { - e.preventDefault(); - GlobalActions.showDeletePostModal(post, 0); - }} + data-toggle='modal' + data-target='#edit_post' + data-refocusid='#reply_textbox' + data-title={Utils.localizeMessage('rhs_comment.comment', 'Comment')} + data-message={post.message} + data-postid={post.id} + data-channelid={post.channel_id} > <FormattedMessage - id='rhs_comment.del' - defaultMessage='Delete' + id='rhs_comment.edit' + defaultMessage='Edit' /> </a> </li> diff --git a/webapp/components/rhs_root_post.jsx b/webapp/components/rhs_root_post.jsx index d871ad2a9..4a15127a0 100644 --- a/webapp/components/rhs_root_post.jsx +++ b/webapp/components/rhs_root_post.jsx @@ -185,46 +185,46 @@ export default class RhsRootPost extends React.Component { </li> ); - if (isOwner && !isSystemMessage) { + if (isOwner || isAdmin) { dropdownContents.push( <li - key='rhs-root-edit' + key='rhs-root-delete' role='presentation' > <a href='#' role='menuitem' - data-toggle='modal' - data-target='#edit_post' - data-refocusid='#reply_textbox' - data-title={type} - data-message={post.message} - data-postid={post.id} - data-channelid={post.channel_id} + onClick={() => GlobalActions.showDeletePostModal(post, this.props.commentCount)} > <FormattedMessage - id='rhs_root.edit' - defaultMessage='Edit' + id='rhs_root.del' + defaultMessage='Delete' /> </a> </li> ); } - if (isOwner || isAdmin) { + if (isOwner && !isSystemMessage) { dropdownContents.push( <li - key='rhs-root-delete' + key='rhs-root-edit' role='presentation' > <a href='#' role='menuitem' - onClick={() => GlobalActions.showDeletePostModal(post, this.props.commentCount)} + data-toggle='modal' + data-target='#edit_post' + data-refocusid='#reply_textbox' + data-title={type} + data-message={post.message} + data-postid={post.id} + data-channelid={post.channel_id} > <FormattedMessage - id='rhs_root.del' - defaultMessage='Delete' + id='rhs_root.edit' + defaultMessage='Edit' /> </a> </li> diff --git a/webapp/i18n/de.json b/webapp/i18n/de.json index d77111fff..eca1cc365 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 href='https://accounts.google.com/login'>anmelden.</li><li>Wechseln Sie zu <a 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 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 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 href='https://login.microsoftonline.com/'>Microsoft oder Office 365</a> Konto an. Stellen Sie sicher das der Account zum selben <a 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 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 d409aaec7..a007b1a1c 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -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 href='https://accounts.google.com/login'>Log in</a> to your Google account.</li><li>Go to <a 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 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\"", @@ -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 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 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 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 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\"", diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json index 793781410..c50a4b3c7 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 href='https://accounts.google.com/login'>Inicia sesión</a> con tu cuenta de Google.</li><li>Dirigete a <a 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 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 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 href='https://login.microsoftonline.com/'>Inicia sesión</a> con tu cuenta de Microsoft u Office 365. Asegura que la cuenta sea un <a 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 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 3cb262cb1..37cf3648d 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 href='https://accounts.google.com/login'>Conectez-vous</a> à votre compte Google.</li><li>Allez à <a 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 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 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 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 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 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 e7ffd7598..d5d6e0ba0 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 href='https://accounts.google.com/login'>ログイン</a>します。</li><li><a 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 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 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 href='https://login.microsoftonline.com/'>ログイン</a>します。そのアカウントが、ユーザーにログインさせたい<a href='https://msdn.microsoft.com/ja-jp/library/azure/jj573650.aspx#Anchor_0'>テナント</a>と同じテナントであることを確認してください。</li><li><a 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 24d26b46b..5811158cd 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 href='https://accounts.google.com/login'>Log in</a> to your Google account.</li><li>Go to <a 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 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 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 href='https://login.microsoftonline.com/'>로그인</a> 하십시요. 로그인하는 계정은 <a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>테넌트</a>의 >계정과 동일해야 합니다.</li><li><a 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 c698d8aa7..ddda039fa 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 href='https://accounts.google.com/login'>Inloggen</a> op uw Google account.</li><li>Ga naar <a 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 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 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 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 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 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 ec86e7827..9ed1ebf75 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 href='https://accounts.google.com/login'>Log in</a> to sua conta Google.</li><li>Ir para <a 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 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 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 href='https://login.microsoftonline.com/'>Log in</a> na sua conta Microsoft ou Office 365. Certifique-se que esta conta é do mesmo <a 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 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 f6dbead52..ee68819d3 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 href='https://accounts.google.com/login'>Войдите</a> в свою учетную запись Google.</li><li>Перейдите к <a 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 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 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 href='https://login.microsoftonline.com/'>Войдите</a> в свою учетную запись Microsoft или Office 365. Убедитесь, что эта учетная запись принадлежит тому же <a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>арендатору</a>, через которого вы хотели бы позволить пользователям вход.</li><li>Перейдите к <a 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 b84e63f3a..5fef8a28d 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 href='https://accounts.google.com/login'>登入</a>到您的谷歌帐号。</li><li>到<a 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 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 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 href='https://login.microsoftonline.com/'>登入</a>到您的微软或Office 365帐号。确定是和您想让用户登入的同一个<a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>租户</a>。</li><li>到<a 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 2c0f52efd..558afc574 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 href='https://accounts.google.com/login'>登入</a> Google帳號。</li><li>前往 <a 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 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 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 href='https://login.microsoftonline.com/'>登入</a> Microsoft 或 Office 365 帳號。請確定該帳號跟其他使用者的登入帳號在同一個<a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>租用戶</a>下。</li><li>前往 <a 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\"", diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss index 9c93c09d7..0436af6c5 100644 --- a/webapp/sass/layout/_post.scss +++ b/webapp/sass/layout/_post.scss @@ -258,32 +258,40 @@ outline: none; text-align: center; } - .nav-pills__unread-indicator-bottom { - position: absolute; - bottom: -30px; - left: 0; - right: 0; - - @include border-radius(50px); - font-size: 13.5px; - margin: 0 auto; - padding: 3px 0 4px; - text-align: center; - max-width: 250px; - z-index: 1; - cursor: pointer; - transition: bottom 0.2s ease-out; - - .fa { - margin-right: 0.5rem; - } - &.visible { + .new-messages__button { + @include opacity(0); bottom: 0; - } - &.disabled { - display: none; - } + font-size: 13.5px; + left: 0; + margin: 0 auto; + position: absolute; + right: 0; + text-align: center; + z-index: 1; + + .fa { + font-size: 1.2em; + font-weight: bold; + margin-right: .5rem; + position: relative; + top: 1px; + } + + div { + @include border-radius(50px); + cursor: pointer; + display: inline-block; + padding: 5px 10px; + } + + &.visible { + @include opacity(1); + } + + &.disabled { + display: none; + } } } @@ -451,20 +459,20 @@ color: rgb(51, 51, 51); position: absolute; top: 4px; - } - } - } - - .msg-typing { - @include opacity(.7); - display: block; - font-size: .95em; - height: 20px; - margin-bottom: 5px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - } + } + } + } + + .msg-typing { + @include opacity(.7); + display: block; + font-size: .95em; + height: 20px; + margin-bottom: 5px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} } .post-list__table { diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss index 68ba20537..a13d2de00 100644 --- a/webapp/sass/responsive/_mobile.scss +++ b/webapp/sass/responsive/_mobile.scss @@ -44,6 +44,11 @@ color: $white; font-size: 15px; padding: 15px 20px 100px; + + > div { + height: calc(100vh - 150px); + overflow: auto; + } } .close { diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx index b0eca9d55..6988225a1 100644 --- a/webapp/utils/utils.jsx +++ b/webapp/utils/utils.jsx @@ -532,12 +532,12 @@ export function applyTheme(theme) { } if (theme.mentionBj) { - changeCss('.sidebar--left .nav-pills__unread-indicator', 'background:' + theme.mentionBj); + changeCss('.sidebar--left .nav-pills__unread-indicator, .app__body .new-messages__button div', 'background:' + theme.mentionBj); changeCss('.sidebar--left .badge', 'background:' + theme.mentionBj + '!important;'); } if (theme.mentionColor) { - changeCss('.sidebar--left .nav-pills__unread-indicator', 'color:' + theme.mentionColor); + changeCss('.sidebar--left .nav-pills__unread-indicator, .app__body .new-messages__button div', 'color:' + theme.mentionColor); changeCss('.sidebar--left .badge', 'color:' + theme.mentionColor + '!important;'); changeCss('.app__body .post-reaction--current-user', 'background-color:' + changeOpacity(theme.mentionColor, 0.4)); } @@ -560,7 +560,6 @@ export function applyTheme(theme) { changeCss('body.app__body', 'scrollbar-face-color:' + theme.centerChannelBg); changeCss('body.app__body', 'scrollbar-track-color:' + theme.centerChannelBg); changeCss('.app__body .post-list__new-messages-below', 'color:' + theme.centerChannelBg); - changeCss('.app__body .nav-pills__unread-indicator-bottom', 'color:' + theme.centerChannelBg); } if (theme.centerChannelColor) { @@ -645,8 +644,6 @@ export function applyTheme(theme) { changeCss('.app__body a, .app__body a:focus, .app__body a:hover, .app__body .btn, .app__body .btn:focus, .app__body .btn:hover', 'color:' + theme.linkColor); changeCss('.app__body .attachment .attachment__container', 'border-left-color:' + changeOpacity(theme.linkColor, 0.5)); changeCss('.app__body .channel-header__links .icon:hover, .app__body .post .flag-icon__container.visible, .app__body .post .comment-icon__container, .app__body .post .post__reply', 'fill:' + theme.linkColor); - changeCss('.app__body .nav-pills__unread-indicator-bottom', 'background:' + theme.linkColor); - changeCss('.app__body .nav-pills__unread-indicator-bottom:hover', 'background:' + changeColor(theme.linkColor, 0.1)); } if (theme.buttonBg) { |