Index: openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml	13 Dec 2005 17:35:23 -0000	1.11
+++ openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml	1 Feb 2006 12:31:32 -0000	1.12
@@ -5,20 +5,28 @@
   <msg key="Act_Identifier">Act Identifier</msg>
   <msg key="Activity_Structures">Activity Structures</msg>
   <msg key="Acts_in_play_count">Acts in play %count%</msg>
+  <msg key="Caluclate_Identifier">Caluclate Identifier</msg>
+  <msg key="Calulate_Identifier">Calulate Identifier</msg>
   <msg key="Class">Class</msg>
+  <msg key="Complete_Act">Complete Act</msg>
+  <msg key="Complete_Acts">Complete Acts</msg>
   <msg key="Component_Identifier">Component Identifier</msg>
   <msg key="Conference_Type">Conference Type</msg>
   <msg key="Confirm_New_IMS-LD">Confirm: New IMS-LD</msg>
   <msg key="Create_New">Create New?</msg>
   <msg key="Creating_new_IMS-LD">Creating new IMS-LD...</msg>
+  <msg key="Data_Type">Data Type</msg>
+  <msg key="Else_Identifier">Else Identifier</msg>
   <msg key="Error_parsing_file">Error parsing file</msg>
+  <msg key="Existing_href">Existing href</msg>
   <msg key="Feedbach_Title">Feedbach Title</msg>
   <msg key="File_name">File name</msg>
   <msg key="finished">finished</msg>
   <msg key="Href">Href</msg>
   <msg key="Identifier">Identifier</msg>
   <msg key="Identifier_Reference">Identifier Reference</msg>
   <msg key="Identifierref">Identifierref</msg>
+  <msg key="If_Identifier">If Identifier</msg>
   <msg key="IMD-LD_Environment">IMD-LD Environment</msg>
   <msg key="IMD-LD_Environments">IMD-LD Environments</msg>
   <msg key="IMD_LD_Level">IMD LD Level</msg>
@@ -28,14 +36,19 @@
   <msg key="IMS-LD_Acts">IMS-LD Acts</msg>
   <msg key="IMS-LD_Component">IMS-LD Component</msg>
   <msg key="IMS-LD_Components">IMS-LD Components</msg>
+  <msg key="IMS-LD_Condition">IMS-LD Condition</msg>
+  <msg key="IMS-LD_Conditions">IMS-LD Conditions</msg>
   <msg key="IMS-LD_CP_Dependency">IMS-LD CP Dependency</msg>
   <msg key="IMS-LD_CP_File">IMS-LD CP File</msg>
   <msg key="IMS-LD_CP_Filed">IMS-LD CP Filed</msg>
   <msg key="IMS-LD_CP_Manifest">IMS-LD CP Manifest</msg>
   <msg key="IMS-LD_CP_Manifests">IMS-LD CP Manifests</msg>
   <msg key="IMS-LD_CP_Resource">IMS-LD CP Resource</msg>
   <msg key="IMS-LD_CP_Resources">IMS-LD CP Resources</msg>
+  <msg key="IMS-LD_Expression">IMS-LD Expression</msg>
+  <msg key="IMS-LD_Expressions">IMS-LD Expressions</msg>
   <msg key="IMS-LD_Identifier">IMS-LD Identifier</msg>
+  <msg key="IMS-LD_Intifier">IMS-LD Intifier</msg>
   <msg key="IMS-LD_Item">IMS-LD Item</msg>
   <msg key="IMS-LD_Items">IMS-LD Items</msg>
   <msg key="IMS-LD_Method">IMS-LD Method</msg>
@@ -47,20 +60,28 @@
   <msg key="IMS-LD_Plays">IMS-LD Plays</msg>
   <msg key="IMS-LD_Prerequisite">IMS-LD Prerequisite</msg>
   <msg key="IMS-LD_Prerequisites">IMS-LD Prerequisites</msg>
+  <msg key="IMS-LD_Properties">IMS-LD Properties</msg>
+  <msg key="IMS-LD_Property">IMS-LD Property</msg>
+  <msg key="IMS-LD_Restriction">IMS-LD Restriction</msg>
+  <msg key="IMS-LD_Restrictions">IMS-LD Restrictions</msg>
   <msg key="IMS-LD_Role">IMS-LD Role</msg>
   <msg key="IMS-LD_Role_Part">IMS-LD Role Part</msg>
   <msg key="IMS-LD_Role_Parts">IMS-LD Role Parts</msg>
   <msg key="IMS-LD_Roles">IMS-LD Roles</msg>
   <msg key="IMS-LD_Sendmail_Data">IMS-LD Sendmail Data</msg>
   <msg key="IMS-LD_Service">IMS-LD Service</msg>
   <msg key="IMS-LD_Services">IMS-LD Services</msg>
+  <msg key="IMS-LD_Then_Model">IMS-LD Then Model</msg>
+  <msg key="IMS-LD_Then_Models">IMS-LD Then Models</msg>
   <msg key="IMS-LD_Time_Limit">IMS-LD Time Limit</msg>
   <msg key="IMS-LD_Time_Limits">IMS-LD Time Limits</msg>
   <msg key="IMS-LD_ZIP_File">IMS-LD ZIP File</msg>
   <msg key="IMS-LDs">IMS-LDs</msg>
+  <msg key="Initial_Value">Initial Value</msg>
   <msg key="Is_shared">Is shared?</msg>
   <msg key="Is_Visible">Is Visible?</msg>
   <msg key="Item_Identifier">Item Identifier</msg>
+  <msg key="Langstring">Langstring</msg>
   <msg key="Learners_Roles">Learners Roles</msg>
   <msg key="Learning_Activities">Learning Activities</msg>
   <msg key="Learning_Object">Learning Object</msg>
@@ -72,12 +93,18 @@
   <msg key="lt_Activity_Description_">Activity Description Identifier</msg>
   <msg key="lt_Activity_Structure_Id">Activity Structure Identifier</msg>
   <msg key="lt_br__Warnings_ul_warni">&lt;br /&gt; Warnings: &lt;ul&gt; %warnings% &lt;/ul&gt;</msg>
+  <msg key="lt_Change_Property_Value">Change Property Value Identifier</msg>
+  <msg key="lt_Complete_Act_Identifi">Complete Act Identifier</msg>
   <msg key="lt_Could_not_determine_w">Could not determine whit what program uncompress the file %upload_file% has. Aborting</msg>
   <msg key="lt_Couldnt_determine_if_">Couldn't determine if this is a well formed IMS-LD: %message%</msg>
   <msg key="lt_Creaginting_new_IMS-L">Creaginting new IMS-LD</msg>
+  <msg key="lt_Email_Propery_Identif">Email Propery Identifier</msg>
   <msg key="lt_Environment_Identifie">Environment Identifier</msg>
   <msg key="lt_Error_creating_folder">Error creating folder</msg>
   <msg key="lt_Error_parsing_manifes">Error parsing manifest.</msg>
+  <msg key="lt_Expression_Identifier">Expression Identifier</msg>
+  <msg key="lt_Expression_One_Identi">Expression One Identifier</msg>
+  <msg key="lt_Expression_Two_Identi">Expression Two Identifer</msg>
   <msg key="lt_IMS-LD_Activity_Descr">IMS-LD Activity Description</msg>
   <msg key="lt_IMS-LD_Activity_Descr_1">IMS-LD Activity Descriptions</msg>
   <msg key="lt_IMS-LD_Activity_Struc">IMS-LD Activity Structure</msg>
