diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 723052576f..a56774ffa8 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -298,6 +298,8 @@
"admin.general.configuration": "Configuration",
"admin.general.localization": "Localization",
"admin.general.localization.availableLocalesDescription": "Set which languages are available for users in Account Settings (leave this field blank to have all supported languages available). If you’re manually adding new languages, the Default Client Language must be added before saving this setting.
Would like to help with translations? Join the Mattermost Translation Server to contribute.",
+ "admin.general.localization.availableLocalesNoResults": "No results found",
+ "admin.general.localization.availableLocalesNotPresent": "The default client language must be included in the available list",
"admin.general.localization.availableLocalesTitle": "Available Languages:",
"admin.general.localization.clientLocaleDescription": "Default language for newly created users and pages where the user hasn't logged in.",
"admin.general.localization.clientLocaleTitle": "Default Client Language:",
@@ -348,12 +350,16 @@
"admin.image.amazonS3BucketDescription": "Name you selected for your S3 bucket in AWS.",
"admin.image.amazonS3BucketExample": "E.g.: \"mattermost-media\"",
"admin.image.amazonS3BucketTitle": "Amazon S3 Bucket:",
+ "admin.image.amazonS3EndpointDescription": "Hostname of your S3 Compatible Storage provider. Defaults to `s3.amazonaws.com`.",
+ "admin.image.amazonS3EndpointTitle": "Amazon S3 Endpoint:",
"admin.image.amazonS3IdDescription": "Obtain this credential from your Amazon EC2 administrator.",
"admin.image.amazonS3IdExample": "E.g.: \"AKIADTOVBGERKLCBV\"",
"admin.image.amazonS3IdTitle": "Amazon S3 Access Key ID:",
"admin.image.amazonS3RegionDescription": "AWS region you selected for creating your S3 bucket.",
"admin.image.amazonS3RegionExample": "E.g.: \"us-east-1\"",
"admin.image.amazonS3RegionTitle": "Amazon S3 Region:",
+ "admin.image.amazonS3SSLDescription": "When false, allow insecure connections to Amazon S3. Defaults to secure connections only.",
+ "admin.image.amazonS3SSLTitle": "Enable Secure Amazon S3 Connections:",
"admin.image.amazonS3SecretDescription": "Obtain this credential from your Amazon EC2 administrator.",
"admin.image.amazonS3SecretExample": "E.g.: \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
"admin.image.amazonS3SecretTitle": "Amazon S3 Secret Access Key:",
@@ -638,6 +644,8 @@
"admin.service.corsTitle": "Enable cross-origin requests from:",
"admin.service.developerDesc": "When true, Javascript errors are shown in a red bar at the top of the user interface. Not recommended for use in production. ",
"admin.service.developerTitle": "Enable Developer Mode: ",
+ "admin.service.forward80To443": "Forward port 80 to 443:",
+ "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443",
"admin.service.googleDescription": "Set this key to enable the display of titles for embedded YouTube video previews. Without the key, YouTube previews will still be created based on hyperlinks appearing in messages or comments but they will not show the video title. View a Google Developers Tutorial for instructions on how to obtain a key.",
"admin.service.googleExample": "E.g.: \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
"admin.service.googleTitle": "Google API Key:",
@@ -647,6 +655,8 @@
"admin.service.insecureTlsTitle": "Enable Insecure Outgoing Connections: ",
"admin.service.integrationAdmin": "Restrict managing integrations to Admins:",
"admin.service.integrationAdminDesc": "When true, webhooks and slash commands can only be created, edited and viewed by Team and System Admins, and OAuth 2.0 applications by System Admins. Integrations are available to all users after they have been created by the Admin.",
+ "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt Certificate Cache File:",
+ "admin.service.letsEncryptCertificateCacheFileDescription": "Certificates retrieved and other data about the Let's Encrypt service will be stored in this file.",
"admin.service.listenAddress": "Listen Address:",
"admin.service.listenDescription": "The address and port to which to bind and listen. Specifying \":8065\" will bind to all network interfaces. Specifying \"127.0.0.1:8065\" will only bind to the network interface having that IP address. If you choose a port of a lower level (called \"system ports\" or \"well-known ports\", in the range of 0-1023), you must have permissions to bind to that port. On Linux you can use: \"sudo setcap cap_net_bind_service=+ep ./bin/platform\" to allow Mattermost to bind to well-known ports.",
"admin.service.listenExample": "E.g.: \":8065\"",
@@ -658,6 +668,8 @@
"admin.service.outWebhooksTitle": "Enable Outgoing Webhooks: ",
"admin.service.overrideDescription": "When true, webhooks, slash commands and other integrations, such as Zapier, will be allowed to change the username they are posting as. Note: Combined with allowing integrations to override profile picture icons, users may be able to perform phishing attacks by attempting to impersonate other users.",
"admin.service.overrideTitle": "Enable integrations to override usernames:",
+ "admin.service.readTimeout": "Read Timeout:",
+ "admin.service.readTimeoutDescription": "Maximum time allowed from when the connection is accepted to when the request body is fully read.",
"admin.service.securityDesc": "When true, System Administrators are notified by email if a relevant security fix alert has been announced in the last 12 hours. Requires email to be enabled.",
"admin.service.securityTitle": "Enable Security Alerts: ",
"admin.service.segmentDescription": "Segment.com is an online service that can be optionally used to track detailed system statistics. You can obtain a key by signing-up for a free account at Segment.com.",
@@ -673,10 +685,18 @@
"admin.service.ssoSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. If the authentication method is SAML or GitLab, the user may automatically be logged back in to Mattermost if they are already logged in to SAML or GitLab. After changing this setting, the setting will take effect after the next time the user enters their credentials.",
"admin.service.testingDescription": "When true, /loadtest slash command is enabled to load test accounts, data and text formatting. Changing this requires a server restart before taking effect.",
"admin.service.testingTitle": "Enable Testing Commands: ",
+ "admin.service.tlsCertFile": "TLS Certificate File:",
+ "admin.service.tlsCertFileDescription": "The certificate file to use.",
+ "admin.service.tlsKeyFile": "TLS Key File:",
+ "admin.service.tlsKeyFileDescription": "The private key file to use.",
+ "admin.service.useLetsEncrypt": "Use Let's Encrypt:",
+ "admin.service.useLetsEncryptDescription": "Enable the automatic retreval of certificates from the Let's Encrypt. The certificate will be retrieved when a client attempts to connect from a new domain. This will work with multiple domains.",
"admin.service.webSessionDays": "Session length AD/LDAP and email (days):",
"admin.service.webSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. After changing this setting, the new session length will take effect after the next time the user enters their credentials.",
"admin.service.webhooksDescription": "When true, incoming webhooks will be allowed. To help combat phishing attacks, all posts from webhooks will be labelled by a BOT tag. See documentation to learn more.",
"admin.service.webhooksTitle": "Enable Incoming Webhooks: ",
+ "admin.service.writeTimeout": "Write Timeout:",
+ "admin.service.writeTimeoutDescription": "If using HTTP (insecure), this is the maximum time allowed from the end of reading the request headers until the response is written. If using HTTPS, it is the total time from when the connection is accepted until the response is written.",
"admin.sidebar.addTeamSidebar": "Add team from sidebar menu",
"admin.sidebar.advanced": "Advanced",
"admin.sidebar.audits": "Compliance and Auditing",
@@ -957,6 +977,7 @@
"authorize.title": "{appName} would like to connect to your Mattermost user account",
"backstage_list.search": "Search",
"backstage_navbar.backToMattermost": "Back to {siteName}",
+ "backstage_sidebar.emoji": "Custom Emoji",
"backstage_sidebar.integrations": "Integrations",
"backstage_sidebar.integrations.commands": "Slash Commands",
"backstage_sidebar.integrations.incoming_webhooks": "Incoming Webhooks",
@@ -971,6 +992,8 @@
"change_url.longer": "Must be longer than two characters",
"change_url.noUnderscore": "Can not contain two underscores in a row.",
"change_url.startWithLetter": "Must start with a letter or number",
+ "channelHeader.addToFavorites": "Add to Favorites",
+ "channelHeader.removeFromFavorites": "Remove from Favorites",
"channel_flow.alreadyExist": "A channel with that URL already exists",
"channel_flow.changeUrlDescription": "Some characters are not allowed in URLs and may be removed.",
"channel_flow.changeUrlTitle": "Change {term} URL",
@@ -997,8 +1020,8 @@
"channel_header.viewInfo": "View Info",
"channel_header.viewMembers": "View Members",
"channel_header.webrtc.call": "Start Video Call",
- "channel_header.webrtc.unavailable": "New call unavailable until your existing call ends",
"channel_header.webrtc.offline": "The user is offline",
+ "channel_header.webrtc.unavailable": "New call unavailable until your existing call ends",
"channel_info.about": "About",
"channel_info.close": "Close",
"channel_info.header": "Header:",
@@ -1098,6 +1121,7 @@
"claim.oauth_to_email.switchTo": "Switch {type} to email and password",
"claim.oauth_to_email.title": "Switch {type} Account to Email",
"confirm_modal.cancel": "Cancel",
+ "connecting_screen": "Connecting",
"create_comment.addComment": "Add a comment...",
"create_comment.comment": "Add Comment",
"create_comment.commentLength": "Comment length must be less than {max} characters.",
@@ -1179,6 +1203,7 @@
"emoji_list.creator": "Creator",
"emoji_list.delete": "Delete",
"emoji_list.empty": "No Custom Emoji Found",
+ "emoji_list.header": "Custom Emoji",
"emoji_list.help": "Custom emoji are available to everyone on your server. Type ':' in a message box to bring up the emoji selection menu. Other users may need to refresh the page before new emojis appear.",
"emoji_list.help2": "Tip: If you add #, ##, or ### as the first character on a new line containing emoji, you can use larger sized emoji. To try it out, send a message such as: '# :smile:'.",
"emoji_list.image": "Image",
@@ -1210,6 +1235,7 @@
"filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 members} one {member} other {members}} of {total} total",
"filtered_user_list.member": "Member",
"filtered_user_list.search": "Press enter to search",
+ "filtered_user_list.searchButton": "Search",
"filtered_user_list.show": "Filter:",
"filtered_user_list.team_only": "Members of this Team",
"find_team.email": "Email",
@@ -1398,10 +1424,10 @@
"installed_outgoing_webhooks.search": "Search Outgoing Webhooks",
"installed_outgoing_webhooks.unknown_channel": "A Private Webhook",
"integrations.add": "Add",
- "integrations.edit": "Edit",
"integrations.command.description": "Slash commands send events to external integrations",
"integrations.command.title": "Slash Command",
"integrations.done": "Done",
+ "integrations.edit": "Edit",
"integrations.header": "Integrations",
"integrations.incomingWebhook.description": "Incoming webhooks allow external integrations to send messages",
"integrations.incomingWebhook.title": "Incoming Webhook",
@@ -1415,7 +1441,6 @@
"intro_messages.beginning": "Beginning of {name}",
"intro_messages.channel": "channel",
"intro_messages.creator": "This is the start of the {name} {type}, created by {creator} on {date}.",
- "intro_messages.purpose": " This {type}'s purpose is: {purpose}.",
"intro_messages.default": "
Welcome to {display_name}!
This is the first channel teammates see when they sign up - use it for posting updates everyone needs to know.
This is the start of {display_name}, a channel for non-work-related conversations.