diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-09-24 21:21:53 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-09-24 21:21:53 +0200 |
| commit | ce0c33f62a0e34a733b9da57cb41f4bf573740c2 (patch) | |
| tree | 0af386b196b3d51bf43905f3eb90b217038d67b0 /phpBB/language/en/acp | |
| parent | 2f773fca1806b7f31f9160487f9b11dc131e9f21 (diff) | |
| parent | 077db77259a1be919491a1c76c6a85ce0ee5c182 (diff) | |
| download | forums-ce0c33f62a0e34a733b9da57cb41f4bf573740c2.tar forums-ce0c33f62a0e34a733b9da57cb41f4bf573740c2.tar.gz forums-ce0c33f62a0e34a733b9da57cb41f4bf573740c2.tar.bz2 forums-ce0c33f62a0e34a733b9da57cb41f4bf573740c2.tar.xz forums-ce0c33f62a0e34a733b9da57cb41f4bf573740c2.zip | |
Merge pull request #2994 from Skouat/ticket/13086-olympus
[ticket/13086] Update ACP_MASS_EMAIL_EXPLAIN language key
* Skouat/ticket/13086-olympus:
[ticket/13086] String replaces 50 with 20
Diffstat (limited to 'phpBB/language/en/acp')
| -rw-r--r-- | phpBB/language/en/acp/email.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/email.php b/phpBB/language/en/acp/email.php index 38c9f19c27..6db09a77c9 100644 --- a/phpBB/language/en/acp/email.php +++ b/phpBB/language/en/acp/email.php @@ -37,7 +37,7 @@ if (empty($lang) || !is_array($lang)) // Email settings $lang = array_merge($lang, array( - 'ACP_MASS_EMAIL_EXPLAIN' => 'Here you can e-mail a message to either all of your users or all users of a specific group <strong>having the option to receive mass e-mails enabled</strong>. To achieve this an e-mail will be sent out to the administrative e-mail address supplied, with a blind carbon copy sent to all recipients. The default setting is to only include 50 recipients in such an e-mail, for more recipients more e-mails will be sent. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for a mass emailing to take a long time, you will be notified when the script has completed.', + 'ACP_MASS_EMAIL_EXPLAIN' => 'Here you can e-mail a message to either all of your users or all users of a specific group <strong>having the option to receive mass e-mails enabled</strong>. To achieve this an e-mail will be sent out to the administrative e-mail address supplied, with a blind carbon copy sent to all recipients. The default setting is to only include 20 recipients in such an e-mail, for more recipients more e-mails will be sent. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for a mass emailing to take a long time, you will be notified when the script has completed.', 'ALL_USERS' => 'All users', 'COMPOSE' => 'Compose', |