Merge pull request #2076 from ZBoxApp/loc-fix

PLT-7: Fix and Add new loc strings

1 files changed, 38 insertions, 33 deletions

diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index 4481e58ae..9338cc766 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -404,7 +404,7 @@
   "admin.service.cmdsDesc": "When true, user created slash commands will be allowed.",
   "admin.service.integrationAdmin": "Enable Integrations for Admin Only: ",
   "admin.service.integrationAdminDesc": "When true, user created integrations can only be created by admins.",
-  "admin.service.overrideTitle": "Enable Overriding Usernames from Webhooks and Salsh Commands: ",
+  "admin.service.overrideTitle": "Enable Overriding Usernames from Webhooks and Slash Commands: ",
   "admin.service.overrideDescription": "When true, webhooks and slash commands will be allowed to change the username they are posting as. Note, combined with allowing icon overriding, this could open users up to phishing attacks.",
   "admin.service.iconTitle": "Enable Overriding Icon from Webhooks and Slash Commands: ",
   "admin.service.iconDescription": "When true, webhooks and slash commands will be allowed to change the icon they post with. Note, combined with allowing username overriding, this could open users up to phishing attacks.",
@@ -1058,6 +1058,41 @@
   "user.settings.import_theme.importBody": "To import a theme, go to a Slack team and look for “Preferences -> Sidebar Theme”. Open the custom theme option, copy the theme color values and paste them here:",
   "user.settings.import_theme.cancel": "Cancel",
   "user.settings.import_theme.submit": "Submit",
+  "user.settings.cmds.request_type_post": "POST",
+  "user.settings.cmds.request_type_get": "GET",
+  "user.settings.cmds.add_display_name.placeholder": "Display Name",
+  "user.settings.cmds.add_username.placeholder": "Username",
+  "user.settings.cmds.add_trigger.placeholder": "Command trigger e.g. \"hello\" not including the slash",
+  "user.settings.cmds.auto_complete_desc.placeholder": "A short description of what this commands does.",
+  "user.settings.cmds.auto_complete_hint.placeholder": "[zipcode]",
+  "user.settings.cmds.url.placeholder": "Must start with http:// or https://",
+  "user.settings.cmds.auto_complete.yes": "yes",
+  "user.settings.cmds.auto_complete.no": "no",
+  "user.settings.cmds.trigger": "Trigger: ",
+  "user.settings.cmds.display_name": "Display Name: ",
+  "user.settings.cmds.username": "Username: ",
+  "user.settings.cmds.icon_url": "Icon URL: ",
+  "user.settings.cmds.auto_complete": "Auto Complete: ",
+  "user.settings.cmds.auto_complete_desc": "Auto Complete Description: ",
+  "user.settings.cmds.auto_complete_hint": "Auto Complete Hint: ",
+  "user.settings.cmds.request_type": "Request Type: ",
+  "user.settings.cmds.url": "URL: ",
+  "user.settings.cmds.token": "Token: ",
+  "user.settings.cmds.regen": "Regen Token",
+  "user.settings.cmds.none": "None",
+  "user.settings.cmds.existing": "Existing commands",
+  "user.settings.cmds.add_desc": "Create commands to send message events to an external integration. Please see <a href=\"http://mattermost.org/commands\">http://mattermost.org/commands</a>  to learn more.",
+  "user.settings.cmds.add_new": "Add a new command",
+  "user.settings.cmds.cmd_display_name": "Command display name.",
+  "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_desc_desc": "A short description of what this commands does",
+  "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",
+  "user.settings.cmds.add": "Add",
   "user.settings.hooks_in.channel": "Channel: ",
   "user.settings.hooks_in.none": "None",
   "user.settings.hooks_in.existing": "Existing incoming webhooks",
@@ -1156,37 +1191,6 @@
   "user.settings.integrations.commands": "Commands",
   "user.settings.integrations.commandsDescription": "Manage your commands",
   "user.settings.integrations.title": "Integration Settings",
-  "user.settings.cmds.trigger": "Trigger: ",
-  "user.settings.cmds.display_name": "Display Name: ",
-  "user.settings.cmds.username": "Username: ",
-  "user.settings.cmds.icon_url": "Icon URL: ",
-  "user.settings.cmds.auto_complete": "Auto Complete: ",
-  "user.settings.cmds.auto_complete_desc": "Auto Complete Description: ",
-  "user.settings.cmds.auto_complete_hint": "Auto Complete Hint: ",
-  "user.settings.cmds.request_type": "Request Type: ",
-  "user.settings.cmds.request_type_post": "POST",
-  "user.settings.cmds.request_type_get": "GET",
-  "user.settings.cmds.url": "URL: ",
-  "user.settings.cmds.token": "Token: ",
-  "user.settings.cmds.regen": "Regen Token",
-  "user.settings.cmds.none": "None",
-  "Existing commands": "Existing commands",
-  "user.settings.cmds.add_desc": "Create commands to send message events to an external integration. Please see <a href=\"http://mattermost.org/commands\">http://mattermost.org/commands</a>  to learn more.",
-  "user.settings.cmds.add_display_name.placeholder": "Display Name",
-  "user.settings.cmds.existing": "Existing commands",
-  "user.settings.cmds.add_username.placeholder": "Username",
-  "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.add_trigger.placeholder": "Command trigger e.g. \"hello\" not including the slash",
-  "user.settings.cmds.auto_complete_desc_desc": "A short description of what this commands does",
-  "user.settings.cmds.auto_complete_help": "Show this command in autocomplete list.",
-  "user.settings.cmds.auto_complete_desc.placeholder": "A short description of what this commands does.",
-  "user.settings.cmds.auto_complete_hint.placeholder": "[zipcode]",
-  "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",
-  "user.settings.cmds.url.placeholder": "Must start with http:// or https://",
   "user.settings.modal.general": "General",
   "user.settings.modal.security": "Security",
   "user.settings.modal.notifications": "Notifications",
@@ -1207,9 +1211,10 @@
   "user.settings.notification.allActivity": "For all activity",
   "user.settings.notifications.onlyMentions": "Only for mentions and direct messages",
   "user.settings.notifications.never": "Never",
-  "user.settings.notifications.info": "Desktop notification sounds are available on Firefox, Safari, Chrome, Internet Explorer, and Edge.",
+  "user.settings.notifications.info": "Desktop notifications are available on Firefox, Safari, Chrome, Internet Explorer, and Edge.",
   "user.settings.notifications.on": "On",
   "user.settings.notifications.off": "Off",
+  "user.settings.notifications.sounds_info": "Desktop notifications sounds are available on Firefox, Safari, Chrome, Internet Explorer, and Edge.",
   "user.settings.notification.soundConfig": "Please configure notification sounds in your browser settings",
   "user.settings.notifications.emailInfo": "Email notifications are sent for mentions and direct messages after you’ve been offline for more than 60 seconds or away from {siteName} for more than 5 minutes.",
   "user.settings.notifications.sensitiveName": "Your case sensitive first name \"{first_name}\"",