@@ -87,15 +114,24 @@
   <msg key="lt_IMS-LD_CP_Dependencie">IMS-LD CP Dependencies</msg>
   <msg key="lt_IMS-LD_CP_Organizatio">IMS-LD CP Organization</msg>
   <msg key="lt_IMS-LD_CP_Organizatio_1">IMS-LD CP Organizations</msg>
+  <msg key="lt_IMS-LD_Item_Identifie">IMS-LD Item Identifier</msg>
   <msg key="lt_IMS-LD_Learning_Activ">IMS-LD Learning Activity</msg>
   <msg key="lt_IMS-LD_Learning_Activ_1">IMS-LD Learning Activities</msg>
   <msg key="lt_IMS-LD_Learning_Objec">IMS-LD Learning Objective</msg>
   <msg key="lt_IMS-LD_Learning_Objec_1">IMS-LD Learning Objectives</msg>
+  <msg key="lt_IMS-LD_Monitor_Servic">IMS-LD Monitor Service</msg>
+  <msg key="lt_IMS-LD_Monitor_Servic_1">IMS-LD Monitor Services</msg>
   <msg key="lt_IMS-LD_On_Completions">IMS-LD On Completions</msg>
+  <msg key="lt_IMS-LD_Property_Group">IMS-LD Property Group</msg>
+  <msg key="lt_IMS-LD_Property_Group_1">IMS-LD Property Groups</msg>
+  <msg key="lt_IMS-LD_Property_Value">IMS-LD Property Value</msg>
+  <msg key="lt_IMS-LD_Property_Value_1">IMS-LD Property Values</msg>
   <msg key="lt_IMS-LD_Sendmail_Servi">IMS-LD Sendmail Service</msg>
   <msg key="lt_IMS-LD_Sendmail_Servi_1">IMS-LD Sendmail Services</msg>
   <msg key="lt_IMS-LD_Support_Activi">IMS-LD Support Activity</msg>
   <msg key="lt_IMS-LD_Support_Activi_1">IMS-LD Support Activities</msg>
+  <msg key="lt_IMS-LD_When_Condition">IMS-LD When Condition True</msg>
+  <msg key="lt_IMS-LD_When_Condition_1">IMS-LD When Conditions True</msg>
   <msg key="lt_Index_search_service_">Index search service not supported</msg>
   <msg key="lt_Information_given_but">Information given but no item associated to it for the role %role_title%</msg>
   <msg key="lt_Information_given_but_1">Information given but no item associated to it for the activity structure %identifier%</msg>
@@ -104,11 +140,14 @@
   <msg key="lt_Learning_Object_Ident">Learning Object Identifier</msg>
   <msg key="lt_Learning_Objective_ID">Learning Objective ID</msg>
   <msg key="lt_Learning_Objectives_I">Learning Objectives ID</msg>
+  <msg key="lt_Learning_Unit_finishe">Learning Unit finished</msg>
   <msg key="lt_li_desc_no_file_assoc">&lt;li&gt; desc (no file associated) &lt;/li&gt;</msg>
   <msg key="lt_More_than_one_validat">More than one validation tried at the same time</msg>
   <msg key="lt_No_imsmanifestxml_fou">No imsmanifest.xml found</msg>
   <msg key="lt_No_imsmanifestxml_was">No imsmanifest.xml was found in the compressed file. Aborting.</msg>
   <msg key="lt_No_information_found_">No information found in the manifest file</msg>
+  <msg key="lt_No_parent_folder_foun">No parent folder found</msg>
+  <msg key="lt_No_parent_folder_foun_1">No parent folder found for the ims-ld in the community %community_id%. Please report this error to the administrator.</msg>
   <msg key="lt_Number_of_Organizatio">Number of Organizations:</msg>
   <msg key="lt_On_Completion_Identif">On Completion Identifier</msg>
   <msg key="lt_Organization_Identifi">Organization Identifier</msg>
@@ -146,26 +185,37 @@
   <msg key="lt_The_resource_resource">The resource %resource_identifier% has a reference to a non existing file (%resource_href%).</msg>
   <msg key="lt_There_cant_be_less_th">There can't be less than %multiplicity% %element_name% and there are %tree_length%. This is not supported, sorry.</msg>
   <msg key="lt_There_cant_greather_t">There can't greather than %multiplicity% %element_name% and there are %tree_length%. This is not supported, sorry.</msg>
