diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-02-08 07:57:21 -0500 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-02-08 07:57:21 -0500 |
commit | 96cb7345dafbf07027acb9dc05fc7d0808a4ac38 (patch) | |
tree | 0df3f431dd2d2a0561dff3341f4cd8331a32108c /web/static/i18n/en.json | |
parent | be70bbc2f027bcc32d54e03c6b66f7e3aadec425 (diff) | |
parent | 39b35b7b394cdc2391beaff8b96cd733400ebcb8 (diff) | |
download | chat-96cb7345dafbf07027acb9dc05fc7d0808a4ac38.tar.gz chat-96cb7345dafbf07027acb9dc05fc7d0808a4ac38.tar.bz2 chat-96cb7345dafbf07027acb9dc05fc7d0808a4ac38.zip |
Merge pull request #2089 from mattermost/plt-1205
PLT-1205 Remove appearance settings tab and move theme management to display s…
Diffstat (limited to 'web/static/i18n/en.json')
-rw-r--r-- | web/static/i18n/en.json | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index 0ce679a27..5b03f0130 100644 --- a/web/static/i18n/en.json +++ b/web/static/i18n/en.json @@ -1130,12 +1130,6 @@ "user.settings.advance.sendDesc": "If enabled 'Enter' inserts a new line and 'Ctrl + Enter' submits the message.", "user.settings.advance.preReleaseDesc": "Check any pre-released features you'd like to preview. You may also need to refresh the page before the setting will take effect.", "user.settings.advance.title": "Advanced Settings", - "user.settings.appearance.themeColors": "Theme Colors", - "user.settings.appearance.customTheme": "Custom Theme", - "user.settings.appearance.save": "Save", - "user.settings.appearance.cancel": "Cancel", - "user.settings.appearance.title": "Appearance Settings", - "user.settings.appearance.import": "Import theme colors from Slack", "user.settings.developer.applicationsPreview": "Applications (Preview)", "user.settings.developer.thirdParty": "Open to register a new third-party application", "user.settings.developer.register": "Register New Application", @@ -1153,6 +1147,11 @@ "user.settings.display.nameOptsDesc": "Set how to display other user's names in posts and the Direct Messages list.", "user.settings.display.fontDesc": "Select the font displayed in the Mattermost user interface.", "user.settings.display.title": "Display Settings", + "user.settings.display.theme.themeColors": "Theme Colors", + "user.settings.display.theme.customTheme": "Custom Theme", + "user.settings.display.theme.import": "Import theme colors from Slack", + "user.settings.display.theme.title": "Theme", + "user.settings.display.theme.describe": "Open to manage your theme", "user.settings.general.usernameReserved": "This username is reserved, please choose a new one.", "user.settings.general.usernameRestrictions": "'Username must begin with a letter, and contain between {min} to {max} lowercase characters made up of numbers, letters, and the symbols '.', '-' and '_'.", "user.settings.general.validEmail": "Please enter a valid email address", @@ -1254,7 +1253,7 @@ "intro_messages.teammate": "This is the start of your direct message history with this teammate. Direct messages and files shared here are not shown to people outside this area.", "intro_messages.offTopic": "<h4 class=\"channel-intro__title\">Beginning of {display_name}</h4><p class=\"channel-intro__content\">This is the start of {display_name}, a channel for non-work-related conversations.<br/></p>", "intro_messages.inviteOthers": "Invite others to this team", - "intro_messages.default": "<h4 class='channel-intro__title'>Beginning of {display_name}</h4><p class='channel-intro__content'><strong>Welcome to {display_name}!'</strong><br/><br/>This is the first channel teammates see when they sign up - use it for posting updates everyone needs to know.</p>", + "intro_messages.default": "<h4 class='channel-intro__title'>Beginning of {display_name}</h4><p class='channel-intro__content'><strong>Welcome to {display_name}!</strong><br/><br/>This is the first channel teammates see when they sign up - use it for posting updates everyone needs to know.</p>", "intro_messages.group": "private group", "intro_messages.onlyInvited": " Only invited members can see this private group.", "intro_messages.channel": "channel", |