Index: modules/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user.module,v
retrieving revision 1.305.2.5
diff -u -r1.305.2.5 user.module
--- modules/user.module 21 May 2004 18:07:48 -0000      1.305.2.5
+++ modules/user.module 15 Jun 2004 01:08:32 -0000
@@ -370,8 +371,14 @@
         return $block;
       case 1:
         if ($menu = menu_tree()) {
-           $block["subject"] = $user->uid ? $user->name : t("Navigation");
-           $block["content"] = "<div class=\"menu\">". $menu ."</div>";
+          if ($user->uid) {
+            $block['subject'] = t(variable_get('user_menu_title', '%username'), array('%username', $user->name));
+          }
+          else {
+            $block['subject'] = t(variable_get('user_anon_menu_title', 'Navigation'));
+          }
+
+          $block['content'] = '<div class="menu">'. $menu .'</div>';
         }
         return $block;
       case 2:
@@ -1119,6 +1126,11 @@
   $group .= form_textarea(t("User registration guidelines"), "user_registration_help", variable_get("user_registration_help", ""), 70, 4, t("This text is displayed at the top of the user registration form.  It's useful for helping or instructing your users."));
   $output = form_group(t("User registration settings"), $group);
 
+  // Navigation menu settings.
+  $group = form_textfield(t('User menu title'), 'user_menu_title', variable_get('user_menu_title', '%username'), 70, 30, t('Customize the title of the main navigation menu for logged-in users.') . ' ' . t('Available variables are:') . ' %username.');
+  $group .= form_textfield(t('Anonymous user menu title'), 'user_anon_menu_title', variable_get('user_anon_menu_title', t('Navigation')), 70, 30, t('Customize the title of the main navigation menu for anonymous users.'));
+  $output .= form_group(t('Navigation menu settings'), $group);
+
   // user email settings
   $group = form_textfield(t("Subject of welcome e-mail"), "user_mail_welcome_subject", _user_mail_text("welcome_subject"), 70, 180, t("Customize the subject of your welcome e-mail, which is sent to new members upon registering.") ." ". t("Available variables are:") ." %username, %site, %password, %uri, %uri_brief, %mailto, %date, %login_uri, %edit_uri.");
   $group .= form_textarea(t("Body of welcome e-mail"), "user_mail_welcome_body", _user_mail_text("welcome_body"), 70, 10, t("Customize the body of the welcome e-mail, which is sent to new members upon registering.") ." ". t("Available variables are:") ." %username, %site, %password, %uri, %uri_brief, %mailto, , %login_uri, %edit_uri.");