aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorErik Frèrejean <erikfrerejean@phpbb.com>2011-02-03 14:36:37 +0100
committerErik Frèrejean <erikfrerejean@phpbb.com>2011-03-04 11:10:08 +0100
commit1b606133198eb1c37402bafea2e3c2c36b25d197 (patch)
tree6e1fe0a0fbefaa672ecf1d334485244f7f691795 /phpBB/language
parentafae883619eb7d193b413b5599078a6f47ead408 (diff)
downloadforums-1b606133198eb1c37402bafea2e3c2c36b25d197.tar
forums-1b606133198eb1c37402bafea2e3c2c36b25d197.tar.gz
forums-1b606133198eb1c37402bafea2e3c2c36b25d197.tar.bz2
forums-1b606133198eb1c37402bafea2e3c2c36b25d197.tar.xz
forums-1b606133198eb1c37402bafea2e3c2c36b25d197.zip
[ticket/9581] Mass e-mail to banned users
Implement the suggestion made by Adam in the ticket, this will add an additional checkbox to the mass e-mail page. By checking this the mass e-mail shall also be send to banned users. By default banned users however are excluded from the mass e-mail. PHPBB3-9581
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/email.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/email.php b/phpBB/language/en/acp/email.php
index 4427bfff01..38c9f19c27 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.',
));