diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-14 19:01:15 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-14 19:01:15 +0100 |
| commit | 2761a993ffeed0192cecd652301c3c7459eab011 (patch) | |
| tree | 54fff096f269530de8542c450af31e71b456d8c7 /phpBB/language | |
| parent | 34ed1352a63ece56185410385a81d881beb25731 (diff) | |
| parent | 69f943c8d6884365165bd222b80feccbf4e70d6f (diff) | |
| download | forums-2761a993ffeed0192cecd652301c3c7459eab011.tar forums-2761a993ffeed0192cecd652301c3c7459eab011.tar.gz forums-2761a993ffeed0192cecd652301c3c7459eab011.tar.bz2 forums-2761a993ffeed0192cecd652301c3c7459eab011.tar.xz forums-2761a993ffeed0192cecd652301c3c7459eab011.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9361] View correct error messages when editing account information
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/ucp.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index f4b1b591d6..c8ffbf31c0 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -138,6 +138,7 @@ $lang = array_merge($lang, array( 'CURRENT_IMAGE' => 'Current image', 'CURRENT_PASSWORD' => 'Current password', 'CURRENT_PASSWORD_EXPLAIN' => 'You must confirm your current password if you wish to change it, alter your e-mail address or username.', + 'CUR_PASSWORD_EMPTY' => 'You did not enter your current password.', 'CUR_PASSWORD_ERROR' => 'The current password you entered is incorrect.', 'CUSTOM_DATEFORMAT' => 'Custom…', @@ -268,9 +269,11 @@ $lang = array_merge($lang, array( 'MOVE_TO_FOLDER' => 'Move to folder', 'MOVE_UP' => 'Move up', + 'NEW_EMAIL_CONFIRM_EMPTY' => 'You did not enter a confirm e-mail address.', 'NEW_EMAIL_ERROR' => 'The e-mail addresses you entered do not match.', 'NEW_FOLDER_NAME' => 'New folder name', 'NEW_PASSWORD' => 'New password', + 'NEW_PASSWORD_CONFIRM_EMPTY' => 'You did not enter a confirm password.', 'NEW_PASSWORD_ERROR' => 'The passwords you entered do not match.', 'NOTIFY_METHOD' => 'Notification method', 'NOTIFY_METHOD_BOTH' => 'Both', |