Multiple UI Improvements

1 files changed, 11 insertions, 5 deletions

diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index 7d427935c..6915f7d26 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -190,10 +190,10 @@
   "admin.ldap.uernameAttrDesc": "The attribute in the LDAP server that will be used to populate the username field in Mattermost. This may be the same as the ID Attribute.",
   "admin.ldap.usernameAttrEx": "Ex \"sAMAccountName\"",
   "admin.ldap.usernameAttrTitle": "Username Attribute:",
-  "admin.licence.keyMigration": "If you’re migrating servers you may need to remove your license key from this server in order to install it on a new server. To start,<a href=\"http://mattermost.com\" target=\"_blank\">disable all Enterprise Edition features on this server</a>.This will enable the ability to remove the license key and downgrade this server from Enterprise Edition to Team Edition.",
+  "admin.licence.keyMigration": "If you’re migrating servers you may need to remove your license key from this server in order to install it on a new server. To start, <a href=\"http://mattermost.com\" target=\"_blank\">disable all Enterprise Edition features on this server</a>. This will enable the ability to remove the license key and downgrade this server from Enterprise Edition to Team Edition.",
   "admin.license.edition": "Edition: ",
   "admin.license.enterpriseEdition": "Mattermost Enterprise Edition. Designed for enterprise-scale communication.",
-  "admin.license.enterpriseType": "<div><p>This compiled release of Mattermost platform is provided under a <a href=\"http://mattermost.com\" target=\"_blank\">commercial license</a>from Mattermost, Inc. based on your subscription level and is subject to the <a href=\"{terms}\" target=\"_blank\">Terms of Service.</a></p><p>Your subscription details are as follows:</p>Name: {name}<br />Company or organization name: {company}<br/>Number of users: {users}<br/>License issued: {issued}<br/>Start date of license: {start}<br/>Expiry date of license: {expires}<br/>LDAP: {ldap}<br/></div>",
+  "admin.license.enterpriseType": "<div><p>This compiled release of Mattermost platform is provided under a <a href=\"http://mattermost.com\" target=\"_blank\">commercial license</a> from Mattermost, Inc. based on your subscription level and is subject to the <a href=\"{terms}\" target=\"_blank\">Terms of Service.</a></p><p>Your subscription details are as follows:</p>Name: {name}<br />Company or organization name: {company}<br/>Number of users: {users}<br/>License issued: {issued}<br/>Start date of license: {start}<br/>Expiry date of license: {expires}<br/>LDAP: {ldap}<br/></div>",
   "admin.license.key": "License Key: ",
   "admin.license.keyRemove": "Remove Enterprise License and Downgrade Server",
   "admin.license.removing": "Removing License...",
@@ -277,8 +277,8 @@
   "admin.service.attemptTitle": "Maximum Login Attempts:",
   "admin.service.cmdsDesc": "When true, user created slash commands will be allowed.",
   "admin.service.cmdsTitle": "Enable Slash Commands: ",
-  "admin.service.corsEx": "http://example.com https://example.com",
   "admin.service.corsDescription": "Enable HTTP Cross origin request from specific domains (separate by a spacebar). Use \"*\" if you want to allow CORS from any domain or leave it blank to disable it.",
+  "admin.service.corsEx": "http://example.com https://example.com",
   "admin.service.corsTitle": "Allow Cross-origin Requests from:",
   "admin.service.developerDesc": "(Developer Option) When true, extra information around errors will be displayed in the UI.",
   "admin.service.developerTitle": "Enable Developer Mode: ",
@@ -561,7 +561,7 @@
   "channel_loader.wrote": " wrote: ",
   "channel_members_modal.addNew": " Add New Members",
   "channel_members_modal.close": "Close",
-  "channel_members_modal.removeMember": "Remove Member",
+  "channel_members_modal.remove": "Remove",
   "channel_memebers_modal.members": " Members",
   "channel_modal.cancel": "Cancel",
   "channel_modal.channel": "Channel",
@@ -966,7 +966,7 @@
   "sso_signup.team_error": "Please enter a team name",
   "suggestion.mention.all": "Notifies everyone in the team",
   "suggestion.mention.channel": "Notifies everyone in the channel",
-  "suggestion.search.private": "Public Groups",
+  "suggestion.search.private": "Private Groups",
   "suggestion.search.public": "Public Channels",
   "team_export_tab.download": "download",
   "team_export_tab.export": "Export",
@@ -1054,9 +1054,15 @@
   "team_signup_welcome.validEmailError": "Please enter a valid email address",
   "team_signup_welcome.welcome": "Welcome to:",
   "team_signup_welcome.yes": "Yes, this address is correct",
+  "textbox.bold": "**bold**",
   "textbox.edit": "Edit message",
   "textbox.help": "Help",
+  "textbox.inlinecode": "`inline code`",
+  "textbox.italic": "_italic_",
+  "textbox.preformatted": "```preformatted```",
   "textbox.preview": "Preview",
+  "textbox.quote": ">quote",
+  "textbox.strike": "strike",
   "tutorial_intro.allSet": "You’re all set",
   "tutorial_intro.end": "Click “Next” to enter Town Square. This is the first channel teammates see when they sign up. Use it for posting updates everyone needs to know.",
   "tutorial_intro.invite": "Invite teammates",