? .DS_Store
? cleanup_term_form_ui_01.patch
? cleanup_term_form_ui_02.patch
? rewrite_permission_descriptions_00.patch
? rewrite_permission_descriptions_01.patch
? rewrite_theme_pages_00.patch
? rewrite_theme_pages_01.patch
? rewrite_theme_pages_02.patch
? rewrite_user_help_00.patch
? simplify_translatable_field_00.patch
? modules/.DS_Store
? sites/.DS_Store
? sites/default/.DS_Store
? sites/default/files
? sites/default/private
? sites/default/settings.php
Index: modules/taxonomy/taxonomy.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.admin.inc,v
retrieving revision 1.80
diff -u -p -r1.80 taxonomy.admin.inc
--- modules/taxonomy/taxonomy.admin.inc	2 Nov 2009 04:39:16 -0000	1.80
+++ modules/taxonomy/taxonomy.admin.inc	5 Nov 2009 15:51:41 -0000
@@ -638,14 +638,9 @@ function taxonomy_form_term($form, &$for
     return array_merge($form, taxonomy_term_confirm_parents($form, $form_state, $vocabulary));
   }
 
-  $form['identification'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Identification'),
-    '#collapsible' => TRUE,
-  );
   $form['identification']['name'] = array(
     '#type' => 'textfield',
-    '#title' => t('Term name'),
+    '#title' => t('Name'),
     '#default_value' => $edit['name'],
     '#maxlength' => 255,
     '#required' => TRUE);
@@ -653,7 +648,7 @@ function taxonomy_form_term($form, &$for
     '#type' => 'textarea',
     '#title' => t('Description'),
     '#default_value' => $edit['description'],
-    '#description' => t('A description of the term. To be displayed on taxonomy/term pages and RSS feeds.'));
+  );
 
   $form['vocabulary_machine_name'] = array(
     '#type' => 'textfield',
@@ -663,9 +658,9 @@ function taxonomy_form_term($form, &$for
 
   field_attach_form('taxonomy_term', (object) $edit, $form, $form_state);
 
-  $form['advanced'] = array(
+  $form['relations'] = array(
     '#type' => 'fieldset',
-    '#title' => t('Advanced options'),
+    '#title' => t('Relations'),
     '#collapsible' => TRUE,
     '#collapsed' => $vocabulary->hierarchy < 2,
   );
@@ -691,7 +686,7 @@ function taxonomy_form_term($form, &$for
         $options[$term->tid] = str_repeat('-', $term->depth) . $term->name;
       }
     }
-    $form['advanced']['parent'] = array(
+    $form['relations']['parent'] = array(
       '#type' => 'select',
       '#title' => t('Parent terms'),
       '#options' => $options,
@@ -700,7 +695,7 @@ function taxonomy_form_term($form, &$for
     );
     
   }
-  $form['advanced']['weight'] = array(
+  $form['relations']['weight'] = array(
     '#type' => 'textfield',
     '#title' => t('Weight'),
     '#size' => 6,