diff options
author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-02-26 15:32:27 -0600 |
---|---|---|
committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-02-26 15:32:27 -0600 |
commit | a01da0c1ee83d15e4c466a80db78fd7e9859e637 (patch) | |
tree | 651cd313ae0d225d67fb0a4f1755d7f87b2546b7 /phpBB/language/en/common.php | |
parent | d2295b3d1f191710916b12980e13c97419ecf0ae (diff) | |
parent | 80bd78a5e5e1069773c05073cd47662a311bda79 (diff) | |
download | forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.tar forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.tar.gz forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.tar.bz2 forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.tar.xz forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.zip |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/language/en/common.php')
-rw-r--r-- | phpBB/language/en/common.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index b747310e5e..b4ed2f74f3 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -187,6 +187,7 @@ $lang = array_merge($lang, array( 'ELLIPSIS' => '…', 'EMAIL' => 'Email', // Short form for EMAIL_ADDRESS 'EMAIL_ADDRESS' => 'Email address', + 'EMAIL_INVALID_EMAIL' => 'The email address you entered is invalid.', 'EMAIL_SMTP_ERROR_RESPONSE' => 'Ran into problems sending email 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.', |