aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp/common.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2006-12-10 17:44:45 +0000
committerNils Adermann <naderman@naderman.de>2006-12-10 17:44:45 +0000
commitf40e2aba2261aaf79ee3b5ebe87b71dd6d30d1cb (patch)
tree9b8bf50649470ecd571d06ee5c7f7eeb91a867c7 /phpBB/language/en/acp/common.php
parent7e47135792a2cbf7e25ccdd184b4934b2a9e764d (diff)
downloadforums-f40e2aba2261aaf79ee3b5ebe87b71dd6d30d1cb.tar
forums-f40e2aba2261aaf79ee3b5ebe87b71dd6d30d1cb.tar.gz
forums-f40e2aba2261aaf79ee3b5ebe87b71dd6d30d1cb.tar.bz2
forums-f40e2aba2261aaf79ee3b5ebe87b71dd6d30d1cb.tar.xz
forums-f40e2aba2261aaf79ee3b5ebe87b71dd6d30d1cb.zip
- finally correctly calculate current time for birthday calculation [Bug #6030]
- allow searching forums with unsearchable subforums [Bug #6056] - addition of an optional HTTP_X_FORWARDED_FOR check in sessions, including bans - do not index forums which have indexing disabled on index recreation [Bug #6060] - properly handle html entities in the theme editor [Bug #6048] - anonymous access is no longer required for the LDAP auth plugin [Bug #6046] - corrected mcp_front queue link to point to approve_details [Bug #6134] - added direct (dis)approval to mcp_front queue items [Bug #6134] - proper mysql version test for fulltext-compatibility [Bug #6054] - added note to style/language "used by" column so it's clear that bots are included - correctly update bot last visit time [Bug #6108] git-svn-id: file:///svn/phpbb/trunk@6740 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp/common.php')
-rw-r--r--phpBB/language/en/acp/common.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 096efc9c52..7253334bd3 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -510,7 +510,7 @@ $lang = array_merge($lang, array(
'LOG_INSTALL_CONVERTED' => '<strong>Converted from %1$s to phpBB %2$s</strong>',
'LOG_INSTALL_INSTALLED' => '<strong>Installed phpBB %s</strong>',
- 'LOG_IP_BROWSER_CHECK' => '<strong>Session IP/browser check failed</strong><br />»User IP "<em>%1$s</em>" checked against session IP "<em>%2$s</em>" and user browser string "<em>%3$s</em>" checked against session browser string "<em>%4$s</em>".',
+ 'LOG_IP_BROWSER_FORWARDED_CHECK' => '<strong>Session IP/browser/X_FORWARDED_FOR check failed</strong><br />»User IP "<em>%1$s</em>" checked against session IP "<em>%2$s</em>", user browser string "<em>%3$s</em>" checked against session browser string "<em>%4$s</em>" and user X_FORWARDED_FOR string "<em>%5$s</em>" checked against session X_FORWARDED_FOR string "<em>%6$s</em>".',
'LOG_JAB_CHANGED' => '<strong>Jabber account changed</strong>',
'LOG_JAB_PASSCHG' => '<strong>Jabber password changed</strong>',