diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2012-03-10 15:47:05 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2012-03-10 15:47:05 +0100 |
| commit | 50fbf1b6522a235e93ba72c50d0f54e09506604a (patch) | |
| tree | 37c31125df63879026f02df9db8a92d14061a629 /inc/lang/en | |
| parent | 7980e1acf1a671646747e5b924f2c8e208280a2e (diff) | |
| parent | 8a9735e34dc99c24355e0aee74a3cd49aa3b1492 (diff) | |
| download | rpg-50fbf1b6522a235e93ba72c50d0f54e09506604a.tar.gz rpg-50fbf1b6522a235e93ba72c50d0f54e09506604a.tar.bz2 | |
Merge branch 'resetpassword'
No longer autogenerate passwords for password reset when
$conf['autopasswd'] is disabled. Instead allow to change the password
online.
* resetpassword:
added a timelimit for password reset tokens
removed commented line
use correct lang string for password mismatch
removed outdated language string. it has to be retranslated
German translation for password reset
honor autopasswd setting for resend password
Conflicts:
inc/lang/no/lang.php
inc/lang/sl/lang.php
Diffstat (limited to 'inc/lang/en')
| -rw-r--r-- | inc/lang/en/lang.php | 4 | ||||
| -rw-r--r-- | inc/lang/en/resetpwd.txt | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 24974ea5e..e0fe98b86 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -43,7 +43,7 @@ $lang['btn_backtomedia'] = 'Back to Mediafile Selection'; $lang['btn_subscribe'] = 'Manage Subscriptions'; $lang['btn_profile'] = 'Update Profile'; $lang['btn_reset'] = 'Reset'; -$lang['btn_resendpwd'] = 'Send new password'; +$lang['btn_resendpwd'] = 'Set new password'; $lang['btn_draft'] = 'Edit draft'; $lang['btn_recover'] = 'Recover draft'; $lang['btn_draftdel'] = 'Delete draft'; @@ -84,7 +84,7 @@ $lang['profchanged'] = 'User profile successfully updated.'; $lang['pwdforget'] = 'Forgotten your password? Get a new one'; $lang['resendna'] = 'This wiki does not support password resending.'; -$lang['resendpwd'] = 'Send new password for'; +$lang['resendpwd'] = 'Set new password for'; $lang['resendpwdmissing'] = 'Sorry, you must fill in all fields.'; $lang['resendpwdnouser'] = 'Sorry, we can\'t find this user in our database.'; $lang['resendpwdbadauth'] = 'Sorry, this auth code is not valid. Make sure you used the complete confirmation link.'; diff --git a/inc/lang/en/resetpwd.txt b/inc/lang/en/resetpwd.txt new file mode 100644 index 000000000..993b48765 --- /dev/null +++ b/inc/lang/en/resetpwd.txt @@ -0,0 +1,4 @@ +====== Set new password ====== + +Please enter a new password for your account in this wiki. + |