PLT-7: Fix and Add new loc strings

4 files changed, 113 insertions, 41 deletions

diff --git a/web/react/components/user_settings/manage_command_hooks.jsx b/web/react/components/user_settings/manage_command_hooks.jsx
index bcf0a6c82..b2fc0a4e1 100644
--- a/web/react/components/user_settings/manage_command_hooks.jsx
+++ b/web/react/components/user_settings/manage_command_hooks.jsx
@@ -39,6 +39,14 @@ const holders = defineMessages({
     adUrlPlaceholder: {
         id: 'user.settings.cmds.url.placeholder',
         defaultMessage: 'Must start with http:// or https://'
+    },
+    autocompleteYes: {
+        id: 'user.settings.cmds.auto_complete.yes',
+        defaultMessage: 'yes'
+    },
+    autocompleteNo: {
+        id: 'user.settings.cmds.auto_complete.no',
+        defaultMessage: 'no'
     }
 });
 
@@ -295,7 +303,7 @@ export default class ManageCommandCmds extends React.Component {
                                 id='user.settings.cmds.auto_complete'
                                 defaultMessage='Auto Complete: '
                             />
-                        </strong><span className='word-break--all'>{cmd.auto_complete ? 'yes' : 'no'}</span>
+                        </strong><span className='word-break--all'>{cmd.auto_complete ? this.props.intl.formatMessage(holders.autocompleteYes) : this.props.intl.formatMessage(holders.autocompleteNo)}</span>
                     </div>
                     <div className='padding-top x2'>
                         <strong>
@@ -414,7 +422,12 @@ export default class ManageCommandCmds extends React.Component {
                     id='user.settings.cmds.add_desc'
                     defaultMessage='Create commands to send message events to an external integration. Please see <a href="http://mattermost.org/commands">http://mattermost.org/commands</a>  to learn more.'
                 />
-                <div><label className='control-label padding-top x2'>{'Add a new command'}</label></div>
+                <div><label className='control-label padding-top x2'>
+                    <FormattedMessage
+                        id='user.settings.cmds.add_new'
+                        defaultMessage='Add a new command'
+                    />
+                </label></div>
                 <div className='padding-top divider-light'></div>
                 <div className='padding-top'>
                     <div className='padding-top x2'>
@@ -433,7 +446,12 @@ export default class ManageCommandCmds extends React.Component {
                                 placeholder={this.props.intl.formatMessage(holders.addDisplayNamePlaceholder)}
                             />
                         </div>
-                        <div className='padding-top'>{'Command display name.'}</div>
+                        <div className='padding-top'>
+                            <FormattedMessage
+                                id='user.settings.cmds.cmd_display_name'
+                                defaultMessage='Command display name.'
+                            />
+                        </div>
                     </div>
                     <div className='padding-top x2'>
                         <label className='control-label'>
@@ -638,7 +656,10 @@ export default class ManageCommandCmds extends React.Component {
                             disabled={disableButton}
                             onClick={this.addNewCmd}
                         >
-                            {'Add'}
+                            <FormattedMessage
+                                id='user.settings.cmds.add'
+                                defaultMessage='Add'
+                            />
                         </a>
                     </div>
                 </div>
diff --git a/web/react/components/user_settings/user_settings_notifications.jsx b/web/react/components/user_settings/user_settings_notifications.jsx
index 91a03eb70..0361aa8de 100644
--- a/web/react/components/user_settings/user_settings_notifications.jsx
+++ b/web/react/components/user_settings/user_settings_notifications.jsx
@@ -294,7 +294,7 @@ class NotificationsTab extends React.Component {
                 <span>
                     <FormattedMessage
                         id='user.settings.notifications.info'
-                        defaultMessage='Desktop notification sounds are available on Firefox, Safari, Chrome, Internet Explorer, and Edge.'
+                        defaultMessage='Desktop notification are available on Firefox, Safari, Chrome, Internet Explorer, and Edge.'
                     />
                 </span>
             );
@@ -395,7 +395,7 @@ class NotificationsTab extends React.Component {
             const extraInfo = (
                 <span>
                     <FormattedMessage
-                        id='user.settings.notifications.info'
+                        id='user.settings.notifications.sounds_info'
                         defaultMessage='Desktop notification sounds are available on Firefox, Safari, Chrome, Internet Explorer, and Edge.'
                     />
                 </span>
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index a160aa58f..76e64beed 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -355,7 +355,7 @@
   "admin.service.cmdsDesc": "When true, user created slash commands will be allowed.",
   "admin.service.integrationAdmin": "Enable Integrations for Admin Only: ",
   "admin.service.integrationAdminDesc": "When true, user created integrations can only be created by admins.",
-  "admin.service.overrideTitle": "Enable Overriding Usernames from Webhooks and Salsh Commands: ",
+  "admin.service.overrideTitle": "Enable Overriding Usernames from Webhooks and Slash Commands: ",
   "admin.service.overrideDescription": "When true, webhooks and slash commands will be allowed to change the username they are posting as. Note, combined with allowing icon overriding, this could open users up to phishing attacks.",
   "admin.service.iconTitle": "Enable Overriding Icon from Webhooks and Slash Commands: ",
   "admin.service.iconDescription": "When true, webhooks and slash commands will be allowed to change the icon they post with. Note, combined with allowing username overriding, this could open users up to phishing attacks.",
@@ -1057,6 +1057,41 @@
   "user.settings.import_theme.importBody": "To import a theme, go to a Slack team and look for “Preferences -> Sidebar Theme”. Open the custom theme option, copy the theme color values and paste them here:",
   "user.settings.import_theme.cancel": "Cancel",
   "user.settings.import_theme.submit": "Submit",
+  "user.settings.cmds.request_type_post": "POST",
+  "user.settings.cmds.request_type_get": "GET",
+  "user.settings.cmds.add_display_name.placeholder": "Display Name",
+  "user.settings.cmds.add_username.placeholder": "Username",
+  "user.settings.cmds.add_trigger.placeholder": "Command trigger e.g. \"hello\" not including the slash",
+  "user.settings.cmds.auto_complete_desc.placeholder": "A short description of what this commands does.",
+  "user.settings.cmds.auto_complete_hint.placeholder": "[zipcode]",
+  "user.settings.cmds.url.placeholder": "Must start with http:// or https://",
+  "user.settings.cmds.auto_complete.yes": "yes",
+  "user.settings.cmds.auto_complete.no": "no",
+  "user.settings.cmds.trigger": "Trigger: ",
+  "user.settings.cmds.display_name": "Display Name: ",
+  "user.settings.cmds.username": "Username: ",
+  "user.settings.cmds.icon_url": "Icon URL: ",
+  "user.settings.cmds.auto_complete": "Auto Complete: ",
+  "user.settings.cmds.auto_complete_desc": "Auto Complete Description: ",
+  "user.settings.cmds.auto_complete_hint": "Auto Complete Hint: ",
+  "user.settings.cmds.request_type": "Request Type: ",
+  "user.settings.cmds.url": "URL: ",
+  "user.settings.cmds.token": "Token: ",
+  "user.settings.cmds.regen": "Regen Token",
+  "user.settings.cmds.none": "None",
+  "user.settings.cmds.existing": "Existing commands",
+  "user.settings.cmds.add_desc": "Create commands to send message events to an external integration. Please see <a href=\"http://mattermost.org/commands\">http://mattermost.org/commands</a>  to learn more.",
+  "user.settings.cmds.add_new": "Add a new command",
+  "user.settings.cmds.cmd_display_name": "Command display name.",
+  "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_desc_desc": "A short description of what this commands does",
+  "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",
+  "user.settings.cmds.add": "Add",
   "user.settings.hooks_in.channel": "Channel: ",
   "user.settings.hooks_in.none": "None",
   "user.settings.hooks_in.existing": "Existing incoming webhooks",
@@ -1155,37 +1190,6 @@
   "user.settings.integrations.commands": "Commands",
   "user.settings.integrations.commandsDescription": "Manage your commands",
   "user.settings.integrations.title": "Integration Settings",
-  "user.settings.cmds.trigger": "Trigger: ",
-  "user.settings.cmds.display_name": "Display Name: ",
-  "user.settings.cmds.username": "Username: ",
-  "user.settings.cmds.icon_url": "Icon URL: ",
-  "user.settings.cmds.auto_complete": "Auto Complete: ",
-  "user.settings.cmds.auto_complete_desc": "Auto Complete Description: ",
-  "user.settings.cmds.auto_complete_hint": "Auto Complete Hint: ",
-  "user.settings.cmds.request_type": "Request Type: ",
-  "user.settings.cmds.request_type_post": "POST",
-  "user.settings.cmds.request_type_get": "GET",
-  "user.settings.cmds.url": "URL: ",
-  "user.settings.cmds.token": "Token: ",
-  "user.settings.cmds.regen": "Regen Token",
-  "user.settings.cmds.none": "None",
-  "Existing commands": "Existing commands",
-  "user.settings.cmds.add_desc": "Create commands to send message events to an external integration. Please see <a href=\"http://mattermost.org/commands\">http://mattermost.org/commands</a>  to learn more.",
-  "user.settings.cmds.add_display_name.placeholder": "Display Name",
-  "user.settings.cmds.existing": "Existing commands",
-  "user.settings.cmds.add_username.placeholder": "Username",
-  "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.add_trigger.placeholder": "Command trigger e.g. \"hello\" not including the slash",
-  "user.settings.cmds.auto_complete_desc_desc": "A short description of what this commands does",
-  "user.settings.cmds.auto_complete_help": "Show this command in autocomplete list.",
-  "user.settings.cmds.auto_complete_desc.placeholder": "A short description of what this commands does.",
-  "user.settings.cmds.auto_complete_hint.placeholder": "[zipcode]",
-  "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",
-  "user.settings.cmds.url.placeholder": "Must start with http:// or https://",
   "user.settings.modal.general": "General",
   "user.settings.modal.security": "Security",
   "user.settings.modal.notifications": "Notifications",
@@ -1206,9 +1210,10 @@
   "user.settings.notification.allActivity": "For all activity",
   "user.settings.notifications.onlyMentions": "Only for mentions and direct messages",
   "user.settings.notifications.never": "Never",
-  "user.settings.notifications.info": "Desktop notification sounds are available on Firefox, Safari, Chrome, Internet Explorer, and Edge.",
+  "user.settings.notifications.info": "Desktop notification are available on Firefox, Safari, Chrome, Internet Explorer, and Edge.",
   "user.settings.notifications.on": "On",
   "user.settings.notifications.off": "Off",
+  "user.settings.notifications.sounds_info": "Desktop notification sounds are available on Firefox, Safari, Chrome, Internet Explorer, and Edge.",
   "user.settings.notification.soundConfig": "Please configure notification sounds in your browser settings",
   "user.settings.notifications.emailInfo": "Email notifications are sent for mentions and direct messages after you’ve been offline for more than 60 seconds or away from {siteName} for more than 5 minutes.",
   "user.settings.notifications.sensitiveName": "Your case sensitive first name \"{first_name}\"",
diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json
index 0a780c442..962fe176a 100644
--- a/web/static/i18n/es.json
+++ b/web/static/i18n/es.json
@@ -293,12 +293,18 @@
   "admin.service.attemptDescription": "Inicio de sesión permitidos antes que el usuario sea bloqueado y se requiera volver a configurar la contraseña vía correo electrónico.",
   "admin.service.attemptExample": "Ej \"10\"",
   "admin.service.attemptTitle": "Máximo de intentos de conexión:",
+  "admin.service.cmdsDesc": "Cuando es verdadero, se permite la creación de comandos de barra por usuarios.",
+  "admin.service.cmdsTitle": "Habilitar Comandos de Barra: ",
   "admin.service.developerDesc": "(Opción de Desarrollador) Cuando está asignado en verdadero, información extra sobre errores se muestra en el UI.",
   "admin.service.developerTitle": "Habilitar modo de Desarrollador: ",
   "admin.service.false": "falso",
   "admin.service.googleDescription": "Asigna una llave a este campo para habilitar la previsualización de videos de YouTube tomados de los enlaces que aparecen en los mensajes o comentarios. Las instrucciones de como obtener una llave está disponible en <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">https://www.youtube.com/watch?v=Im69kzhpR3I</a>. Al dejar este campo en blanco deshabilita la generación de previsualizaciones de videos de YouTube desde los enlaces.",
   "admin.service.googleExample": "Ej \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
   "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.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:",
   "admin.service.listenDescription": "La dirección a la que se unirá y escuchará. Ingresar \":8065\" se podrá unir a todas las interfaces o podrá seleccionar una como ej: \"127.0.0.1:8065\".  Cambiando este valor es necesario reiniciar el servidor.",
   "admin.service.listenExample": "Ej \":8065\"",
@@ -306,6 +312,8 @@
   "admin.service.mobileSessionDaysDesc": "La sesión nativa de los dispositivos moviles expirará luego de transcurrido el numero de días especificado y se solicitará al usuario que inicie sesión nuevamente.",
   "admin.service.outWebhooksDesc": "Cuando es verdadero, los webhooks de salida serán permitidos.",
   "admin.service.outWebhooksTitle": "Habilitar Webhooks de Salida: ",
+  "admin.service.overrideDescription": "Cuando es verdadero, se le permitirá cambiar el nombre de usuario desde webhooks. Nota, en conjunto con cambio de icono, podría exponer a los usuarios a sufrir ataques de phishing.",
+  "admin.service.overrideTitle": "Habilitar el cambio de nombres de usuario desde los Webhooks: ",
   "admin.service.save": "Guardar",
   "admin.service.saving": "Guardando....",
   "admin.service.securityDesc": "Cuando es verdadero, Los Administradores del Sistema serán notificados por correo electrónico se han anunciado alertas de seguridad relevantes en las últimas 12 horas. Requiere que los correos estén habilitados.",
@@ -894,8 +902,8 @@
   "sidebar.tutorialScreen1": "<h4>Canales</h4><p><strong>Canales</strong> organizan las conversaciones en diferentes tópicos. Son abiertos para cualquier persona de tu equipo. Para enviar comunicaciones privadas con una sola persona utiliza <strong>Mensajes Directos</strong> o con multiples personas utilizando <strong>Grupos Privados</strong>.</p>",
   "sidebar.tutorialScreen2": "<h4>Canal \"General\"</h4><p>Este es un canal para comenzar:</p><p><strong>General</strong> es el lugar para tener comunicación con todo el equipo. Todos los integrantes de tu equipo son miembros de este canal.</p>",
   "sidebar.tutorialScreen3": "<h4>Creando y Uniendose a Canales</h4><p>Pincha en <strong>\"Más...\"</strong> para crear un nuevo canal o unirte a uno existente.</p><p>También puedes crear un nuevo canal o grupo privado al pinchar el simbolo de <strong>\"+\"</strong> que se encuentra al lado del encabezado de Canales o Grupos Privados.</p>",
-  "sidebar.unreadAbove": "Mensaje(s) sin leer arriba",
-  "sidebar.unreadBelow": "Mensaje(s) sin leer abajo",
+  "sidebar.unreadAbove": "Mensaje(s) sin leer ▲",
+  "sidebar.unreadBelow": "Mensaje(s) sin leer ▼",
   "sidebar_header.tutorial": "<h4>Menú Principal</h4><p>El <strong>Menú Principal</strong> es donde puedes <strong>Invitar a nuevos miembros</strong>, podrás <strong>Configurar tu Cuenta</strong> y seleccionar un <strong>Tema</strong> para personalizar la apariencia.</p><p>Los administradores del Equipo podrán <strong>Configurar el Equipo</strong> desde este menú.</p><p>Los administradores del Sistema encontrarán una opción para ir a la <strong>Consola de Sistema</strong> para administrar el sistema completo.</p>",
   "sidebar_right_menu.accountSettings": "Configurar tu Cuenta",
   "sidebar_right_menu.console": "Consola del Sistema",
@@ -1054,6 +1062,41 @@
   "user.settings.appearance.save": "Guardar",
   "user.settings.appearance.themeColors": "Selecciona un Tema",
   "user.settings.appearance.title": "Configuraciones de Apariencia",
+  "user.settings.cmds.add": "Agregar",
+  "user.settings.cmds.add_desc": "Crea comandos que permitan enviar eventos a integraciones externas. Por favor revisa <a href=\"http://mattermost.org/commands\">http://mattermost.org/commands</a>  para aprender más.",
+  "user.settings.cmds.add_display_name.placeholder": "Nombre a mostrar",
+  "user.settings.cmds.add_new": "Agregar un nuevo comando",
+  "user.settings.cmds.add_trigger.placeholder": "Gatillador del Comando ej. \"hola\" no se debe incluir la barra",
+  "user.settings.cmds.add_username.placeholder": "Nombre de usuario",
+  "user.settings.cmds.auto_complete": "Auto completado: ",
+  "user.settings.cmds.auto_complete.no": "no",
+  "user.settings.cmds.auto_complete.yes": "sí",
+  "user.settings.cmds.auto_complete_desc": "Descripción del Auto Completado: ",
+  "user.settings.cmds.auto_complete_desc.placeholder": "Una pequeña descripción de que hace el comando.",
+  "user.settings.cmds.auto_complete_desc_desc": "Una pequeña descripción de que hace el comando",
+  "user.settings.cmds.auto_complete_help": "Mostrar este comando en la lista de auto completado.",
+  "user.settings.cmds.auto_complete_hint": "Pista de auto completado: ",
+  "user.settings.cmds.auto_complete_hint.placeholder": "[código postal]",
+  "user.settings.cmds.auto_complete_hint_desc": "Lista de parámetros que recibe el comando.",
+  "user.settings.cmds.cmd_display_name": "Nombre a mostrar del Comando.",
+  "user.settings.cmds.display_name": "Nombre a mostrar: ",
+  "user.settings.cmds.existing": "Comandos existentes",
+  "user.settings.cmds.icon_url": "URL del icono: ",
+  "user.settings.cmds.icon_url_desc": "URL para un icono",
+  "user.settings.cmds.none": "Ninguno",
+  "user.settings.cmds.regen": "Regenerar Token",
+  "user.settings.cmds.request_type": "Tipo de Solicitud: ",
+  "user.settings.cmds.request_type_desc": "Tipo de solicitud emitido al callback URL por el Comando.",
+  "user.settings.cmds.request_type_get": "GET",
+  "user.settings.cmds.request_type_post": "POST",
+  "user.settings.cmds.token": "Token: ",
+  "user.settings.cmds.trigger": "Gatillador: ",
+  "user.settings.cmds.trigger_desc": "Palabra que gatilla la acción",
+  "user.settings.cmds.url": "URL: ",
+  "user.settings.cmds.url.placeholder": "Debe comenzar con http:// o https://",
+  "user.settings.cmds.url_desc": "URL que va a recibir el evento HTTP POST o GET",
+  "user.settings.cmds.username": "Nombre de usuario: ",
+  "user.settings.cmds.username_desc": "El nombre de usuario a utilizar cuando se genere el mensaje.",
   "user.settings.custom_theme.awayIndicator": "Indicador Ausente",
   "user.settings.custom_theme.buttonBg": "Fondo Botón",
   "user.settings.custom_theme.buttonColor": "Texto Botón",
@@ -1151,6 +1194,8 @@
   "user.settings.import_theme.importHeader": "Importar Tema de Slack",
   "user.settings.import_theme.submit": "Enviar",
   "user.settings.import_theme.submitError": "Formato inválido, por favor intenta copiando y pegando nuevamente.",
+  "user.settings.integrations.commands": "Comandos",
+  "user.settings.integrations.commandsDescription": "Administra tus comandos",
   "user.settings.integrations.incomingWebhooks": "Webhooks de entrada",
   "user.settings.integrations.incomingWebhooksDescription": "Administra tus webhooks de entrada",
   "user.settings.integrations.outWebhooks": "Webhooks de salida",
@@ -1188,6 +1233,7 @@
   "user.settings.notifications.sensitiveName": "Tu nombre con distinción de mayúsculas \"{first_name}\"",
   "user.settings.notifications.sensitiveUsername": "Tu nombre de usuario sin distinción de mayúsculas \"{username}\"",
   "user.settings.notifications.sensitiveWords": "Otras palabras sin distinción de mayúsculas, separadas por comas:",
+  "user.settings.notifications.sounds_info": "Las notificaciones de sonido de Escritorio están disponibles en Firefox, Safari, Chrome, Internet Explorer, y Edge.",
   "user.settings.notifications.teamWide": "Menciones para todo el equipo \"@all\"",
   "user.settings.notifications.title": "Configuracón de Notificaciones",
   "user.settings.notifications.usernameMention": "Tu nombre de usuario mencionado \"@{username}\"",