summaryrefslogtreecommitdiffstats
path: root/webapp/i18n
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-05-02 16:39:00 -0300
committerJoram Wilander <jwawilander@gmail.com>2016-05-02 15:38:59 -0400
commit66ed1ab909fdd4a35a62a1515a54cf7991518484 (patch)
treed2b64babfac252e1643cf0b977863aa8f4ddd03e /webapp/i18n
parent3e0adf6227dbe466936924f1ba27b71a7a3d6acb (diff)
downloadchat-66ed1ab909fdd4a35a62a1515a54cf7991518484.tar.gz
chat-66ed1ab909fdd4a35a62a1515a54cf7991518484.tar.bz2
chat-66ed1ab909fdd4a35a62a1515a54cf7991518484.zip
Fix locs for create_team and added a few spanish missing locs (#2840)
Diffstat (limited to 'webapp/i18n')
-rw-r--r--webapp/i18n/en.json7
-rw-r--r--webapp/i18n/es.json8
2 files changed, 10 insertions, 5 deletions
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.",