--- loncom/interface/lonprintout.pm	2022/06/11 15:50:09	1.680
+++ loncom/interface/lonprintout.pm	2023/01/17 00:13:55	1.684
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.680 2022/06/11 15:50:09 raeburn Exp $
+# $Id: lonprintout.pm,v 1.684 2023/01/17 00:13:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4562,7 +4562,8 @@ sub printHelper {
 	# BZ 5209 - incomplete problems from entire course:
 
 	push(@{$printChoices},
-	     [&mtn('Selected <b>Incomplete Problems</b> from <b>entire course</b> for selected people'),
+	     [&mt('Selected [_1]Incomplete Problems[_2] from [_3]entire course[_4] for [_5]selected people[_6]',
+              '<b>','</b>','<b>','</b>','<b>','</b>'),
 	      'incomplete_problems_selpeople_course', 'INCOMPLETE_PROBLEMS_COURSE_RESOURCES']);
 	my $helperFragment = &create_incomplete_course_helper($helper); # Create needed states.
 
@@ -4570,9 +4571,9 @@ sub printHelper {
 
 	#  Selected problems/resources from entire course:
 
-        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'];
-	push @{$printChoices}, [&mtn('Selected <b>Problems</b> from <b>entire course</b> for <b>selected people</b>'), 'all_problems_students', 'ALL_PROBLEMS_STUDENTS'];
+        push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from [_3]entire course[_4]','<b>','</b>','<b>','</b>'), 'all_problems', 'ALL_PROBLEMS'];
+	push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from [_3]entire course[_4]','<b>','</b>','<b>','</b>'), 'all_resources', 'ALL_RESOURCES'];
+	push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from [_3]entire course[_4] for [_5]selected people[_6]','<b>','</b>','<b>','</b>','<b>','</b>'), 'all_problems_students', 'ALL_PROBLEMS_STUDENTS'];
 my $suffixXml = <<ALL_PROBLEMS;
   <state name="STUDENTS1" title="Select People">
       <message><b>Select sorting order of printout</b> </message>
@@ -4788,8 +4789,9 @@ CHOOSE_FROM_SUBDIR
     # another resource selector for that sequence
     if ((!$helper->{VARS}->{'construction'}) &&
         (!$is_published || (($subdir eq '') && ($url eq '/adm/navmaps')))) {
-        push @$printChoices, [&mtn("Selected <b>Resources</b> from <b>selected folder</b> in course"),
-                              'select_sequences', 'CHOOSE_SEQUENCE'];
+        push(@$printChoices,[&mt('Selected [_1]Resources[_2] from [_3]selected folder[_4] in course',
+                                 '<b>','</b>','<b>','</b>'),
+                             'select_sequences','CHOOSE_SEQUENCE']);
         my $escapedSequenceName;
         if ($helper->{VARS}->{'SEQUENCE'} ne '') {
             $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'};
@@ -4804,7 +4806,9 @@ CHOOSE_FROM_SUBDIR
         #Escape apostrophes and backslashes for Perl
         $escapedSequenceName =~ s/\\/\\\\/g;
         $escapedSequenceName =~ s/'/\\'/g;
+        my $nocurrloc;
         if (($subdir eq '') && ($url eq '/adm/navmaps')) {
+            $nocurrloc = 'nocurrloc="1"';
             if ($perm{'pfo'}) {
                 push(@{$printChoices},
                     [&mt('Selected [_1]Problems[_2] from [_3]selected folder[_4] in course for [_5]selected people[_6]',
@@ -4818,18 +4822,10 @@ CHOOSE_FROM_SUBDIR
                          'select_sequences_resources_for_students','CHOOSE_SEQUENCE_STUDENTS1'],
                     [&mt('Selected [_1]Resources[_2] from [_3]selected folder[_4] in course for [_5]CODEd assignments[_6]',
                          '<b>','</b>','<b>','</b>','<b>','</b>'),
-                         'select_sequences_resources_for_anon','CHOOSE_SEQUENCE_ANON2'],
-                    [&mt('Selected [_1]Resources[_2] from [_3]selected folder[_4] in course',
-                         '<b>','</b>','<b>','</b>'),
-                         'select_sequences','CHOOSE_SEQUENCE']);
+                         'select_sequences_resources_for_anon','CHOOSE_SEQUENCE_ANON2']);
                 if ($escapedSequenceName) {
                     &generate_common_choosers($r,$helper,$escapedSequenceName,$escapedSequenceName,$isProblem,$symbFilter,$start_new_option);
                 }
-            } else {
-                push(@{$printChoices},
-                [&mt('Selected [_1]Resources[_2] from [_3]selected folder[_4] in course',
-                     '<b>','</b>','<b>','</b>'),
-                     'select_sequences','CHOOSE_SEQUENCE']);
             }
         }
         if (($subdir eq '') && ($url eq '/adm/navmaps') && ($perm{'pfo'})) {
@@ -4887,7 +4883,7 @@ CHOOSE_FROM_SUBDIR
   <state name="CHOOSE_FROM_ANY_SEQUENCE" title="Select Resources To Print">
     <message>(mark desired resources then click "next" button) <br /></message>
     <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
-              closeallpages="1" modallink="1">
+              closeallpages="1" modallink="1" suppressNavmap="1" $nocurrloc>
       <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isNotMap</filterfunc>
       <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
@@ -4911,7 +4907,7 @@ CHOOSE_FROM_ANY_SEQUENCE
   <state name="CHOOSE_FROM_ANY_SEQUENCE" title="Select Resources To Print">
     <message>(mark desired resources then click "next" button) <br /></message>
     <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
-              closeallpages="1" modallink="1">
+              closeallpages="1" modallink="1" suppressNavmap="1" $nocurrloc>
       <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isNotMap</filterfunc>
       <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>