--- loncom/interface/lonmsgdisplay.pm	2008/11/04 06:22:53	1.95
+++ loncom/interface/lonmsgdisplay.pm	2008/12/05 19:38:32	1.100
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.95 2008/11/04 06:22:53 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.100 2008/12/05 19:38:32 schafran Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -243,9 +243,9 @@ function folder_choice(targetform,caller
   </td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
   <td align="right">
    <table><tr><td><br />
-    <input type="button" value="'.&mt('Make New Folder').
+    <input type="button" value="'.&mt('New Folder').
     '" onClick="javascript:folder_choice(this.form,'."'new'".');" /></td>'.
-    '<td align="center"><b>'.&mt('New Folder').'</b><br />'.
+    '<td align="center"><b>'.&mt('Name').'</b><br />'.
     '<input type="text" size="15" name="newfolder" value="" />
     </td></tr></table>
   </td>
@@ -353,7 +353,7 @@ sub makefolder {
         }
     } else {
         $outcome = 
-	    &mt('Error - could not obtain lock on email folders record.');
+	    &mt('Error - could not obtain lock on e-mail folders record.');
     }
     return ($outcome,$warning);
 }
@@ -559,7 +559,8 @@ sub disgroup {
     my $result;
     #  Needs to be in a course
     if (!($env{'request.course.fn'})) {
-        $result = &mt('Error: you must have a course role selected to be able to send a broadcast message to a group in the course.');
+        $result = &mt('Error: you must have a course role selected to be able to send a broadcast 
+e-mail to a group in the course.');
         return $result;
     }
     if ($cdom eq '' || $cnum eq '') {
@@ -717,13 +718,13 @@ sub groupmail_header {
          {href=>"/adm/email?compose=group&amp;group=".
                 "$env{'form.group'}&amp;$refarg",
           text=>"Send a Message in a Group",
-          title=>"Compose Group Email Message"},);
+          title=>"Compose Group Message"},);
     if ($action eq 'sending') {
             &Apache::lonhtmlcommon::add_breadcrumb
                          ({text=>"Messages being sent.",
-                           title=>"Messages 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;
@@ -737,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;
@@ -1286,7 +1287,7 @@ sub compout {
          $dispcrit=
  '<span class="LC_nobreak"><label><input type="checkbox" name="critmsg" /> '.&mt('Send as critical message').'.</label>'.$crithelp.'&nbsp;&nbsp;'.&mt('Require return receipt?').'<label><input type="radio" name="sendbck" value="1" />'.&mt('Yes').'</label>&nbsp;&nbsp;<label><input type="radio" name="sendbck" value="" checked="checked" />'.&mt('No').'</label></span><br />'.
  '<label><input type="checkbox" name="permanent" /> '.
-&mt('Send copy to permanent email address (if known)').'</label><br />'.
+&mt('Send copy to permanent e-mail address (if known)').'</label><br />'.
 '<label><input type="checkbox" name="rsspost" /> '.
 		  &mt('Include in course RSS newsfeed').'</label><br />';
     }
@@ -1675,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" />
@@ -1687,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>
 |;