| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -444,11 +444,13 @@ |
| 445 | 445 | 'resetpass_announce', |
| 446 | 446 | 'resetpass_text', |
| 447 | 447 | 'resetpass_header', |
| | 448 | + 'oldpassword', |
| | 449 | + 'newpassword', |
| | 450 | + 'retypenew', |
| 448 | 451 | 'resetpass_submit', |
| 449 | 452 | 'resetpass_success', |
| 450 | 453 | 'resetpass_bad_temporary', |
| 451 | 454 | 'resetpass_forbidden', |
| 452 | | - 'resetpass_missing', |
| 453 | 455 | 'resetpass-no-info', |
| 454 | 456 | 'resetpass-submit-loggedin', |
| 455 | 457 | 'resetpass-wrong-oldpass', |
| — | — | @@ -869,9 +871,6 @@ |
| 870 | 872 | 'prefs-resetpass', |
| 871 | 873 | 'saveprefs', |
| 872 | 874 | 'resetprefs', |
| 873 | | - 'oldpassword', |
| 874 | | - 'newpassword', |
| 875 | | - 'retypenew', |
| 876 | 875 | 'textboxsize', |
| 877 | 876 | 'rows', |
| 878 | 877 | 'columns', |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -997,17 +997,19 @@ |
| 998 | 998 | * Nederlands|nl', # do not translate or duplicate this message to other languages |
| 999 | 999 | |
| 1000 | 1000 | # Password reset dialog |
| 1001 | | -'resetpass' => 'Change or reset account password', |
| | 1001 | +'resetpass' => 'Change password', |
| 1002 | 1002 | 'resetpass_announce' => 'You logged in with a temporary e-mailed code. |
| 1003 | 1003 | To finish logging in, you must set a new password here:', |
| 1004 | 1004 | 'resetpass_text' => '<!-- Add text here -->', # only translate this message to other languages if you have to change it |
| 1005 | | -'resetpass_header' => 'Reset password', |
| | 1005 | +'resetpass_header' => 'Change account password', |
| | 1006 | +'oldpassword' => 'Old password:', |
| | 1007 | +'newpassword' => 'New password:', |
| | 1008 | +'retypenew' => 'Retype new password:', |
| 1006 | 1009 | 'resetpass_submit' => 'Set password and log in', |
| 1007 | 1010 | 'resetpass_success' => 'Your password has been changed successfully! Now logging you in...', |
| 1008 | 1011 | 'resetpass_bad_temporary' => 'Invalid temporary password. |
| 1009 | 1012 | You may have already successfully changed your password or requested a new temporary password.', |
| 1010 | 1013 | 'resetpass_forbidden' => 'Passwords cannot be changed', |
| 1011 | | -'resetpass_missing' => 'No form data.', |
| 1012 | 1014 | 'resetpass-no-info' => 'You must be logged in to access this page directly.', |
| 1013 | 1015 | 'resetpass-submit-loggedin' => 'Change password', |
| 1014 | 1016 | 'resetpass-wrong-oldpass' => 'Invalid temporary or current password. |
| — | — | @@ -1548,9 +1550,6 @@ |
| 1549 | 1551 | 'prefs-resetpass' => 'Change password', |
| 1550 | 1552 | 'saveprefs' => 'Save', |
| 1551 | 1553 | 'resetprefs' => 'Clear unsaved changes', |
| 1552 | | -'oldpassword' => 'Old password:', |
| 1553 | | -'newpassword' => 'New password:', |
| 1554 | | -'retypenew' => 'Retype new password:', |
| 1555 | 1554 | 'textboxsize' => 'Editing', |
| 1556 | 1555 | 'rows' => 'Rows:', |
| 1557 | 1556 | 'columns' => 'Columns:', |