Index: openacs-4/packages/lorsm/catalog/lorsm.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/catalog/lorsm.en_US.ISO-8859-1.xml,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/lorsm/catalog/lorsm.en_US.ISO-8859-1.xml	29 Nov 2004 17:48:11 -0000	1.1.2.2
+++ openacs-4/packages/lorsm/catalog/lorsm.en_US.ISO-8859-1.xml	11 Jan 2005 18:31:32 -0000	1.1.2.3
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="lorsm" package_version="0.5d" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="lorsm" package_version="0.6d1" locale="en_US" charset="ISO-8859-1">
 
   <msg key="_the_package_has">: the package has</msg>
+  <msg key="_Viewed">% Viewed</msg>
   <msg key="Access_Course">Access Course</msg>
   <msg key="Add_Course">Add Course</msg>
   <msg key="Add_metadata">Add metadata</msg>
   <msg key="Add_your_own_course">Add your own course</msg>
+  <msg key="Adding_file_filex">Adding file %filex%...</msg>
   <msg key="Admin_Course">Admin Course</msg>
   <msg key="Aggregation_Level">Aggregation Level:</msg>
   <msg key="Assets">Assets</msg>
@@ -19,8 +21,11 @@
   <msg key="Cost">Cost:</msg>
   <msg key="course">course.</msg>
   <msg key="Course_Index">Course Index</msg>
+  <msg key="Course_Info">Course Info</msg>
   <msg key="Course_Information">Course Information</msg>
   <msg key="Course_Name">Course Name:</msg>
+  <msg key="Course_Name_1">Course Name</msg>
+  <msg key="Course_Structure">Course Structure</msg>
   <msg key="Coverage">Coverage:</msg>
   <msg key="Created_By">Created By:</msg>
   <msg key="Creation_Date">Creation Date</msg>
@@ -29,11 +34,16 @@
   <msg key="Descriptions">Descriptions:</msg>
   <msg key="Difficulty">Difficulty:</msg>
   <msg key="Disabled">Disabled</msg>
+  <msg key="Done">Done!</msg>
   <msg key="Duration">Duration:</msg>
+  <msg key="Edit">Edit</msg>
+  <msg key="Edit_1">Edit</msg>
   <msg key="Educational_Metadata">Educational Metadata</msg>
   <msg key="Enabled">Enabled</msg>
   <msg key="Exit_Course">Exit Course</msg>
   <msg key="Export">Export</msg>
+  <msg key="file">file...</msg>
+  <msg key="files">files</msg>
   <msg key="Formats">Formats:</msg>
   <msg key="General_Metadata">General Metadata</msg>
   <msg key="Identifier">Identifier:</msg>
@@ -42,32 +52,54 @@
   <msg key="Interactivity_Level">Interactivity Level:</msg>
   <msg key="Interactivity_Type">Interactivity Type:</msg>
   <msg key="Is_SCORM">Is SCORM?:</msg>
+  <msg key="Is_Shared">Is Shared?</msg>
   <msg key="Is_shared">Is shared?</msg>
+  <msg key="Item_Name">Item Name</msg>
   <msg key="Items">Items</msg>
   <msg key="Keywords">Keywords:</msg>
   <msg key="Language">Language:</msg>
   <msg key="Languages">Languages:</msg>
+  <msg key="Last_Viewed_On">Last Viewed On</msg>
   <msg key="Lifecycle_Metadata">Lifecycle Metadata</msg>
   <msg key="Locations">Locations:</msg>
   <msg key="Log_Out">Log Out</msg>
+  <msg key="lorsm.lt_The_upload_failed_or_">The upload failed or the file was empty</msg>
   <msg key="lt_Add_a_IMSSCORM_Compli">Add a IMS/SCORM Compliant Course</msg>
   <msg key="lt_Add_course_to_my_clas">Add course to my class now:</msg>
