Index: taxonomy_menu_path_custom/taxonomy_menu_path_custom.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/taxonomy_menu/taxonomy_menu_path_custom/Attic/taxonomy_menu_path_custom.module,v
retrieving revision 1.1.2.5
diff -u -r1.1.2.5 taxonomy_menu_path_custom.module
--- taxonomy_menu_path_custom/taxonomy_menu_path_custom.module	31 May 2009 12:03:27 -0000	1.1.2.5
+++ taxonomy_menu_path_custom/taxonomy_menu_path_custom.module	29 Oct 2009 10:43:53 -0000
@@ -16,28 +16,25 @@
 function taxonomy_menu_path_custom_taxonomy_menu_options() {
 
   $options['taxonomy_menu_path_custom_depth'] = array(
-    '#title' => t('Display Depth in Custom Path'),
+    '#title' => t('Display depth in custom path'),
     '#weight' => -2,
-    '#description' => t("Only used with a Custom Path. <br />
-	  To use depth the path in the view has to have the path of '<Base Path for Custom Path>/%/%' The two arguments must be 'Term ID (with depth)' and 'Depth Modifier'.<br />
-	  Have this view setup <strong>before</strong> you create this taxonomy menu. Otherwise leave this field empty!"),
+    '#description' => t("Only used with a custom path.<br />To use depth the path in the view has to have the path of '<base path for custom path>/%/%'. The two arguments must be 'Term ID (with depth)' and 'Depth modifier'.<br />Have this view setup <strong>before</strong> you create this taxonomy menu. Otherwise leave this field empty!"),
     'default' => '',
     '#type' => 'textfield',
   );
   $options['taxonomy_menu_path_custom_base_path'] = array(
-    '#title' => t('Base Path for Custom Path'),
+    '#title' => t('Base path for custom path'),
     '#weight' => -3,
     '#type' => 'textfield',
     'default' => 'category',
-    '#description' => t("Only used with a Custom Path.<br />
-	  You need to have a view with path 'custom path/%' and an argument 'Term ID' <strong>before</strong> you create this taxonomy menu."),
+    '#description' => t("Only used with a custom path.<br />You need to have a view with path 'custom path/%' and an argument 'Term ID' <strong>before</strong> you create this taxonomy menu."),
   );
   $options['taxonomy_menu_path_custom_use_term_name'] = array(
-    '#title' => t('Use Term Name'),
+    '#title' => t('Use term name'),
     '#weight' => -1,
     '#type' => 'checkbox',
     'default' => '',
-    '#description' => t("If checked, use Term Name instead of Term ID."),
+    '#description' => t("If checked, use term name instead of term ID."),
   );
 
   return $options;
@@ -48,7 +45,7 @@
  */
 function taxonomy_menu_path_custom_taxonomy_menu_path() {
   $output = array(
-    'taxonomy_menu_path_custom_path' => t('Custom Path'),
+    'taxonomy_menu_path_custom_path' => t('Custom path'),
   );
 
   return $output;
Index: taxonomy_menu_path_custom/taxonomy_menu_path_custom.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/taxonomy_menu/taxonomy_menu_path_custom/Attic/taxonomy_menu_path_custom.info,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 taxonomy_menu_path_custom.info
--- taxonomy_menu_path_custom/taxonomy_menu_path_custom.info	8 Mar 2009 18:54:00 -0000	1.1.2.1
+++ taxonomy_menu_path_custom/taxonomy_menu_path_custom.info	29 Oct 2009 10:43:53 -0000
@@ -2,6 +2,6 @@
 core          = "6.x"
 dependencies[] = taxonomy
 dependencies[] = taxonomy_menu
-description   = "Enables Custom path base to Taxonomy Menu"
+description   = "Enables Custom path base to Taxonomy Menu."
 name          = "Taxonomy Menu Custom Path"
 package       = Taxonomy Menu
Index: taxonomy_menu.batch.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/taxonomy_menu/Attic/taxonomy_menu.batch.inc,v
retrieving revision 1.1.4.2
diff -u -r1.1.4.2 taxonomy_menu.batch.inc
--- taxonomy_menu.batch.inc	3 Sep 2009 18:10:47 -0000	1.1.4.2
+++ taxonomy_menu.batch.inc	29 Oct 2009 10:43:52 -0000
@@ -46,7 +46,7 @@
     'finished' => '_taxonomy_menu_insert_link_items_success', 
     'title' => t('Rebuilding Taxonomy Menu'), 
     'init_message' => t('The menu items have been deleted, and are about to be regenerated.'), 
-    'progress_message' => t('Import Progress: Completed @current of @total Stages.'),
+    'progress_message' => t('Import progress: Completed @current of @total stages.'),
     'redirect' => 'admin/content/taxonomy/edit/vocabulary/'. $vid,
     'error_message' => t('The Taxonomy Menu rebuild process encountered an error.'), 
   ); 
@@ -80,7 +80,7 @@
  */
 function _taxonomy_menu_insert_link_items_success() {
   //TODO state menu name here
-  drupal_set_message("The Taxonomy Menu has been updated.");
+  drupal_set_message('The Taxonomy Menu has been updated.');
 }
 
 /*
Index: taxonomy_menu.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/taxonomy_menu/taxonomy_menu.module,v
retrieving revision 1.19.2.2.2.39
diff -u -r1.19.2.2.2.39 taxonomy_menu.module
--- taxonomy_menu.module	18 Oct 2009 01:13:00 -0000	1.19.2.2.2.39
+++ taxonomy_menu.module	29 Oct 2009 10:43:53 -0000
@@ -32,7 +32,7 @@
   if ($form_id == 'taxonomy_form_vocabulary') {
     // choose a menu to add link items to.
     $menus = menu_get_menus();
-    array_unshift($menus, '= DISABLED =');
+    array_unshift($menus, t('- Disabled -'));
 
     //options for path if tokens are not enabled
     $paths = _taxonomy_menu_get_paths();
@@ -55,12 +55,10 @@
 
     $form['taxonomy_menu']['path'] = array(
       '#type' => 'select',
-      '#title' => t('Menu Path Type'),
+      '#title' => t('Menu path type'),
       '#default_value' => variable_get('taxonomy_menu_path_'. $form['vid']['#value'], 0),
       '#options' => $paths,
-      '#description' => t('If Default is selected then the path is taxonomy/term/tid <br />
-        The menu path will be passed through drupal_get_path_alias() function so all aliases will be applied'
-      ),
+      '#description' => t('The path will be taxonomy/term/tid if <em>Default</em> has been selected.<br />The menu path will be passed through drupal_get_path_alias() function so all aliases will be applied.'),
     );
 
     //get taxonomy menu form options
@@ -72,7 +70,7 @@
       '#title' => t('Select to rebuild the menu on submit.'),
       '#default_value' => 0,
       '#weight' => 20,
-      '#description' => t('Rebuild the menu on submit.  Warning:  This will delete then re-create all of the menu items.  Only use this option if you are experiencing issues.'),
+      '#description' => t('Rebuild the menu on submit. <strong>Warning</strong>: This will delete then re-create all of the menu items. Only use this option if you are experiencing issues like missing menu items or other inconsistencies.'),
     );
     // move the buttons to the bottom of the form
     $form['submit']['#weight'] = 49;
@@ -163,10 +161,10 @@
   //only insert the links if a menu is set
   if (variable_get('taxonomy_menu_vocab_menu_'. $vid, FALSE)) {
     _taxonomy_menu_insert_link_items($vid);
-    return t('The Taxonomy Menu has been rebuilt');
+    return t('The Taxonomy Menu has been rebuilt.');
   }
 
-  return t('The Taxonomy Menu has been removed');
+  return t('The Taxonomy Menu has been removed.');
 }
 
 /**
@@ -213,7 +211,7 @@
     taxonomy_menu_handler('update', $args);
   }
 
-  return t("The Taxonomy Menu $menu_name has been updated.");
+  return t('The Taxonomy Menu %menu_name has been updated.', array('%menu_name' => $menu_name));
 }
 
 /**
@@ -275,7 +273,7 @@
             'term' => $term,
             'menu_name' => $menu_name,
           );
-          $message = "Term '@term' has been added to taxonomy menu '@menuname'";
+          $message = t('Term %term has been added to taxonomy menu %menu_name.', array('%term' => $args['name'], '%menu_name' => $menu_name));
           break;
 
         case 'update':
@@ -291,7 +289,7 @@
             'menu_name' => $menu_name,
             'mlid' => _taxonomy_menu_get_mlid($args['tid'], $args['vid']),
           );
-          $message = "Term '@term' has been updated in taxonomy menu '@menuname'";
+          $message = t('Term %term has been updated in taxonomy menu %menu_name.', array('%term' => $args['name'], '%menu_name' => $menu_name));
           break;
 
         case 'delete':
@@ -299,13 +297,12 @@
             'term' => taxonomy_get_term($args['tid']),
             'mlid' => _taxonomy_menu_get_mlid($args['tid'], $args['vid']),
           );
-          $message = "Term '@term' has been deleted from taxonomy menu '@menuname'";
+          $message = t('Term %term has been deleted from taxonomy menu %menu_name.', array('%term' => $args['name'], '%menu_name' => $menu_name));
           break;
       }
       // run function
       taxonomy_menu_handler($op, $item);
       // report status
-      $message = t($message, array('@term' => $args['name'], '@menuname' => $menu_name));
       drupal_set_message($message, 'status');
 
       // rebuild the menu
@@ -538,7 +535,7 @@
     return $mlid;
   }
   else {
-    drupal_set_message(t('Could not save the menu link for the taxonomy menu'), 'error');
+    drupal_set_message(t('Could not save the menu link for the taxonomy menu.'), 'error');
     return FALSE;
   }
 }
@@ -859,46 +856,45 @@
 function taxonomy_menu_taxonomy_menu_options() {
 
   $options['sync'] = array(
-    '#title' => t('Syncronise changes to this vocabulary'),
+    '#title' => t('Synchronise changes to this vocabulary'),
     '#description' => t('Every time a term is added/deleted/modified, the corresponding menu link will be altered too.'),
     'default' => TRUE,
   );
 
   $options['display_num'] = array(
-    '#title' => t('Display Number of Nodes'),
-    '#description' => t('Display the number of Items per taxonomy Terms.  Will not show up for vocabulary menu items.'),
+    '#title' => t('Display number of items'),
+    '#description' => t('Display the number of items per taxonomy terms. Will not show up for vocabulary menu items.'),
     'default' => FALSE,
   );
 
   $options['hide_empty_terms'] = array(
-    '#title' => t('Hide Empty Terms'),
-    '#description' => t('Hide terms with no nodes attached to them.'),
+    '#title' => t('Hide empty terms'),
+    '#description' => t('Hide terms with no items attached to them.'),
     'default' => FALSE,
   );
 
   $options['voc_item'] = array(
-    '#title' => t('Item for Vocabulary'),
-    '#description' => t("Shall the vocabulary have it's own item."),
+    '#title' => t('Add item for vocabulary'),
+    '#description' => t('Shows the vocabulary name as the top level menu item of the taxonomy menu.'),
     'default' => TRUE,
   );
 
   $options['expanded'] = array(
-    '#title' => t('Auto Expand Menu Item'),
-    '#description' => t('Sets the expand setting to TRUE'),
+    '#title' => t('Auto expand menu items'),
+    '#description' => t('Automatically show all menu items as expanded.'),
     'default' => TRUE,
   );
 
   $options['display_descendants'] = array(
-    '#title' => t('Display Descendants'),
+    '#title' => t('Display descendants'),
+    '#description' => t('TODO'),
     'default' => FALSE,
   );
   
   $options['end_all'] = array(
     '#title' => t("Use 'all' at the end of URL"),
     'default' => TRUE,
-    '#description' => t('This changes tid+tid+tid to "All" in term when Dispaly Decendants is selected. <br />
-    Only used if Menu Path Type is "Default path". <br />
-    Works with default taxonomy page.'),
+    '#description' => t('This changes tid+tid+tid to "All" in term when <em>Display descendants</em> has been selected.<br />Only used if <em>Menu path type</em> is "Default path".<br />Works with default taxonomy page.'),
   );
 
   return $options;
@@ -941,7 +937,7 @@
 
         if ($item['title'] != ($term->name . $display_num)) {
           // Should not happen
-          drupal_set_message(t('Menu and taxonomy name mismatch : @title != @name', array('@title' => $item['title'], '@name' => $term->name . $display_num)), 'error');
+          drupal_set_message(t('Menu and taxonomy name mismatch: @title != @name', array('@title' => $item['title'], '@name' => $term->name . $display_num)), 'error');
         }
         $item['title'] = tt('taxonomy:term:'. $term->tid .':name', $term->name) . $display_num;
       }
Index: taxonomy_menu.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/taxonomy_menu/taxonomy_menu.install,v
retrieving revision 1.2.2.1.2.7
diff -u -r1.2.2.1.2.7 taxonomy_menu.install
--- taxonomy_menu.install	25 Mar 2009 21:29:13 -0000	1.2.2.1.2.7
+++ taxonomy_menu.install	29 Oct 2009 10:43:52 -0000
@@ -42,28 +42,28 @@
 function taxonomy_menu_schema() {
 
   $schema['taxonomy_menu'] = array(
-    'description' => t('Links a taxonomy term to a menu item'),
+    'description' => 'Links a taxonomy term to a menu item.',
     'fields' => array(
       'mlid' => array(
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-        'description' => t('The taxonomy terms {menu_link}.mlid'),
+        'description' => 'The taxonomy terms {menu_link}.mlid.',
       ),
       'tid' => array(
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-        'description' => t('tid that is linked to the mlid'),
+        'description' => 'Tid that is linked to the mlid.',
       ),
       'vid' => array(
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-        'description' => t('vid for the tid'),
+        'description' => 'Vid for the tid.',
       ),
     ),
     'primary key' => array('mlid', 'tid'),
@@ -76,28 +76,28 @@
 
 function taxonomy_menu_update_6200() {
   $schema['taxonomy_menu'] = array(
-    'description' => t('Links a taxonomy term to a menu item'),
+    'description' => 'Links a taxonomy term to a menu item.',
     'fields' => array(
       'mlid' => array(
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-        'description' => t('The taxonomy terms {menu_link}.mlid'),
+        'description' => 'The taxonomy terms {menu_link}.mlid.',
       ),
       'tid' => array(
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-        'description' => t('tid that is linked to the mlid'),
+        'description' => 'Tid that is linked to the mlid.',
       ),
       'vid' => array(
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-        'description' => t('vid for the tid'),
+        'description' => 'Vid for the tid.',
       ),
     ),
     'primary key' => array('mlid', 'tid'),
Index: taxonomy_menu_vocabulary_path/taxonomy_menu_vocabulary_path.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/taxonomy_menu/taxonomy_menu_vocabulary_path/Attic/taxonomy_menu_vocabulary_path.info,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 taxonomy_menu_vocabulary_path.info
--- taxonomy_menu_vocabulary_path/taxonomy_menu_vocabulary_path.info	30 Aug 2009 01:56:31 -0000	1.1.2.1
+++ taxonomy_menu_vocabulary_path/taxonomy_menu_vocabulary_path.info	29 Oct 2009 10:43:53 -0000
@@ -2,7 +2,7 @@
 core          = "6.x"
 dependencies[] = taxonomy
 dependencies[] = taxonomy_menu
-description   = "Enables a custom path for each vocabulary through Taxonomy Menu"
+description   = "Enables a custom path for each vocabulary through Taxonomy Menu."
 name          = "Taxonomy Menu Vocabulary Path"
 package       = Taxonomy Menu
 
Index: taxonomy_menu_vocabulary_path/taxonomy_menu_vocabulary_path.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/taxonomy_menu/taxonomy_menu_vocabulary_path/Attic/taxonomy_menu_vocabulary_path.module,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 taxonomy_menu_vocabulary_path.module
--- taxonomy_menu_vocabulary_path/taxonomy_menu_vocabulary_path.module	30 Aug 2009 01:56:31 -0000	1.1.2.1
+++ taxonomy_menu_vocabulary_path/taxonomy_menu_vocabulary_path.module	29 Oct 2009 10:43:53 -0000
@@ -19,7 +19,7 @@
 function taxonomy_menu_vocabulary_path_taxonomy_menu_options() {
   $options['taxonomy_menu_vocabulary_path'] = array(
     '#title' => t('Custom path for vocabulary'),
-    '#description' => t('Enter the path you would like to use for this vocabulary. Only used if Menu Path Type is "Vocabulary path".'),
+    '#description' => t('Enter the path you would like to use for this vocabulary. Only used if menu path type is "Vocabulary path".'),
     'default' => 'category',
     '#type' => 'textfield',
     '#weight' => -5,
@@ -30,7 +30,7 @@
     '#weight' => -4,
     '#type' => 'checkbox',
     'default' => '',
-    '#description' => t('Use the custom path for vocabulary as base path for term menu items. Only used if Menu Path Type is "Vocabulary path".'),
+    '#description' => t('Use the custom path for vocabulary as base path for term menu items. Only used if Menu path type is "Vocabulary path".'),
   );
  
   return $options;
Index: taxonomy_menu_hierarchy/taxonomy_menu_hierarchy.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/taxonomy_menu/taxonomy_menu_hierarchy/Attic/taxonomy_menu_hierarchy.info,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 taxonomy_menu_hierarchy.info
--- taxonomy_menu_hierarchy/taxonomy_menu_hierarchy.info	1 Mar 2009 05:07:35 -0000	1.1.2.1
+++ taxonomy_menu_hierarchy/taxonomy_menu_hierarchy.info	29 Oct 2009 10:43:53 -0000
@@ -2,6 +2,6 @@
 core          = "6.x"
 dependencies[] = taxonomy
 dependencies[] = taxonomy_menu
-description   = "Enables Hierarchy path to Taxonomy Menu"
+description   = "Enables Hierarchy path to Taxonomy Menu."
 name          = "Taxonomy Menu Hierarchy"
 package       = Taxonomy Menu
Index: taxonomy_menu_hierarchy/taxonomy_menu_hierarchy.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/taxonomy_menu/taxonomy_menu_hierarchy/Attic/taxonomy_menu_hierarchy.module,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 taxonomy_menu_hierarchy.module
--- taxonomy_menu_hierarchy/taxonomy_menu_hierarchy.module	14 Mar 2009 21:21:06 -0000	1.1.2.2
+++ taxonomy_menu_hierarchy/taxonomy_menu_hierarchy.module	29 Oct 2009 10:43:53 -0000
@@ -51,8 +51,8 @@
  */
 function taxonomy_menu_hierarchy_taxonomy_menu_options() {
   $options['hierarchy_base'] = array(
-    '#title' => t('Base Path for Hierarchy Path'),
-    '#description' => t('Only used when the Hierarchy path type is selected'),
+    '#title' => t('Base path for hierarchy path'),
+    '#description' => t('Only used if the <em>Hierarchy path</em> type is selected.'),
     'default' => 'category',
     '#type' => 'textfield',
     '#weight' => -5,
