diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-02-08 11:57:32 -0500 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-02-08 11:57:32 -0500 |
commit | bb5ae99643237a9bf8bf48f494ddcd5ddf8eb5b5 (patch) | |
tree | b27b56c2a3e24268ba4a35a212aa773069e56528 /web/static/i18n/en.json | |
parent | 557157a979e9e473b442424c49821a24e45c7bdb (diff) | |
parent | 4d9a9ab8b9bdfe002e24cca5697ccb51d896b3ee (diff) | |
download | chat-bb5ae99643237a9bf8bf48f494ddcd5ddf8eb5b5.tar.gz chat-bb5ae99643237a9bf8bf48f494ddcd5ddf8eb5b5.tar.bz2 chat-bb5ae99643237a9bf8bf48f494ddcd5ddf8eb5b5.zip |
Merge pull request #2096 from ZBoxApp/new-locs
Add new localizations in english and spanish
Diffstat (limited to 'web/static/i18n/en.json')
-rw-r--r-- | web/static/i18n/en.json | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index 5b03f0130..64d06f46d 100644 --- a/web/static/i18n/en.json +++ b/web/static/i18n/en.json @@ -1089,7 +1089,7 @@ "user.settings.cmds.username_desc": "The username to use when overriding the post.", "user.settings.cmds.icon_url_desc": "URL to an icon", "user.settings.cmds.trigger_desc": "Word to trigger on", - "user.settings.cmds.auto_complete_help": "Show this command in autocomplete list.", + "user.settings.cmds.auto_complete_help": "Show this command in autocomplete list", "user.settings.cmds.auto_complete_hint_desc": "List parameters to be passed to the command.", "user.settings.cmds.request_type_desc": "Command request type issued to the callback URL.", "user.settings.cmds.url_desc": "URL that will receive the HTTP POST or GET event", @@ -1147,11 +1147,6 @@ "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", @@ -1194,7 +1189,6 @@ "user.settings.modal.general": "General", "user.settings.modal.security": "Security", "user.settings.modal.notifications": "Notifications", - "user.settings.modal.appearance": "Appearance", "user.settings.modal.developer": "Developer", "user.settings.modal.integrations": "Integrations", "user.settings.modal.display": "Display", @@ -1245,6 +1239,11 @@ "user.settings.security.title": "Security Settings", "user.settings.security.viewHistory": "View Access History", "user.settings.security.logoutActiveSessions": "View and Logout of Active Sessions", + "user.settings.display.theme.title": "Theme", + "user.settings.display.theme.describe": "Open to manage your theme", + "user.settings.display.theme.themeColors": "Theme Colors", + "user.settings.display.theme.customTheme": "Custom Theme", + "user.settings.display.theme.import": "Import theme colors from Slack", "view_image_popover.publicLink": "Get Public Link", "view_image_popover.file": "File {count} of {total}", "view_image_popover.download": "Download", @@ -1263,4 +1262,4 @@ "intro_messages.beginning": "Beginning of {name}", "intro_messages.invite": "Invite others to this {type}", "intro_messages.setHeader": "Set a Header" -} +}
\ No newline at end of file |