Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.277
diff -u -r1.277 form.inc
--- includes/form.inc	18 Jul 2008 07:06:24 -0000	1.277
+++ includes/form.inc	29 Jul 2008 07:30:29 -0000
@@ -2174,11 +2174,12 @@
 
   if (!empty($element['#title'])) {
     $title = $element['#title'];
+    $terminal = $element['#title_terminal'];
     if (!empty($element['#id'])) {
-      $output .= ' <label for="' . $element['#id'] . '">' . $t('!title: !required', array('!title' => filter_xss_admin($title), '!required' => $required)) . "</label>\n";
+      $output .= ' <label for="' . $element['#id'] . '">' . $t('!title@terminal !required', array('!title' => filter_xss_admin($title), '!required' => $required, '@terminal' => $terminal)) . "</label>\n";
     }
     else {
-      $output .= ' <label>' . $t('!title: !required', array('!title' => filter_xss_admin($title), '!required' => $required)) . "</label>\n";
+      $output .= ' <label>' . $t('!title@terminal !required', array('!title' => filter_xss_admin($title), '!required' => $required, '@terminal' => $terminal)) . "</label>\n";
     }
   }
 
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.611
diff -u -r1.611 system.module
--- modules/system/system.module	23 Jul 2008 07:37:06 -0000	1.611
+++ modules/system/system.module	29 Jul 2008 07:56:45 -0000
@@ -220,6 +220,7 @@
     '#maxlength' => 128,
     '#autocomplete_path' => FALSE,
     '#process' => array('form_process_ahah'),
+    '#title_terminal' => ':',
   );
 
   $type['password'] = array(
@@ -227,11 +228,13 @@
     '#size' => 60,
     '#maxlength' => 128,
     '#process' => array('form_process_ahah'),
+    '#title_terminal' => ':',
   );
 
   $type['password_confirm'] = array(
     '#input' => TRUE,
     '#process' => array('form_process_password_confirm'),
+    '#title_terminal' => ':',
   );
 
   $type['textarea'] = array(
@@ -240,29 +243,34 @@
     '#rows' => 5,
     '#resizable' => TRUE,
     '#process' => array('form_process_ahah'),
+    '#title_terminal' => ':',
   );
 
   $type['radios'] = array(
     '#input' => TRUE,
     '#process' => array('form_process_radios'),
+    '#title_terminal' => ':',
   );
 
   $type['radio'] = array(
     '#input' => TRUE,
     '#default_value' => NULL,
     '#process' => array('form_process_ahah'),
+    '#title_terminal' => ':',
   );
 
   $type['checkboxes'] = array(
     '#input' => TRUE,
     '#tree' => TRUE,
     '#process' => array('form_process_checkboxes'),
+    '#title_terminal' => ':',
   );
 
   $type['checkbox'] = array(
     '#input' => TRUE,
     '#return_value' => 1,
     '#process' => array('form_process_ahah'),
+    '#title_terminal' => ':',
   );
 
   $type['select'] = array(
@@ -270,6 +278,7 @@
     '#size' => 0,
     '#multiple' => FALSE,
     '#process' => array('form_process_ahah'),
+    '#title_terminal' => ':',
   );
 
   $type['weight'] = array(
@@ -283,11 +292,13 @@
     '#input' => TRUE,
     '#element_validate' => array('date_validate'),
     '#process' => array('form_process_date'),
+    '#title_terminal' => ':',
   );
 
   $type['file'] = array(
     '#input' => TRUE,
     '#size' => 60,
+    '#title_terminal' => ':',
   );
 
 
@@ -296,6 +307,7 @@
    */
   $type['item'] = array(
     '#markup' => '',
+    '#title_terminal' => ':',
   );
 
   $type['hidden'] = array(