--- loncom/interface/lonmsgdisplay.pm	2013/07/15 16:13:21	1.163
+++ loncom/interface/lonmsgdisplay.pm	2013/08/30 13:40:49	1.168
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.163 2013/07/15 16:13:21 bisitz Exp $
+# $Id: lonmsgdisplay.pm,v 1.168 2013/08/30 13:40:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -128,11 +128,8 @@ sub folderlist {
                 go   => 'Go',
                 nnff => 'New Name for Folder',
                 newn => 'New Name',
-                thfm => 'The folder may not be renamed',
-                fmnb => 'folder may not be renamed as it is a folder provided by the system.',
-                asth => 'as this name is already in use for a system-provided or user-defined folder.',
-                the => 'The',
-                tnfm => 'The new folder may not be named',
+                fmnb => 'Folder may not be renamed as it is a folder provided by the system.',
+                asth => 'Requested name already in use for a system-provided or user-defined folder.',
 
     );
 
@@ -182,7 +179,7 @@ function folder_choice(targetform,caller
         if (targetform.folderaction.options[targetform.folderaction.selectedIndex].value == 'rename') {
             for (var i=0; i<permfolders_keys.length; i++) {
                 if (permfolders_keys[i] == targetform.folder.value) {
-                    alert("$lt{'the'} '"+permfolders_vals[i]+"' $lt{'fmnb'}");
+                    alert("'"+permfolders_vals[i]+"' -- $lt{'fmnb'}");
                     return;
                 }
             }
@@ -191,7 +188,7 @@ function folder_choice(targetform,caller
                 targetform.renamed.value=foldername;
                 for (var i=0; i<allfolders.length; i++) {
                     if (allfolders[i] == foldername) {
-                        alert("$lt{'thfm'} '"+foldername+"' $lt{'asth'}");
+                        alert("'"+foldername+"' $lt{'asth'}");
                         return;
                     }
                 }
@@ -207,7 +204,7 @@ function folder_choice(targetform,caller
         if (newname) {
             for (var i=0; i<allfolders.length; i++) {
                 if (allfolders[i] == newname) {
-                    alert("$lt{'tnfm'} '"+newname+"' $lt{'asth'}");
+                    alert("'"+newname+"' -- $lt{'asth'}");
                     return;
                 }
             }
@@ -243,9 +240,11 @@ function folder_choice(targetform,caller
          '" onclick="javascript:folder_choice(this.form,'."'change'".');" />
          </span>
      </td>
-    </tr>
-    <tr>
-     <td colspan="4"><b>'.&mt('New Folder').'</b><br />'."\n".'
+     <td>&nbsp;</td>
+     <td>&nbsp;</td>
+     <td valign="top" style="border-left: 1px solid;">&nbsp;</td>
+     <td>&nbsp;</td>
+     <td><b>'.&mt('New Folder').'</b><br />'."\n".'
          <span class="LC_nobreak">
          <input type="text" size="15" name="newfolder" value="" />
          <input type="button" value="'.$lt{'go'}.
@@ -1665,8 +1664,8 @@ ENDREPSCRIPT
         $r->print(&additional_rec_row(\%lt));
         $r->print('<tr><td colspan="2">'.
                   &mt('Unless you choose otherwise:').'<ul><li>'.
-        &mt("The subject in each forwarded message will be <i>'Forwarding:'</i> followed by the original subject.").'</li><li>'.
-        &mt("The message itself will begin with a first line: <i>'Forwarded message from'</i> followed by the original sender's name.").'</li></ul></td></tr>');
+        &mt("The subject in each forwarded message will be [_1]'Forwarding:'[_2] followed by the original subject.",'<i>','</i>').'</li><li>'.
+        &mt("The message itself will begin with a first line: [_1]'Forwarded message from'[_2] followed by the original sender's name.",'<i>','</i>').'</li></ul></td></tr>');
         $func1='Forward'; # do not translate here!
         $dissub = &mt('Forwarding').': ';
         $subj_size = '10';
@@ -1741,7 +1740,7 @@ ENDBLOCK
 '</pre>
 </p>
 <p>
-'.&mt('The messages will be assembled from all lines with the respective'."\n".'<tt>username:domain</tt>, and appended to the general message text.'));
+'.&mt('The messages will be assembled from all lines with the respective [_1][_2]username:domain[_3], and appended to the general message text.','<br />','<tt>','</tt>'));
         $r->print(<<ENDUPLOAD);
 </p>
 <p>