aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp/forums.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-11-18 16:27:35 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-11-18 16:27:35 +0000
commite264a62b731d29389ba0a4a3548070e259e373c0 (patch)
tree8b4c935deb992a577cedd8123a46b2fcaf128d6d /phpBB/language/en/acp/forums.php
parent5f788b4d08838dec5e8168f2efd515859224a3a4 (diff)
downloadforums-e264a62b731d29389ba0a4a3548070e259e373c0.tar
forums-e264a62b731d29389ba0a4a3548070e259e373c0.tar.gz
forums-e264a62b731d29389ba0a4a3548070e259e373c0.tar.bz2
forums-e264a62b731d29389ba0a4a3548070e259e373c0.tar.xz
forums-e264a62b731d29389ba0a4a3548070e259e373c0.zip
- a handful of mcp fixed, the most important one is the change for check_ids() - it is now supporting ids from more than one forum too, making it possible to use some mcp features as designed initially. We really need to get our moderator team testing the mcp extensively.
- fixed some other tiny glitches - if a forum category with subforums get changed to a link type forum give options of what to do with the subforums (#5334) - other bugfixes git-svn-id: file:///svn/phpbb/trunk@6601 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp/forums.php')
-rw-r--r--phpBB/language/en/acp/forums.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index ebfe3b2710..b0e6405690 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -45,6 +45,7 @@ $lang = array_merge($lang, array(
'CREATE_FORUM' => 'Create new forum',
'DECIDE_MOVE_DELETE_CONTENT' => 'Delete content or move to forum',
+ 'DECIDE_MOVE_DELETE_SUBFORUMS' => 'Delete subforums or move to forum',
'DEFAULT_STYLE' => 'Default Style',
'DELETE_ALL_POSTS' => 'Delete posts',
'DELETE_SUBFORUMS' => 'Delete subforums and posts',
@@ -106,8 +107,8 @@ $lang = array_merge($lang, array(
'LIST_INDEX_EXPLAIN' => 'Displays a link to this forum under the parent forums subforum listing if one exist.',
'LOCKED' => 'Locked',
- 'MOVE_POSTS_TO' => 'Move posts',
- 'MOVE_SUBFORUMS_TO' => 'Move subforums',
+ 'MOVE_POSTS_TO' => 'Move posts to',
+ 'MOVE_SUBFORUMS_TO' => 'Move subforums to',
'NO_DESTINATION_FORUM' => 'You have not specified a forum to move content to',
'NO_FORUM_ACTION' => 'No action defined for what happens with the forum content',