Index: openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml,v
diff -u -r1.68.2.3 -r1.68.2.4
--- openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml	10 Jun 2005 18:53:30 -0000	1.68.2.3
+++ openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml	4 Jul 2005 16:15:16 -0000	1.68.2.4
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="assessment" package_version="0.10d13" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="assessment" package_version="0.12" locale="en_US" charset="ISO-8859-1">
 
   <msg key="above">Above</msg>
   <msg key="Absolute_Size">Absolute Size</msg>
@@ -17,11 +17,13 @@
   <msg key="action_to_perform">Action to Perform</msg>
   <msg key="add_item">Add new question</msg>
   <msg key="add_item_display_cb">Add new question: Checkbox Display</msg>
+  <msg key="add_item_display_fu">Add new question: File Upload Display</msg>
   <msg key="add_item_display_rb">Add new question: Radiobutton Display</msg>
   <msg key="add_item_display_sa">Add new question: Short Answer Display</msg>
   <msg key="add_item_display_sb">Add new question: Selectbox Display</msg>
   <msg key="add_item_display_ta">Add new question: Textarea Display</msg>
   <msg key="add_item_display_tb">Add new question: Textbox Display</msg>
+  <msg key="add_item_type_fu">Add new question: File Upload</msg>
   <msg key="add_item_type_mc">Add new question: Multiple Choice</msg>
   <msg key="add_item_type_mc_choices">Add new question: Multiple Choices</msg>
   <msg key="add_item_type_mc_existing">Add existing choice set</msg>
@@ -290,6 +292,7 @@
   <msg key="item_Description_help">Additional searchable description for the question catalog</msg>
   <msg key="item_display_cb">Checkboxes</msg>
   <msg key="item_display_Content">Question File</msg>
+  <msg key="item_display_f">File</msg>
   <msg key="item_display_rb">Radiobuttons</msg>
   <msg key="item_display_sa">Short Answer</msg>
   <msg key="item_display_sb">Selectbox</msg>
@@ -304,6 +307,7 @@
   <msg key="Item_Type">Question Type</msg>
   <msg key="item_type_dq">Database Question</msg>
   <msg key="item_type_file">File</msg>
+  <msg key="item_type_fu">File Upload</msg>
   <msg key="Item_Type_help">Question type used.</msg>
   <msg key="item_type_mc">Multiple Choice</msg>
   <msg key="item_type_oq">Open Question</msg>
Index: openacs-4/packages/assessment/tcl/as-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-install-procs.tcl,v
diff -u -r1.30.2.7 -r1.30.2.8
--- openacs-4/packages/assessment/tcl/as-install-procs.tcl	4 Jul 2005 16:11:59 -0000	1.30.2.7
+++ openacs-4/packages/assessment/tcl/as-install-procs.tcl	4 Jul 2005 16:19:14 -0000	1.30.2.8
@@ -249,7 +249,7 @@
     content::folder::register_content_type -folder_id $folder_id -content_type {as_section_display_types} -include_subtypes t
 
     content::folder::register_content_type -folder_id $folder_id -content_type {as_item_type_fu} -include_subtypes t
-    content::folder::register_content_type -folder_id $folder_id -content_type {as_item_type_display_f} -include_subtypes t
+    content::folder::register_content_type -folder_id $folder_id -content_type {as_item_display_f} -include_subtypes t
     content::folder::register_content_type -folder_id $folder_id -content_type {as_sections} -include_subtypes t
     content::folder::register_content_type -folder_id $folder_id -content_type {as_assessments} -include_subtypes t
     content::folder::register_content_type -folder_id $folder_id -content_type {as_sessions} -include_subtypes t
@@ -378,7 +378,6 @@
 		#File Upload new type
 		content::type::new -content_type {as_item_type_fu} -supertype {content_revision} -pretty_name {Assessment Item Type File Upload} -pretty_plural {Assessment Item Type File Upload} -table_name {as_item_type_fu} -id_column {as_item_type_id}
 		content::type::new -content_type {as_item_display_f} -supertype {content_revision} -pretty_name {Assessment Item Display File} -pretty_plural {Assessment Item Display File} -table_name {as_item_display_f} -id_column {as_item_display_id}
-		
 		# File Upload display type
 		content::type::attribute::new -content_type {as_item_display_f} -attribute_name {html_display_options} -datatype {string} -pretty_name {HTML display Options} -column_spec {varchar(50)}
 		content::type::attribute::new -content_type {as_item_display_f} -attribute_name {abs_size} -datatype {string} -pretty_name {Abstraction Real Size} -column_spec {varchar(20)}
@@ -389,7 +388,7 @@
 		    
 		    # File Upload registration
 		    content::folder::register_content_type -folder_id $folder_id -content_type {as_item_type_fu} -include_subtypes t
-		    content::folder::register_content_type -folder_id $folder_id -content_type {as_item_type_display_f} -include_subtypes t
+		    content::folder::register_content_type -folder_id $folder_id -content_type {as_item_display_f} -include_subtypes t
 		}
 		
 	    }