diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-05-11 02:32:58 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-05-11 02:32:58 -0400 |
| commit | 1fcb269616c4241cf93bc8d7db4a202a4e5f79f8 (patch) | |
| tree | e03612f4773709543536320062c3ed7748a4d54e /phpBB/language/en/ucp.php | |
| parent | 4b3d80729332adbdac5060a1b561615cc35274ac (diff) | |
| parent | 74e9245df3b6652db10e46302510d27a54db827e (diff) | |
| download | forums-1fcb269616c4241cf93bc8d7db4a202a4e5f79f8.tar forums-1fcb269616c4241cf93bc8d7db4a202a4e5f79f8.tar.gz forums-1fcb269616c4241cf93bc8d7db4a202a4e5f79f8.tar.bz2 forums-1fcb269616c4241cf93bc8d7db4a202a4e5f79f8.tar.xz forums-1fcb269616c4241cf93bc8d7db4a202a4e5f79f8.zip | |
Merge PR #785 branch 'Senky/ticket/10835' into develop-olympus
* Senky/ticket/10835:
[ticket/10835] changing "e-mail" to "email"
[ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entry
[ticket/10835] fixing misleading message in UCP
Diffstat (limited to 'phpBB/language/en/ucp.php')
| -rw-r--r-- | phpBB/language/en/ucp.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 3ebc863447..7df26e040f 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -137,7 +137,8 @@ $lang = array_merge($lang, array( 'CREATE_FOLDER' => 'Add folder…', '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.', + 'CURRENT_PASSWORD_EXPLAIN' => 'You must enter your current password if you wish to alter your email address or username.', + 'CURRENT_CHANGE_PASSWORD_EXPLAIN' => 'To change your password, your email address, or your username, you must enter your current password.', 'CUR_PASSWORD_EMPTY' => 'You did not enter your current password.', 'CUR_PASSWORD_ERROR' => 'The current password you entered is incorrect.', 'CUSTOM_DATEFORMAT' => 'Custom…', |