### Eclipse Workspace Patch 1.0
#P DrupalHEAD
Index: modules/aggregator/aggregator.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.test,v
retrieving revision 1.18
diff -u -r1.18 aggregator.test
--- modules/aggregator/aggregator.test	22 Jan 2009 12:59:32 -0000	1.18
+++ modules/aggregator/aggregator.test	28 Jan 2009 13:43:38 -0000
@@ -87,7 +87,7 @@
    */
   function removeFeedItems($feed) {
     $this->drupalPost('admin/content/aggregator/remove/' . $feed->fid, array(), t('Remove items'));
-    $this->assertRaw(t('The news items from %title have been removed.', array('%title' => $feed->title)), t('Feed items removed.'));
+    $this->assertRaw(t('The feed items from %title have been removed.', array('%title' => $feed->title)), t('Feed items removed.'));
   }
 
   /**
Index: modules/aggregator/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v
retrieving revision 1.404
diff -u -r1.404 aggregator.module
--- modules/aggregator/aggregator.module	26 Jan 2009 14:08:42 -0000	1.404
+++ modules/aggregator/aggregator.module	28 Jan 2009 13:43:37 -0000
@@ -318,7 +318,7 @@
     $value = db_query('SELECT block FROM {aggregator_category} WHERE cid = :cid', array(':cid' => $id))->fetchField();
     $form['block'] = array(
       '#type' => 'select',
-      '#title' => t('Number of news items in block'),
+      '#title' => t('Number of feed items in block'),
       '#default_value' => $value,
       '#options' => drupal_map_assoc(array(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20))
     );
@@ -342,7 +342,7 @@
 /**
  * Implementation of hook_block_view().
  *
- * Generates blocks for the latest news items in each category and feed.
+ * Generates blocks for the latest feed items in each category and feed.
  */
 function aggregator_block_view($delta = '') {
   if (user_access('access news feeds')) {
Index: modules/aggregator/aggregator.processor.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.processor.inc,v
retrieving revision 1.3
diff -u -r1.3 aggregator.processor.inc
--- modules/aggregator/aggregator.processor.inc	26 Jan 2009 14:08:42 -0000	1.3
+++ modules/aggregator/aggregator.processor.inc	28 Jan 2009 13:43:37 -0000
@@ -58,7 +58,7 @@
     ->condition('fid', $feed->fid)
     ->execute();
 
-  drupal_set_message(t('The news items from %site have been removed.', array('%site' => $feed->title)));
+  drupal_set_message(t('The feed items from %site have been removed.', array('%site' => $feed->title)));
 }
 
 /**
Index: modules/aggregator/aggregator.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.admin.inc,v
retrieving revision 1.24
diff -u -r1.24 aggregator.admin.inc
--- modules/aggregator/aggregator.admin.inc	26 Jan 2009 14:08:42 -0000	1.24
+++ modules/aggregator/aggregator.admin.inc	28 Jan 2009 13:43:37 -0000
@@ -74,7 +74,7 @@
     '#title' => t('URL'),
     '#default_value' => isset($feed->url) ? $feed->url : '',
     '#maxlength' => 255,
-    '#description' => t('The fully-qualified URL of the feed.'),
+    '#description' => t('The compatible URL of the feed.'),
     '#required' => TRUE,
   );
   $form['refresh'] = array('#type' => 'select',
@@ -84,10 +84,10 @@
     '#description' => t('The length of time between feed updates. Requires a correctly configured <a href="@cron">cron maintenance task</a>.', array('@cron' => url('admin/reports/status'))),
   );
   $form['block'] = array('#type' => 'select',
-    '#title' => t('News items in block'),
+    '#title' => t('Feed items in block'),
     '#default_value' => isset($feed->block) ? $feed->block : 5,
     '#options' => drupal_map_assoc(array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)),
-    '#description' => t("Drupal can make a block with the most recent news items of this feed. You can <a href=\"@block-admin\">configure blocks</a> to be displayed in the sidebar of your page. This setting lets you configure the number of news items to show in this feed's block. If you choose '0' this feed's block will be disabled.", array('@block-admin' => url('admin/build/block'))),
+    '#description' => t("Drupal can make a block with a feed's most recent items. You can <a href=\"@block-admin\">configure blocks</a> to be displayed in the sidebar of your page. This setting lets you configure the number of feed items to show in the block. If you choose '0' this feed's block will be disabled.", array('@block-admin' => url('admin/build/block'))),
   );
 
   // Handling of categories.
@@ -102,7 +102,7 @@
   if ($options) {
     $form['category'] = array(
       '#type' => 'checkboxes',
-      '#title' => t('Categorize news items'),
+      '#title' => t('Categorize feed items'),
       '#default_value' => $values,
       '#options' => $options,
       '#description' => t('New feed items are automatically filed in the checked categories.'),
@@ -254,10 +254,10 @@
     '#description' => t('The length of time between feed updates. Requires a correctly configured <a href="@cron">cron maintenance task</a>.', array('@cron' => url('admin/reports/status'))),
   );
   $form['block'] = array('#type' => 'select',
-    '#title' => t('News items in block'),
+    '#title' => t('Feed items in block'),
     '#default_value' => 5,
     '#options' => drupal_map_assoc(array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)),
-    '#description' => t("Drupal can make a block with the most recent news items of a feed. You can <a href=\"@block-admin\">configure blocks</a> to be displayed in the sidebar of your page. This setting lets you configure the number of news items to show in a feed's block. If you choose '0' these feeds' blocks will be disabled.", array('@block-admin' => url('admin/build/block'))),
+    '#description' => t("Drupal can make a block with a feed's most recent items. You can <a href=\"@block-admin\">configure blocks</a> to be displayed in the sidebar of your page. This setting lets you configure the number of feed items to show in a block. If you choose '0' these feeds' blocks will be disabled.", array('@block-admin' => url('admin/build/block'))),
   );
 
   // Handling of categories.
@@ -265,7 +265,7 @@
   if ($options) {
     $form['category'] = array(
       '#type' => 'checkboxes',
-      '#title' => t('Categorize news items'),
+      '#title' => t('Categorize feed items'),
       '#options' => $options,
       '#description' => t('New feed items are automatically filed in the checked categories.'),
     );
@@ -469,7 +469,7 @@
     $form['basic_conf'] = array(
       '#type' => 'fieldset',
       '#title' => t('Basic configuration'),
-      '#description' => t('For most aggregation tasks, the default settings are fine.'),
+      '#description' => t('The default settings are fine for most aggregation tasks.'),
       '#collapsible' => TRUE,
       '#collapsed' => FALSE,
       );