diff options
author | enahum <nahumhbl@gmail.com> | 2016-04-08 18:04:23 -0300 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-04-08 14:04:23 -0700 |
commit | df77179eccffbb77f684abde45cac743f5d0b414 (patch) | |
tree | 524312a7033c11a4daeb9fa2b4aa2283765bdd9d /i18n/en.json | |
parent | 77ee1ce7fee698847e211dc15d4673300901aa48 (diff) | |
download | chat-df77179eccffbb77f684abde45cac743f5d0b414.tar.gz chat-df77179eccffbb77f684abde45cac743f5d0b414.tar.bz2 chat-df77179eccffbb77f684abde45cac743f5d0b414.zip |
Fix email verification process (#2664)
- Fix email verification URL in login view
- Fix URL in email being sent for verification
- Add Email Verification on password reset
- Fix display of email in reset password
- Fix URL en team_signup_password_page
- Fix typo in webapp en loc
- Add missing es locs
- Removed extra es, fr and pt locs
Diffstat (limited to 'i18n/en.json')
-rw-r--r-- | i18n/en.json | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/i18n/en.json b/i18n/en.json index 5d154001c..17f1ba7c8 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -2208,6 +2208,10 @@ "translation": "Invalid thumbnail width for file settings. Must be a positive number." }, { + "id": "model.config.is_valid.ldap_security.app_error", + "translation": "Invalid connection security for LDAP settings. Must be '', 'TLS', or 'STARTTLS'" + }, + { "id": "model.config.is_valid.listen_address.app_error", "translation": "Invalid listen address for service settings Must be set." }, @@ -2244,10 +2248,6 @@ "translation": "Invalid maximum open connection for SQL settings. Must be a positive number." }, { - "id": "model.config.is_valid.ldap_security.app_error", - "translation": "Invalid connection security for LDAP settings. Must be '', 'TLS', or 'STARTTLS'" - }, - { "id": "model.file_info.get.gif.app_error", "translation": "Could not decode gif." }, |