Index: menutrails.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/menutrails/menutrails.module,v
retrieving revision 1.4.2.11
diff -u -p -r1.4.2.11 menutrails.module
--- menutrails.module	2 Feb 2009 15:50:15 -0000	1.4.2.11
+++ menutrails.module	4 Feb 2009 03:48:17 -0000
@@ -128,7 +128,7 @@ function menutrails_node_location($node)
     $term_trails = variable_get('menutrails_terms', array());
     if (!empty($node->taxonomy)) {
       foreach ($node->taxonomy as $term) {
-        if ($term_trails[$term->tid]) {
+        if (isset($term_trails[$term->tid])) {
           $href = $term_trails[$term->tid];
         }
       }
@@ -262,19 +262,19 @@ function menutrails_menutrails_settings(
     );
   }
   foreach ($vocabs as $vocab) {
+    // Tagging gets out of hand too fast, so we disallow.
     if ($vocab->tags != 1) {
-      // Tagging gets out of hand too fast, so we disallow.
       $form[$vocab->vid]['menutrails_terms'] = array(
         '#tree' => TRUE,
         '#type' => 'fieldset',
         '#collapsible' => TRUE,
         '#collapsed' => TRUE,
-        '#title' => t('Categories:') ." $vocab->name",
+        '#title' => t('Categories: @vocabulary', array('@vocabulary' => $vocab->name)),
       );
       $terms = taxonomy_get_tree($vocab->vid);
       foreach ($terms as $term) {
         $form[$vocab->vid]['menutrails_terms'][$term->tid] = array('#type' => 'select',
-          '#title' => t('Parent item for') ." $term->name",
+          '#title' => t('Parent item for @term', array('@term' => $term->name)),
           '#default_value' => isset($term_trails[$term->tid]) ? $term_trails[$term->tid] : NULL,
           '#options' => $options,
         );
@@ -288,13 +288,13 @@ function menutrails_menutrails_settings(
       '#collapsible' => TRUE,
       '#collapsed' => TRUE,
       '#title' => t('Organic groups'),
-      '#description' => t('Settings for nodes withing Organic Groups: these override node and taxonomy settings'),
+      '#description' => t('Settings for nodes withing Organic groups: these override node and taxonomy settings.'),
     );
     $form['menutrails_og']['menutrails_og_sub_pages'] = array(
       '#type' => 'checkbox',
-      '#title' => t('Use Group Node Menu Trail For Og Pages'),
+      '#title' => t('Use group node menu trail for pages in groups'),
       '#default_value' => variable_get('menutrails_og_sub_pages', TRUE),
-      '#description' => t('Use menutrails present for an organic group node for OG sub pages (e.g. "manage subscription" or "members")'),
+      '#description' => t('Use menutrails present for an organic group node for OG sub pages (e.g. "manage subscription" or "members").'),
     );
     $form['menutrails_og']['menutrails_og_post_default'] = array(
       '#type' => 'select',
@@ -309,21 +309,21 @@ function menutrails_menutrails_settings(
       '#collapsed' => TRUE,
       '#tree' => TRUE,
       '#title' => t('Individual organic group trails'),
-      '#description' => t('Specific trails for posts within specific groups'),
+      '#description' => t('Specific trails for posts within specific groups.'),
     );
     $result = db_query('SELECT n.nid, n.title FROM {node} n INNER JOIN og ON n.nid = og.nid ORDER BY n.title');
     $og_trails = variable_get('menutrails_og_node', array());
     while ($node = db_fetch_object($result)) {
       $form['menutrails_og']['menutrails_og_node'][$node->nid] = array(
         '#type' => 'select',
-        '#title' => 'Group '. $node->title,
+        '#title' => t('Group @group', array('@group' => $node->title)),
         '#default_value' => isset($og_trails[$node->nid]) ? $og_trails[$node->nid] : NULL,
         '#options' => $options,
       );
     }
     $form['menutrails_og']['menutrails_og_group_menu'] = array(
       '#type' => 'checkbox',
-      '#title' => t("Use Group's Menu Item For Posts"),
+      '#title' => t("Use group's menu item for posts"),
       '#default_value' => variable_get('menutrails_og_group_menu', FALSE),
       '#description' => t('If a specific group node has an assigned menu item, use this as the trail for nodes which have that group as an audience. If present, this will override all other group settings.'),
     );