From 2b852fb9c586c20a45b74a6e91230234d2321ba1 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Tue, 23 Feb 2016 09:57:39 -0300
Subject: Fix for PLT-1945, PLT-2012, PLT-2045 & PLT-2067 - Missing locs on
 server - Fix spanish locs

---
 web/react/components/admin_console/license_settings.jsx      | 3 +--
 web/react/components/admin_console/service_settings.jsx      | 4 +---
 web/react/components/channel_notifications_modal.jsx         | 2 +-
 web/react/components/user_settings/user_settings_general.jsx | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/admin_console/license_settings.jsx b/web/react/components/admin_console/license_settings.jsx
index 3332f37ef..fdbe912ef 100644
--- a/web/react/components/admin_console/license_settings.jsx
+++ b/web/react/components/admin_console/license_settings.jsx
@@ -203,8 +203,7 @@ class LicenseSettings extends React.Component {
                     <p className='help-text'>
                         <FormattedHTMLMessage
                             id='admin.license.uploadDesc'
-                            defaultMessage='Upload a license key for Mattermost Enterprise Edition to upgrade this server. <a href="http://mattermost.com" target="_blank">Visit us online</a>
-                             to learn more about the benefits of Enterprise Edition or to purchase a key.'
+                            defaultMessage='Upload a license key for Mattermost Enterprise Edition to upgrade this server. <a href="http://mattermost.com" target="_blank">Visit us online</a> to learn more about the benefits of Enterprise Edition or to purchase a key.'
                         />
                     </p>
                 </div>
diff --git a/web/react/components/admin_console/service_settings.jsx b/web/react/components/admin_console/service_settings.jsx
index f232d4633..047c7eb8d 100644
--- a/web/react/components/admin_console/service_settings.jsx
+++ b/web/react/components/admin_console/service_settings.jsx
@@ -287,9 +287,7 @@ class ServiceSettings extends React.Component {
                             <p className='help-text'>
                                 <FormattedHTMLMessage
                                     id='admin.service.googleDescription'
-                                    defaultMessage='Set this key to enable embedding of YouTube video previews based on hyperlinks appearing in messages or comments. Instructions to obtain a key available at
-                                    <a href="https://www.youtube.com/watch?v=Im69kzhpR3I" target="_blank">https://www.youtube.com/watch?v=Im69kzhpR3I</a>.
-                                    Leaving the field blank disables the automatic generation of YouTube video previews from links.'
+                                    defaultMessage='Set this key to enable embedding of YouTube video previews based on hyperlinks appearing in messages or comments. Instructions to obtain a key available at <a href="https://www.youtube.com/watch?v=Im69kzhpR3I" target="_blank">https://www.youtube.com/watch?v=Im69kzhpR3I</a>. Leaving the field blank disables the automatic generation of YouTube video previews from links.'
                                 />
                             </p>
                         </div>
diff --git a/web/react/components/channel_notifications_modal.jsx b/web/react/components/channel_notifications_modal.jsx
index 6591de687..7048434f8 100644
--- a/web/react/components/channel_notifications_modal.jsx
+++ b/web/react/components/channel_notifications_modal.jsx
@@ -153,7 +153,7 @@ export default class ChannelNotificationsModal extends React.Component {
                             />
                             <FormattedMessage
                                 id='channel_notifications.globalDefault'
-                                defaultMessage='Global default ({notifyLevel}'
+                                defaultMessage='Global default ({notifyLevel})'
                                 values={{
                                     notifyLevel: (globalNotifyLevelName)
                                 }}
diff --git a/web/react/components/user_settings/user_settings_general.jsx b/web/react/components/user_settings/user_settings_general.jsx
index cd229775f..2f2116c2a 100644
--- a/web/react/components/user_settings/user_settings_general.jsx
+++ b/web/react/components/user_settings/user_settings_general.jsx
@@ -22,7 +22,7 @@ const holders = defineMessages({
     },
     usernameRestrictions: {
         id: 'user.settings.general.usernameRestrictions',
-        defaultMessage: "'Username must begin with a letter, and contain between {min} to {max} lowercase characters made up of numbers, letters, and the symbols '.', '-' and '_'."
+        defaultMessage: "Username must begin with a letter, and contain between {min} to {max} lowercase characters made up of numbers, letters, and the symbols '.', '-' and '_'."
     },
     validEmail: {
         id: 'user.settings.general.validEmail',
-- 
cgit v1.2.3-1-g7c22