diff options
| -rw-r--r-- | web/react/components/admin_console/gitlab_settings.jsx | 4 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_responsive.scss | 3 | ||||
| -rw-r--r-- | web/static/i18n/en.json | 2 | ||||
| -rw-r--r-- | web/static/i18n/es.json | 5 | ||||
| -rw-r--r-- | web/static/i18n/pt.json | 2 |
5 files changed, 9 insertions, 7 deletions
diff --git a/web/react/components/admin_console/gitlab_settings.jsx b/web/react/components/admin_console/gitlab_settings.jsx index 744fa3b19..ad9950eea 100644 --- a/web/react/components/admin_console/gitlab_settings.jsx +++ b/web/react/components/admin_console/gitlab_settings.jsx @@ -167,7 +167,7 @@ class GitLabSettings extends React.Component { <div className='help-text'> <FormattedHTMLMessage id='admin.gitlab.EnableHtmlDesc' - defaultMessage='<ol><li>Log in to your GitLab account and go to Applications -> Profile Settings.</li><li>Enter Redirect URIs "<your-mattermost-url>/login/gitlab/complete" (example: http://localhost:8065/login/gitlab/complete) and "<your-mattermost-url>/signup/gitlab/complete". </li><li>Then use "Secret" and "Id" fields from GitLab to complete the options below.</li><li>Complete the Endpoint URLs below. </li></ol>' + defaultMessage='<ol><li>Log in to your GitLab account and go to Profile Settings -> Applications.</li><li>Enter Redirect URIs "<your-mattermost-url>/login/gitlab/complete" (example: http://localhost:8065/login/gitlab/complete) and "<your-mattermost-url>/signup/gitlab/complete". </li><li>Then use "Secret" and "Id" fields from GitLab to complete the options below.</li><li>Complete the Endpoint URLs below. </li></ol>' /> </div> </div> @@ -376,4 +376,4 @@ GitLabSettings.propTypes = { config: React.PropTypes.object }; -export default injectIntl(GitLabSettings);
\ No newline at end of file +export default injectIntl(GitLabSettings); diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index ead65af2e..0f978a806 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -572,8 +572,7 @@ .glyphicon-refresh-animate { right: 33px; top: 15px; - color: #fff; - color: rgba(255,255,255,0.5); + color: #aaa; } .form-control { border: none; diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index 68942c61a..ec1ab6156 100644 --- a/web/static/i18n/en.json +++ b/web/static/i18n/en.json @@ -107,7 +107,7 @@ "admin.email.testing": "Testing...", "admin.email.true": "true", "admin.gitab.clientSecretDescription": "Obtain this value via the instructions above for logging into GitLab.", - "admin.gitlab.EnableHtmlDesc": "<ol><li>Log in to your GitLab account and go to Applications -> Profile Settings.</li><li>Enter Redirect URIs \"<your-mattermost-url>/login/gitlab/complete\" (example: http://localhost:8065/login/gitlab/complete) and \"<your-mattermost-url>/signup/gitlab/complete\". </li><li>Then use \"Secret\" and \"Id\" fields from GitLab to complete the options below.</li><li>Complete the Endpoint URLs below. </li></ol>", + "admin.gitlab.EnableHtmlDesc": "<ol><li>Log in to your GitLab account and go to Profile Settings -> Applications.</li><li>Enter Redirect URIs \"<your-mattermost-url>/login/gitlab/complete\" (example: http://localhost:8065/login/gitlab/complete) and \"<your-mattermost-url>/signup/gitlab/complete\". </li><li>Then use \"Secret\" and \"Id\" fields from GitLab to complete the options below.</li><li>Complete the Endpoint URLs below. </li></ol>", "admin.gitlab.authDescription": "Enter https://<your-gitlab-url>/oauth/authorize (example https://example.com:3000/oauth/authorize). Make sure you use HTTP or HTTPS in your URL depending on your server configuration.", "admin.gitlab.authExample": "Ex \"\"", "admin.gitlab.authTitle": "Auth Endpoint:", diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json index ac9fd173f..0b5cd4e4a 100644 --- a/web/static/i18n/es.json +++ b/web/static/i18n/es.json @@ -100,7 +100,7 @@ "admin.email.testing": "Probando...", "admin.email.true": "verdadero", "admin.gitab.clientSecretDescription": "Utilizar este valor vía instrucciones suministradas anteriormente para iniciar sesión en GitLab.", - "admin.gitlab.EnableHtmlDesc": "<ol><li>Inicia sesión con tu cuenta en GitLab y dirigete a Applications -> Profile Settings.</li><li>Ingresa los URIs \"<tu-mattermost-url>/login/gitlab/complete\" (ejemplo: http://localhost:8065/login/gitlab/complete) y \"<tu-mattermost-url>/signup/gitlab/complete\". </li><li>Luego utiliza los valores de los campos \"Secret\" e \"Id\" de GitLab y completa las opciones que abajo se presentan.</li><li>Completa las dirección URLs abajo. </li></ol>", + "admin.gitlab.EnableHtmlDesc": "<ol><li>Inicia sesión con tu cuenta en GitLab y dirigete a Profile Settings -> Applications.</li><li>Ingresa los URIs \"<tu-mattermost-url>/login/gitlab/complete\" (ejemplo: http://localhost:8065/login/gitlab/complete) y \"<tu-mattermost-url>/signup/gitlab/complete\". </li><li>Luego utiliza los valores de los campos \"Secret\" e \"Id\" de GitLab y completa las opciones que abajo se presentan.</li><li>Completa las dirección URLs abajo. </li></ol>", "admin.gitlab.authDescription": "Ingresar <your-gitlab-url>/oauth/authorize (example http://localhost:3000/oauth/authorize). Asegurate que si utilizas HTTPS o HTTPS tus URLS sean correctas", "admin.gitlab.authExample": "Ej \"\"", "admin.gitlab.authTitle": "URL para autentificación:", @@ -539,10 +539,12 @@ "channel_info.url": "URL del Canal:", "channel_invite.addNewMembers": "Agregar nuevos Miembros a ", "channel_invite.close": "Cerrar", + "channel_loader.connection_error": "Parece haber un problema con tu conexión a internet.", "channel_loader.posted": "Publicó", "channel_loader.socketError": "No se puede conectar con Mattermost, por favor revise su conexión. Si el problema persiste, solicite a un administrador que revise el puerto del WebSocket.", "channel_loader.someone": "Alguien", "channel_loader.something": " hizo algo nuevo", + "channel_loader.unknown_error": "Hemos recibido un código de estado inesperado del servidor.", "channel_loader.uploadedFile": " subió un archivo", "channel_loader.uploadedImage": " subió una imagen", "channel_loader.wrote": " escribió: ", @@ -756,6 +758,7 @@ "member_item.makeAdmin": "Convertir en Admin de Equipo", "member_item.member": "Miembro", "member_item.removeMember": "Elminar Miembro", + "member_list.noUsersAdd": "No hay usuarios que agregar.", "member_team_item.confirmDemoteDescription": "Si te degradas a ti mismo de la función de Administrador de Sistema y no hay otro usuario con privilegios de Administrador de Sistema, tendrás que volver a asignar un Administrador del Sistema accediendo al servidor de Mattermost a través de un terminal y ejecutar el siguiente comando.", "member_team_item.confirmDemoteRoleTitle": "Confirmar el decenso del rol de Administrador de Sistema", "member_team_item.confirmDemotion": "Confirmar decenso", diff --git a/web/static/i18n/pt.json b/web/static/i18n/pt.json index dc5a0d29c..c7d91d5f3 100644 --- a/web/static/i18n/pt.json +++ b/web/static/i18n/pt.json @@ -100,7 +100,7 @@ "admin.email.testing": "Testando...", "admin.email.true": "verdadeiro", "admin.gitab.clientSecretDescription": "Obter este valor de acordo com as instruções acima para logar no GitLab.", - "admin.gitlab.EnableHtmlDesc": "<ol><li>Faça login na sua conta do GitLab e vá para Aplicativos -> Configurações do perfil.</li><li>Digite redirecionamento URIs \"<your-mattermost-url>/login/gitlab/complete\" (exemplo: http://localhost:8065/login/gitlab/complete) e \"<your-mattermost-url>/signup/gitlab/complete\".</li><li>Em seguida, use os campos \"Secret\" e \"Id\" do Gitlab para completar as opções abaixo.</li><li>Complete o Endpoint com as URLs abaixo. </li></ol>", + "admin.gitlab.EnableHtmlDesc": "<ol><li>Faça login na sua conta do GitLab e vá para Configurações do perfil -> Aplicativos.</li><li>Digite redirecionamento URIs \"<your-mattermost-url>/login/gitlab/complete\" (exemplo: http://localhost:8065/login/gitlab/complete) e \"<your-mattermost-url>/signup/gitlab/complete\".</li><li>Em seguida, use os campos \"Secret\" e \"Id\" do Gitlab para completar as opções abaixo.</li><li>Complete o Endpoint com as URLs abaixo. </li></ol>", "admin.gitlab.authDescription": "Entre https://<your-gitlab-url>/oauth/authorize (exemplo https://example.com:3000/oauth/authorize). Tenha certeza de usar HTTP ou HTTPS na sua URL dependendo da configuração do seu servidor.", "admin.gitlab.authExample": "Ex \"\"", "admin.gitlab.authTitle": "Autenticação Endpoint:", |