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.2 -r1.3
--- openacs-4/packages/imsld/tcl/imsld-cr-procs.tcl	4 Oct 2005 13:45:40 -0000	1.2
+++ openacs-4/packages/imsld/tcl/imsld-cr-procs.tcl	5 Oct 2005 15:33:25 -0000	1.3
@@ -45,7 +45,7 @@
         content::folder::register_content_type -folder_id $folder_id -content_type content_simlink -include_subtypes t
         permission::grant -party_id $user_id -object_id $folder_id -privilege admin
     } on_error {
-        ad_return_error "<#_ Error creating folder #>" "<#_ There was an error creating the folder. Aborting. #> <pre>$errmsg</pre>"
+        ad_return_error "[_ imsld.lt_Error_creating_folder]" "[_ imsld.lt_There_was_an_error_cr] <pre>$errmsg</pre>"
         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.8 -r1.9
--- openacs-4/packages/imsld/tcl/imsld-install-procs.tcl	4 Oct 2005 13:45:40 -0000	1.8
+++ openacs-4/packages/imsld/tcl/imsld-install-procs.tcl	5 Oct 2005 15:33:25 -0000	1.9
@@ -19,226 +19,226 @@
 
     ### IMS-LD
     # learning objects
-    content::type::new -content_type imsld_learning_object -supertype content_revision -pretty_name "<#_ Learning Object #>" -pretty_plural "<#_ Learning Objects #>" -table_name imsld_learning_objects -id_column learning_object_id
+    content::type::new -content_type imsld_learning_object -supertype content_revision -pretty_name "[_ imsld.Learning_Object]" -pretty_plural "[_ imsld.Learning_Objects]" -table_name imsld_learning_objects -id_column learning_object_id
     
-    content::type::attribute::new -content_type imsld_learning_object -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-    content::type::attribute::new -content_type imsld_learning_object -attribute_name class -datatype string -pretty_name "<#_ Class #>" -column_spec "varchar(4000)"
-    content::type::attribute::new -content_type imsld_learning_object -attribute_name is_visible_p -datatype string -pretty_name "<#_ Is Visible? #>" -column_spec "char(1)"
-    content::type::attribute::new -content_type imsld_learning_object -attribute_name type -datatype string -pretty_name "<#_ Type #>" -column_spec "varchar(100)"
-    content::type::attribute::new -content_type imsld_learning_object -attribute_name parameters -datatype string -pretty_name "<#_ Parameters #>" -column_spec "varchar(4000)"
+    content::type::attribute::new -content_type imsld_learning_object -attribute_name identifier -datatype string -pretty_name "[_ imsld.Identifier]" -column_spec "varchar(100)"
+    content::type::attribute::new -content_type imsld_learning_object -attribute_name class -datatype string -pretty_name "[_ imsld.Class]" -column_spec "varchar(4000)"
+    content::type::attribute::new -content_type imsld_learning_object -attribute_name is_visible_p -datatype string -pretty_name "[_ imsld.Is_Visible]" -column_spec "char(1)"
+    content::type::attribute::new -content_type imsld_learning_object -attribute_name type -datatype string -pretty_name "[_ imsld.Type]" -column_spec "varchar(100)"
+    content::type::attribute::new -content_type imsld_learning_object -attribute_name parameters -datatype string -pretty_name "[_ imsld.Parameters]" -column_spec "varchar(4000)"
     
     # imsld 
-    content::type::new -content_type imsld_imsld -supertype content_revision -pretty_name "<#_ IMS-LD #>" -pretty_plural "<#_ IMS-LDs #>" -table_name imsld_imslds -id_column imsld_id 
+    content::type::new -content_type imsld_imsld -supertype content_revision -pretty_name "[_ imsld.IMS-LD]" -pretty_plural "[_ imsld.IMS-LDs]" -table_name imsld_imslds -id_column imsld_id 
 
-    content::type::attribute::new -content_type imsld_imsld -attribute_name organization_id -datatype number -pretty_name "<#_ Organization Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_imsld -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-    content::type::attribute::new -content_type imsld_imsld -attribute_name version -datatype string -pretty_name "<#_ Version #>" -column_spec "varchar(10)"
-    content::type::attribute::new -content_type imsld_imsld -attribute_name level -datatype string -pretty_name "<#_ Level #>" -column_spec "char(1)"
-    content::type::attribute::new -content_type imsld_imsld -attribute_name sequence_used_p -datatype string -pretty_name "<#_ Sequence Used #>" -column_spec "char(1)"
-    content::type::attribute::new -content_type imsld_imsld -attribute_name learning_objective_id -datatype number -pretty_name "<#_ Learning Objectives ID #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_imsld -attribute_name prerequisite_id -datatype number -pretty_name "<#_ Prerequistes ID #>" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_imsld -attribute_name organization_id -datatype number -pretty_name "[_ imsld.lt_Organization_Identifi]" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_imsld -attribute_name identifier -datatype string -pretty_name "[_ imsld.Identifier]" -column_spec "varchar(100)"
+    content::type::attribute::new -content_type imsld_imsld -attribute_name version -datatype string -pretty_name "[_ imsld.Version]" -column_spec "varchar(10)"
+    content::type::attribute::new -content_type imsld_imsld -attribute_name level -datatype string -pretty_name "[_ imsld.Level]" -column_spec "char(1)"
+    content::type::attribute::new -content_type imsld_imsld -attribute_name sequence_used_p -datatype string -pretty_name "[_ imsld.Sequence_Used]" -column_spec "char(1)"
+    content::type::attribute::new -content_type imsld_imsld -attribute_name learning_objective_id -datatype number -pretty_name "[_ imsld.lt_Learning_Objectives_I]" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_imsld -attribute_name prerequisite_id -datatype number -pretty_name "[_ imsld.Prerequistes_ID]" -column_spec "integer"
 
     # learning objectives
-    content::type::new -content_type imsld_learning_objective -supertype content_revision -pretty_name "<#_ IMS-LD Learning Objective #>" -pretty_plural "<#_ IMS-LD Learning Objectives #>" -table_name imsld_learning_objectives -id_column learning_object_id
+    content::type::new -content_type imsld_learning_objective -supertype content_revision -pretty_name "[_ imsld.lt_IMS-LD_Learning_Objec]" -pretty_plural "[_ imsld.lt_IMS-LD_Learning_Objec_1]" -table_name imsld_learning_objectives -id_column learning_object_id
 
-    content::type::attribute::new -content_type imsld_learning_objective -attribute_name pretty_title -datatype string -pretty_name "<#_ Pretty Title #>" -column_spec "varchar(200)"
+    content::type::attribute::new -content_type imsld_learning_objective -attribute_name pretty_title -datatype string -pretty_name "[_ imsld.Pretty_Title]" -column_spec "varchar(200)"
 
     # imsld prerequisites
-    content::type::new -content_type imsld_prerequisite -supertype content_revision -pretty_name "<#_ IMS-LD Prerequisite #>" -pretty_plural "<#_ IMS-LD Prerequisites #>" -table_name imsld_prerequisites -id_column prerequisite_id
+    content::type::new -content_type imsld_prerequisite -supertype content_revision -pretty_name "[_ imsld.IMS-LD_Prerequisite]" -pretty_plural "[_ imsld.IMS-LD_Prerequisites]" -table_name imsld_prerequisites -id_column prerequisite_id
 
-    content::type::attribute::new -content_type imsld_prerequisite -attribute_name pretty_title -datatype string -pretty_name "<#_ Pretty Title #>" -column_spec "varchar(200)"
+    content::type::attribute::new -content_type imsld_prerequisite -attribute_name pretty_title -datatype string -pretty_name "[_ imsld.Pretty_Title]" -column_spec "varchar(200)"
 
     # imsld items
-    content::type::new -content_type imsld_item -supertype content_revision -pretty_name "<#_ IMS-LD Item #>" -pretty_plural "<#_ IMS-LD Items #>" -table_name imsld_items -id_column imsld_item_id
+    content::type::new -content_type imsld_item -supertype content_revision -pretty_name "[_ imsld.IMS-LD_Item]" -pretty_plural "[_ imsld.IMS-LD_Items]" -table_name imsld_items -id_column imsld_item_id
 
-    content::type::attribute::new -content_type imsld_item -attribute_name parent_item_id -datatype integer -pretty_name "<#_ Parent Item Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_item -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-    content::type::attribute::new -content_type imsld_item -attribute_name identifierref -datatype string -pretty_name "<#_ Identifier Reference #>" -column_spec "varchar(100)"
-    content::type::attribute::new -content_type imsld_item -attribute_name is_visible_p -datatype string -pretty_name "<#_ Is Visible? #>" -column_spec "char(1)"
-    content::type::attribute::new -content_type imsld_item -attribute_name parameters -datatype string -pretty_name "<#_ Parameters #>" -column_spec "varchar(4000)"
+    content::type::attribute::new -content_type imsld_item -attribute_name parent_item_id -datatype integer -pretty_name "[_ imsld.lt_Parent_Item_Identifie]" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_item -attribute_name identifier -datatype string -pretty_name "[_ imsld.Identifier]" -column_spec "varchar(100)"
+    content::type::attribute::new -content_type imsld_item -attribute_name identifierref -datatype string -pretty_name "[_ imsld.Identifier_Reference]" -column_spec "varchar(100)"
+    content::type::attribute::new -content_type imsld_item -attribute_name is_visible_p -datatype string -pretty_name "[_ imsld.Is_Visible]" -column_spec "char(1)"
+    content::type::attribute::new -content_type imsld_item -attribute_name parameters -datatype string -pretty_name "[_ imsld.Parameters]" -column_spec "varchar(4000)"
 
     # components
-    content::type::new -content_type imsld_component -supertype content_revision -pretty_name "<#_ IMS-LD Component #>" -pretty_plural "<#_ IMS-LD Components #>" -table_name imsld_components -id_column component_id
+    content::type::new -content_type imsld_component -supertype content_revision -pretty_name "[_ imsld.IMS-LD_Component]" -pretty_plural "[_ imsld.IMS-LD_Components]" -table_name imsld_components -id_column component_id
 
-    content::type::attribute::new -content_type imsld_component -attribute_name imsld_id -datatype number -pretty_name "<#_ IMS-LD Identifier #>" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_component -attribute_name imsld_id -datatype number -pretty_name "[_ imsld.IMS-LD_Identifier]" -column_spec "integer"
     
     # imsld roles
-    content::type::new -content_type imsld_role -supertype content_revision -pretty_name "<#_ IMS-LD Role #>" -pretty_plural "<#_ IMS-LD Roles #>" -table_name imsld_roles -id_column role_id
+    content::type::new -content_type imsld_role -supertype content_revision -pretty_name "[_ imsld.IMS-LD_Role]" -pretty_plural "[_ imsld.IMS-LD_Roles]" -table_name imsld_roles -id_column role_id
 
-    content::type::attribute::new -content_type imsld_role -attribute_name component_id -datatype string -pretty_name "<#_ Component Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_role -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-    content::type::attribute::new -content_type imsld_role -attribute_name role_type -datatype string  -pretty_name "<#_ Role Type #>" -column_spec "varchar(100)"
-    content::type::attribute::new -content_type imsld_role -attribute_name parent_role_id -datatype number -pretty_name "<#_ Parent Role Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_role -attribute_name create_new_p -datatype string -pretty_name "<#_ Create New? #>" -column_spec "char(1)"
-    content::type::attribute::new -content_type imsld_role -attribute_name match_persons_p -datatype string -pretty_name "<#_ Match Persons? #>" -column_spec "char(1)"
-    content::type::attribute::new -content_type imsld_role -attribute_name max_persons -datatype number -pretty_name "<#_ Max Persons #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_role -attribute_name min_persons -datatype number -pretty_name "<#_ Min Persons#>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_role -attribute_name href -datatype string -pretty_name "<#_ Href #>" -column_spec "varchar(2000)"
+    content::type::attribute::new -content_type imsld_role -attribute_name component_id -datatype string -pretty_name "[_ imsld.Component_Identifier]" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_role -attribute_name identifier -datatype string -pretty_name "[_ imsld.Identifier]" -column_spec "varchar(100)"
+    content::type::attribute::new -content_type imsld_role -attribute_name role_type -datatype string  -pretty_name "[_ imsld.Role_Type]" -column_spec "varchar(100)"
+    content::type::attribute::new -content_type imsld_role -attribute_name parent_role_id -datatype number -pretty_name "[_ imsld.lt_Parent_Role_Identifie]" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_role -attribute_name create_new_p -datatype string -pretty_name "[_ imsld.Create_New]" -column_spec "char(1)"
+    content::type::attribute::new -content_type imsld_role -attribute_name match_persons_p -datatype string -pretty_name "[_ imsld.Match_Persons]" -column_spec "char(1)"
+    content::type::attribute::new -content_type imsld_role -attribute_name max_persons -datatype number -pretty_name "[_ imsld.Max_Persons]" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_role -attribute_name min_persons -datatype number -pretty_name "[_ imsld.Min_Persons]" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_role -attribute_name href -datatype string -pretty_name "[_ imsld.Href]" -column_spec "varchar(2000)"
 
     # imsld activity description
-    content::type::new -content_type imsld_activity_desc -supertype content_revision -pretty_name "<#_ IMS-LD Activity Description #>" -pretty_plural "<#_ IMS-LD Activity Descriptions #>" -table_name imsld_activity_descs -id_column description_id
+    content::type::new -content_type imsld_activity_desc -supertype content_revision -pretty_name "[_ imsld.lt_IMS-LD_Activity_Descr]" -pretty_plural "[_ imsld.lt_IMS-LD_Activity_Descr_1]" -table_name imsld_activity_descs -id_column description_id
 
-    content::type::attribute::new -content_type imsld_activity_desc -attribute_name pretty_title -datatype string -pretty_name "<#_ Pretty Title #>" -column_spec "varchar(200)"
+    content::type::attribute::new -content_type imsld_activity_desc -attribute_name pretty_title -datatype string -pretty_name "[_ imsld.Pretty_Title]" -column_spec "varchar(200)"
 
     # learning activities
-    content::type::new -content_type imsld_learning_activity -supertype content_revision -pretty_name "<#_ IMS-LD Learning Activity #>" -pretty_plural "<#_ IMS-LD Learning Activities #>" -table_name imsld_learning_activities -id_column activity_id
+    content::type::new -content_type imsld_learning_activity -supertype content_revision -pretty_name "[_ imsld.lt_IMS-LD_Learning_Activ]" -pretty_plural "[_ imsld.lt_IMS-LD_Learning_Activ_1]" -table_name imsld_learning_activities -id_column activity_id
     
-    content::type::attribute::new -content_type imsld_learning_activity -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-    content::type::attribute::new -content_type imsld_learning_activity -attribute_name component_id -datatype number -pretty_name "<#_ Component Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_learning_activity -attribute_name activity_description_id -datatype number -pretty_name "<#_ Activity Description Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_learning_activity -attribute_name is_visible_p -datatype string -pretty_name "<#_ Is Visible? #>" -column_spec "char(1)"
-    content::type::attribute::new -content_type imsld_learning_activity -attribute_name user_choice_p -datatype string -pretty_name "<#_ User Choice? #>" -column_spec "char(1)"
-    content::type::attribute::new -content_type imsld_learning_activity -attribute_name time_limit_id -datatype number -pretty_name "<#_ Time Limit Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_learning_activity -attribute_name on_completion_id -datatype number -pretty_name "<#_ On Completion Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_learning_activity -attribute_name parameters -datatype string -pretty_name "<#_ Parameters #>" -column_spec "varchar(4000)"
-    content::type::attribute::new -content_type imsld_learning_activity -attribute_name learning_objective_id -datatype number -pretty_name "<#_ Learning Objective ID #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_learning_activity -attribute_name prerequisite_id -datatype number -pretty_name "<#_ Prerequistes ID #>" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_learning_activity -attribute_name identifier -datatype string -pretty_name "[_ imsld.Identifier]" -column_spec "varchar(100)"
+    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 user_choice_p -datatype string -pretty_name "[_ imsld.User_Choice]" -column_spec "char(1)"
+    content::type::attribute::new -content_type imsld_learning_activity -attribute_name time_limit_id -datatype number -pretty_name "[_ imsld.lt_Time_Limit_Identifier]" -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"
 
     # support activities
-    content::type::new -content_type imsld_support_activity -supertype content_revision -pretty_name "<#_ IMS-LD Support Activity #>" -pretty_plural "<#_ IMS-LD Support Activities #>" -table_name imsld_support_activities -id_column activity_id
+    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
     
-    content::type::attribute::new -content_type imsld_support_activity -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-    content::type::attribute::new -content_type imsld_support_activity -attribute_name component_id -datatype number -pretty_name "<#_ Component Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_support_activity -attribute_name parameter_id -datatype number -pretty_name "<#_ Parameter Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_support_activity -attribute_name is_visible_p -datatype string -pretty_name "<#_ Is Visible? #>" -column_spec "char(1)"
-    content::type::attribute::new -content_type imsld_support_activity -attribute_name user_choice_p -datatype string -pretty_name "<#_ User Choice? #>" -column_spec "char(1)"
-    content::type::attribute::new -content_type imsld_support_activity -attribute_name time_limit_id -datatype number -pretty_name "<#_ Time Limit Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_support_activity -attribute_name on_completion_id -datatype number -pretty_name "<#_ On Completion Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_support_activity -attribute_name parameters -datatype string -pretty_name "<#_ Parameters #>" -column_spec "varchar(4000)"
+    content::type::attribute::new -content_type imsld_support_activity -attribute_name identifier -datatype string -pretty_name "[_ imsld.Identifier]" -column_spec "varchar(100)"
+    content::type::attribute::new -content_type imsld_support_activity -attribute_name component_id -datatype number -pretty_name "[_ imsld.Component_Identifier]" -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 user_choice_p -datatype string -pretty_name "[_ imsld.User_Choice]" -column_spec "char(1)"
+    content::type::attribute::new -content_type imsld_support_activity -attribute_name time_limit_id -datatype number -pretty_name "[_ imsld.lt_Time_Limit_Identifier]" -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)"
 
     # activity structures
