aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2006-08-28 17:20:21 +0000
committerNils Adermann <naderman@naderman.de>2006-08-28 17:20:21 +0000
commitc0a880b6652d330b760b7da7cdde8076f854d836 (patch)
treee83ab0835afa5660ff8f582535a25c2a1c1f0f69 /phpBB/language
parent1d37b69ddd79d9d6bc1346f3761a899d20305636 (diff)
downloadforums-c0a880b6652d330b760b7da7cdde8076f854d836.tar
forums-c0a880b6652d330b760b7da7cdde8076f854d836.tar.gz
forums-c0a880b6652d330b760b7da7cdde8076f854d836.tar.bz2
forums-c0a880b6652d330b760b7da7cdde8076f854d836.tar.xz
forums-c0a880b6652d330b760b7da7cdde8076f854d836.zip
- birthdays/age in user's timezone and not server's local time
- parse bbcode in posts with fewer characters than selected maximum on search results page - retrieve search word context in posts which are longer than maximum characters (no raw BBCode anymore) - formatted text is processed in the same order everywhere now: censor_text, replace newlines, bbcode, smileys, attachments, highlighting [including Bug #2048] - highlighting pattern updated to exclude style and script (e.g custom BBCode) [Bug #3856] - fixed a style problem in Opera [Bug #3770] - performance increase for user::img() - slight adjustments to search git-svn-id: file:///svn/phpbb/trunk@6321 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/search.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index 25d0000bb8..569c40a53d 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -38,7 +38,7 @@ $lang = array_merge($lang, array(
'FOUND_SEARCH_MATCHES' => 'Search found %d matches',
'FOUND_MORE_SEARCH_MATCHES' => 'Search found more than %d matches',
- 'GLOBAL' => 'Global topic',
+ 'GLOBAL' => 'Global announcement',
'IGNORED_TERMS' => 'ignored',
'IGNORED_TERMS_EXPLAIN' => 'The following words in your search query were ignored: <b>%s</b>',