--- loncom/interface/lonmsgdisplay.pm	2008/10/08 14:56:50	1.93
+++ loncom/interface/lonmsgdisplay.pm	2008/10/23 10:15:37	1.94
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.93 2008/10/08 14:56:50 bisitz Exp $
+# $Id: lonmsgdisplay.pm,v 1.94 2008/10/23 10:15:37 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1239,7 +1239,11 @@ sub compout {
     my $dismsg='';
     my $disbase='';
     my $attachrow;
-    my $func=&mt('Send New');
+    my $func1='Send'; # do not translate here!
+    my %func2=( # do not translate here!
+               'ma'  => 'Message',
+               'msg' => 'Messages',
+              );
     my %lt=&Apache::lonlocal::texthash('us'  => 'Username',
 				       'do'  => 'Domain',
 				       'ad'  => 'Additional Recipients',
@@ -1247,8 +1251,6 @@ sub compout {
                                        'ar'  => 'Allow replies',
 				       'sb'  => 'Subject',
 				       'ca'  => 'Cancel',
-				       'ma'  => 'Mail',
-                                       'msg' => 'Messages',
                                        'gen' => 'Generate messages from a file',
                                        'gmt' => 'General message text',
                                        'tff' => 'The file format for the uploaded portion of the message is',
@@ -1296,7 +1298,7 @@ sub compout {
 	%content=&Apache::lonmsg::unpackagemsg($message{$forwarding},$folder);
 	$dispcrit.='<input type="hidden" name="forwid" value="'.
 	    $forwarding.'" />';
-	$func=&mt('Forward');
+	$func1='Forward'; # do not translate here!
 	
 	$dissub=&mt('Forwarding').': '.$content{'subject'};
 	$dismsg=&mt('Forwarded message from').' '.
@@ -1310,7 +1312,7 @@ sub compout {
 	%content=&Apache::lonmsg::unpackagemsg($message{$replying},$folder);
 	$dispcrit.='<input type="hidden" name="replyid" value="'.
 	    $replying.'" />';
-	$func=&mt('Send Reply to');
+	$func1='Send Reply to'; # do not translate here!
 	
 	$dissub=&mt('Reply').': '.$content{'subject'};       
 	$dismsg='> '.$content{'message'};
@@ -1421,7 +1423,7 @@ ENDREPSCRIPT
                   &mt('Unless you choose otherwise:').'<ul><li>'.
         &mt("The subject in each forwarded message will be <i>'Forwarding:'</i> followed by the original subject.").'</li><li>'.
         &mt("The message itself will begin with a first line: <i>'Forwarded message from'</i> followed by the original sender's name.").'</li></ul></td></tr>');
-        $func=&mt('Forward');
+        $func1='Forward'; # do not translate here!
         $dissub = &mt('Forwarding').': ';
         $subj_size = '10';
         my $extra = '&lt;'.&mt('original subject').'&gt;&nbsp;&nbsp;&nbsp;'.
@@ -1440,7 +1442,7 @@ $latexHelp.
         foreach my $msg (@to_forward) {
             $r->print('<input type="hidden" name="delmark" value="'.$msg.'" />');
         }
-        $r->print(&submit_button_row($folder,$dismode,$func.' '.$lt{'msg'},
+        $r->print(&submit_button_row($folder,$dismode,&mt($func1.' '.$func2{'msg'}),
                                      \%lt));
     } elsif ($broadcast ne 'upload') {
         $subj_size = '50';
@@ -1462,7 +1464,7 @@ $attachrow
 $dispcrit
 $disbase
 ENDCOMP
-        $r->print(&submit_button_row($folder,$dismode,$func.' '.$lt{'ma'},
+        $r->print(&submit_button_row($folder,$dismode,&mt($func1.' '.$func2{'ma'}),
                                      \%lt));
         $r->print($citation);
         if (exists($env{'form.ref'})) {