--- g2.module	2005-12-29 17:20:51.000000000 -0600
+++ g2.module.new	2005-12-30 05:17:50.000000000 -0600
@@ -19,9 +19,13 @@
 define('G2DEFAULTALPHABAR', '0123456789abcdefghijklmnopqrstuvwxyz');
 define('G2NODETYPE',        'g2_entry');
 define('G2PATHENTRIES',     'g2/entries');
+define('G2TITLEENTRIES',    'G2 entries by name');
 define('G2PATHAUTOCOMPLETE','g2/autocomplete');
+DEFINE('G2TITLEAUTOCOMPLETE','entry autocomplete');
 define('G2PATHINITIAL',     'g2/initial');
+define('G2TITLEINITIAL',    'entries starting by initial');
 define('G2PATHMAIN',        'g2');
+define('G2TITLEMAIN',       'G2 glossary main page');
 define('G2PERMVIEW',        'view g2 entries');
 define('G2PERMADMIN',       'administer g2 entries');
 define('G2_VERSION',        '2005-12-28');
@@ -62,7 +66,7 @@
   $ret = array();
   for ($i = 0 ; $i < strlen($rawalphabar) ; $i++)
     {
-    $ret[] = l($rawalphabar[$i], 'g2/initial/' . urlencode($rawalphabar[$i]), NULL, NULL, NULL, TRUE); 
+    $ret[] = l($rawalphabar[$i], G2PATHINITIAL . '/' . urlencode($rawalphabar[$i]), NULL, NULL, NULL, TRUE); 
     }
   return $ret;
   }
@@ -398,7 +402,7 @@
           '#type'          => 'textfield', 
           '#title'         => t('Entry for the day'), 
           '#maxlength'     => 60, 
-          '#autocomplete_path' => 'g2/autocomplete', 
+          '#autocomplete_path' => G2PATHAUTOCOMPLETE,
           '#required'      => TRUE, 
           '#default_value' => variable_get('g2_wotd_entry', '')
           );
@@ -938,7 +942,7 @@
     $items[] = array // AJAX autocomplete callback
       (
       'path'     => G2PATHAUTOCOMPLETE, 
-      'title'    => t('entry autocomplete'),
+      'title'    => t(G2TITLEAUTOCOMPLETE),
       'callback' => '_g2_autocomplete', 
       'access'   => $view_access, 
       'type'     => MENU_CALLBACK
@@ -946,7 +950,7 @@
     $items[] = array //
       (
       'path'     => G2PATHINITIAL, 
-      'title'    => t('entries starting by initial'),
+      'title'    => t(G2TITLEINITIAL),
       'callback' => '_g2_initial', 
       'access'   => $view_access, 
       'type'     => MENU_CALLBACK
@@ -954,7 +958,7 @@
     $items[] = array
       (
       'path'     => G2PATHENTRIES,
-      'title'    => 'G2 entries by name',
+      'title'    => G2TITLEENTRIES,
       'callback' => '_g2_entries',
       'access'   => $view_access,
       'type'     => MENU_CALLBACK
@@ -962,7 +966,7 @@
     $items[] = array // G2 main page
       (
       'path'     => G2PATHMAIN,
-      'title'    => t('G2 glossary main page'),
+      'title'    => t(G2TITLEMAIN),
       'callback' => '_g2_main',
       'access'   => $view_access, 
       'type'     => MENU_NORMAL_ITEM
@@ -1135,8 +1139,8 @@
   if ($page) 
     { 
     $breadcrumb = array(); 
-    $breadcrumb[] = array('path' => 'g2', 'title' => t('G2')); 
-    $breadcrumb[] = array('path' => 'g2/'. $node->title, 
+    $breadcrumb[] = array('path' => G2PATHMAIN, 'title' => t('G2')); 
+    $breadcrumb[] = array('path' => G2PATHMAIN .'/'. $node->title, 
       'title' => t('%category', array('%category' => $node->title))); 
     $breadcrumb[] = array('path' => 'node/'. $node->nid); 
     menu_set_location($breadcrumb);