summaryrefslogtreecommitdiffstats
path: root/i18n/en.json
diff options
context:
space:
mode:
Diffstat (limited to 'i18n/en.json')
-rw-r--r--i18n/en.json36
1 files changed, 34 insertions, 2 deletions
diff --git a/i18n/en.json b/i18n/en.json
index a5eb4f607..7b7ee344a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -401,7 +401,7 @@
},
{
"id": "api.context.unknown.app_error",
- "translation": "An unknown error has occured. Please contact support."
+ "translation": "An unknown error has occurred. Please contact support."
},
{
"id": "api.export.json.app_error",
@@ -957,7 +957,7 @@
},
{
"id": "api.team.email_teams.sending.error",
- "translation": "An error occured while sending an email in emailTeams err=%v"
+ "translation": "An error occurred while sending an email in emailTeams err=%v"
},
{
"id": "api.team.export_team.admin.app_error",
@@ -3406,5 +3406,37 @@
{
"id": "web.watcher_fail.error",
"translation": "Failed to add directory to watcher %v"
+ },
+ {
+ "id": "ent.ldap.do_login.licence_disable.app_error",
+ "translation": "LDAP functionality disabled by current license. Please contact your system administrator about upgrading your enterprise license."
+ },
+ {
+ "id": "ent.ldap.do_login.unable_to_connect.app_error",
+ "translation": "Unable to connect to LDAP server"
+ },
+ {
+ "id": "ent.ldap.do_login.bind_admin_user.app_error",
+ "translation": "Unable to bind to LDAP server. Check BindUsername and BindPassword."
+ },
+ {
+ "id": "ent.ldap.do_login.search_ldap_server.app_error",
+ "translation": "Failed to search LDAP server"
+ },
+ {
+ "id": "ent.ldap.do_login.user_not_registered.app_error",
+ "translation": "User not registered on LDAP server"
+ },
+ {
+ "id": "ent.ldap.do_login.matched_to_many_users.app_error",
+ "translation": "Username given matches multiple users"
+ },
+ {
+ "id": "ent.ldap.do_login.invalid_password.app_error",
+ "translation": "Invalid Password"
+ },
+ {
+ "id": "ent.ldap.do_login.unable_to_create_user.app_error",
+ "translation": "Credentials valid but unable to create user."
}
]