Add missing en locs and translations to es

webapp/components/user_settings/user_settings_display.jsx

@@ -304,7 +304,7 @@ export default class UserSettingsDisplay extends React.Component {
                 describe = (
                     <FormattedMessage
                         id='user.settings.display.showUsername'
-                        defaultMessage='Show username (team default)'
+                        defaultMessage='Show username (default)'
                     />
                 );
             } else if (this.state.nameFormat === 'full_name') {

webapp/components/user_settings/user_settings_security.jsx

@@ -1,6 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
+import $ from 'jquery';
 import SettingItemMin from '../setting_item_min.jsx';
 import SettingItemMax from '../setting_item_max.jsx';
 import AccessHistoryModal from '../access_history_modal.jsx';
@@ -247,7 +248,7 @@ class SecurityTab extends React.Component {
                 extraInfo = (
                     <span>
                         <FormattedMessage
-                            id='user.settings.mfa.addHelp'
+                            id='user.settings.mfa.addHelpQr'
                             defaultMessage='Please scan the QR code with the Google Authenticator app on your smartphone and fill in the token with one provided by the app.'
                         />
                     </span>