#184867 by deekayen, catch and keith.smith: fix some spelling errors in our source code and messages printed

22 files changed, 29 insertions, 29 deletions

diff --git a/includes/form.inc b/includes/form.inc
index 9c1062ef4..a6cf31996 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -1847,7 +1847,7 @@ function theme_form($element) {
 function theme_textarea($element) {
   $class = array('form-textarea');
 
-  // Add teaser behaviour (must come before resizable)
+  // Add teaser behavior (must come before resizable)
   if (!empty($element['#teaser'])) {
     drupal_add_js('misc/teaser.js');
     // Note: arrays are merged in drupal_get_js().
@@ -1856,7 +1856,7 @@ function theme_textarea($element) {
     $class[] = 'teaser';
   }
 
-  // Add resizable behaviour
+  // Add resizable behavior
   if ($element['#resizable'] !== FALSE) {
     drupal_add_js('misc/textarea.js');
     $class[] = 'resizable';
diff --git a/includes/menu.inc b/includes/menu.inc
index 63282ca7f..74694c8e0 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -560,7 +560,7 @@ function _menu_link_translate(&$item) {
     // 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;
       }
diff --git a/includes/unicode.inc b/includes/unicode.inc
index 20ce94b95..a9c417404 100644
--- a/includes/unicode.inc
+++ b/includes/unicode.inc
@@ -104,7 +104,7 @@ function unicode_requirements() {
 
   return $requirements;
 }
- 
+
 /**
  * Prepare a new XML parser.
  *
@@ -427,7 +427,7 @@ function drupal_ucfirst($text) {
 
 /**
  * Cut off a piece of a string based on character indices and counts. Follows
- * the same behaviour as PHP's own substr() function.
+ * the same behavior as PHP's own substr() function.
  *
  * Note that for cutting off a string at a known character/substring
  * location, the usage of PHP's normal strpos/substr is safe and
diff --git a/misc/ahah.js b/misc/ahah.js
index 8ea5a5d3c..92de2df8c 100644
--- a/misc/ahah.js
+++ b/misc/ahah.js
@@ -13,7 +13,7 @@
  */
 
 /**
- * Attaches the ahah behaviour to each ahah form element.
+ * Attaches the ahah behavior to each ahah form element.
  */
 Drupal.behaviors.ahah = function(context) {
   for (var base in Drupal.settings.ahah) {
diff --git a/misc/autocomplete.js b/misc/autocomplete.js
index c49a20ecd..aa2deb019 100644
--- a/misc/autocomplete.js
+++ b/misc/autocomplete.js
@@ -1,7 +1,7 @@
 // $Id$
 
 /**
- * Attaches the autocomplete behaviour to all required fields
+ * Attaches the autocomplete behavior to all required fields
  */
 Drupal.behaviors.autocomplete = function (context) {
   var acdb = [];
@@ -282,7 +282,7 @@ Drupal.ACDB.prototype.search = function (searchString) {
         }
       },
       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);
diff --git a/misc/batch.js b/misc/batch.js
index 51b1e8b59..5a5587ad8 100644
--- a/misc/batch.js
+++ b/misc/batch.js
@@ -1,7 +1,7 @@
 // $Id$
 
 /**
- * Attaches the batch behaviour to progress bars.
+ * Attaches the batch behavior to progress bars.
  */
 Drupal.behaviors.batch = function (context) {
   // This behavior attaches by ID, so is only valid once on a page.
diff --git a/misc/progress.js b/misc/progress.js
index 9f34d251f..70fa3fad4 100644
--- a/misc/progress.js
+++ b/misc/progress.js
@@ -85,7 +85,7 @@ Drupal.progressBar.prototype.sendPing = function () {
         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 }));
       }
     });
   }
diff --git a/misc/teaser.js b/misc/teaser.js
index 0aa512901..973734e81 100644
--- a/misc/teaser.js
+++ b/misc/teaser.js
@@ -1,7 +1,7 @@
 // $Id$
 
 /**
- * Auto-attach for teaser behaviour.
+ * Auto-attach for teaser behavior.
  *
  * Note: depends on resizable textareas.
  */
