Index: openacs-4/packages/acs-admin/catalog/acs-admin.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/catalog/acs-admin.en_US.ISO-8859-1.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/catalog/acs-admin.en_US.ISO-8859-1.xml	14 May 2007 20:30:16 -0000	1.2
+++ openacs-4/packages/acs-admin/catalog/acs-admin.en_US.ISO-8859-1.xml	18 Nov 2007 21:27:09 -0000	1.3
@@ -1,88 +1,84 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-admin" package_version="5.3.0" locale="en_US" charset="ISO-8859-1">
-  <msg key="Service">Service</msg>
-  <msg key="Pages">Pages</msg>
-  <msg key="Visit_service_pages">Visit service pages</msg>
-  <msg key="Administration">Administration</msg>
-  <msg key="Service_administration">Service administration</msg>
-  <msg key="Site-Wide_Admin">Site-Wide Admin</msg>
-  <msg key="Parameters">Parameters</msg>
-  <msg key="Service_parameters">Service parameters</msg>
-  <msg key="Edit_callback">Edit callback</msg>
-  <msg key="Type">Type</msg>
-  <msg key="Tcl_Proc">Tcl Proc</msg>
-  <msg key="Invoke">Invoke</msg>
-  <msg key="Invoke_this_callback_proc_now_Be_careful">Invoke this callback proc now. Be careful!</msg>
-  <msg key="Delete_callback">Delete callback</msg>
-  <msg key="Package_Manager">Package Manager</msg>
-  <msg key="Add_callback">Add callback</msg>
-  <msg key="Tcl_Callbacks">Tcl Callbacks</msg>
-  <msg key="Name">Name</msg>
-  <msg key="General">General</msg>
-  <msg key="Short_Name">Short Name</msg>
-  <msg key="Authority_short_name_help_text">This is used when referring to the authority in parameters etc. Even if you need to change the display name above, this should stay unchanged.</msg>
-  <msg key="Enabled">Enabled</msg>
-  <msg key="Help_contact_text">Help contact text</msg>
-  <msg key="Help_contact_help_text">Contact information (phone, email, etc.) to be displayed as a last resort when people are having problems with an authority.</msg>
-  <msg key="Authentication">Authentication</msg>
-  <msg key="Password_Management">Password Management</msg>
-  <msg key="Recover_password_URL">Recover password URL</msg>
-  <msg key="Recover_password_URL_help_text">Instead of a password management driver, you may provide a URL to which users are sent when they need help recovering their password. Any username in this url must be on the syntax foo={username} and {username} will be replaced with the real username.</msg>
-  <msg key="Change_password_URL">Change password URL</msg>
-  <msg key="Change_password_URL_help_text">Instead of a password management driver, you may provide a URL to which users are sent when they want to change their password. Any username in this url must be on the syntax foo={username} and {username} will be replaced with the real username.</msg>
+<message_catalog package_key="acs-admin" locale="en_US" charset="ISO-8859-1">
+
+  <msg key="Account_reg_URL_help_text">URL where users register for a new account.</msg>
   <msg key="Account_Registration">Account registration</msg>
   <msg key="Account_registration_URL">Account registration URL</msg>
-  <msg key="Account_reg_URL_help_text">URL where users register for a new account.</msg>
-  <msg key="On-Demand_Sync">On-Demand Sync</msg>
-  <msg key="User_Info">User Info</msg>
-  <msg key="User_Info_help_text">The implementation for getting user information from the authority in real-time</msg>
-  <msg key="Batch_sync_enabled">Batch sync enabled</msg>
-  <msg key="Yes">Yes</msg>
-  <msg key="No">No</msg>
-  <msg key="GetDocument_implementation">GetDocument implementation</msg>
-  <msg key="ProcessDocument_implementation">ProcessDocument implementation</msg>
-  <msg key="Start_time">Start time</msg>
-  <msg key="End_time">End time</msg>
-  <msg key="Run_time">Run time</msg>
   <msg key="Actions">Actions</msg>
-  <msg key="Problems">Problems</msg>
   <msg key="Actions_Minute">Actions/Minute</msg>
-  <msg key="Message">Message</msg>
-  <msg key="Interactive">Interactive</msg>
+  <msg key="Add_callback">Add callback</msg>
+  <msg key="Administration">Administration</msg>
+  <msg key="Are_you_sure_you_want_to_delete_authority_authorities_pretty_name">Are you sure you want to delete authority %authorities.pretty_name%?</msg>
+  <msg key="Authentication">Authentication</msg>
+  <msg key="Authority_name">Authority name</msg>
+  <msg key="Authority_short_name_help_text">This is used when referring to the authority in parameters etc. Even if you need to change the display name above, this should stay unchanged.</msg>
+  <msg key="Batch_sync_enabled">Batch sync enabled</msg>
   <msg key="Batch_Synchronization">Batch Synchronization</msg>
