From dc747b8d994b6f5d07182196ed9deed7959a7317 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 29 Apr 2007 20:56:46 +0000 Subject: - * wildcard in a search query should cause \w+ in highlighting, not \w* [Bug #10031] - display a warning that the search index is not converted from phpBB2 to phpBB3 [Bug #9761] - forgot to add : to reg_name when deleting userinfo from the url regex constructor [Bug #9868] - magic urls should work after ">" - fixed sorting in mcp_reports/mcp_queue [Bug #9882] - display a "Report has already been closed" message, if a post is accessed in mcp_reports which has a closed report (might occur if two moderators want to process it at the same time) - convertor: old forum path should have the trailing slash removed - subsilver2 will come bundled with phpBB3, but it will not be installed by default (if admins want to use it they can, but it's not a default option for users) - prosilver was missing the topic-only mode in mcp_reports/mcp_queue git-svn-id: file:///svn/phpbb/trunk@7428 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/language/en/install.php | 2 ++ phpBB/language/en/mcp.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'phpBB/language') diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index b30318614a..a8e9b39d37 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -282,6 +282,8 @@ $lang = array_merge($lang, array( 'SCRIPT_PATH_EXPLAIN' => 'The path where phpBB is located relative to the domain name, e.g. /phpBB3', 'SELECT_LANG' => 'Select language', 'SERVER_CONFIG' => 'Server configuration', + 'SEARCH_INDEX_UNCONVERTED' => 'Search index was not converted', + 'SEARCH_INDEX_UNCONVERTED_EXPLAIN' => 'Your old search index was not converted. Searching will always yield an empty result. To create a new search index go to the Administration Control Panel, select Maintenance and then choose Search index from the submenu.', 'SOFTWARE' => 'Forum software', 'SPECIFY_OPTIONS' => 'Specify conversion options', 'STAGE_ADMINISTRATOR' => 'Administrator details', diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index fe405eb3d0..23ed2a87d6 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -254,7 +254,7 @@ $lang = array_merge($lang, array( 'REPORTS_DELETED_SUCCESS' => 'The selected reports have been deleted successfully.', 'REPORTS_TOTAL' => 'In total there are %d reports to review', 'REPORTS_ZERO_TOTAL' => 'There are no reports to review', - 'REPORT_CLOSED' => 'This report has previously been closed.', + 'REPORT_CLOSED' => 'This report has already been closed.', 'REPORT_CLOSED_SUCCESS' => 'The selected report has been closed successfully.', 'REPORT_DELETED_SUCCESS' => 'The selected report has been deleted successfully.', 'REPORT_DETAILS' => 'Report details', -- cgit v1.2.1