3 files changed, 43 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index aac05bc8c1..e1739f229a 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -231,6 +231,38 @@ $lang = array_merge($lang, array(
 	'USERNAME_LENGTH_EXPLAIN'	=> 'Minimum and maximum number of characters in usernames.',
 ));
 
+// Feeds
+$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_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_EXPLAI'				=> 'The maximum number of feed items to display.',
+
+	'ACP_FEED_OVERALL_FORUMS'			=> 'Enable overall forums feed',
+	'ACP_FEED_OVERALL_FORUMS_EXPLAIN'	=> 'This feed displays the latest posts from all forums topics.',
+	'ACP_FEED_OVERALL_FORUMS_LIMIT'		=> 'Number of items per page to display in the forums feed',
+
+	'ACP_FEED_OVERALL_TOPIC'			=> 'Enable overall topics feed',
+	'ACP_FEED_OVERALL_TOPIC_EXPLAIN'	=> 'Enables the &quot;All Topics&quot; feed',
+	'ACP_FEED_OVERALL_TOPIC_LIMIT'		=> 'Number of items per page to display in the topics feed',
+	'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_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_ITEM_STATISTICS'			=> 'Item statistics',
+	'ACP_FEED_ITEM_STATISTICS_EXPLAIN'	=> 'Display individual statistics underneath feed items<br />(Posted by, date and time, Replies, Views)',
+	'ACP_FEED_EXCLUDE_ID'				=> 'Exclude these forums',
+	'ACP_FEED_EXCLUDE_ID_EXPLAIN'		=> 'Content from these will be <strong>not included in feeds</strong>. Select no forum to pull data from all forums.<br />Select/Deselect multiple forums by holding <samp>CTRL</samp> and clicking.',
+));
+
 // Visual Confirmation Settings
 $lang = array_merge($lang, array(
 	'ACP_VC_SETTINGS_EXPLAIN'				=> 'Here you are able to define visual confirmation defaults and CAPTCHA settings.',
@@ -264,6 +296,7 @@ $lang = array_merge($lang, array(
 	'CAPTCHA_CONFIGURE_EXPLAIN'				=> 'Change the settings for the selected CAPTCHA.',
 	'CONFIGURE'								=> 'Configure',
 	'CAPTCHA_NO_OPTIONS'					=> 'This CAPTCHA has no configuration options.',
+
 	'VISUAL_CONFIRM_POST'					=> 'Enable visual confirmation for guest postings',
 	'VISUAL_CONFIRM_POST_EXPLAIN'			=> 'Requires anonymous users to enter a random code matching an image to help prevent mass postings.',
 	'VISUAL_CONFIRM_REG'					=> 'Enable visual confirmation for registrations',
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 6cfcc44d21..bc569cd8ed 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -148,6 +148,9 @@ $lang = array_merge($lang, array(
 
 	'ACP_RESTORE'				=> 'Restore',
 
+	'ACP_FEED'					=> 'Feed management',
+	'ACP_FEED_SETTINGS'			=> 'Feed settings',
+
 	'ACP_SEARCH'				=> 'Search configuration',
 	'ACP_SEARCH_INDEX'			=> 'Search index',
 	'ACP_SEARCH_SETTINGS'		=> 'Search settings',
@@ -161,6 +164,8 @@ $lang = array_merge($lang, array(
 	'ACP_STYLE_MANAGEMENT'		=> 'Style management',
 	'ACP_STYLES'				=> 'Styles',
 
+	'ACP_SUBMIT_CHANGES'		=> 'Submit changes',
+
 	'ACP_TEMPLATES'				=> 'Templates',
 	'ACP_THEMES'				=> 'Themes',
 
@@ -464,6 +469,7 @@ $lang = array_merge($lang, array(
 	'LOG_CONFIG_MESSAGE'		=> '<strong>Altered private message settings</strong>',
 	'LOG_CONFIG_POST'			=> '<strong>Altered post settings</strong>',
 	'LOG_CONFIG_REGISTRATION'	=> '<strong>Altered user registration settings</strong>',
+	'LOG_CONFIG_FEED'			=> '<strong>Altered syndication feeds settings</strong>',
 	'LOG_CONFIG_SEARCH'			=> '<strong>Altered search settings</strong>',
 	'LOG_CONFIG_SECURITY'		=> '<strong>Altered security settings</strong>',
 	'LOG_CONFIG_SERVER'			=> '<strong>Altered server settings</strong>',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 12510d5d5e..9e5de4d61b 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -383,6 +383,8 @@ $lang = array_merge($lang, array(
 	'NO_ONLINE_USERS'			=> 'No registered users',
 	'NO_POSTS'					=> 'No posts',
 	'NO_POSTS_TIME_FRAME'		=> 'No posts exist inside this topic for the selected time frame.',
+	'NO_FEED_ENABLED'			=> 'Feeds are not enabled.',
+	'NO_FEED'					=> 'Couldn\'t find Feed.',
 	'NO_SUBJECT'				=> 'No subject specified',								// Used for posts having no subject defined but displayed within management pages.
 	'NO_SUCH_SEARCH_MODULE'		=> 'The specified search backend doesn’t exist.',
 	'NO_SUPPORTED_AUTH_METHODS'	=> 'No supported authentication methods.',
@@ -486,6 +488,8 @@ $lang = array_merge($lang, array(
 	'RETURN_PAGE'				=> '%sReturn to the previous page%s',
 	'RETURN_TOPIC'				=> '%sReturn to the topic last visited%s',
 	'RETURN_TO'					=> 'Return to',
+	'FEED'						=> 'Feed',
+	'FEED_NEWS'					=> 'News',
 	'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',