diff --git a/modules/block/block.install b/modules/block/block.install
index 8b4cb65b1..a5274f068 100644
--- a/modules/block/block.install
+++ b/modules/block/block.install
@@ -79,7 +79,7 @@ function block_schema() {
       '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; contains either a list of paths on which to include/exclude the block or PHP code, depending on "visibility" setting.'),
       ),
       'title' => array(
         'type' => 'varchar',
diff --git a/modules/block/block.module b/modules/block/block.module
index 1b4557b93..131d70e94 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -91,7 +91,7 @@ function block_help($path, $arg) {
       return t('<p>Blocks are boxes of content that may be rendered into certain regions of your web pages, for example, into sidebars. They are usually generated automatically by modules, but administrators can create blocks manually.</p>
 <p>Only enabled blocks are shown. You can position blocks by specifying which area of the page they should appear in (e.g., a sidebar).  Highlighted labels on this page show the regions into which blocks can be rendered. You can specify where within a region a block will appear by adjusting its weight.</p>
 <p>If you want certain blocks to disable themselves temporarily during high server loads, check the "Throttle" box. You can configure the auto-throttle on the <a href="@throttle">throttle configuration page</a> after having enabled the throttle module.</p>
-<p>You can configure the behaviour of each block (for example, specifying on which pages and for what users it will appear) by clicking the "configure" link for each block.</p>', array('@throttle' => url('admin/settings/throttle')));
+<p>You can configure the behavior of each block (for example, specifying on which pages and for what users it will appear) by clicking the "configure" link for each block.</p>', array('@throttle' => url('admin/settings/throttle')));
     case 'admin/build/block/add':
       return '<p>'. t('Here you can create a new block. Once you have created this block you must make it active and give it a place on the page using <a href="@overview">blocks</a>. The description is used in the "block" column on the <a href="@overview">blocks</a> page.', array('@overview' => url('admin/build/block'))) .'</p>';
   }
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index ea4bdfa50..86b874130 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -127,7 +127,7 @@ function comment_help($path, $arg) {
   switch ($path) {
     case 'admin/help#comment':
       $output = '<p>'. 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.') .'</p>';
-      $output .= '<p>'. 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.') .'</p>';
+      $output .= '<p>'. 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.') .'</p>';
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@comment">Comment page</a>.', array('@comment' => 'http://drupal.org/handbook/modules/comment/')) .'</p>';
       return $output;
     case 'admin/content/comment':
@@ -1958,7 +1958,7 @@ function theme_comment_submitted($comment) {
 
 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;
   }
 
diff --git a/modules/locale/locale.install b/modules/locale/locale.install
index 8b3309e46..5d12b3d36 100644
--- a/modules/locale/locale.install
+++ b/modules/locale/locale.install
@@ -146,7 +146,7 @@ function locale_schema() {
         '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',
diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index a7e477398..0d8e720f3 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -41,7 +41,7 @@ function locale_help($path, $arg) {
     case 'admin/settings/language':
       return t("<p>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 <a href=\"@add-language\">add language page</a>, or directly by <a href=\"@import\">importing a translation</a>. 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.</p><p>Drupal interface translations may be added or extended by several courses: by <a href=\"@import\">importing</a> an existing translation, by <a href=\"@search\">translating everything</a> from scratch, or by a combination of these approaches.</p>", 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 '<p>'. 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 <a href=\"@import\">importing a translation</a>.", array("@import" => url("admin/build/translate/import"))) .'</p>';
+      return '<p>'. 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 <a href=\"@import\">importing a translation</a>.", array("@import" => url("admin/build/translate/import"))) .'</p>';
     case 'admin/settings/language/configure':
       return '<p>'. 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 <a href="@languages">language editing pages</a>.', array('@languages' => url('admin/settings/language'))) .'</p>';
 
diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc
index d697c08b3..776fc8d4b 100644
--- a/modules/menu/menu.admin.inc
+++ b/modules/menu/menu.admin.inc
@@ -492,7 +492,7 @@ function menu_configure() {
     '#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);
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index 4e5fc581d..f729945d4 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -18,8 +18,8 @@ define('MENU_MAX_MENU_NAME_LENGTH_UI', 27);
 function menu_help($path, $arg) {
   switch ($path) {
     case 'admin/help#menu':
-      $output = t('<p>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 <a href="@admin-block">blocks</a> 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.</p>
-<p>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).</p>
+      $output = t('<p>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 <a href="@admin-block">blocks</a> 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.</p>
+<p>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).</p>
 Menu administration tabs:
 <ul>
   <li>On the administer menu page, administrators can "edit" to change the title, description, parent or weight of a menu item. Under the "operations" column, click on "enable/disable" to toggle a menu item on or off. Only menu items which are enabled are displayed in the corresponding menu block. Note that the default menu items generated by the menu module cannot be deleted, only disabled.</li>
diff --git a/modules/poll/poll.install b/modules/poll/poll.install
index d6f3de95c..5998743dc 100644
--- a/modules/poll/poll.install
+++ b/modules/poll/poll.install
@@ -55,7 +55,7 @@ function poll_schema() {
         'type' => 'serial',
         'unsigned' => TRUE,
         'not null' => TRUE,
-        'description' => t('Unique identifer for a poll choice.'),
+        'description' => t('Unique identifier for a poll choice.'),
         ),
       'nid'     => array(
         'type' => 'int',
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index a87003128..64582d451 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -14,7 +14,7 @@ function poll_help($path, $arg) {
   switch ($path) {
     case 'admin/help#poll':
       $output = '<p>'. t('The poll module can be used to create simple polls for site users. A poll is a simple multiple choice questionnaire which displays the cumulative results of the answers to the poll. Having polls on the site is a good way to get instant feedback from community members.') .'</p>';
-      $output .= '<p>'. t('Users can create a poll. The title of the poll should be the question, then enter the answers and the "base" vote counts. You can also choose the time period over which the vote will run.The <a href="@poll">poll</a> item in the navigation menu will take you to a page where you can see all the current polls, vote on them (if you haven\'t already) and view the results.', array('@poll' => url('poll'))) .'</p>';
+      $output .= '<p>'. t('Users can create a poll. The title of the poll should be the question, then enter the answers and the "base" vote counts. You can also choose the time period over which the vote will run. The <a href="@poll">poll</a> item in the navigation menu will take you to a page where you can see all the current polls, vote on them (if you haven\'t already) and view the results.', array('@poll' => url('poll'))) .'</p>';
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@poll">Poll page</a>.', array('@poll' => 'http://drupal.org/handbook/modules/poll/')) .'</p>';
       return $output;
   }
diff --git a/modules/search/search.module b/modules/search/search.module
index d9bf6cbaf..b329f2688 100644
--- a/modules/search/search.module
+++ b/modules/search/search.module
@@ -97,11 +97,11 @@ function search_help($path, $arg) {
   switch ($path) {
     case 'admin/help#search':
       $output = '<p>'. t('The search module adds the ability to search for content by keywords. Search is often the only practical way to find content on a large site. Search is useful for finding users and posts by searching on keywords.') .'</p>';
-      $output .= '<p>'. t('The search engine works by maintaining an index of the words in your site\'s content. It indexes the posts and users. You can adjust the settings to tweak the indexing behaviour. Note that the search requires cron to be set up correctly. The index percentage sets the maximum amount of items that will be indexed in one cron run. Set this number lower if your cron is timing out or if PHP is running out of memory.') .'</p>';
+      $output .= '<p>'. t('The search engine works by maintaining an index of the words in your site\'s content. It indexes the posts and users. You can adjust the settings to tweak the indexing behavior. Note that the search requires cron to be set up correctly. The index percentage sets the maximum amount of items that will be indexed in one cron run. Set this number lower if your cron is timing out or if PHP is running out of memory.') .'</p>';
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@search">Search page</a>.', array('@search' => 'http://drupal.org/handbook/modules/search/')) .'</p>';
       return $output;
     case 'admin/settings/search':
-      return '<p>'. t('The search engine works by maintaining an index of the words in your site\'s content. You can adjust the settings below to tweak the indexing behaviour. Note that the search requires cron to be set up correctly.') .'</p>';
+      return '<p>'. t('The search engine works by maintaining an index of the words in your site\'s content. You can adjust the settings below to tweak the indexing behavior. Note that the search requires cron to be set up correctly.') .'</p>';
     case 'search#noresults':
       return t('<ul>
 <li>Check if your spelling is correct.</li>
@@ -319,7 +319,7 @@ function search_simplify($text) {
   $text = preg_replace('/(['. PREG_CLASS_NUMBERS .']+)['. PREG_CLASS_PUNCTUATION .']+(?=['. PREG_CLASS_NUMBERS .'])/u', '\1', $text);
 
   // The dot, underscore and dash are simply removed. This allows meaningful
-  // search behaviour with acronyms and URLs.
+  // search behavior with acronyms and URLs.
   $text = preg_replace('/[._-]+/', '', $text);
 
   // With the exception of the rules above, we consider all punctuation,
diff --git a/modules/system/system.install b/modules/system/system.install
index 65deea35a..010f0922d 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -930,7 +930,7 @@ function system_schema() {
         'not null' => TRUE,
         'default' => 0),
       'info' => array(
-        'description' => t("A serialized array containing information from the module's .info file; keys can include name, description, package, version, core, dependencies, depedents, and php."),
+        'description' => t("A serialized array containing information from the module's .info file; keys can include name, description, package, version, core, dependencies, dependents, and php."),
         'type' => 'text',
         'not null' => FALSE)
       ),
diff --git a/modules/system/system.module b/modules/system/system.module
index 0d68f55d8..7ea9e20fc 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -25,7 +25,7 @@ function system_help($path, $arg) {
 
   switch ($path) {
     case 'admin/help#system':
-      $output = '<p>'. t('The system module provides system-wide defaults such as running jobs at a particular time, and storing web pages to improve efficiency. The ability to run scheduled jobs makes administering the website more usable, as administrators do not have to manually start jobs. The storing of web pages, or caching, allows the site to efficiently re-use web pages and improve website performance. The system module provides control over preferences, behaviours including visual and operational settings.') .'</p>';
+      $output = '<p>'. t('The system module provides system-wide defaults such as running jobs at a particular time, and storing web pages to improve efficiency. The ability to run scheduled jobs makes administering the website more usable, as administrators do not have to manually start jobs. The storing of web pages, or caching, allows the site to efficiently re-use web pages and improve website performance. The system module provides control over preferences, behaviors including visual and operational settings.') .'</p>';
       $output .= '<p>'. t('Some modules require regularly scheduled actions, such as cleaning up logfiles. Cron, which stands for chronograph, is a periodic command scheduler executing commands at intervals specified in seconds. It can be used to control the execution of daily, weekly and monthly jobs (or anything with a period measured in seconds). The aggregator module periodically updates feeds using cron. Ping periodically notifies services of new content on your site. Search periodically indexes the content on your site. Automating tasks is one of the best ways to keep a system running smoothly, and if most of your administration does not require your direct involvement, cron is an ideal solution. Cron can, if necessary, also be run manually.') .'</p>';
       $output .= '<p>'. t("There is a caching mechanism which stores dynamically generated web pages in a database. By caching a web page, the system module does not have to create the page each time someone wants to view it, instead it takes only one SQL query to display it, reducing response time and the server's load. Only pages requested by <em>anonymous</em> users are cached. In order to reduce server load and save bandwidth, the system module stores and sends cached pages compressed.") .'</p>';
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@system">System page</a>.', array('@system' => 'http://drupal.org/handbook/modules/system/')) .'</p>';
diff --git a/modules/taxonomy/taxonomy.install b/modules/taxonomy/taxonomy.install
index 0000c0eee..1ce9dbf53 100644
--- a/modules/taxonomy/taxonomy.install
+++ b/modules/taxonomy/taxonomy.install
@@ -215,7 +215,7 @@ function taxonomy_schema() {
         'not null' => TRUE,
         'default' => 0,
         'size' => 'tiny',
-        'description' => t('Whether or not multiple terms from this vocablulary may be assigned to a node. (0 = disabled, 1 = enabled)'),
+        'description' => t('Whether or not multiple terms from this vocabulary may be assigned to a node. (0 = disabled, 1 = enabled)'),
       ),
       'required' => array(
         'type' => 'int',
diff --git a/modules/user/user.module b/modules/user/user.module
index 3d169127b..801f8f5f2 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -2127,7 +2127,7 @@ function user_register_submit($form, &$form_state) {
       // No e-mail verification is required, create new user account, and login user immediately.
       _user_mail_notify('register_no_approval_required', $account);
       if (user_authenticate($account->name, trim($pass))) {
-        drupal_set_message(t('Registration succesful. You are now logged in.'));
+        drupal_set_message(t('Registration successful. You are now logged in.'));
       }
       $form_state['redirect'] = '';
       return;