+  <msg key="lt_Adding_course_name_Ma">Adding %course_name% Manifest...</msg>
+  <msg key="lt_Adding_file_filex_met_1">Adding file %filex% metadata...</msg>
+  <msg key="lt_Adding_Manifest_Metad">Adding Manifest Metadata...</msg>
+  <msg key="lt_Adding_Organization_o">Adding Organization %org_title%...</msg>
+  <msg key="lt_Adding_resource_depen">Adding resource dependencies...</msg>
+  <msg key="lt_Adding_resource_res_i_2">Adding resource %res_identifier%...</msg>
+  <msg key="lt_Adding_resource_res_i_3">Adding resource %res_identifier% metadata...</msg>
+  <msg key="lt_Adding_tempval_items_">Adding %tmpval% items and their respective metadata...</msg>
   <msg key="lt_and_we_will_import_yo">and we will import your course in this folder.</msg>
   <msg key="lt_being_added_to_the_Le">being added to the Learning Object Repository.</msg>
+  <msg key="lt_Blackboard6_Content_P">Blackboard6 Content Packaging Course</msg>
   <msg key="lt_Blackboard_6_complain">Blackboard 6 complaint package</msg>
+  <msg key="lt_Choose_the_course_zip">Choose the course zip file to upload</msg>
   <msg key="lt_classlist_stylefont-w">class=&quot;list&quot; style=&quot;font-weight: bold;&quot;</msg>
+  <msg key="lt_Cleaning_up_unused_ap">Cleaning up unused application and folders...</msg>
   <msg key="lt_Click_on_menu_to_the_">Click on menu to the left to view course materials.</msg>
   <msg key="lt_Click_on_the_Course_I">Click on the Course Index items to start your</msg>
   <msg key="lt_Copyright_or_other_Re">Copyright or other Restrictions:</msg>
   <msg key="lt_Course_already_part_o">Course already part of your class</msg>
   <msg key="lt_Course_Delivery_Syste">Course Delivery System for LORS</msg>
   <msg key="lt_Courses_in_your_Repos">Courses in your Repository</msg>
+  <msg key="lt_Deleting_temporary_fo">Deleting temporary folder...</msg>
   <msg key="lt_Export_as_IMS_Content">Export as IMS Content Package</msg>
+  <msg key="lt_Granting_permissions__1">Granting permissions %course_name% Manifest...</msg>
+  <msg key="lt_here_is_list_items_li">here is list_items %list_items%</msg>
   <msg key="lt_Heres_a_link_to_the_a">Here's a link to the actual element</msg>
+  <msg key="lt_Importing_manifest_ti">Importing manifest</msg>
+  <msg key="lt_Importing_No_Metadata">Importing: No Metadata Available</msg>
+  <msg key="lt_Initiating_Updating_l">Initiating Updating log...</msg>
   <msg key="lt_Intended_End_User_Rol">Intended End User Role:</msg>
   <msg key="lt_Learning_Resource_Typ">Learning Resource Type:</msg>
   <msg key="lt_Manage_Courses_in_Rep">Manage Courses in Repository</msg>
   <msg key="lt_No_metadata_record_ex">No metadata record exist for this object: %object_type%.</msg>
+  <msg key="lt_Now_we_are_almost_don">Now we are almost done...</msg>
   <msg key="lt_number_of_times_and_h">number of times and have covered</msg>
   <msg key="lt_Other_Platform_Requir">Other Platform Requirements:</msg>
   <msg key="lt_Preliminary_informati">Preliminary information</msg>
@@ -76,16 +108,22 @@
   <msg key="lt_Search_Learning_Objec">Search Learning Objects</msg>
   <msg key="lt_Shared_Courses_in_the">Shared Courses in the Repository</msg>
   <msg key="lt_Sorry_your_browser_mu">Sorry, your browser must support frames to view this page.</msg>
+  <msg key="lt_Starting_File_Process">Starting File Processing...</msg>
   <msg key="lt_The_last_page_you_vie">The last page you viewed was:</msg>
   <msg key="lt_The_uploaded_file_is_">The uploaded file is a</msg>
