diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-04-10 14:17:56 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-04-10 14:17:56 -0400 |
| commit | 2d3dcd43c58fe2e28fafcb6738e45c8632b2ff28 (patch) | |
| tree | 665c0c3ca9ffb24b9dbbf53d25df094c138bb74f /phpBB/language/en/acp/email.php | |
| parent | 8a54d8850932a22c9d808973572b29d82a7a2dd2 (diff) | |
| parent | d3b5df2548446c76e94e41837abc8b5a8d034b42 (diff) | |
| download | forums-2d3dcd43c58fe2e28fafcb6738e45c8632b2ff28.tar forums-2d3dcd43c58fe2e28fafcb6738e45c8632b2ff28.tar.gz forums-2d3dcd43c58fe2e28fafcb6738e45c8632b2ff28.tar.bz2 forums-2d3dcd43c58fe2e28fafcb6738e45c8632b2ff28.tar.xz forums-2d3dcd43c58fe2e28fafcb6738e45c8632b2ff28.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9581] Fix missing index
[ticket/9581] Slightly tweaked queries
[ticket/9581] Make banlist table select optional
[ticket/9581] Mass e-mail to banned users
Diffstat (limited to 'phpBB/language/en/acp/email.php')
| -rw-r--r-- | phpBB/language/en/acp/email.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/email.php b/phpBB/language/en/acp/email.php index b8b299bee9..6ce8ddd59b 100644 --- a/phpBB/language/en/acp/email.php +++ b/phpBB/language/en/acp/email.php @@ -52,14 +52,16 @@ $lang = array_merge($lang, array( 'SEND_TO_GROUP' => 'Send to group', 'SEND_TO_USERS' => 'Send to users', 'SEND_TO_USERS_EXPLAIN' => 'Entering names here will override any group selected above. Enter each username on a new line.', - + + 'MAIL_BANNED' => 'Mail banned users', + 'MAIL_BANNED_EXPLAIN' => 'When sending a mass e-mail to a group you can select here whether banned users will also receive the e-mail.', 'MAIL_HIGH_PRIORITY' => 'High', 'MAIL_LOW_PRIORITY' => 'Low', 'MAIL_NORMAL_PRIORITY' => 'Normal', 'MAIL_PRIORITY' => 'Mail priority', 'MASS_MESSAGE' => 'Your message', 'MASS_MESSAGE_EXPLAIN' => 'Please note that you may enter only plain text. All markup will be removed before sending.', - + 'NO_EMAIL_MESSAGE' => 'You must enter a message.', 'NO_EMAIL_SUBJECT' => 'You must specify a subject for your message.', )); |