diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-05-11 02:36:47 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-05-11 02:37:25 -0400 |
| commit | 03d3f9adb5d35c27ce58a29c9a0bc229eaf97ca0 (patch) | |
| tree | 3017e1f48f48f9be59515568c63152674d9b1503 /phpBB/language | |
| parent | 61eb0151f0bd9ea5a0f1b229fc80de35a4fac2cf (diff) | |
| parent | 1fcb269616c4241cf93bc8d7db4a202a4e5f79f8 (diff) | |
| download | forums-03d3f9adb5d35c27ce58a29c9a0bc229eaf97ca0.tar forums-03d3f9adb5d35c27ce58a29c9a0bc229eaf97ca0.tar.gz forums-03d3f9adb5d35c27ce58a29c9a0bc229eaf97ca0.tar.bz2 forums-03d3f9adb5d35c27ce58a29c9a0bc229eaf97ca0.tar.xz forums-03d3f9adb5d35c27ce58a29c9a0bc229eaf97ca0.zip | |
Merge PR #785 branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10835] changing "e-mail" to "email"
[ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entry
[ticket/10835] fixing misleading message in UCP
Conflicts:
phpBB/language/en/ucp.php
Diffstat (limited to 'phpBB/language')
| -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 2212e44628..87dced4786 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -134,7 +134,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 email 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…', |