+  <msg key="lt_There_is_no_property-">There is no property-group with the identifier %ref% (referenced by property-group %identifier%)</msg>
+  <msg key="lt_There_is_no_property_">There is no property with the identifier %ref% (referenced by: property group %identifier%)</msg>
+  <msg key="lt_There_is_no_property__1">There is no property with the identifier %email_property_ref% (referenced from an email data)</msg>
+  <msg key="lt_There_is_no_property__2">There is no property with the identifier %username_property_ref% (referenced from an email data)</msg>
+  <msg key="lt_There_is_no_property__3">There is no property with the identifier %ref% (referenced by: property value</msg>
   <msg key="lt_There_is_no_role_with">There is no role with the identifier %role_ref% (referenced by an email data)</msg>
   <msg key="lt_There_is_no_role_with_1">There is no role with the identifier %role_ref% (referenced by: manager)</msg>
   <msg key="lt_There_is_no_role_with_2">There is no role with the identifier %role_ref% (referenced by: participant)</msg>
   <msg key="lt_There_is_no_role_with_3">There is no role with the identifier %role_ref% (referenced by: observer)</msg>
   <msg key="lt_There_is_no_role_with_4">There is no role with the identifier %role_ref% (referenced by: moderator)</msg>
   <msg key="lt_There_is_no_role_with_5">There is no role with the identifier %ref% (referenced by: support activity)</msg>
+  <msg key="lt_There_is_no_role_with_6">There is no role with the identifier %ref% (referenced by: locrole property)</msg>
+  <msg key="lt_There_is_no_role_with_7">There is no role with the identifier %ref% (referenced from a monitor service)</msg>
+  <msg key="lt_There_is_no_role_with_8">There is no role with the identifier %role_ref% (referenced from within an expression)</msg>
   <msg key="lt_There_must_be_exactly">There must be exactly %multiplicity% %element_name% and there are %tree_length%. This is not supported, sorry.</msg>
   <msg key="lt_There_was_an_error_cr">There was an error creating the folder. Aborting.</msg>
   <msg key="lt_There_was_an_error_cr_1">There was an error creating the tmp_dir to unzip the file.</msg>
   <msg key="lt_There_was_an_error_ge">There was an error generating the tmp_dir to unzip the file.</msg>
   <msg key="lt_There_was_an_error_pa">There was an error parsing the manifest. Please correct it and try again. &lt;br /&gt;&lt;code&gt;%errmsg%&lt;/code&gt;</msg>
   <msg key="lt_There_was_an_error_tr">There was an error trying to delete the dir %dir%.</msg>
   <msg key="lt_Time_Limit_Identifier">Time Limit Identifier</msg>
+  <msg key="lt_Time_Property_Identif">Time Property Identifier</msg>
   <msg key="lt_ul_Completed_Activiti">&lt;ul&gt; Completed Activities &lt;br /&gt;</msg>
   <msg key="lt_ul_Next_Activity_acti">&lt;ul&gt; %first_or_next% Activity: %activity_name%</msg>
   <msg key="lt_Uploading_and_process">Uploading and processing your course, please wait...</msg>
+  <msg key="lt_Username_Property_Ide">Username Property Identifier</msg>
   <msg key="lt_Valid_types_are_learn">Valid types are learning, support and structure</msg>
   <msg key="lt_Warning_More_than_one">More than one learning object in environment %identifier%. Just one used (the first one)</msg>
   <msg key="lt_We_will_continue_auto">We will continue automatically when processing is complete.</msg>
   <msg key="lt_When_Last_Act_Complet">When Last Act Completed?</msg>
+  <msg key="lt_When_Property_Value_i">When Property Value is Set Identifier</msg>
   <msg key="Mail_Data">Mail Data</msg>
   <msg key="Manager_Identifier">Manager Identifier</msg>
   <msg key="Manifest_Identifier">Manifest Identifier</msg>
@@ -185,10 +235,16 @@
   <msg key="Play_Identifier">Play Identifier</msg>
   <msg key="Prerequistes_ID">Prerequistes ID</msg>
   <msg key="Pretty_Title">Pretty Title</msg>
+  <msg key="Property_Identifier">Property Identifier</msg>
+  <msg key="Property_Value_Ref">Property Value Ref.</msg>
   <msg key="Recipients">Recipients</msg>
+  <msg key="Reference_Identifier">Reference Identifier</msg>
+  <msg key="Reference_Type">Reference Type</msg>
   <msg key="Resource_Identifier">Resource Identifier</msg>
+  <msg key="Restriction_Type">Restriction Type</msg>
   <msg key="Role_Identifier">Role Identifier</msg>
   <msg key="Role_Type">Role Type</msg>
+  <msg key="Self">Self</msg>
   <msg key="Sendmail_Identifier">Sendmail Identifier</msg>
   <msg key="Sequence_Used">Sequence Used</msg>
   <msg key="Service_Identifier">Service Identifier</msg>
@@ -198,6 +254,7 @@
   <msg key="Staff_Roels">Staff Roels</msg>
   <msg key="Structure_Type">Structure Type</msg>
   <msg key="Support_Activities">Support Activities</msg>
+  <msg key="Then_Identifier">Then Identifier</msg>
   <msg key="Time_in_Seconds">Time in Seconds</msg>
   <msg key="Total_Activities">Total Activities</msg>
   <msg key="Total_Roles">Total Roles</msg>
@@ -207,7 +264,11 @@
   <msg key="units-of-learning">Learning Units</msg>
   <msg key="units-of-learning_Administration">Units of Learning Administration</msg>
   <msg key="Uploading_IMS_LD">Uploading IMS LD</msg>
+  <msg key="URI">URI</msg>
   <msg key="User_Choice">User Choice?</msg>
   <msg key="Value">Value</msg>
   <msg key="Version">Version</msg>
+  <msg key="When_Condition_True">When Condition True</msg>
+  <msg key="With_Control">With Control</msg>
+  <msg key="XML_Piece">XML Piece</msg>
 </message_catalog>
Index: openacs-4/packages/imsld/tcl/imsld-cr-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-cr-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/imsld/tcl/imsld-cr-procs.tcl	9 Dec 2005 12:01:31 -0000	1.4
+++ openacs-4/packages/imsld/tcl/imsld-cr-procs.tcl	1 Feb 2006 12:31:32 -0000	1.5
@@ -137,7 +137,7 @@
 
     set folder_id [content::item::get_id -item_path "imsld_root_cr_folder_${community_id}" -resolve_index f]
     if { [string eq "" $folder_id] } {
-        ad_return_error "<#_ No parent folder found #>" "<#_ No parent folder found for the ims-ld in the community %community_id%. Please report this error to the administrator. #>"
+        ad_return_error "[_ imsld.lt_No_parent_folder_foun]" "[_ imsld.lt_No_parent_folder_foun_1]"
         ad_script_abort
     }
     return $folder_id
Index: openacs-4/packages/imsld/tcl/imsld-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-install-procs.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/imsld/tcl/imsld-install-procs.tcl	30 Jan 2006 19:31:05 -0000	1.15
+++ openacs-4/packages/imsld/tcl/imsld-install-procs.tcl	1 Feb 2006 12:31:32 -0000	1.16
@@ -88,12 +88,12 @@
     content::type::attribute::new -content_type imsld_learning_activity -attribute_name component_id -datatype number -pretty_name "#imsld.Component_Identifier#" -column_spec "integer"
     content::type::attribute::new -content_type imsld_learning_activity -attribute_name activity_description_id -datatype number -pretty_name "#imsld.lt_Activity_Description_#" -column_spec "integer"
     content::type::attribute::new -content_type imsld_learning_activity -attribute_name is_visible_p -datatype string -pretty_name "#imsld.Is_Visible#" -column_spec "char(1)"
-    content::type::attribute::new -content_type imsld_learning_activity -attribute_name complete_act_id -datatype number -pretty_name "<#_ Complete Act Identifier #>" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_learning_activity -attribute_name complete_act_id -datatype number -pretty_name "#imsld.lt_Complete_Act_Identifi#" -column_spec "integer"
     content::type::attribute::new -content_type imsld_learning_activity -attribute_name on_completion_id -datatype number -pretty_name "#imsld.lt_On_Completion_Identif#" -column_spec "integer"
     content::type::attribute::new -content_type imsld_learning_activity -attribute_name parameters -datatype string -pretty_name "#imsld.Parameters#" -column_spec "varchar(4000)"
     content::type::attribute::new -content_type imsld_learning_activity -attribute_name learning_objective_id -datatype number -pretty_name "#imsld.lt_Learning_Objective_ID#" -column_spec "integer"
     content::type::attribute::new -content_type imsld_learning_activity -attribute_name prerequisite_id -datatype number -pretty_name "#imsld.Prerequistes_ID#" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_learning_activity -attribute_name sort_order -datatype number -pretty_name "<#_ Sort Order #>" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_learning_activity -attribute_name sort_order -datatype number -pretty_name "#imsld.Sort_Order#" -column_spec "integer"
 
     # support activities
     content::type::new -content_type imsld_support_activity -supertype content_revision -pretty_name "#imsld.lt_IMS-LD_Support_Activi#" -pretty_plural "#imsld.lt_IMS-LD_Support_Activi_1#" -table_name imsld_support_activities -id_column activity_id
@@ -103,10 +103,10 @@
     content::type::attribute::new -content_type imsld_support_activity -attribute_name activity_description_id -datatype number -pretty_name "#imsld.lt_Activity_Description_#" -column_spec "integer"
     content::type::attribute::new -content_type imsld_support_activity -attribute_name parameter_id -datatype number -pretty_name "#imsld.Parameter_Identifier#" -column_spec "integer"
     content::type::attribute::new -content_type imsld_support_activity -attribute_name is_visible_p -datatype string -pretty_name "#imsld.Is_Visible#" -column_spec "char(1)"
-    content::type::attribute::new -content_type imsld_support_activity -attribute_name complete_act_id -datatype number -pretty_name "<#_ Complete Act Identifier #>" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_support_activity -attribute_name complete_act_id -datatype number -pretty_name "#imsld.lt_Complete_Act_Identifi#" -column_spec "integer"
     content::type::attribute::new -content_type imsld_support_activity -attribute_name on_completion_id -datatype number -pretty_name "#imsld.lt_On_Completion_Identif#" -column_spec "integer"
     content::type::attribute::new -content_type imsld_support_activity -attribute_name parameters -datatype string -pretty_name "#imsld.Parameters#" -column_spec "varchar(4000)"
-    content::type::attribute::new -content_type imsld_support_activity -attribute_name sort_order -datatype number -pretty_name "<#_ Sort Order #>" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_support_activity -attribute_name sort_order -datatype number -pretty_name "#imsld.Sort_Order#" -column_spec "integer"
 
     # activity structures
     content::type::new -content_type imsld_activity_structure -supertype content_revision -pretty_name "#imsld.lt_IMS-LD_Activity_Struc#" -pretty_plural "#imsld.lt_IMS-LD_Activity_Struc_1#" -table_name imsld_activity_structures -id_column structure_id 
@@ -116,7 +116,7 @@
     content::type::attribute::new -content_type imsld_activity_structure -attribute_name number_to_select -datatype number -pretty_name "#imsld.Number_to_Select#" -column_spec "integer"
     content::type::attribute::new -content_type imsld_activity_structure -attribute_name structure_type -datatype string -pretty_name "#imsld.Structure_Type#" -column_spec "char(9)"
     content::type::attribute::new -content_type imsld_activity_structure -attribute_name sort -datatype string -pretty_name "#imsld.Sort#" -column_spec "varchar(4)"
-    content::type::attribute::new -content_type imsld_activity_structure -attribute_name sort_order -datatype number -pretty_name "<#_ Sort Order #>" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_activity_structure -attribute_name sort_order -datatype number -pretty_name "#imsld.Sort_Order#" -column_spec "integer"
 
     # environments
     content::type::new -content_type imsld_environment -supertype content_revision -pretty_name "#imsld.IMD-LD_Environment#" -pretty_plural "#imsld.IMD-LD_Environments#" -table_name imsld_environments -id_column environment_id
@@ -161,7 +161,7 @@
     content::type::new -content_type imsld_method -supertype content_revision -pretty_name "#imsld.IMS-LD_Method#" -pretty_plural "#imsld.IMS-LD_Methods#" -table_name imsld_methods -id_column method_id
     
     content::type::attribute::new -content_type imsld_method -attribute_name imsld_id -datatype number -pretty_name "#imsld.IMS-LD_Identifier#" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_method -attribute_name complete_act_id -datatype number -pretty_name "<#_ Complete Act Identifier #>" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_method -attribute_name complete_act_id -datatype number -pretty_name "#imsld.lt_Complete_Act_Identifi#" -column_spec "integer"
     content::type::attribute::new -content_type imsld_method -attribute_name on_completion_id -datatype number -pretty_name "#imsld.lt_On_Completion_Identif#" -column_spec "integer"
 
     # plays
@@ -170,15 +170,15 @@
     content::type::attribute::new -content_type imsld_play -attribute_name method_id -datatype number -pretty_name "#imsld.Method_Identifier#" -column_spec "integer"
     content::type::attribute::new -content_type imsld_play -attribute_name is_visible_p -datatype string -pretty_name "#imsld.Is_Visible#" -column_spec "char(1)"
     content::type::attribute::new -content_type imsld_play -attribute_name identifier -datatype string -pretty_name "#imsld.Identifier#" -column_spec "varchar(100)"
-    content::type::attribute::new -content_type imsld_play -attribute_name complete_act_id -datatype number -pretty_name "<#_ Complete Act Identifier #>" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_play -attribute_name complete_act_id -datatype number -pretty_name "#imsld.lt_Complete_Act_Identifi#" -column_spec "integer"
     content::type::attribute::new -content_type imsld_play -attribute_name on_completion_id -datatype number -pretty_name "#imsld.lt_On_Completion_Identif#" -column_spec "integer"
     content::type::attribute::new -content_type imsld_play -attribute_name sort_order -datatype number -pretty_name "#imsld.Sort_Order#" -column_spec "integer"
     
     # acts
     content::type::new -content_type imsld_act -supertype content_revision -pretty_name "#imsld.IMS-LD_Act#" -pretty_plural "#imsld.IMS-LD_Acts#" -table_name imsld_acts -id_column act_id
 
     content::type::attribute::new -content_type imsld_act -attribute_name play_id -datatype number -pretty_name "#imsld.Play_Identifier#" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_act -attribute_name complete_act_id -datatype number -pretty_name "<#_ Complete Act Identifier #>" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_act -attribute_name complete_act_id -datatype number -pretty_name "#imsld.lt_Complete_Act_Identifi#" -column_spec "integer"
     content::type::attribute::new -content_type imsld_act -attribute_name identifier -datatype string -pretty_name "#imsld.Identifier#" -column_spec "varchar(100)"
     content::type::attribute::new -content_type imsld_act -attribute_name on_completion_id -datatype number -pretty_name "#imsld.lt_On_Completion_Identif#" -column_spec "integer"
     content::type::attribute::new -content_type imsld_act -attribute_name sort_order -datatype number -pretty_name "#imsld.Sort_Order#" -column_spec "integer"
@@ -196,7 +196,7 @@
     content::type::attribute::new -content_type imsld_role_part -attribute_name sort_order -datatype number -pretty_name "#imsld.Sort_Order#" -column_spec "integer"
 
     # complete acts
-    content::type::new -content_type imsld_complete_act -supertype content_revision -pretty_name "<#_ Complete Act #>" -pretty_plural "<#_ Complete Acts #>" -table_name imsld_complete_acts -id_column complete_act_id
+    content::type::new -content_type imsld_complete_act -supertype content_revision -pretty_name "#imsld.Complete_Act#" -pretty_plural "#imsld.Complete_Acts#" -table_name imsld_complete_acts -id_column complete_act_id
     
     content::type::attribute::new -content_type imsld_complete_act -attribute_name time_in_seconds -datatype number -pretty_name "#imsld.Time_in_Seconds#" -column_spec "integer"
     content::type::attribute::new -content_type imsld_complete_act -attribute_name user_choice_p -datatype string -pretty_name "#imsld.User_Choice#" -column_spec "char(1)"
@@ -247,95 +247,95 @@
     ### IMS-LD LEVEL B
 
     # properties
-    content::type::new -content_type imsld_property -supertype content_revision -pretty_name "<#_ IMS-LD Property #>" -pretty_plural "<#_ IMS-LD Properties #>" -table_name imsld_properties -id_column property_id
+    content::type::new -content_type imsld_property -supertype content_revision -pretty_name "#imsld.IMS-LD_Property#" -pretty_plural "#imsld.IMS-LD_Properties#" -table_name imsld_properties -id_column property_id
 
-    content::type::attribute::new -content_type imsld_property -attribute_name component_id -datatype number -pretty_name "<#_ Component Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_property -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-    content::type::attribute::new -content_type imsld_property -attribute_name type -datatype string -pretty_name "<#_ Type #>" -column_spec "varchar(20)"
-    content::type::attribute::new -content_type imsld_property -attribute_name datatype -datatype string -pretty_name "<#_ Data Type #>" -column_spec "varchar(20)"
-    content::type::attribute::new -content_type imsld_property -attribute_name initial_value -datatype string -pretty_name "<#_ Initial Value #>" -column_spec "varchar(4000)"
-    content::type::attribute::new -content_type imsld_property -attribute_name role_id -datatype number -pretty_name "<#_ Role Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_property -attribute_name existing_href -datatype string -pretty_name "<#_ Existing href #>" -column_spec "varchar(2000)"
-    content::type::attribute::new -content_type imsld_property -attribute_name uri -datatype string -pretty_name "<#_ URI #>" -column_spec "varchar(2000)"
+    content::type::attribute::new -content_type imsld_property -attribute_name component_id -datatype number -pretty_name "#imsld.Component_Identifier#" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_property -attribute_name identifier -datatype string -pretty_name "#imsld.Identifier#" -column_spec "varchar(100)"
+    content::type::attribute::new -content_type imsld_property -attribute_name type -datatype string -pretty_name "#imsld.Type#" -column_spec "varchar(20)"
+    content::type::attribute::new -content_type imsld_property -attribute_name datatype -datatype string -pretty_name "#imsld.Data_Type#" -column_spec "varchar(20)"
+    content::type::attribute::new -content_type imsld_property -attribute_name initial_value -datatype string -pretty_name "#imsld.Initial_Value#" -column_spec "varchar(4000)"
+    content::type::attribute::new -content_type imsld_property -attribute_name role_id -datatype number -pretty_name "#imsld.Role_Identifier#" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_property -attribute_name existing_href -datatype string -pretty_name "#imsld.Existing_href#" -column_spec "varchar(2000)"
+    content::type::attribute::new -content_type imsld_property -attribute_name uri -datatype string -pretty_name "#imsld.URI#" -column_spec "varchar(2000)"
 
     # property groups
-    content::type::new -content_type imsld_property_group -supertype content_revision -pretty_name "<#_ IMS-LD Property Group #>" -pretty_plural "<#_ IMS-LD Property Groups #>" -table_name imsld_property_groups -id_column property_group_id
+    content::type::new -content_type imsld_property_group -supertype content_revision -pretty_name "#imsld.lt_IMS-LD_Property_Group#" -pretty_plural "#imsld.lt_IMS-LD_Property_Group_1#" -table_name imsld_property_groups -id_column property_group_id
 
-    content::type::attribute::new -content_type imsld_property_group -attribute_name component_id -datatype number -pretty_name "<#_ Component Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_property_group -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
+    content::type::attribute::new -content_type imsld_property_group -attribute_name component_id -datatype number -pretty_name "#imsld.Component_Identifier#" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_property_group -attribute_name identifier -datatype string -pretty_name "#imsld.Identifier#" -column_spec "varchar(100)"
 
     # restrictions
-    content::type::new -content_type imsld_restriction -supertype content_revision -pretty_name "<#_ IMS-LD Restriction #>" -pretty_plural "<#_ IMS-LD Restrictions #>" -table_name imsld_restrictions -id_column restriction_id
+    content::type::new -content_type imsld_restriction -supertype content_revision -pretty_name "#imsld.IMS-LD_Restriction#" -pretty_plural "#imsld.IMS-LD_Restrictions#" -table_name imsld_restrictions -id_column restriction_id
 
-    content::type::attribute::new -content_type imsld_restriction -attribute_name property_id -datatype number -pretty_name "<#_ Property Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_restriction -attribute_name restriction_type -datatype string -pretty_name "<#_ Restriction Type #>" -column_spec "varchar(20)"
-    content::type::attribute::new -content_type imsld_restriction -attribute_name value -datatype string -pretty_name "<#_ Value #>" -column_spec "varchar"
+    content::type::attribute::new -content_type imsld_restriction -attribute_name property_id -datatype number -pretty_name "#imsld.Property_Identifier#" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_restriction -attribute_name restriction_type -datatype string -pretty_name "#imsld.Restriction_Type#" -column_spec "varchar(20)"
+    content::type::attribute::new -content_type imsld_restriction -attribute_name value -datatype string -pretty_name "#imsld.Value#" -column_spec "varchar"
 
     # property values
-    content::type::new -content_type imsld_property_value -supertype content_revision -pretty_name "<#_ IMS-LD Property Value #>" -pretty_plural "<#_ IMS-LD Property Values #>" -table_name imsld_property_values -id_column property_value_id
+    content::type::new -content_type imsld_property_value -supertype content_revision -pretty_name "#imsld.lt_IMS-LD_Property_Value#" -pretty_plural "#imsld.lt_IMS-LD_Property_Value_1#" -table_name imsld_property_values -id_column property_value_id
 
-    content::type::attribute::new -content_type imsld_property_value -attribute_name property_id -datatype number -pretty_name "<#_ Property Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_property_value -attribute_name langstring -datatype string -pretty_name "<#_ Langstring #>" -column_spec "varchar(4000)"
-    content::type::attribute::new -content_type imsld_property_value -attribute_name calculate_id -datatype number -pretty_name "<#_ Calulate Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_property_value -attribute_name property_value_ref -datatype number -pretty_name "<#_ Property Value Ref. #>" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_property_value -attribute_name property_id -datatype number -pretty_name "#imsld.Property_Identifier#" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_property_value -attribute_name langstring -datatype string -pretty_name "#imsld.Langstring#" -column_spec "varchar(4000)"
+    content::type::attribute::new -content_type imsld_property_value -attribute_name calculate_id -datatype number -pretty_name "#imsld.Calulate_Identifier#" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_property_value -attribute_name property_value_ref -datatype number -pretty_name "#imsld.Property_Value_Ref#" -column_spec "integer"
 
     # complete acts
-    content::type::attribute::new -content_type imsld_complete_act -attribute_name time_property_id -datatype number -pretty_name "<#_ Time Property Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_complete_act -attribute_name when_prop_val_is_set_id -datatype number -pretty_name "<#_ When Property Value is Set Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_complete_act -attribute_name when_condition_true_id -datatype number -pretty_name "<#_ When Condition True #>" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_complete_act -attribute_name time_property_id -datatype number -pretty_name "#imsld.lt_Time_Property_Identif#" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_complete_act -attribute_name when_prop_val_is_set_id -datatype number -pretty_name "#imsld.lt_When_Property_Value_i#" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_complete_act -attribute_name when_condition_true_id -datatype number -pretty_name "#imsld.When_Condition_True#" -column_spec "integer"
 
     # monitor service
-    content::type::new -content_type imsld_monitor_service -supertype content_revision -pretty_name "<#_ IMS-LD Monitor Service #>" -pretty_plural "<#_ IMS-LD Monitor Services #>" -table_name imsld_monitor_services -id_column monitor_id
+    content::type::new -content_type imsld_monitor_service -supertype content_revision -pretty_name "#imsld.lt_IMS-LD_Monitor_Servic#" -pretty_plural "#imsld.lt_IMS-LD_Monitor_Servic_1#" -table_name imsld_monitor_services -id_column monitor_id
 
-    content::type::attribute::new -content_type imsld_monitor_service -attribute_name service_id -datatype number -pretty_name "<#_ Service Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_monitor_service -attribute_name role_id -datatype number -pretty_name "<#_ Role Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_monitor_service -attribute_name self_p -datatype string -pretty_name "<#_ Self #>" -column_spec "char(1)"
-    content::type::attribute::new -content_type imsld_monitor_service -attribute_name imsld_item_id -datatype number -pretty_name "<#_ IMS-LD Item Identifier #>" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_monitor_service -attribute_name service_id -datatype number -pretty_name "#imsld.Service_Identifier#" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_monitor_service -attribute_name role_id -datatype number -pretty_name "#imsld.Role_Identifier#" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_monitor_service -attribute_name self_p -datatype string -pretty_name "#imsld.Self#" -column_spec "char(1)"
+    content::type::attribute::new -content_type imsld_monitor_service -attribute_name imsld_item_id -datatype number -pretty_name "#imsld.lt_IMS-LD_Item_Identifie#" -column_spec "integer"
 
     # send mail service
-    content::type::attribute::new -content_type imsld_send_mail_service -attribute_name email_property_id -datatype number -pretty_name "<#_ Email Propery Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_send_mail_service -attribute_name username_property_id -datatype number -pretty_name "<#_ Username Property Identifier #>" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_send_mail_service -attribute_name email_property_id -datatype number -pretty_name "#imsld.lt_Email_Propery_Identif#" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_send_mail_service -attribute_name username_property_id -datatype number -pretty_name "#imsld.lt_Username_Property_Ide#" -column_spec "integer"
 
     # when condition true
-    content::type::new -content_type imsld_when_condition_true -supertype content_revision -pretty_name "<#_ IMS-LD When Condition True #>" -pretty_plural "<#_ IMS-LD When Conditions True #>" -table_name imsld_when_condition_true -id_column when_condition_true_id
+    content::type::new -content_type imsld_when_condition_true -supertype content_revision -pretty_name "#imsld.lt_IMS-LD_When_Condition#" -pretty_plural "#imsld.lt_IMS-LD_When_Condition_1#" -table_name imsld_when_condition_true -id_column when_condition_true_id
 
-    content::type::attribute::new -content_type imsld_when_condition_true -attribute_name role_id -datatype number -pretty_name "<#_ Role Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_when_condition_true -attribute_name expression_id -datatype number -pretty_name "<#_ Expression Identifier #>" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_when_condition_true -attribute_name role_id -datatype number -pretty_name "#imsld.Role_Identifier#" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_when_condition_true -attribute_name expression_id -datatype number -pretty_name "#imsld.lt_Expression_Identifier#" -column_spec "integer"
 
     # expressions, conditions and calculate
-    content::type::new -content_type imsld_expression -supertype content_revision -pretty_name "<#_ IMS-LD Expression #>" -pretty_plural "<#_ IMS-LD Expressions #>" -table_name imsld_expressions -id_column expression_id
+    content::type::new -content_type imsld_expression -supertype content_revision -pretty_name "#imsld.IMS-LD_Expression#" -pretty_plural "#imsld.IMS-LD_Expressions#" -table_name imsld_expressions -id_column expression_id
 
-    content::type::attribute::new -content_type imsld_expression -attribute_name imsld_id -datatype number -pretty_name "<#_ IMS-LD Intifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_expression -attribute_name xml_piece -datatype string -pretty_name "<#_ XML Piece #>" -column_spec "text"
+    content::type::attribute::new -content_type imsld_expression -attribute_name imsld_id -datatype number -pretty_name "#imsld.IMS-LD_Intifier#" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_expression -attribute_name xml_piece -datatype string -pretty_name "#imsld.XML_Piece#" -column_spec "text"
 
 #     # conditions 
-#     content::type::new -content_type imsld_condition -supertype content_revision -pretty_name "<#_ IMS-LD Condition #>" -pretty_plural "<#_ IMS-LD Conditions #>" -table_name imsld_conditions -id_column condition_id
+#     content::type::new -content_type imsld_condition -supertype content_revision -pretty_name "#imsld.IMS-LD_Condition#" -pretty_plural "#imsld.IMS-LD_Conditions#" -table_name imsld_conditions -id_column condition_id
 
-#     content::type::attribute::new -content_type imsld_condition -attribute_name method_id -datatype number -pretty_name "<#_ Method Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_condition -attribute_name if_id -datatype number -pretty_name "<#_ If Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_condition -attribute_name then_id -datatype number -pretty_name "<#_ Then Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_condition -attribute_name else_id -datatype number -pretty_name "<#_ Else Identifier #>" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_condition -attribute_name method_id -datatype number -pretty_name "#imsld.Method_Identifier#" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_condition -attribute_name if_id -datatype number -pretty_name "#imsld.If_Identifier#" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_condition -attribute_name then_id -datatype number -pretty_name "#imsld.Then_Identifier#" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_condition -attribute_name else_id -datatype number -pretty_name "#imsld.Else_Identifier#" -column_spec "integer"
 
 #     # expressions
-#     content::type::new -content_type imsld_expression -supertype content_revision -pretty_name "<#_ IMS-LD Expression #>" -pretty_plural "<#_ IMS-LD Expressions #>" -table_name imsld_expressions -id_column expression_id
+#     content::type::new -content_type imsld_expression -supertype content_revision -pretty_name "#imsld.IMS-LD_Expression#" -pretty_plural "#imsld.IMS-LD_Expressions#" -table_name imsld_expressions -id_column expression_id
 
-#     content::type::attribute::new -content_type imsld_expression -attribute_name type -datatype string -pretty_name "<#_ Type #>" -column_spec "varchar(25)"
-#     content::type::attribute::new -content_type imsld_expression -attribute_name role_id -datatype number -pretty_name "<#_ Role Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_expression -attribute_name calculate_id -datatype number -pretty_name "<#_ Caluclate Identifier  #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_expression -attribute_name exp_one_id -datatype number -pretty_name "<#_ Expression One Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_expression -attribute_name exp_two_id -datatype number -pretty_name "<#_ Expression Two Identifer #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_expression -attribute_name property_id -datatype number -pretty_name "<#_ Property Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_expression -attribute_name ref_type -datatype string -pretty_name "<#_ Reference Type #>" -column_spec "varchar(20)"
-#     content::type::attribute::new -content_type imsld_expression -attribute_name ref_id -datatype number -pretty_name "<#_ Reference Identifier #>" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_expression -attribute_name type -datatype string -pretty_name "#imsld.Type#" -column_spec "varchar(25)"
+#     content::type::attribute::new -content_type imsld_expression -attribute_name role_id -datatype number -pretty_name "#imsld.Role_Identifier#" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_expression -attribute_name calculate_id -datatype number -pretty_name "#imsld.Caluclate_Identifier#" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_expression -attribute_name exp_one_id -datatype number -pretty_name "#imsld.lt_Expression_One_Identi#" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_expression -attribute_name exp_two_id -datatype number -pretty_name "#imsld.lt_Expression_Two_Identi#" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_expression -attribute_name property_id -datatype number -pretty_name "#imsld.Property_Identifier#" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_expression -attribute_name ref_type -datatype string -pretty_name "#imsld.Reference_Type#" -column_spec "varchar(20)"
+#     content::type::attribute::new -content_type imsld_expression -attribute_name ref_id -datatype number -pretty_name "#imsld.Reference_Identifier#" -column_spec "integer"
 
 #     # then model
-#     content::type::new -content_type imsld_then_model -supertype content_revision -pretty_name "<#_ IMS-LD Then Model #>" -pretty_plural "<#_ IMS-LD Then Models #>" -table_name imsld_then_model -id_column then_model_id
+#     content::type::new -content_type imsld_then_model -supertype content_revision -pretty_name "#imsld.IMS-LD_Then_Model#" -pretty_plural "#imsld.IMS-LD_Then_Models#" -table_name imsld_then_model -id_column then_model_id
 
-#     content::type::attribute::new -content_type imsld_then_model -attribute_name type -datatype string -pretty_name "<#_ Type #>" -column_spec "varchar(20)"
-#     content::type::attribute::new -content_type imsld_then_model -attribute_name ref_type -datatype string -pretty_name "<#_ Reference Type #>" -column_spec "varchar(20)"
-#     content::type::attribute::new -content_type imsld_then_model -attribute_name ref_id -datatype number -pretty_name "<#_ Reference Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_then_model -attribute_name with_control_p -datatype string -pretty_name "<#_ With Control #>" -column_spec "char(1)"
-#     content::type::attribute::new -content_type imsld_then_model -attribute_name change_prop_val_id -datatype number -pretty_name "<#_ Change Property Value Identifier #>" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_then_model -attribute_name type -datatype string -pretty_name "#imsld.Type#" -column_spec "varchar(20)"
+#     content::type::attribute::new -content_type imsld_then_model -attribute_name ref_type -datatype string -pretty_name "#imsld.Reference_Type#" -column_spec "varchar(20)"
+#     content::type::attribute::new -content_type imsld_then_model -attribute_name ref_id -datatype number -pretty_name "#imsld.Reference_Identifier#" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_then_model -attribute_name with_control_p -datatype string -pretty_name "#imsld.With_Control#" -column_spec "char(1)"
+#     content::type::attribute::new -content_type imsld_then_model -attribute_name change_prop_val_id -datatype number -pretty_name "#imsld.lt_Change_Property_Value#" -column_spec "integer"
 
 }
 
