diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-07-06 19:24:02 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-07-06 19:24:02 +0200 |
| commit | bb83af0a0a9589b8fab5e38e847e4372577fedaa (patch) | |
| tree | b4d933fe7f6ea40832500270ddd431cbeb4d5c0a /phpBB/language | |
| parent | 51181c6ea1ac1b222c5ab6a5d7ec89c54fa9890f (diff) | |
| parent | cddb884be6c8a8890f4fbd7415763d46e51e050b (diff) | |
| download | forums-bb83af0a0a9589b8fab5e38e847e4372577fedaa.tar forums-bb83af0a0a9589b8fab5e38e847e4372577fedaa.tar.gz forums-bb83af0a0a9589b8fab5e38e847e4372577fedaa.tar.bz2 forums-bb83af0a0a9589b8fab5e38e847e4372577fedaa.tar.xz forums-bb83af0a0a9589b8fab5e38e847e4372577fedaa.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 462d66a04a..e3d8e6742f 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -575,6 +575,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' => '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_SETTINGS' => 'SMTP settings', 'SMTP_USERNAME' => 'SMTP username', 'SMTP_USERNAME_EXPLAIN' => 'Only enter a username if your SMTP server requires it.', |