diff options
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/create_team/components/display_name.jsx | 12 | ||||
| -rw-r--r-- | webapp/components/create_team/components/team_url.jsx | 20 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 7 | ||||
| -rw-r--r-- | webapp/i18n/es.json | 8 |
4 files changed, 26 insertions, 21 deletions
diff --git a/webapp/components/create_team/components/display_name.jsx b/webapp/components/create_team/components/display_name.jsx index e33eee1bc..e8f1717bb 100644 --- a/webapp/components/create_team/components/display_name.jsx +++ b/webapp/components/create_team/components/display_name.jsx @@ -12,11 +12,11 @@ import logoImage from 'images/logo.png'; const holders = defineMessages({ required: { - id: 'create_team_display_name.required', + id: 'create_team.display_name.required', defaultMessage: 'This field is required' }, charLength: { - id: 'create_team_display_name.charLength', + id: 'create_team.display_name.charLength', defaultMessage: 'Name must be 4 or more characters up to a maximum of 15' } }); @@ -75,7 +75,7 @@ class TeamSignupDisplayNamePage extends React.Component { /> <h2> <FormattedMessage - id='create_team_display_name.teamName' + id='create_team.display_name.teamName' defaultMessage='Team Name' /> </h2> @@ -99,7 +99,7 @@ class TeamSignupDisplayNamePage extends React.Component { </div> <div> <FormattedMessage - id='create_team_display_name.nameHelp' + id='create_team.display_name.nameHelp' defaultMessage='Name your team in any language. Your team name shows in menus and headings.' /> </div> @@ -109,14 +109,14 @@ class TeamSignupDisplayNamePage extends React.Component { onClick={this.submitNext} > <FormattedMessage - id='create_team_display_name.next' + id='create_team.display_name.next' defaultMessage='Next' /><i className='glyphicon glyphicon-chevron-right'></i> </button> <div className='margin--extra'> <Link to='/select_team'> <FormattedMessage - id='create_team_display_name.back' + id='create_team.display_name.back' defaultMessage='Back to previous step' /> </Link> diff --git a/webapp/components/create_team/components/team_url.jsx b/webapp/components/create_team/components/team_url.jsx index 025103141..1a20066b5 100644 --- a/webapp/components/create_team/components/team_url.jsx +++ b/webapp/components/create_team/components/team_url.jsx @@ -16,23 +16,23 @@ import logoImage from 'images/logo.png'; const holders = defineMessages({ required: { - id: 'create_team_url.required', + id: 'create_team.team_url.required', defaultMessage: 'This field is required' }, regex: { - id: 'create_team_url.regex', + id: 'create_team.team_url.regex', defaultMessage: "Use only lower case letters, numbers and dashes. Must start with a letter and can't end in a dash." }, charLength: { - id: 'create_team_url.charLength', + id: 'create_team.team_url.charLength', defaultMessage: 'Name must be 4 or more characters up to a maximum of 15' }, taken: { - id: 'create_team_url.taken', + id: 'create_team.team_url.taken', defaultMessage: 'URL is taken or contains a reserved word' }, unavailable: { - id: 'create_team_url.unavailable', + id: 'create_team.team_url.unavailable', defaultMessage: 'This URL is unavailable. Please try another.' } }); @@ -147,7 +147,7 @@ class TeamUrl extends React.Component { /> <h2> <FormattedMessage - id='create_team_url.teamUrl' + id='create_team.team_url.teamUrl' defaultMessage='Team URL' /> </h2> @@ -180,13 +180,13 @@ class TeamUrl extends React.Component { </div> <p> <FormattedMessage - id='create_team_url.webAddress' + id='create_team.team_url.webAddress' defaultMessage='Choose the web address of your new team:' /> </p> <ul className='color--light'> <FormattedHTMLMessage - id='create_team_url.hint' + id='create_team.team_url.hint' defaultMessage="<li>Short and memorable is best</li> <li>Use lowercase letters, numbers and dashes</li> <li>Must start with a letter and can't end in a dash</li>" @@ -199,7 +199,7 @@ class TeamUrl extends React.Component { onClick={this.submitNext} > <FormattedMessage - id='create_team_password.finish' + id='create_team.team_url.finish' defaultMessage='Finish' /> </button> @@ -209,7 +209,7 @@ class TeamUrl extends React.Component { onClick={this.submitBack} > <FormattedMessage - id='create_team_url.back' + id='create_team.team_url.back' defaultMessage='Back to previous step' /> </a> diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 78ff7d374..3505c1d3c 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1280,9 +1280,13 @@ "user.settings.developer.register": "Register New Application", "user.settings.developer.thirdParty": "Open to register a new third-party application", "user.settings.developer.title": "Developer Settings", + "user.settings.display.channeldisplaymode": "Select how text in a channel is displayed.", + "user.settings.display.channelDisplayTitle": "Channel Display Mode", "user.settings.display.clockDisplay": "Clock Display", + "user.settings.display.fixedWidthCentered": "Fixed width, centered", "user.settings.display.fontDesc": "Select the font displayed in the Mattermost user interface.", "user.settings.display.fontTitle": "Display Font", + "user.settings.display.fullScreen": "Full width", "user.settings.display.language": "Language", "user.settings.display.militaryClock": "24-hour clock (example: 16:00)", "user.settings.display.nameOptsDesc": "Set how to display other user's names in posts and the Direct Messages list.", @@ -1299,9 +1303,6 @@ "user.settings.display.theme.themeColors": "Theme Colors", "user.settings.display.theme.title": "Theme", "user.settings.display.title": "Display Settings", - "user.settings.display.fixedWidthCentered": "Fixed width, centered", - "user.settings.display.fullScreen": "Full width", - "user.settings.display.channeldisplaymode": "Select how text in a channel is displayed.", "user.settings.general.checkEmail": "Check your email at {email} to verify the address.", "user.settings.general.checkEmailNoAddress": "Check your email to verify your new address", "user.settings.general.close": "Close", diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json index 0b2fbb405..44d7c8a0a 100644 --- a/webapp/i18n/es.json +++ b/webapp/i18n/es.json @@ -1246,8 +1246,8 @@ "user.settings.advance.feature": " Característica ", "user.settings.advance.features": " Características ", "user.settings.advance.markdown_preview": "Mostrar la previsualización de mensajes escritos con markdown", - "user.settings.advance.off": "Encendido", - "user.settings.advance.on": "Apagado", + "user.settings.advance.off": "Apagado", + "user.settings.advance.on": "Encendido", "user.settings.advance.preReleaseDesc": "Marca las características de pre-lanzamiento que quieras previsualizar. Es posible que necesites refrescar la página antes de que los cambios se vean reflejados.", "user.settings.advance.preReleaseTitle": "Previsualizar características de pre-lanzamiento", "user.settings.advance.sendDesc": "Si está habilitado 'Retorno' inserta una nueva linea y 'Ctrl + Retorno' envía el mensaje.", @@ -1280,9 +1280,13 @@ "user.settings.developer.register": "Registrar una Nueva Aplicación", "user.settings.developer.thirdParty": "Abrir para registrar una nueva aplicación externa", "user.settings.developer.title": "Configuraciones de Desarrollo", + "user.settings.display.channeldisplaymode": "Selecciona como se muestra el texto del canal.", + "user.settings.display.channelDisplayTitle": "Modo en que se muestra el Canal", "user.settings.display.clockDisplay": "Visualización del Reloj", + "user.settings.display.fixedWidthCentered": "De ancho fijo, centrado", "user.settings.display.fontDesc": "Selecciona la fuente con la que quieres ver la interfaz de Mattermost.", "user.settings.display.fontTitle": "Fuente de Visualización", + "user.settings.display.fullScreen": "De ancho total", "user.settings.display.language": "Idioma", "user.settings.display.militaryClock": "Reloj de 24 horas (ejemplo: 16:00)", "user.settings.display.nameOptsDesc": "Asigna como mostrar los nombres de los otros usuarios en los mensajes y en la lista de Mensajes Directos.", |