diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2009-07-26 18:24:53 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2009-07-26 18:24:53 +0000 |
| commit | 1a863c9581f4606c4a86593de78db0caeebf33ce (patch) | |
| tree | 9a31701d852a87aac5099096a893802751696578 /phpBB | |
| parent | b6ebd2e4972f8cff7e16ed96788b1fa861f7568d (diff) | |
| download | forums-1a863c9581f4606c4a86593de78db0caeebf33ce.tar forums-1a863c9581f4606c4a86593de78db0caeebf33ce.tar.gz forums-1a863c9581f4606c4a86593de78db0caeebf33ce.tar.bz2 forums-1a863c9581f4606c4a86593de78db0caeebf33ce.tar.xz forums-1a863c9581f4606c4a86593de78db0caeebf33ce.zip | |
Alter r9860 #36685
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9862 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index b0eb5c9cb6..7b88c5764e 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -486,7 +486,7 @@ $lang = array_merge($lang, array( 'EMAIL_SIG' => 'E-mail signature', 'EMAIL_SIG_EXPLAIN' => 'This text will be attached to all e-mails the board sends.', 'ENABLE_EMAIL' => 'Enable board-wide e-mails', - 'ENABLE_EMAIL_EXPLAIN' => 'If this is set to disabled no e-mails will be sent by the board at all. <em>Note the user and admin account activiation settings require this setting to be enabled.</em>', + 'ENABLE_EMAIL_EXPLAIN' => 'If this is set to disabled no e-mails will be sent by the board at all. <em>Note the user and admin account activiation settings require this setting to be enabled. If currently using "user" or "admin" activation in the activation settings, disabling this setting will require no activiation of new accounts.</em>', 'SMTP_AUTH_METHOD' => 'Authentication method for SMTP', 'SMTP_AUTH_METHOD_EXPLAIN' => 'Only used if a username/password is set, ask your provider if you are unsure which method to use.', 'SMTP_CRAM_MD5' => 'CRAM-MD5', |