-    content::type::new -content_type imsld_activity_structure -supertype content_revision -pretty_name "<#_ IMS-LD Activity Structure #>" -pretty_plural "<#_ IMS-LD Activity Structures #>" -table_name imsld_activity_structures -id_column structure_id 
+    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 
 
-    content::type::attribute::new -content_type imsld_activity_structure -attribute_name component_id -datatype number -pretty_name "<#_Component Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_activity_structure -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-    content::type::attribute::new -content_type imsld_activity_structure -attribute_name number_to_select -datatype number -pretty_name "<#_ Number to Select #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_activity_structure -attribute_name structure_type -datatype string -pretty_name "<#_ Structure Type #>" -column_spec "char(9)"
-    content::type::attribute::new -content_type imsld_activity_structure -attribute_name sort -datatype string -pretty_name "<#_ Sort #>" -column_spec "varchar(4)"
+    content::type::attribute::new -content_type imsld_activity_structure -attribute_name component_id -datatype number -pretty_name "[_ imsld._Component]" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_activity_structure -attribute_name identifier -datatype string -pretty_name "[_ imsld.Identifier]" -column_spec "varchar(100)"
+    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)"
 
     # environments
-    content::type::new -content_type imsld_environment -supertype content_revision -pretty_name "<#_ IMD-LD Environment #>" -pretty_plural "<#_ IMD-LD Environments #>" -table_name imsld_environments -id_column environment_id
+    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
     
-    content::type::attribute::new -content_type imsld_environment -attribute_name component_id -datatype number -pretty_name "<#_ Component Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_environment -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-    content::type::attribute::new -content_type imsld_environment -attribute_name learning_object_id -datatype number -pretty_name "<#_ Learning Object Identifier #>" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_environment -attribute_name component_id -datatype number -pretty_name "[_ imsld.Component_Identifier]" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_environment -attribute_name identifier -datatype string -pretty_name "[_ imsld.Identifier]" -column_spec "varchar(100)"
+    content::type::attribute::new -content_type imsld_environment -attribute_name learning_object_id -datatype number -pretty_name "[_ imsld.lt_Learning_Object_Ident]" -column_spec "integer"
 
     # services
-    content::type::new -content_type imsld_service -supertype content_revision -pretty_name "<#_ IMS-LD Service #>" -pretty_plural "<#_ IMS-LD Services #>" -table_name imsld_services -id_column service_id
+    content::type::new -content_type imsld_service -supertype content_revision -pretty_name "[_ imsld.IMS-LD_Service]" -pretty_plural "[_ imsld.IMS-LD_Services]" -table_name imsld_services -id_column service_id
     
-    content::type::attribute::new -content_type imsld_service -attribute_name environment_id -datatype number -pretty_name "<#_ Environment Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_service -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-    content::type::attribute::new -content_type imsld_service -attribute_name class -datatype string -pretty_name "<#_ Class #>" -column_spec "varchar(4000)"
-    content::type::attribute::new -content_type imsld_service -attribute_name is_visible_p -datatype string -pretty_name "<#_ Is Visible? #>" -column_spec "char(1)"
-    content::type::attribute::new -content_type imsld_service -attribute_name parameters -datatype string -pretty_name "<#_ Parameters #>" -column_spec "varchar(4000)"
-    content::type::attribute::new -content_type imsld_service -attribute_name service_type -datatype string -pretty_name "<#_ Service Type #>" -column_spec "varchar(10)"
+    content::type::attribute::new -content_type imsld_service -attribute_name environment_id -datatype number -pretty_name "[_ imsld.lt_Environment_Identifie]" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_service -attribute_name identifier -datatype string -pretty_name "[_ imsld.Identifier]" -column_spec "varchar(100)"
+    content::type::attribute::new -content_type imsld_service -attribute_name class -datatype string -pretty_name "[_ imsld.Class]" -column_spec "varchar(4000)"
+    content::type::attribute::new -content_type imsld_service -attribute_name is_visible_p -datatype string -pretty_name "[_ imsld.Is_Visible]" -column_spec "char(1)"
+    content::type::attribute::new -content_type imsld_service -attribute_name parameters -datatype string -pretty_name "[_ imsld.Parameters]" -column_spec "varchar(4000)"
+    content::type::attribute::new -content_type imsld_service -attribute_name service_type -datatype string -pretty_name "[_ imsld.Service_Type]" -column_spec "varchar(10)"
 
     # send mail services
-    content::type::new -content_type imsld_send_mail_service -supertype content_revision -pretty_name "<#_ IMS-LD Sendmail Service #>" -pretty_plural "<#_ IMS-LD Sendmail Services #>" -table_name imsld_send_mail_services -id_column mail_id
+    content::type::new -content_type imsld_send_mail_service -supertype content_revision -pretty_name "[_ imsld.lt_IMS-LD_Sendmail_Servi]" -pretty_plural "[_ imsld.lt_IMS-LD_Sendmail_Servi_1]" -table_name imsld_send_mail_services -id_column mail_id
     
-    content::type::attribute::new -content_type imsld_send_mail_service -attribute_name service_id -datatype number -pretty_name "<#_ Service Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_send_mail_service -attribute_name recipients -datatype string -pretty_name "<#_ Recipients #>" -column_spec "varchar(11)"
-    content::type::attribute::new -content_type imsld_send_mail_service -attribute_name is_visible_p -datatype string -pretty_name "<#_ Is Visible? #>" -column_spec "char(1)"
-    content::type::attribute::new -content_type imsld_send_mail_service -attribute_name parameters -datatype string -pretty_name "<#_ Parameters #>" -column_spec "varchar(4000)"
+    content::type::attribute::new -content_type imsld_send_mail_service -attribute_name service_id -datatype number -pretty_name "[_ imsld.Service_Identifier]" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_send_mail_service -attribute_name recipients -datatype string -pretty_name "[_ imsld.Recipients]" -column_spec "varchar(11)"
+    content::type::attribute::new -content_type imsld_send_mail_service -attribute_name is_visible_p -datatype string -pretty_name "[_ imsld.Is_Visible]" -column_spec "char(1)"
+    content::type::attribute::new -content_type imsld_send_mail_service -attribute_name parameters -datatype string -pretty_name "[_ imsld.Parameters]" -column_spec "varchar(4000)"
 
     # send mail data
-    content::type::new -content_type imsld_send_mail_data -supertype content_revision -pretty_name "<#_ IMS-LD Sendmail Data #>" -pretty_plural "<#_ IMS-LD Sendmail Data #>" -table_name imsld_send_mail_data -id_column data_id
+    content::type::new -content_type imsld_send_mail_data -supertype content_revision -pretty_name "[_ imsld.IMS-LD_Sendmail_Data]" -pretty_plural "[_ imsld.IMS-LD_Sendmail_Data]" -table_name imsld_send_mail_data -id_column data_id
 
-    content::type::attribute::new -content_type imsld_send_mail_data -attribute_name send_mail_id -datatype number -pretty_name "<#_ Sendmail Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_send_mail_data -attribute_name role_id -datatype number -pretty_name "<#_ Role Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_send_mail_data -attribute_name mail_data -datatype string -pretty_name "<#_ Mail Data #>" -column_spec "varchar(4000)"
+    content::type::attribute::new -content_type imsld_send_mail_data -attribute_name send_mail_id -datatype number -pretty_name "[_ imsld.Sendmail_Identifier]" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_send_mail_data -attribute_name role_id -datatype number -pretty_name "[_ imsld.Role_Identifier]" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_send_mail_data -attribute_name mail_data -datatype string -pretty_name "[_ imsld.Mail_Data]" -column_spec "varchar(4000)"
 
     # conference services
-    content::type::new -content_type imsld_conference_service -supertype content_revision -pretty_name "<#_ IMS-LD Conference Service #>" -pretty_plural "<#_ IMS-LD Conference Services #>" -table_name imsld_conference_services -id_column conference_id
+    content::type::new -content_type imsld_conference_service -supertype content_revision -pretty_name "[_ imsld.lt_IMS-LD_Conference_Ser]" -pretty_plural "[_ imsld.lt_IMS-LD_Conference_Ser_1]" -table_name imsld_conference_services -id_column conference_id
 
-    content::type::attribute::new -content_type imsld_conference_service -attribute_name service_id -datatype number -pretty_name "<#_ Service Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_conference_service -attribute_name conference_type -datatype string -pretty_name "<#_ Conference Type #>" -column_spec "char(12)"
-    content::type::attribute::new -content_type imsld_conference_service -attribute_name imsld_item_id -datatype number -pretty_name "<#_ Item Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_conference_service -attribute_name manager_id -datatype number -pretty_name "<#_ Manager Identifier #>" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_conference_service -attribute_name service_id -datatype number -pretty_name "[_ imsld.Service_Identifier]" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_conference_service -attribute_name conference_type -datatype string -pretty_name "[_ imsld.Conference_Type]" -column_spec "char(12)"
+    content::type::attribute::new -content_type imsld_conference_service -attribute_name imsld_item_id -datatype number -pretty_name "[_ imsld.Item_Identifier]" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_conference_service -attribute_name manager_id -datatype number -pretty_name "[_ imsld.Manager_Identifier]" -column_spec "integer"
 
     # methods
-    content::type::new -content_type imsld_method -supertype content_revision -pretty_name "<#_ IMS-LD Method #>" -pretty_plural "<#_ IMS-LD Methods #>" -table_name imsld_methods -id_column method_id
+    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 "<#_ IMS-LD Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_method -attribute_name time_limit_id -datatype number -pretty_name "<#_ Time Limit Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_method -attribute_name on_completion_id -datatype number -pretty_name "<#_ On Completion Identifier #>" -column_spec "integer"
+    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 time_limit_id -datatype number -pretty_name "[_ imsld.lt_Time_Limit_Identifier]" -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
-    content::type::new -content_type imsld_play -supertype content_revision -pretty_name "<#_ IMS-LD Play #>" -pretty_plural "<#_ IMS-LD Plays #>" -table_name imsld_plays -id_column play_id
+    content::type::new -content_type imsld_play -supertype content_revision -pretty_name "[_ imsld.IMS-LD_Play]" -pretty_plural "[_ imsld.IMS-LD_Plays]" -table_name imsld_plays -id_column play_id
 
-    content::type::attribute::new -content_type imsld_play -attribute_name method_id -datatype number -pretty_name "<#_ Method Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_play -attribute_name is_visible_p -datatype string -pretty_name "<#_ Is Visible? #>" -column_spec "char(1)"
-    content::type::attribute::new -content_type imsld_play -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-    content::type::attribute::new -content_type imsld_play -attribute_name when_last_act_completed_p -datatype string -pretty_name "<#_ When Last Act Completed? #>" -column_spec "char(1)"
-    content::type::attribute::new -content_type imsld_play -attribute_name time_limit_id -datatype number -pretty_name "<#_ Time Limit Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_play -attribute_name on_completion_id -datatype number -pretty_name "<#_ On Completion Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_play -attribute_name sort_order -datatype number -pretty_name "<#_ Sort Order #>" -column_spec "integer"
+    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 when_last_act_completed_p -datatype string -pretty_name "[_ imsld.lt_When_Last_Act_Complet]" -column_spec "char(1)"
+    content::type::attribute::new -content_type imsld_play -attribute_name time_limit_id -datatype number -pretty_name "[_ imsld.lt_Time_Limit_Identifier]" -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 "<#_ IMS-LD Act #>" -pretty_plural "<#_ IMS-LD Acts #>" -table_name imsld_acts -id_column act_id
+    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 "<#_ Play Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_act -attribute_name time_limit_id -datatype number -pretty_name "<#_ Time Limit Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_act -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-    content::type::attribute::new -content_type imsld_act -attribute_name on_completion_id -datatype number -pretty_name "<#_ On Completion Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_act -attribute_name sort_order -datatype number -pretty_name "<#_ Sort Order #>" -column_spec "integer"
+    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 time_limit_id -datatype number -pretty_name "[_ imsld.lt_Time_Limit_Identifier]" -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"
 
     # role parts
