mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 14:30:32 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* 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
This commit is contained in:
Nils Adermann
2010-12-13 17:14:36 +01:00
parent adfa1656fb 5d8ddc7480
commit 18f74a7e10
17 changed files with 313 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/language/en/install.php
View File

@@ -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',