diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-02-28 19:20:23 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-02-28 19:20:23 +0000 |
| commit | a6f2f7e9a99d56f3f5f079f11f14f30b518c0057 (patch) | |
| tree | a82606f95eb8f96fc3b4abb0d8ddd6f1b74bda67 /phpBB | |
| parent | c089fe8e39ad40a909ab6709578c188363a511ac (diff) | |
| download | forums-a6f2f7e9a99d56f3f5f079f11f14f30b518c0057.tar forums-a6f2f7e9a99d56f3f5f079f11f14f30b518c0057.tar.gz forums-a6f2f7e9a99d56f3f5f079f11f14f30b518c0057.tar.bz2 forums-a6f2f7e9a99d56f3f5f079f11f14f30b518c0057.tar.xz forums-a6f2f7e9a99d56f3f5f079f11f14f30b518c0057.zip | |
Merge r10487 into 3.0.7: Make those warnings more consistent.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10554 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 18a2d0e801..7f07237fbf 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -392,7 +392,7 @@ $lang = array_merge($lang, array( 'LDAP_NO_EMAIL' => 'The specified e-mail attribute does not exist.', 'LDAP_NO_IDENTITY' => 'Could not find a login identity for %s.', 'LDAP_PASSWORD' => 'LDAP password', - 'LDAP_PASSWORD_EXPLAIN' => 'Leave blank to use anonymous binding. Else fill in the password for the above user. Required for Active Directory Servers. <strong>WARNING:</strong> This password will be stored as plain text in the database visible to everybody who can access your database or who can view this configuration page.', + 'LDAP_PASSWORD_EXPLAIN' => 'Leave blank to use anonymous binding. Else fill in the password for the above user. Required for Active Directory Servers.<br /><em><strong>Warning:</strong> This password will be stored as plain text in the database visible to everybody who can access your database or who can view this configuration page.</em>', 'LDAP_PORT' => 'LDAP server port', 'LDAP_PORT_EXPLAIN' => 'Optionally you can specify a port which should be used to connect to the LDAP server instead of the default port 389.', 'LDAP_SERVER' => 'LDAP server name', @@ -504,7 +504,7 @@ $lang = array_merge($lang, array( 'SMTP_DIGEST_MD5' => 'DIGEST-MD5', 'SMTP_LOGIN' => 'LOGIN', 'SMTP_PASSWORD' => 'SMTP password', - 'SMTP_PASSWORD_EXPLAIN' => 'Only enter a password if your SMTP server requires it. <em><strong>Warning:</strong> this password is stored as plain text in the database.</em>', + 'SMTP_PASSWORD_EXPLAIN' => 'Only enter a password if your SMTP server requires it.<br /><em><strong>Warning:</strong> This password will be stored as plain text in the database visible to everybody who can access your database or who can view this configuration page.</em>', 'SMTP_PLAIN' => 'PLAIN', 'SMTP_POP_BEFORE_SMTP' => 'POP-BEFORE-SMTP', 'SMTP_PORT' => 'SMTP server port', @@ -527,7 +527,7 @@ $lang = array_merge($lang, array( 'JAB_PACKAGE_SIZE' => 'Jabber package size', 'JAB_PACKAGE_SIZE_EXPLAIN' => 'This is the number of messages sent in one package. If set to 0 the message is sent immediately and will not be queued for later sending.', 'JAB_PASSWORD' => 'Jabber password', - 'JAB_PASSWORD_EXPLAIN' => '<em><strong>Warning:</strong> this password is stored as plain text in the database.</em>', + 'JAB_PASSWORD_EXPLAIN' => '<em><strong>Warning:</strong> This password will be stored as plain text in the database visible to everybody who can access your database or who can view this configuration page.</em>', 'JAB_PORT' => 'Jabber port', 'JAB_PORT_EXPLAIN' => 'Leave blank unless you know it is not port 5222.', 'JAB_SERVER' => 'Jabber server', |