+  <msg key="Change_password_URL">Change password URL</msg>
+  <msg key="Change_password_URL_help_text">Instead of a password management driver, you may provide a URL to which users are sent when they want to change their password. Any username in this url must be on the syntax foo={username} and {username} will be replaced with the real username.</msg>
+  <msg key="Creation_user">Creation user</msg>
+  <msg key="Delete">Delete</msg>
+  <msg key="Delete_callback">Delete callback</msg>
   <msg key="Disable_this_authority">Disable this authority</msg>
+  <msg key="Document">Document</msg>
+  <msg key="Document_end_time">Document end time</msg>
+  <msg key="Document_message">Document message</msg>
+  <msg key="Document_start_time">Document start time</msg>
+  <msg key="Document_status">Document status</msg>
+  <msg key="download">download</msg>
+  <msg key="Edit_callback">Edit callback</msg>
   <msg key="Enable_this_authority">Enable this authority</msg>
-  <msg key="Order">Order*</msg>
-  <msg key="Registration">Registration</msg>
+  <msg key="Enabled">Enabled</msg>
+  <msg key="End_time">End time</msg>
+  <msg key="General">General</msg>
+  <msg key="GetDocument_implementation">GetDocument implementation</msg>
+  <msg key="Help_contact_help_text">Contact information (phone, email, etc.) to be displayed as a last resort when people are having problems with an authority.</msg>
+  <msg key="Help_contact_text">Help contact text</msg>
+  <msg key="Interactive">Interactive</msg>
+  <msg key="Invoke">Invoke</msg>
+  <msg key="Invoke_this_callback_proc_now_Be_careful">Invoke this callback proc now. Be careful!</msg>
   <msg key="Make_this_the_authority_for_registering_new_users">Make this the authority for registering new users</msg>
-  <msg key="You_are_changing_all_user_registrations_to_be_in_authority_authorities_pretty_name">You are changing all user registrations to be in authority %authorities.pretty_name%</msg>
-  <msg key="Move_this_authority_up">Move this authority up</msg>
+  <msg key="Message">Message</msg>
   <msg key="Move_this_authority_down">Move this authority down</msg>
-  <msg key="Authentication">Authentication</msg>
+  <msg key="Move_this_authority_up">Move this authority up</msg>
+  <msg key="Name">Name</msg>
+  <msg key="No">No</msg>
+  <msg key="Number_of_actions">Number of actions</msg>
+  <msg key="Number_of_problems">Number of problems</msg>
+  <msg key="On-Demand_Sync">On-Demand Sync</msg>
+  <msg key="One_batch_job">One batch job</msg>
+  <msg key="Operation">Operation</msg>
+  <msg key="Order">Order*</msg>
+  <msg key="Package_Manager">Package Manager</msg>
+  <msg key="Pages">Pages</msg>
+  <msg key="Parameters">Parameters</msg>
   <msg key="Password">Password</msg>
+  <msg key="Password_Management">Password Management</msg>
+  <msg key="Problems">Problems</msg>
+  <msg key="ProcessDocument_implementation">ProcessDocument implementation</msg>
+  <msg key="Recover_password_URL">Recover password URL</msg>
+  <msg key="Recover_password_URL_help_text">Instead of a password management driver, you may provide a URL to which users are sent when they need help recovering their password. Any username in this url must be on the syntax foo={username} and {username} will be replaced with the real username.</msg>
   <msg key="Registration">Registration</msg>
-  <msg key="Are_you_sure_you_want_to_delete_authority_authorities_pretty_name">Are you sure you want to delete authority %authorities.pretty_name%?</msg>
-  <msg key="Delete">Delete</msg>
-  <msg key="One_batch_job">One batch job</msg>
-  <msg key="Authority_name">Authority name</msg>
-  <msg key="Start_time">Start time</msg>
-  <msg key="End_time">End time</msg>
+  <msg key="Run_time">Run time</msg>
   <msg key="Running_time">Running time</msg>
-  <msg key="Snapshot">Snapshot</msg>
-  <msg key="Message">Message</msg>
-  <msg key="Creation_user">Creation user</msg>
-  <msg key="Document_start_time">Document start time</msg>
-  <msg key="Document_end_time">Document end time</msg>
-  <msg key="Document_status">Document status</msg>
-  <msg key="Document_message">Document message</msg>
-  <msg key="Document">Document</msg>
-  <msg key="Number_of_actions">Number of actions</msg>
-  <msg key="Number_of_problems">Number of problems</msg>
-  <msg key="download">download</msg>
   <msg key="seconds">seconds</msg>
