Index: openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml,v
diff -u -r1.32.2.10 -r1.32.2.11
--- openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml	31 Jul 2006 06:27:19 -0000	1.32.2.10
+++ openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml	24 Aug 2006 01:06:58 -0000	1.32.2.11
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="file-storage" package_version="5.2.2" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="file-storage" package_version="5.2.3" locale="en_US" charset="ISO-8859-1">
 
   <msg key="_Upload">Revision</msg>
   <msg key="Action">Action</msg>
   <msg key="Actions">Actions:</msg>
   <msg key="Actions_1">Actions</msg>
+  <msg key="Add_Dup_As_New_File">If you upload a file with the same name as a file already in this folder, we will alter your new file's name by adding an incremental suffix (eg. &amp;quot;mydoc.doc&amp;quot; -&amp;gt; &amp;quot;mydoc-1.doc&amp;quot;) and making it a new, separate file. &lt;br /&gt;&lt;br /&gt;&lt;em&gt;Note that this is not the Title of the file, which you can specify as you like. This is the File Name, which must be unique in each folder.&lt;/em&gt;</msg>
   <msg key="Add_File">Add File</msg>
+  <msg key="Add_folder_from_fs">Add folder from file system</msg>
   <msg key="Add_pretty_name">Add %pretty_name%</msg>
   <msg key="Author">Author</msg>
   <msg key="back_to_folder_view">Back to folder view</msg>
@@ -17,6 +19,7 @@
   <msg key="Configure_File_Upload_Limit">Configure File Upload Limit</msg>
   <msg key="Copy">Copy</msg>
   <msg key="Copy_File">Copy File</msg>
+  <msg key="Copy_to_folder_title">Copy to folder</msg>
   <msg key="Create">Create</msg>
   <msg key="Create_a_new_folder">Create a new folder</msg>
   <msg key="Create_a_URL">Create a URL</msg>
@@ -45,6 +48,7 @@
   <msg key="file_page_owner_label">Owner: %owner%</msg>
   <msg key="Folder">Folder</msg>
   <msg key="folder">folder</msg>
+  <msg key="Folder_Add">Add folder</msg>
   <msg key="Folder_available_via_WebDAV_at">This folder is available via WebDAV at %webdav_url%</msg>
   <msg key="folder_delete_page_title">Delete %folder_name%</msg>
   <msg key="Folder_deleted">Folder deleted</msg>
@@ -136,6 +140,7 @@
   <msg key="New_URL_Uploaded">New URL Uploaded</msg>
   <msg key="No_such_type">No such type</msg>
   <msg key="no_such_URL">no such URL</msg>
+  <msg key="No_valid_destination_folders_exist">No valid destination folder exists</msg>
   <msg key="PDF">PDF</msg>
   <msg key="Permissions">Permissions</msg>
   <msg key="properties">properties</msg>
@@ -159,7 +164,9 @@
   <msg key="Update">Update</msg>
   <msg key="Upload">Upload</msg>
   <msg key="Upload_a_file">Upload a file</msg>
+  <msg key="Upload_a_folder">Upload a folder</msg>
   <msg key="Upload_a_new_version">Upload a new version</msg>
+  <msg key="Upload_folder_help">Upload a folder from the file system</msg>
   <msg key="Upload_Limit">Upload Limit (bytes)</msg>
   <msg key="Upload_limit_error">The upload limit can not be set to be larger than</msg>
   <msg key="Upload_limit_error_2">bytes. Increase the upload limit in your AOLserver's Tcl configuration file.</msg>