From 11bf05813a66b85248e62a15b5874423b7c2e13d Mon Sep 17 00:00:00 2001 From: Yang Chen Date: Tue, 18 Oct 2016 19:55:17 -0400 Subject: =?UTF-8?q?Changed=20=E2=80=9CApply=20New=20Theme=20to=20All=20Tea?= =?UTF-8?q?ms=E2=80=9D=20to=20=E2=80=9CApply=20new=20theme=20to=20all=20my?= =?UTF-8?q?=20teams=E2=80=9D=20(#4260)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webapp/components/user_settings/user_settings_theme.jsx | 2 +- webapp/i18n/en.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/webapp/components/user_settings/user_settings_theme.jsx b/webapp/components/user_settings/user_settings_theme.jsx index f1bed0085..fb3665984 100644 --- a/webapp/components/user_settings/user_settings_theme.jsx +++ b/webapp/components/user_settings/user_settings_theme.jsx @@ -301,7 +301,7 @@ export default class ThemeSetting extends React.Component { /> diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 921fc17d2..b8b5e1249 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1836,6 +1836,7 @@ "user.settings.display.showNickname": "Show nickname if one exists, otherwise show first and last name", "user.settings.display.showUsername": "Show username (default)", "user.settings.display.teammateDisplay": "Teammate Name Display", + "user.settings.display.theme.applyToAllTeams": "Apply new theme to all my teams", "user.settings.display.theme.customTheme": "Custom Theme", "user.settings.display.theme.describe": "Open to manage your theme", "user.settings.display.theme.import": "Import theme colors from Slack", -- cgit v1.2.3-1-g7c22