diff options
| author | enahum <nahumhbl@gmail.com> | 2016-08-04 10:45:36 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-08-04 11:45:36 -0400 |
| commit | f5d69cb813cb9307ac36e9a47dfc467c1e9f2d30 (patch) | |
| tree | 6e305d1606b2dd908194f9ae5a572df4f00608dd /i18n/en.json | |
| parent | 35cdc8f8431103a396cccd0b942dcd1f5fc6a93c (diff) | |
| download | chat-f5d69cb813cb9307ac36e9a47dfc467c1e9f2d30.tar.gz chat-f5d69cb813cb9307ac36e9a47dfc467c1e9f2d30.tar.bz2 chat-f5d69cb813cb9307ac36e9a47dfc467c1e9f2d30.zip | |
New Languages and translations (#3729)
Diffstat (limited to 'i18n/en.json')
| -rw-r--r-- | i18n/en.json | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/i18n/en.json b/i18n/en.json index 17c136f7f..bf658b1aa 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1976,14 +1976,14 @@ "translation": "Failed to send welcome email successfully err=%v" }, { - "id": "api.user.update_active.permissions.app_error", - "translation": "You do not have the appropriate permissions" - }, - { "id": "api.user.update_active.no_deactivate_ldap.app_error", "translation": "You can not modify the activation status of LDAP accounts. Please modify through the LDAP server." }, { + "id": "api.user.update_active.permissions.app_error", + "translation": "You do not have the appropriate permissions" + }, + { "id": "api.user.update_mfa.not_available.app_error", "translation": "MFA not configured or available on this server" }, @@ -2180,14 +2180,6 @@ "translation": "Feature requires an enterprise license. Please contact your system administrator about upgrading your enterprise license." }, { - "id": "ent.migration.migratetoldap.duplicate_field", - "translation": "Unable to migrate LDAP users with specified field. Duplicate entry detected. Please remove all duplcates and try again." - }, - { - "id": "ent.migration.migratetoldap.user_not_found", - "translation": "Unable to find user on LDAP server: " - }, - { "id": "ent.brand.save_brand_image.decode.app_error", "translation": "Unable to decode image." }, @@ -2324,6 +2316,14 @@ "translation": "Error trying to authenticate MFA token" }, { + "id": "ent.migration.migratetoldap.duplicate_field", + "translation": "Unable to migrate LDAP users with specified field. Duplicate entry detected. Please remove all duplcates and try again." + }, + { + "id": "ent.migration.migratetoldap.user_not_found", + "translation": "Unable to find user on LDAP server: " + }, + { "id": "ent.saml.build_request.app_error", "translation": "An error occurred while initiating the request to the Identity Provider. Please contact your System Administrator." }, |