diff options
| author | Nils Adermann <naderman@naderman.de> | 2007-04-01 22:15:59 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2007-04-01 22:15:59 +0000 |
| commit | e6dab93a02a05a61799c1c0e56864961e8b56bba (patch) | |
| tree | 74f3c51982a8455ee1741af4127b69562f6bcde6 /phpBB/language/en/common.php | |
| parent | f610ed82cbf0df2b5f8afd6ca3f88b9313281036 (diff) | |
| download | forums-e6dab93a02a05a61799c1c0e56864961e8b56bba.tar forums-e6dab93a02a05a61799c1c0e56864961e8b56bba.tar.gz forums-e6dab93a02a05a61799c1c0e56864961e8b56bba.tar.bz2 forums-e6dab93a02a05a61799c1c0e56864961e8b56bba.tar.xz forums-e6dab93a02a05a61799c1c0e56864961e8b56bba.zip | |
- urlencoded usernames don't need htmlspecialchars [Bug #8794]
- fulltext_mysql still used synonyms/ignore words [Bug #5405]
- merge tool extend to allow merging complete topics via quickmod and mcp_forum [Bug #5293]
- renamed "fork" to "copy" (was already called "copy" in some places)
- Copied posts should not increase post count, and should also not decrease it on deletion [Bug #8072]
git-svn-id: file:///svn/phpbb/trunk@7261 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/common.php')
| -rw-r--r-- | phpBB/language/en/common.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 4e20a602b2..18ac1e8af9 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -298,6 +298,8 @@ $lang = array_merge($lang, array( 'MCP' => 'Moderator Control Panel', 'MEMBERLIST' => 'Members', 'MEMBERLIST_EXPLAIN' => 'View complete list of members', + 'MERGE' => 'Merge', + 'MERGE_POSTS' => 'Merge posts', 'MERGE_TOPIC' => 'Merge topic', 'MESSAGE' => 'Message', 'MESSAGES' => 'Messages', |