diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2009-07-26 18:31:31 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2009-07-26 18:31:31 +0000 |
| commit | 18ce333e31ae5bd1df619b9d553a77050b693eb0 (patch) | |
| tree | 8a16f101baa5e11d1bca6af3f0a457b570d9aeb8 | |
| parent | 1a863c9581f4606c4a86593de78db0caeebf33ce (diff) | |
| download | forums-18ce333e31ae5bd1df619b9d553a77050b693eb0.tar forums-18ce333e31ae5bd1df619b9d553a77050b693eb0.tar.gz forums-18ce333e31ae5bd1df619b9d553a77050b693eb0.tar.bz2 forums-18ce333e31ae5bd1df619b9d553a77050b693eb0.tar.xz forums-18ce333e31ae5bd1df619b9d553a77050b693eb0.zip | |
Fix r9862 #36685 this is pre-pub as well O_O
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9863 89ea8834-ac86-4346-8a33-228a782c2dd0
| -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 7b88c5764e..8f86981f50 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. If currently using "user" or "admin" activation in the activation settings, disabling this setting will require no activiation of new accounts.</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 activation settings require this setting to be enabled. If currently using "user" or "admin" activation in the activation settings, disabling this setting will require no activation 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', |