-    content::type::new -content_type imsld_role_part -supertype content_revision -pretty_name "<#_ IMS-LD Role Part #>" -pretty_plural "<#_ IMS-LD Role Parts #>" -table_name imsld_role_parts -id_column role_part_id
+    content::type::new -content_type imsld_role_part -supertype content_revision -pretty_name "[_ imsld.IMS-LD_Role_Part]" -pretty_plural "[_ imsld.IMS-LD_Role_Parts]" -table_name imsld_role_parts -id_column role_part_id
 
-    content::type::attribute::new -content_type imsld_role_part -attribute_name act_id -datatype number -pretty_name "<#_ Act Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_role_part -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-    content::type::attribute::new -content_type imsld_role_part -attribute_name role_id -datatype number -pretty_name "<#_ Role Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_role_part -attribute_name learning_activity_id -datatype number -pretty_name "<#_ Learning Activity Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_role_part -attribute_name support_activity_id -datatype number -pretty_name "<#_ Support Activity Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_role_part -attribute_name activity_structure_id -datatype number -pretty_name "<#_ Activity Structure Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_role_part -attribute_name environment_id -datatype number -pretty_name "<#_ Environment Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_role_part -attribute_name sort_order -datatype number -pretty_name "<#_ Sort Order #>" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_role_part -attribute_name act_id -datatype number -pretty_name "[_ imsld.Act_Identifier]" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_role_part -attribute_name identifier -datatype string -pretty_name "[_ imsld.Identifier]" -column_spec "varchar(100)"
+    content::type::attribute::new -content_type imsld_role_part -attribute_name role_id -datatype number -pretty_name "[_ imsld.Role_Identifier]" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_role_part -attribute_name learning_activity_id -datatype number -pretty_name "[_ imsld.lt_Learning_Activity_Ide]" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_role_part -attribute_name support_activity_id -datatype number -pretty_name "[_ imsld.lt_Support_Activity_Iden]" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_role_part -attribute_name activity_structure_id -datatype number -pretty_name "[_ imsld.lt_Activity_Structure_Id]" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_role_part -attribute_name environment_id -datatype number -pretty_name "[_ imsld.lt_Environment_Identifie]" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_role_part -attribute_name sort_order -datatype number -pretty_name "[_ imsld.Sort_Order]" -column_spec "integer"
 
     # time limits
-    content::type::new -content_type imsld_time_limit -supertype content_revision -pretty_name "<#_ IMS-LD Time Limit #>" -pretty_plural "<#_ IMS-LD Time Limits #>" -table_name imsld_time_limits -id_column time_limit_id
+    content::type::new -content_type imsld_time_limit -supertype content_revision -pretty_name "[_ imsld.IMS-LD_Time_Limit]" -pretty_plural "[_ imsld.IMS-LD_Time_Limits]" -table_name imsld_time_limits -id_column time_limit_id
     
-    content::type::attribute::new -content_type imsld_time_limit -attribute_name time_in_seconds -datatype number -pretty_name "<#_ Time in Seconds #>" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_time_limit -attribute_name time_in_seconds -datatype number -pretty_name "[_ imsld.Time_in_Seconds]" -column_spec "integer"
 
     # on completion
-    content::type::new -content_type imsld_on_completion -supertype content_revision -pretty_name "<#_ IMS-LD On Completion #>" -pretty_plural "<#_ IMS-LD On Completions #>" -table_name imsld_on_completion -id_column on_completion_id
+    content::type::new -content_type imsld_on_completion -supertype content_revision -pretty_name "[_ imsld.IMS-LD_On_Completion]" -pretty_plural "[_ imsld.lt_IMS-LD_On_Completions]" -table_name imsld_on_completion -id_column on_completion_id
 
-    content::type::attribute::new -content_type imsld_on_completion -attribute_name feedback_title -datatype string -pretty_name "<#_ Feedbach Title #>" -column_spec "varchar(200)"
+    content::type::attribute::new -content_type imsld_on_completion -attribute_name feedback_title -datatype string -pretty_name "[_ imsld.Feedbach_Title]" -column_spec "varchar(200)"
 
     ### IMS-LD Content Packaging
 
     # manifests
-    content::type::new -content_type imsld_cp_manifest -supertype content_revision -pretty_name "<#_ IMS-LD CP Manifest #>" -pretty_plural "<#_ IMS-LD CP Manifests #>" -table_name imsld_cp_manifests -id_column manifest_id
+    content::type::new -content_type imsld_cp_manifest -supertype content_revision -pretty_name "[_ imsld.IMS-LD_CP_Manifest]" -pretty_plural "[_ imsld.IMS-LD_CP_Manifests]" -table_name imsld_cp_manifests -id_column manifest_id
 
-    content::type::attribute::new -content_type imsld_cp_manifest -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(1000)"
-    content::type::attribute::new -content_type imsld_cp_manifest -attribute_name version -datatype string -pretty_name "<#_ Version #>" -column_spec "varchar(100)"
-    content::type::attribute::new -content_type imsld_cp_manifest -attribute_name parent_manifest_id -datatype number -pretty_name "<#_ Parent Manifest Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_cp_manifest -attribute_name is_shared_p -datatype string -pretty_name "<#_ Is shared? #>" -column_spec "char(1)"
+    content::type::attribute::new -content_type imsld_cp_manifest -attribute_name identifier -datatype string -pretty_name "[_ imsld.Identifier]" -column_spec "varchar(1000)"
+    content::type::attribute::new -content_type imsld_cp_manifest -attribute_name version -datatype string -pretty_name "[_ imsld.Version]" -column_spec "varchar(100)"
+    content::type::attribute::new -content_type imsld_cp_manifest -attribute_name parent_manifest_id -datatype number -pretty_name "[_ imsld.lt_Parent_Manifest_Ident]" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_cp_manifest -attribute_name is_shared_p -datatype string -pretty_name "[_ imsld.Is_shared]" -column_spec "char(1)"
 
     # organizations
-    content::type::new -content_type imsld_cp_organization -supertype content_revision -pretty_name "<#_ IMS-LD CP Organization #>" -pretty_plural "<#_ IMS-LD CP Organizations #>" -table_name imsld_cp_organizations -id_column organization_id
+    content::type::new -content_type imsld_cp_organization -supertype content_revision -pretty_name "[_ imsld.lt_IMS-LD_CP_Organizatio]" -pretty_plural "[_ imsld.lt_IMS-LD_CP_Organizatio_1]" -table_name imsld_cp_organizations -id_column organization_id
     
-    content::type::attribute::new -content_type imsld_cp_organization -attribute_name manifest_id -datatype number -pretty_name "<#_ Manifest Identifier #>" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_cp_organization -attribute_name manifest_id -datatype number -pretty_name "[_ imsld.Manifest_Identifier]" -column_spec "integer"
 
     # resources
-    content::type::new -content_type imsld_cp_resource -supertype content_revision -pretty_name "<#_ IMS-LD CP Resource #>" -pretty_plural "<#_ IMS-LD CP Resources #>" -table_name imsld_cp_resources -id_column resource_id
+    content::type::new -content_type imsld_cp_resource -supertype content_revision -pretty_name "[_ imsld.IMS-LD_CP_Resource]" -pretty_plural "[_ imsld.IMS-LD_CP_Resources]" -table_name imsld_cp_resources -id_column resource_id
 
-    content::type::attribute::new -content_type imsld_cp_resource -attribute_name manifest_id -datatype number -pretty_name "<#_ Manifest Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_cp_resource -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-    content::type::attribute::new -content_type imsld_cp_resource -attribute_name type -datatype string -pretty_name "<#_ Type #>" -column_spec "varchar(1000)"
-    content::type::attribute::new -content_type imsld_cp_resource -attribute_name href -datatype string -pretty_name "<#_ Href #>" -column_spec "varchar(2000)"
+    content::type::attribute::new -content_type imsld_cp_resource -attribute_name manifest_id -datatype number -pretty_name "[_ imsld.Manifest_Identifier]" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_cp_resource -attribute_name identifier -datatype string -pretty_name "[_ imsld.Identifier]" -column_spec "varchar(100)"
+    content::type::attribute::new -content_type imsld_cp_resource -attribute_name type -datatype string -pretty_name "[_ imsld.Type]" -column_spec "varchar(1000)"
+    content::type::attribute::new -content_type imsld_cp_resource -attribute_name href -datatype string -pretty_name "[_ imsld.Href]" -column_spec "varchar(2000)"
 
     # dependencies
-    content::type::new -content_type imsld_cp_dependency -supertype content_revision -pretty_name "<#_ IMS-LD CP Dependency #>" -pretty_plural "<#_ IMS-LD CP Dependencies #>" -table_name imsld_cp_dependencies -id_column dependency_id
+    content::type::new -content_type imsld_cp_dependency -supertype content_revision -pretty_name "[_ imsld.IMS-LD_CP_Dependency]" -pretty_plural "[_ imsld.lt_IMS-LD_CP_Dependencie]" -table_name imsld_cp_dependencies -id_column dependency_id
 
-    content::type::attribute::new -content_type imsld_cp_dependency -attribute_name resource_id -datatype number -pretty_name "<#_ Resource Identifier #>" -column_spec "integer"
-    content::type::attribute::new -content_type imsld_cp_dependency -attribute_name identifierref -datatype string -pretty_name "<#_ Identifierref #>" -column_spec "varchar(100)"
+    content::type::attribute::new -content_type imsld_cp_dependency -attribute_name resource_id -datatype number -pretty_name "[_ imsld.Resource_Identifier]" -column_spec "integer"
+    content::type::attribute::new -content_type imsld_cp_dependency -attribute_name identifierref -datatype string -pretty_name "[_ imsld.Identifierref]" -column_spec "varchar(100)"
 
     # imsld cp files
-    content::type::new -content_type imsld_cp_file -supertype content_revision -pretty_name "<#_ IMS-LD CP File #>" -pretty_plural "<#_ IMS-LD CP Filed #>" -table_name imsld_cp_files -id_column imsld_file_id
+    content::type::new -content_type imsld_cp_file -supertype content_revision -pretty_name "[_ imsld.IMS-LD_CP_File]" -pretty_plural "[_ imsld.IMS-LD_CP_Filed]" -table_name imsld_cp_files -id_column imsld_file_id
 
-    content::type::attribute::new -content_type imsld_cp_file -attribute_name path_to_file -datatype string -pretty_name "<#_ Path to File #>" -column_spec "varchar(2000)"
-    content::type::attribute::new -content_type imsld_cp_file -attribute_name file_name -datatype string -pretty_name "<#_ File name #>" -column_spec "varchar(2000)"
-    content::type::attribute::new -content_type imsld_cp_file -attribute_name href -datatype string -pretty_name "<#_ Href #>" -column_spec "varchar(2000)"
+    content::type::attribute::new -content_type imsld_cp_file -attribute_name path_to_file -datatype string -pretty_name "[_ imsld.Path_to_File]" -column_spec "varchar(2000)"
+    content::type::attribute::new -content_type imsld_cp_file -attribute_name file_name -datatype string -pretty_name "[_ imsld.File_name]" -column_spec "varchar(2000)"
+    content::type::attribute::new -content_type imsld_cp_file -attribute_name href -datatype string -pretty_name "[_ imsld.Href]" -column_spec "varchar(2000)"
     
 }
 
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.9 -r1.10
--- openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl	4 Oct 2005 13:45:40 -0000	1.9
+++ openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl	5 Oct 2005 15:33:25 -0000	1.10
@@ -79,13 +79,13 @@
 
     # Generate a random directory name
     if { [catch {set tmp_dir [file join [file dirname $tmpfile] [ns_mktemp "$dest_dir_base-XXXXXX"]]} errmsg] } {
-        form set_error upload_file_form upload_file "<#_ There was an error generating the tmp_dir to unzip the file. #> $errmsg"
+        form set_error upload_file_form upload_file "[_ imsld.lt_There_was_an_error_ge] $errmsg"
         return -code error "IMSLD::imsld::parse::expand_file: Error generating tmp directory: $errmsg"
     }
 
     # Create a temporary directory
     if { [catch {file mkdir $tmp_dir} errmsg] } {
-        form set_error upload_file_form upload_file "<#_ There was an error creating the tmp_dir to unzip the file. #> $errmsg"
+        form set_error upload_file_form upload_file "[_ imsld.lt_There_was_an_error_cr_1] $errmsg"
         return -code error "IMSLD::imsld::parse::expand_file: Error creating tmp directory: $errmsg"
     }
 
@@ -102,7 +102,7 @@
     } elseif { [regexp {.zip$} $upload_file] } { 
         set type zip 
     } else { 
-        set type "<#_ Uknown type #>" 
+        set type "[_ imsld.Uknown_type]" 
     } 
     
     switch $type {
@@ -142,7 +142,7 @@
         }
         default {
             set error_p 1
-            set errmsg "<#_ Could not determine whit what program uncompress the file $upload_file has. Aborting #>"
+            set errmsg "[_ imsld.lt_Could_not_determine_w]"
         }
     }
     
