Index: includes/menu.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/menu.inc,v retrieving revision 1.219 diff -u -r1.219 menu.inc --- includes/menu.inc 17 Oct 2007 19:42:02 -0000 1.219 +++ includes/menu.inc 19 Oct 2007 13:35:33 -0000 @@ -560,7 +560,7 @@ // menu_tree_check_access() may set this ahead of time for links to nodes. if (!isset($item['access'])) { if (!_menu_load_objects($item, $map)) { - // An error occured loading an object. + // An error occurred loading an object. $item['access'] = FALSE; return FALSE; } Index: misc/autocomplete.js =================================================================== RCS file: /cvs/drupal/drupal/misc/autocomplete.js,v retrieving revision 1.21 diff -u -r1.21 autocomplete.js --- misc/autocomplete.js 12 Sep 2007 18:29:32 -0000 1.21 +++ misc/autocomplete.js 19 Oct 2007 13:38:04 -0000 @@ -282,7 +282,7 @@ } }, error: function (xmlhttp) { - alert(Drupal.t("An HTTP error @status occured. \n@uri", { '@status': xmlhttp.status, '@uri': db.uri })); + alert(Drupal.t("An HTTP error @status occurred. \n@uri", { '@status': xmlhttp.status, '@uri': db.uri })); } }); }, this.delay); Index: misc/progress.js =================================================================== RCS file: /cvs/drupal/drupal/misc/progress.js,v retrieving revision 1.18 diff -u -r1.18 progress.js --- misc/progress.js 12 Sep 2007 18:29:32 -0000 1.18 +++ misc/progress.js 19 Oct 2007 13:35:26 -0000 @@ -85,7 +85,7 @@ pb.timer = setTimeout(function() { pb.sendPing(); }, pb.delay); }, error: function (xmlhttp) { - pb.displayError(Drupal.t("An HTTP error @status occured. \n@uri", { '@status': xmlhttp.status, '@uri': pb.uri })); + pb.displayError(Drupal.t("An HTTP error @status occurred. \n@uri", { '@status': xmlhttp.status, '@uri': pb.uri })); } }); } Index: modules/block/block.install =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.install,v retrieving revision 1.3 diff -u -r1.3 block.install --- modules/block/block.install 12 Oct 2007 14:10:17 -0000 1.3 +++ modules/block/block.install 19 Oct 2007 13:38:34 -0000 @@ -79,7 +79,7 @@ 'pages' => array( 'type' => 'text', 'not null' => TRUE, - 'description' => t('Contents of the "Pages" block; contain either a list of paths on which to include/exlclude the block or PHP code, depending on "visibility" setting.'), + 'description' => t('Contents of the "Pages" block; contain either a list of paths on which to include/exclude the block or PHP code, depending on "visibility" setting.'), ), 'title' => array( 'type' => 'varchar', Index: modules/comment/comment.module =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v retrieving revision 1.593 diff -u -r1.593 comment.module --- modules/comment/comment.module 19 Oct 2007 10:19:02 -0000 1.593 +++ modules/comment/comment.module 19 Oct 2007 14:48:59 -0000 @@ -127,7 +127,7 @@ switch ($path) { case 'admin/help#comment': $output = '

'. t('The comment module creates a discussion board for each post. Users can post comments to discuss a forum topic, weblog post, story, collaborative book page, etc. The ability to comment is an important part of involving members in a community dialogue.') .'

'; - $output .= '

'. t('An administrator can give comment permissions to user groups, and users can (optionally) edit their last comment, assuming no others have been posted since. Attached to each comment board is a control panel for customizing the way that comments are displayed. Users can control the chronological ordering of posts (newest or oldest first) and the number of posts to display on each page. Comments behave like other user submissions. Filters, smileys and HTML that work in nodes will also work with comments. The comment module provides specific features to inform site members when new comments have been posted.') .'

'; + $output .= '

'. t('An administrator can give comment permissions to user groups, and users can (optionally) edit their last comment, assuming no others have been posted since. Attached to each comment board is a control panel for customizing the way that comments are displayed. Users can control the chronological ordering of posts (newest or oldest first) and the number of posts to display on each page. Comments behave like other user submissions. Filters, emoticons and HTML that work in nodes will also work with comments. The comment module provides specific features to inform site members when new comments have been posted.') .'

'; $output .= '

'. t('For more information please read the configuration and customization handbook Comment page.', array('@comment' => 'http://drupal.org/handbook/modules/comment/')) .'

