diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-09-24 21:24:29 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-09-24 21:24:29 +0200 |
| commit | 1b3109d650acb679cb9f6b5be9bfb6097489e6d6 (patch) | |
| tree | 3f86dd542a6b13d002b1fb172182011acb1222c7 /phpBB/language | |
| parent | 30e1d29f5803bf5d7426096db79655f54344eaec (diff) | |
| parent | ce0c33f62a0e34a733b9da57cb41f4bf573740c2 (diff) | |
| download | forums-1b3109d650acb679cb9f6b5be9bfb6097489e6d6.tar forums-1b3109d650acb679cb9f6b5be9bfb6097489e6d6.tar.gz forums-1b3109d650acb679cb9f6b5be9bfb6097489e6d6.tar.bz2 forums-1b3109d650acb679cb9f6b5be9bfb6097489e6d6.tar.xz forums-1b3109d650acb679cb9f6b5be9bfb6097489e6d6.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/13086] String replaces 50 with 20
Conflicts:
phpBB/language/en/acp/email.php
Diffstat (limited to 'phpBB/language')
| -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 ddacb9df25..0d47e37d09 100644 --- a/phpBB/language/en/acp/email.php +++ b/phpBB/language/en/acp/email.php @@ -38,7 +38,7 @@ if (empty($lang) || !is_array($lang)) // Email settings $lang = array_merge($lang, array( - 'ACP_MASS_EMAIL_EXPLAIN' => 'Here you can email a message to either all of your users or all users of a specific group <strong>having the option to receive mass emails enabled</strong>. To achieve this an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all recipients. The default setting is to only include 50 recipients in such an email, for more recipients more emails 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 email a message to either all of your users or all users of a specific group <strong>having the option to receive mass emails enabled</strong>. To achieve this an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all recipients. The default setting is to only include 20 recipients in such an email, for more recipients more emails 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', |