From df77179eccffbb77f684abde45cac743f5d0b414 Mon Sep 17 00:00:00 2001 From: enahum Date: Fri, 8 Apr 2016 18:04:23 -0300 Subject: 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 --- i18n/en.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'i18n/en.json') diff --git a/i18n/en.json b/i18n/en.json index 5d154001c..17f1ba7c8 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -2207,6 +2207,10 @@ "id": "model.config.is_valid.file_thumb_width.app_error", "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." @@ -2243,10 +2247,6 @@ "id": "model.config.is_valid.sql_max_conn.app_error", "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." -- cgit v1.2.3-1-g7c22