--- loncom/interface/lonmsgdisplay.pm	2008/11/17 17:19:52	1.96
+++ loncom/interface/lonmsgdisplay.pm	2008/12/03 21:09:44	1.99
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.96 2008/11/17 17:19:52 schafran Exp $
+# $Id: lonmsgdisplay.pm,v 1.99 2008/12/03 21:09:44 schafran Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -718,13 +718,13 @@ sub groupmail_header {
          {href=>"/adm/email?compose=group&group=".
                 "$env{'form.group'}&$refarg",
           text=>"Send a Message in a Group",
-          title=>"Compose Group E-mail"},);
+          title=>"Compose Group Message"},);
     if ($action eq 'sending') {
             &Apache::lonhtmlcommon::add_breadcrumb
-                         ({text=>"E-mails being sent.",
+                         ({text=>"Messages being sent.",
                            title=>"E-mails sent"},);
     }
-    my $groupheader = &Apache::loncommon::start_page('Group Email');
+    my $groupheader = &Apache::loncommon::start_page('Group Message');
     $groupheader .= &Apache::lonhtmlcommon::breadcrumbs
                 ('Group - '.$env{'form.group'}.' Email');
     return $groupheader;
@@ -738,7 +738,7 @@ sub groupmail_sent {
     }
     my $output .= '<br /><br /><a href="/adm/email?compose=group&amp;group='.
                   $group.'&amp;'.$refarg.'">'.
-                  &mt('Send another group email').'</a>'.'&nbsp;&nbsp;&nbsp;'.
+                  &mt('Send another group message').'</a>'.'&nbsp;&nbsp;&nbsp;'.
                   '<a href="/adm/'.$cdom.'/'.$cnum.'/'.$group.'/smppg?'.
                   $refarg.'">'. &mt('Return to group page').'</a>';
     return $output;
@@ -1571,7 +1571,7 @@ $sendmode
 $dispcrit
 $disbase
 ENDCOMP
-        $r->print(&submit_button_row($folder,$dismode,&mt($func1),
+        $r->print(&submit_button_row($folder,$dismode,&mt($func1.' '.$func2{'ma'}),
                                      \%lt,$hasfloat,$group));
         $r->print($citation);
         if (exists($env{'form.ref'})) {
@@ -1676,6 +1676,7 @@ ENDADD
 sub submit_button_row {
     my ($folder,$dismode,$sendtext,$lt,$is_crsform,$group) = @_;
     my $pre=&mt("Show Preview and Check Spelling");
+    my $value=&mt('Send');
     my $prevbutton = '<input type="button" name="preview" value="'.$pre.'" onclick="if (typeof(document.compemail.onsubmit)=='."'function'".') {document.compemail.onsubmit();};document.preview.comment.value=document.compemail.message.value;document.preview.subject.value=document.compemail.subject.value;document.preview.submit();" />';
     my $output = qq|
 <input type="hidden" name="folder" value="$folder" />
@@ -1688,7 +1689,7 @@ sub submit_button_row {
     }
     $output .= qq|
 <table><tr><td align="left">
-<input type="submit" name="send" value="$sendtext" />
+<input type="submit" name="send" value="$value" title="$sendtext" />
 <input type="submit" name="cancel" value="$lt->{'ca'}" />
 </td><td width="60">&nbsp;</td><td align="right">$prevbutton</td></tr></table>
 |;