summaryrefslogtreecommitdiffstats
path: root/webapp/i18n
diff options
context:
space:
mode:
Diffstat (limited to 'webapp/i18n')
-rw-r--r--webapp/i18n/en.json4
-rw-r--r--webapp/i18n/es.json2
-rw-r--r--webapp/i18n/i18n.jsx1
3 files changed, 6 insertions, 1 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 1e0788ebe..85f221c7c 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -181,6 +181,7 @@
"admin.email.smtpUsernameTitle": "SMTP Username:",
"admin.email.testing": "Testing...",
"admin.false": "false",
+ "admin.general.localization": "Localization",
"admin.general.localization.availableLocalesDescription": "Determines which languages are available for users in Account Settings.",
"admin.general.localization.clientLocaleDescription": "Default language for newly created users and pages where the user hasn't logged in.",
"admin.general.localization.serverLocaleDescription": "Default language for system messages and logs. Changing this will require a server restart before taking effect.",
@@ -283,7 +284,7 @@
"admin.ldap.serverTitle": "LDAP Server:",
"admin.ldap.skipCertificateVerification": "Skip Certificate Verification",
"admin.ldap.skipCertificateVerificationDesc": "Skips the certificate verification step for TLS or STARTTLS connections. Not recommended for production environments where TLS is required. For testing only.",
- "admin.ldap.syncIntervalHelpText": "LDAP Synchronization is the process by which Mattermost updates its users to reflect any updated data on the LDAP server. For example if a name for a user is updated on the LDAP server, the change will be reflected in Mattermost when the synchronization is performed. Accounts that have been removed from the LDAP server will have their active sessions cleared and no longer be able to login to Mattermost. Mattermost will perform this synchronization regularly according to the interval supplied here. For example, if 60 is supplied, Mattermost will update the users every hour.",
+ "admin.ldap.syncIntervalHelpText": "LDAP Synchronization is the process by which Mattermost updates its users to reflect any updated data on the LDAP server. For example if a name for a user is updated on the LDAP server, the change will be reflected in Mattermost when the synchronization is performed. Accounts that have been removed from the LDAP server will have their active sessions cleared and no longer be able to login to Mattermost. Mattermost will perform this synchronization regularly according to the interval supplied here. For example, if 60 is supplied, Mattermost will update the users every hour. Changing this will require a server restart before taking effect.",
"admin.ldap.syncIntervalTitle": "Synchronization Interval (In Minutes)",
"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.userFilterDisc": "Optionally enter an LDAP Filter to use when searching for user objects. Only the users selected by the query will be able to access Mattermost. For Active Directory, the query to filter out disabled users is (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
@@ -433,6 +434,7 @@
"admin.sidebar.integrations": "Integrations",
"admin.sidebar.ldap": "LDAP",
"admin.sidebar.license": "Edition and License",
+ "admin.sidebar.localization": "Localization",
"admin.sidebar.logging": "Logging",
"admin.sidebar.login": "Login",
"admin.sidebar.logs": "Logs",
diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json
index 5680d7cb9..6ce2e77c3 100644
--- a/webapp/i18n/es.json
+++ b/webapp/i18n/es.json
@@ -181,6 +181,7 @@
"admin.email.smtpUsernameTitle": "Usuario SMTP:",
"admin.email.testing": "Probando...",
"admin.false": "falso",
+ "admin.general.localization": "Idiomas",
"admin.general.localization.availableLocalesDescription": "Determina qué idiomas están disponibles para los usuarios en la Configuración de la Cuenta.",
"admin.general.localization.clientLocaleDescription": "Idioma predeterminado para nuevos usuarios y páginas donde el usuario no ha iniciado sesión.",
"admin.general.localization.serverLocaleDescription": "Idioma predeterminado para los mensajes del sistema y los registros. Cambiar esto requerirá un reinicio del servidor antes de tomar efecto.",
@@ -431,6 +432,7 @@
"admin.sidebar.integrations": "Integraciones",
"admin.sidebar.ldap": "LDAP",
"admin.sidebar.license": "Edición y Licencia",
+ "admin.sidebar.localization": "Idiomas",
"admin.sidebar.logging": "Registros",
"admin.sidebar.login": "Inicio de Sesión",
"admin.sidebar.logs": "Registros",
diff --git a/webapp/i18n/i18n.jsx b/webapp/i18n/i18n.jsx
index 783cef975..3a66c5c33 100644
--- a/webapp/i18n/i18n.jsx
+++ b/webapp/i18n/i18n.jsx
@@ -13,6 +13,7 @@ import frLocaleData from 'react-intl/locale-data/fr';
import jaLocaleData from 'react-intl/locale-data/ja';
import ptLocaleData from 'react-intl/locale-data/pt';
+// should match the values in model/config.go
const languages = {
en: {
value: 'en',