Index: openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl	1 Feb 2006 11:34:48 -0000	1.28
+++ openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl	1 Feb 2006 12:31:32 -0000	1.29
@@ -981,7 +981,7 @@
             and component_id = :component_id
         }] } {
             # there is no property with that identifier, return the error
-            return [list 0 "<#_ There is no property with the identifier %ref% (referenced by: property group %identifier%) #>"]
+            return [list 0 "[_ imsld.lt_There_is_no_property_]"]
         }
         relation_add imsld_gprop_prop_rel $property_group_id $property_item_id
     }
@@ -1029,7 +1029,7 @@
                 relation_add imsld_gprop_gprop_rel $property_group_id $property_group_ref_id
             } else {
                 # error
-                return [list 0 "<#_ There is no property-group with the identifier %ref% (referenced by property-group %identifier%) #>"]
+                return [list 0 "[_ imsld.lt_There_is_no_property-]"]
             }
         } else {
             # do the mappings
@@ -1169,7 +1169,7 @@
             and component_id = :component_id
         }] } {
             # there is no role with that identifier, return the error
-            return [list 0 "<#_ There is no role with the identifier %ref% (referenced by: locrole property) #>"]
+            return [list 0 "[_ imsld.lt_There_is_no_role_with_6]"]
         }
 
         set lrp_initial_value [$locrole_property child all imsld:initial-value] 
