aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp/forums.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2008-02-03 22:55:10 +0000
committerNils Adermann <naderman@naderman.de>2008-02-03 22:55:10 +0000
commitcc24876726854e2e799651b1d7e40e54a2c0375b (patch)
treeae879ed244bb88ee3d4e3386f1cf45109ac63d70 /phpBB/language/en/acp/forums.php
parentefdb743f60b9df2f5a151cd56ba3c45007cdedc8 (diff)
downloadforums-cc24876726854e2e799651b1d7e40e54a2c0375b.tar
forums-cc24876726854e2e799651b1d7e40e54a2c0375b.tar.gz
forums-cc24876726854e2e799651b1d7e40e54a2c0375b.tar.bz2
forums-cc24876726854e2e799651b1d7e40e54a2c0375b.tar.xz
forums-cc24876726854e2e799651b1d7e40e54a2c0375b.zip
merging r8373 into 3.0 branch: adding a new option to hide the entire list of subforums on listforums
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8374 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp/forums.php')
-rw-r--r--phpBB/language/en/acp/forums.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index 72c92a6740..84f280c779 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -114,10 +114,12 @@ $lang = array_merge($lang, array(
'GENERAL_FORUM_SETTINGS' => 'General forum settings',
- 'LINK' => 'Link',
- 'LIST_INDEX' => 'List subforum in parent-forum’s legend',
- 'LIST_INDEX_EXPLAIN' => 'Displays this forum on the index and elsewhere as a link within the legend of its parent-forum.',
- 'LOCKED' => 'Locked',
+ 'LINK' => 'Link',
+ 'LIST_INDEX' => 'List subforum in parent-forum’s legend',
+ 'LIST_INDEX_EXPLAIN' => 'Displays this forum on the index and elsewhere as a link within the legend of its parent-forum if the parent-forum’s “List subforums in legend” option is enabled.',
+ 'LIST_SUBFORUMS' => 'List subforums in legend',
+ 'LIST_SUBFORUMS_EXPLAIN' => 'Displays this forum’s subforums on the index and elsewhere as a link within the legend if their “List subforum in parent-forum’s legend” option is enabled.',
+ 'LOCKED' => 'Locked',
'MOVE_POSTS_NO_POSTABLE_FORUM' => 'The forum you selected for moving the posts to is not postable. Please select a postable forum.',
'MOVE_POSTS_TO' => 'Move posts to',