Merge pull request #2096 from ZBoxApp/new-locs

Add new localizations in english and spanish

3 files changed, 16 insertions, 14 deletions

diff --git a/web/react/utils/channel_intro_messages.jsx b/web/react/utils/channel_intro_messages.jsx
index 69e08f143..1aca0467e 100644
--- a/web/react/utils/channel_intro_messages.jsx
+++ b/web/react/utils/channel_intro_messages.jsx
@@ -128,7 +128,7 @@ export function createDefaultIntroMessage(channel) {
         <div className='channel-intro'>
             <FormattedHTMLMessage
                 id='intro_messages.default'
-                defaultMessage="<h4 class='channel-intro__title'>Beginning of {display_name}</h4><p class='channel-intro__content'><strong>Welcome to {display_name}!'</strong><br/><br/>This is the first channel teammates see when they sign up - use it for posting updates everyone needs to know.</p>"
+                defaultMessage="<h4 class='channel-intro__title'>Beginning of {display_name}</h4><p class='channel-intro__content'><strong>Welcome to {display_name}!</strong><br/><br/>This is the first channel teammates see when they sign up - use it for posting updates everyone needs to know.</p>"
                 values={{
                     display_name: channel.display_name
                 }}
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index 5b03f0130..64d06f46d 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -1089,7 +1089,7 @@
   "user.settings.cmds.username_desc": "The username to use when overriding the post.",
   "user.settings.cmds.icon_url_desc": "URL to an icon",
   "user.settings.cmds.trigger_desc": "Word to trigger on",
-  "user.settings.cmds.auto_complete_help": "Show this command in autocomplete list.",
+  "user.settings.cmds.auto_complete_help": "Show this command in autocomplete list",
   "user.settings.cmds.auto_complete_hint_desc": "List parameters to be passed to the command.",
   "user.settings.cmds.request_type_desc": "Command request type issued to the callback URL.",
   "user.settings.cmds.url_desc": "URL that will receive the HTTP POST or GET event",
@@ -1147,11 +1147,6 @@
   "user.settings.display.nameOptsDesc": "Set how to display other user's names in posts and the Direct Messages list.",
   "user.settings.display.fontDesc": "Select the font displayed in the Mattermost user interface.",
   "user.settings.display.title": "Display Settings",
-  "user.settings.display.theme.themeColors": "Theme Colors",
-  "user.settings.display.theme.customTheme": "Custom Theme",
-  "user.settings.display.theme.import": "Import theme colors from Slack",
-  "user.settings.display.theme.title": "Theme",
-  "user.settings.display.theme.describe": "Open to manage your theme",
   "user.settings.general.usernameReserved": "This username is reserved, please choose a new one.",
   "user.settings.general.usernameRestrictions": "'Username must begin with a letter, and contain between {min} to {max} lowercase characters made up of numbers, letters, and the symbols '.', '-' and '_'.",
   "user.settings.general.validEmail": "Please enter a valid email address",
@@ -1194,7 +1189,6 @@
   "user.settings.modal.general": "General",
   "user.settings.modal.security": "Security",
   "user.settings.modal.notifications": "Notifications",
-  "user.settings.modal.appearance": "Appearance",
   "user.settings.modal.developer": "Developer",
   "user.settings.modal.integrations": "Integrations",
   "user.settings.modal.display": "Display",
@@ -1245,6 +1239,11 @@
   "user.settings.security.title": "Security Settings",
   "user.settings.security.viewHistory": "View Access History",
   "user.settings.security.logoutActiveSessions": "View and Logout of Active Sessions",
+  "user.settings.display.theme.title": "Theme",
+  "user.settings.display.theme.describe": "Open to manage your theme",
+  "user.settings.display.theme.themeColors": "Theme Colors",
+  "user.settings.display.theme.customTheme": "Custom Theme",
+  "user.settings.display.theme.import": "Import theme colors from Slack",
   "view_image_popover.publicLink": "Get Public Link",
   "view_image_popover.file": "File {count} of {total}",
   "view_image_popover.download": "Download",
@@ -1263,4 +1262,4 @@
   "intro_messages.beginning": "Beginning of {name}",
   "intro_messages.invite": "Invite others to this {type}",
   "intro_messages.setHeader": "Set a Header"
-}
+}
\ No newline at end of file
diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json
index 25515ca86..a65b20e4c 100644
--- a/web/static/i18n/es.json
+++ b/web/static/i18n/es.json
@@ -303,6 +303,8 @@
   "admin.service.googleTitle": "Llave de desarrolador Google:",
   "admin.service.iconDescription": "Cuando es verdadero, se le permitirá cambiar el icono del mensaje desde webhooks. Nota, en combinación con permitir el cambio de nombre de usuario, podría exponer a los usuarios a sufrir ataques de phishing.",
   "admin.service.iconTitle": "Habilitar el cambio de icono desde los Webhooks: ",
