From ad7e3ccf4c8d233744cd7408f42484405f7d9c48 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sun, 27 Dec 2009 00:48:52 +0000 Subject: Integrate active topics feed. Some language adjustments and rearrangements. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10382 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/language/en/acp/board.php | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'phpBB/language/en/acp/board.php') diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index f181ea0291..949aa6766c 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -249,30 +249,32 @@ $lang = array_merge($lang, array( 'ACP_FEED_MANAGEMENT' => 'General Syndication Feeds settings', 'ACP_FEED_MANAGEMENT_EXPLAIN' => 'This Module makes available various ATOM Feeds, parsing any BBCode in posts to make them readable in external feeds.', + 'ACP_FEED_GENERAL' => 'General Feed Settings', + 'ACP_FEED_POST_BASED' => 'Post-based Feed Settings', + 'ACP_FEED_TOPIC_BASED' => 'Topic-based Feed Settings', + 'ACP_FEED_SETTINGS_OTHER' => 'Other Feeds and Seetings', + 'ACP_FEED_ENABLE' => 'Enable Feeds', 'ACP_FEED_ENABLE_EXPLAIN' => 'Turns on or off ATOM Feeds for the entire board.
Disabling this switches off all Feeds, no matter how the options below are set.', 'ACP_FEED_LIMIT' => 'Number of items', - 'ACP_FEED_LIMIT_EXPLAIN' => 'The maximum number of feed items to display.', + 'ACP_FEED_LIMIT_EXPLAIN' => 'The maximum number of feed items to display.', 'ACP_FEED_OVERALL' => 'Enable board-wide Feed', 'ACP_FEED_OVERALL_EXPLAIN' => 'Board-wide new posts.', - - 'ACP_FEED_OVERALL_FORUMS' => 'Enable forums feed', - 'ACP_FEED_OVERALL_FORUMS_EXPLAIN' => 'Enables the “All forums” feed, which displays a list of forums.', - - 'ACP_FEED_OVERALL_TOPIC' => 'Enable topics feed', - 'ACP_FEED_OVERALL_TOPIC_EXPLAIN' => 'Enables the “All Topics” feed, which displays the last created topics including the first post.', 'ACP_FEED_FORUM' => 'Enable Per-Forum Feeds', 'ACP_FEED_FORUM_EXPLAIN' => 'Single forum new posts.', 'ACP_FEED_TOPIC' => 'Enable Per-Topic Feeds', 'ACP_FEED_TOPIC_EXPLAIN' => 'Single topics new posts.', - 'ACP_FEED_NEWS' => 'News Feeds', + + 'ACP_FEED_TOPICS_NEW' => 'Enable new topics feed', + 'ACP_FEED_TOPICS_NEW_EXPLAIN' => 'Enables the “New Topics” feed, which displays the last created topics including the first post.', + 'ACP_FEED_TOPICS_ACTIVE' => 'Enable active topics feed', + 'ACP_FEED_TOPICS_ACTIVE_EXPLAIN' => 'Enables the “Active Topics” feed, which displays the last active topics including the last post.', + 'ACP_FEED_NEWS' => 'News Feed', 'ACP_FEED_NEWS_EXPLAIN' => 'Pull the first post from these forums. Select no forums to disable news feed.
Select multiple forums by holding CTRL and clicking.', - 'ACP_FEED_GENERAL' => 'General Feed Settings', - 'ACP_FEED_POST_BASED' => 'Post-based Feed Settings', - 'ACP_FEED_TOPIC_BASED' => 'Topic-based Feed Settings', - 'ACP_FEED_SETTINGS_OTHER' => 'Other Feeds and Seetings', + 'ACP_FEED_OVERALL_FORUMS' => 'Enable forums feed', + 'ACP_FEED_OVERALL_FORUMS_EXPLAIN' => 'Enables the “All forums” feed, which displays a list of forums.', 'ACP_FEED_ITEM_STATISTICS' => 'Item statistics', 'ACP_FEED_ITEM_STATISTICS_EXPLAIN' => 'Display individual statistics underneath feed items
(Posted by, date and time, Replies, Views)', -- cgit v1.2.1