aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-12-11 21:56:21 +0100
committerMarc Alexander <admin@m-a-styles.de>2017-12-11 21:56:21 +0100
commit9f055e1af39f36ff18cc278093000cb30c858885 (patch)
tree0dbfa5caa2e26c2c71936d84639b23722a14c8db /phpBB/language
parentb4ca1bdb0050b238797431f29faaefdc3057b50a (diff)
downloadforums-9f055e1af39f36ff18cc278093000cb30c858885.tar
forums-9f055e1af39f36ff18cc278093000cb30c858885.tar.gz
forums-9f055e1af39f36ff18cc278093000cb30c858885.tar.bz2
forums-9f055e1af39f36ff18cc278093000cb30c858885.tar.xz
forums-9f055e1af39f36ff18cc278093000cb30c858885.zip
[ticket/15322] Add config setting for -f parameter & remove mail function name
The -f parameter can now be added via configuration in the ACP. Addtionally, the config setting for the mail function name has been removed. PHPBB3-15322
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/board.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index f6e7a310a8..e836ae30a4 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -562,8 +562,8 @@ $lang = array_merge($lang, array(
'CONTACT_EMAIL_EXPLAIN' => 'This address will be used whenever a specific contact point is needed, e.g. spam, error output, etc. It will always be used as the <samp>From</samp> and <samp>Reply-To</samp> address in emails.',
'CONTACT_EMAIL_NAME' => 'Contact name',
'CONTACT_EMAIL_NAME_EXPLAIN' => 'This is the contact name that e-mail recipients will see. If you don’t want to have a contact name, leave this field empty.',
- 'EMAIL_FUNCTION_NAME' => 'Email function name',
- 'EMAIL_FUNCTION_NAME_EXPLAIN' => 'The email function used to send mails through PHP.',
+ 'EMAIL_ENVELOPE_SENDER' => 'Set envelope sender address',
+ 'EMAIL_ENVELOPE_SENDER_EXPLAIN' => 'Setting the envelope sender address might be needed for a correct return address when sending mails on some hosts.',
'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_SIG' => 'Email signature',