+  <msg key="Service">Service</msg>
+  <msg key="Service_administration">Service administration</msg>
+  <msg key="Service_parameters">Service parameters</msg>
+  <msg key="Short_Name">Short Name</msg>
+  <msg key="Site-Wide_Admin">Site-Wide Admin</msg>
+  <msg key="Snapshot">Snapshot</msg>
+  <msg key="Start_time">Start time</msg>
+  <msg key="Success">Success</msg>
+  <msg key="Tcl_Callbacks">Tcl Callbacks</msg>
+  <msg key="Tcl_Proc">Tcl Proc</msg>
   <msg key="Timestamp">Timestamp</msg>
-  <msg key="View_log_entry">View log entry</msg>
-  <msg key="Operation">Operation</msg>
+  <msg key="Type">Type</msg>
+  <msg key="User_Info">User Info</msg>
+  <msg key="User_Info_help_text">The implementation for getting user information from the authority in real-time</msg>
   <msg key="Username">Username</msg>
-  <msg key="Success">Success</msg>
+  <msg key="View_log_entry">View log entry</msg>
+  <msg key="Visit_service_pages">Visit service pages</msg>
+  <msg key="Yes">Yes</msg>
+  <msg key="You_are_changing_all_user_registrations_to_be_in_authority_authorities_pretty_name">You are changing all user registrations to be in authority %authorities.pretty_name%</msg>
 </message_catalog>
Index: openacs-4/packages/acs-authentication/catalog/acs-authentication.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/catalog/acs-authentication.de_DE.ISO-8859-1.xml,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-authentication/catalog/acs-authentication.de_DE.ISO-8859-1.xml	14 May 2007 20:30:18 -0000	1.5
+++ openacs-4/packages/acs-authentication/catalog/acs-authentication.de_DE.ISO-8859-1.xml	18 Nov 2007 21:27:09 -0000	1.6
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-authentication" package_version="5.3.1" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="acs-authentication" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="Invalid_username_or_password">Benutzeridentifikation oder Passwort ist falsch</msg>
 </message_catalog>
Index: openacs-4/packages/acs-authentication/catalog/acs-authentication.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/catalog/acs-authentication.en_US.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-authentication/catalog/acs-authentication.en_US.ISO-8859-1.xml	14 May 2007 20:30:18 -0000	1.8
+++ openacs-4/packages/acs-authentication/catalog/acs-authentication.en_US.ISO-8859-1.xml	18 Nov 2007 21:27:09 -0000	1.9
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-authentication" package_version="5.3.1" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="acs-authentication" locale="en_US" charset="ISO-8859-1">
 
   <msg key="Invalid_username_or_password">Invalid username or password</msg>
 </message_catalog>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.de_DE.ISO-8859-1.xml,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.de_DE.ISO-8859-1.xml	6 Jul 2007 12:13:22 -0000	1.21
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.de_DE.ISO-8859-1.xml	18 Nov 2007 21:27:09 -0000	1.22
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.3.1" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="Administrator">Administrator</msg>
   <msg key="Administrators">Administratoren </msg>
@@ -53,8 +53,8 @@
   <msg key="common_new">neu</msg>
   <msg key="common_Next">Weiter</msg>
   <msg key="common_next">Weiter</msg>
-  <msg key="common_no">nein</msg>
   <msg key="common_No">Nein</msg>
+  <msg key="common_no">nein</msg>
   <msg key="common_OK">OK</msg>
   <msg key="common_ok">OK</msg>
   <msg key="common_Open">Offen</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.en_US.ISO-8859-1.xml,v
diff -u -r1.42 -r1.43
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.en_US.ISO-8859-1.xml	6 Jul 2007 12:13:22 -0000	1.42
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.en_US.ISO-8859-1.xml	18 Nov 2007 21:27:09 -0000	1.43
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.3.1" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" locale="en_US" charset="ISO-8859-1">
 
   <msg key="Administrator">Administrator</msg>
   <msg key="Administrators">Administrators</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.de_DE.ISO-8859-1.xml,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/acs-lang/catalog/acs-lang.de_DE.ISO-8859-1.xml	14 May 2007 20:30:21 -0000	1.22
