? 493466.patch
? cleanup.content.type_.add__0.patch
? content_type_add.patch
? sites/.DS_Store
? sites/localhost.drupal7
? sites/default/.DS_Store
Index: modules/node/content_types.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/content_types.inc,v
retrieving revision 1.84
diff -u -p -r1.84 content_types.inc
--- modules/node/content_types.inc	29 Jul 2009 06:39:34 -0000	1.84
+++ modules/node/content_types.inc	2 Aug 2009 04:25:52 -0000
@@ -75,7 +75,7 @@ function node_type_form(&$form_state, $t
     '#title' => t('Name'),
     '#type' => 'textfield',
     '#default_value' => $type->name,
-    '#description' => t('The human-readable name of this content type. This text will be displayed as part of the list on the <em>add new content</em> page. It is recommended that this name begin with a capital letter and contain only letters, numbers, and <strong>spaces</strong>. This name must be unique.'),
+    '#description' => t('This name will be displayed in any lists of content types. It is recommended that this name contain only letters, numbers, and spaces.'),
     '#required' => TRUE,
     '#size' => 30,
     '#field_suffix' => ' <small id="node-type-name-suffix">&nbsp;</small>',
@@ -88,7 +88,7 @@ function node_type_form(&$form_state, $t
       '#default_value' => $type->type,
       '#maxlength' => 32,
       '#required' => TRUE,
-      '#description' => t('The machine-readable name of this content type. This text will be used for constructing the URL of the <em>add new content</em> page for this content type. This name must contain only lowercase letters, numbers, and underscores. Underscores will be converted into hyphens when constructing the URL of the <em>add new content</em> page. This name must be unique.'),
+      '#description' => t('The machine-readable name of this content type. This text will be used in the URL of the <em>Add new content</em> page for this content type. Only lowercase letters, numbers, and underscores can be used; underscores will be converted into hyphens when constructing the URL of the <em>Add new content</em> page. This name must be unique.'),
     );
   }
   else {
@@ -108,7 +108,7 @@ function node_type_form(&$form_state, $t
     '#title' => t('Description'),
     '#type' => 'textarea',
     '#default_value' => $type->description,
-    '#description' => t('A brief description of this content type. This text will be displayed as part of the list on the <em>add new content</em> page.'),
+    '#description' => t('This text will be displayed in the list on the <em>Content types</em> and <em>Add new content</em> pages.'),
     );
 
   $form['submission'] = array(
@@ -133,24 +133,23 @@ function node_type_form(&$form_state, $t
     '#title' => t('Body field label'),
     '#type' => 'textfield',
     '#default_value' => isset($type->body_label) ? $type->body_label : '',
-    '#description' => t('To omit the body field for this content type, remove any text and leave this field blank.'),
+    '#description' => t('To remove the body field, remove this text and leave blank.'),
   );
   $form['submission']['node_preview'] = array(
     '#type' => 'radios',
-    '#title' => t('Preview post'),
+    '#title' => t('Preview post before submitting'),
     '#default_value' => variable_get('node_preview_' . $type->type, DRUPAL_OPTIONAL),
     '#options' => array(
       DRUPAL_DISABLED => t('Disabled'),
       DRUPAL_OPTIONAL => t('Optional'),
       DRUPAL_REQUIRED => t('Required'),
     ),
-    '#description' => t('Should users preview posts before submitting?'),
     );
   $form['submission']['help']  = array(
     '#type' => 'textarea',
     '#title' => t('Explanation or submission guidelines'),
     '#default_value' => $type->help,
-    '#description' => t('This text will be displayed at the top of the submission form for this content type. It is useful for helping or instructing your users.')
+    '#description' => t('This text will be displayed at the top of the submission form for this content type. It is useful for adding help text describing the content type or general instructions.')
   );
   $form['workflow'] = array(
     '#type' => 'fieldset',
@@ -396,7 +395,7 @@ function node_type_delete_confirm(&$form
 
   $num_nodes = db_query("SELECT COUNT(*) FROM {node} WHERE type = :type", array(':type' => $type->type))->fetchField();
   if ($num_nodes) {
-    $caption .= '<p>' . format_plural($num_nodes, '<strong>Warning:</strong> there is currently 1 %type post on your site. It may not be able to be displayed or edited correctly, once you have removed this content type.', '<strong>Warning:</strong> there are currently @count %type posts on your site. They may not be able to be displayed or edited correctly, once you have removed this content type.', array('%type' => $type->name)) . '</p>';
+    $caption .= '<p>' . format_plural($num_nodes, '<strong>Warning:</strong> there is currently 1 %type post on your site. It may not be able to be displayed or edited correctly once you have removed this content type.', '<strong>Warning:</strong> there are currently @count %type posts on your site. They may not be able to be displayed or edited correctly once you have removed this content type.', array('%type' => $type->name)) . '</p>';
   }
 
   $caption .= '<p>' . t('This action cannot be undone.') . '</p>';