'. t('The aggregator is a powerful on-site syndicator and news reader that gathers fresh content from RSS-, RDF-, and Atom-based feeds made available across the web. Thousands of sites (particularly news sites and blogs) publish their latest headlines and posts in feeds, using a number of standardized XML-based formats. Formats supported by the aggregator include RSS, RDF, and Atom.', array('@rss' => 'http://blogs.law.harvard.edu/tech/rss', '@rdf' => 'http://www.w3.org/RDF/', '@atom' => 'http://www.atomenabled.org')) .'
'; - $output .= ''. t('Feeds contain feed items, or individual posts published by the site providing the feed. Feeds may be grouped in categories, generally by topic. Users view feed items in the main aggregator display or by their source. Administrators can add, edit and delete feeds and choose how often to check each feed for newly updated items. The most recent items in either a feed or category can be displayed as a block through the block administration page. A machine-readable OPML file of all feeds is available. A correctly configured cron maintenance task is required to update feeds automatically.', array('@aggregator' => url('aggregator'), '@aggregator-sources' => url('aggregator/sources'), '@feededit' => url('admin/content/aggregator'), '@admin-block' => url('admin/build/block'), '@aggregator-opml' => url('aggregator/opml'), '@cron' => url('admin/reports/status'))) .'
'; + $output .= ''. t('Feeds contain feed items, or individual posts published by the site providing the feed. Feeds may be grouped in categories, generally by topic. Users view feed items in the main aggregator display or by their source. Administrators can add, edit and delete feeds and choose how often to check each feed for newly updated items. The most recent items in either a feed or category can be displayed as a block through the blocks administration page. A machine-readable OPML file of all feeds is available. A correctly configured cron maintenance task is required to update feeds automatically.', array('@aggregator' => url('aggregator'), '@aggregator-sources' => url('aggregator/sources'), '@feededit' => url('admin/content/aggregator'), '@admin-block' => url('admin/build/block'), '@aggregator-opml' => url('aggregator/opml'), '@cron' => url('admin/reports/status'))) .'
'; $output .= ''. t('For more information, see the online handbook entry for Aggregator module.', array('@aggregator' => 'http://drupal.org/handbook/modules/aggregator/')) .'
'; return $output; case 'admin/content/aggregator': $output = ''. t('Thousands of sites (particularly news sites and blogs) publish their latest headlines and posts in feeds, using a number of standardized XML-based formats. Formats supported by the aggregator include RSS, RDF, and Atom.', array('@rss' => 'http://blogs/law.harvard.edu/tech/rss', '@rdf' => 'http://www.w3.org/RDF/', '@atom' => 'http://www.atomenabled.org')) .'
'; - $output .= ''. t('Current feeds are listed below, and new feeds may be added. For each feed or feed category, the latest items block may be enabled at the blocks configuration page.', array('@addfeed' => url('admin/content/aggregator/add/feed'), '@block' => url('admin/build/block'))) .'
'; + $output .= ''. t('Current feeds are listed below, and new feeds may be added. For each feed or feed category, the latest items block may be enabled at the blocks administration page.', array('@addfeed' => url('admin/content/aggregator/add/feed'), '@block' => url('admin/build/block'))) .'
'; return $output; case 'admin/content/aggregator/add/feed': return ''. t('Add a feed in RSS, RDF or Atom format. A feed may only have one entry.') .'
'; Index: modules/block/block.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.admin.inc,v retrieving revision 1.12 diff -u -p -r1.12 block.admin.inc --- modules/block/block.admin.inc 26 Nov 2007 16:36:42 -0000 1.12 +++ modules/block/block.admin.inc 19 Dec 2007 18:49:45 -0000 @@ -23,7 +23,7 @@ function block_admin_display($theme = NU } /** - * Generate main block administration form. + * Generate main blocks administration form. */ function block_admin_display_form(&$form_state, $blocks, $theme = NULL) { global $theme_key, $custom_theme; @@ -89,7 +89,7 @@ function block_admin_display_form(&$form } /** - * Process main block administration form submission. + * Process main blocks administration form submission. */ function block_admin_display_form_submit($form, &$form_state) { foreach ($form_state['values'] as $block) { Index: modules/block/block.module =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.module,v retrieving revision 1.293 diff -u -p -r1.293 block.module --- modules/block/block.module 18 Dec 2007 16:38:21 -0000 1.293 +++ modules/block/block.module 19 Dec 2007 18:49:45 -0000 @@ -67,7 +67,7 @@ define('BLOCK_CACHE_GLOBAL', 0x0008); function block_help($path, $arg) { switch ($path) { case 'admin/help#block': - $output = ''. 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 blocks configuration page 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'))) .'
'; + $output = ''. 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 blocks administration page 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'))) .'
'; $output .= ''. t('Although blocks are usually generated automatically by modules (like the User login 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 input format.', array('@input-format' => url('admin/settings/filters'))) .'
'; $output .= ''. t('When working with blocks, remember that:') .'
'; $output .= ''. t('Click the configure link next to each block to configure its specific title and visibility settings. Use the add block page to create a custom block.', array('@add-block' => url('admin/build/block/add'))) .'
'; return $output; case 'admin/build/block/add': - return ''. t('Use this page to create a new custom block. New blocks are disabled by default, and must be moved to a region on the blocks configuration page to be visible.', array('@blocks' => url('admin/build/block'))) .'
'; + return ''. t('Use this page to create a new custom block. New blocks are disabled by default, and must be moved to a region on the blocks administration page to be visible.', array('@blocks' => url('admin/build/block'))) .'
'; } } Index: modules/blog/blog.module =================================================================== RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v retrieving revision 1.294 diff -u -p -r1.294 blog.module --- modules/blog/blog.module 14 Dec 2007 18:08:44 -0000 1.294 +++ modules/blog/blog.module 19 Dec 2007 18:49:45 -0000 @@ -63,7 +63,7 @@ function blog_help($path, $arg) { case 'admin/help#blog': $output = ''. t('The blog module allows registered users to maintain an online journal, or blog. Blogs are made up of individual blog entries, and the blog entries are most often displayed in descending order by creation time.') .'
'; $output .= ''. t('There is an (optional) Blogs menu item added to the Navigation menu, which displays all blogs available on your site, and a My blog item displaying the current user\'s blog entries. The Blog entry menu item under Create content allows new blog entries to be created.') .'
'; - $output .= ''. t('Each blog entry is displayed with an automatic link to other blogs created by the same user. By default, blog entries have comments enabled and are automatically promoted to the site front page. The blog module also creates a Recent blog posts block that may be enabled at the blocks configuration page.', array('@blocks' => url('admin/build/block'))) .'
'; + $output .= ''. t('Each blog entry is displayed with an automatic link to other blogs created by the same user. By default, blog entries have comments enabled and are automatically promoted to the site front page. The blog module also creates a Recent blog posts block that may be enabled at the blocks administration page.', array('@blocks' => url('admin/build/block'))) .'
'; $output .= ''. t('When using the aggregator module an automatic blog it icon is displayed next to the items in a feed\'s latest items block. Clicking this icon populates a blog entry with a title (the title of the feed item) and body (a link to the source item on its original site and illustrative content suitable for use in a block quote). Blog authors can use this feature to easily comment on items of interest that appear in aggregator feeds from other sites. To use this feature, be sure to enable the aggregator module, add and configure a feed from another site, and position the feed\'s latest items block.', array('@modules' => url('admin/build/modules'), '@feeds' => url('admin/content/aggregator'), '@blocks' => url('admin/build/block'))) .'
'; $output .= ''. t('For more information, see the online handbook entry for Blog module.', array('@blog' => 'http://drupal.org/handbook/modules/blog/')) .'
'; return $output; Index: modules/book/book.module =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book.module,v retrieving revision 1.450 diff -u -p -r1.450 book.module --- modules/book/book.module 14 Dec 2007 18:08:45 -0000 1.450 +++ modules/book/book.module 19 Dec 2007 18:49:46 -0000 @@ -1001,7 +1001,7 @@ function book_help($path, $arg) { switch ($path) { case 'admin/help#book': $output = ''. t('The book module is suited for creating structured, multi-page hypertexts such as site resource guides, manuals, and Frequently Asked Questions (FAQs). It permits a document to have chapters, sections, subsections, etc. Authors with suitable permissions can add pages to a collaborative book, placing them into the existing document by adding them to a table of contents menu.') .'
'; - $output .= ''. t('Pages in the book hierarchy have navigation elements at the bottom of the page for moving through the text. These links lead to the previous and next pages in the book, and to the level above the current page in the book\'s structure. More comprehensive navigation may be provided by enabling the book navigation block on the block administration page.', array('@admin-block' => url('admin/build/block'))) .'
'; + $output .= ''. t('Pages in the book hierarchy have navigation elements at the bottom of the page for moving through the text. These links lead to the previous and next pages in the book, and to the level above the current page in the book\'s structure. More comprehensive navigation may be provided by enabling the book navigation block on the blocks administration page.', array('@admin-block' => url('admin/build/block'))) .'
'; $output .= ''. t('Users can select the printer-friendly version link visible at the bottom of a book page to generate a printer-friendly display of the page and all of its subsections. ') .'
'; $output .= ''. t("Users with the administer book outlines permission can add a post of any content type to a book, by selecting the appropriate book while editing the post or by using the interface available on the post's outline tab.") .'
'; $output .= ''. t('Administrators can view a list of all books on the book administration page. The Outline page for each book allows section titles to be edited or rearranged.', array('@admin-node-book' => url('admin/content/book'))) .'
'; Index: modules/menu/menu.module =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v retrieving revision 1.154 diff -u -p -r1.154 menu.module --- modules/menu/menu.module 19 Dec 2007 13:49:23 -0000 1.154 +++ modules/menu/menu.module 19 Dec 2007 18:49:46 -0000 @@ -19,13 +19,13 @@ function menu_help($path, $arg) { switch ($path) { case 'admin/help#menu': $output = ''. t("The menu module provides an interface to control and customize Drupal's powerful menu system. Menus are a hierarchical collection of links, or menu items, used to navigate a website, and are positioned and displayed using Drupal's flexible block system. By default, three menus are created during installation: Navigation, Primary links, and Secondary links. The Navigation menu contains most links necessary for working with and navigating your site, and is often displayed in either the left or right sidebar. Most Drupal themes also provide support for Primary links and Secondary links, by displaying them in either the header or footer of each page. By default, Primary links and Secondary links contain no menu items but may be configured to contain custom menu items specific to your site.") .'
'; - $output .= ''. t('The menus page displays all menus currently available on your site. Select a menu from this list to add or edit a menu item, or to rearrange items within the menu. Create new menus using the add menu page (the block containing a new menu must also be enabled on the blocks configuration page).', array('@menu' => url('admin/build/menu'), '@add-menu' => url('admin/build/menu/add'), '@blocks' => url('admin/build/block'))) .'
'; + $output .= ''. t('The menus page displays all menus currently available on your site. Select a menu from this list to add or edit a menu item, or to rearrange items within the menu. Create new menus using the add menu page (the block containing a new menu must also be enabled on the blocks administration page).', array('@menu' => url('admin/build/menu'), '@add-menu' => url('admin/build/menu/add'), '@blocks' => url('admin/build/block'))) .'
'; $output .= ''. t('For more information, see the online handbook entry for Menu module.', array('@menu' => 'http://drupal.org/handbook/modules/menu/')) .'
'; return $output; case 'admin/build/menu': return ''. t('Menus are a collection of links (menu items) used to navigate a website. The menus currently available on your site are displayed below. Select a menu from this list to manage its menu items.') .'
'; case 'admin/build/menu/add': - return ''. t('Enter the name for your new menu. Remember to enable the newly created block in the blocks configuration page.', array('@blocks' => url('admin/build/block'))) .'
'; + return ''. t('Enter the name for your new menu. Remember to enable the newly created block in the blocks administration page.', array('@blocks' => url('admin/build/block'))) .'
'; case 'admin/build/menu-customize/%': return ''. t('To rearrange menu items, grab a drag-and-drop handle under the Menu item column and drag the items (or group of items) to a new location in the list. (Grab a handle by clicking and holding the mouse while hovering over a handle icon.) Remember that your changes will not be saved until you click the Save configuration button at the bottom of the page.') .'
'; case 'admin/build/menu/item/add': Index: modules/statistics/statistics.module =================================================================== RCS file: /cvs/drupal/drupal/modules/statistics/statistics.module,v retrieving revision 1.269 diff -u -p -r1.269 statistics.module --- modules/statistics/statistics.module 14 Dec 2007 18:08:48 -0000 1.269 +++ modules/statistics/statistics.module 19 Dec 2007 18:49:46 -0000 @@ -19,7 +19,7 @@ function statistics_help($path, $arg) { $output .= '
'. t('Configuring the statistics module') .'
'; $output .= '