+++ openacs-4/packages/acs-lang/catalog/acs-lang.de_DE.ISO-8859-1.xml	18 Nov 2007 21:27:09 -0000	1.23
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.3.1" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="available-in-this-language">Deutsche Version verf�gbar</msg>
   <msg key="change-locale">Sprache wechseln</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml	14 May 2007 20:30:21 -0000	1.27
+++ openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml	18 Nov 2007 21:27:10 -0000	1.28
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.3.1" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" locale="en_US" charset="ISO-8859-1">
 
   <msg key="available-in-this-language">Available in English</msg>
   <description key="available-in-this-language">The language referred to in the message body should be the language of the locale, not a localized version of &quot;English&quot;.</description>
Index: openacs-4/packages/acs-lang/tcl/lang-catalog-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-catalog-procs-oracle.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/tcl/lang-catalog-procs-oracle.xql	26 Feb 2004 15:28:46 -0000	1.3
+++ openacs-4/packages/acs-lang/tcl/lang-catalog-procs-oracle.xql	18 Nov 2007 21:27:10 -0000	1.4
@@ -2,14 +2,6 @@
 <queryset>
   <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-  <fullquery name="lang::catalog::system_package_version_name.get_version_name">
-    <querytext>
-           select version_name
-           from apm_package_version_info
-           where version_id = apm_package.highest_version(:package_key)
-    </querytext>
-  </fullquery>
-
   <fullquery name="lang::catalog::export.update_sync_time">
     <querytext>
       update lang_messages
Index: openacs-4/packages/acs-lang/tcl/lang-catalog-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-catalog-procs-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/tcl/lang-catalog-procs-postgresql.xql	26 Feb 2004 15:28:46 -0000	1.3
+++ openacs-4/packages/acs-lang/tcl/lang-catalog-procs-postgresql.xql	18 Nov 2007 21:27:10 -0000	1.4
@@ -2,14 +2,6 @@
 <queryset>
   <rdbms><type>postgresql</type><version>7.2</version></rdbms>
 
-  <fullquery name="lang::catalog::system_package_version_name.get_version_name">
-    <querytext>
-           select version_name
-           from apm_package_version_info
-           where version_id = apm_package__highest_version(:package_key)
-    </querytext>
-  </fullquery>
-
   <fullquery name="lang::catalog::export.update_sync_time">
     <querytext>
       update lang_messages
Index: openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl,v
diff -u -r1.45 -r1.46
--- openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl	29 Aug 2007 14:16:56 -0000	1.45
+++ openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl	18 Nov 2007 21:27:10 -0000	1.46
@@ -217,13 +217,6 @@
     return $catalog_paths
 }
 
