mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-18 23:51:49 +02:00
Merge branch '3.2.x'
This commit is contained in:
@@ -585,7 +585,7 @@ $lang = array_merge($lang, array(
|
|||||||
'SMTP_POP_BEFORE_SMTP' => 'POP-BEFORE-SMTP',
|
'SMTP_POP_BEFORE_SMTP' => 'POP-BEFORE-SMTP',
|
||||||
'SMTP_PORT' => 'SMTP server port',
|
'SMTP_PORT' => 'SMTP server port',
|
||||||
'SMTP_PORT_EXPLAIN' => 'Only change this if you know your SMTP server is on a different 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' => '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_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_SETTINGS' => 'SMTP settings',
|
||||||
'SMTP_USERNAME' => 'SMTP username',
|
'SMTP_USERNAME' => 'SMTP username',
|
||||||
|
Reference in New Issue
Block a user