From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001 From: Marius Burkard <m.burkard@pixcept.de> Date: Wed, 20 Apr 2016 10:58:46 -0400 Subject: [PATCH] Merge branch 'stable-3.1' --- interface/web/login/lib/lang/en.lng | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/interface/web/login/lib/lang/en.lng b/interface/web/login/lib/lang/en.lng index e7487da..2db2d49 100644 --- a/interface/web/login/lib/lang/en.lng +++ b/interface/web/login/lib/lang/en.lng @@ -5,12 +5,15 @@ $wb['error_user_too_many_logins'] = "To many wrong login's, Please retry it after 15 minutes"; $wb['pass_reset_txt'] = 'A new password will be generated and send to your email address if the email address entered below matches the email address in your client settings.'; $wb['pw_reset'] = 'The password has been reset and send to your email address.'; +$wb['pw_reset_act'] = 'You have been sent an activation link. Please visit the link to confirm your password request.'; $wb['pw_error'] = 'Username or email address does not match.'; $wb['pw_error_noinput'] = 'Please enter email address and username.'; $wb['pw_reset_mail_msg'] = 'The password to your ISPConfig 3 control panel account has been reset. The new password is: '; -$wb['pw_reset_mail_title'] = 'ISPConfig 3 Control panel password has been reset.'; +$wb['pw_reset_mail_title'] = 'ISPConfig 3 Control panel password has been reset'; +$wb['pw_reset_act_mail_title'] = 'Confirm ISPConfig 3 Control panel password reset'; +$wb['pw_reset_act_mail_msg'] = 'Please confirm that your want to reset your ISPConfig 3 control panel account password by visiting the following activation link: '; $wb['user_regex_error'] = 'Username contains unallowed characters or is longer than 64 characters.'; -$wb['pw_error_length'] = 'The password length is > 64 characters.'; +$wb['pw_error_length'] = 'The password length is < 1 or > 256 characters.'; $wb['email_error'] = 'Email contains unallowed characters or has a invalid format.'; $wb['login_txt'] = "Login"; $wb['username_txt'] = "Username"; @@ -25,4 +28,7 @@ $wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.'; $wb['stay_logged_in_txt'] = 'Keep me logged in'; $wb['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.'; +$wb['lost_password_function_wait_txt'] = 'You cannot request a new password, yet. Please wait a few minutes.'; +$wb['lost_password_function_expired_txt'] = 'This activation link has expired. Please request a new one.'; +$wb['lost_password_function_denied_txt'] = 'This activation link is not valid.'; ?> -- Gitblit v1.9.1