diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-04-01 08:46:03 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-04-01 08:46:03 -0400 |
| commit | 3aa240d74fe4137fcb0fa8038ede241a4e03b805 (patch) | |
| tree | 1d775d212777dc9b7e995670a2014af4604ae08b /webapp/components/user_settings/user_settings_display.jsx | |
| parent | da5de9eed36f2dde768398dc30c95a58e80f7b19 (diff) | |
| parent | 271876f3b53225611dfee40fd46917c6a477314b (diff) | |
| download | chat-3aa240d74fe4137fcb0fa8038ede241a4e03b805.tar.gz chat-3aa240d74fe4137fcb0fa8038ede241a4e03b805.tar.bz2 chat-3aa240d74fe4137fcb0fa8038ede241a4e03b805.zip | |
Merge pull request #2599 from ZBoxApp/locs
Add missing en locs and translations to es
Diffstat (limited to 'webapp/components/user_settings/user_settings_display.jsx')
| -rw-r--r-- | webapp/components/user_settings/user_settings_display.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/components/user_settings/user_settings_display.jsx b/webapp/components/user_settings/user_settings_display.jsx index d815bd371..d169e01b5 100644 --- a/webapp/components/user_settings/user_settings_display.jsx +++ b/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') { |