diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-05-02 12:49:07 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-05-02 12:49:07 +0200 |
| commit | 854854b60f2b452df57482667cd211bddd123663 (patch) | |
| tree | 5d8c4d3c5cc60441152abe78705763e7f0cfb31d /phpBB/language | |
| parent | e511ea71c17b34fb6bb5233831c6b0b88b1f98b8 (diff) | |
| parent | 45e39d0990c01f005a7dccc5a36de3dd0f62c585 (diff) | |
| download | forums-854854b60f2b452df57482667cd211bddd123663.tar forums-854854b60f2b452df57482667cd211bddd123663.tar.gz forums-854854b60f2b452df57482667cd211bddd123663.tar.bz2 forums-854854b60f2b452df57482667cd211bddd123663.tar.xz forums-854854b60f2b452df57482667cd211bddd123663.zip | |
Merge remote-tracking branch 'github-elsensee/ticket/stenudd/8558-2' into develop-ascraeus
* github-elsensee/ticket/stenudd/8558-2:
[ticket/8558] Fix operator
[ticket/8558] Fix field length in ACP
[ticket/8558] Use only one variable and improve explain string
[ticket/8558] Add config in migrations and schema_data
[ticket/8558] Add display name in emails from board
Conflicts:
phpBB/includes/functions_messenger.php
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 1d2c979e0c..696e82324c 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -524,6 +524,8 @@ $lang = array_merge($lang, array( 'BOARD_HIDE_EMAILS_EXPLAIN' => 'This function keeps email addresses completely private.', 'CONTACT_EMAIL' => 'Contact email address', '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_PACKAGE_SIZE' => 'Email package size', |