--- loncom/interface/lonprintout.pm	2007/08/29 00:55:37	1.507
+++ loncom/interface/lonprintout.pm	2007/10/11 22:49:49	1.510
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.507 2007/08/29 00:55:37 albertel Exp $
+# $Id: lonprintout.pm,v 1.510 2007/10/11 22:49:49 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1969,10 +1969,7 @@ ENDPART
     }
 
     my $URLback=''; #link to original document
-    if ($helper->{'VARS'}->{'construction'} ne '1') {
-	#prints published resource
-	$URLback=&escape('/adm/flip?postdata=return:');
-    } else {
+    if ($helper->{'VARS'}->{'construction'} eq '1') {
 	#prints resource from the construction space
 	$URLback='/'.$helper->{'VARS'}->{'filename'};
 	if ($URLback=~/([^?]+)/) {
@@ -2235,7 +2232,7 @@ sub get_randomly_ordered_warning {
 	    sub { return ($_[0]->is_map() && $_[0]->randomorder); };
 	my @matches = $navmap->retrieveResources($res, $func,1,1,1);
 	if (@matches) {
-	    $message = "Some folders are set to be randomly ordered. When printing the contents of these folders will be printed in the original order for all students.";
+	    $message = "Some of the items below are in folders set to be randomly ordered. However, when printing the contents of these folders, they will be printed in the original order for all students, not the randomized order.";
 	}
     }
     if ($message) {
@@ -2470,8 +2467,8 @@ HELPERFRAGMENT
     if ($perm{'pfo'} &&  !$is_published  &&
         ($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) { 
 
-        push @{$printChoices}, ['Selected <b>Problems</b> from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
-	push @{$printChoices}, ['Selected <b>Resources</b> from <b>entire course</b>', 'all_resources', 'ALL_RESOURCES'];
+        push @{$printChoices}, [&mtn('Selected <b>Problems</b> from <b>entire course</b>'), 'all_problems', 'ALL_PROBLEMS'];
+	push @{$printChoices}, [&mtn('Selected <b>Resources</b> from <b>entire course</b>'), 'all_resources', 'ALL_RESOURCES'];
          &Apache::lonxml::xmlparse($r, 'helper', <<ALL_PROBLEMS);
   <state name="ALL_PROBLEMS" title="Select Problem(s) to print">
     <resource variable="RESOURCES" toponly='0' multichoice="1"
@@ -2823,7 +2820,7 @@ CHOOSE_FROM_SUBDIR
     # Allow the user to select any sequence in the course, feed it to
     # another resource selector for that sequence
     if (!$helper->{VARS}->{'construction'} && !$is_published) {
-	push @$printChoices, ["Selected <b>Resources</b> from <b>selected folder</b> in course",
+	push @$printChoices, [&mtn("Selected <b>Resources</b> from <b>selected folder</b> in course"),
 			      'select_sequences', 'CHOOSE_SEQUENCE'];
 	my $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'};
 	#Escape apostrophes and backslashes for Perl