@@ -1566,7 +1566,7 @@
                     and content_revision__is_live(property_id) = 't' 
                     and component_id = :component_id }] } {
                     # there is no property with that identifier, return the error
-                    return [list 0 "<#_ There is no property with the identifier %email_property_ref% (referenced from an email data) #>"]
+                    return [list 0 "[_ imsld.lt_There_is_no_property__1]"]
                 } 
             } else {
                 set email_property_id ""
@@ -1582,7 +1582,7 @@
                     and content_revision__is_live(property_id) = 't' 
                     and component_id = :component_id }] } {
                     # there is no property with that identifier, return the error
-                    return [list 0 "<#_ There is no property with the identifier %username_property_ref% (referenced from an email data) #>"]
+                    return [list 0 "[_ imsld.lt_There_is_no_property__2]"]
                 }
             } else {
                 set username_property_id ""
@@ -1789,7 +1789,7 @@
             and ir.component_id = :component_id
         }] } {
             # there is no role with that identifier, return the error
-            return [list 0 "<#_ There is no role with the identifier %ref% (referenced from a monitor service) #>"]
+            return [list 0 "[_ imsld.lt_There_is_no_role_with_7]"]
         }
         
         # monitor: self
@@ -1986,7 +1986,7 @@
         and component_id = :component_id
     }] } {
         # there is no property with that identifier, return the error
-        return [list 0 "<#_ There is no property with the identifier %ref% (referenced by: property value #>"]
+        return [list 0 "[_ imsld.lt_There_is_no_property__3]"]
     }
     
     # Property Value
