mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-30 13:30:25 +02:00
Merge remote-tracking branch 'nickvergessen/ticket/9361' into develop-olympus
* nickvergessen/ticket/9361: [ticket/9361] View correct error messages when editing account information
This commit is contained in:
@@ -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',
|
||||
|
Reference in New Issue
Block a user