Index: modules/contact/contact.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.pages.inc,v
retrieving revision 1.11
diff -u -r1.11 contact.pages.inc
--- modules/contact/contact.pages.inc	16 Jul 2008 21:59:26 -0000	1.11
+++ modules/contact/contact.pages.inc	31 Aug 2008 01:13:10 -0000
@@ -60,7 +60,7 @@
       // If there is more than one category available and no default category has been selected,
       // prepend a default placeholder value.
       if (!isset($default_category)) {
-        $default_category = t('- Please choose -');
+        $default_category = '<'. t('Please choose') .'>';
         $categories = array($default_category) + $categories;
       }
       $form['cid'] = array('#type' => 'select',
Index: modules/forum/forum.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.admin.inc,v
retrieving revision 1.12
diff -u -r1.12 forum.admin.inc
--- modules/forum/forum.admin.inc	16 Jul 2008 21:59:26 -0000	1.12
+++ modules/forum/forum.admin.inc	31 Aug 2008 01:13:10 -0000
@@ -278,8 +278,8 @@
   if ($tree) {
     foreach ($tree as $term) {
       if (!in_array($term->tid, $exclude)) {
-        $options[$term->tid] = str_repeat(' -- ', $term->depth) . $term->name;
-      }
+        $options[$term->tid] = str_repeat('--', $term->depth) .' '. $term->name;
+      } 
     }
   }
   if ($child_type == 'container') {
Index: modules/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.461
diff -u -r1.461 forum.module
--- modules/forum/forum.module	11 Aug 2008 21:57:40 -0000	1.461
+++ modules/forum/forum.module	31 Aug 2008 01:13:10 -0000
@@ -380,7 +380,7 @@
     // Make the vocabulary required for 'real' forum-nodes.
     $vid = variable_get('forum_nav_vocabulary', '');
     $form['taxonomy'][$vid]['#required'] = TRUE;
-    $form['taxonomy'][$vid]['#options'][''] = t('- Please choose -');
+    $form['taxonomy'][$vid]['#options'][''] = '<'. t('Please choose') .'>';
   }
 }
 
Index: modules/poll/poll.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v
retrieving revision 1.270
diff -u -r1.270 poll.module
--- modules/poll/poll.module	24 Jul 2008 16:25:18 -0000	1.270
+++ modules/poll/poll.module	31 Aug 2008 01:24:49 -0000
@@ -263,7 +263,8 @@
   );
 
   // Poll attributes
-  $duration = array(0 => t('Unlimited')) + drupal_map_assoc(array(86400, 172800, 345600, 604800, 1209600, 2419200, 4838400, 9676800, 31536000), "format_interval");
+  $duration  = array(0 => '<'. t('Unlimited') .'>');
+  $duration += drupal_map_assoc(array(86400, 172800, 345600, 604800, 1209600, 2419200, 4838400, 9676800, 31536000), "format_interval");
   $active = array(0 => t('Closed'), 1 => t('Active'));
 
   $form['settings'] = array(
Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.425
diff -u -r1.425 taxonomy.module
--- modules/taxonomy/taxonomy.module	24 Jul 2008 16:25:19 -0000	1.425
+++ modules/taxonomy/taxonomy.module	31 Aug 2008 01:19:44 -0000
@@ -412,11 +412,11 @@
   $vocabulary = taxonomy_vocabulary_load($vid);
   $help = ($help) ? $help : $vocabulary->help;
 
-  if (!$vocabulary->multiple) {
-    $blank = ($vocabulary->required) ? t('- Please choose -') : t('- None selected -');
+  if ($vocabulary->multiple) {
+    $blank = ($vocabulary->required) ? 0 : '<'. t('none') .'>';
   }
   else {
-    $blank = ($vocabulary->required) ? 0 : t('- None -');
+    $blank = ($vocabulary->required) ? '<'. t('Please choose') .'>' : '<'. t('none') .'>';
   }
 
   return _taxonomy_term_select(check_plain($vocabulary->name), $name, $value, $vid, $help, intval($vocabulary->multiple), $blank);
@@ -436,7 +436,7 @@
     if ($tree && (count($tree) > 0)) {
       $options[$vocabulary->name] = array();
       foreach ($tree as $term) {
-        $options[$vocabulary->name][$term->tid] = str_repeat('-', $term->depth) . $term->name;
+        $options[$vocabulary->name][$term->tid] = str_repeat('--', $term->depth) .' '. $term->name;
       }
     }
   }
@@ -1026,7 +1026,7 @@
     foreach ($tree as $term) {
       if (!in_array($term->tid, $exclude)) {
         $choice = new stdClass();
-        $choice->option = array($term->tid => str_repeat('-', $term->depth) . $term->name);
+        $choice->option = array($term->tid => str_repeat('--', $term->depth) .' '. $term->name);
         $options[] = $choice;
       }
     }
Index: sites/default/default.settings.php
===================================================================
RCS file: /cvs/drupal/drupal/sites/default/default.settings.php,v
retrieving revision 1.14
diff -u -r1.14 default.settings.php
--- sites/default/default.settings.php	21 Aug 2008 19:36:39 -0000	1.14
+++ sites/default/default.settings.php	30 Aug 2008 14:00:05 -0000
@@ -200,7 +200,7 @@
  *
  * To see what PHP settings are possible, including whether they can
  * be set at runtime (ie., when ini_set() occurs), read the PHP
- * documentation at http://www.php.net/manual/en/ini.php#ini.list
+ * documentation at http://www.php.net/manual/ini.php#ini.list
  * and take a look at the .htaccess file to see which non-runtime
  * settings are used there. Settings defined here should not be
  * duplicated there so as to avoid conflict issues.