@@ -3623,7 +3623,7 @@
 #             and content_revision__is_live(ir.role_id) = 't' 
 #         }] } {
 #             # there is no role with that identifier, return the error
-#             return [list 0 "<#_ There is no role with the identifier %role_ref% (referenced from within an expression) #>]"]
+#             return [list 0 "[_ imsld.lt_There_is_no_role_with_8]]"]
 #         }
 #     }
 
Index: openacs-4/packages/imsld/tcl/imsld-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-procs.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/imsld/tcl/imsld-procs.tcl	1 Feb 2006 11:48:25 -0000	1.21
+++ openacs-4/packages/imsld/tcl/imsld-procs.tcl	1 Feb 2006 12:31:32 -0000	1.22
@@ -273,7 +273,7 @@
         set activity_id [lindex $referenced_sa 1]
         set time_in_seconds [lindex $referenced_sa 2]
         set role_part_id [imsld::get_role_part_from_activity -activity_type support -leaf_id $sa_item_id]
-        db_1row get_activity_info {
+        db_1row get_sa_activity_info {
             select icm.manifest_id,
             ii.imsld_id,
             ip.play_id,
@@ -330,7 +330,7 @@
         set activity_id [lindex $referenced_la 1]
         set time_in_seconds [lindex $referenced_la 2]
         set role_part_id [imsld::get_role_part_from_activity -activity_type learning -leaf_id $la_item_id]
-        db_1row get_activity_info {
+        db_1row get_la_activity_info {
             select icm.manifest_id,
             ii.imsld_id,
             ip.play_id,
@@ -2185,7 +2185,7 @@
                         and rp.sort_order = (select min(irp2.sort_order) from imsld_role_parts irp2 where irp2.act_id = ia.item_id)
                     }] } {
                         # there is no more to search, we reached the end of the unit of learning
-                        template::multirow append imsld_multirow {} {} {} {} {} "<#_ Learning Unit finished #>"
+                        template::multirow append imsld_multirow {} {} {} {} {} "[_ imsld.lt_Learning_Unit_finishe]"
                         return [template::multirow size imsld_multirow]
                     }
                 }
