From: Gergő Tisza Date: Thu, 14 Jun 2018 06:36:14 +0000 (+0000) Subject: Improve help text of forced password change X-Git-Tag: 1.34.0-rc.0~5074^2 X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=429de588b0815ce8325e41882df95f2126e9e878;p=lhc%2Fweb%2Fwiklou.git Improve help text of forced password change "reset" sounds confusing; password reset normally means you get a new random password via email. (This is mainly a problem in resetpass-validity-soft, where the current wording might make one think that the password will automatically reset if they skip the form now; the patch changes the other resetpass-* messages as well for consistency.) Change-Id: I3a7129c941ff597741ebdaf0aea15ffdc91e0779 --- diff --git a/languages/i18n/en.json b/languages/i18n/en.json index ee098ddc6c..a4655a1251 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -568,13 +568,13 @@ "resetpass-submit-loggedin": "Change password", "resetpass-submit-cancel": "Cancel", "resetpass-wrong-oldpass": "Invalid temporary or current password.\nYou may have already changed your password or requested a new temporary password.", - "resetpass-recycled": "Please reset your password to something other than your current password.", + "resetpass-recycled": "Please change your password to something other than your current password.", "resetpass-temp-emailed": "You logged in with a temporary emailed code.\nTo finish logging in, you must set a new password here:", "resetpass-temp-password": "Temporary password:", "resetpass-abort-generic": "Password change has been aborted by an extension.", "resetpass-expired": "Your password has expired. Please set a new password to log in.", - "resetpass-expired-soft": "Your password has expired and needs to be reset. Please choose a new password now, or click \"{{int:authprovider-resetpass-skip-label}}\" to reset it later.", - "resetpass-validity-soft": "Your password is not valid: $1\n\nPlease choose a new password now, or click \"{{int:authprovider-resetpass-skip-label}}\" to reset it later.", + "resetpass-expired-soft": "Your password has expired and needs to be changed. Please choose a new password now, or click \"{{int:authprovider-resetpass-skip-label}}\" to change it later.", + "resetpass-validity-soft": "Your password is not valid: $1\n\nPlease choose a new password now, or click \"{{int:authprovider-resetpass-skip-label}}\" to change it later.", "passwordreset": "Reset password", "passwordreset-text-one": "Complete this form to receive a temporary password via email.", "passwordreset-text-many": "{{PLURAL:$1|Fill in one of the fields to receive a temporary password via email.}}",