diff options
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 26 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 2 |
2 files changed, 16 insertions, 12 deletions
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.<br />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.<br />Select multiple forums by holding <samp>CTRL</samp> 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<br />(Posted by, date and time, Replies, Views)', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index b97445f186..75aeb90855 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -491,6 +491,8 @@ $lang = array_merge($lang, array( 'RETURN_TO' => 'Return to', 'FEED' => 'Feed', 'FEED_NEWS' => 'News', + 'FEED_TOPICS_ACTIVE' => 'Active Topics', + 'FEED_TOPICS_NEW' => 'New Topics', 'RULES_ATTACH_CAN' => 'You <strong>can</strong> post attachments in this forum', 'RULES_ATTACH_CANNOT' => 'You <strong>cannot</strong> post attachments in this forum', 'RULES_DELETE_CAN' => 'You <strong>can</strong> delete your posts in this forum', |