Index: openacs-4/packages/attachments/catalog/attachments.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/catalog/attachments.en_US.ISO-8859-1.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/attachments/catalog/attachments.en_US.ISO-8859-1.xml	10 Nov 2002 16:13:19 -0000	1.2
+++ openacs-4/packages/attachments/catalog/attachments.en_US.ISO-8859-1.xml	11 Dec 2002 13:22:53 -0000	1.3
@@ -1,32 +1,25 @@
 <?xml version="1.0"?>
-<!-- Generated by lang::catalog::export_package_to_files on 2002 November 10 18:44 -->
+<!-- Generated by lang::catalog::export_package_to_files on 2002 December 09 18:27 -->
 <message_catalog package_key="attachments" locale="en_US" charset="ISO-8859-1">
 
   <msg key="Action">Action</msg>
   <msg key="Add_File">Add File</msg>
   <msg key="Add_folder_Link">Add folder Link</msg>
   <msg key="Add_pretty_name">Add %pretty_name%</msg>
   <msg key="Attach">Attach</msg>
+  <msg key="attach_new">Attach a &lt;b&gt;new&lt;/b&gt;:</msg>
   <msg key="Attach_URL">Attach URL</msg>
-  <msg key="Attach_a">Attach a</msg>
   <msg key="Choose">Choose</msg>
   <msg key="Description">Description:</msg>
   <msg key="File">File</msg>
   <msg key="Last_Modified">Last Modified</msg>
-  <msg key="Name">Name</msg>
-  <msg key="No_such_type">No such type</msg>
-  <msg key="Object">Object</msg>
-  <msg key="Size">Size</msg>
-  <msg key="Title">Title:</msg>
-  <msg key="Top">Top</msg>
-  <msg key="Type">Type</msg>
-  <msg key="URL">URL</msg>
-  <msg key="URL_1">URL:</msg>
-  <msg key="Version_filename_">Version filename :</msg>
-  <msg key="You_are_attaching_a">You are attaching a</msg>
   <msg key="lt_Add_Attachment_Folder">Add Attachment Folder Link</msg>
   <msg key="lt_Attach_a_File_to_pret">Attach a File to %pretty_object_name%</msg>
+  <msg key="lt_contentscontent_size_">%contents.content_size% item</msg>
+  <msg key="lt_contentscontent_size__1">%contents.content_size% byte</msg>
   <msg key="lt_Created_by_the_attach">Created by the attachments packge</msg>
+  <msg key="lt_document_to_pretty_ob">document to %pretty_object_name%.</msg>
+  <msg key="lt_dont_know_how_to_deal">don't know how to deal with this attachment type</msg>
   <msg key="lt_Error_Attachment_root">Error: Attachment root folder and fs root folder different!</msg>
   <msg key="lt_Error_empty_folder_id">Error: empty folder_id!</msg>
   <msg key="lt_Folder_folder_name_is">Folder %folder_name% is empty</msg>
@@ -39,17 +32,24 @@
 upload a new file into a folder, open the folder by clicking the
 folder's name, then click the appropriate  &amp;quot;Attach a new: File | URL&amp;quot;
 link</msg>
+  <msg key="lt_to_pretty_object_name">to %pretty_object_name%.</msg>
   <msg key="lt_Upload_New_Attachment">Upload New Attachment</msg>
   <msg key="lt_Use_the_Browse_button">Use the &quot;Browse...&quot; button to locate your file, 
     then click &quot;Open&quot;.</msg>
   <msg key="lt_You_are_attaching_a_d">You are attaching a document to %pretty_object_name%.</msg>
   <msg key="lt_You_probably_clicked_">You probably clicked on the Add button more than once. Check if the file is properly loaded on the &lt;a href=&quot;%folder_url%&quot;&gt;folder&lt;/a&gt; you want, or you can use the Back button to return and re-enter the version file.</msg>
   <msg key="lt_Your_file_is_larger_t">Your file is larger than the maximum file size allowed on this system (%max_number_of_bytes% bytes)</msg>
-  <msg key="lt_contentscontent_size_">%contents.content_size% item</msg>
-  <msg key="lt_contentscontent_size__1">%contents.content_size% byte</msg>
-  <msg key="lt_document_to_pretty_ob">document to %pretty_object_name%.</msg>
-  <msg key="lt_dont_know_how_to_deal">don't know how to deal with this attachment type</msg>
-  <msg key="lt_to_pretty_object_name">to %pretty_object_name%.</msg>
+  <msg key="Name">Name</msg>
   <msg key="new">new</msg>
   <msg key="new_url">new url</msg>
+  <msg key="No_such_type">No such type</msg>
+  <msg key="Object">Object</msg>
+  <msg key="Size">Size</msg>
+  <msg key="Title">Title:</msg>
+  <msg key="Top">Top</msg>
+  <msg key="Type">Type</msg>
+  <msg key="URL">URL</msg>
+  <msg key="URL_1">URL:</msg>
+  <msg key="Version_filename_">Version filename :</msg>
+  <msg key="You_are_attaching_a">You are attaching a</msg>
 </message_catalog>
Index: openacs-4/packages/attachments/www/attach.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/attach.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/attachments/www/attach.adp	30 Nov 2002 17:26:03 -0000	1.6
+++ openacs-4/packages/attachments/www/attach.adp	11 Dec 2002 13:23:03 -0000	1.7
@@ -13,7 +13,7 @@
 <p>
 @fs_context_bar_html@
 <p>
-#attachments.Attach_a# <b>#attachments.new#</b>:  &nbsp;&nbsp;     <a href="file-add?folder_id=@folder_id@&@passthrough_vars@">#attachments.File#</a>
+#attachments.attach_new#  &nbsp;&nbsp;     <a href="file-add?folder_id=@folder_id@&@passthrough_vars@">#attachments.File#</a>
       &nbsp;&nbsp;|&nbsp;&nbsp;
       <a href="simple-add?folder_id=@folder_id@&@passthrough_vars@">#attachments.URL#</a>
 <p>
@@ -45,7 +45,7 @@
       <td>
         #attachments.lt_contentscontent_size_#<if @contents.content_size@ ne 1>s</if>
       </td>
-      <td>@contents.type@</td>
+      <td>#file-storage.folder_type_pretty_name#</td>
       <td>@contents.last_modified@</td>
 </if>
 <else>