? contactformtext.diff
? sites/default/settings.php
Index: modules/contact/contact.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.admin.inc,v
retrieving revision 1.2
diff -u -p -r1.2 contact.admin.inc
--- modules/contact/contact.admin.inc	16 Jul 2007 12:43:05 -0000	1.2
+++ modules/contact/contact.admin.inc	27 Oct 2007 14:44:46 -0000
@@ -15,7 +15,7 @@ function contact_admin_categories() {
   while ($category = db_fetch_object($result)) {
     $rows[] = array($category->category, $category->recipients, ($category->selected ? t('Yes') : t('No')), l(t('edit'), 'admin/build/contact/edit/'. $category->cid), l(t('delete'), 'admin/build/contact/delete/'. $category->cid));
   }
-  $header = array(t('Category'), t('Recipients'), t('Selected'), array('data' => t('Operations'), 'colspan' => 2));
+  $header = array(t('Contact Group'), t('Recipients'), t('Selected'), array('data' => t('Operations'), 'colspan' => 2));
 
   return theme('table', $header, $rows);
 }
@@ -37,7 +37,7 @@ function contact_admin_edit($form_state 
   }
   $form['contact_op'] = array('#type' => 'value', '#value' => $op);
   $form['category'] = array('#type' => 'textfield',
-    '#title' => t('Category'),
+    '#title' => t('Contact group'),
     '#maxlength' => 255,
     '#default_value' => $contact['category'],
     '#description' => t("Example: 'website feedback' or 'product information'."),
@@ -57,13 +57,13 @@ function contact_admin_edit($form_state 
   $form['weight'] = array('#type' => 'weight',
     '#title' => t('Weight'),
     '#default_value' => $contact['weight'],
-    '#description' => t('When listing categories, those with lighter (smaller) weights get listed before categories with heavier (larger) weights. Categories with equal weights are sorted alphabetically.'),
+    '#description' => t('When listing contact groups, groups with lighter (smaller) weights are listed before groups with heavier (larger) weights. Contact groups with equal weights are sorted alphabetically.'),
   );
   $form['selected'] = array('#type' => 'select',
     '#title' => t('Selected'),
     '#options' => array('0' => t('No'), '1' => t('Yes')),
     '#default_value' => $contact['selected'],
-    '#description' => t('Set this to <em>Yes</em> if you would like this category to be selected by default.'),
+    '#description' => t('Set this to <em>Yes</em> if you would like this contact group to be selected by default.'),
   );
   $form['cid'] = array('#type' => 'value',
     '#value' => $contact['cid'],
Index: modules/contact/contact.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.module,v
retrieving revision 1.97
diff -u -p -r1.97 contact.module
--- modules/contact/contact.module	16 Jul 2007 06:37:49 -0000	1.97
+++ modules/contact/contact.module	27 Oct 2007 14:44:46 -0000
@@ -19,7 +19,7 @@ function contact_help($path, $arg) {
       $output .= '<p>'. t('For more information, please read the configuration and customization handbook page for the <a href="@contact">contact module</a>.', array('@contact' => url('http://drupal.org/handbook/modules/contact/', array('absolute' => TRUE)))) .'</p>';
       return $output;
     case 'admin/build/contact':
-      $output = '<p>'. t('This page lets you setup <a href="@form">your site-wide contact form</a>. To do so, add one or more categories. You can associate different recipients with each category to route e-mails to different people. For example, you can route website feedback to the webmaster and direct product information requests to the sales department. On the <a href="@settings">settings page</a>, you can customize the information shown above the contact form. This can be useful to provide additional contact information such as your postal address and telephone number.', array('@settings' => url('admin/build/contact/settings'), '@form' => url('contact'))) .'</p>';
+      $output = '<p>'. t('This page lets you configure <a href="@form">your site-wide contact form</a>. To do so, add one or more contact groups with a set of e-mail recipients; contact groups allow e-mail to be routed to different addresses based on the message topic. For example, website feedback may be routed to a group containing the webmaster, while direct product information requests are sent to members of the sales department. On the <a href="@settings">settings page</a>, you can customize the information shown above the contact form. This can be useful to provide additional contact information such as your postal address and telephone number.', array('@settings' => url('admin/build/contact/settings'), '@form' => url('contact'))) .'</p>';
       if (!module_exists('menu')) {
         $menu_note = t('The menu item can be customized and configured only once the menu module has been <a href="@modules-page">enabled</a>.', array('@modules-page' => url('admin/settings/modules')));
       }
@@ -43,7 +43,7 @@ function contact_perm() {
 function contact_menu() {
   $items['admin/build/contact'] = array(
     'title' => 'Contact form',
-    'description' => 'Create a system contact form and set up categories for the form to use.',
+    'description' => 'Create a system contact form and set up contact groups for the form to use.',
     'page callback' => 'contact_admin_categories',
     'access arguments' => array('administer site configuration'),
     'file' => 'contact.admin.inc',
@@ -55,7 +55,7 @@ function contact_menu() {
     'file' => 'contact.admin.inc',
   );
   $items['admin/build/contact/add'] = array(
-    'title' => 'Add category',
+    'title' => 'Add contact group',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('contact_admin_edit', 3),
     'type' => MENU_LOCAL_TASK,