### Eclipse Workspace Patch 1.0
#P DrupalHEAD
Index: modules/block/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.module,v
retrieving revision 1.315
diff -u -r1.315 block.module
--- modules/block/block.module	15 Nov 2008 08:23:07 -0000	1.315
+++ modules/block/block.module	29 Nov 2008 14:40:25 -0000
@@ -66,20 +66,20 @@
 function block_help($path, $arg) {
   switch ($path) {
     case 'admin/help#block':
-      $output = '<p>' . t('Blocks are boxes of content rendered into an area, or region, of a web page. The default theme Garland, for example, implements the regions "left sidebar", "right sidebar", "content", "header", and "footer", and a block may appear in any one of these areas. The <a href="@blocks">blocks administration page</a> provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions.', array('@blocks' => url('admin/build/block'))) . '</p>';
-      $output .= '<p>' . t('Although blocks are usually generated automatically by modules (like the <em>User login</em> block, for example), administrators can also define custom blocks. Custom blocks have a title, description, and body. The body of the block can be as long as necessary, and can contain content supported by any available <a href="@input-format">input format</a>.', array('@input-format' => url('admin/settings/filters'))) . '</p>';
+      $output = '<p>' . t('Blocks are boxes of content rendered into an area, or region, of a web page. For example, the default theme, Garland, implements the regions "left sidebar", "right sidebar", "content", "header", and "footer", and blocks can be assigned to any one of these areas. The <a href="@blocks">blocks administration page</a> provides a drag-and-drop interface for organizing blocks.', array('@blocks' => url('admin/build/block'))) . '</p>';
+      $output .= '<p>' . t('Although blocks are usually generated automatically by modules (like the <em>User login</em> block, for example), administrators can also create custom blocks. Custom blocks have a title, description, and body. The body of the block can be as long as necessary, and can contain content supported by any available <a href="@input-format">input format</a>.', array('@input-format' => url('admin/settings/filters'))) . '</p>';
       $output .= '<p>' . t('When working with blocks, remember that:') . '</p>';
-      $output .= '<ul><li>' . t('since not all themes implement the same regions, or display regions in the same way, blocks are positioned on a per-theme basis.') . '</li>';
-      $output .= '<li>' . t('disabled blocks, or blocks not in a region, are never shown.') . '</li>';
+      $output .= '<ul><li>' . t('blocks are organized on a per-theme basis, since only some themes implement the same regions, or display regions in the same way.') . '</li>';
+      $output .= '<li>' . t('disabled blocks, or blocks not assigned to a region, are never shown.') . '</li>';
       $output .= '<li>' . t('blocks can be configured to be visible only on certain pages.') . '</li>';
       $output .= '<li>' . t('blocks can be configured to be visible only when specific conditions are true.') . '</li>';
       $output .= '<li>' . t('blocks can be configured to be visible only for certain user roles.') . '</li>';
-      $output .= '<li>' . t('when allowed by an administrator, specific blocks may be enabled or disabled on a per-user basis using the <em>My account</em> page.') . '</li>';
+      $output .= '<li>' . t('administrators can allow specific blocks to be enabled or disabled on a per-user basis using the <em>My account</em> page.') . '</li>';
       $output .= '<li>' . t('some dynamic blocks, such as those generated by modules, will be displayed only on certain pages.') . '</li></ul>';
       $output .= '<p>' . t('For more information, see the online handbook entry for <a href="@block">Block module</a>.', array('@block' => 'http://drupal.org/handbook/modules/block/')) . '</p>';
       return $output;
     case 'admin/build/block':
-      $output = '<p>' . t('This page provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions. To change the region or order of a block, grab a drag-and-drop handle under the <em>Block</em> column and drag the block to a new location in the list. (Grab a handle by clicking and holding the mouse while hovering over a handle icon.) Since not all themes implement the same regions, or display regions in the same way, blocks are positioned on a per-theme basis. Remember that your changes will not be saved until you click the <em>Save blocks</em> button at the bottom of the page.') . '</p>';
+      $output = '<p>' . t('Set a block's title and visibility with the <em>configure</em> link; assign a block to a region through the drop-down menu; and assign a block to a region or arrange block order within regions by grabbing the drag-and-drop handle. (Blocks are positioned relative to the current theme; themes often implement regions in different ways.) Use the <a href="@add-block">add block</a> page to create a custom block; delete removes it.', array('@add-block' => url('admin/build/block/add'))) . '</p>';
-      $output .= '<p>' . t('Click the <em>configure</em> link next to each block to configure its specific title and visibility settings. Use the <a href="@add-block">add block page</a> to create a custom block.', array('@add-block' => url('admin/build/block/add'))) . '</p>';
+      $output .= '<p>' . t('Changes are not saved until you click the <em>Save blocks</em> button below.') . '</p>';

       
       return $output;
     case 'admin/build/block/add':
@@ -107,7 +107,7 @@
   return array(
     'administer blocks' => array(
       'title' => t('Administer blocks'),
-      'description' => t('Select which blocks are displayed, and arrange them on the page.'),
+      'description' => t('Display and organize blocks.'),
     ),
     'use PHP for block visibility' => array(
       'title' => t('Use PHP for block visibility'),
@@ -312,7 +312,7 @@
     '#title' => t('Block description'),
     '#default_value' => $edit['info'],
     '#maxlength' => 64,
-    '#description' => t('A brief description of your block. Used on the <a href="@overview">block overview page</a>.', array('@overview' => url('admin/build/block'))),
+    '#description' => t('A brief description of your block, used on the <a href="@overview">block overview page</a>.', array('@overview' => url('admin/build/block'))),
     '#required' => TRUE,
     '#weight' => -19,
   );