diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-02-24 17:42:14 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-02-24 17:42:14 +0100 |
| commit | 5361a14c1ed2a39db10df9252488185e6ad3c6ff (patch) | |
| tree | a8f94c9de00aa1e7d905679f9828fff0aa58f60b /phpBB/language/en/ucp.php | |
| parent | 0fdbdd01fb57ce2fcfe234ee7a99ab3740ea9db5 (diff) | |
| parent | 678ec7b545e6780b1192d6fdf358692c9431bb17 (diff) | |
| download | forums-5361a14c1ed2a39db10df9252488185e6ad3c6ff.tar forums-5361a14c1ed2a39db10df9252488185e6ad3c6ff.tar.gz forums-5361a14c1ed2a39db10df9252488185e6ad3c6ff.tar.bz2 forums-5361a14c1ed2a39db10df9252488185e6ad3c6ff.tar.xz forums-5361a14c1ed2a39db10df9252488185e6ad3c6ff.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID
[ticket/10896] Adds email validation to email settings in ACP
Conflicts:
phpBB/adm/index.php
phpBB/language/en/common.php
phpBB/language/en/ucp.php
Diffstat (limited to 'phpBB/language/en/ucp.php')
| -rw-r--r-- | phpBB/language/en/ucp.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 267ae00710..0609c1d5fe 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -173,7 +173,6 @@ $lang = array_merge($lang, array( 'EDIT_DRAFT_EXPLAIN' => 'Here you are able to edit your draft. Drafts do not contain attachment and poll information.', 'EMAIL_BANNED_EMAIL' => 'The email address you entered is not allowed to be used.', - 'EMAIL_INVALID_EMAIL' => 'The email address you entered is invalid.', 'EMAIL_REMIND' => 'This must be the email address associated with your account. If you have not changed this via your user control panel then it is the email address you registered your account with.', 'EMAIL_TAKEN_EMAIL' => 'The entered email address is already in use.', 'EMPTY_DRAFT' => 'You must enter a message to submit your changes.', |