+  "admin.service.insecureTlsDesc": "Cuando es verdadero, cualquier solicitud de salida por HTTPS será aceptada incluso si posee certificados no verificados o autofirmados. Por ejemplo, webhooks de salida a un servidor con un certificado TLS autofirmado, utilizando cualquier dominio, será permitido. Tenga en cuenta que esto hace que estas conexiones susceptibles a los ataques hombre-en-el-medio.",
+  "admin.service.insecureTlsTitle": "Habilitar Conexiones de Salida Inseguras: ",
   "admin.service.integrationAdmin": "Habilitar Integraciones sólo para administradores: ",
   "admin.service.integrationAdminDesc": "Cuando es verdadero, las integraciones creadas por usuarios solo pueden ser creadas por administradores.",
   "admin.service.listenAddress": "Dirección de escucha:",
@@ -1129,10 +1131,12 @@
   "user.settings.display.showNickname": "Mostrar el sobrenombre si existe, de lo contrario mostrar el nombre y apellido",
   "user.settings.display.showUsername": "Mostrar el nombre de usuario (predeterminado)",
   "user.settings.display.teammateDisplay": "Visualización del nombre de los integrantes",
+  "user.settings.display.theme.customTheme": "Tema Personalizado",
+  "user.settings.display.theme.describe": "Abrir para administrar tu tema",
+  "user.settings.display.theme.import": "Importar colores del tema desde Slack",
+  "user.settings.display.theme.themeColors": "Colores del Tema",
+  "user.settings.display.theme.title": "Tema",
   "user.settings.display.title": "Configuración de Visualización",
-  "user.settings.display.theme.customTheme": "Tema personalizado",
-  "user.settings.display.theme.import": "Importar los colores de tema de Slack",
-  "user.settings.display.theme.themeColors": "Selecciona un Tema",
   "user.settings.general.checkEmail": "Revisa tu correo electrónico {email} para verificar la dirección.",
   "user.settings.general.checkEmailNoAddress": "Revisa tu correo electrónico para verificar la dirección",
   "user.settings.general.close": "Cerrar",
@@ -1201,7 +1205,6 @@
   "user.settings.languages": "Cambiar Idioma",
   "user.settings.languages.change": "Cambia el idioma con el que se muestra la intefaz de usuario",
   "user.settings.modal.advanced": "Avanzada",
-  "user.settings.modal.appearance": "Apariencia",
   "user.settings.modal.confirmBtns": "Sí, Descartar",
   "user.settings.modal.confirmMsg": "Tienes cambios sin guardar, ¿Estás seguro que los quieres descartar?",
   "user.settings.modal.confirmTitle": "¿Descartar Cambios?",
@@ -1259,4 +1262,4 @@
   "view_image_popover.download": "Descargar",
   "view_image_popover.file": "Archivo {count} de {total}",
   "view_image_popover.publicLink": "Obtener Enlace Público"
-}
+}
\ No newline at end of file