--- loncom/interface/lonhelpmenu.pm	2012/12/17 15:55:50	1.40
+++ loncom/interface/lonhelpmenu.pm	2013/07/19 17:11:09	1.41
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # generate frame-based help system
 #
-# $Id: lonhelpmenu.pm,v 1.40 2012/12/17 15:55:50 raeburn Exp $
+# $Id: lonhelpmenu.pm,v 1.41 2013/07/19 17:11:09 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -149,46 +149,41 @@ SCRIPT_TWO
     $r->print('<table id="LC_helpmenu" width="'.$width.'">');
 
     my $general_help = &Apache::loncommon::general_help();
-    $r->print(<<END);
+    $r->print('
   <tr height="50">
-   <td width='5'>&nbsp;</td>
+   <td width="5">&nbsp;</td>
    <td>
-    <fieldset><legend><img src="$location/lonIcons/minilogo.gif" height='20' width='29' valign='bottom' />&nbsp;&nbsp;LON-CAPA help/support</legend>
+    <fieldset><legend><img src="'.$location.'/lonIcons/minilogo.gif" height="20" width="29" valign="bottom" alt="('.&mt('LON-CAPA help/support').')" />&nbsp;&nbsp;'.&mt('LON-CAPA help/support').'</legend>
  <table id="LC_helpmenu_links">
    <tr>
-	<td><span class="LC_nobreak"><a href="/adm/help/$general_help.hlp" target="bodyframe">
-		  <img src="$location/help/help.png" border="0" alt="(General help)" valign="middle" />&nbsp;General Help</a>&nbsp;</span></td>
-END
+	<td><span class="LC_nobreak"><a href="/adm/help/'.$general_help.'.hlp" target="bodyframe">
+		  <img src="'.$location.'/help/help.png" border="0" alt="('.&mt('General help').')" valign="middle" />&nbsp;'.&mt('General Help').'</a>&nbsp;</span></td>');
     if ($component_url) {
 	$r->print("<td><span class=\"LC_nobreak\"><a href=\"$component_url\" target=\"bodyframe\">".
-		  '<img src="'.$location.'/help/help.png" border="0" alt="(Topic help)" valign="middle" />&nbsp;'.$topic.'</a>&nbsp;</span></td>');
+		  '<img src="'.$location.'/help/help.png" border="0" alt="('.&mt('Topic help').')" valign="middle" />&nbsp;'.$topic.'</a>&nbsp;</span></td>');
     }
     if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $r->print('
-            <td><span class="LC_nobreak">&nbsp;<a href="javascript:gohelpdesk()"><img src="'.$location.'/lonIcons/helpdesk.gif" border="0" alt="(Ask helpdesk)" valign="middle" />&nbsp;Ask helpdesk</a>&nbsp;</span></td>');
+            <td><span class="LC_nobreak">&nbsp;<a href="javascript:gohelpdesk()"><img src="'.$location.'/lonIcons/helpdesk.gif" border="0" alt="('.&mt('Ask helpdesk').')" valign="middle" />&nbsp;'.&mt('Ask helpdesk').'</a>&nbsp;</span></td>');
     }
     if ($faq && $env{'user.adv'}) {
-        $r->print(<<END);
-             <td><span class="LC_nobreak">&nbsp;<a href="$faqbaseurl/fom/cache/$faq.html" target="bodyframe"><img src="$location/lonMisc/smallFAQ.gif" border="0" alt="(FAQ)" valign="middle" />&nbsp;FAQ</a>&nbsp;</span>
-            </td>
-END
+        $r->print('
+             <td><span class="LC_nobreak">&nbsp;<a href="'.$faqbaseurl.'/fom/cache/'.$faq.'.html" target="bodyframe"><img src="'.$location.'/lonMisc/smallFAQ.gif" border="0" alt="('.&mt('FAQ').')" valign="middle" />&nbsp;'.&mt('FAQ').'</a>&nbsp;</span>
+            </td>');
     }
     if ($env{'user.adv'}) {
     	if ($helpconfig{'helpsettings'}{'submitbugs'} eq '1' ||
     		$helpconfig{'helpsettings'}{'submitbugs'} eq '' ) {
-        	$r->print(<<END);
-            	<td><span class="LC_nobreak"&nbsp;<b><a href="$bugurl" target="bodyframe"><img src="$location/lonMisc/smallBug.gif" border="0" alt="(Report a bug)" valign="middle" />&nbsp;Report a bug</a>&nbsp;</b></span></td>
-END
+        	$r->print('
+            	<td><span class="LC_nobreak"&nbsp;<b><a href="'.$bugurl.'" target="bodyframe"><img src="'.$location.'/lonMisc/smallBug.gif" border="0" alt="('.&mt('Report a bug').')" valign="middle" />&nbsp;'.&mt('Report a bug').'</a>&nbsp;</b></span></td>');
 		}
     }
     if ($stayOnPage) {
-        $r->print(<<END);
-            <td><span class="LC_nobreak">&nbsp;<a href="$origurl" target="_top"><img src="$location/lonIcons/move_up.gif" border="0" alt="(Return to last location)" valign="middle" />&nbsp;Return to last location</a>&nbsp;</span></td>
-END
+        $r->print('
+            <td><span class="LC_nobreak">&nbsp;<a href="'.$origurl.'" target="_top"><img src="'.$location.'/lonIcons/move_up.gif" border="0" alt="('.&mt('Return to last location').')" valign="middle" />&nbsp;'.&mt('Return to last location').'</a>&nbsp;</span></td>');
     } else {
-        $r->print(<<END);
-            <td><span class="LC_nobreak"&nbsp;<a href="javascript:window.close()" target="_top"><img src="$location/lonIcons/closepage.gif" border="0" alt="(Close window)" valign="bottom" />&nbsp;Close</a>&nbsp;</span></td>
-END
+        $r->print('
+            <td><span class="LC_nobreak"&nbsp;<a href="javascript:window.close()" target="_top"><img src="$location/lonIcons/closepage.gif" border="0" alt="('.&mt('Close window').')" valign="bottom" />&nbsp;'.&mt('Close').'</a>&nbsp;</span></td>');
     }
     $r->print(<<END);
   </tr>