@@ -239,25 +239,25 @@
     @option lower_than If passed, the number of roots of the tree must be lower or equal than multiplicity
 } {
     if { [expr $equal_p + $greather_than_p + $lower_than_p] > 1 } {
-        return -code error "IMSLD:imsld::parse::validate_multiplicity: <#_ More than one validation tried at the same time#>"
+        return -code error "IMSLD:imsld::parse::validate_multiplicity: [_ imsld.lt_More_than_one_validat]"
     }
     if { ![expr $equal_p + $greather_than_p + $lower_than_p] } {
         set equal_p 1
     }
 
     if { $equal_p } {
         if { [llength $tree] != $multiplicity } {
-            ad_return_error "<#_ Error parsing file #>" "<#_ There must be exactly $multiplicity $element_name and there are [llength $tree]. This is not supported, sorry. #>"
+            ad_return_error "[_ imsld.Error_parsing_file]" "[_ imsld.lt_There_must_be_exactly]"
             ad_script_abort
         }
     } elseif { $greather_than_p } {
         if { [llength $tree] < $multiplicity } {
-            ad_return_error "<#_ Error parsing file #>" "<#_ There can't be less than $multiplicity $element_name and there are [llength $tree]. This is not supported, sorry. #>"
+            ad_return_error "[_ imsld.Error_parsing_file]" "[_ imsld.lt_There_cant_be_less_th]"
             ad_script_abort
         } 
     } else {
         if { [llength $tree] > $multiplicity } {
-            ad_return_error "<#_ Error parsing file #>" "<#_ There can't greather than $multiplicity $element_name and there are [llength $tree]. This is not supported, sorry. #>"
+            ad_return_error "[_ imsld.Error_parsing_file]" "[_ imsld.lt_There_cant_greather_t]"
             ad_script_abort
         } 
     }
@@ -275,7 +275,7 @@
 } {
     if { [file exist $dir] } {
         if { [catch {exec rm -rf $dir} errmsg] } {
-            return -code error "IMSLD:imsld::parse::remove_dir: <#_ There was an error trying to delete the dir $dir. #> $errmsg"
+            return -code error "IMSLD:imsld::parse::remove_dir: [_ imsld.lt_There_was_an_error_tr] $errmsg"
         }
     }
 
@@ -529,15 +529,15 @@
                           -complete_path "${tmp_dir}/${filex_href}"]
         if { !$filex_id } {
             # an error ocurred when creating the file
-            return [list 0 "<#_ The file $filex_href % was not created, it wasn't found in the manifest #>"]
+            return [list 0 "[_ imsld.lt_The_file_filex_href_w]"]
         }
         # map resource with file
         relation_add imsld_res_files_rel $resource_id $filex_id
     }
     
     if { ![empty_string_p $resource_href] && !$found_p } {
         # we should have fond the referenced file, aborting
-        return [list 0 "<#_ The resource $resource_identifier % has a reference to a non existing file ($resource_href %). #>"]
+        return [list 0 "[_ imsld.lt_The_resource_resource]"]
     }
 
     set resource_dependencies [$resource_node child all imscp:dependency]
@@ -732,7 +732,7 @@
         # parse the item, create it and map it to the role
         set information_item [$role_information child all imsld:item]
         if { ![llength $information_item] } {
-            return [list 0 "<#_ Information given but no item associated to it for the role $role_title % #>"]
+            return [list 0 "[_ imsld.lt_Information_given_but]"]
         }
 
         set item_list [imsld::parse::parse_and_create_item -manifest $manifest \
@@ -1045,7 +1045,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 % $role_ref % (referenced by an email data) #>"]
+                return [list 0 "[_ imsld.lt_There_is_no_role_with]"]
             }
             set email_data_id [imsld::item_revision_new -attributes [list [list send_mail_id $send_mail_id] \
                                                                          [list role_id $role_id] \
@@ -1075,7 +1075,7 @@
                 and content_revision__is_live(role_id) = 't' 
                 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 % $role_ref % (referenced by: manager) #>"]
+                return [list 0 "[_ imsld.lt_There_is_no_role_with_1]"]
             }
         }
 
@@ -1125,7 +1125,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 % $role_ref % (referenced by: participant) buscando con component $component_id y env $environment_id #>"]
+                return [list 0 "[_ imsld.lt_There_is_no_role_with_2]"]
             }
             # map conference with participant role
             relation_add imsld_conf_part_rel $conference_id $participant_id
@@ -1144,7 +1144,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 % $role_ref % (referenced by: observer) #>"]
+                    return [list 0 "[_ imsld.lt_There_is_no_role_with_3]"]
                 }
                 # map conference with observer role
                 relation_add imsld_conf_obser_rel $conference_id $observer_id
@@ -1164,7 +1164,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 % $role_ref % (referenced by: moderator) #>"]
+                    return [list 0 "[_ imsld.lt_There_is_no_role_with_4]"]
                 }
                 # map conference with moderator role
                 relation_add imsld_conf_moder_rel $conference_id $moderator_id
@@ -1176,7 +1176,7 @@
     set index_search [$service_node child all imsld:index-search]
     if { [llength $index_search] } {
         ns_log error "Index-search service not supported"
-        return [list 0 "<#_ Index search service not supported #>"]
+        return [list 0 "[_ imsld.lt_Index_search_service_]"]
     }
     return $service_id
 }
@@ -1212,7 +1212,7 @@
         if { [llength $learning_object] > 1 } {
             set learning_object [lindex $learning_object 0]
             global warnings
-            append warnings "<li> <#_ Warning: More than one learning object in environment % $identifier %. Just one used (the first one) #> </li>"
+            append warnings "<li> [_ imsld.lt_Warning_More_than_one] </li>"
         }
         set learning_object_list [imsld::parse::parse_and_create_learning_object -learning_object_node $learning_object \
                                       -manifest_id $manifest_id \
@@ -1302,7 +1302,7 @@
                     relation_add imsld_env_env_rel $environment_id $environment_ref_id
                 } else {
                     # error, return
-                    return [list 0 "<#_ Referenced environment % $referenced_identifier % does not exist #>"]
+                    return [list 0 "[_ imsld.lt_Referenced_environmen]"]
                 }
             }
         }
@@ -1480,7 +1480,7 @@
                 component_id = :component_id
             }] } {
                 # error, referenced environment does not exist
-                return [list 0 "<#_ Referenced environment (% $environment_ref %) in learning activity does not exist. #>"]
+                return [list 0 "[_ imsld.lt_Referenced_environmen_1]"]
             }
 
             # map environment with learning-activity
@@ -1619,7 +1619,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: support activity) #>"]
+            return [list 0 "[_ imsld.lt_There_is_no_role_with_5]"]
         }
         # map support activity with the role
         relation_add imsld_sa_role_rel $support_activity_id $role_id
@@ -1641,7 +1641,7 @@
                 and component_id = :component_id
             }] } {
                 # error, referenced environment does not exist
-                return [list 0 "<#_ Referenced environment (% $environment_ref %) in support activity does not exist. #>"]
+                return [list 0 "[_ imsld.lt_Referenced_environmen_2]"]
             }
 
             # map environment with support-activity
@@ -1695,7 +1695,7 @@
         # parse the item, create it and map it to the activity structure
         set information_item [$activity_node child all imsld:item]
         if { ![llength $information_item] } {
-            return [list 0 "<#_ Information given but no item associated to it for the activity structure % $identifier % #>"]
+            return [list 0 "[_ imsld.lt_Information_given_but_1]"]
         }
 
         set item_list [imsld::parse::parse_and_create_item -manifest $manifest \
@@ -1729,7 +1729,7 @@
                 and component_id = :component_id
             }] } {
                 # error, referenced environment does not exist
-                return [list 0 "<#_ Referenced environment (% $environment_ref %) in activity structure % $identifier % does not exist. #>"]
+                return [list 0 "[_ imsld.lt_Referenced_environmen_3]"]
             }
 
             # map environment with activity structure
@@ -1770,7 +1770,7 @@
                     }] } {
                         # warning message
                         global warnings
-                        append warnings "<li> <#_ Referenced support activity % $learning_activity_ref % is actually an activity structure!. #> </li>"
+                        append warnings "<li> [_ imsld.lt_Referenced_support_ac] </li>"
                         # do the mappings
                         relation_add imsld_as_as_rel $activity_structure_id $refrenced_struct_id
                     } else {
@@ -1805,18 +1805,18 @@
                             }
                             # warning message
                             global warnings
-                            append warnings "<li> <#_ Referenced learning activity % $learning_activity_ref % is actually an activity structure!. #> </li>"
+                            append warnings "<li> [_ imsld.lt_Referenced_learning_a] </li>"
                             # finally, do the mappings
                             relation_add imsld_as_as_rel $activity_structure_id $activity_structure_ref_id
                         } else {
                             # error, referenced learning activity does not exist
-                            return [list 0 "<#_ Referenced learning activity (% $learning_activity_ref %) in activity structure % $identifier % does not exist. comp $component_id  #>"]
+                            return [list 0 "[_ imsld.lt_Referenced_learning_a_1]"]
                         }
                     }
                 } else {
                     # warning message
                     global warnings
-                    append warnings "<li> <#_ Referenced learning activity % $learning_activity_ref % is actually a support activity. #> </li>"
+                    append warnings "<li> [_ imsld.lt_Referenced_learning_a_2] </li>"
                     # map support activity with activity structure
                     relation_add imsld_as_sa_rel $activity_structure_id $activity_id
                 }
@@ -1861,7 +1861,7 @@
                     }] } {
                         # warning message
                         global warnings
-                        append warnings "<li> <#_ Referenced support activity % $support_activity_ref % is actually an activity structure!. #> </li>"
+                        append warnings "<li> [_ imsld.lt_Referenced_support_ac_1] </li>"
                         # do the mappings
                         relation_add imsld_as_as_rel $activity_structure_id $refrenced_struct_id
                     } else {
@@ -1896,18 +1896,18 @@
                             }
                             # warning message
                             global warnings
-                            append warnings "<li> <#_ Referenced support activity % $support_activity_ref % is actually an activity structure!. #> </li>"
+                            append warnings "<li> [_ imsld.lt_Referenced_support_ac_1] </li>"
                             # finally, do the mappings
                             relation_add imsld_as_as_rel $activity_structure_id $activity_structure_ref_id
                         } else {
                             # error, referenced support activity does not exist
-                            return [list 0 "<#_ Referenced support activity (% $support_activity_ref %) in activity structure % $identifier % does not exist. #>"]
+                            return [list 0 "[_ imsld.lt_Referenced_support_ac_2]"]
                         }
                     }
                 } else {
                     # warning message
                     global warnings
-                    append warnings "<li> <#_ Referenced support activity % $support_activity_ref % is actually a learning activity. #> </li>"
+                    append warnings "<li> [_ imsld.lt_Referenced_support_ac_3] </li>"
                     # map the learning activity with activity structure
                     relation_add imsld_as_la_rel $activity_structure_id $activity_id
                 }
@@ -1972,7 +1972,7 @@
                     relation_add imsld_as_as_rel $activity_structure_id $activity_structure_ref_id
                 } else {
                     # error, return
-                    return [list 0 "<#_ Referenced activity structure % $ref % does not exist #>"]
+                    return [list 0 "[_ imsld.lt_Referenced_activity_s]"]
                 }
             }
         }
@@ -2037,7 +2037,7 @@
             and content_revision__is_live(ir.role_id) = 't' 
             and ir.component_id = :component_id}] } {
             # error, referenced role does not exist
-            return [list 0 "<#_ Referenced role (% $role_ref_ref %) in role part % $identifier % does not exist. #>"]
+            return [list 0 "[_ imsld.lt_Referenced_role_role_]"]
         }
     }
 
@@ -2076,16 +2076,16 @@
                     and component_id = :component_id
                 }] } {
                     # error, referenced learning activity does not exist
-                    return [list 0 "<#_ Referenced learning activity (% $learning_activity_ref_ref %) in role part % $identifier % does not exist. #>"]
+                    return [list 0 "[_ imsld.lt_Referenced_learning_a_3]"]
                 } else {
                     # warning message
                     global warnings
-                    append warnings "<li> <#_ Referenced learning activity % $learning_activity_ref_ref % in role part % $identifier % is actually an activity structure. #> </li>"
+                    append warnings "<li> [_ imsld.lt_Referenced_learning_a_4] </li>"
                 }
             } else {
                 # warning message
                 global warnings
-                append warnings "<li> <#_ Referenced learning activity % $learning_activity_ref_ref % in role part % $identifier % is actually a support activity. #> </li>"
+                append warnings "<li> [_ imsld.lt_Referenced_learning_a_5] </li>"
             }
         }
     }
@@ -2121,16 +2121,16 @@
                     and component_id = :component_id
                 }] } {
                     # error, referenced support activity does not exist
-                    return [list 0 "<#_ Referenced support activity (% $support_activity_ref_ref %) in role part % $identifier % does not exist. #>"]
+                    return [list 0 "[_ imsld.lt_Referenced_support_ac_4]"]
                 } else {
                     # warning message
                     global warnings
-                    append warnings "<li> <#_ Referenced support activity % $support_activity_ref_ref % in role part % $identifier % is actually an activity structure. #> </li>"
+                    append warnings "<li> [_ imsld.lt_Referenced_support_ac_5] </li>"
                 }
             } else {
                 # warning message
                 global warnings
-                append warnings "<li> <#_ Referenced support activity % $support_activity_ref % in role part % $identifier % is actually a learning activity. #> </li>"
+                append warnings "<li> [_ imsld.lt_Referenced_support_ac_6] </li>"
             }
         }
     }
@@ -2168,16 +2168,16 @@
                     and component_id = :component_id
                 }] } {
                     # error, referenced activity structure does not exist
-                    return [list 0 "<#_ Referenced activity structure (% $activity_structure_ref_ref %) in role part % $identifier % does not exist. #>"]
+                    return [list 0 "[_ imsld.lt_Referenced_activity_s_1]"]
                 } else {
                     # warning message
                     global warnings
-                    append warnings "<li> <#_ Referenced activity structure % $activity_structure_ref_ref % in role part % $identifier % is actually an support activity. #> </li>"
+                    append warnings "<li> [_ imsld.lt_Referenced_activity_s_2] </li>"
                 }
             } else {
                 # warning message
                 global warnings
-                append warnings "<li> <#_ Referenced activity structure % $activity_structure_ref_ref % in role part % $identifier % is actually a learning activity. #> </li>"
+                append warnings "<li> [_ imsld.lt_Referenced_activity_s_3] </li>"
             }
         }
     }
@@ -2198,7 +2198,7 @@
             and env.component_id = :component_id
         }] } {
             # error, referenced environment does not exist
-            return [list 0 "<#_ Referenced environment (% $environment_ref_ref %) in role part % $identifier % does not exist. #>"]
+            return [list 0 "[_ imsld.lt_Referenced_environmen_4]"]
         }
     }
     
@@ -2336,7 +2336,7 @@
                 and content_revision__is_live(role_part_id) = 't' 
                 and act_id = :act_id
             }] } {
-                return [list 0 "<#_ The referenced role part in 'when role part completed' of the act % $identifier % does not exist #>"]
+                return [list 0 "[_ imsld.lt_The_referenced_role_p]"]
             }
             # found, map the role part (with the imsld_act_rp_completed_rel) with the act
             relation_add imsld_act_rp_completed_rel $act_id $role_part_id
