diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-07-21 21:12:07 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-07-21 21:12:07 +0200 |
| commit | 5d2e144624c586d1fdbb1ccaf8f238d53428ab6a (patch) | |
| tree | 089b8b3957df28e633891fa3f6aeb4ff767db607 /phpBB/language/en/acp | |
| parent | de039dcc7cb56ed8dde36734a4f61a80bdf47cd6 (diff) | |
| parent | 17c6cd3676fae4947d263fc2b80dde3a4e96f011 (diff) | |
| download | forums-5d2e144624c586d1fdbb1ccaf8f238d53428ab6a.tar forums-5d2e144624c586d1fdbb1ccaf8f238d53428ab6a.tar.gz forums-5d2e144624c586d1fdbb1ccaf8f238d53428ab6a.tar.bz2 forums-5d2e144624c586d1fdbb1ccaf8f238d53428ab6a.tar.xz forums-5d2e144624c586d1fdbb1ccaf8f238d53428ab6a.zip | |
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB/language/en/acp')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 96897af6fd..10e76cc483 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -587,8 +587,8 @@ $lang = array_merge($lang, array( 'SMTP_POP_BEFORE_SMTP' => 'POP-BEFORE-SMTP', 'SMTP_PORT' => 'SMTP server port', 'SMTP_PORT_EXPLAIN' => 'Only change this if you know your SMTP server is on a different port.', - 'SMTP_SERVER' => 'SMTP server address and protocol', - 'SMTP_SERVER_EXPLAIN' => 'Note that you have to provide the protocol that your server uses. If you are using SSL, this has to be "ssl://your.mailserver.com"', + 'SMTP_SERVER' => 'SMTP server address', + 'SMTP_SERVER_EXPLAIN' => 'Do not provide a protocol (<samp>ssl://</samp> or <samp>tsl://</samp>) unless your mail host tells you to do so.', 'SMTP_SETTINGS' => 'SMTP settings', 'SMTP_USERNAME' => 'SMTP username', 'SMTP_USERNAME_EXPLAIN' => 'Only enter a username if your SMTP server requires it.', |