--- support.module.orig	Mon Aug 15 05:59:38 2011
+++ support.module	Sun Aug 28 08:04:52 2011
@@ -202,8 +202,8 @@ function support_menu() {
     'file' => 'support.admin.inc',
   );
   $items['admin/support/clients'] = array(
-    'title' => 'Clients',
-    'description' => 'Manage clients.',
+    'title' => 'Desks',
+    'description' => 'Manage desks.',
     'page callback' => 'support_admin_client_overview',
     'access arguments' => array('administer support'),
     'file' => 'support.admin.inc',
@@ -229,7 +229,7 @@ function support_menu() {
     'file' => 'support.admin.inc',
   );
   $items['admin/support/clients/add'] = array(
-    'title' => 'Add client',
+    'title' => 'Add desk',
     'type' => MENU_LOCAL_TASK,
     'weight' => 2,
     'page callback' => 'drupal_get_form',
@@ -394,12 +394,12 @@ function support_fetch_client_mail() {
 function support_help($path, $arg) {
   switch ($path) {
     case 'admin/support/clients':
-      $output = '<p>'. t('Each support ticket can only be assigned to one client. !create one or more clients, then !assign allowing users to access these tickets.  Users can only create tickets for clients they have permission to access.  If working with multiple clients you will need to !define for each to prevent one client from viewing the tickets of another client.', array('!create' => l(t('Create'), 'admin/support/clients/add'), '!assign' => l(t('assign permissions'), 'admin/user/permissions', array('fragment' => 'module-support')), '!define' => l(t('define roles'), 'admin/user/roles'))) .'</p>';
+      $output = '<p>'. t('Each support ticket can only be assigned to one desk. !create one or more desks, then !assign allowing users to access these tickets.  Users can only create tickets for desks they have permission to access.  If working with multiple desks you will need to !define for each to prevent one desk from viewing the tickets of another desk.', array('!create' => l(t('Create'), 'admin/support/clients/add'), '!assign' => l(t('assign permissions'), 'admin/user/permissions', array('fragment' => 'module-support')), '!define' => l(t('define roles'), 'admin/user/roles'))) .'</p>';
       break;
     case 'admin/support/clients/add':
     case 'admin/support/clients/%/edit':
-      $output  = '<p>'. t("Each support ticket must be assigned to one client.  Support can be configured so one client can't view another client's tickets.") .'</p>';
-      $output .= '<p>'. t('If you would like users to be able to create and update tickets via email, you will require a dedicated email address for each client.  This email address is used to send and receive update notifications.  A cronjob automatically downloads emails sent to this address and converts them into tickets and ticket updates.  The message_id of each email is tracked, allowing support to properly associate replies with existing tickets.') .'</p>';
+      $output  = '<p>'. t("Each support ticket must be assigned to one desk.  Support can be configured so one user can't view another user's tickets.") .'</p>';
+      $output .= '<p>'. t('If you would like users to be able to create and update tickets via email, you will require a dedicated email address for each desk.  This email address is used to send and receive update notifications.  A cronjob automatically downloads emails sent to this address and converts them into tickets and ticket updates.  The message_id of each email is tracked, allowing support to properly associate replies with existing tickets.') .'</p>';
       break;
     case 'admin/support/settings':
       $output = '<p>'. t('Global settings for the support module.') .'</p>';
@@ -545,7 +545,7 @@ function support_account_load($from, $ti
            ($client->user_creation == 0 && variable_get('support_autocreate_users', TRUE) == FALSE)) {
     // User does not exist and the setting to allow automatic creation is
     // disabled.  Send notification to user.
-    watchdog('support', 'An autocreation of a user from the e-mail address: !from was denied. The client recieving the request was: !client', array('!from' => utf8_encode($from), '!client' => $client->name));
+    watchdog('support', 'An autocreation of a user from the e-mail address: !from was denied. The desk recieving the request was: !client', array('!from' => utf8_encode($from), '!client' => $client->name));
     _support_mail_deny($from);
     return FALSE;
   }
@@ -691,7 +691,7 @@ function support_nodeapi(&$node, $op, $t
       case 'validate':
         $client = db_result(db_query('SELECT name FROM {support_client} WHERE clid = %d', $node->client));
         if (!isset($node->client) || $node->client == 0) {
-          form_set_error('client', t('You must select a client'));
+          form_set_error('client', t('You must select a desk'));
         }
         if (isset($node->assigned) && !is_numeric($node->assigned)) {
           $assigned = db_result(db_query("SELECT uid FROM {users} WHERE name = '%s'", $node->assigned));
@@ -1685,7 +1685,7 @@ function support_form_alter(&$form, $for
       $form['advanced']['client'] = array(
         '#type' => 'select',
         '#multiple' => TRUE,
-        '#title' => t('Search specific client(s)'),
+        '#title' => t('Search specific desk(s)'),
         '#prefix' => '<div class="criterion">',
         '#suffix' => '</div>',
         '#options' => $clients,
@@ -2102,7 +2102,7 @@ function support_status_form(&$form_stat
       }
     }
   }
-  $default = array('- select client -');
+  $default = array('- select desk -');
   if (empty($clients)) {
     $clients = $default;
   }
@@ -2122,7 +2122,7 @@ function support_status_form(&$form_stat
       '#type' => 'select',
       '#required' => TRUE,
       '#prefix' => '&nbsp;&nbsp;',
-      '#title' => t('Client'),
+      '#title' => t('Desk'),
       '#options' => $clients,
       '#default_value' => is_numeric($node->client) ? $node->client : 0,
     );
@@ -2606,7 +2606,7 @@ function support_page_form(&$form_state,
       $_SESSION['support_client'] = $client;
     }
     else {
-      drupal_set_message(t('Client does not exist or is not enabled.'), 'error');
+      drupal_set_message(t('Desk does not exist or is not enabled.'), 'error');
       if (isset($_SESSION['support_client'])) {
         unset($_SESSION['support_client']);
       }
@@ -2913,7 +2913,7 @@ function _support_client($clid) {
 function support_client_fetch($client, $manual = TRUE) {
   if (!isset($client->integrate_email) || $client->integrate_email != TRUE) {
     if ($manual) {
-      drupal_set_message(t('Client not integrated with email, unable to fetch mail for !client.', array('!client' => $client->name)));
+      drupal_set_message(t('Desk not integrated with email, unable to fetch mail for !client.', array('!client' => $client->name)));
       drupal_goto('admin/support/clients');
     }
     return;
