diff options
| author | Andreas Gohr <gohr@cosmocode.de> | 2011-10-31 15:41:53 +0100 |
|---|---|---|
| committer | Andreas Gohr <gohr@cosmocode.de> | 2011-10-31 15:58:36 +0100 |
| commit | cc204bbd1f1625352ddd0edaacdd297fe022881c (patch) | |
| tree | ea7f952e01acf8b7b051a0dcd85dc9af747815cf /inc/lang/en | |
| parent | 222298bcee7f8e8fd98bb6fc1bcfb821ac1e55cd (diff) | |
| download | rpg-cc204bbd1f1625352ddd0edaacdd297fe022881c.tar.gz rpg-cc204bbd1f1625352ddd0edaacdd297fe022881c.tar.bz2 | |
honor autopasswd setting for resend password
When autopasswd is disabled, the resend password option now asks for a
new password instead of autogenerating a new one and sending it by mail.
Note to translators: the wording for btn_resendpwd and resendpwd changed
to be more universal. English and German language files where updated -
other languages need to be adjusted.
Conflicts:
inc/lang/en/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 89a7c4d40..9d26a4957 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. + |