aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2006-07-27 19:02:47 +0000
committerNils Adermann <naderman@naderman.de>2006-07-27 19:02:47 +0000
commit007f4f69872f0e8f9d848229078e488f620eaca1 (patch)
tree5055f20042426a0da42a24c556ee58cb10dcae89 /phpBB/language/en
parent412cf506891e7e35dcf1b35190bc2a05d823bb96 (diff)
downloadforums-007f4f69872f0e8f9d848229078e488f620eaca1.tar
forums-007f4f69872f0e8f9d848229078e488f620eaca1.tar.gz
forums-007f4f69872f0e8f9d848229078e488f620eaca1.tar.bz2
forums-007f4f69872f0e8f9d848229078e488f620eaca1.tar.xz
forums-007f4f69872f0e8f9d848229078e488f620eaca1.zip
- fixed the age calculation (note: turn on your brain before commiting something like this the next time) [Bug #3337]
- removed the split_words array, introduced an enforced search_query - the forum used for global topics in the search is now a forum, and no longer a category [Bug #2561] - Bug #3404 - allow accessing reports by report_id, in contrast to mcp_queue this cannot just use the post id, since there can be multiple closed reports per post, so closed reports have to be accessed by report id, open reports, can optionally be accessed by report id or post id [Bug #3149] - only attempt to unflag reported topics on closing a report when there are any without other reported posts [Bug #3057] - updated fulltext_mysql to use the the search_query string - overwrote the old fulltext_native with our improved version since it consumes too much time to maintain boths and we would switch to the improved version later anyway - always show a link to search a user's posts even if the postcount is zero since he might only have posted in forums which do not count posts [Bug #3267] git-svn-id: file:///svn/phpbb/trunk@6211 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en')
-rw-r--r--phpBB/language/en/memberlist.php2
-rw-r--r--phpBB/language/en/search.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index 95c5b1976b..88893e827b 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -105,7 +105,7 @@ $lang = array_merge($lang, array(
'REAL_NAME' => 'Recipient name',
'RECIPIENT' => 'Recipient',
- 'SEARCH_USER_POSTS' => 'Search users posts',
+ 'SEARCH_USER_POSTS' => 'Search user\'s posts',
'SELECT_MARKED' => 'Select marked',
'SELECT_SORT_METHOD' => 'Select sort method',
'SEND_IM' => 'Instant messaging',
diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index 0e7e4700e5..25d0000bb8 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -68,7 +68,7 @@ $lang = array_merge($lang, array(
'SEARCH_FORUMS' => 'Search in forums',
'SEARCH_FORUMS_EXPLAIN' => 'Select the forum or forums you wish to search in. For speed all subforums can be searched by selecting the parent and setting enable search subforums below.',
'SEARCH_IN_RESULTS' => 'Search these results',
- 'SEARCH_KEYWORDS_EXPLAIN' => 'Place <strong>+</strong> in front of a word which must be found and <strong>-</strong> in front of a word which must not be found. If you place <strong>|</strong> in front of words, each result has to contain at least one of these words. Use * as a wildcard for partial matches',
+ 'SEARCH_KEYWORDS_EXPLAIN' => 'Place <strong>+</strong> in front of a word which must be found and <strong>-</strong> in front of a word which must not be found. Put a list of words seperated by <strong>|</strong> into brackets if only one of the words must be found. Use * as a wildcard for partial matches.',
'SEARCH_MSG_ONLY' => 'Message text only',
'SEARCH_OPTIONS' => 'Search Options',
'SEARCH_QUERY' => 'Search Query',