diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-02-04 23:13:47 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-02-04 23:13:47 -0600 |
| commit | 5aec7600a68adb9466fb7ce034ba22070ac8a244 (patch) | |
| tree | 87d37edcc0d13b04a2b582553636d6cdb6439ee2 /phpBB/language | |
| parent | 293b65e3efbf94f6521acebe1b9f3e7bbca20286 (diff) | |
| download | forums-5aec7600a68adb9466fb7ce034ba22070ac8a244.tar forums-5aec7600a68adb9466fb7ce034ba22070ac8a244.tar.gz forums-5aec7600a68adb9466fb7ce034ba22070ac8a244.tar.bz2 forums-5aec7600a68adb9466fb7ce034ba22070ac8a244.tar.xz forums-5aec7600a68adb9466fb7ce034ba22070ac8a244.zip | |
[ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID
PHPBB3-10896
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/common.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 9f8799b6d6..6dd390ed24 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -160,7 +160,7 @@ $lang = array_merge($lang, array( 'EDIT_POST' => 'Edit post', 'EMAIL' => 'E-mail', // Short form for EMAIL_ADDRESS 'EMAIL_ADDRESS' => 'E-mail address', - 'EMAIL_INVALID' => 'The email address you entered is invalid.', + 'EMAIL_INVALID_EMAIL' => 'The e-mail address you entered is invalid.', 'EMAIL_SMTP_ERROR_RESPONSE' => 'Ran into problems sending e-mail at <strong>Line %1$s</strong>. Response: %2$s.', 'EMPTY_SUBJECT' => 'You must specify a subject when posting a new topic.', 'EMPTY_MESSAGE_SUBJECT' => 'You must specify a subject when composing a new message.', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 5152c4b50b..0dce2961e5 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -176,7 +176,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 e-mail address you entered is not allowed to be used.', - 'EMAIL_INVALID_EMAIL' => 'The e-mail address you entered is invalid.', 'EMAIL_REMIND' => 'This must be the e-mail address associated with your account. If you have not changed this via your user control panel then it is the e-mail address you registered your account with.', 'EMAIL_TAKEN_EMAIL' => 'The entered e-mail address is already in use.', 'EMPTY_DRAFT' => 'You must enter a message to submit your changes.', |