From 93101331bfe146b14fb02e7f57f1e334734878b4 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Thu, 17 Mar 2016 10:43:08 -0400 Subject: Changed 'show username' display text to be more accurate --- webapp/components/user_settings/user_settings_display.jsx | 2 +- webapp/i18n/en.json | 2 +- webapp/i18n/pt.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'webapp') 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 = ( ); const showNickname = ( diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index bb1f05c23..44c2636ba 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1174,7 +1174,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 +} -- cgit v1.2.3-1-g7c22