aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2009-12-23 03:26:38 +0000
committerAndreas Fischer <bantu@phpbb.com>2009-12-23 03:26:38 +0000
commit035fe7426478acf024043d60247cd018492ce009 (patch)
tree5af730c07f7dac788c55a5857b0d3fa3b90b2f3a /phpBB/language
parent749fe6f9d08ebc0ba534e115a0a009fa439dd4b7 (diff)
downloadforums-035fe7426478acf024043d60247cd018492ce009.tar
forums-035fe7426478acf024043d60247cd018492ce009.tar.gz
forums-035fe7426478acf024043d60247cd018492ce009.tar.bz2
forums-035fe7426478acf024043d60247cd018492ce009.tar.xz
forums-035fe7426478acf024043d60247cd018492ce009.zip
Let's try this. Split feed user interface into sections. This partly reverts r10366.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10374 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/board.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index eb06a2f61b..f181ea0291 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -251,10 +251,8 @@ $lang = array_merge($lang, array(
'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_POST' => 'Number of items in post based feeds',
- 'ACP_FEED_LIMIT_POST_EXPLAIN' => 'The maximum number of feed items to display in post based feeds.',
- 'ACP_FEED_LIMIT_TOPIC' => 'Number of items in topic based feeds',
- 'ACP_FEED_LIMIT_TOPIC_EXPLAIN' => 'The maximum number of feed items to display in topic based feeds.',
+ 'ACP_FEED_LIMIT' => 'Number of items',
+ '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.',
@@ -272,6 +270,9 @@ $lang = array_merge($lang, array(
'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_ITEM_STATISTICS' => 'Item statistics',
'ACP_FEED_ITEM_STATISTICS_EXPLAIN' => 'Display individual statistics underneath feed items<br />(Posted by, date and time, Replies, Views)',