aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-08-12 21:40:17 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-08-12 21:40:17 +0200
commitc0bd3122e0bdb626b8f500afd5965acabefe197a (patch)
tree14686769b04f8612ec0db091c9ebea1c65b7ca4f /phpBB/language
parent54fff02f95e68f368e09ba8783ba83be2f8fcf76 (diff)
parent89e95941b1a4d082fa0c3202b175c3f827e09333 (diff)
downloadforums-c0bd3122e0bdb626b8f500afd5965acabefe197a.tar
forums-c0bd3122e0bdb626b8f500afd5965acabefe197a.tar.gz
forums-c0bd3122e0bdb626b8f500afd5965acabefe197a.tar.bz2
forums-c0bd3122e0bdb626b8f500afd5965acabefe197a.tar.xz
forums-c0bd3122e0bdb626b8f500afd5965acabefe197a.zip
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/board.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 10e76cc483..fdc02d9ae8 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -568,6 +568,8 @@ $lang = array_merge($lang, array(
'EMAIL_FORCE_SENDER_EXPLAIN' => 'This will set the <samp>Return-Path</samp> to the from email address instead of using the local user and hostname of the server. This setting does not apply when using SMTP.<br><em><strong>Warning:</strong> Requires the user that the webserver runs as to be added as trusted user to the sendmail configuration.</em>',
'EMAIL_PACKAGE_SIZE' => 'Email package size',
'EMAIL_PACKAGE_SIZE_EXPLAIN' => 'This is the number of maximum emails sent out in one package. This setting is applied to the internal message queue; set this value to 0 if you have problems with non-delivered notification emails.',
+ 'EMAIL_MAX_CHUNK_SIZE' => 'Maximum allowed email recipients',
+ 'EMAIL_MAX_CHUNK_SIZE_EXPLAIN' => 'If necessary, set this to not exceed the maximum number of recipients that your email server will allow in one email message.',
'EMAIL_SIG' => 'Email signature',
'EMAIL_SIG_EXPLAIN' => 'This text will be attached to all emails the board sends.',
'ENABLE_EMAIL' => 'Enable board-wide emails',