--- loncom/interface/lonprintout.pm	2013/06/05 14:16:18	1.627.2.6
+++ loncom/interface/lonprintout.pm	2013/08/28 14:31:54	1.627.2.8
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.627.2.6 2013/06/05 14:16:18 raeburn Exp $
+# $Id: lonprintout.pm,v 1.627.2.8 2013/08/28 14:31:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1231,6 +1231,7 @@ sub is_code_valid {
     my ($code_type, $code_length) = ('letter', 6);	# defaults.
     my @lines = &Apache::grades::get_scantronformat_file();
     foreach my $line (@lines) {
+        next if (($line =~ /^\#/) || ($line eq ''));
 	my ($name, $type, $length) = (split(/:/, $line))[0,2,4];
 	if($name eq $code_option) {
 	    $code_length = $length;
@@ -3313,7 +3314,7 @@ ENDPART
 		 $moreenv{'CODE'}=&num_to_letters($code);
 	     }
              my $actual_seq = \@master_seq;
-             if ($randomorder) {
+             if ($randomorder || $randompick) {
                  $env{'form.CODE'} = $moreenv{'CODE'};
                  $actual_seq = master_seq_to_person_seq($map, \@master_seq,
                                                         undef,
@@ -4141,13 +4142,13 @@ sub printHelper {
     my $start_new_option;
     if ($perm{'pav'}) {
 	$start_new_option = 
-	    "<option text='".&mt('Start new page<br />before selected').
+	    "<option text='".&mt('Start new page[_1]before selected','<br />').
 	    "' variable='FINISHPAGE' />".
-	    "<option text='".&mt('Extra space<br />before selected').
+	    "<option text='".&mt('Extra space[_1]before selected','<br />').
 	    "' variable='EXTRASPACE' type='text' />" .
 	    "<option " .
 	    "' variable='POSSIBLE_RESOURCES' type='hidden' />".
-	    "<option text='".&mt('Space units<br />check for mm').
+	    "<option text='".&mt('Space units[_1]check for mm','<br />').
 	    "' variable='EXTRASPACE_UNITS' type='checkbox' />"
 	    ;
 	    
@@ -4312,7 +4313,7 @@ my $suffixXml = <<ALL_PROBLEMS;
 ALL_PROBLEMS
          &Apache::lonxml::xmlparse($r, 'helper', 
 				   &generate_resource_chooser('ALL_PROBLEMS',
-							      'SelectProblem(s) to print',
+							      'Select Problem(s) to print',
 							      'multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1"',
 							      'RESOURCES',
 							      'PAGESIZE',