--- loncom/homework/grades.pm	2007/11/05 11:46:08	1.480
+++ loncom/homework/grades.pm	2007/11/13 01:47:36	1.489
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.480 2007/11/05 11:46:08 foxr Exp $
+# $Id: grades.pm,v 1.489 2007/11/13 01:47:36 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,7 +42,6 @@ use Apache::Constants qw(:common);
 use Apache::lonlocal;
 use Apache::lonenc;
 use String::Similarity;
-use Data::Dumper;
 use LONCAPA;
 
 use POSIX qw(floor);
@@ -172,7 +171,7 @@ sub get_symb {
 sub nameUserString {
     my ($type,$fullname,$uname,$udom) = @_;
     if ($type eq 'header') {
-	return '<b>&nbsp;Fullname&nbsp;</b><span class="LC_internal_info">(Username)</span>';
+	return '<b>&nbsp;'.&mt('Fullname').'&nbsp;</b><span class="LC_internal_info">('.&mt('Username').')</span>';
     } else {
 	return '&nbsp;'.$fullname.'<span class="LC_internal_info">&nbsp;('.$uname.
 	    ($env{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</span>';
@@ -255,10 +254,10 @@ sub showResourceInfo {
 		$partsseen{$partID}=1;
 	    }
 	    my $display_part=&get_display_part($partID,$symb);
-	    $result.='<td><b>Part: </b>'.$display_part.' <span class="LC_internal_info">'.
+	    $result.='<td>'.&mt('<b>Part: </b>[_1]',$display_part).' <span class="LC_internal_info">'.
 		$resID.'</span></td>'.
-		'<td><b>Type: </b>'.$responsetype.'</td></tr>';
-#	    '<td><b>Handgrade: </b>'.$handgrade.'</td></tr>';
+		'<td>'.&mt('<b>Type: </b>[_1]',$responsetype).'</td></tr>';
+#	    '<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td></tr>';
 	}
     }
     $result.='</table>'."\n";
@@ -734,9 +733,12 @@ sub verifyreceipt {
     $receipt     =~ s/[^\-\d]//g;
     my ($symb)   = &get_symb($request);
 
-    my $title.='<h3><span class="LC_info">Verifying Submission Receipt '.
-	$receipt.'</h3></span>'."\n".
-	'<h4><b>Resource: </b>'.$env{'form.probTitle'}.'</h4><br /><br />'."\n";
+    my $title.=
+	'<h3><span class="LC_info">'.
+	&mt('Verifying Submission Receipt [_1]',$receipt).
+	'</span></h3>'."\n".
+	'<h4>'.&mt('<b>Resource: </b>[_1]',$env{'form.probTitle'}).
+	'</h4>'."\n";
 
     my ($string,$contents,$matches) = ('','',0);
     my (undef,undef,$fullname) = &getclasslist('all','0');
@@ -746,6 +748,19 @@ sub verifyreceipt {
 	$env{"course.$courseid.receiptalg"} eq 'receipt3') { $receiptparts=1; }
     my $parts=['0'];
     if ($receiptparts) { ($parts)=&response_type($symb); }
+    
+    my $header = 
+	&Apache::loncommon::start_data_table().
+	&Apache::loncommon::start_data_table_header_row().
+	'<th>&nbsp;'.&mt('Fullname').'&nbsp;</th>'."\n".
+	'<th>&nbsp;'.&mt('Username').'&nbsp;</th>'."\n".
+	'<th>&nbsp;'.&mt('Domain').'&nbsp;</th>';
+    if ($receiptparts) {
+	$header.='<th>&nbsp;'.&mt('Problem Part').'&nbsp;</th>';
+    }
+    $header.=
+	&Apache::loncommon::end_data_table_header_row();
+
     foreach (sort 
 	     {
 		 if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
@@ -756,7 +771,9 @@ sub verifyreceipt {
 	my ($uname,$udom)=split(/\:/);
 	foreach my $part (@$parts) {
 	    if ($receipt eq &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb,$part)) {
-		$contents.='<tr bgcolor="#ffffe6"><td>&nbsp;'."\n".
+		$contents.=
+		    &Apache::loncommon::start_data_table_row().
+		    '<td>&nbsp;'."\n".
 		    '<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
 		    '\');" target="_self">'.$$fullname{$_}.'</a>&nbsp;</td>'."\n".
 		    '<td>&nbsp;'.$uname.'&nbsp;</td>'.
@@ -764,28 +781,23 @@ sub verifyreceipt {
 		if ($receiptparts) {
 		    $contents.='<td>&nbsp;'.$part.'&nbsp;</td>';
 		}
-		$contents.='</tr>'."\n";
+		$contents.= 
+		    &Apache::loncommon::end_data_table_row()."\n";
 		
 		$matches++;
 	    }
 	}
     }
     if ($matches == 0) {
-	$string = $title.'No match found for the above receipt.';
+	$string = $title.&mt('No match found for the above receipt.');
     } else {
 	$string = &jscriptNform($symb).$title.
-	    'The above receipt matches the following student'.
-	    ($matches <= 1 ? '.' : 's.')."\n".
-	    '<table border="0"><tr><td bgcolor="#777777">'."\n".
-	    '<table border="0"><tr bgcolor="#e6ffff">'."\n".
-	    '<td><b>&nbsp;Fullname&nbsp;</b></td>'."\n".
-	    '<td><b>&nbsp;Username&nbsp;</b></td>'."\n".
-	    '<td><b>&nbsp;Domain&nbsp;</b></td>';
-	if ($receiptparts) {
-	    $string.='<td>&nbsp;Problem Part&nbsp;</td>';
-	}
-	$string.='</tr>'."\n".$contents.
-	    '</table></td></tr></table>'."\n";
+	    '<p>'.
+	    &mt('The above receipt matches the following [numerate,_1,student].',$matches).
+	    '</p>'.
+	    $header.
+	    $contents.
+	    &Apache::loncommon::end_data_table()."\n";
     }
     return $string.&show_grading_menu_form($symb);
 }
@@ -807,11 +819,18 @@ sub listStudents {
     $env{'form.probTitle'} = $env{'form.probTitle'} eq '' ? 
 	&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};
 
-    my $result='<h3><span class="LC_info">&nbsp;'.$viewgrade.
-	' Submissions for a Student or a Group of Students</span></h3>';
+    my $result='<h3><span class="LC_info">&nbsp;'.
+	&mt($viewgrade.' Submissions for a Student or a Group of Students')
+	.'</span></h3>';
 
     my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes'));
 
+    my %lt = ( 'multiple' =>
+	       "Please select a student or group of students before clicking on the Next button.",
+	       'single'   =>
+	       "Please select the student before clicking on the Next button.",
+	       );
+    %lt = &Apache::lonlocal::texthash(%lt);
     $request->print(<<LISTJAVASCRIPT);
 <script type="text/javascript" language="javascript">
     function checkSelect(checkBox) {
@@ -823,15 +842,15 @@ sub listStudents {
 		    ctr++;
 		}
 	    }
-	    sense = "a student or group of students";
+	    sense = '$lt{'multiple'}';
 	} else {
 	    if (checkBox.checked) {
 		ctr = 1;
 	    }
-	    sense = "the student";
+	    sense = '$lt{'single'}';
 	}
 	if (ctr == 0) {
-	    alert("Please select "+sense+" before clicking on the Next button.");
+	    alert(sense);
 	    return false;
 	}
 	document.gradesub.submit();
@@ -851,30 +870,49 @@ LISTJAVASCRIPT
     my $checkhdgrade = ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked="checked"' : '';
     my $checklastsub = $checkhdgrade eq '' ? 'checked="checked"' : '';
     my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'.
-	"\n".$table.
-	'&nbsp;<b>View Problem Text: </b><label><input type="radio" name="vProb" value="no" checked="checked" /> no </label>'."\n".
-	'<label><input type="radio" name="vProb" value="yes" /> one student </label>'."\n".
-	'<label><input type="radio" name="vProb" value="all" /> all students </label><br />'."\n".
-	'&nbsp;<b>View Answer: </b><label><input type="radio" name="vAns" value="no"  /> no </label>'."\n".
-	'<label><input type="radio" name="vAns" value="yes" /> one student </label>'."\n".
-	'<label><input type="radio" name="vAns" value="all" checked="checked" /> all students </label><br />'."\n".
-	'&nbsp;<b>Submissions: </b>'."\n";
+	"\n".$table;
+	
+    $gradeTable .= 
+	'&nbsp;'.
+	&mt('<b>View Problem Text: </b>[_1]',
+	    '<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n".
+	    '<label><input type="radio" name="vProb" value="yes" /> '.&mt('one student').' </label>'."\n".
+	    '<label><input type="radio" name="vProb" value="all" /> '.&mt('all students').' </label>').'<br />'."\n";
+    $gradeTable .= 
+	'&nbsp;'.
+	&mt('<b>View Answer: </b>[_1]',
+	    '<label><input type="radio" name="vAns" value="no"  /> '.&mt('no').' </label>'."\n".
+	    '<label><input type="radio" name="vAns" value="yes" /> '.&mt('one student').' </label>'."\n".
+	    '<label><input type="radio" name="vAns" value="all" checked="checked" /> '.&mt('all students').' </label>').'<br />'."\n";
+
+    my $submission_options;
     if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {
-	$gradeTable.='<label><input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> essay part only </label>'."\n";
+	$submission_options.=
+	    '<label><input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> '.&mt('essay part only').' </label>'."\n";
     }
     my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
     my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status;
     $env{'form.Status'} = $saveStatus;
-    $gradeTable.='<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last submission only </label>'."\n".
-	'<label><input type="radio" name="lastSub" value="last" /> last submission &amp; parts info </label>'."\n".
-	'<label><input type="radio" name="lastSub" value="datesub" /> by dates and submissions </label>'."\n".
-	'<label><input type="radio" name="lastSub" value="all" /> all details</label><br />'."\n".
-        '&nbsp;<b>Grading Increments:</b> <select name="increment">'.
-        '<option value="1">Whole Points</option>'.
-        '<option value=".5">Half Points</option>'.
-        '<option value=".25">Quarter Points</option>'.
-        '<option value=".1">Tenths of a Point</option>'.
-        '</select>'.
+    $submission_options.=
+	'<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> '.&mt('last submission only').' </label>'."\n".
+	'<label><input type="radio" name="lastSub" value="last" /> '.&mt('last submission &amp; parts info').' </label>'."\n".
+	'<label><input type="radio" name="lastSub" value="datesub" /> '.&mt('by dates and submissions').' </label>'."\n".
+	'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').'</label>';
+    $gradeTable .= 
+	'&nbsp;'.
+	&mt('<b>Submissions: </b>[_1]',$submission_options).'<br />'."\n";
+
+    $gradeTable .= 
+        '&nbsp;'.
+	&mt('<b>Grading Increments:</b> [_1]',
+	    '<select name="increment">'.
+	    '<option value="1">'.&mt('Whole Points').'</option>'.
+	    '<option value=".5">'.&mt('Half Points').'</option>'.
+	    '<option value=".25">'.&mt('Quarter Points').'</option>'.
+	    '<option value=".1">'.&mt('Tenths of a Point').'</option>'.
+	    '</select>');
+    
+    $gradeTable .= 
         &build_section_inputs().
 	'<input type="hidden" name="submitonly"  value="'.$submitonly.'" />'."\n".
 	'<input type="hidden" name="handgrade"   value="'.$env{'form.handgrade'}.'" /><br />'."\n".
@@ -887,35 +925,36 @@ LISTJAVASCRIPT
     if (exists($env{'form.gradingMenu'}) && exists($env{'form.Status'})) {
 	$gradeTable.='<input type="hidden" name="Status"   value="'.$stu_status.'" />'."\n";
     } else {
-	$gradeTable.='<b>Student Status:</b> '.
-	    &Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);').'<br />';
+	$gradeTable.=&mt('<b>Student Status:</b> [_1]',
+			 &Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);')).'<br />';
     }
 
-    $gradeTable.='To '.lc($viewgrade).' a submission or a group of submissions, click on the check box(es) '.
-	'next to the student\'s name(s). Then click on the Next button.<br />'."\n".
+    $gradeTable.=&mt('To '.lc($viewgrade).' a submission or a group of submissions, click on the check box(es) '.
+	'next to the student\'s name(s). Then click on the Next button.').'<br />'."\n".
 	'<input type="hidden" name="command" value="processGroup" />'."\n";
 
 # checkall buttons
     $gradeTable.=&check_script('gradesub', 'stuinfo');
     $gradeTable.='<input type="button" '."\n".
 	'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n".
-	'value="Next->" /> <br />'."\n";
+	'value="'.&mt('Next-&gt;').'" /> <br />'."\n";
     $gradeTable.=&check_buttons();
-    $gradeTable.='<label><input type="checkbox" name="checkPlag" checked="checked" />Check For Plagiarism</label>';
+    $gradeTable.='<label><input type="checkbox" name="checkPlag" checked="checked" />'.&mt('Check For Plagiarism').'</label>';
     my ($classlist, undef, $fullname) = &getclasslist($getsec,'1',$getgroup);
     $gradeTable.= &Apache::loncommon::start_data_table().
 	&Apache::loncommon::start_data_table_header_row();
     my $loop = 0;
     while ($loop < 2) {
-	$gradeTable.='<th>No.</th><th>Select</th>'.
-	    '<th>'.&nameUserString('header').'&nbsp;'.'Section/Group</th>';
+	$gradeTable.='<th>'.&mt('No.').'</th><th>'.&mt('Select').'</th>'.
+	    '<th>'.&nameUserString('header').'&nbsp;'.&mt('Section/Group').'</th>';
 	if ($env{'form.showgrading'} eq 'yes' 
 	    && $submitonly ne 'queued'
 	    && $submitonly ne 'all') {
-	    foreach (sort(@$partlist)) {
-		my $display_part=&get_display_part((split(/_/))[0],$symb);
-		$gradeTable.='<th>Part: '.$display_part.
-		    ' Status</h>';
+	    foreach my $part (sort(@$partlist)) {
+		my $display_part=
+		    &get_display_part((split(/_/,$part))[0],$symb);
+		$gradeTable.=
+		    '<th>'.&mt('Part: [_1] Status',$display_part).'</th>';
 	    }
 	} elsif ($submitonly eq 'queued') {
 	    $gradeTable.='<th>'.&mt('Queue Status').'&nbsp;</th>';
@@ -991,8 +1030,8 @@ LISTJAVASCRIPT
 
 	    if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
 		foreach (sort keys(%status)) {
-		    next if (/^resource.*?submitted_by$/);
-		    $gradeTable.='<td align="center">&nbsp;'.$status{$_}.'&nbsp;</td>'."\n";
+		    next if ($_ =~ /^resource.*?submitted_by$/);
+		    $gradeTable.='<td align="center">&nbsp;'.&mt($status{$_}).'&nbsp;</td>'."\n";
 		}
 	    }
 #	    $gradeTable.='<td></td>' if ($ctr%2 ==1);
@@ -1018,19 +1057,20 @@ LISTJAVASCRIPT
     $gradeTable.=&Apache::loncommon::end_data_table()."\n".
 	'<input type="button" '.
 	'onClick="javascript:checkSelect(this.form.stuinfo);" '.
-	'value="Next->" /></form>'."\n";
+	'value="'.&mt('Next-&gt;').'" /></form>'."\n";
     if ($ctr == 0) {
 	my $num_students=(scalar(keys(%$fullname)));
 	if ($num_students eq 0) {
-	    $gradeTable='<br />&nbsp;<span class="LC_warning">There are no students currently enrolled.</span>';
+	    $gradeTable='<br />&nbsp;<span class="LC_warning">'.&mt('There are no students currently enrolled.').'</span>';
 	} else {
 	    my $submissions='submissions';
 	    if ($submitonly eq 'incorrect') { $submissions = 'incorrect submissions'; }
 	    if ($submitonly eq 'graded'   ) { $submissions = 'ungraded submissions'; }
 	    if ($submitonly eq 'queued'   ) { $submissions = 'queued submissions'; }
 	    $gradeTable='<br />&nbsp;<span class="LC_warning">'.
-		'No '.$submissions.' found for this resource for any students. ('.$num_students.
-		' students checked for '.$submissions.')</span><br />';
+		&mt('No '.$submissions.' found for this resource for any students. ([_1] students checked for '.$submissions.')',
+		    $num_students).
+		'</span><br />';
 	}
     } elsif ($ctr == 1) {
 	$gradeTable =~ s/type="checkbox"/type="checkbox" checked="checked"/;
@@ -1080,9 +1120,9 @@ sub check_script {
 }
 
 sub check_buttons {
-    my $buttons.='<input type="button" onclick="checkall()" value="Check All" />';
-    $buttons.='<input type="button" onclick="uncheckall()" value="Uncheck All" />&nbsp;';
-    $buttons.='<input type="button" onclick="checksec()" value="Check Section/Group" />';
+    my $buttons.='<input type="button" onclick="checkall()" value="'.&mt('Check All').'" />';
+    $buttons.='<input type="button" onclick="uncheckall()" value="'.&mt('Uncheck All').'" />&nbsp;';
+    $buttons.='<input type="button" onclick="checksec()" value="'.&mt('Check Section/Group').'" />';
     $buttons.='<input type="text" size="5" name="chksec" />&nbsp;';
     return $buttons;
 }
@@ -1617,8 +1657,7 @@ sub get_increment {
 sub gradeBox {
     my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_;
     my $checkIcon = '<img alt="'.&mt('Check Mark').
-	'" src="'.$request->dir_config('lonIconsURL').
-	'/check.gif" height="16" border="0" />';
+	'" src="'.&Apache::loncommon::lonhttpdurl($request->dir_config('lonIconsURL').'/check.gif').'" height="16" border="0" />';
     my $wgt    = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb,$udom,$uname);
     my $wgtmsg = ($wgt > 0) ? &mt('(problem weight)') 
                            : '<span class="LC_info">'.&mt('problem weight assigned by computer').'</span>';
@@ -1633,41 +1672,47 @@ sub gradeBox {
     if ($last_resets{$partid}) {
         $aggtries = &get_num_tries($record,$last_resets{$partid},$partid);
     }
-    $result.='<table border="0"><tr><td>'.
-	'<b>Part: </b>'.$display_part.' <b>Points: </b></td><td>'."\n";
+    $result.='<table border="0"><tr>';
     my $ctr = 0;
     my $thisweight = 0;
     my $increment = &get_increment();
-    $result.='<table border="0"><tr>'."\n";  # display radio buttons in a nice table 10 across
+
+    my $radio.='<table border="0"><tr>'."\n";  # display radio buttons in a nice table 10 across
     while ($thisweight<=$wgt) {
-	$result.= '<td><span style="white-space: nowrap;"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
+	$radio.= '<td><span style="white-space: nowrap;"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
 	    'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','.
 	    $thisweight.')" value="'.$thisweight.'" '.
 	    ($score eq $thisweight ? 'checked="checked"':'').' /> '.$thisweight."</label></span></td>\n";
-	$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
+	$radio.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
         $thisweight += $increment;
 	$ctr++;
     }
-    $result.='</tr></table>';
-    $result.='</td><td>&nbsp;<b>or</b>&nbsp;</td>'."\n";
-    $result.='<td><input type="text" name="GD_BOX'.$counter.'_'.$partid.'"'.
+    $radio.='</tr></table>';
+
+    my $line.='<input type="text" name="GD_BOX'.$counter.'_'.$partid.'"'.
 	($score ne ''? ' value = "'.$score.'"':'').' size="4" '.
 	'onChange="javascript:updateRadio(this.form,\''.$counter.'_'.$partid.'\','.
 	$wgt.')" /></td>'."\n";
-    $result.='<td>/'.$wgt.' '.$wgtmsg.
+    $line.='<td>/'.$wgt.' '.$wgtmsg.
 	($$record{'resource.'.$partid.'.solved'} eq 'correct_by_student' ? '&nbsp;'.$checkIcon : '').
 	' </td><td>'."\n";
-    $result.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.
+    $line.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.
 	'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n";
     if ($$record{'resource.'.$partid.'.solved'} eq 'excused') {
-	$result.='<option></option>'.
-	    '<option selected="selected">excused</option>';
+	$line.='<option></option>'.
+	    '<option value="excused" selected="selected">'.&mt('excused').'</option>';
     } else {
-	$result.='<option selected="selected"></option>'.
-	    '<option>excused</option>';
+	$line.='<option selected="selected"></option>'.
+	    '<option value="excused" >'.&mt('excused').'</option>';
     }
-    $result.='<option>reset status</option></select>'."\n";
-    $result.="&nbsp;&nbsp;\n";
+    $line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n";
+
+
+    $result .= 
+	&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line);
+
+    
+    $result.='</tr></table>'."\n";
     $result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".
 	'<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n".
 	'<input type="hidden" name="solved'.$counter.'_'.$partid.'" value="'.
@@ -1676,7 +1721,6 @@ sub gradeBox {
         $$record{'resource.'.$partid.'.tries'}.'" />'."\n".
         '<input type="hidden" name="aggtries'.$counter.'_'.$partid.'" value="'.
         $aggtries.'" />'."\n";
-    $result.='</td></tr></table>'."\n";
     $result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record);
     return $result;
 }
@@ -1708,7 +1752,7 @@ sub handback_box {
     			 '<span class="LC_filename">'.$file_disp.'</span>');
     	        $result.='<input type="file"   name="'.$prefix.'returndoc'.$file_counter.'" />'."\n";
     	        $result.='<input type="hidden" name="'.$prefix.'origdoc'.$file_counter.'" value="'.$file.'" /><br />';
-    	        $result.='(File will be uploaded when you click on Save &amp; Next below.)<br />';
+    	        $result.='('.&mt('File will be uploaded when you click on Save &amp; Next below.').')<br />';
     	        $file_counter++;
 	    }
 	}
@@ -1854,8 +1898,8 @@ sub submission {
 	if ($env{'form.handgrade'} eq 'yes' && &files_exist($request, $symb)) {
 	    &download_all_link($request, $symb);
 	}
-	$request->print('<h3>&nbsp;<span class="LC_info">Submission Record</span></h3>'."\n".
-			'<h4>&nbsp;<b>Resource: </b>'.$env{'form.probTitle'}.'</h4>'."\n");
+	$request->print('<h3>&nbsp;<span class="LC_info">'.&mt('Submission Record').'</span></h3>'."\n".
+			'<h4>&nbsp;'.&mt('<b>Resource: </b> [_1]',$env{'form.probTitle'}).'</h4>'."\n");
 
 	# option to display problem, only once else it cause problems 
         # with the form later since the problem has a form.
@@ -2220,7 +2264,7 @@ KEYWORDS
     # print end of form
     if ($counter == $total) {
 	my $endform='<table border="0"><tr><td>'."\n";
-	$endform.='<input type="button" value="Save & Next" '.
+	$endform.='<input type="button" value="'.&mt('Save &amp; Next').'" '.
 	    'onClick="javascript:checksubmit(this.form,\'Save & Next\','.
 	    $total.','.scalar(@partlist).');" target="_self" /> &nbsp;'."\n";
 	my $ntstu ='<select name="NTSTU">'.
@@ -2229,15 +2273,15 @@ KEYWORDS
 	    '<option>7</option><option>10</option></select>'."\n";
 	my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1');
 	$ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</;
-	$endform.=$ntstu.'student(s) &nbsp;&nbsp;';
-	$endform.='<input type="button" value="Previous" '.
+	$endform.=&mt('[_1]student(s)',$ntstu);
+	$endform.='&nbsp;&nbsp;<input type="button" value="'.&mt('Previous').'" '.
 	    'onClick="javascript:checksubmit(this.form,\'Previous\');" target="_self" /> &nbsp;'."\n".
-	    '<input type="button" value="Next" '.
+	    '<input type="button" value="'.&mt('Next').'" '.
 	    'onClick="javascript:checksubmit(this.form,\'Next\');" target="_self" /> &nbsp;';
-	$endform.='(Next and Previous (student) do not save the scores.)'."\n" ;
+	$endform.=&mt('(Next and Previous (student) do not save the scores.)')."\n" ;
         $endform.="<input type='hidden' value='".&get_increment().
             "' name='increment' />";
-	$endform.='</td><tr></table></form>';
+	$endform.='</td></tr></table></form>';
 	$endform.=&show_grading_menu_form($symb);
 	$request->print($endform);
     }
@@ -2576,9 +2620,9 @@ sub processHandGrade {
 	$ctr++;
     }
     if ($total < 0) {
-	my $the_end = '<h3><span class="LC_info">LON-CAPA User Message</span></h3><br />'."\n";
-	$the_end.='<b>Message: </b> No more students for this section or class.<br /><br />'."\n";
-	$the_end.='Click on the button below to return to the grading menu.<br /><br />'."\n";
+	my $the_end = '<h3><span class="LC_info">'.&mt('LON-CAPA User Message').'</span></h3><br />'."\n";
+	$the_end.=&mt('<b>Message: </b> No more students for this section or class.').'<br /><br />'."\n";
+	$the_end.=&mt('Click on the button below to return to the grading menu.').'<br /><br />'."\n";
 	$the_end.=&show_grading_menu_form($symb);
 	$request->print($the_end);
     }
@@ -3149,7 +3193,7 @@ sub viewgrades {
     &Apache::lonnet::clear_EXT_cache_status();
 
     my $result='<h3><span class="LC_info">'.&mt('Manual Grading').'</span></h3>';
-    $result.='<h4><b>Current Resource: </b>'.$env{'form.probTitle'}.'</h4>'."\n";
+    $result.='<h4>'.&mt('<b>Current Resource: </b>[_1]',$env{'form.probTitle'}).'</h4>'."\n";
 
     #view individual student submission form - called using Javascript viewOneStudent
     $result.=&jscriptNform($symb);
@@ -3167,13 +3211,15 @@ sub viewgrades {
     my $sectionClass;
     my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
     if ($env{'form.section'} eq 'all') {
-	$sectionClass='Class </h3>';
+	$sectionClass='Class';
     } elsif ($env{'form.section'} eq 'none') {
-	$sectionClass=&mt('Students in no Section').'</h3>';
+	$sectionClass='Students in no Section';
     } else {
-	$sectionClass=&mt('Students in Section(s) [_1]',$section_display).'</h3>';
+	$sectionClass='Students in Section(s) [_1]';
     }
-    $result.='<h3>'.&mt('Assign Common Grade To [_1]',$sectionClass);
+    $result.=
+	'<h3>'.
+	&mt("Assign Common Grade To $sectionClass",$section_display).'</h3>';
     $result.= &Apache::loncommon::start_data_table();
     #radio buttons/text box for assigning points for a section or class.
     #handles different parts of a problem
@@ -3191,48 +3237,52 @@ sub viewgrades {
 	my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);
 	$weight{$partid} = $wgt eq '' ? '1' : $wgt;
 
-	$result.=&Apache::loncommon::start_data_table_row().'<td>';
-	$result.='<input type="hidden" name="partid_'.
-	    $ctsparts.'" value="'.$partid.'" />'."\n";
-	$result.='<input type="hidden" name="weight_'.
-	    $partid.'" value="'.$weight{$partid}.'" />'."\n";
 	my $display_part=&get_display_part($partid,$symb);
-	$result.=
-	    '<b>Part:</b> '.$display_part.'&nbsp; &nbsp;<b>Point:</b> </td><td>';
-	$result.='<table border="0"><tr>';  
+	my $radio.='<table border="0"><tr>';  
 	my $ctr = 0;
 	while ($ctr<=$weight{$partid}) { # display radio buttons in a nice table 10 across
-	    $result.= '<td><label><input type="radio" name="RADVAL_'.$partid.'" '.
+	    $radio.= '<td><label><input type="radio" name="RADVAL_'.$partid.'" '.
 		'onclick="javascript:writePoint(\''.$partid.'\','.$weight{$partid}.
 		','.$ctr.')" />'.$ctr."</label></td>\n";
 	    $result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
 	    $ctr++;
 	}
-	$result.='</tr></table>';
-	$result.= '</td><td><b> or </b><input type="text" name="TEXTVAL_'.
+	$radio.='</tr></table>';
+	my $line = '<input type="text" name="TEXTVAL_'.
 	    $partid.'" size="4" '.'onChange="javascript:writePoint(\''.
 		$partid.'\','.$weight{$partid}.',\'textval\')" /> /'.
 	    $weight{$partid}.' (problem weight)</td>'."\n";
-	$result.= '<td><select name="SELVAL_'.$partid.'"'.
+	$line.= '<td><select name="SELVAL_'.$partid.'"'.
 	    'onChange="javascript:writeRadText(\''.$partid.'\','.
 		$weight{$partid}.')"> '.
 	    '<option selected="selected"> </option>'.
-	    '<option>excused</option>'.
-	    '<option>reset status</option></select></td>'.
-            '<td><label><input type="checkbox" name="FORCE_'.$partid.'" /> Override "Correct"</label></td>'.&Apache::loncommon::end_data_table_row()."\n";
+	    '<option value="excused">'.&mt('excused').'</option>'.
+	    '<option value="reset status">'.&mt('reset status').'</option>'.
+	    '</select></td>'.
+            '<td><label><input type="checkbox" name="FORCE_'.$partid.'" />'.&mt('Override "Correct"').'</label>';
+	$line.='<input type="hidden" name="partid_'.
+	    $ctsparts.'" value="'.$partid.'" />'."\n";
+	$line.='<input type="hidden" name="weight_'.
+	    $partid.'" value="'.$weight{$partid}.'" />'."\n";
+
+	$result.=
+	    &Apache::loncommon::start_data_table_row()."\n".
+	    &mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line).
+	    &Apache::loncommon::end_data_table_row()."\n";
 	$ctsparts++;
     }
     $result.=&Apache::loncommon::end_data_table()."\n".
 	'<input type="hidden" name="totalparts" value="'.$ctsparts.'" />';
-    $result.='<input type="button" value="Revert to Default" '.
+    $result.='<input type="button" value="'.&mt('Revert to Default').'" '.
 	'onClick="javascript:resetEntry('.$ctsparts.');" />';
 
     #table listing all the students in a section/class
     #header of table
-    $result.= '<h3>Assign Grade to Specific Students in '.$sectionClass;
+    $result.= '<h3>'.&mt('Assign Grade to Specific Students in '.$sectionClass,
+			 $section_display).'</h3>';
     $result.= &Apache::loncommon::start_data_table().
 	&Apache::loncommon::start_data_table_header_row().
-	'<th>No.</th>'.
+	'<th>'.&mt('No.').'</th>'.
 	'<th>'.&nameUserString('header')."</th>\n";
     my (@parts) = sort(&getpartlist($symb));
     my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
@@ -3245,13 +3295,20 @@ sub viewgrades {
         push(@partids, $partid);
 	my $display_part=&get_display_part($partid,$symb);
 	if ($display =~ /^Partial Credit Factor/) {
-	    $result.='<th>Score Part: '.$display_part.
-		' <br />(weight = '.$weight{$partid}.')</th>'."\n";
+	    $result.='<th>'.
+		&mt('Score Part: [_1]<br /> (weight = [_2])',
+		    $display_part,$weight{$partid}).'</th>'."\n";
 	    next;
+	    
 	} else {
-	    $display =~s/\[Part: \Q$partid\E\]/Part:<\/b> $display_part/;
+	    if ($display =~ /Problem Status/) {
+		my $grade_status_mt = &mt('Grade Status');
+		$display =~ s{Problem Status}{$grade_status_mt<br />};
+	    }
+	    my $part_mt = &mt('Part:');
+	    $display =~s{\[Part: \Q$partid\E\]}{$part_mt $display_part};
 	}
-	$display =~ s|Problem Status|Grade Status<br />|;
+
 	$result.='<th>'.$display.'</th>'."\n";
     }
     $result.=&Apache::loncommon::end_data_table_header_row();
@@ -3276,14 +3333,14 @@ sub viewgrades {
     }
     $result.=&Apache::loncommon::end_data_table();
     $result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";
-    $result.='<input type="button" value="Save" '.
+    $result.='<input type="button" value="'.&mt('Save').'" '.
 	'onClick="javascript:submit();" target="_self" /></form>'."\n";
     if (scalar(%$fullname) eq 0) {
 	my $colspan=3+scalar(@parts);
 	my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
         my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status'));
 	$result='<span class="LC_warning">'.
-	    &mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade',
+	    &mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade.',
 	        $section_display, $stu_status).
 	    '</span>';
     }
@@ -3339,9 +3396,9 @@ sub viewstudentgrade {
 	    $result.='&nbsp;<select name="'.
 		'GD_'.$student.'_'.$part.'_solved" '.
 		'onChange="javascript:changeOneScore(\''.$part.'\',\''.$student.'\')" >'."\n";
-	    $result.= (($status eq 'excused') ? '<option> </option><option selected="selected">excused</option>' 
-		: '<option selected="selected"> </option><option>excused</option>')."\n";
-	    $result.='<option>reset status</option>';
+	    $result.= (($status eq 'excused') ? '<option> </option><option selected="selected" value="excused">'.&mt('excused').'</option>' 
+		: '<option selected="selected"> </option><option value="excused">'.&mt('excused').'</option>')."\n";
+	    $result.='<option value="reset status">'.&mt('reset status').'</option>';
 	    $result.="</select>&nbsp;</td>\n";
 	} else {
 	    $result.='<input type="hidden" name="'.
@@ -4049,23 +4106,25 @@ LISTJAVASCRIPT
     my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
 
     my $result='<h3><span class="LC_info">&nbsp;'.
-	'Manual Grading by Page or Sequence</span></h3>';
+	&mt('Manual Grading by Page or Sequence').'</span></h3>';
 
     $result.='<form action="/adm/grades" method="post" name="displayPage">'."\n";
-    $result.='&nbsp;<b>Problems from:</b> <select name="selectpage">'."\n";
     my ($titles,$symbx) = &getSymbMap();
     my ($curpage) =&Apache::lonnet::decode_symb($symb); 
 #    my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb); 
 #    my $type=($curpage =~ /\.(page|sequence)/);
+    my $select = '<select name="selectpage">'."\n";
     my $ctr=0;
     foreach (@$titles) {
 	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
-	$result.='<option value="'.$ctr.'" '.
+	$select.='<option value="'.$ctr.'" '.
 	    ($$symbx{$_} =~ /$curpage$/ ? 'selected="selected"' : '').
 	    '>'.$showtitle.'</option>'."\n";
 	$ctr++;
     }
-    $result.= '</select>'."<br />\n";
+    $select.= '</select>';
+    $result.=&mt('&nbsp;<b>Problems from:</b> [_1]',$select)."<br />\n";
+
     $ctr=0;
     foreach (@$titles) {
 	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
@@ -4076,13 +4135,16 @@ LISTJAVASCRIPT
     $result.='<input type="hidden" name="page" />'."\n".
 	'<input type="hidden" name="title" />'."\n";
 
-    $result.='&nbsp;<b>View Problems Text: </b><label><input type="radio" name="vProb" value="no" checked="checked" /> no </label>'."\n".
-	'<label><input type="radio" name="vProb" value="yes" /> yes </label>'."<br />\n";
-
-    $result.='&nbsp;<b>Submission Details: </b>'.
-	'<label><input type="radio" name="lastSub" value="none" /> none</label>'."\n".
-	'<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> by dates and submissions</label>'."\n".
-	'<label><input type="radio" name="lastSub" value="all" /> all details</label>'."\n";
+    my $options =
+	'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n".
+	'<label><input type="radio" name="vProb" value="yes" /> '.&mt('yes').' </label>'."<br />\n";
+    $result.='&nbsp;'.&mt('<b>View Problems Text: </b> [_1]',$options);
+
+    $options =
+	'<label><input type="radio" name="lastSub" value="none" /> '.&mt('none').' </label>'."\n".
+	'<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> '.&mt('by dates and submissions').'</label>'."\n".
+	'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').' </label>'."\n";
+    $result.='&nbsp;'.&mt('<b>Submission Details: </b>[_1]',$options);
     
     $result.=&build_section_inputs();
     my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
@@ -4091,21 +4153,23 @@ LISTJAVASCRIPT
 	'<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
 	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n";
 
-    $result.='&nbsp;<b>'.&mt('Use CODE:').' </b>'.
-	'<input type="text" name="CODE" value="" /><br />'."\n";
+    $result.='&nbsp;'.&mt('<b>Use CODE: [_1] </b>',
+			  '<input type="text" name="CODE" value="" />').
+			      '<br />'."\n";
 
     $result.='&nbsp;<input type="button" '.
-	'onClick="javascript:checkPickOne(this.form);"value="Next->" /><br />'."\n";
+	'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next-&gt;').'" /><br />'."\n";
 
     $request->print($result);
 
-    my $studentTable.='&nbsp;<b>Select a student you wish to grade and then click on the Next button.</b><br />'.
-	'<table border="0"><tr><td bgcolor="#777777">'.
-	'<table border="0"><tr bgcolor="#e6ffff">'.
-	'<td align="right">&nbsp;<b>No.</b></td>'.
-	'<td>'.&nameUserString('header').'</td>'.
-	'<td align="right">&nbsp;<b>No.</b></td>'.
-	'<td>'.&nameUserString('header').'</td></tr>';
+    my $studentTable.='&nbsp;<b>'.&mt('Select a student you wish to grade and then click on the Next button.').'</b><br />'.
+	&Apache::loncommon::start_data_table().
+	&Apache::loncommon::start_data_table_header_row().
+	'<th align="right">&nbsp;'.&mt('No.').'</th>'.
+	'<th>'.&nameUserString('header').'</th>'.
+	'<th align="right">&nbsp;'.&mt('No.').'</th>'.
+	'<th>'.&nameUserString('header').'</th>'.
+	&Apache::loncommon::end_data_table_header_row();
  
     my (undef,undef,$fullname) = &getclasslist($getsec,'1');
     my $ptr = 1;
@@ -4117,17 +4181,23 @@ LISTJAVASCRIPT
 			     return $a cmp $b;
 			 } (keys(%$fullname))) {
 	my ($uname,$udom) = split(/:/,$student);
-	$studentTable.=($ptr%2 == 1 ? '<tr bgcolor="#ffffe6">' : '</td>');
+	$studentTable.=($ptr%2==1 ? &Apache::loncommon::start_data_table_row()
+                                  : '</td>');
 	$studentTable.='<td align="right">'.$ptr.'&nbsp;</td>';
 	$studentTable.='<td>&nbsp;<label><input type="radio" name="student" value="'.$student.'" /> '
 	    .&nameUserString(undef,$$fullname{$student},$uname,$udom)."</label>\n";
-	$studentTable.=($ptr%2 == 0 ? '</td></tr>' : '');
+	$studentTable.=
+	    ($ptr%2 == 0 ? '</td>'.&Apache::loncommon::end_data_table_row() 
+                         : '');
 	$ptr++;
     }
-    $studentTable.='</td><td>&nbsp;</td><td>&nbsp;</td></tr>' if ($ptr%2 == 0);
-    $studentTable.='</table></td></tr></table>'."\n";
+    if ($ptr%2 == 0) {
+	$studentTable.='</td><td>&nbsp;</td><td>&nbsp;</td>'.
+	    &Apache::loncommon::end_data_table_row();
+    }
+    $studentTable.=&Apache::loncommon::end_data_table()."\n";
     $studentTable.='<input type="button" '.
-	'onClick="javascript:checkPickOne(this.form);"value="Next->" /></form>'."\n";
+	'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next-&gt;').'" /></form>'."\n";
 
     $studentTable.=&show_grading_menu_form($symb);
     $request->print($studentTable);
