diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-03-17 12:05:17 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-03-17 12:05:17 -0400 |
| commit | 2cd006474ec8a808b2ea2b0502a842f44cb0b127 (patch) | |
| tree | 32b65030f082b562499bdd2856a510b931266a5e | |
| parent | a6a9dd76914b33d292a54d667ce6789c2b6b4b41 (diff) | |
| parent | 93101331bfe146b14fb02e7f57f1e334734878b4 (diff) | |
| download | chat-2cd006474ec8a808b2ea2b0502a842f44cb0b127.tar.gz chat-2cd006474ec8a808b2ea2b0502a842f44cb0b127.tar.bz2 chat-2cd006474ec8a808b2ea2b0502a842f44cb0b127.zip | |
Merge pull request #2461 from hmhealey/teamdefault
Changed 'show username' display text to be more accurate
| -rw-r--r-- | webapp/components/user_settings/user_settings_display.jsx | 2 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 2 | ||||
| -rw-r--r-- | webapp/i18n/pt.json | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/webapp/components/user_settings/user_settings_display.jsx b/webapp/components/user_settings/user_settings_display.jsx index 58d4493cb..3299588f7 100644 --- a/webapp/components/user_settings/user_settings_display.jsx +++ b/webapp/components/user_settings/user_settings_display.jsx @@ -195,7 +195,7 @@ export default class UserSettingsDisplay extends React.Component { const showUsername = ( <FormattedMessage id='user.settings.display.showUsername' - defaultMessage='Show username (team default)' + defaultMessage='Show username (default)' /> ); const showNickname = ( diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 94a78dbd6..cdce75760 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1176,7 +1176,7 @@ "user.settings.display.preferTime": "Select how you prefer time displayed.", "user.settings.display.showFullname": "Show first and last name", "user.settings.display.showNickname": "Show nickname if one exists, otherwise show first and last name", - "user.settings.display.showUsername": "Show username (team default)", + "user.settings.display.showUsername": "Show username (default)", "user.settings.display.teammateDisplay": "Teammate Name Display", "user.settings.display.theme.customTheme": "Custom Theme", "user.settings.display.theme.describe": "Open to manage your theme", diff --git a/webapp/i18n/pt.json b/webapp/i18n/pt.json index 0d8e5f4cb..17ffe1b16 100644 --- a/webapp/i18n/pt.json +++ b/webapp/i18n/pt.json @@ -1174,7 +1174,7 @@ "user.settings.display.preferTime": "Selecione como você prefere que a hora seja mostrada.", "user.settings.display.showFullname": "Mostrar primeiro e último nome", "user.settings.display.showNickname": "Mostras apelidos se um existir, caso contrário mostrar o primeiro e último nome", - "user.settings.display.showUsername": "Mostrar nome de usuário (equipe padrão)", + "user.settings.display.showUsername": "Mostrar nome de usuário (padrão)", "user.settings.display.teammateDisplay": "Nome de Exibição da Equipe de Trabalho", "user.settings.display.theme.customTheme": "Tema Customizado", "user.settings.display.theme.describe": "Abrir para gerenciar seu tema", @@ -1313,4 +1313,4 @@ "web.footer.terms": "Termos", "web.header.back": "Voltar", "web.root.singup_info": "Toda comunicação em um só lugar, pesquisável e acessível em qualquer lugar" -}
\ No newline at end of file +} |