+  <msg key="lt_This_is_the_name_the_">This is the name the name of the course, as it will be stored in the system</msg>
   <msg key="lt_to_addchange_the_meta">to add/change the metadata for this record.</msg>
   <msg key="lt_Track_Students_Progre">Track Student's Progress</msg>
   <msg key="lt_Typical_Learning_Time">Typical Learning Time:</msg>
   <msg key="lt_upload_a_XML_LOM_meta">upload a XML LOM metadata node</msg>
   <msg key="lt_Upload_an_IMSSCORM_Co">Upload an IMS/SCORM Content Package Course</msg>
+  <msg key="lt_Upload_IMS_Content_Pa">Upload IMS Content Package</msg>
+  <msg key="lt_Uploading_and_process">Uploading and processing your course, please wait ...</msg>
+  <msg key="lt_Use_the_Browse_button">Use the &quot;Browse...&quot; button to locate your file, then click &quot;Open&quot;</msg>
   <msg key="lt_valigntop_alignleftis">valign=&quot;top&quot; align=&quot;left&quot;&gt;%isscorm;noquote%</msg>
   <msg key="lt_View_Available_Course">View Available Courses in the Repository</msg>
   <msg key="lt_We_have_detected_the_">We have detected the root folder for</msg>
+  <msg key="lt_We_will_continue_auto">We will continue automatically when processing is complete.</msg>
   <msg key="lt_You_are_about_to_add_">You are about to add %course_name% to your class.</msg>
   <msg key="lt_You_can_add_courses_a">You can add courses already existing in the repository</msg>
   <msg key="lt_You_have_seen_this_co">You have seen this course</msg>
@@ -95,12 +133,17 @@
   <msg key="Metadata_1">Metadata?</msg>
   <msg key="No">No</msg>
   <msg key="No_Courses">No Courses</msg>
+  <msg key="No_version_Available">No version Available</msg>
   <msg key="Not_Shared">Not Shared</msg>
   <msg key="not_yet">not yet</msg>
   <msg key="Note">Note</msg>
+  <msg key="Now_processing">Now processing</msg>
   <msg key="of_the_content">of the content.</msg>
+  <msg key="Organization">Organization</msg>
   <msg key="Organizations">Organizations</msg>
   <msg key="Owner">Owner</msg>
+  <msg key="Processing_files">Processing file(s):</msg>
+  <msg key="Processing_folder">Processing folder</msg>
   <msg key="Relation_Metadata">Relation Metadata</msg>
   <msg key="Relations">Relations:</msg>
   <msg key="Requirements">Requirements:</msg>
@@ -113,18 +156,22 @@
   <msg key="SCOs">SCOs</msg>
   <msg key="See_metadata">See metadata</msg>
   <msg key="Semantic_Density">Semantic Density:</msg>
+  <msg key="Sharable_Resources">Sharable Resources</msg>
   <msg key="Shared">Shared</msg>
   <msg key="Size">Size:</msg>
   <msg key="Status">Status:</msg>
   <msg key="Status_1">Status</msg>
   <msg key="Storage_Folder">Storage Folder:</msg>
   <msg key="Structure">Structure:</msg>
+  <msg key="Subject">Subject</msg>
   <msg key="Submanifests">Submanifests:</msg>
   <msg key="Technical_Metadata">Technical Metadata</msg>
   <msg key="Titles">Titles:</msg>
   <msg key="Trackable">Trackable:</msg>
   <msg key="Tracking">Tracking?</msg>
+  <msg key="Type">Type</msg>
   <msg key="Typical_Age_Range">Typical Age Range:</msg>
+  <msg key="Uploading_course">Uploading course...</msg>
   <msg key="Version">Version:</msg>
   <msg key="Welcome_to">Welcome to</msg>
   <msg key="Welcome_to_LEON">Welcome to LEON</msg>
