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/common.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/common.php')
| -rw-r--r-- | phpBB/language/en/common.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 631805afc2..7741ff8d1f 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -613,7 +613,6 @@ $lang = array_merge($lang, array( 'TOO_LONG_USER_PASSWORD' => 'The password you entered is too long.', 'TOO_LONG_USERNAME' => 'The username you entered is too long.', 'TOO_LONG_EMAIL' => 'The e-mail address you entered is too long.', - 'TOO_LONG_EMAIL_CONFIRM' => 'The e-mail address confirmation you entered is too long.', 'TOO_LONG_WEBSITE' => 'The website address you entered is too long.', 'TOO_LONG_YIM' => 'The Yahoo! Messenger name you entered is too long.', @@ -635,7 +634,6 @@ $lang = array_merge($lang, array( 'TOO_SHORT_USER_PASSWORD' => 'The password you entered is too short.', 'TOO_SHORT_USERNAME' => 'The username you entered is too short.', 'TOO_SHORT_EMAIL' => 'The e-mail address you entered is too short.', - 'TOO_SHORT_EMAIL_CONFIRM' => 'The e-mail address confirmation you entered is too short.', 'TOO_SHORT_WEBSITE' => 'The website address you entered is too short.', 'TOO_SHORT_YIM' => 'The Yahoo! Messenger name you entered is too short.', |