Index: openacs-4/packages/imsld/tcl/imsld-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-procs.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/imsld/tcl/imsld-procs.xql	1 Feb 2006 11:34:48 -0000	1.1
+++ openacs-4/packages/imsld/tcl/imsld-procs.xql	1 Feb 2006 12:31:32 -0000	1.2
@@ -20,15 +20,15 @@
         select icm.manifest_id,
         ii.imsld_id,
         im.method_id, 
-        tl.time_in_seconds,
+        ca.time_in_seconds,
         icm.creation_date
         from imsld_cp_manifestsi icm, imsld_cp_organizationsi ico, 
-        imsld_imsldsi ii, imsld_methodsi im, imsld_time_limitsi tl
+        imsld_imsldsi ii, imsld_methodsi im, imsld_complete_actsi ca
         where im.imsld_id = ii.item_id
         and ii.organization_id = ico.item_id
         and ico.manifest_id = icm.item_id
-        and im.time_limit_id is not null
-        and im.time_limit_id = tl.item_id
+        and im.complete_act_id = ca.item_id
+        and ca.time_in_seconds is not null
         and content_revision__is_live(im.method_id) = 't'
     
 		</querytext>
@@ -60,17 +60,17 @@
         select icm.manifest_id,
         ii.imsld_id,
         ip.play_id,
-        tl.time_in_seconds,
+        ca.time_in_seconds,
         icm.creation_date
         from imsld_cp_manifestsi icm, imsld_cp_organizationsi ico, 
         imsld_imsldsi ii, imsld_methodsi im, imsld_plays ip,
-        imsld_time_limitsi tl
+        imsld_complete_actsi ca
         where ip.method_id = im.item_id
         and im.imsld_id = ii.item_id
         and ii.organization_id = ico.item_id
         and ico.manifest_id = icm.item_id
-        and ip.time_limit_id is not null
-        and ip.time_limit_id = tl.item_id
+        and ip.complete_act_id = ca.item_id
+        and ca.time_in_seconds is not null
         and content_revision__is_live(ip.play_id) = 't'
     
 		</querytext>
@@ -86,18 +86,18 @@
         ii.imsld_id,
         ip.play_id,
         ia.act_id,
