Index: captcha.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/captcha/captcha.module,v
retrieving revision 1.42.2.40
diff -u -u -p -r1.42.2.40 captcha.module
--- captcha.module	3 Dec 2007 01:16:42 -0000	1.42.2.40
+++ captcha.module	6 Dec 2007 01:29:32 -0000
@@ -517,22 +517,29 @@ function captcha_form_alter($form_id, &$
     $captcha_point = db_fetch_object($result);
     $form['captcha'] = array(
       '#type' => 'fieldset',
-      '#title' => 'CAPTCHA',
+      '#title' => t('CAPTCHA'),
       '#collapsible' => TRUE,
       '#collapsed' => TRUE,
     );
     if ($captcha_point && $captcha_point->type) {
-      $form['captcha']['#description'] = t('The challenge "@type" (by module "@module") is enabled here for untrusted users: !edit, !disable or !general.', array(
-        '@type' => $captcha_point->type,
-        '@module' => $captcha_point->module,
-        '!edit' => l(t('edit challenge type'), "admin/user/captcha/$form_id", array(), drupal_get_destination()),
-        '!disable' => l(t('disable challenge'), "admin/user/captcha/$form_id/disable", array(), drupal_get_destination()),
-        '!general' => l(t('edit general challenge settings'), "admin/user/captcha"),
-        )
+      $form['captcha']['#description'] = t('Untrusted users will see a CAPTCHA here (!settings).',
+        array('!settings' => l(t('general CAPTCHA settings'), 'admin/user/captcha'))
+      );
+      $form['captcha']['challenge'] = array(
+        '#type' => 'item',
+        '#title' => t('Enabled challenge'),
+        '#value' => t('"@type" by module "@module" (!change, !disable)', array(
+          '@type' => $captcha_point->type,
+          '@module' => $captcha_point->module,
+          '!change' => l(t('change'), "admin/user/captcha/$form_id", array(), drupal_get_destination()),
+          '!disable' => l(t('disable'), "admin/user/captcha/$form_id/disable", array(), drupal_get_destination()),
+        )),
       );
     }
     else {
-      $form['captcha']['#description'] = l(t('Place a challenge here for untrusted users.'), "admin/user/captcha/$form_id/enable", array(), drupal_get_destination());
+      $form['captcha']['add_captcha'] = array(
+        '#value' => l(t('Place a CAPTCHA here for untrusted users.'), "admin/user/captcha/$form_id/enable", array(), drupal_get_destination())
+      );
     }
     // Add pre_render function for placing the CAPTCHA just above the submit button
     $form['#pre_render'] = ((array) $form['#pre_render']) + array('captcha_pre_render_place_captcha');