- Patch #155986 by Uwe: fixed typos.

15 files changed, 32 insertions, 32 deletions

diff --git a/modules/actions/actions.install b/modules/actions/actions.install
index 9710db461..8047d60d3 100644
--- a/modules/actions/actions.install
+++ b/modules/actions/actions.install
@@ -9,7 +9,7 @@ function actions_install() {
   drupal_install_schema('actions');
   variable_set('actions_next_id', 0);
 
-  // Do initial sychronization of actions in code and the database.
+  // Do initial synchronization of actions in code and the database.
   // For that we need to run code from actions.module.
   drupal_load('module', 'actions');
   actions_synchronize(actions_list());
diff --git a/modules/actions/actions.module b/modules/actions/actions.module
index eab78ebb0..331fe2267 100644
--- a/modules/actions/actions.module
+++ b/modules/actions/actions.module
@@ -720,7 +720,7 @@ function actions_forms() {
  *   HTML form.
  */
 function actions_assign($type = NULL) {
-  // If no type is specificied we default to node actions, since they
+  // If no type is specified we default to node actions, since they
   // are the most common.
   if (!isset($type)) {
     drupal_goto('admin/build/actions/assign/node');
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index f7141b1d0..1e36560c4 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -299,7 +299,7 @@ function comment_block($op = 'list', $delta = 0) {
  *
  * @param $number (optional) The maximum number of comments to find.
  * @return $comments An array of comment objects each containing a nid,
- *   subject, cid, and timstamp, or an empty array if there are no recent
+ *   subject, cid, and timestamp, or an empty array if there are no recent
  *   comments visible to the current user.
  */
 function comment_get_recent($number = 10) {
@@ -1912,7 +1912,7 @@ function theme_comment_post_forbidden($nid) {
 }
 
 /**
- * Allow themable wrapping of all comments.
+ * Allow themeable wrapping of all comments.
  */
 function theme_comment_wrapper($content) {
   return '<div id="comments">'. $content .'</div>';
diff --git a/modules/contact/contact.module b/modules/contact/contact.module
index 4ffa19545..fc04d9892 100644
--- a/modules/contact/contact.module
+++ b/modules/contact/contact.module
@@ -384,7 +384,7 @@ function contact_mail_user_submit($form, &$form_state) {
   flood_register_event('contact');
   watchdog('mail', '%name-from sent %name-to an e-mail.', array('%name-from' => $user->name, '%name-to' => $account->name));
   drupal_set_message(t('The message has been sent.'));
-  
+
   // Back to the requested users profile page.
   $form_state['redirect'] = "user/$account->uid";
 }
@@ -494,7 +494,7 @@ function contact_mail_page_validate($form, &$form_state) {
  */
 function contact_mail_page_submit($form, &$form_state) {
   global $language;
-  
+
   $values = $form_state['values'];
 
   // E-mail address of the sender: as the form field is a text field,
@@ -504,9 +504,9 @@ function contact_mail_page_submit($form, &$form_state) {
   // Load category properties and save form values for email composition.
   $contact = db_fetch_object(db_query("SELECT * FROM {contact} WHERE cid = %d", $values['cid']));
   $values['contact'] = $contact;
-  
+
   // Send the e-mail to the recipients using the site default language.
-  drupal_mail('contact', 'page_mail', $contact->recipients, language_default(), $values, $from); 
+  drupal_mail('contact', 'page_mail', $contact->recipients, language_default(), $values, $from);
 
   // If the user requests it, send a copy using the current language.
   if ($values['copy']) {
@@ -541,7 +541,7 @@ function contact_mail($key, &$message, $params) {
       $message['body'][] = $params['message'];
       break;
     case 'page_autoreply':
-      $contact = $params['contact']; 
+      $contact = $params['contact'];
       $message['subject'] .= t('[!category] !subject', array('!category' => $contact->category, '!subject' => $params['subject']), $language->language);
       $message['body'][] = $contact->reply;
       break;
diff --git a/modules/help/help.module b/modules/help/help.module
index 3c66a69be..590d8d685 100644
--- a/modules/help/help.module
+++ b/modules/help/help.module
@@ -47,7 +47,7 @@ function help_main() {
    <dt>Node</dt><dd>The basic unit of content in Drupal, often referred to as a "post". All content that can be created using the "create content" menu is a node. Keep in mind that comments, blocks, and users are <em>not</em> nodes.</dd>
    <dt>Published</dt><dd>A post that is viewable by every visitor of the site, regardless of whether he is logged in (see also "Unpublished").</dd>
    <dt>Role</dt><dd>A classification users are placed into for the purpose of setting users\' permissions. A user receives the combined permissions of all roles to which he or she is subscribed.</dd>
-   <dt>Taxonomy</dt><dd>A categorization system that allows the building of complex hierarchial or relational structures and tagging of content (see <a href="@taxonomy">taxonomy help</a>).</dd>
+   <dt>Taxonomy</dt><dd>A categorization system that allows the building of complex hierarchical or relational structures and tagging of content (see <a href="@taxonomy">taxonomy help</a>).</dd>
    <dt>Unpublished</dt><dd>A post that is only viewable by administrators and moderators.</dd>
    <dt>User</dt><dd>A person who has an account at your Drupal site, and is currently logged in with that account.</dd>
    <dt>Visitor</dt><dd>A person who does not have an account at your Drupal site or a person who has an account at your Drupal site but is <em>not</em> currently logged in with that account. A visitor is also called an "anonymous user".</dd>
diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index 55f980795..078231744 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -210,7 +210,7 @@ function locale_user($type, $edit, &$user, $category = NULL) {
       '#title' => t('Language settings'),
       '#weight' => 1,
     );
-    
+
     $form['locale']['language'] = array(
       '#type' => 'radios',
       '#title' => t('Language'),
diff --git a/modules/locale/locale.schema b/modules/locale/locale.schema
index 1697e1e57..70d4fbb5c 100644
--- a/modules/locale/locale.schema
+++ b/modules/locale/locale.schema
@@ -32,7 +32,7 @@ function locale_schema() {
 
   $schema['locales_source'] = array(
     'fields' => array(
-      // Unique indentifier of this string.
+      // Unique identifier of this string.
       'lid'       => array('type' => 'serial', 'not null' => TRUE),
       // Drupal path in case of online discovered translations or file path in case of imported strings.
       'location'  => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''),
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index 6376cb111..7f3491ad6 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -403,7 +403,7 @@ function menu_edit_menu(&$form_state, $type, $menu_name = '') {
     $form['menu_name'] = array(
       '#type' => 'textfield',
       '#title' => t('Menu name'),
-      '#description' => t('The machine-readable name of this menu. This text will be used for constructing the URL of the <em>menu overwrite</em> page for this menu. This name may consist of only of lowercase letters, numbers and hypens and must be unique.'),
+      '#description' => t('The machine-readable name of this menu. This text will be used for constructing the URL of the <em>menu overwrite</em> page for this menu. This name may consist of only of lowercase letters, numbers and hyphens and must be unique.'),
       '#required' => TRUE,
     );
     $form['#insert'] = TRUE;
@@ -431,7 +431,7 @@ function menu_edit_menu(&$form_state, $type, $menu_name = '') {
 function menu_edit_menu_validate($form, &$form_state) {
   $item = $form_state['values'];
   if (preg_match('/[^a-z0-9-]/', $item['menu_name'])) {
-    form_set_error('menu_name', t('Menu name may consist of only of lowercase letters, numbers and hypens.'));
+    form_set_error('menu_name', t('Menu name may consist of only of lowercase letters, numbers and hyphens.'));
   }
   if ($form['#insert'] &&
       (db_result(db_query("SELECT menu_name FROM {menu_custom} WHERE menu_name = '%s'", $item['menu_name'])) ||
diff --git a/modules/node/node.module b/modules/node/node.module
index d8949dd65..3d67408a5 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -214,7 +214,7 @@ function node_teaser_js(&$form, &$form_state) {
  *   The format of the content. If the content contains PHP code, we do not
  *   split it up to prevent parse errors.
  * @param $size
- *   The desired character length of the teaser. If omitted, the default 
+ *   The desired character length of the teaser. If omitted, the default
  *   value will be used.
  * @return
  *   The generated teaser.
@@ -1899,7 +1899,7 @@ function node_revision_delete($nid, $revision) {
 }
 
 /**
- * Post revision deletion opertations.
+ * Post revision deletion operations.
  */
 function node_revision_delete_post($node, $revision) {
 
diff --git a/modules/openid/openid.inc b/modules/openid/openid.inc
index 7f525cf21..1e968c103 100644
--- a/modules/openid/openid.inc
+++ b/modules/openid/openid.inc
@@ -86,7 +86,7 @@ function _openid_is_xri($identifier) {
 }
 
 /**
- * Normalize the given identifer as per spec.
+ * Normalize the given identifier as per spec.
  */
 function _openid_normalize($identifier) {
   if (_openid_is_xri($identifier)) {
diff --git a/modules/system/system.install b/modules/system/system.install
index d78e12bec..02ec53c80 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -976,7 +976,7 @@ function system_update_145() {
       break;
   }
 
-  // Intialize block data for default theme
+  // Initialize block data for default theme
   $ret[] = update_sql("UPDATE {blocks} SET region = 'left' WHERE region = '0'");
   $ret[] = update_sql("UPDATE {blocks} SET region = 'right' WHERE region = '1'");
   db_query("UPDATE {blocks} SET theme = '%s'", $default_theme);
@@ -3121,7 +3121,7 @@ function system_update_6017() {
         $ret[] = array('success' => TRUE, 'query' => "variable_set($new_name)");
         $ret[] = array('success' => TRUE, 'query' => "variable_del($old_name)");
         if ($old_name == 'user_mail_approval_body') {
-          drupal_set_message(t('Saving an old value of the welcome message body for users that are pending administrator approval. However, you should consider modifying this text, since Drupal can now be configured to automatically notify users and send them their login infomation when their accounts are approved.  See the !admin_user_settings page for details.', array('!admin_user_settings' => l(t('User settings'), 'admin/user/settings'))));
+          drupal_set_message(t('Saving an old value of the welcome message body for users that are pending administrator approval. However, you should consider modifying this text, since Drupal can now be configured to automatically notify users and send them their login information when their accounts are approved.  See the !admin_user_settings page for details.', array('!admin_user_settings' => l(t('User settings'), 'admin/user/settings'))));
         }
       }
     }
@@ -3160,7 +3160,7 @@ function system_update_6018() {
  *
  * Note that the mysql and pgsql cases make different changes.  This
  * is because each schema needs to be tweaked in different ways to
- * comform to the new schema structure.  Also, since they operate on
+ * conform to the new schema structure.  Also, since they operate on
  * tables defined by many optional core modules which may not ever
  * have been installed, they must test each table for existence.  If
  * the modules are first installed after this update exists the tables
@@ -3392,7 +3392,7 @@ function system_update_6022() {
 
   // Rename the file_revisions table to upload then add nid column. Since we're
   // changing the table name we need to drop and re-add the vid index so both
-  // pgsql ends up with the corect index name.
+  // pgsql ends up with the correct index name.
   db_drop_index($ret, 'file_revisions', 'vid');
   db_rename_table($ret, 'file_revisions', 'upload');
   db_add_field($ret, 'upload', 'nid', array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0));
diff --git a/modules/system/system.module b/modules/system/system.module
index b58c79fb0..8d01bd14b 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -1114,7 +1114,7 @@ function system_theme_data() {
       }
     }
     $themes[$key]->info['stylesheets'] = $pathed_stylesheets;
-    
+
     // Give the scripts proper path information.
     $scripts = array();
     foreach ($themes[$key]->info['scripts'] as $script) {
@@ -1147,7 +1147,7 @@ function system_theme_data() {
       }
     }
     // Add any stylesheets from the base theme, unless the names match in which case
-    // the sub-theme wins. Note that we slip the base theme's stylesheets in at the 
+    // the sub-theme wins. Note that we slip the base theme's stylesheets in at the
     // beginning of the array so that they get added to the page in the correct order.
     foreach ($themes[$base_key]->info['stylesheets'] as $media => $stylesheets) {
       foreach ($stylesheets as $stylesheet => $path) {
@@ -1161,7 +1161,7 @@ function system_theme_data() {
       }
     }
     // Add any scripts from the base theme, unless the names match in which case
-    // the sub-theme wins. Note that we slip the base theme's scripts in at the 
+    // the sub-theme wins. Note that we slip the base theme's scripts in at the
     // beginning of the array so that they get added to the page in the correct order.
     foreach ($themes[$base_key]->info['scripts'] as $script => $path) {
       if (!isset($themes[$key]->info['scripts'][$script])) {
@@ -2308,7 +2308,7 @@ function system_theme_settings(&$form_state, $key = '') {
     $filename = ($key) ? str_replace('/', '_', $key) .'_logo.'. $parts['extension'] : 'logo.'. $parts['extension'];
 
     // The image was saved using file_save_upload() and was added to the
-    // files table as a temorary file. We'll make a copy and let the garbage
+    // files table as a temporary file. We'll make a copy and let the garbage
     // collector delete the original upload.
     if (file_copy($file, $filename, FILE_EXISTS_REPLACE)) {
       $_POST['default_logo'] = 0;
@@ -2323,7 +2323,7 @@ function system_theme_settings(&$form_state, $key = '') {
     $filename = ($key) ? str_replace('/', '_', $key) .'_favicon.'. $parts['extension'] : 'favicon.'. $parts['extension'];
 
     // The image was saved using file_save_upload() and was added to the
-    // files table as a temorary file. We'll make a copy and let the garbage
+    // files table as a temporary file. We'll make a copy and let the garbage
     // collector delete the original upload.
     if (file_copy($file, $filename)) {
       $_POST['default_favicon'] = 0;
@@ -2784,7 +2784,7 @@ function system_cron() {
   while ($file = db_fetch_object($result)) {
     if (file_exists($file->filepath)) {
       // If files that exist cannot be deleted, continue so the database remains
-      // consistant.
+      // consistent.
       if (!file_delete($file->filepath)) {
         watchdog('file system', t('Could not delete temporary file "%path" during garbage collection', array('%path' => $file->filepath)), 'error');
         continue;
diff --git a/modules/translation/translation.module b/modules/translation/translation.module
index b45bf2126..c4af9c0b8 100644
--- a/modules/translation/translation.module
+++ b/modules/translation/translation.module
@@ -35,7 +35,7 @@ function translation_help($path, $arg) {
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@translation">Translation page</a>.', array('@translation' => 'http://drupal.org/handbook/modules/translation/')) .'</p>';
       return $output;
     case 'node/%/translate':
-      $output = '<p>'. t('Translations of a piece of content are managed with translation sets. Each translation set has one source post and any number of translations in any of the <a href="!languages">enabled languages</a>. All translations are tracked to be up to date or oudated based on whether the source post was modified significantly.', array('!languages' => url('admin/settings/language'))) .'</p>';
+      $output = '<p>'. t('Translations of a piece of content are managed with translation sets. Each translation set has one source post and any number of translations in any of the <a href="!languages">enabled languages</a>. All translations are tracked to be up to date or outdated based on whether the source post was modified significantly.', array('!languages' => url('admin/settings/language'))) .'</p>';
       return $output;
   }
 }
diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index f8ddc5f86..434c87c59 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -166,7 +166,7 @@ function upload_admin_settings() {
     '#default_value' => variable_get('upload_max_resolution', 0),
     '#size' => 15,
     '#maxlength' => 10,
-    '#description' => t('The maximum allowed image size (e.g. 640x480). Set to 0 for no restriction. If an <a href="!image-toolkit-link">image toolkit</a> is installed, files exceeding this value will be scalled down to fit.', array('!image-toolkit-link' => url('admin/settings/image-toolkit'))),
+    '#description' => t('The maximum allowed image size (e.g. 640x480). Set to 0 for no restriction. If an <a href="!image-toolkit-link">image toolkit</a> is installed, files exceeding this value will be scaled down to fit.', array('!image-toolkit-link' => url('admin/settings/image-toolkit'))),
     '#field_suffix' => '<kbd>'. t('WIDTHxHEIGHT') .'</kbd>'
   );
   $form['settings_general']['upload_list_default'] = array(
@@ -317,7 +317,7 @@ function upload_file_download($file) {
 function _upload_prepare(&$node) {
   global $user;
 
-  // Initialize _SESSION['upload_files'] if no post occured.
+  // Initialize _SESSION['upload_files'] if no post occurred.
   // This clears the variable from old forms and makes sure it
   // is an array to prevent notices and errors in other parts
   // of upload.module.
diff --git a/modules/user/user.module b/modules/user/user.module
index ca867d1be..33b0b3d89 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -371,7 +371,7 @@ function user_validate_picture(&$form, &$form_state) {
   );
   if ($file = file_save_upload('picture_upload', $validators)) {
     // The image was saved using file_save_upload() and was added to the
-    // files table as a temorary file. We'll make a copy and let the garbage
+    // files table as a temporary file. We'll make a copy and let the garbage
     // collector delete the original upload.
     $info = image_get_info($file->filepath);
     $destination = variable_get('user_picture_path', 'pictures') .'/picture-'. $form['#uid'] .'.'. $info['extension'];
@@ -3143,7 +3143,7 @@ function user_mail_tokens($account, $language) {
  * are more than one languages enabled on the site. If the user did not
  * choose a preferred language, or is the anonymous user, the $default
  * value, or if it is not set, the site default language will be returned.
- * 
+ *
  * @param $account
  *   User account to look up language for.
  * @param $default