diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-10-13 17:25:19 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-10-13 17:25:19 +0200 |
| commit | e9677e698017e5303c097f3d48061c7273b53b95 (patch) | |
| tree | 44f7365096bd429f96014dd110253ea42656218e /phpBB/language/en/acp/forums.php | |
| parent | 563fb56c4a90329e6430da6766e95741fb4135cd (diff) | |
| parent | b957639abb4eba00b840092e60fffbc36a9db84c (diff) | |
| download | forums-e9677e698017e5303c097f3d48061c7273b53b95.tar forums-e9677e698017e5303c097f3d48061c7273b53b95.tar.gz forums-e9677e698017e5303c097f3d48061c7273b53b95.tar.bz2 forums-e9677e698017e5303c097f3d48061c7273b53b95.tar.xz forums-e9677e698017e5303c097f3d48061c7273b53b95.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/8094] Remove ambiguity of "phpBB has no categories"
Diffstat (limited to 'phpBB/language/en/acp/forums.php')
| -rw-r--r-- | phpBB/language/en/acp/forums.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php index 80e958afa5..bb5b361086 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.', |