[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonprintout.pm

[raeburn]

raeburn		Thu Aug  8 15:40:59 2013 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	lonprintout.pm 
  Log:
  - For 2.11
    - Backport 1.632, 1.634, 1.635
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.627.2.6 loncom/interface/lonprintout.pm:1.627.2.7
--- loncom/interface/lonprintout.pm:1.627.2.6	Wed Jun  5 14:16:18 2013
+++ loncom/interface/lonprintout.pm	Thu Aug  8 15:40:59 2013
@@ -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.7 2013/08/08 15:40:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3313,7 +3313,7 @@
 		 $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 +4141,13 @@
     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 +4312,7 @@
 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',