@@ -2806,7 +2806,7 @@
                 and content_revision__is_live(play_id) = 't' 
                 and method_id = :method_id
             } ] } {
-                return [list 0 "<#_ The referenced play in 'when play completed' in the method does not exist #>"]
+                return [list 0 "[_ imsld.lt_The_referenced_play_i]"]
             }
             # found, map the play (with the imsld_mp_completed_rel) with the method
             relation_add imsld_mp_completed_rel $method_id $play_id
@@ -2815,7 +2815,7 @@
     
     global warnings
     if { ![empty_string_p $warnings] } {
-        set warnings "<#_ <br /> Warnings: <ul> $warnings </ul> #>"
+        set warnings "[_ imsld.lt_br__Warnings_ul_warni]"
     }
     return [list $manifest_id "$warnings"]
 }
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.5 -r1.6
--- openacs-4/packages/imsld/tcl/imsld-procs.tcl	5 Oct 2005 14:13:01 -0000	1.5
+++ openacs-4/packages/imsld/tcl/imsld-procs.tcl	5 Oct 2005 15:33:25 -0000	1.6
@@ -206,7 +206,7 @@
     } else {
         # get the completed activities in order to display them
         # save the last one because we will use it latter
-        set completed_activities "<#_ <ul> Completed <br /> #>"
+        set completed_activities "[_ imsld.lt_ul_Completed_Activiti]"
         db_foreach completed_activity {
             select stat.completed_id,
             stat.role_part_id,
@@ -234,18 +234,18 @@
                             from imsld_learning_activitiesi
                             where activity_id = :completed_id
                         }
-                        append completed_activities "<#_ <li> % $activity_title % </li> #>"
+                        append completed_activities "[_ imsld.li_activity_title_li]"
                     } else {
                         # the learning activity is referenced from an activity structure... digg more
-                        append completed_activities "<#_ <li> impozzible </li> #>"
+                        append completed_activities "[_ imsld.li_impozzible_li]"
                     }
                 }
                 support {
                 }
                 structure {
                 }
                 default {
-                    ad_return_error "<#_ Invalid type $type in imsld::next_activity #>" "<#_ Valid types are learning, support and structure#>"
+                    ad_return_error "[_ imsld.lt_Invalid_type_type_in_]" "[_ imsld.lt_Valid_types_are_learn]"
                     ad_script_abort
                 }
             }
@@ -308,7 +308,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
-                    return [list "finished!" {} "$completed_activities"]
+                    return [list { "[_ imsld.finished]" } {} "$completed_activities"]
                 }
             }
         }
@@ -337,7 +337,7 @@
         # !!! HERE IS WHERE WE DECIDE IF WE CALL A DOTLRN SERVICE TO SERVE THE ACTIVITY, DEPENDING ON THE IDENTIFIER ???
         # BY DEFAULT GET THE RESOURCE AND DISPLAY IT FROM THE FILE STORAGE
         set activity_name [expr { [empty_string_p $title] ? $identifier : $title }]
-        set activity_urls "<#_ <ul> Todo: % $activity_name % <br /> #>"
+        set activity_urls "[_ imsld.lt_ul_Next_Activity_acti]"
         db_foreach la_associated_files {
             select cpf.imsld_file_id,
             cpf.file_name,
@@ -372,10 +372,10 @@
                 where fs.live_revision = :imsld_file_id
             }]
             set file_url "[ad_url][apm_package_url_from_id $fs_package_id]view/${file_url}"