Index: openacs-4/packages/lorsm/www/course-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/Attic/course-add-3.tcl,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/lorsm/www/course-add-3.tcl	5 Jan 2005 17:01:51 -0000	1.6.2.1
+++ openacs-4/packages/lorsm/www/course-add-3.tcl	11 Jan 2005 18:31:33 -0000	1.6.2.2
@@ -170,7 +170,7 @@
 		    ns_write "[_ lorsm.Processing_files]<blockquote>"
 		    foreach file $files {
 			set tempval [regsub $tmp_dir $file {}]
-			ns_write "<img src=\"/resources/file-storage/file.gif\"> $tempval<font color=\"green\">[_ lorsm.OK]</font><br>"
+			ns_write "<img src=\"/resources/file-storage/file.gif\"> $tempval<font color=\"green\">[_ acs-kernel.common_OK]</font><br>"
 		    }
 		    ns_write "</blockquote>"
 		    #
@@ -295,7 +295,7 @@
 		        -community_id $community_id]
 
 
-	ns_write "[_ lorsm.lt_Granting_permissions__1]<br>"
+        ns_write "[_ lorsm.lt_Granting_permissions__1 [list course_name $course_name]]<br>"
 
 	# PERMISSIONS FOR MANIFEST and learning objects
 
@@ -344,7 +344,7 @@
 	# Done with Manifest and learning object Permissions
 
 
-	ns_write "[_ lorsm.lt_Adding_course_name_Ma]<br>"
+        ns_write "[_ lorsm.lt_Adding_course_name_Ma [list course_name $course_name]]<br>"
 
         if {$man_hasmetadata == 1} {
             # adds manifest metadata
@@ -383,7 +383,7 @@
                                 -title $org_title \
                                 -hasmetadata $org_hasmetadata]
 
-		ns_write "[_ lorsm.lt_Adding_Organization_o]<br>"
+                ns_write "[_ lorsm.lt_Adding_Organization_o [list org_title $org_title]]<br>"
 
 
                 if {$org_hasmetadata == 1} {
@@ -396,7 +396,7 @@
 
                 set list_items [lors::imscp::getItems $organization]
 
-#                ns_write "[_ lorsm.lt_here_is_list_items_li]"
+                #                ns_write "[_ lorsm.lt_here_is_list_items_li [list list_items $list_items]]"
 
                 set add [concat $add [lors::imscp::addItems -org_id $org_id $list_items 0 $tmp_dir]]
 
@@ -448,7 +448,7 @@
                                      -scorm_type $res_scormtype \
                                      -hasmetadata $res_hasmetadata]
 
-		ns_write "[_ lorsm.lt_Adding_resource_res_i_2]<br>"
+                ns_write "[_ lorsm.lt_Adding_resource_res_i_2 [list res_identifier $res_identifier]]<br>"
 		
 		lappend res_list [concat "$resource_id $res_identifier"]
 
@@ -461,7 +461,7 @@
                                         -node [lors::imsmd::getMDNode $resource] \
                                         -dir $tmp_dir]
 
-		    ns_write "[_ lorsm.lt_Adding_resource_res_i_3]<br>"
+                    ns_write "[_ lorsm.lt_Adding_resource_res_i_3 [list res_identifier $res_identifier]]<br>"
 
                 }
 
@@ -480,7 +480,7 @@
                 foreach file $res_files {
                     lappend l_files [list [lindex $file 0] $resource_id [lindex $file 1]]
 
-                    #                ns_write "[_ lorsm.lt_resource_id_res_ident]"
+                    #                ns_write "$resource_id $res_identifier \n"
                     #                ns_write "\t$file \n"
                 }
             }
@@ -560,7 +560,7 @@
 			     -filename $filex \
 			     -hasmetadata $hasmetadata]
 
