aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-10-13 17:25:10 +0200
committerAndreas Fischer <bantu@phpbb.com>2011-10-13 17:25:10 +0200
commitb957639abb4eba00b840092e60fffbc36a9db84c (patch)
treea3e97d0cd65bf9bcf16df98cce50053fa41b5e91
parent8017469e59141d99aefe97363520f3e06b9b6422 (diff)
parent6698a9cbd62be1e77f329a7e8843fafbc18a1025 (diff)
downloadforums-b957639abb4eba00b840092e60fffbc36a9db84c.tar
forums-b957639abb4eba00b840092e60fffbc36a9db84c.tar.gz
forums-b957639abb4eba00b840092e60fffbc36a9db84c.tar.bz2
forums-b957639abb4eba00b840092e60fffbc36a9db84c.tar.xz
forums-b957639abb4eba00b840092e60fffbc36a9db84c.zip
Merge remote-tracking branch 'igorw/ticket/8094' into develop-olympus
* igorw/ticket/8094: [ticket/8094] Remove ambiguity of "phpBB has no categories"
-rw-r--r--phpBB/language/en/acp/forums.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index eab027f295..b99a0724be 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -72,7 +72,7 @@ $lang = array_merge($lang, array(
'ENABLE_TOPIC_ICONS' => 'Enable topic icons',
'FORUM_ADMIN' => 'Forum administration',
- 'FORUM_ADMIN_EXPLAIN' => 'In phpBB3 there are no categories, everything is forum based. Each forum can have an unlimited number of sub-forums and you can determine whether each may be posted to or not (i.e. whether it acts like an old category). Here you can add, edit, delete, lock, unlock individual forums as well as set certain additional controls. If your posts and topics have got out of sync you can also resynchronise a forum. <strong>You need to copy or set appropriate permissions for newly created forums to have them displayed.</strong>',
+ 'FORUM_ADMIN_EXPLAIN' => 'In phpBB3 everything is forum based. A category is just a special type of forum. Each forum can have an unlimited number of sub-forums and you can determine whether each may be posted to or not (i.e. whether it acts like an old category). Here you can add, edit, delete, lock, unlock individual forums as well as set certain additional controls. If your posts and topics have got out of sync you can also resynchronise a forum. <strong>You need to copy or set appropriate permissions for newly created forums to have them displayed.</strong>',
'FORUM_AUTO_PRUNE' => 'Enable auto-pruning',
'FORUM_AUTO_PRUNE_EXPLAIN' => 'Prunes the forum of topics, set the frequency/age parameters below.',
'FORUM_CREATED' => 'Forum created successfully.',