--- loncom/interface/loncoursegroups.pm	2008/12/16 23:17:12	1.80.2.1
+++ loncom/interface/loncoursegroups.pm	2008/12/16 16:44:28	1.84
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursegroups.pm,v 1.80.2.1 2008/12/16 23:17:12 raeburn Exp $
+# $Id: loncoursegroups.pm,v 1.84 2008/12/16 16:44:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -76,10 +76,10 @@ sub handler {
 
     my %functions = (
                       email => 'E-mail',
-                      discussion => 'Discussion boards',
+                      discussion => 'Discussion Boards',
                       chat => 'Chat',
-                      files => 'File repository',
-                      roster => 'Membership roster',
+                      files => 'File Repository',
+                      roster => 'Membership Roster',
                       homepage => $ucgpterm.' home page',
                     );
 
@@ -1668,8 +1668,8 @@ END
        <td class="LC_description">'.&mt('Granularity:').'</td>
        <td colspan="10">'.$lt{'doyo'}.'&nbsp;<label><input type="radio" name="granularity" value="Yes" />'.&mt('Yes').'</label>&nbsp;<label><input type="radio" name="granularity" value="No" checked="checked" />'.&mt('No').'</label>');
     if ($action eq 'modify') {
-        $r->print('&nbsp;&nbsp;('.&mt('Currently set to "[_1]"',
-                                      &mt($$stored{'granularity'})).')');
+        $r->print('&nbsp;&nbsp;('.&mt('Currently set to [_1].'
+                                      ,'"'.&mt($$stored{'granularity'}).'"').')');
     }
     $r->print('
        </td>
@@ -3509,7 +3509,6 @@ sub mapping_options {
         'adds'  => "If automatic $gpterm enrollment is enabled, when a user is newly assigned a ".lc($crstype)."-wide or section-specific role, he/she will automatically be added as a member of the $gpterm, with start and end access dates defined by the default dates set for the $gpterm, unless he/she is already a $gpterm member, with access dates that permit either current or future $gpterm access.",
         'drops'  => "If automatic $gpterm disenrollment is enabled, when a user's role is expired, access to the $gpterm will be terminated unless the user continues to have other ".lc($crstype)."-wide or section-specific active or future roles which receive automatic membership in the $gpterm.",
         'pirs' => "Pick roles and sections for automatic $gpterm enrollment",
-        'curr' => 'Currently set to',
         'on' => 'on',
         'off' => 'off',
         'auad' => "Automatically enable $gpterm membership when roles are added?",
@@ -3537,14 +3536,14 @@ sub automapping {
    <span class="LC_nobreak">'.$$lt{'auad'}.':&nbsp;
     <label><input type="radio" name="autoadd" value="on" />'.&mt('on').'&nbsp;&nbsp;</label><label><input type="radio" name="autoadd" value="off" checked="checked" />'.&mt('off').'</label>');
     if ($action eq 'modify') {
-        $r->print('&nbsp;&nbsp;&nbsp;&nbsp;('.$$lt{'curr'}.' <b>'.$$lt{$add}.'</b>)');
+        $r->print('&nbsp;&nbsp;&nbsp;&nbsp;('.&mt('Currently set to [_1].','<b>'.$$lt{$add}.'</b>').')');
     }
     $r->print('
     </span><br />
     <span class="LC_nobreak">'.$$lt{'auex'}.':&nbsp;
     <label><input type="radio" name="autodrop" value="on" />'.&mt('on').'&nbsp;&nbsp;</label><label><input type="radio" name="autodrop" value="off" checked="checked" />'.&mt('off').'</label>');
     if ($action eq 'modify') {
-        $r->print('&nbsp;&nbsp;&nbsp;&nbsp;('.$$lt{'curr'}.' <b>'.$$lt{$drop}.'</b>)');
+        $r->print('&nbsp;&nbsp;&nbsp;&nbsp;('.&mt('Currently set to [_1].','<b>'.$$lt{$drop}.'</b>').')');
     }
     $r->print('</span><br /><br />'.$$lt{'mapr'});
 }
@@ -3787,7 +3786,7 @@ sub add_group_folder {
                     if ($delresult ne 'ok') {
                         $warning = $delresult;
                     }
-                    return $outcome;
+                    return $outcome.$warning;
                 }
             }
             my $delresult = &release_folder_lock($cdom,$cnum,'group_allfolders');
@@ -3797,7 +3796,7 @@ sub add_group_folder {
         } else {
             $outcome = '<span class="LC_error">'
                       .&mt('Could not obtain exclusive lock to check status of the folder for all groups. No group folder added.')
-                      .'</div>';
+                      .'</span>';
             return $outcome;
         }
         my $grpfolder = &mt($ucgpterm.' Folder - [_1]',$description);