-	    ns_write "[_ lorsm.Adding_file_filex]<br>"
+	    ns_write "[_ lorsm.Adding_file_filex [list filex $filex]]<br>"
 
 
 	    if {$file_hasmetadata != 0} {
@@ -569,7 +569,7 @@
 					   -node $file_hasmetadata \
 					   -dir $tmp_dir]
 
-		ns_write "[_ lorsm.lt_Adding_file_filex_met_1]<br>"
+            ns_write "[_ lorsm.lt_Adding_file_filex_met_1 [list filex $filex]]<br>"
 	    }
 	}
 
Index: openacs-4/packages/lorsm/www/course-structure.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/Attic/course-structure.tcl,v
diff -u -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/lorsm/www/course-structure.tcl	5 Jan 2005 17:01:51 -0000	1.4.2.1
+++ openacs-4/packages/lorsm/www/course-structure.tcl	11 Jan 2005 18:31:33 -0000	1.4.2.2
@@ -146,11 +146,11 @@
    
     set table_extra_vars {return_url}
     set table_def {
-	{ title "[_ lorsm.Item_Name]" "no_sort" "<td>$indent[if {![empty_string_p $identifierref]} {set href \"<a href='[apm_package_url_from_id $fs_package_id]view/[db_string select_folder_key {select key from fs_folders where folder_id = :folder_id}]/[lorsm::fix_url -url $identifierref]'>$item_title</a>\"} else {set href $item_title}]</td>" }
-	{ Edit "[_ lorsm.Edit]" "no_sort" "<td align=\"center\">[if {![empty_string_p $identifierref]} {set href \"<a href=\'[export_vars -base edit-content {identifierref folder_id return_url fs_package_id}]\'>[_ lorsm.Edit_1]</a></td>\"}]"}
-	{ metadata "[_ lorsm.Metadata_1]" "no_sort" "<td align=\"center\">[if {$hasmetadata == \"f\"} {set hasmetadata \"<a href=md?ims_md_id=$item_id>No\"} else {set hasmetadata \"<a href=md/?ims_md_id=$item_id>Yes\"}]</a></td>" }
-	{ type   "[_ lorsm.Type]" "no_sort" "<td align=\"center\">$type</td>" }
-	{ shared "[_ lorsm.Is_Shared]" "no_sort" "<td align=\"center\">[if {$isshared == false} {set ret \"No\"}]</td>" }
+	{ title "\#lorsm.Item_Name\#" "no_sort" "<td>$indent[if {![empty_string_p $identifierref]} {set href \"<a href='[apm_package_url_from_id $fs_package_id]view/[db_string select_folder_key {select key from fs_folders where folder_id = :folder_id}]/[lorsm::fix_url -url $identifierref]'>$item_title</a>\"} else {set href $item_title}]</td>" }
+	{ Edit "\#lorsm.Edit\#" "no_sort" "<td align=\"center\">[if {![empty_string_p $identifierref]} {set href \"<a href=\'[export_vars -base edit-content {identifierref folder_id return_url fs_package_id}]\'>[_ lorsm.Edit_1]</a></td>\"}]"}
+	{ metadata "\#lorsm.Metadata_1\#" "no_sort" "<td align=\"center\">[if {$hasmetadata == \"f\"} {set hasmetadata \"<a href=md?ims_md_id=$item_id>No\"} else {set hasmetadata \"<a href=md/?ims_md_id=$item_id>Yes\"}]</a></td>" }
+	{ type   "\#lorsm.Type\#" "no_sort" "<td align=\"center\">$type</td>" }
+	{ shared "\#lorsm.Is_Shared\#" "no_sort" "<td align=\"center\">[if {$isshared == false} {set ret \"No\"}]</td>" }
     }
 
     set table_item [ad_table -Tmissing_text $missing_text -Textra_vars $table_extra_vars -Theader_row_extra "style=\"background-color: #e0e0e0; font-weight: bold;\" class=\"list-header\"" -Ttable_extra_html $table_extra_html blah {