From 683930ca4a31d502b704bbb9366938b4ed6562b1 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Mon, 16 Jul 2007 14:02:06 +0000 Subject: - Handle forum links/redirects within viewforum if no read permission given (to display login box or error message) (Bug #13467) - Prevent changing postable forum having subforums to link forum without moving subforums out first git-svn-id: file:///svn/phpbb/trunk@7895 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/language/en/acp/common.php | 2 ++ phpBB/language/en/acp/forums.php | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'phpBB/language') diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 848f9175f3..3923da2b00 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -402,6 +402,8 @@ $lang = array_merge($lang, array( 'LOG_ADMIN_AUTH_FAIL' => 'Failed administration login attempt', 'LOG_ADMIN_AUTH_SUCCESS' => 'Successful administration login', + 'LOG_ATTACHMENTS_DELETED' => 'Removed user attachments
» %s', + 'LOG_ATTACH_EXT_ADD' => 'Added or edited attachment extension
» %s', 'LOG_ATTACH_EXT_DEL' => 'Removed attachment extension
» %s', 'LOG_ATTACH_EXT_UPDATE' => 'Updated attachment extension
» %s', diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php index 2235772bf4..8ad28f175d 100644 --- a/phpBB/language/en/acp/forums.php +++ b/phpBB/language/en/acp/forums.php @@ -102,6 +102,8 @@ $lang = array_merge($lang, array( 'FORUM_TYPE' => 'Forum type', 'FORUM_UPDATED' => 'Forum information updated successfully.', + 'FORUM_WITH_SUBFORUMS_NOT_TO_LINK' => 'You want to change a postable forum having subforums to a link. Please move all subforums out of this forum before you proceed, because after changing to a link you are no longer able to see the subforums currently connected to this forum.', + 'GENERAL_FORUM_SETTINGS' => 'General forum settings', 'LINK' => 'Link', @@ -126,7 +128,7 @@ $lang = array_merge($lang, array( 'PRUNE_STICKY' => 'Prune stickies', 'PRUNE_OLD_POLLS' => 'Prune old polls', 'PRUNE_OLD_POLLS_EXPLAIN' => 'Removes topics with polls not voted in for post age days.', - + 'REDIRECT_ACL' => 'Now you are able to %sset permissions%s for this forum.', 'SYNC_IN_PROGRESS' => 'Synchronizing forum', -- cgit v1.2.1