aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/install.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-12-13 17:14:36 +0100
committerNils Adermann <naderman@naderman.de>2010-12-13 17:14:36 +0100
commit18f74a7e10b01f4f6f916e2baa814b27b31fc8a9 (patch)
treec7068f8e9cb82587f97adb19a390cb69631b9b9f /phpBB/language/en/install.php
parentadfa1656fb9d8b5bb601af1d7a6720884954d87a (diff)
parent5d8ddc748000623b8e705b9434a4133cdd8fcc19 (diff)
downloadforums-18f74a7e10b01f4f6f916e2baa814b27b31fc8a9.tar
forums-18f74a7e10b01f4f6f916e2baa814b27b31fc8a9.tar.gz
forums-18f74a7e10b01f4f6f916e2baa814b27b31fc8a9.tar.bz2
forums-18f74a7e10b01f4f6f916e2baa814b27b31fc8a9.tar.xz
forums-18f74a7e10b01f4f6f916e2baa814b27b31fc8a9.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/9851] "Search new posts" should require login. [task/phpdoc] Added a phpdoc task to the build process [task/phpdoc] Added a configuration file for phpDocumentor. [feature/acm-wincache] Adding caching module for WinCache's User Cache. [ticket/9939] Fix JavaScript error in admin recaptcha template [ticket/9575] Also change 'administrate' to 'administer' in templates [ticket/8736] guest can have 255 chars long username [ticket/9928] Do not link "login to your board" to the "send statistics" page. [ticket/9575] Change 'administrate' to 'administer' [ticket/9921] Adding sample configuration file for the lighttpd webserver. [ticket/9932] Add the Bing bot when converting [ticket/9930] Redirect failes with open_basedir enabled. [ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs
Diffstat (limited to 'phpBB/language/en/install.php')
-rw-r--r--phpBB/language/en/install.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 358dafb4a7..96a1f0e704 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -370,7 +370,7 @@ $lang = array_merge($lang, array(
// Updater
$lang = array_merge($lang, array(
- 'ALL_FILES_UP_TO_DATE' => 'All files are up to date with the latest phpBB version. You should now <a href="../ucp.php?mode=login&amp;redirect=adm/index.php%3Fi=send_statistics%26mode=send_statistics">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory! Please send us updated information about your server and board configurations from the <a href="../ucp.php?mode=login&amp;redirect=adm/index.php%3Fi=send_statistics%26mode=send_statistics">Send statistics</a> module in your ACP.',
+ 'ALL_FILES_UP_TO_DATE' => 'All files are up to date with the latest phpBB version. You should now <a href="../ucp.php?mode=login">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory! Please send us updated information about your server and board configurations from the <a href="../ucp.php?mode=login&amp;redirect=adm/index.php%3Fi=send_statistics%26mode=send_statistics">Send statistics</a> module in your ACP.',
'ARCHIVE_FILE' => 'Source file within archive',
'BACK' => 'Back',