diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-16 14:02:06 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-16 14:02:06 +0000 |
| commit | 683930ca4a31d502b704bbb9366938b4ed6562b1 (patch) | |
| tree | cd1f3d62969335b3904f8bcea01a0fa3d8ac70a7 /phpBB/language/en | |
| parent | d4675c109aa65a909b97061643222f4f2d9fb140 (diff) | |
| download | forums-683930ca4a31d502b704bbb9366938b4ed6562b1.tar forums-683930ca4a31d502b704bbb9366938b4ed6562b1.tar.gz forums-683930ca4a31d502b704bbb9366938b4ed6562b1.tar.bz2 forums-683930ca4a31d502b704bbb9366938b4ed6562b1.tar.xz forums-683930ca4a31d502b704bbb9366938b4ed6562b1.zip | |
- 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
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/acp/common.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/forums.php | 4 |
2 files changed, 5 insertions, 1 deletions
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' => '<strong>Failed administration login attempt</strong>', 'LOG_ADMIN_AUTH_SUCCESS' => '<strong>Successful administration login</strong>', + 'LOG_ATTACHMENTS_DELETED' => '<strong>Removed user attachments</strong><br />» %s', + 'LOG_ATTACH_EXT_ADD' => '<strong>Added or edited attachment extension</strong><br />» %s', 'LOG_ATTACH_EXT_DEL' => '<strong>Removed attachment extension</strong><br />» %s', 'LOG_ATTACH_EXT_UPDATE' => '<strong>Updated attachment extension</strong><br />» %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', |