--- loncom/interface/lonpreferences.pm	2004/06/08 01:32:02	1.44
+++ loncom/interface/lonpreferences.pm	2004/11/02 00:17:24	1.49
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.44 2004/06/08 01:32:02 www Exp $
+# $Id: lonpreferences.pm,v 1.49 2004/11/02 00:17:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -868,8 +868,7 @@ sub handler {
                       }));
 
     push (@Options,({ action   => 'changemsgforward',
-                      linktext => 'Change Message Forwarding',
-                      text     => 'and Notification Addresses',
+                      linktext => 'Change Message Forwarding and Notification Addresses',
                       href     => '/adm/preferences',
                       help     => 'Prefs_Forwarding',
                       breadcrumb => 
@@ -888,6 +887,7 @@ sub handler {
     push (@Options,{ action => 'none', 
                      linktext =>
                          q{Edit the 'About Me' Personal Information Screen},
+		     help => 'Prefs_About_Me',
                      href => $aboutmeaction});
     push (@Options,({ action => 'changecolors',
                       linktext => 'Change Color Scheme',
@@ -908,6 +908,7 @@ sub handler {
     push (@Options,({ action => 'changelanguages',
                       linktext => 'Change Language Preferences',
                       href => '/adm/preferences',
+		      help => 'Prefs_Language',
                       breadcrumb=>
                           { href => '/adm/preferences?action=changelanguages',
                             text => 'Change Language'},
@@ -938,6 +939,7 @@ sub handler {
     push (@Options,({ action => 'changediscussions',
                       linktext => 'Change Discussion Display Preferences',
                       href => '/adm/preferences',
+                      help => 'Change_Discussion_Display',
                       breadcrumb => 
                             { href => '/adm/preferences?action=changediscussions',
                               text => 'Change Discussion Preferences'},
@@ -964,6 +966,7 @@ sub handler {
 </head>
 ENDHEADER
     my $call = undef;
+    my $help = undef;
     my $printmenu = 'yes';
     foreach my $option (@Options) {
         if ($option->{'action'} eq $ENV{'form.action'}) {
@@ -973,11 +976,12 @@ ENDHEADER
                 &Apache::lonhtmlcommon::add_breadcrumb
                     ($option->{'breadcrumb'});
             }
+	    $help=$option->{'help'};
         }
     }
     $r->print(&Apache::loncommon::bodytag('Change Preferences'));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs
-              (undef,'Change Preferences'));
+              (undef,'Change Preferences',$help));
     if (defined($call)) {
         $call->($r);
     }
@@ -1001,10 +1005,10 @@ ENDHEADER
                 $optiontext .= 
                     '<a href="'.$option->{'href'}.
                     '?action='.$option->{'action'}.'">'.
-                    $option->{'linktext'}.'</a>';
+                    &mt($option->{'linktext'}).'</a>';
             }
             if (exists($option->{'text'})) {
-                $optiontext .= ' '.$option->{'text'};
+                $optiontext .= ' '.&mt($option->{'text'});
             }
             if ($optiontext ne '') {
                 $optiontext = '<font size="+1">'.$optiontext.'</font>';