@@ -4179,15 +4249,15 @@ sub displayPage {
     &Apache::lonnet::clear_EXT_cache_status();
 
     if (!&canview($usec)) {
-	$request->print('<span class="LC_warning">Unable to view requested student.('.$env{'form.student'}.')</span>');
+	$request->print('<span class="LC_warning">'.&mt('Unable to view requested student. ([_1])',$env{'form.student'}).'</span>');
 	$request->print(&show_grading_menu_form($symb));
 	return;
     }
     my $result='<h3><span class="LC_info">&nbsp;'.$env{'form.title'}.'</span></h3>';
-    $result.='<h3>&nbsp;Student: '.&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom).
+    $result.='<h3>&nbsp;'.&mt('Student: [_1]',&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom)).
 	'</h3>'."\n";
     if (&Apache::lonnet::validCODE($env{'form.CODE'})) {
-	$result.='<h3>&nbsp;CODE: '.$env{'form.CODE'}.'</h3>'."\n";
+	$result.='<h3>&nbsp;'.&mt('CODE: [_1]',$env{'form.CODE'}).'</h3>'."\n";
     } else {
 	delete($env{'form.CODE'});
     }
@@ -4198,7 +4268,7 @@ sub displayPage {
     my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'});
     my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
     if (!$map) {
-	$request->print('<span class="LC_warning">Unable to view requested sequence. ('.$resUrl.')</span>');
+	$request->print('<span class="LC_warning">'.&mt('Unable to view requested sequence. ([_1])',$resUrl).'</span>');
 	$request->print(&show_grading_menu_form($symb));
 	return; 
     }
@@ -4220,15 +4290,14 @@ sub displayPage {
 	    '<input type="hidden" name="CODE" value="'.$env{'form.CODE'}.'" />'."\n";
     }
     my $checkIcon = '<img alt="'.&mt('Check Mark').
-	'" src="'.$request->dir_config('lonIconsURL').
-	'/check.gif" height="16" border="0" />';
+	'" src="'.&Apache::loncommon::lonhttpdurl($request->dir_config('lonIconsURL').'/check.gif').'" height="16" border="0" />';
 
-    $studentTable.='&nbsp;<b>Note:</b> Problems graded correct by the computer are marked with a '.$checkIcon.
-	' symbol.'."\n".
-	'<table border="0"><tr><td bgcolor="#777777">'.
-	'<table border="0"><tr bgcolor="#e6ffff">'.
-	'<td align="center"><b>&nbsp;Prob.&nbsp;</b></td>'.
-	'<td><b>&nbsp;'.($env{'form.vProb'} eq 'no' ? 'Title' : 'Problem Text').'/Grade</b></td></tr>';
+    $studentTable.='&nbsp;'.&mt('<b>Note:</b> Problems graded correct by the computer are marked with a [_1] symbol.',$checkIcon)."\n".
+	&Apache::loncommon::start_data_table().
+	&Apache::loncommon::start_data_table_header_row().
+	'<th align="center">&nbsp;Prob.&nbsp;</th>'.
+	'<th>&nbsp;'.($env{'form.vProb'} eq 'no' ? &mt('Title') : &mt('Problem Text')).'/'.&mt('Grade').'</th>'.
+	&Apache::loncommon::end_data_table_header_row();
 
     &Apache::lonxml::clear_problem_counter();
     my ($depth,$question,$prob) = (1,1,1);
@@ -4242,8 +4311,14 @@ sub displayPage {
 	    my $parts = $curRes->parts();
             my $title = $curRes->compTitle();
 	    my $symbx = $curRes->symb();
-	    $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.
-		(scalar(@{$parts}) == 1 ? '' : '<br />('.scalar(@{$parts}).'&nbsp;parts)').'</td>';
+	    $studentTable.=
+		&Apache::loncommon::start_data_table_row().
+		'<td align="center" valign="top" >'.$prob.
+		(scalar(@{$parts}) == 1 ? '' 
+		                        : '<br />('.&mt('[_1]&nbsp;parts)',
+							scalar(@{$parts}))
+		 ).
+		 '</td>';
 	    $studentTable.='<td valign="top">';
 	    my %form = ('CODE' => $env{'form.CODE'},);
 	    if ($env{'form.vProb'} eq 'yes' ) {
@@ -4258,14 +4333,14 @@ sub displayPage {
 #		    $request->print('match='.$1."<br />\n");
 #		}
 #		$companswer =~ s|<table border=\"1\">|<table border=\"0\">|g;
-		$studentTable.='&nbsp;<b>'.$title.'</b>&nbsp;<br />&nbsp;<b>Correct answer:</b><br />'.$companswer;
+		$studentTable.='&nbsp;<b>'.$title.'</b>&nbsp;<br />&nbsp;'.&mt('<b>Correct answer:</b><br />[_1]',$companswer);
 	    }
 
 	    my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);
 
 	    if ($env{'form.lastSub'} eq 'datesub') {
 		if ($record{'version'} eq '') {
-		    $studentTable.='<br />&nbsp;<span class="LC_warning">No recorded submission for this problem</span><br />';
+		    $studentTable.='<br />&nbsp;<span class="LC_warning">'.&mt('No recorded submission for this problem.').'</span><br />';
 		} else {
 		    my %responseType = ();
 		    foreach my $partid (@{$parts}) {
@@ -4301,8 +4376,8 @@ sub displayPage {
         $curRes = $iterator->next();
     }
 
-    $studentTable.='</table></td></tr></table>'."\n".
-	'<input type="button" value="Save" '.
+    $studentTable.='</table>'."\n".
+	'<input type="button" value="'.&mt('Save').'" '.
 	'onClick="javascript:checkSubmitPage(this.form,'.$question.');" />'.
 	'</form>'."\n";
     $studentTable.=&show_grading_menu_form($symb);
@@ -4382,13 +4457,13 @@ sub displaySubByDates {
 		}
 	    }
 	    if (exists($$record{"$where.$partid.checkedin"})) {
-		$displaySub[1].='Checked in by '.
-		    $$record{"$where.$partid.checkedin"}.' into slot '.
-		    $$record{"$where.$partid.checkedin.slot"}.
-		    '<br />';
+		$displaySub[1].=&mt('Checked in by [_1] into slot [_2]',
+				    $$record{"$where.$partid.checkedin"},
+				    $$record{"$where.$partid.checkedin.slot"}).
+					'<br />';
 	    }
 	    if (exists $$record{"$where.$partid.award"}) {
-		$displaySub[1].='<b>Part:</b>&nbsp;'.$display_part.' &nbsp;'.
+		$displaySub[1].='<b>'.&mt('Part:').'</b>&nbsp;'.$display_part.' &nbsp;'.
 		    lc($$record{"$where.$partid.award"}).' '.
 		    $mark{$$record{"$where.$partid.solved"}}.
 		    '<br />';
@@ -4450,12 +4525,14 @@ sub updateGradeByPage {
     my $iterator = $navmap->getIterator($map->map_start(),
 					$map->map_finish());
 
-    my $studentTable='<table border="0"><tr><td bgcolor="#777777">'.
-	'<table border="0"><tr bgcolor="#e6ffff">'.
-	'<td align="center"><b>&nbsp;Prob.&nbsp;</b></td>'.
-	'<td><b>&nbsp;Title&nbsp;</b></td>'.
-	'<td><b>&nbsp;Previous Score&nbsp;</b></td>'.
-	'<td><b>&nbsp;New Score&nbsp;</b></td></tr>';
+    my $studentTable=
+	&Apache::loncommon::start_data_table().
+	&Apache::loncommon::start_data_table_header_row().
+	'<th align="center">&nbsp;'.&mt('Prob.').'&nbsp;</th>'.
+	'<th>&nbsp;'.&mt('Title').'&nbsp;</th>'.
+	'<th>&nbsp;'.&mt('Previous Score').'&nbsp;</th>'.
+	'<th>&nbsp;'.&mt('New Score').'&nbsp;</th>'.
+	&Apache::loncommon::end_data_table_header_row();
 
     $iterator->next(); # skip the first BEGIN_MAP
     my $curRes = $iterator->next(); # for "current resource"
@@ -4468,8 +4545,12 @@ sub updateGradeByPage {
 	    my $parts = $curRes->parts();
             my $title = $curRes->compTitle();
 	    my $symbx = $curRes->symb();
-	    $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.
-		(scalar(@{$parts}) == 1 ? '' : '<br />('.scalar(@{$parts}).'&nbsp;parts)').'</td>';
+	    $studentTable.=
+		&Apache::loncommon::start_data_table_row().
+		'<td align="center" valign="top" >'.$prob.
+		(scalar(@{$parts}) == 1 ? '' 
+                                        : '<br />('.&mt('[quant,_1,&nbsp;parts]',scalar(@{$parts}))
+		 ).')</td>';
 	    $studentTable.='<td valign="top">&nbsp;<b>'.$title.'</b>&nbsp;</td>';
 
 	    my %newrecord=();
@@ -4556,14 +4637,14 @@ sub updateGradeByPage {
 
 	    $studentTable.='<td valign="top">'.$displayPts[0].'</td>'.
 		'<td valign="top">'.$displayPts[1].'</td>'.
-		'</tr>';
+		&Apache::loncommon::end_data_table_row();
 
 	    $prob++;
 	}
         $curRes = $iterator->next();
     }
 
-    $studentTable.='</td></tr></table></td></tr></table>';
+    $studentTable.=&Apache::loncommon::end_data_table();
     $studentTable.=&show_grading_menu_form($env{'form.symb'});
     my $grademsg=($changeflag == 0 ? 'No score was changed or updated.' :
 		  'The scores were changed for '.
@@ -4820,52 +4901,48 @@ sub scantron_selectphase {
 
     # Chunk of form to prompt for a file to grade and how:
 
-    $result.= <<SCANTRONFORM;
-    <table width="100%" border="0">
-    <tr>
-     <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantron_process">
-      <td bgcolor="#777777">
-       <input type="hidden" name="command" value="scantron_warning" />
-        $default_form_data
-        <table width="100%" border="0">
-          <tr bgcolor="#e6ffff">
-            <td colspan="2">
-              &nbsp;<b>Specify file and which Folder/Sequence to grade</b>
-            </td>
-          </tr>
-          <tr bgcolor="#ffffe6">
-            <td> Sequence to grade: </td><td> $sequence_selector </td>
-          </tr>
-          <tr bgcolor="#ffffe6">
-            <td> Filename of scoring office file: </td><td> $file_selector </td>
-          </tr>
-          <tr bgcolor="#ffffe6">
-            <td> Format of data file: </td><td> $format_selector </td>
-          </tr>
-          <tr bgcolor="#ffffe6">
-            <td> Saved CODEs to validate against: </td><td> $CODE_selector</td>
-          </tr>
-          <tr bgcolor="#ffffe6">
-            <td> Each CODE is only to be used once:</td><td> $CODE_unique </td>
-          </tr>
-          <tr bgcolor="#ffffe6">
+    $result.= '
+    <br />
+    <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantron_process">
+    <input type="hidden" name="command" value="scantron_warning" />
+    '.$default_form_data.'
+    '.&Apache::loncommon::start_data_table('LC_scantron_action').'
+       '.&Apache::loncommon::start_data_table_header_row().'
+            <th colspan="2">
+              &nbsp;Specify file and which Folder/Sequence to grade
+            </th>
+       '.&Apache::loncommon::end_data_table_header_row().'
+       '.&Apache::loncommon::start_data_table_row().'
+            <td> Sequence to grade: </td><td> '.$sequence_selector.' </td>
+       '.&Apache::loncommon::end_data_table_row().'
+       '.&Apache::loncommon::start_data_table_row().'
+            <td> Filename of scoring office file: </td><td> '.$file_selector.' </td>
+       '.&Apache::loncommon::end_data_table_row().'
+       '.&Apache::loncommon::start_data_table_row().'
+            <td> Format of data file: </td><td> '.$format_selector.' </td>
+       '.&Apache::loncommon::end_data_table_row().'
+       '.&Apache::loncommon::start_data_table_row().'
+            <td> Saved CODEs to validate against: </td><td> '.$CODE_selector.' </td>
+       '.&Apache::loncommon::end_data_table_row().'
+       '.&Apache::loncommon::start_data_table_row().'
+            <td> Each CODE is only to be used once:</td><td> '.$CODE_unique.' </td>
+       '.&Apache::loncommon::end_data_table_row().'
+       '.&Apache::loncommon::start_data_table_row().'
 	    <td> Options: </td>
             <td>
 	       <label><input type="checkbox" name="scantron_options_redo" value="redo_skipped"/> Do only previously skipped records</label> <br />
                <label><input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> Remove all existing corrections</label> <br />
                <label><input type="checkbox" name="scantron_options_hidden" value="ignore_hidden"/> Skip hidden resources when grading</label>
 	    </td>
-          </tr>
-          <tr bgcolor="#ffffe6">
+       '.&Apache::loncommon::end_data_table_row().'
+       '.&Apache::loncommon::start_data_table_row().'
             <td colspan="2">
               <input type="submit" value="Grading: Validate Scantron Records" />
             </td>
-          </tr>
-        </table>
-       </td>
-     </form>
-    </tr>
-SCANTRONFORM
+       '.&Apache::loncommon::end_data_table_row().'
+    '.&Apache::loncommon::end_data_table().'
+    </form>
+';
    
     $r->print($result);
 
@@ -4874,18 +4951,17 @@ SCANTRONFORM
 
 	# Chunk of form to prompt for a scantron file upload.
 
-        $r->print(<<SCANTRONFORM);
-    <tr>
-      <td bgcolor="#777777">
-        <table width="100%" border="0">
-          <tr bgcolor="#e6ffff">
-            <td>
-              &nbsp;<b>Specify a Scantron data file to upload.</b>
-            </td>
-          </tr>
-          <tr bgcolor="#ffffe6">
+        $r->print('
+    <br />
+    '.&Apache::loncommon::start_data_table('LC_scantron_action').'
+       '.&Apache::loncommon::start_data_table_header_row().'
+            <th>
+              &nbsp;Specify a Scantron data file to upload.
+            </th>
+       '.&Apache::loncommon::end_data_table_header_row().'
+       '.&Apache::loncommon::start_data_table_row().'
             <td>
-SCANTRONFORM
+');
     my $default_form_data=&defaultFormData(&get_symb($r,1));
     my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'};
@@ -4911,47 +4987,38 @@ SCANTRONFORM
               </form>
 UPLOAD
 
-        $r->print(<<SCANTRONFORM);
+        $r->print('
             </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-SCANTRONFORM
+       '.&Apache::loncommon::end_data_table_row().'
+       '.&Apache::loncommon::end_data_table().'
+');
     }
 
     # Chunk of the form that prompts to view a scoring office file,
     # corrected file, skipped records in a file.
 
-    $r->print(<<SCANTRONFORM);
-    <tr>
-      <form action='/adm/grades' name='scantron_download'>
-        <td bgcolor="#777777">
-	  $default_form_data
-          <input type="hidden" name="command" value="scantron_download" />
-          <table width="100%" border="0">
-            <tr bgcolor="#e6ffff">
-              <td colspan="2">
-                &nbsp;<b>Download a scoring office file</b>
-              </td>
-            </tr>
-            <tr bgcolor="#ffffe6">
-              <td> Filename of scoring office file: </td><td> $file_selector </td>
-            </tr>
-            <tr bgcolor="#ffffe6">
-              <td colspan="2">
+    $r->print('
+   <br />
+   <form action="/adm/grades" name="scantron_download">
+     '.$default_form_data.'
+     <input type="hidden" name="command" value="scantron_download" />
+     '.&Apache::loncommon::start_data_table('LC_scantron_action').'
+       '.&Apache::loncommon::start_data_table_header_row().'
+              <th>
+                &nbsp;Download a scoring office file
+              </th>
+       '.&Apache::loncommon::end_data_table_header_row().'
+       '.&Apache::loncommon::start_data_table_row().'
+              <td> Filename of scoring office file: '.$file_selector.' 
+                <br />
                 <input type="submit" value="Download: Show List of Associated Files" />
-              </td>
-            </tr>
-          </table>
-        </td>
-      </form>
-    </tr>
-SCANTRONFORM
+       '.&Apache::loncommon::end_data_table_row().'
+     '.&Apache::loncommon::end_data_table().'
+   </form>
+   <br />
+');
 
-    $r->print('<tr><td bgcolor="#777777">');
     &Apache::lonpickcode::code_list($r,2);
-    $r->print('</td></tr></table>');
     $r->print($grading_menu_button);
     return
 }
@@ -5150,14 +5217,14 @@ sub scantron_fixup_scanline {
 	}
     } elsif ($field eq 'answer') {
 	&scantron_get_maxbubble(); # Need the bubble counter info.
-	my $length=$scantron_config->{'Qlength'};
+	my $length =$scantron_config->{'Qlength'};
 	my $off=$scantron_config->{'Qoff'};
 	my $on=$scantron_config->{'Qon'};
-	my $answer=${off}x$length;
         my $question_number = $args->{'question'} -1;
         my $first_position  = $first_bubble_line{$question_number};
 	my $bubble_count    = $bubble_lines_per_response{$question_number};
         my $bubbles_per_line= $$scantron_config{'Qlength'};
+	my $answer=${off}x($bubbles_per_line*$bubble_count);
         my $final_answer;
         if ($$scantron_config{'Qon'} eq 'letter'  ||
 	    $$scantron_config{'Qon'} eq 'number') { 
@@ -5174,18 +5241,24 @@ sub scantron_fixup_scanline {
 		    my @alphabet=('A'..'Z');
 		    $answer=$alphabet[$bubble_number];
 		} elsif ($on eq 'number') {
-		    $answer=$args->$bubble_number+1;
+		    $answer= $bubble_number+1;
 		    if ($answer == 10) { $answer = '0'; }
 		} else {
-		    substr($answer,$args->{'response'},1)=$on;
+		    substr($answer,$bubble_number+$bubble_line*$bubbles_per_line,1)=$on;
+		    $final_answer = $answer;
 		}
 		&scan_data($scan_data,
 			   "$whichline.no_bubble.".$args->{'question'},undef,'1');
-		for (my $l = 0; $l < $bubble_count; $l++) {
-		    if ($l eq $bubble_line) {
-			$final_answer .= $answer;
-		    } else {
-			$final_answer .= ' ';
+		
+		# Positional notation already has the right final answer length..
+
+		if (($on eq 'letter') || ($on eq 'number')) {
+		    for (my $l = 0; $l < $bubble_count; $l++) {
+			if ($l eq $bubble_line) {
+			    $final_answer .= $answer;
+			} else {
+			    $final_answer .= ' ';
+			}
 		    }
 		}
 	    }
@@ -5193,7 +5266,7 @@ sub scantron_fixup_scanline {
 	    #substr($line,$where-1,$length)=$answer;
 	    substr($line, 
 		   $scantron_config->{'Qstart'}+$first_position-1,
-		   $bubbles_per_line) = $final_answer;
+		   $bubbles_per_line*$length) = $final_answer;
 	}
     }
     return $line;
@@ -5441,11 +5514,16 @@ sub scantron_parse_scanline {
 		if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
 		    push(@{$record{"scantron.missingerror"}},$questnum);
 		}
-	    } elsif (scalar(@array) lt 2) {
+		
+		#  If the bubble is not the last position, there will be
+		# 2 elements.  If it is the last position, there will be 1 element.
+
+	    } elsif (scalar(@array) le 2) {
 
 		my $location      = length($array[0]);
-		my $line_num      = $location / $$scantron_config{'Qlength'};
+		my $line_num      = int($location / $$scantron_config{'Qlength'});
 		my $bubble        = $alphabet[$location % $$scantron_config{'Qlength'}];
+		
 
 		for (my $ans = 0; $ans < $answers_needed; $ans++) {
 		    if ($ans eq $line_num) {
@@ -7342,13 +7420,14 @@ sub grading_menu {
                 $menudata->{'url'}.'" >'.
                 $menudata->{'name'}."</a></h3>\n";
         } else {
-            $Str .='    <h3><input type="button" value="Verify Receipt" '.
+            $Str .='    <h3><input type="button" value="'.&mt('Verify Receipt').'" '.
                 $menudata->{'jscript'}.
                 ' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.
                 ' /></h3>';
             $Str .= ('&nbsp;'x8).
-                    ' receipt: '.&Apache::lonnet::recprefix($env{'request.course.id'}).
-                    '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />';
+		&mt(' receipt: [_1]',
+		    &Apache::lonnet::recprefix($env{'request.course.id'}).
+                    '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />');
         }
         $Str .= '    '.('&nbsp;'x8).$menudata->{'short_description'}.
             "\n";