diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-02-03 16:21:51 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-02-03 16:21:51 -0500 |
| commit | cddd63aae045a833e9a3ec4bb396b3987f95cbd3 (patch) | |
| tree | 69ac84e41f9333ec540fddb1d428c5bac97c0fd4 /phpBB/language/en/ucp.php | |
| parent | 6ad87d3aaf04fba5e58351c18fc78d1a9ee77dbb (diff) | |
| parent | ccf0cf649daabc600e8a79680e29c7bfbba32cac (diff) | |
| download | forums-cddd63aae045a833e9a3ec4bb396b3987f95cbd3.tar forums-cddd63aae045a833e9a3ec4bb396b3987f95cbd3.tar.gz forums-cddd63aae045a833e9a3ec4bb396b3987f95cbd3.tar.bz2 forums-cddd63aae045a833e9a3ec4bb396b3987f95cbd3.tar.xz forums-cddd63aae045a833e9a3ec4bb396b3987f95cbd3.zip | |
Merge remote-tracking branch 'imkingdavid/ticket/10535' into develop
* imkingdavid/ticket/10535:
[ticket/10535] Delete no longer needed email confirm language entries.
[ticket/10535] Delete email confirm from installer
[ticket/10535] Removed email confirm field from acp_users module
[ticket/10535] Forgot a subsilver2 change. *doh*
[ticket/10535] Removed email confirm from UCP, removed unused language entries
[ticket/10535] Remove email confirm check on registration form
Diffstat (limited to 'phpBB/language/en/ucp.php')
| -rw-r--r-- | phpBB/language/en/ucp.php | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 264b6ed4d8..aa1e9c27ce 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -122,8 +122,6 @@ $lang = array_merge($lang, array( 'CLICK_RETURN_FOLDER' => '%1$sReturn to your “%3$s” folder%2$s', 'CONFIRMATION' => 'Confirmation of registration', 'CONFIRM_CHANGES' => 'Confirm changes', - 'CONFIRM_EMAIL' => 'Confirm e-mail address', - 'CONFIRM_EMAIL_EXPLAIN' => 'You only need to specify this if you are changing your e-mail address.', 'CONFIRM_EXPLAIN' => 'To prevent automated registrations the board requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.', 'VC_REFRESH' => 'Refresh confirmation code', 'VC_REFRESH_EXPLAIN' => 'If you cannot read the code you can request a new one by clicking the button.', @@ -282,8 +280,6 @@ $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.', |