diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-14 19:01:06 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-14 19:01:06 +0100 |
| commit | 69f943c8d6884365165bd222b80feccbf4e70d6f (patch) | |
| tree | abf1b2b402513930b98f6327166c0b30b09bc700 /phpBB/language | |
| parent | f31da015fcad1efb792e78462af7eb56e1abcabc (diff) | |
| parent | 14af18cb1b81e5dcee70c9eccb35d19f17af6948 (diff) | |
| download | forums-69f943c8d6884365165bd222b80feccbf4e70d6f.tar forums-69f943c8d6884365165bd222b80feccbf4e70d6f.tar.gz forums-69f943c8d6884365165bd222b80feccbf4e70d6f.tar.bz2 forums-69f943c8d6884365165bd222b80feccbf4e70d6f.tar.xz forums-69f943c8d6884365165bd222b80feccbf4e70d6f.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/9361' into develop-olympus
* nickvergessen/ticket/9361:
[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 c1e3c06c43..3ebc863447 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', |