'; return $output; case 'admin/content/comment': @@ -1958,7 +1958,7 @@ function _comment_delete_thread($comment) { if (!is_object($comment) || !is_numeric($comment->cid)) { - watchdog('content', 'Can not delete non-existent comment.', WATCHDOG_WARNING); + watchdog('content', 'Cannot delete non-existent comment.', WATCHDOG_WARNING); return; } Index: modules/locale/locale.install =================================================================== RCS file: /cvs/drupal/drupal/modules/locale/locale.install,v retrieving revision 1.19 diff -u -r1.19 locale.install --- modules/locale/locale.install 12 Oct 2007 14:10:17 -0000 1.19 +++ modules/locale/locale.install 19 Oct 2007 14:01:26 -0000 @@ -146,7 +146,7 @@ 'length' => 12, 'not null' => TRUE, 'default' => '', - 'description' => t("Language code, eg 'de' or 'en-US'."), + 'description' => t("Language code, e.g. 'de' or 'en-US'."), ), 'name' => array( 'type' => 'varchar', Index: modules/locale/locale.module =================================================================== RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v retrieving revision 1.195 diff -u -r1.195 locale.module --- modules/locale/locale.module 15 Oct 2007 19:51:06 -0000 1.195 +++ modules/locale/locale.module 19 Oct 2007 17:50:23 -0000 @@ -41,7 +41,7 @@ case 'admin/settings/language': return t("

Drupal provides support for the translation of its interface text into different languages. This page provides an overview of the installed languages. You can add a language on the add language page, or directly by importing a translation. If multiple languages are enabled, registered users will be able to set their preferred language. The site default will be used for anonymous visitors and for users without their own settings.

Drupal interface translations may be added or extended by several courses: by importing an existing translation, by translating everything from scratch, or by a combination of these approaches.

", array("@search" => url("admin/build/translate/search"), "@import" => url("admin/build/translate/import"), "@add-language" => url("admin/settings/language/add"))); case 'admin/settings/language/add': - return '

'. t("You need to add all languages in which you would like to display the site interface. If you can't find the desired language in the quick-add dropdown, then you will need to provide the proper language code yourself. The language code may be used to negotiate with browsers and to present flags, etc., so it is important to pick a code that is standardised for the desired language. You can also add a language by importing a translation.", array("@import" => url("admin/build/translate/import"))) .'

'; + return '

'. t("You need to add all languages in which you would like to display the site interface. If you can't find the desired language in the quick-add dropdown, then you will need to provide the proper language code yourself. The language code may be used to negotiate with browsers and to present flags, etc., so it is important to pick a code that is standardized for the desired language. You can also add a language by importing a translation.", array("@import" => url("admin/build/translate/import"))) .'

'; case 'admin/settings/language/configure': return '

'. t('The language used to display a web page is determined with a negotiation algorithm. You can choose how this algorithm should work. By default, there is no negotiation and the default language is used. You can use path prefixes (like "de" and "it" for German and Italian content) with different fallback options, so you can have web addresses like /de/contact and /it/contact. Alternatively you can use custom domains like de.example.com and it.example.com. Customize path prefixes and set domain names on the language editing pages.', array('@languages' => url('admin/settings/language'))) .'

'; Index: modules/menu/menu.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.admin.inc,v retrieving revision 1.3 diff -u -r1.3 menu.admin.inc --- modules/menu/menu.admin.inc 27 Sep 2007 16:59:54 -0000 1.3 +++ modules/menu/menu.admin.inc 19 Oct 2007 13:48:05 -0000 @@ -492,7 +492,7 @@ '#default_value' => variable_get('menu_secondary_links_source', 'secondary-links'), '#options' => $secondary_options, '#tree' => FALSE, - '#description' => t('Select what should be displayed as the secondary links . If %primary is choosen the children of the active primary menu link (if any) will be shown instead of the links in the %secondary menu.', array('%secondary' => $menu_options['secondary-links'], '%primary' => $menu_options['primary-links'])), + '#description' => t('Select what should be displayed as the secondary links . If %primary is chosen, the children of the active primary menu link (if any) will be shown instead of the links in the %secondary menu.', array('%secondary' => $menu_options['secondary-links'], '%primary' => $menu_options['primary-links'])), ); return system_settings_form($form); Index: modules/menu/menu.module =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v retrieving revision 1.145 diff -u -r1.145 menu.module --- modules/menu/menu.module 7 Oct 2007 09:50:01 -0000 1.145 +++ modules/menu/menu.module 19 Oct 2007 13:48:05 -0000 @@ -18,8 +18,8 @@ function menu_help($path, $arg) { switch ($path) { case 'admin/help#menu': - $output = t('

Menus are a collection of links (menu items) used to navigate a website. The menu module provides an interface to control and customize the powerful menu system that comes with Drupal. Menus are primarily displayed as a hierarchical list of links using Drupal\'s highly flexible blocks feature. Each menu automatically creates a block of the same name. By default, new menu items are placed inside a built-in menu labelled %navigation, but administrators can also create custom menus.

-

Drupal themes generally provide out-of-the-box support for two menus commonly labelled %primary-links and %secondary-links. These are sets of links which are usually displayed in the header or footer of each page (depending on the currently active theme).

+ $output = t('

Menus are a collection of links (menu items) used to navigate a website. The menu module provides an interface to control and customize the powerful menu system that comes with Drupal. Menus are primarily displayed as a hierarchical list of links using Drupal\'s highly flexible blocks feature. Each menu automatically creates a block of the same name. By default, new menu items are placed inside a built-in menu labeled %navigation, but administrators can also create custom menus.

+

Drupal themes generally provide out-of-the-box support for two menus commonly labeled %primary-links and %secondary-links. These are sets of links which are usually displayed in the header or footer of each page (depending on the currently active theme).

Menu administration tabs: