--- loncom/homework/grades.pm	2009/05/07 19:36:45	1.572
+++ loncom/homework/grades.pm	2009/05/23 19:01:13	1.575
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.572 2009/05/07 19:36:45 www Exp $
+# $Id: grades.pm,v 1.575 2009/05/23 19:01:13 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2135,10 +2135,9 @@ KEYWORDS
 								   {'one_time' => 1});
 
 			    $similar="<hr /><h3><span class=\"LC_warning\">".
-				&mt('Essay is [_1]% similar to an essay by [_2] ([_3]:[_4]) in course [_5] (course id [_6]:[_7])',
+				&mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])',
 				    $osim,
-				    &Apache::loncommon::plainname($oname,$odom),
-				    $oname,$odom,
+				    &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')',
 				    $old_course_desc{'description'},
 				    $old_course_desc{'num'},
 				    $old_course_desc{'domain'}).
@@ -2463,7 +2462,7 @@ sub processHandGrade {
                                                      undef,$feedurl,undef,
                                                      undef,undef,$showsymb,
                                                      $restitle);
-		$request->print('<br />'.&mt('Sending message to [_1]:[_2]',$uname,$udom).': '.
+		$request->print('<br />'.&mt('Sending message to [_1]',$uname.':'.$udom).': '.
 				$msgstatus);
 	    }
 	    if ($env{'form.collaborator'.$ctr}) {
@@ -3681,7 +3680,7 @@ sub split_part_type {
 #
 #--- Javascript to handle csv upload
 sub csvupload_javascript_reverse_associate {
-    my $error1=&mt('You need to specify the username or ID');
+    my $error1=&mt('You need to specify the username or the student/employee ID');
     my $error2=&mt('You need to specify at least one grading field');
   return(<<ENDPICK);
   function verify(vf) {
@@ -3721,7 +3720,7 @@ ENDPICK
 }
 
 sub csvupload_javascript_forward_associate {
-    my $error1=&mt('You need to specify the username or ID');
+    my $error1=&mt('You need to specify the username or the student/employee ID');
     my $error2=&mt('You need to specify at least one grading field');
   return(<<ENDPICK);
   function verify(vf) {
@@ -5200,7 +5199,7 @@ sub scantron_selectphase {
               &Apache::loncommon::start_data_table_row()."\n".
               '<td colspan="2">'."\n".
               '<input type="hidden" name="command" value="checksubmissions" />'."\n".
-              '<input type="submit" value="'.&mt('Review Scantron Data and Submission Records').'" />'."\n".
+              '<input type="submit" value="'.&mt('Review Bubblesheet Data and Submission Records').'" />'."\n".
               '</td>'."\n".
               &Apache::loncommon::end_data_table_row()."\n".
               &Apache::loncommon::end_data_table()."\n".
@@ -5241,7 +5240,7 @@ sub scantron_selectphase {
       CODEstart   - (only matter if a CODE exists) column in the line where
                      the CODE starts
       CODElength  - length of the CODE
-      IDstart     - column where the student/employee ID number starts
+      IDstart     - column where the student/employee ID starts
       IDlength    - length of the student/employee ID info
       Qstart      - column where the information from the bubbled
                     'questions' start
@@ -5341,7 +5340,7 @@ sub username_to_idmap {
     $whichline         - line number of the passed in scanline
     $field             - type of change to process 
                          (either 
-                          'ID'     -> correct the student/employee ID number
+                          'ID'     -> correct the student/employee ID
                           'CODE'   -> correct the CODE
                           'answer' -> fixup the submitted answers)
     
@@ -7475,8 +7474,8 @@ SCANTRONFORM
     
     my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam'));
     my $count=&get_todo_count($scanlines,$scan_data);
-    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Scantron Status',
- 				    'Scantron Progress',$count,
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet Status',
+ 				    'Bubblesheet Progress',$count,
 				    'inline',undef,'scantronupload');
     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
 					  'Processing first student');
@@ -7760,7 +7759,7 @@ sub scantron_upload_scantron_data {
   &Apache::lonhtmlcommon::end_pick_box().'<br />
 
 <input name="command" value="scantronupload_save" type="hidden" />
-<input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Scantron Data').'" />
+<input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
 </form>
 ');
     return '';
@@ -7778,7 +7777,7 @@ sub scantron_upload_scantron_data_save {
     if (!&Apache::lonnet::allowed('usc',$env{'form.domainid'}) &&
 	!&Apache::lonnet::allowed('usc',
 			    $env{'form.domainid'}.'_'.$env{'form.courseid'})) {
-	$r->print(&mt("You are not allowed to upload Scantron data to the requested course.")."<br />");
+	$r->print(&mt("You are not allowed to upload bubblesheet data to the requested course.")."<br />");
 	if ($symb) {
 	    $r->print(&show_grading_menu_form($symb));
 	} else {