--- loncom/interface/lonwishlist.pm	2012/05/16 11:26:03	1.13
+++ loncom/interface/lonwishlist.pm	2012/05/22 16:31:38	1.14
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility-routines for wishlist
 #
-# $Id: lonwishlist.pm,v 1.13 2012/05/16 11:26:03 bisitz Exp $
+# $Id: lonwishlist.pm,v 1.14 2012/05/22 16:31:38 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -528,14 +528,16 @@ sub JSforWishlist {
     # that means that it is checked wether a path contains .problem, .quiz, .exam etc.
     # this is good for most cases but crashes as soon as a real external website contains one of this pattern in its URL.
     # so maybe there's a better way to find out wether a given URL belongs to a LON-CAPA-server or not ...?
-    my $warningLinkNotAllowed1 = &mt('You can only insert links to LON-CAPA resources from the resource-pool '.
-                                    'or to external websites. Paths to LON-CAPA resources must be of the form /res/dom/usr... . '.
-                                    'Paths to external websites must contain the network protocol (e.g. http://...).');
-    my $warningLinkNotAllowed2 = &mt('The following link is not allowed: ');
+    my $warningLinkNotAllowed1 =
+        &mt('You can only insert links to LON-CAPA resources from the resource-pool'.
+            ' or to external websites.'.
+            ' Paths to LON-CAPA resources must be of the form /res/domain/user/...'.
+            ' Paths to external websites must contain the network protocol, e.g. http://...');
+    my $warningLinkNotAllowed2 = &mt('The following link is not allowed:').' ';
     my $warningLink = &mt('You must insert a title and a path!');
     my $warningFolder = &mt('You must insert a title!');
     my $warningDelete = &mt('Are you sure you want to delete the selected entries? Deleting a folder also deletes all entries within this folder!');
-    my $warningSave = &mt('You have unsaved changes. You can either save these changes now by clicking "ok" or click "cancel" if you do not want to save your changes.');
+    my $warningSave = &mt('You have unsaved changes. You can either save these changes now by clicking "OK" or click "Cancel" if you do not want to save your changes.');
     my $warningMoveS = &mt('You must select at minimum one entry to move!');
     my $warningMoveD = &mt('You must select a destination folder!');
     $foldersOption = '';
@@ -1270,7 +1272,7 @@ sub wishlistMove {
                 $wishlistHTMLmove .= '<td><input type="radio" name="mark" id="radio'.$index.'" value="'.$index.'" /></td>'.
                                      '<td id="padd'.$index.'" style="padding-left:'.(($indent-$indentConst)<0?0:($indent-$indentConst)).'px; min-width: 220px;">';
             }
-            # higlight the title, if the folder was selected to be moved
+            # highlight the title, if the folder was selected to be moved
             else {
                 $wishlistHTMLmove .= '<td></td>'.
                                      '<td id="padd'.$index.'" style="padding-left:'.(($indent-$indentConst)<0?0:($indent-$indentConst)).'px; min-width: 220px;'.
@@ -1591,9 +1593,11 @@ sub makePopUpNewLink {
                                        'bgcolor'   => '#FFFFFF',});
 
     my $warningLink = &mt('You must insert a title!');
-    my $warningLinkNotAllowed1 = &mt('You can only insert links to LON-CAPA resources from the resource-pool '.
-                                    'or to external websites. Paths to LON-CAPA resources must be of the form /res/dom/usr... . '.
-                                    'Paths to external websites must contain the network protocol (e.g. http://...).');
+    my $warningLinkNotAllowed1 =
+        &mt('You can only insert links to LON-CAPA resources from the resource-pool'.
+            ' or to external websites.'.
+            ' Paths to LON-CAPA resources must be of the form /res/domain/user/...'.
+            ' Paths to external websites must contain the network protocol, e.g. http://...');
 
     my $inPageWishlistlink1 = '<h1>'.&mt('Save to Stored Links').'</h1>';
     # If no title is delivered, 'New Link' is called up from the wishlist-interface, so after
@@ -1623,7 +1627,7 @@ sub makePopUpNewLink {
                               '<select name="folders">'.
                               $options.
                               '</select>'.
-                              '<input type="button" value="'.&mt('cancel').'" onclick="javascript:window.close();" />'.
+                              '<input type="button" value="'.&mt('Cancel').'" onclick="javascript:window.close();" />'.
                               '</form>';
     $options = '';
 
@@ -1781,14 +1785,21 @@ sub makePageImport {
 
     my $inner = '<h1>'.&mt('Import Resources from Stored Links').'</h1>';
     if (!$rat) {
-        $inner .= '<p><span class="LC_info">'.&mt("Please note that you can use the checkboxes corresponding to a folder to ".
-                                                  "easily check all links within this folder. The folder structure itself can't be imported. ".
-                                                  "All checked links will be imported into the current folder of your course.").'</span></p>';
+        $inner .=
+            '<p class="LC_info">'.
+            &mt('Please note that you can use the checkboxes corresponding to a folder to '.
+                'easily check all links within this folder.'.
+                ' The folder structure itself cannot be imported.').
+            ' '.&mt('All checked links will be imported into the current folder of your course.').
+            '</p>';
     }
     else {
-        $inner .= '<p><span class="LC_info">'.&mt("Please note that you can use the checkboxes corresponding to a folder to ".
-                                                  "easily check all links within this folder. The folder structure itself can't be imported. ")
-                                                  .'</span></p>';
+        $inner .=
+            '<p class="LC_info">'.
+            &mt('Please note that you can use the checkboxes corresponding to a folder to '.
+                'easily check all links within this folder.'.
+                ' The folder structure itself cannot be imported.').
+            '</p>';
     }
     my %wishlist = &getWishlist();