-        tl.time_in_seconds,
+        ca.time_in_seconds,
         icm.creation_date
         from imsld_cp_manifestsi icm, imsld_cp_organizationsi ico, 
         imsld_imsldsi ii, imsld_methodsi im, imsld_playsi ip, imsld_acts ia,
-        imsld_time_limitsi tl
+        imsld_complete_actsi ca
         where ia.play_id = ip.item_id
         and ip.method_id = im.item_id
         and im.imsld_id = ii.item_id
         and ii.organization_id = ico.item_id
         and ico.manifest_id = icm.item_id
-        and ia.time_limit_id is not null
-        and ia.time_limit_id = tl.item_id
+        and ia.complete_act_id = ca.item_id
+        and ca.time_in_seconds is not null
         and content_revision__is_live(ia.act_id) = 't'
     
 		</querytext>
@@ -107,70 +107,79 @@
 
 
 
-	<fullquery name="imsld::sweep_expired_activities.possible_expired_support_activities">
+	<fullquery name="imsld::sweep_expired_activities.referenced_sas">
 		<querytext>
-        select icm.manifest_id,
+        select sa.item_id as sa_item_id,
         sa.activity_id,
-        ii.imsld_id,
-        ip.play_id,
-        ia.act_id,
-        irp.role_part_id,
-        tl.time_in_seconds,
-        icm.creation_date
-        from imsld_cp_manifestsi icm, imsld_cp_organizationsi ico, 
-        imsld_imsldsi ii, imsld_methodsi im, imsld_playsi ip, 
-        imsld_actsi ia, imsld_role_partsi irp, imsld_support_activitiesi sa,
-        imsld_time_limitsi tl
-        where sa.item_id = irp.support_activity_id
-        and irp.act_id = ia.item_id
-        and ia.play_id = ip.item_id
-        and ip.method_id = im.item_id
-        and im.imsld_id = ii.item_id
-        and ii.organization_id = ico.item_id
-        and ico.manifest_id = icm.item_id
-        and sa.time_limit_id is not null
-        and sa.time_limit_id = tl.item_id
-        and content_revision__is_live(sa.activity_id) = 't'
+        ca.time_in_seconds
+        from imsld_support_activitiesi sa,
+        imsld_complete_actsi ca
+        where sa.complete_act_id = ca.item_id
+        and content_revision__is_live(ca.complete_act_id) = 't'
+        and ca.time_in_seconds is not null
     
 		</querytext>
 	</fullquery>
 
+	<fullquery name="imsld::sweep_expired_activities.get_sa_activity_info">
+		<querytext>
+            select icm.manifest_id,
+            ii.imsld_id,
+            ip.play_id,
+            ia.act_id,
+            icm.creation_date
+            from imsld_cp_manifestsi icm, imsld_cp_organizationsi ico, 
+            imsld_imsldsi ii, imsld_methodsi im, imsld_playsi ip, 
+            imsld_actsi ia, imsld_role_partsi irp
+            where irp.role_part_id = :role_part_id
+            and irp.act_id = ia.item_id
+            and ia.play_id = ip.item_id
+            and ip.method_id = im.item_id
+            and im.imsld_id = ii.item_id
+            and ii.organization_id = ico.item_id
+            and ico.manifest_id = icm.item_id
+            and content_revision__is_live(icm.manifest_id) = 't'
+    
+		</querytext>
+	</fullquery>
 
-
-
-
-	<fullquery name="imsld::sweep_expired_activities.possible_expired_learning_activities">
+	<fullquery name="imsld::sweep_expired_activities.referenced_las">
 		<querytext>
-        select icm.manifest_id,
+        select la.item_id as la_item_id,
         la.activity_id,
-        ii.imsld_id,
-        ip.play_id,
-        ia.act_id,
-        irp.role_part_id,
-        tl.time_in_seconds,
-        icm.creation_date
-        from imsld_cp_manifestsi icm, imsld_cp_organizationsi ico, 
-        imsld_imsldsi ii, imsld_methodsi im, imsld_playsi ip, 
-        imsld_actsi ia, imsld_role_partsi irp, imsld_learning_activitiesi la,
-        imsld_time_limitsi tl
-        where la.item_id = irp.learning_activity_id
-        and irp.act_id = ia.item_id
-        and ia.play_id = ip.item_id
-        and ip.method_id = im.item_id
-        and im.imsld_id = ii.item_id
-        and ii.organization_id = ico.item_id
-        and ico.manifest_id = icm.item_id
-        and la.time_limit_id is not null
-        and la.time_limit_id = tl.item_id
-        and content_revision__is_live(la.activity_id) = 't'
+        ca.time_in_seconds
+        from imsld_learning_activitiesi la,
+        imsld_complete_actsi ca
+        where la.complete_act_id = ca.item_id
+        and content_revision__is_live(ca.complete_act_id) = 't'
+        and ca.time_in_seconds is not null
     
 		</querytext>
 	</fullquery>
 
+	<fullquery name="imsld::sweep_expired_activities.get_la_activity_info">
+		<querytext>
+            select icm.manifest_id,
+            ii.imsld_id,
+            ip.play_id,
+            ia.act_id,
+            icm.creation_date
+            from imsld_cp_manifestsi icm, imsld_cp_organizationsi ico, 
+            imsld_imsldsi ii, imsld_methodsi im, imsld_playsi ip, 
+            imsld_actsi ia, imsld_role_partsi irp
+            where irp.role_part_id = :role_part_id
+            and irp.act_id = ia.item_id
+            and ia.play_id = ip.item_id
+            and ip.method_id = im.item_id
+            and im.imsld_id = ii.item_id
+            and ii.organization_id = ico.item_id
+            and ico.manifest_id = icm.item_id
+            and content_revision__is_live(icm.manifest_id) = 't'
 
+		</querytext>
+	</fullquery>
 
 
-
 	<fullquery name="imsld::mark_role_part_finished.role_part_info">
 		<querytext>
         select item_id as role_part_item_id
@@ -459,16 +468,17 @@
             ip.item_id as play_item_id,
             ia.act_id,
             ia.item_id as act_item_id,
-            ip.when_last_act_completed_p,
+            ica.when_last_act_completed_p,
             im.method_id,
             im.item_id as method_item_id
-            from imsld_imsldsi ii, imsld_methodsi im, imsld_playsi ip, imsld_actsi ia, imsld_role_parts irp
+            from imsld_imsldsi ii, imsld_actsi ia, imsld_role_parts irp, 
+               imsld_methodsi im, imsld_playsi ip left outer join imsld_complete_actsi ica on (ip.complete_act_id = ica.item_id)
             where irp.role_part_id = :role_part_id
             and irp.act_id = ia.item_id
             and ia.play_id = ip.item_id
             and ip.method_id = im.item_id
             and im.imsld_id = ii.item_id
-            and content_revision__is_live(ii.imsld_id) = 't'
+            and content_revision__is_live(ii.imsld_id) = 't';
         
 		</querytext>
 	</fullquery>
@@ -1448,8 +1458,7 @@
             select la.activity_id,
             la.item_id as activity_item_id,
             la.title as activity_title,
-            la.identifier,
-            la.user_choice_p
+            la.identifier
             from imsld_learning_activitiesi la
             where la.activity_id = :activity_id
         
@@ -1462,8 +1471,7 @@
             select sa.activity_id,
             sa.item_id as activity_item_id,
             sa.title as activity_title,
-            sa.identifier,
-            sa.user_choice_p
+            sa.identifier
             from imsld_support_activitiesi sa
             where sa.activity_id = :activity_id