summaryrefslogtreecommitdiffstats
path: root/i18n/en.json
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-06-29 09:17:09 -0300
committerChristopher Speller <crspeller@gmail.com>2016-06-29 08:17:09 -0400
commitb418d78517b4fbdb6ad405ad8b3b483f2fd624d5 (patch)
tree38f59382e473fc976ea382da965b05f567874b83 /i18n/en.json
parentb63f61fe7d022bf1569993afbd9441ee7db2feca (diff)
downloadchat-b418d78517b4fbdb6ad405ad8b3b483f2fd624d5.tar.gz
chat-b418d78517b4fbdb6ad405ad8b3b483f2fd624d5.tar.bz2
chat-b418d78517b4fbdb6ad405ad8b3b483f2fd624d5.zip
daily translations 20160628 (#3444)
Diffstat (limited to 'i18n/en.json')
-rw-r--r--i18n/en.json16
1 files changed, 8 insertions, 8 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 9200428a5..6f74d1d3e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2108,6 +2108,10 @@
"translation": "User not registered on LDAP server"
},
{
+ "id": "ent.ldap.mattermost_user_update",
+ "translation": "Mattermost user was updated by LDAP server."
+ },
+ {
"id": "ent.ldap.syncdone.info",
"translation": "LDAP Synchronization completed"
},
@@ -2120,10 +2124,6 @@
"translation": "Invalid LDAP Filter"
},
{
- "id": "ent.ldap.mattermost_user_update",
- "translation": "Mattermost user was updated by LDAP server."
- },
- {
"id": "ent.mfa.activate.authenticate.app_error",
"translation": "Error attempting to authenticate MFA token"
},
@@ -2512,6 +2512,10 @@
"translation": "Invalid thumbnail width for file settings. Must be a positive number."
},
{
+ "id": "model.config.is_valid.ldap_required.app_error",
+ "translation": "Required LDAP field missing."
+ },
+ {
"id": "model.config.is_valid.ldap_security.app_error",
"translation": "Invalid connection security for LDAP settings. Must be '', 'TLS', or 'STARTTLS'"
},
@@ -2520,10 +2524,6 @@
"translation": "Invalid sync interval time. Must be at least one minute."
},
{
- "id": "model.config.is_valid.ldap_required.app_error",
- "translation": "Required LDAP field missing."
- },
- {
"id": "model.config.is_valid.listen_address.app_error",
"translation": "Invalid listen address for service settings Must be set."
},