diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-05-17 17:51:42 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-05-17 17:51:42 -0400 |
| commit | edd453c6cd6daf1b4c6e1ea7ce2721db16e25214 (patch) | |
| tree | b5d616a061d949fc894fe07f03c06d2b20338476 /i18n/en.json | |
| parent | 0fe75cb7826944a3352705d5e78eba1d12cc213a (diff) | |
| parent | ac509b114df1c1b4b841eded74fb797805e0162d (diff) | |
| download | chat-edd453c6cd6daf1b4c6e1ea7ce2721db16e25214.tar.gz chat-edd453c6cd6daf1b4c6e1ea7ce2721db16e25214.tar.bz2 chat-edd453c6cd6daf1b4c6e1ea7ce2721db16e25214.zip | |
Merge branch 'release-3.0'
Diffstat (limited to 'i18n/en.json')
| -rw-r--r-- | i18n/en.json | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/i18n/en.json b/i18n/en.json index 40f722add..6ecfece69 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3512,6 +3512,10 @@ "translation": "An account with that email already exists." }, { + "id": "store.sql_user.save.email_exists.ldap_app_error", + "translation": "This account does not use LDAP authentication. Please sign in using email and password." + }, + { "id": "store.sql_user.save.existing.app_error", "translation": "Must call update for exisiting user" }, @@ -3528,6 +3532,10 @@ "translation": "An account with that username already exists." }, { + "id": "store.sql_user.save.username_exists.ldap_app_error", + "translation": "An account with that username already exists. Please contact your Administrator." + }, + { "id": "store.sql_user.update.app_error", "translation": "We couldn't update the account" }, |