aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-12-24 16:15:07 +0100
committerMarc Alexander <admin@m-a-styles.de>2019-12-24 16:15:07 +0100
commit843887fcb91497db86b0d015f2d729e47d5fd159 (patch)
tree6ad7ee6bc7de13a192d2bed6f468146870db4b8f
parent4c05257783e3aca33aa198889323c50608adcdc1 (diff)
parent91a60f871aa95d94b824de311bca2c305e30f1c3 (diff)
downloadforums-843887fcb91497db86b0d015f2d729e47d5fd159.tar
forums-843887fcb91497db86b0d015f2d729e47d5fd159.tar.gz
forums-843887fcb91497db86b0d015f2d729e47d5fd159.tar.bz2
forums-843887fcb91497db86b0d015f2d729e47d5fd159.tar.xz
forums-843887fcb91497db86b0d015f2d729e47d5fd159.zip
Merge branch '3.2.x' into 3.3.x
-rw-r--r--phpBB/language/en/acp/board.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index cb9013805d..a01a4f1bd1 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -592,7 +592,7 @@ $lang = array_merge($lang, array(
'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',
- '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_SERVER_EXPLAIN' => 'Do not provide a protocol (<samp>ssl://</samp> or <samp>tls://</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.',