-ad_proc -private lang::catalog::system_package_version_name { package_key } {
-    Returns the version name of the highest version of the given
-    package_key in the system.
-} {
-    return [db_string get_version_name {}]
-}
-
 ad_proc -private lang::catalog::messages_in_db {
     {-package_key:required}
     {-locale:required}
@@ -356,9 +349,8 @@
     fconfigure $catalog_file_id -encoding $file_encoding
 
     # Open the root node of the document
-    set package_version [system_package_version_name $filename_info(package_key)]
     puts $catalog_file_id "<?xml version=\"1.0\" encoding=\"$filename_info(charset)\"?>
-<message_catalog package_key=\"$filename_info(package_key)\" package_version=\"$package_version\" locale=\"$filename_info(locale)\" charset=\"$filename_info(charset)\">
+<message_catalog package_key=\"$filename_info(package_key)\" locale=\"$filename_info(locale)\" charset=\"$filename_info(charset)\">
 "
 
    # Loop over and write the messages to the file
@@ -472,7 +464,6 @@
 
     <pre>
       package_key
-      package_version
       locale
       charset
       messages    - An array-list with message keys as keys and the message texts as values.
@@ -491,7 +482,6 @@
     # The names of xml tags and attributes
     set MESSAGE_CATALOG_TAG "message_catalog"
     set PACKAGE_KEY_ATTR "package_key"
-    set PACKAGE_VERSION_ATTR "package_version"
     set LOCALE_ATTR "locale"
     set CHARSET_ATTR "charset"
     set MESSAGE_TAG "msg"
@@ -512,7 +502,6 @@
 
     # Set the message catalog root level attributes
     set msg_catalog_array(package_key) [get_required_xml_attribute $root_node ${PACKAGE_KEY_ATTR}]
-    set msg_catalog_array(package_version) [get_required_xml_attribute $root_node ${PACKAGE_VERSION_ATTR}]
     set msg_catalog_array(locale) [get_required_xml_attribute $root_node ${LOCALE_ATTR}]
     set msg_catalog_array(charset) [get_required_xml_attribute $root_node ${CHARSET_ATTR}]
 
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml	14 May 2007 20:30:24 -0000	1.27
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml	18 Nov 2007 21:27:10 -0000	1.28
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-subsite" package_version="5.3.1" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="acs-subsite" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="_or"> oder</msg>
   <msg key="_Update_Basic_Information">Die Allgemeinen Informationen aktualisieren</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml,v
diff -u -r1.77 -r1.78
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	25 Sep 2007 15:22:38 -0000	1.77
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	18 Nov 2007 21:27:10 -0000	1.78
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-subsite" package_version="5.3.1" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="acs-subsite" locale="en_US" charset="ISO-8859-1">
 
   <msg key="_or">, or</msg>
   <msg key="_Update_Basic_Information">Update Basic Information</msg>
@@ -28,7 +28,6 @@
   <msg key="Account_not_avail_now">This account is not available at this time.</msg>
   <msg key="Account_reopened_message">Your account at %system_name% has been reopened. Welcome back.</msg>
   <msg key="Account_reopened_title">Account Reopened</msg>
-  <msg key="icon_of_envelope">Icon of Envelope</msg>
   <msg key="Action">Action</msg>
   <msg key="Add">Add</msg>
   <msg key="add_folder">add folder</msg>
@@ -181,6 +180,7 @@
   <msg key="Help_information">&lt;p&gt;&lt;h3&gt;Help Information&lt;/h3&gt;</msg>
   <msg key="Hide">Hide</msg>
   <msg key="Home_page">Home page</msg>
+  <msg key="icon_of_envelope">Icon of Envelope</msg>
   <msg key="If_you_were_to">If you were to</msg>
   <msg key="Information_Updated">Information Updated</msg>
   <msg key="Install_locales">Install Locales</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.de_DE.ISO-8859-1.xml,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.de_DE.ISO-8859-1.xml	14 May 2007 20:30:25 -0000	1.16
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.de_DE.ISO-8859-1.xml	18 Nov 2007 21:27:10 -0000	1.17
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.3.1" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="a_problem">Ein Problem</msg>
   <msg key="approve">Freischalten</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.en_US.ISO-8859-1.xml,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.en_US.ISO-8859-1.xml	14 May 2007 20:30:25 -0000	1.21
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.en_US.ISO-8859-1.xml	18 Nov 2007 21:27:10 -0000	1.22
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.3.1" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" locale="en_US" charset="ISO-8859-1">
 
   <msg key="a_problem">a problem</msg>
   <msg key="approve">approve</msg>
Index: openacs-4/packages/acs-templating/catalog/acs-templating.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/catalog/acs-templating.de_DE.ISO-8859-1.xml,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-templating/catalog/acs-templating.de_DE.ISO-8859-1.xml	14 May 2007 20:30:27 -0000	1.12
+++ openacs-4/packages/acs-templating/catalog/acs-templating.de_DE.ISO-8859-1.xml	18 Nov 2007 21:27:10 -0000	1.13
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-templating" package_version="5.3.1" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="acs-templating" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="12-Hour">12-st�ndig</msg>
   <msg key="24-Hour">24-st�ndig</msg>
Index: openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml	14 May 2007 20:30:27 -0000	1.19
+++ openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml	18 Nov 2007 21:27:10 -0000	1.20
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-templating" package_version="5.3.1" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="acs-templating" locale="en_US" charset="ISO-8859-1">
 
   <msg key="12-Hour">12-Hour</msg>
   <msg key="24-Hour">24-Hour</msg>
Index: openacs-4/packages/search/catalog/search.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/catalog/search.de_DE.ISO-8859-1.xml,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/search/catalog/search.de_DE.ISO-8859-1.xml	14 May 2007 20:30:29 -0000	1.5
+++ openacs-4/packages/search/catalog/search.de_DE.ISO-8859-1.xml	18 Nov 2007 21:27:10 -0000	1.6
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="search" package_version="5.3.1" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="search" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="Advanced_Search">Erweiterte Suche</msg>
   <msg key="anytime">jederzeit</msg>
Index: openacs-4/packages/search/catalog/search.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/catalog/search.en_US.ISO-8859-1.xml,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/search/catalog/search.en_US.ISO-8859-1.xml	25 Sep 2007 15:22:40 -0000	1.11
+++ openacs-4/packages/search/catalog/search.en_US.ISO-8859-1.xml	18 Nov 2007 21:27:10 -0000	1.12
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="search" package_version="5.3.1" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="search" locale="en_US" charset="ISO-8859-1">
 
   <msg key="________Search_took">.
         Search took</msg>