-            append activity_urls "<#_ <li> % <a href=[export_vars -base $file_url]> % $file_name % </a> \[ <a href=[ad_url][ad_conn url]/finish-component-element-${imsld_id}-${role_part_id}-${activity_id}-learning.imsld>finishim!</a> \] </li> #>"
+            append activity_urls "<li> <a href=[export_vars -base $file_url]> $file_name </a> \[ <a href=[ad_url][ad_conn url]/finish-component-element-${imsld_id}-${role_part_id}-${activity_id}-learning.imsld>finish</a> \] </li>"
         } if_no_rows {
             # the activity doesn't have any resource associated, display the default page
-            append activity_urls "<#_ <li> desc (no file associated) </li> #>"
+            append activity_urls "[_ imsld.lt_li_desc_no_file_assoc]"
         }
         append activity_urls "</ul>"
     } elseif { [db_0or1row support_activity {
@@ -394,7 +394,7 @@
         # !!! HERE IS WHERE WE DECIDE IF WE CALL A DOTLRN SERVICE TO SERVE THE ACTIVITY, DEPENDING ON THE IDENTIFIER ???
         # BY DEFAULT GET THE RESOURCE AND DISPLAY IT FROM THE FILE STORAGE
         set activity_name [expr { [empty_string_p $title] ? $identifier : $title }]
-        set activity_urls "<#_ <ul> % $activity_name % <br /> #>"
+        set activity_urls "[_ imsld.ul_activity_name_br_]"
         db_foreach la_associated_files {
             select cpf.imsld_file_id,
             cpf.file_name
@@ -414,10 +414,10 @@
             and cpf.resource_id = cr4.item_id
             and content_revision__is_live(cpf.imsld_file_id) = 't'
         } {
-            append activity_urls "<#_ <li> % $file_name % </li> #>"
+            append activity_urls "[_ imsld.li_file_name_li]"
         } if_no_rows {
             # the activity doesn't have any resource associated, display the default page
-            append activity_urls "<#_ <li> desc (no file associated) </li> #>"
+            append activity_urls "[_ imsld.lt_li_desc_no_file_assoc]"
         }
         append activity_urls "</ul>"
     } elseif { 1==3 } {
@@ -429,8 +429,8 @@
         set activity_name "... environment?"
         set activity_urls "?????"
     }
-
-    return [list "$activity_name" "$activity_urls" "$completed_activities"]
+    # !! first parameter: activity name
+    return [list "" "$activity_urls" "$completed_activities"]
 }
 
 ad_register_proc GET /finish-component-element* imsld::finish_component_element
Index: openacs-4/packages/imsld/www/test.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/Attic/test.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/imsld/www/test.tcl	5 Oct 2005 14:13:02 -0000	1.3
+++ openacs-4/packages/imsld/www/test.tcl	5 Oct 2005 15:33:26 -0000	1.4
@@ -64,227 +64,227 @@
 
     set mensaje "crear"
 #     # learning objects
-#     content::type::new -content_type imsld_learning_object -supertype content_revision -pretty_name "<#_ Learning Object #>" -pretty_plural "<#_ Learning Objects #>" -table_name imsld_learning_objects -id_column learning_object_id
+#     content::type::new -content_type imsld_learning_object -supertype content_revision -pretty_name "[_ imsld.Learning_Object]" -pretty_plural "[_ imsld.Learning_Objects]" -table_name imsld_learning_objects -id_column learning_object_id
     
-#     content::type::attribute::new -content_type imsld_learning_object -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-#     content::type::attribute::new -content_type imsld_learning_object -attribute_name class -datatype string -pretty_name "<#_ Class #>" -column_spec "varchar(4000)"
-#     content::type::attribute::new -content_type imsld_learning_object -attribute_name is_visible_p -datatype string -pretty_name "<#_ Is Visible? #>" -column_spec "char(1)"
-#     content::type::attribute::new -content_type imsld_learning_object -attribute_name type -datatype string -pretty_name "<#_ Type #>" -column_spec "varchar(100)"
-#     content::type::attribute::new -content_type imsld_learning_object -attribute_name parameters -datatype string -pretty_name "<#_ Parameters #>" -column_spec "varchar(4000)"
+#     content::type::attribute::new -content_type imsld_learning_object -attribute_name identifier -datatype string -pretty_name "[_ imsld.Identifier]" -column_spec "varchar(100)"
+#     content::type::attribute::new -content_type imsld_learning_object -attribute_name class -datatype string -pretty_name "[_ imsld.Class]" -column_spec "varchar(4000)"
+#     content::type::attribute::new -content_type imsld_learning_object -attribute_name is_visible_p -datatype string -pretty_name "[_ imsld.Is_Visible]" -column_spec "char(1)"
+#     content::type::attribute::new -content_type imsld_learning_object -attribute_name type -datatype string -pretty_name "[_ imsld.Type]" -column_spec "varchar(100)"
+#     content::type::attribute::new -content_type imsld_learning_object -attribute_name parameters -datatype string -pretty_name "[_ imsld.Parameters]" -column_spec "varchar(4000)"
     
 #     # imsld 
-#     content::type::new -content_type imsld_imsld -supertype content_revision -pretty_name "<#_ IMS-LD #>" -pretty_plural "<#_ IMS-LDs #>" -table_name imsld_imslds -id_column imsld_id 
+#     content::type::new -content_type imsld_imsld -supertype content_revision -pretty_name "[_ imsld.IMS-LD]" -pretty_plural "[_ imsld.IMS-LDs]" -table_name imsld_imslds -id_column imsld_id 
 
-#     content::type::attribute::new -content_type imsld_imsld -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-#     content::type::attribute::new -content_type imsld_imsld -attribute_name version -datatype string -pretty_name "<#_ Version #>" -column_spec "varchar(10)"
-#     content::type::attribute::new -content_type imsld_imsld -attribute_name level -datatype string -pretty_name "<#_ Level #>" -column_spec "char(1)"
-#     content::type::attribute::new -content_type imsld_imsld -attribute_name sequence_used_p -datatype string -pretty_name "<#_ Sequence Used #>" -column_spec "char(1)"
-#     content::type::attribute::new -content_type imsld_imsld -attribute_name learning_objective_id -datatype number -pretty_name "<#_ Learning Objectives ID #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_imsld -attribute_name prerequisite_id -datatype number -pretty_name "<#_ Prerequistes ID #>" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_imsld -attribute_name identifier -datatype string -pretty_name "[_ imsld.Identifier]" -column_spec "varchar(100)"
+#     content::type::attribute::new -content_type imsld_imsld -attribute_name version -datatype string -pretty_name "[_ imsld.Version]" -column_spec "varchar(10)"
+#     content::type::attribute::new -content_type imsld_imsld -attribute_name level -datatype string -pretty_name "[_ imsld.Level]" -column_spec "char(1)"
+#     content::type::attribute::new -content_type imsld_imsld -attribute_name sequence_used_p -datatype string -pretty_name "[_ imsld.Sequence_Used]" -column_spec "char(1)"
+#     content::type::attribute::new -content_type imsld_imsld -attribute_name learning_objective_id -datatype number -pretty_name "[_ imsld.lt_Learning_Objectives_I]" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_imsld -attribute_name prerequisite_id -datatype number -pretty_name "[_ imsld.Prerequistes_ID]" -column_spec "integer"
 
 #     # learning objectives
-#     content::type::new -content_type imsld_learning_objective -supertype content_revision -pretty_name "<#_ IMS-LD Learning Objective #>" -pretty_plural "<#_ IMS-LD Learning Objectives #>" -table_name imsld_learning_objectives -id_column learning_object_id
+#     content::type::new -content_type imsld_learning_objective -supertype content_revision -pretty_name "[_ imsld.lt_IMS-LD_Learning_Objec]" -pretty_plural "[_ imsld.lt_IMS-LD_Learning_Objec_1]" -table_name imsld_learning_objectives -id_column learning_object_id
 
-#     content::type::attribute::new -content_type imsld_learning_objective -attribute_name pretty_title -datatype string -pretty_name "<#_ Pretty Title #>" -column_spec "varchar(200)"
+#     content::type::attribute::new -content_type imsld_learning_objective -attribute_name pretty_title -datatype string -pretty_name "[_ imsld.Pretty_Title]" -column_spec "varchar(200)"
 
 #     # imsld prerequisites
-#     content::type::new -content_type imsld_prerequisite -supertype content_revision -pretty_name "<#_ IMS-LD Prerequisite #>" -pretty_plural "<#_ IMS-LD Prerequisites #>" -table_name imsld_prerequisites -id_column prerequisite_id
+#     content::type::new -content_type imsld_prerequisite -supertype content_revision -pretty_name "[_ imsld.IMS-LD_Prerequisite]" -pretty_plural "[_ imsld.IMS-LD_Prerequisites]" -table_name imsld_prerequisites -id_column prerequisite_id
 
-#     content::type::attribute::new -content_type imsld_prerequisite -attribute_name pretty_title -datatype string -pretty_name "<#_ Pretty Title #>" -column_spec "varchar(200)"
+#     content::type::attribute::new -content_type imsld_prerequisite -attribute_name pretty_title -datatype string -pretty_name "[_ imsld.Pretty_Title]" -column_spec "varchar(200)"
 
 #     # imsld items
-#     content::type::new -content_type imsld_item -supertype content_revision -pretty_name "<#_ IMS-LD Item #>" -pretty_plural "<#_ IMS-LD Items #>" -table_name imsld_items -id_column imsld_item_id
+#     content::type::new -content_type imsld_item -supertype content_revision -pretty_name "[_ imsld.IMS-LD_Item]" -pretty_plural "[_ imsld.IMS-LD_Items]" -table_name imsld_items -id_column imsld_item_id
 
-#     content::type::attribute::new -content_type imsld_item -attribute_name parent_item_id -datatype integer -pretty_name "<#_ Parent Item Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_item -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-#     content::type::attribute::new -content_type imsld_item -attribute_name identifierref -datatype string -pretty_name "<#_ Identifier Reference #>" -column_spec "varchar(100)"
-#     content::type::attribute::new -content_type imsld_item -attribute_name is_visible_p -datatype string -pretty_name "<#_ Is Visible? #>" -column_spec "char(1)"
-#     content::type::attribute::new -content_type imsld_item -attribute_name parameters -datatype string -pretty_name "<#_ Parameters #>" -column_spec "varchar(4000)"
+#     content::type::attribute::new -content_type imsld_item -attribute_name parent_item_id -datatype integer -pretty_name "[_ imsld.lt_Parent_Item_Identifie]" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_item -attribute_name identifier -datatype string -pretty_name "[_ imsld.Identifier]" -column_spec "varchar(100)"
+#     content::type::attribute::new -content_type imsld_item -attribute_name identifierref -datatype string -pretty_name "[_ imsld.Identifier_Reference]" -column_spec "varchar(100)"
+#     content::type::attribute::new -content_type imsld_item -attribute_name is_visible_p -datatype string -pretty_name "[_ imsld.Is_Visible]" -column_spec "char(1)"
+#     content::type::attribute::new -content_type imsld_item -attribute_name parameters -datatype string -pretty_name "[_ imsld.Parameters]" -column_spec "varchar(4000)"
 
 #     # components
-#     content::type::new -content_type imsld_component -supertype content_revision -pretty_name "<#_ IMS-LD Component #>" -pretty_plural "<#_ IMS-LD Components #>" -table_name imsld_components -id_column component_id
+#     content::type::new -content_type imsld_component -supertype content_revision -pretty_name "[_ imsld.IMS-LD_Component]" -pretty_plural "[_ imsld.IMS-LD_Components]" -table_name imsld_components -id_column component_id
 
-#     content::type::attribute::new -content_type imsld_component -attribute_name imsld_id -datatype number -pretty_name "<#_ IMS-LD Identifier #>" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_component -attribute_name imsld_id -datatype number -pretty_name "[_ imsld.IMS-LD_Identifier]" -column_spec "integer"
     
 #     # imsld roles
-#     content::type::new -content_type imsld_role -supertype content_revision -pretty_name "<#_ IMS-LD Role #>" -pretty_plural "<#_ IMS-LD Roles #>" -table_name imsld_roles -id_column role_id
+#     content::type::new -content_type imsld_role -supertype content_revision -pretty_name "[_ imsld.IMS-LD_Role]" -pretty_plural "[_ imsld.IMS-LD_Roles]" -table_name imsld_roles -id_column role_id
 
-#     content::type::attribute::new -content_type imsld_role -attribute_name component_id -datatype string -pretty_name "<#_ Component Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_role -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-#     content::type::attribute::new -content_type imsld_role -attribute_name role_type -datatype string  -pretty_name "<#_ Role Type #>" -column_spec "varchar(100)"
-#     content::type::attribute::new -content_type imsld_role -attribute_name parent_role_id -datatype number -pretty_name "<#_ Parent Role Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_role -attribute_name create_new_p -datatype string -pretty_name "<#_ Create New? #>" -column_spec "char(1)"
-#     content::type::attribute::new -content_type imsld_role -attribute_name match_persons_p -datatype string -pretty_name "<#_ Match Persons? #>" -column_spec "char(1)"
-#     content::type::attribute::new -content_type imsld_role -attribute_name max_persons -datatype number -pretty_name "<#_ Max Persons #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_role -attribute_name min_persons -datatype number -pretty_name "<#_ Min Persons#>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_role -attribute_name href -datatype string -pretty_name "<#_ Href #>" -column_spec "varchar(2000)"
+#     content::type::attribute::new -content_type imsld_role -attribute_name component_id -datatype string -pretty_name "[_ imsld.Component_Identifier]" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_role -attribute_name identifier -datatype string -pretty_name "[_ imsld.Identifier]" -column_spec "varchar(100)"
+#     content::type::attribute::new -content_type imsld_role -attribute_name role_type -datatype string  -pretty_name "[_ imsld.Role_Type]" -column_spec "varchar(100)"
+#     content::type::attribute::new -content_type imsld_role -attribute_name parent_role_id -datatype number -pretty_name "[_ imsld.lt_Parent_Role_Identifie]" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_role -attribute_name create_new_p -datatype string -pretty_name "[_ imsld.Create_New]" -column_spec "char(1)"
+#     content::type::attribute::new -content_type imsld_role -attribute_name match_persons_p -datatype string -pretty_name "[_ imsld.Match_Persons]" -column_spec "char(1)"
+#     content::type::attribute::new -content_type imsld_role -attribute_name max_persons -datatype number -pretty_name "[_ imsld.Max_Persons]" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_role -attribute_name min_persons -datatype number -pretty_name "[_ imsld.Min_Persons]" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_role -attribute_name href -datatype string -pretty_name "[_ imsld.Href]" -column_spec "varchar(2000)"
 
 #     # imsld activity description
-#     content::type::new -content_type imsld_activity_desc -supertype content_revision -pretty_name "<#_ IMS-LD Activity Description #>" -pretty_plural "<#_ IMS-LD Activity Descriptions #>" -table_name imsld_activity_desc -id_column description_id
+#     content::type::new -content_type imsld_activity_desc -supertype content_revision -pretty_name "[_ imsld.lt_IMS-LD_Activity_Descr]" -pretty_plural "[_ imsld.lt_IMS-LD_Activity_Descr_1]" -table_name imsld_activity_desc -id_column description_id
 
-#     content::type::attribute::new -content_type imsld_activity_desc -attribute_name pretty_title -datatype string -pretty_name "<#_ Pretty Title #>" -column_spec "varchar(200)"
+#     content::type::attribute::new -content_type imsld_activity_desc -attribute_name pretty_title -datatype string -pretty_name "[_ imsld.Pretty_Title]" -column_spec "varchar(200)"
 
 #     # learning activities
-#     content::type::new -content_type imsld_learning_activity -supertype content_revision -pretty_name "<#_ IMS-LD Learning Activity #>" -pretty_plural "<#_ IMS-LD Learning Activities #>" -table_name imsld_learning_activities -id_column activity_id
+#     content::type::new -content_type imsld_learning_activity -supertype content_revision -pretty_name "[_ imsld.lt_IMS-LD_Learning_Activ]" -pretty_plural "[_ imsld.lt_IMS-LD_Learning_Activ_1]" -table_name imsld_learning_activities -id_column activity_id
     
-#     content::type::attribute::new -content_type imsld_learning_activity -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-#     content::type::attribute::new -content_type imsld_learning_activity -attribute_name component_id -datatype number -pretty_name "<#_ Component Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_learning_activity -attribute_name activity_description_id -datatype number -pretty_name "<#_ Activity Description Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_learning_activity -attribute_name is_visible_p -datatype string -pretty_name "<#_ Is Visible? #>" -column_spec "char(1)"
-#     content::type::attribute::new -content_type imsld_learning_activity -attribute_name user_choice_p -datatype string -pretty_name "<#_ User Choice? #>" -column_spec "char(1)"
-#     content::type::attribute::new -content_type imsld_learning_activity -attribute_name time_limit_id -datatype number -pretty_name "<#_ Time Limit Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_learning_activity -attribute_name on_completion_id -datatype number -pretty_name "<#_ On Completion Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_learning_activity -attribute_name parameters -datatype string -pretty_name "<#_ Parameters #>" -column_spec "varchar(4000)"
-#     content::type::attribute::new -content_type imsld_learning_activity -attribute_name learning_objective_id -datatype number -pretty_name "<#_ Learning Objective ID #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_learning_activity -attribute_name prerequisite_id -datatype number -pretty_name "<#_ Prerequistes ID #>" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_learning_activity -attribute_name identifier -datatype string -pretty_name "[_ imsld.Identifier]" -column_spec "varchar(100)"
+#     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 user_choice_p -datatype string -pretty_name "[_ imsld.User_Choice]" -column_spec "char(1)"
+#     content::type::attribute::new -content_type imsld_learning_activity -attribute_name time_limit_id -datatype number -pretty_name "[_ imsld.lt_Time_Limit_Identifier]" -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"
 
 #     # support activities
-#     content::type::new -content_type imsld_support_activity -supertype content_revision -pretty_name "<#_ IMS-LD Support Activity #>" -pretty_plural "<#_ IMS-LD Support Activities #>" -table_name imsld_support_activities -id_column activity_id
+#     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
     
-#     content::type::attribute::new -content_type imsld_support_activity -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-#     content::type::attribute::new -content_type imsld_support_activity -attribute_name component_id -datatype number -pretty_name "<#_ Component Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_support_activity -attribute_name parameter_id -datatype number -pretty_name "<#_ Parameter Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_support_activity -attribute_name is_visible_p -datatype string -pretty_name "<#_ Is Visible? #>" -column_spec "char(1)"
-#     content::type::attribute::new -content_type imsld_support_activity -attribute_name user_choice_p -datatype string -pretty_name "<#_ User Choice? #>" -column_spec "char(1)"
-#     content::type::attribute::new -content_type imsld_support_activity -attribute_name time_limit_id -datatype number -pretty_name "<#_ Time Limit Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_support_activity -attribute_name on_completion_id -datatype number -pretty_name "<#_ On Completion Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_support_activity -attribute_name parameters -datatype string -pretty_name "<#_ Parameters #>" -column_spec "varchar(4000)"
+#     content::type::attribute::new -content_type imsld_support_activity -attribute_name identifier -datatype string -pretty_name "[_ imsld.Identifier]" -column_spec "varchar(100)"
+#     content::type::attribute::new -content_type imsld_support_activity -attribute_name component_id -datatype number -pretty_name "[_ imsld.Component_Identifier]" -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 user_choice_p -datatype string -pretty_name "[_ imsld.User_Choice]" -column_spec "char(1)"
+#     content::type::attribute::new -content_type imsld_support_activity -attribute_name time_limit_id -datatype number -pretty_name "[_ imsld.lt_Time_Limit_Identifier]" -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)"
 
 #     # activity structures
-#     content::type::new -content_type imsld_activity_structure -supertype content_revision -pretty_name "<#_ IMS-LD Activity Structure #>" -pretty_plural "<#_ IMS-LD Activity Structures #>" -table_name imsld_activity_structures -id_column structure_id 
+#     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 
 
-#     content::type::attribute::new -content_type imsld_activity_structure -attribute_name component_id -datatype number -pretty_name "<#_Component Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_activity_structure -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-#     content::type::attribute::new -content_type imsld_activity_structure -attribute_name number_to_select -datatype number -pretty_name "<#_ Number to Select #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_activity_structure -attribute_name structure_type -datatype string -pretty_name "<#_ Structure Type #>" -column_spec "char(9)"
-#     content::type::attribute::new -content_type imsld_activity_structure -attribute_name sort -datatype string -pretty_name "<#_ Sort #>" -column_spec "varchar(4)"
+#     content::type::attribute::new -content_type imsld_activity_structure -attribute_name component_id -datatype number -pretty_name "[_ imsld._Component]" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_activity_structure -attribute_name identifier -datatype string -pretty_name "[_ imsld.Identifier]" -column_spec "varchar(100)"
+#     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)"
 
 #     # environments
-#     content::type::new -content_type imsld_environment -supertype content_revision -pretty_name "<#_ IMD-LD Environment #>" -pretty_plural "<#_ IMD-LD Environments #>" -table_name imsld_environments -id_column environment_id
+#     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
     
-#     content::type::attribute::new -content_type imsld_environment -attribute_name component_id -datatype number -pretty_name "<#_ Component Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_environment -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-#     content::type::attribute::new -content_type imsld_environment -attribute_name learning_object_id -datatype number -pretty_name "<#_ Learning Object Identifier #>" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_environment -attribute_name component_id -datatype number -pretty_name "[_ imsld.Component_Identifier]" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_environment -attribute_name identifier -datatype string -pretty_name "[_ imsld.Identifier]" -column_spec "varchar(100)"
+#     content::type::attribute::new -content_type imsld_environment -attribute_name learning_object_id -datatype number -pretty_name "[_ imsld.lt_Learning_Object_Ident]" -column_spec "integer"
 
 #     # services
-#     content::type::new -content_type imsld_service -supertype content_revision -pretty_name "<#_ IMS-LD Service #>" -pretty_plural "<#_ IMS-LD Services #>" -table_name imsld_services -id_column service_id
+#     content::type::new -content_type imsld_service -supertype content_revision -pretty_name "[_ imsld.IMS-LD_Service]" -pretty_plural "[_ imsld.IMS-LD_Services]" -table_name imsld_services -id_column service_id
     
-#     content::type::attribute::new -content_type imsld_service -attribute_name environment_id -datatype number -pretty_name "<#_ Environment Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_service -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-#     content::type::attribute::new -content_type imsld_service -attribute_name class -datatype string -pretty_name "<#_ Class #>" -column_spec "varchar(4000)"
-#     content::type::attribute::new -content_type imsld_service -attribute_name is_visible_p -datatype string -pretty_name "<#_ Is Visible? #>" -column_spec "char(1)"
-#     content::type::attribute::new -content_type imsld_service -attribute_name parameters -datatype string -pretty_name "<#_ Parameters #>" -column_spec "varchar(4000)"
-#     content::type::attribute::new -content_type imsld_service -attribute_name service_type -datatype string -pretty_name "<#_ Service Type #>" -column_spec "varchar(10)"
+#     content::type::attribute::new -content_type imsld_service -attribute_name environment_id -datatype number -pretty_name "[_ imsld.lt_Environment_Identifie]" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_service -attribute_name identifier -datatype string -pretty_name "[_ imsld.Identifier]" -column_spec "varchar(100)"
+#     content::type::attribute::new -content_type imsld_service -attribute_name class -datatype string -pretty_name "[_ imsld.Class]" -column_spec "varchar(4000)"
+#     content::type::attribute::new -content_type imsld_service -attribute_name is_visible_p -datatype string -pretty_name "[_ imsld.Is_Visible]" -column_spec "char(1)"
+#     content::type::attribute::new -content_type imsld_service -attribute_name parameters -datatype string -pretty_name "[_ imsld.Parameters]" -column_spec "varchar(4000)"
+#     content::type::attribute::new -content_type imsld_service -attribute_name service_type -datatype string -pretty_name "[_ imsld.Service_Type]" -column_spec "varchar(10)"
 
 #     # send mail services
-#     content::type::new -content_type imsld_send_mail_service -supertype content_revision -pretty_name "<#_ IMS-LD Sendmail Service #>" -pretty_plural "<#_ IMS-LD Sendmail Services #>" -table_name imsld_send_mail_services -id_column mail_id
+#     content::type::new -content_type imsld_send_mail_service -supertype content_revision -pretty_name "[_ imsld.lt_IMS-LD_Sendmail_Servi]" -pretty_plural "[_ imsld.lt_IMS-LD_Sendmail_Servi_1]" -table_name imsld_send_mail_services -id_column mail_id
     
-#     content::type::attribute::new -content_type imsld_send_mail_service -attribute_name service_id -datatype number -pretty_name "<#_ Service Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_send_mail_service -attribute_name recipients -datatype string -pretty_name "<#_ Recipients #>" -column_spec "varchar(11)"
-#     content::type::attribute::new -content_type imsld_send_mail_service -attribute_name is_visible_p -datatype string -pretty_name "<#_ Is Visible? #>" -column_spec "char(1)"
-#     content::type::attribute::new -content_type imsld_send_mail_service -attribute_name parameters -datatype string -pretty_name "<#_ Parameters #>" -column_spec "varchar(4000)"
+#     content::type::attribute::new -content_type imsld_send_mail_service -attribute_name service_id -datatype number -pretty_name "[_ imsld.Service_Identifier]" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_send_mail_service -attribute_name recipients -datatype string -pretty_name "[_ imsld.Recipients]" -column_spec "varchar(11)"
+#     content::type::attribute::new -content_type imsld_send_mail_service -attribute_name is_visible_p -datatype string -pretty_name "[_ imsld.Is_Visible]" -column_spec "char(1)"
+#     content::type::attribute::new -content_type imsld_send_mail_service -attribute_name parameters -datatype string -pretty_name "[_ imsld.Parameters]" -column_spec "varchar(4000)"
 
 #     # send mail data
-#     content::type::new -content_type imsld_send_mail_data -supertype content_revision -pretty_name "<#_ IMS-LD Sendmail Data #>" -pretty_plural "<#_ IMS-LD Sendmail Data #>" -table_name imsld_send_mail_data -id_column data_id
+#     content::type::new -content_type imsld_send_mail_data -supertype content_revision -pretty_name "[_ imsld.IMS-LD_Sendmail_Data]" -pretty_plural "[_ imsld.IMS-LD_Sendmail_Data]" -table_name imsld_send_mail_data -id_column data_id
 
-#     content::type::attribute::new -content_type imsld_send_mail_data -attribute_name send_mail_id -datatype number -pretty_name "<#_ Sendmail Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_send_mail_data -attribute_name role_id -datatype number -pretty_name "<#_ Role Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_send_mail_data -attribute_name mail_data -datatype string -pretty_name "<#_ Mail Data #>" -column_spec "varchar(4000)"
+#     content::type::attribute::new -content_type imsld_send_mail_data -attribute_name send_mail_id -datatype number -pretty_name "[_ imsld.Sendmail_Identifier]" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_send_mail_data -attribute_name role_id -datatype number -pretty_name "[_ imsld.Role_Identifier]" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_send_mail_data -attribute_name mail_data -datatype string -pretty_name "[_ imsld.Mail_Data]" -column_spec "varchar(4000)"
 
 #     # conference services
-#     content::type::new -content_type imsld_conference_service -supertype content_revision -pretty_name "<#_ IMS-LD Conference Service #>" -pretty_plural "<#_ IMS-LD Conference Services #>" -table_name imsld_conference_services -id_column conference_id
+#     content::type::new -content_type imsld_conference_service -supertype content_revision -pretty_name "[_ imsld.lt_IMS-LD_Conference_Ser]" -pretty_plural "[_ imsld.lt_IMS-LD_Conference_Ser_1]" -table_name imsld_conference_services -id_column conference_id
 
-#     content::type::attribute::new -content_type imsld_conference_service -attribute_name service_id -datatype number -pretty_name "<#_ Service Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_conference_service -attribute_name conference_type -datatype string -pretty_name "<#_ Conference Type #>" -column_spec "char(12)"
-#     content::type::attribute::new -content_type imsld_conference_service -attribute_name imsld_item_id -datatype number -pretty_name "<#_ Item Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_conference_service -attribute_name manager_id -datatype number -pretty_name "<#_ Manager Identifier #>" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_conference_service -attribute_name service_id -datatype number -pretty_name "[_ imsld.Service_Identifier]" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_conference_service -attribute_name conference_type -datatype string -pretty_name "[_ imsld.Conference_Type]" -column_spec "char(12)"
+#     content::type::attribute::new -content_type imsld_conference_service -attribute_name imsld_item_id -datatype number -pretty_name "[_ imsld.Item_Identifier]" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_conference_service -attribute_name manager_id -datatype number -pretty_name "[_ imsld.Manager_Identifier]" -column_spec "integer"
 
 #     # methods
-#     content::type::new -content_type imsld_method -supertype content_revision -pretty_name "<#_ IMS-LD Method #>" -pretty_plural "<#_ IMS-LD Methods #>" -table_name imsld_methods -id_column method_id
+#     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 "<#_ IMS-LD Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_method -attribute_name time_limit_id -datatype number -pretty_name "<#_ Time Limit Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_method -attribute_name on_completion_id -datatype number -pretty_name "<#_ On Completion Identifier #>" -column_spec "integer"
+#     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 time_limit_id -datatype number -pretty_name "[_ imsld.lt_Time_Limit_Identifier]" -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
-#     content::type::new -content_type imsld_play -supertype content_revision -pretty_name "<#_ IMS-LD Play #>" -pretty_plural "<#_ IMS-LD Plays #>" -table_name imsld_plays -id_column play_id
+#     content::type::new -content_type imsld_play -supertype content_revision -pretty_name "[_ imsld.IMS-LD_Play]" -pretty_plural "[_ imsld.IMS-LD_Plays]" -table_name imsld_plays -id_column play_id
 
-#     content::type::attribute::new -content_type imsld_play -attribute_name method_id -datatype number -pretty_name "<#_ Method Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_play -attribute_name is_visible_p -datatype string -pretty_name "<#_ Is Visible? #>" -column_spec "char(1)"
-#     content::type::attribute::new -content_type imsld_play -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-#     content::type::attribute::new -content_type imsld_play -attribute_name when_last_act_completed_p -datatype string -pretty_name "<#_ When Last Act Completed? #>" -column_spec "char(1)"
-#     content::type::attribute::new -content_type imsld_play -attribute_name time_limit_id -datatype number -pretty_name "<#_ Time Limit Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_play -attribute_name on_completion_id -datatype number -pretty_name "<#_ On Completion Identifier #>" -column_spec "integer"
+#     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 when_last_act_completed_p -datatype string -pretty_name "[_ imsld.lt_When_Last_Act_Complet]" -column_spec "char(1)"
+#     content::type::attribute::new -content_type imsld_play -attribute_name time_limit_id -datatype number -pretty_name "[_ imsld.lt_Time_Limit_Identifier]" -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"
     
 #     # acts
-#     content::type::new -content_type imsld_act -supertype content_revision -pretty_name "<#_ IMS-LD Act #>" -pretty_plural "<#_ IMS-LD Acts #>" -table_name imsld_acts -id_column act_id
+#     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 "<#_ Play Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_act -attribute_name time_limit_id -datatype number -pretty_name "<#_ Time Limit Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_act -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-#     content::type::attribute::new -content_type imsld_act -attribute_name on_completion_id -datatype number -pretty_name "<#_ On Completion Identifier #>" -column_spec "integer"
+#     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 time_limit_id -datatype number -pretty_name "[_ imsld.lt_Time_Limit_Identifier]" -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"
 
 #     # role parts
-#     content::type::new -content_type imsld_role_part -supertype content_revision -pretty_name "<#_ IMS-LD Role Part #>" -pretty_plural "<#_ IMS-LD Role Parts #>" -table_name imsld_role_parts -id_column role_part_id
+#     content::type::new -content_type imsld_role_part -supertype content_revision -pretty_name "[_ imsld.IMS-LD_Role_Part]" -pretty_plural "[_ imsld.IMS-LD_Role_Parts]" -table_name imsld_role_parts -id_column role_part_id
 
-#     content::type::attribute::new -content_type imsld_role_part -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-#     content::type::attribute::new -content_type imsld_role_part -attribute_name role_id -datatype number -pretty_name "<#_ Role Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_role_part -attribute_name learning_activity_id -datatype number -pretty_name "<#_ Learning Activity Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_role_part -attribute_name support_activity_id -datatype number -pretty_name "<#_ Support Activity Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_role_part -attribute_name activity_structure_id -datatype number -pretty_name "<#_ Activity Structure Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_role_part -attribute_name environment_id -datatype number -pretty_name "<#_ Environment Identifier #>" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_role_part -attribute_name identifier -datatype string -pretty_name "[_ imsld.Identifier]" -column_spec "varchar(100)"
+#     content::type::attribute::new -content_type imsld_role_part -attribute_name role_id -datatype number -pretty_name "[_ imsld.Role_Identifier]" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_role_part -attribute_name learning_activity_id -datatype number -pretty_name "[_ imsld.lt_Learning_Activity_Ide]" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_role_part -attribute_name support_activity_id -datatype number -pretty_name "[_ imsld.lt_Support_Activity_Iden]" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_role_part -attribute_name activity_structure_id -datatype number -pretty_name "[_ imsld.lt_Activity_Structure_Id]" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_role_part -attribute_name environment_id -datatype number -pretty_name "[_ imsld.lt_Environment_Identifie]" -column_spec "integer"
 
 #     # parameters
-#     content::type::new -content_type imsld_parameter -supertype content_revision -pretty_name "<#_ IMS-LD Parameter #>" -pretty_plural "<#_ IMS-LD Parameters #>" -table_name imsld_parameters -id_column parameter_id
+#     content::type::new -content_type imsld_parameter -supertype content_revision -pretty_name "[_ imsld.IMS-LD_Parameter]" -pretty_plural "[_ imsld.IMS-LD_Parameters]" -table_name imsld_parameters -id_column parameter_id
     
-#     content::type::attribute::new -content_type imsld_parameter -attribute_name value -datatype string -pretty_name "<#_ Value #>" -column_spec "varchar(4000)"
+#     content::type::attribute::new -content_type imsld_parameter -attribute_name value -datatype string -pretty_name "[_ imsld.Value]" -column_spec "varchar(4000)"
 
 #     # time limits
-#     content::type::new -content_type imsld_time_limit -supertype content_revision -pretty_name "<#_ IMS-LD Time Limit #>" -pretty_plural "<#_ IMS-LD Time Limits #>" -table_name imsld_time_limits -id_column time_limit_id
+#     content::type::new -content_type imsld_time_limit -supertype content_revision -pretty_name "[_ imsld.IMS-LD_Time_Limit]" -pretty_plural "[_ imsld.IMS-LD_Time_Limits]" -table_name imsld_time_limits -id_column time_limit_id
     
-#     content::type::attribute::new -content_type imsld_time_limit -attribute_name time_in_seconds -datatype number -pretty_name "<#_ Time in Seconds #>" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_time_limit -attribute_name time_in_seconds -datatype number -pretty_name "[_ imsld.Time_in_Seconds]" -column_spec "integer"
 
 #     # on completion
-#     content::type::new -content_type imsld_on_completion -supertype content_revision -pretty_name "<#_ IMS-LD On Completion #>" -pretty_plural "<#_ IMS-LD On Completions #>" -table_name imsld_on_completion -id_column on_completion_id
+#     content::type::new -content_type imsld_on_completion -supertype content_revision -pretty_name "[_ imsld.IMS-LD_On_Completion]" -pretty_plural "[_ imsld.lt_IMS-LD_On_Completions]" -table_name imsld_on_completion -id_column on_completion_id
 
-#     content::type::attribute::new -content_type imsld_on_completion -attribute_name feedback_title -datatype string -pretty_name "<#_ Feedbach Title #>" -column_spec "varchar(200)"
+#     content::type::attribute::new -content_type imsld_on_completion -attribute_name feedback_title -datatype string -pretty_name "[_ imsld.Feedbach_Title]" -column_spec "varchar(200)"
 
 #     ### IMS-LD Content Packaging
 
 #     # manifests
-#     content::type::new -content_type imsld_cp_manifest -supertype content_revision -pretty_name "<#_ IMS-LD CP Manifest #>" -pretty_plural "<#_ IMS-LD CP Manifests #>" -table_name imsld_cp_manifests -id_column manifest_id
+#     content::type::new -content_type imsld_cp_manifest -supertype content_revision -pretty_name "[_ imsld.IMS-LD_CP_Manifest]" -pretty_plural "[_ imsld.IMS-LD_CP_Manifests]" -table_name imsld_cp_manifests -id_column manifest_id
 
-#     content::type::attribute::new -content_type imsld_cp_manifest -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(1000)"
-#     content::type::attribute::new -content_type imsld_cp_manifest -attribute_name version -datatype string -pretty_name "<#_ Version #>" -column_spec "varchar(100)"
-#     content::type::attribute::new -content_type imsld_cp_manifest -attribute_name parent_manifest_id -datatype number -pretty_name "<#_ Parent Manifest Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_cp_manifest -attribute_name is_shared_p -datatype string -pretty_name "<#_ Is shared? #>" -column_spec "char(1)"
+#     content::type::attribute::new -content_type imsld_cp_manifest -attribute_name identifier -datatype string -pretty_name "[_ imsld.Identifier]" -column_spec "varchar(1000)"
+#     content::type::attribute::new -content_type imsld_cp_manifest -attribute_name version -datatype string -pretty_name "[_ imsld.Version]" -column_spec "varchar(100)"
+#     content::type::attribute::new -content_type imsld_cp_manifest -attribute_name parent_manifest_id -datatype number -pretty_name "[_ imsld.lt_Parent_Manifest_Ident]" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_cp_manifest -attribute_name is_shared_p -datatype string -pretty_name "[_ imsld.Is_shared]" -column_spec "char(1)"
 
 #     # organizations
-#     content::type::new -content_type imsld_cp_organization -supertype content_revision -pretty_name "<#_ IMS-LD CP Organization #>" -pretty_plural "<#_ IMS-LD CP Organizations #>" -table_name imsld_cp_organizations -id_column organization_id
+#     content::type::new -content_type imsld_cp_organization -supertype content_revision -pretty_name "[_ imsld.lt_IMS-LD_CP_Organizatio]" -pretty_plural "[_ imsld.lt_IMS-LD_CP_Organizatio_1]" -table_name imsld_cp_organizations -id_column organization_id
     
-#     content::type::attribute::new -content_type imsld_cp_organization -attribute_name manifest_id -datatype number -pretty_name "<#_ Manifest Identifier #>" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_cp_organization -attribute_name manifest_id -datatype number -pretty_name "[_ imsld.Manifest_Identifier]" -column_spec "integer"
 
 #     # resources
-#     content::type::new -content_type imsld_cp_resource -supertype content_revision -pretty_name "<#_ IMS-LD CP Resource #>" -pretty_plural "<#_ IMS-LD CP Resources #>" -table_name imsld_cp_resources -id_column resource_id
+#     content::type::new -content_type imsld_cp_resource -supertype content_revision -pretty_name "[_ imsld.IMS-LD_CP_Resource]" -pretty_plural "[_ imsld.IMS-LD_CP_Resources]" -table_name imsld_cp_resources -id_column resource_id
 
-#     content::type::attribute::new -content_type imsld_cp_resource -attribute_name manifest_id -datatype number -pretty_name "<#_ Manifest Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_cp_resource -attribute_name identifier -datatype string -pretty_name "<#_ Identifier #>" -column_spec "varchar(100)"
-#     content::type::attribute::new -content_type imsld_cp_resource -attribute_name type -datatype string -pretty_name "<#_ Type #>" -column_spec "varchar(1000)"
-#     content::type::attribute::new -content_type imsld_cp_resource -attribute_name href -datatype string -pretty_name "<#_ Href #>" -column_spec "varchar(2000)"
+#     content::type::attribute::new -content_type imsld_cp_resource -attribute_name manifest_id -datatype number -pretty_name "[_ imsld.Manifest_Identifier]" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_cp_resource -attribute_name identifier -datatype string -pretty_name "[_ imsld.Identifier]" -column_spec "varchar(100)"
+#     content::type::attribute::new -content_type imsld_cp_resource -attribute_name type -datatype string -pretty_name "[_ imsld.Type]" -column_spec "varchar(1000)"
+#     content::type::attribute::new -content_type imsld_cp_resource -attribute_name href -datatype string -pretty_name "[_ imsld.Href]" -column_spec "varchar(2000)"
 
 #     # dependencies
-#     content::type::new -content_type imsld_cp_dependency -supertype content_revision -pretty_name "<#_ IMS-LD CP Dependency #>" -pretty_plural "<#_ IMS-LD CP Dependencies #>" -table_name imsld_cp_dependencies -id_column dependency_id
+#     content::type::new -content_type imsld_cp_dependency -supertype content_revision -pretty_name "[_ imsld.IMS-LD_CP_Dependency]" -pretty_plural "[_ imsld.lt_IMS-LD_CP_Dependencie]" -table_name imsld_cp_dependencies -id_column dependency_id
 
-#     content::type::attribute::new -content_type imsld_cp_dependency -attribute_name resource_id -datatype number -pretty_name "<#_ Resource Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_cp_dependency -attribute_name identifierref -datatype string -pretty_name "<#_ Identifierref #>" -column_spec "varchar(100)"
+#     content::type::attribute::new -content_type imsld_cp_dependency -attribute_name resource_id -datatype number -pretty_name "[_ imsld.Resource_Identifier]" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_cp_dependency -attribute_name identifierref -datatype string -pretty_name "[_ imsld.Identifierref]" -column_spec "varchar(100)"
 
 #     # imsld cp files
-#     content::type::new -content_type imsld_cp_file -supertype content_revision -pretty_name "<#_ IMS-LD CP File #>" -pretty_plural "<#_ IMS-LD CP Filed #>" -table_name imsld_cp_files -id_column imsld_file_id
+#     content::type::new -content_type imsld_cp_file -supertype content_revision -pretty_name "[_ imsld.IMS-LD_CP_File]" -pretty_plural "[_ imsld.IMS-LD_CP_Filed]" -table_name imsld_cp_files -id_column imsld_file_id
 
-#     content::type::attribute::new -content_type imsld_cp_file -attribute_name resource_id -datatype number -pretty_name "<#_ Resource Identifier #>" -column_spec "integer"
-#     content::type::attribute::new -content_type imsld_cp_file -attribute_name path_to_file -datatype string -pretty_name "<#_ Path to File #>" -column_spec "varchar(2000)"
-#     content::type::attribute::new -content_type imsld_cp_file -attribute_name file_name -datatype string -pretty_name "<#_ File name #>" -column_spec "varchar(2000)"
-#     content::type::attribute::new -content_type imsld_cp_file -attribute_name href -datatype string -pretty_name "<#_ Href #>" -column_spec "varchar(2000)"
+#     content::type::attribute::new -content_type imsld_cp_file -attribute_name resource_id -datatype number -pretty_name "[_ imsld.Resource_Identifier]" -column_spec "integer"
+#     content::type::attribute::new -content_type imsld_cp_file -attribute_name path_to_file -datatype string -pretty_name "[_ imsld.Path_to_File]" -column_spec "varchar(2000)"
+#     content::type::attribute::new -content_type imsld_cp_file -attribute_name file_name -datatype string -pretty_name "[_ imsld.File_name]" -column_spec "varchar(2000)"
+#     content::type::attribute::new -content_type imsld_cp_file -attribute_name href -datatype string -pretty_name "[_ imsld.Href]" -column_spec "varchar(2000)"
 
 
 } else {
Index: openacs-4/packages/imsld/www/admin/imsld-new-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-new-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/imsld/www/admin/imsld-new-2.adp	5 Aug 2005 15:25:33 -0000	1.2
+++ openacs-4/packages/imsld/www/admin/imsld-new-2.adp	5 Oct 2005 15:33:27 -0000	1.3
@@ -3,13 +3,13 @@
   <property name="context">@context;noquote@</property>
 
 <if @imsld_info:rowcount@ eq 0>
-    No information found in the imsmanifest.xml file. Nothing to do.
-</if><else>
-Pleas, confirm the information you are uploading
+    #imsld.No#
+</if>
+<else>
+    #imsld.lt_Please_confirm_the_in#
 <blockquote>
 <listtemplate name="imsld_info"></listtemplate>
 </blockquote>
 <formtemplate id=imsld_upload></formtemplate>
 </else>
 
-@msg;noquote@
\ No newline at end of file
Index: openacs-4/packages/imsld/www/admin/imsld-new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-new-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/imsld/www/admin/imsld-new-2.tcl	21 Sep 2005 14:39:56 -0000	1.3
+++ openacs-4/packages/imsld/www/admin/imsld-new-2.tcl	5 Oct 2005 15:33:27 -0000	1.4
@@ -19,8 +19,8 @@
 set package_id [ad_conn package_id]
 permission::require_permission -object_id $package_id -privilege create
 
-set page_title "<#_ Confirm: New IMS-LD #>"
-set context [list [list "<#_ New IMS-LD #>" "new-imsld"] [list "<#_ Confirm: New IMS-LD #>"]]
+set page_title "[_ imsld.Confirm_New_IMS-LD]"
+set context [list [list "[_ imsld.New_IMS-LD]" "new-imsld"] [list "[_ imsld.Confirm_New_IMS-LD]"]]
 
 set user_id [ad_conn user_id]
 
@@ -33,7 +33,7 @@
 # see if the file actually is where it suppose to be. Othewise abort
 if {$manifest == 0} {
     imsld::parse::remove_dir -dir $tmp_dir
-    ad_return_error "<#_ No imsmanifest.xml found #>" "<#_ No imsmanifest.xml was found in the compressed file. Aborting. #>"
+    ad_return_error "[_ imsld.lt_No_imsmanifestxml_fou]" "[_ imsld.lt_No_imsmanifestxml_was]"
     ad_script_abort
 }
 
@@ -51,7 +51,7 @@
     template::list::create \
         -name imsld_info \
         -multirow imsld_info \
-        -no_data "<#_ No information found in the manifest file #>" \
+        -no_data "[_ imsld.lt_No_information_found_]" \
         -elements {
             element_name {
                 label ""
@@ -69,17 +69,17 @@
     if { ![llength $organizations] } {
         set organizations [$manifest child all organizations]
     }
-    multirow append imsld_info "<#_ Number of Organizations: #>" [llength $organizations]
+    multirow append imsld_info "[_ imsld.lt_Number_of_Organizatio]" [llength $organizations]
     set imsld [$organizations child all imsld:learning-design]
     if { ![llength $imsld] } {
         set imsld [$organizations child all learning-design]
     }
-    multirow append imsld_info "<#_ Number of IMD LDs #>" [llength $imsld]
+    multirow append imsld_info "[_ imsld.Number_of_IMD_LDs]" [llength $imsld]
     set imsld_title [imsld::parse::get_title -node $imsld -prefix imsld]
     set imsld_level [imsld::parse::get_attribute -node $imsld -attr_name level]
-    set imsld_level [expr { [empty_string_p $imsld_level] ? "<#_ Not defined #>" : $imsld_level }]
-    multirow append imsld_info "<#_ IMD LD Title #>" "$imsld_title"
-    multirow append imsld_info "<#_ IMD LD Level #>" "$imsld_level"
+    set imsld_level [expr { [empty_string_p $imsld_level] ? "[_ imsld.Not_defined]" : $imsld_level }]
+    multirow append imsld_info "[_ imsld.IMD_LD_Title]" "$imsld_title"
+    multirow append imsld_info "[_ imsld.IMD_LD_Level]" "$imsld_level"
     
     # Components
     set components [$imsld child all imsld:components]
@@ -89,20 +89,20 @@
     if { [llength $roles] } {
         set learners [llength [$roles child all imsld:learner]]
         set staff [llength [$roles child all imsld:staff]]
-        multirow append imsld_info "<#_ Total Roles #>" [expr $learners + $staff]
-        multirow append imsld_info "<#_ Learners Roles #>" $learners
-        multirow append imsld_info "<#_ Staff Roels #>" $staff
+        multirow append imsld_info "[_ imsld.Total_Roles]" [expr $learners + $staff]
+        multirow append imsld_info "[_ imsld.Learners_Roles]" $learners
+        multirow append imsld_info "[_ imsld.Staff_Roels]" $staff
     }
 
     set activities [$components child all imsld:activities]
     if { [llength $activities] } {
         set learning_activities [llength [$activities child all imsld:learning-activity]]
         set support_activities [llength [$activities child all imsld:support-activity]]
         set activity_structures [llength [$activities child all imsld:activity-structure]]
-        multirow append imsld_info "<#_ Total Activities #>" [expr $learning_activities + $support_activities + $activity_structures]
-        multirow append imsld_info "<#_ Learning Activities #>" $learning_activities
-        multirow append imsld_info "<#_ Support Activities #>" $support_activities
-        multirow append imsld_info "<#_ Activity Structures #>" $activity_structures
+        multirow append imsld_info "[_ imsld.Total_Activities]" [expr $learning_activities + $support_activities + $activity_structures]
+        multirow append imsld_info "[_ imsld.Learning_Activities]" $learning_activities
+        multirow append imsld_info "[_ imsld.Support_Activities]" $support_activities
+        multirow append imsld_info "[_ imsld.Activity_Structures]" $activity_structures
     } 
 
     # Methods
@@ -112,16 +112,19 @@
     set plays [$methods child all imsld:play]
     imsld::parse::validate_multiplicity -tree $plays -multiplicity 0 -element_name plays -greather_than
 
+    set count 1
     foreach play $plays {
         set play_identifier [imsld::parse::get_attribute -node $play -attr_name identifier]
         set acts [$play child all imsld:act]
         imsld::parse::validate_multiplicity -tree $acts -multiplicity 0 -element_name acts -greather_than
-        multirow append imsld_info "<#_ Acts in play $play_identifier % #>" [llength $acts]
+        multirow append imsld_info "[_ imsld.Acts_in_play_count]" [llength $acts]
+        incr count
     }
     
 } else {
     # Not valid (or supported?) IMS LD
-    ad_return_error "<#_ No IMS LD #>" "Couldn't determine if this is a well formed IMS-LD: [lindex $is_imsld_list 1]"
+    set message [lindex $is_imsld_list 1]
+    ad_return_error "[_ imsld.No_IMS_LD]" "[_ imsld.lt_Couldnt_determine_if_]"
     ad_script_abort
 }
 
@@ -134,8 +137,3 @@
 set file_str [imsld::parse::get_files_structure -tmp_dir $tmp_dir]
 
 
-set msg "vamoaver ....  $file_str \n\n en $tmp_dir con largo [llength $file_str] !!"
-append msg "<br> la lista es:"
-foreach fix $file_str {
-    append msg "<br> $fix --FIN--"
-}
Index: openacs-4/packages/imsld/www/admin/imsld-new-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/Attic/imsld-new-3.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/imsld/www/admin/imsld-new-3.adp	27 Sep 2005 11:05:11 -0000	1.2
+++ openacs-4/packages/imsld/www/admin/imsld-new-3.adp	5 Oct 2005 15:33:27 -0000	1.3
@@ -2,4 +2,4 @@
   <property name="title">titulin</property>
   <property name="context">contextin</property>
 
-success @warnings;noquote@
+success! @warnings;noquote@
Index: openacs-4/packages/imsld/www/admin/imsld-new-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/Attic/imsld-new-3.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/imsld/www/admin/imsld-new-3.tcl	5 Oct 2005 14:13:02 -0000	1.7
+++ openacs-4/packages/imsld/www/admin/imsld-new-3.tcl	5 Oct 2005 15:33:27 -0000	1.8
@@ -17,16 +17,16 @@
 set package_id [ad_conn package_id]
 permission::require_permission -object_id $package_id -privilege create
 
-set page_title "<#_ Creating new IMS-LD... #>"
-set context [list [list "<#_ New IMS-LD #>" "new-imsld"] [list "<#_ Creaginting new IMS-LD #>"]]
+set page_title "[_ imsld.Creating_new_IMS-LD]"
+set context [list [list "[_ imsld.New_IMS-LD]" "new-imsld"] [list "[_ imsld.lt_Creaginting_new_IMS-L]"]]
 
 set user_id [ad_conn user_id]
 
 # Display progress bar
 # ad_progress_bar_begin \
-#     -title "<#_ Uploading IMS LD #>" \
-#     -message_1 "<#_ Uploading and processing your course, please wait... #>" \
-#     -message_2 "<#_ We will continue automatically when processing is complete. #>"
+#     -title "[_ imsld.Uploading_IMS_LD]" \
+#     -message_1 "[_ imsld.lt_Uploading_and_process]" \
+#     -message_2 "[_ imsld.lt_We_will_continue_auto]"
 
 
 # Atempting to create the new IMS LD.
@@ -40,7 +40,7 @@
 
 if { !$manifest_id } {
     set errmsg [lindex $manifest_list 1]
-    ad_return_error "<#_ Error parsing manifest. #>" "<#_ There was an error parsing the manifest. Please correct it and try again. <br /><code>$errmsg %</code> #>"
+    ad_return_error "[_ imsld.lt_Error_parsing_manifes]" "[_ imsld.lt_There_was_an_error_pa]"
     ad_script_abort
 }
 
Index: openacs-4/packages/imsld/www/admin/imsld-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-new.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/imsld/www/admin/imsld-new.tcl	5 Aug 2005 15:25:33 -0000	1.2
+++ openacs-4/packages/imsld/www/admin/imsld-new.tcl	5 Oct 2005 15:33:27 -0000	1.3
@@ -14,16 +14,16 @@
 set package_id [ad_conn package_id]
 permission::require_permission -object_id $package_id -privilege create
 
-set page_title "<#_ New IMS-LD #>"
-set context [list "<#_ New IMS-LD #>"]
+set page_title "[_ imsld.New_IMS-LD]"
+set context [list "[_ imsld.New_IMS-LD]"]
 
 set user_id [ad_conn user_id]
 set manifest_id [db_nextval acs_object_id_seq]
 
 # form to upload an IMS LD ZIP file
 
 ad_form -name upload_file_form -html {enctype multipart/form-data} -cancel_url $return_url -action imsld-new-2 -form {
-    {upload_file:file {label "<#_ IMS-LD ZIP File #>"}}
+    {upload_file:file {label "[_ imsld.IMS-LD_ZIP_File]"}}
     {return_url:text {widget hidden} {value $return_url}}
     {manifest_id:integer {widget hidden} {value $manifest_id}}
 }