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/mcp.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/mcp.php')
| -rw-r--r-- | phpBB/language/en/mcp.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index bf1a56610a..110e12ed88 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -81,10 +81,10 @@ $lang = array_merge($lang, array( 'EMPTY_TOPICS_REMOVED_WARNING' => 'Please note that one or several topics have been removed from the database because they were or become empty', 'FEEDBACK' => 'Feedback', - 'FORK' => 'Fork', - 'FORK_TOPIC' => 'Fork topic', + 'FORK' => 'Copy', + 'FORK_TOPIC' => 'Copy topic', 'FORK_TOPIC_CONFIRM' => 'Are you sure you want to copy this topic?', - 'FORK_TOPICS' => 'Fork selected topics', + 'FORK_TOPICS' => 'Copy selected topics', 'FORK_TOPICS_CONFIRM' => 'Are you sure you want to copy the selected topics?', 'FORUM_DESC' => 'Description', 'FORUM_NAME' => 'Forum name', @@ -188,8 +188,10 @@ $lang = array_merge($lang, array( 'MERGE_POSTS' => 'Merge posts', 'MERGE_POSTS_CONFIRM' => 'Are you sure you want to merge the selected posts?', - 'MERGE_TOPIC_EXPLAIN' => 'Using the form below you can merge selected posts into another topic. These posts will not be reordered and will appear as if the users posted them to the new topic.<br />Please enter the destination topic id or click on the "Select" button to search for one', + 'MERGE_TOPIC_EXPLAIN' => 'Using the form below you can merge selected posts into another topic. These posts will not be reordered and will appear as if the users posted them to the new topic.<br />Please enter the destination topic id or click on "Select topic" to search for one', 'MERGE_TOPIC_ID' => 'Destination topic identification number', + 'MERGE_TOPICS' => 'Merge topics', + 'MERGE_TOPICS_CONFIRM' => 'Are you sure you want to merge the selected topics?', 'MODERATE_FORUM' => 'Moderate forum', 'MODERATE_TOPIC' => 'Moderate topic', 'MODERATE_POST' => 'Moderate post', @@ -273,6 +275,7 @@ $lang = array_merge($lang, array( 'SELECT_ACTION' => 'Select desired action', 'SELECT_FORUM_GLOBAL_ANNOUNCEMENT' => 'Please select the forum you wish this global announcement to be displayed.', 'SELECT_FORUM_GLOBAL_ANNOUNCEMENTS' => 'One or more of the selected topics are global announcements. Please select the forum you wish these to be displayed.', + 'SELECT_MERGE' => 'Select for merging', 'SELECT_TOPICS_FROM' => 'Select topics from', 'SELECT_TOPIC' => 'Select topic', 'SELECT_USER' => 'Select user', |