summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webapp/components/admin_console/admin_sidebar.jsx2
-rw-r--r--webapp/i18n/en.json30
2 files changed, 31 insertions, 1 deletions
diff --git a/webapp/components/admin_console/admin_sidebar.jsx b/webapp/components/admin_console/admin_sidebar.jsx
index 28769d484..565279e72 100644
--- a/webapp/components/admin_console/admin_sidebar.jsx
+++ b/webapp/components/admin_console/admin_sidebar.jsx
@@ -566,7 +566,7 @@ export default class AdminSidebar extends React.Component {
name='rate'
title={
<FormattedMessage
- id='admin.sidebar.rate'
+ id='admin.sidebar.rateLimiting'
defaultMessage='Rate Limiting'
/>
}
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 40acbd97f..c0c8c74be 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -82,6 +82,7 @@
"add_outgoing_webhook.triggerWordsOrChannelRequired": "A valid channel or a list of trigger words is required",
"admin.audits.reload": "Reload User Activity Logs",
"admin.audits.title": "User Activity Logs",
+ "admin.authentication.gitlab": "GitLab",
"admin.banner.heading": "Note:",
"admin.compliance.directoryDescription": "Directory to which compliance reports are written. If blank, will be set to ./data/.",
"admin.compliance.directoryExample": "Ex \"./data/\"",
@@ -125,6 +126,7 @@
"admin.connectionSecurityTitle": "Connection Security:",
"admin.connectionSecurityTls": "TLS",
"admin.connectionSecurityTlsDescription": "Encrypts the communication between Mattermost and your server.",
+ "admin.customization.customBrand": "Custom Branding",
"admin.customization.customEmoji": "Custom Emoji",
"admin.customization.enableCustomEmojiDesc": "Enable users to create custom emoji for use in chat messages.",
"admin.customization.enableCustomEmojiTitle": "Enable Custom Emoji:",
@@ -132,6 +134,9 @@
"admin.customization.restrictCustomEmojiCreationDesc": "Restrict the creation of custom emoji to certain users.",
"admin.customization.restrictCustomEmojiCreationSystemAdmin": "Only allow system admins to create custom emoji",
"admin.customization.restrictCustomEmojiCreationTitle": "Restrict Custom Emoji Creation:",
+ "admin.customization.support": "Legal and Support",
+ "admin.database.title": "Database Settings",
+ "admin.developer.title": "Developer Settings",
"admin.email.agreeHPNS": " I understand and accept the Mattermost Hosted Push Notification Service <a href=\"https://about.mattermost.com/hpns-terms/\" target=\"_blank\">Terms of Service</a> and <a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">Privacy Policy</a>.",
"admin.email.allowEmailSignInDescription": "When true, Mattermost allows users to sign in using their email and password.",
"admin.email.allowEmailSignInTitle": "Allow Sign In With Email: ",
@@ -191,10 +196,20 @@
"admin.email.smtpUsernameTitle": "SMTP Username:",
"admin.email.testing": "Testing...",
"admin.false": "false",
+ "admin.files.images": "Images",
+ "admin.files.storage": "Storage",
+ "admin.general.configuration": "Configuration",
"admin.general.localization": "Localization",
"admin.general.localization.availableLocalesDescription": "Determines which languages are available for users in Account Settings. (Leave it blank to have all supported languages available)",
+ "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:",
"admin.general.localization.serverLocaleDescription": "Default language for system messages and logs. Changing this will require a server restart before taking effect.",
+ "admin.general.localization.serverLocaleTitle": "Default Server Language:",
+ "admin.general.log": "Logging",
+ "admin.general.privacy": "Privacy",
+ "admin.general.title": "General Settings",
+ "admin.general.usersAndTeams": "Users and Teams",
"admin.gitab.clientSecretDescription": "Obtain this value via the instructions above for logging into GitLab.",
"admin.gitlab.EnableHtmlDesc": "<ol><li>Log in to your GitLab account and go to Profile Settings -> Applications.</li><li>Enter Redirect URIs \"<your-mattermost-url>/login/gitlab/complete\" (example: http://localhost:8065/login/gitlab/complete) and \"<your-mattermost-url>/signup/gitlab/complete\". </li><li>Then use \"Secret\" and \"Id\" fields from GitLab to complete the options below.</li><li>Complete the Endpoint URLs below. </li></ol>",
"admin.gitlab.authDescription": "Enter https://<your-gitlab-url>/oauth/authorize (example https://example.com:3000/oauth/authorize). Make sure you use HTTP or HTTPS in your URL depending on your server configuration.",
@@ -255,6 +270,8 @@
"admin.image.thumbWidthDescription": "Width of thumbnails generated from uploaded images. Updating this value changes how thumbnail images render in future, but does not change images created in the past.",
"admin.image.thumbWidthExample": "Ex \"120\"",
"admin.image.thumbWidthTitle": "Thumbnail Width:",
+ "admin.integrations.external": "External Services",
+ "admin.integrations.webhook": "Webhooks and Commands",
"admin.ldap.baseDesc": "The Base DN is the Distinguished Name of the location where Mattermost should start its search for users in the LDAP tree.",
"admin.ldap.baseEx": "Ex \"ou=Unit Name,dc=corp,dc=example,dc=com\"",
"admin.ldap.baseTitle": "BaseDN:",
@@ -343,6 +360,9 @@
"admin.nav.logout": "Logout",
"admin.nav.report": "Report a Problem",
"admin.nav.switch": "Team Selection",
+ "admin.notifications.email": "Email",
+ "admin.notifications.push": "Mobile Push",
+ "admin.notifications.title": "Notification Settings",
"admin.privacy.showEmailDescription": "When false, hides email address of users from other users in the user interface, including team owners and team administrators. Used when system is set up for managing teams where some users choose to keep their contact information private.",
"admin.privacy.showEmailTitle": "Show Email Address: ",
"admin.privacy.showFullNameDescription": "When false, hides full name of users from other users, including team owners and team administrators. Username is shown in place of full name.",
@@ -362,6 +382,7 @@
"admin.rate.queriesTitle": "Number Of Queries Per Second:",
"admin.rate.remoteDescription": "When true, rate limit API access by IP address.",
"admin.rate.remoteTitle": "Vary By Remote Address: ",
+ "admin.rate.title": "Rate Limit Settings",
"admin.recycle.button": "Recycle Database Connections",
"admin.recycle.loading": " Recycling...",
"admin.recycle.reloadFail": "Recycling unsuccessful: {error}",
@@ -375,6 +396,13 @@
"admin.reset_password.submit": "Please enter at least {chars} characters.",
"admin.reset_password.titleReset": "Reset Password",
"admin.reset_password.titleSwitch": "Switch Account to Email/Password",
+ "admin.save": "Save",
+ "admin.saving": "Saving Config...",
+ "admin.security.connection": "Connections",
+ "admin.security.login": "Login",
+ "admin.security.public_links": "Public Links",
+ "admin.security.session": "Sessions",
+ "admin.security.signup": "Signup",
"admin.select_team.close": "Close",
"admin.select_team.select": "Select",
"admin.select_team.selectTeam": "Select Team",
@@ -444,6 +472,7 @@
"admin.sidebar.images": "Images",
"admin.sidebar.integrations": "Integrations",
"admin.sidebar.ldap": "LDAP",
+ "admin.sidebar.legalAndSupport": "Legal and Support",
"admin.sidebar.license": "Edition and License",
"admin.sidebar.localization": "Localization",
"admin.sidebar.logging": "Logging",
@@ -460,6 +489,7 @@
"admin.sidebar.security": "Security",
"admin.sidebar.sessions": "Sessions",
"admin.sidebar.settings": "SETTINGS",
+ "admin.sidebar.signUp": "Sign Up",
"admin.sidebar.sign_up": "Sign Up",
"admin.sidebar.statistics": "Statistics",
"admin.sidebar.storage": "Storage",