aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp/forums.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2006-06-20 19:00:30 +0000
committerNils Adermann <naderman@naderman.de>2006-06-20 19:00:30 +0000
commit4448249a4433c9047b886efe2ec06dce6c4276f8 (patch)
treec03475df6cdc346279f33f6931c5214055a8db93 /phpBB/language/en/acp/forums.php
parentc125ae12761e99a0f11703bbbec0defb29ad90c4 (diff)
downloadforums-4448249a4433c9047b886efe2ec06dce6c4276f8.tar
forums-4448249a4433c9047b886efe2ec06dce6c4276f8.tar.gz
forums-4448249a4433c9047b886efe2ec06dce6c4276f8.tar.bz2
forums-4448249a4433c9047b886efe2ec06dce6c4276f8.tar.xz
forums-4448249a4433c9047b886efe2ec06dce6c4276f8.zip
- correctly display subcategories
- use L_TRANSLATION_INFO [Bug #2357] - always begin with ACL_UNSET in permission trace - allow copy permissions when editing a forum - default to parent forum for copying permissions - no duplication of the breadcrumps on registration [Bug #2307] git-svn-id: file:///svn/phpbb/trunk@6107 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp/forums.php')
-rw-r--r--phpBB/language/en/acp/forums.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index ff12e687e8..2087fbf22b 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -38,7 +38,8 @@ $lang = array_merge($lang, array(
'AUTO_PRUNE_VIEWED_EXPLAIN' => 'Number of days since topic was viewed after which topic is removed.',
'COPY_PERMISSIONS' => 'Copy permissions from',
- 'COPY_PERMISSIONS_EXPLAIN' => 'Once created, the forum will have the same permissions as the one you select here. If no forum is selected the newly created forum will not be visible until permissions had been set.',
+ 'COPY_PERMISSIONS_ADD_EXPLAIN' => 'Once created, the forum will have the same permissions as the one you select here. If no forum is selected the newly created forum will not be visible until permissions had been set.',
+ 'COPY_PERMISSIONS_EDIT_EXPLAIN' => 'If you select to copy permissions, the forum will have the same permissions as the one you select here. This will overwrite any permissions you have previously set for this forum with the permissions of the forum you select here. If no forum is selected the current permissions will be kept.',
'CREATE_FORUM' => 'Create new forum',
'DECIDE_MOVE_DELETE_CONTENT' => 'Delete content or move to forum',