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 -N -r1.60 -r1.61
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	1 Mar 2005 14:46:44 -0000	1.60
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	13 Mar 2005 23:51:13 -0000	1.61
@@ -24,6 +24,7 @@
       <a href="%login_url%">Log in</a> again to see what you can do about it.
     </p&;gt;
   </msg>
+  <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="Action">Action</msg>
@@ -38,6 +39,7 @@
   <msg key="Applications">Applications</msg>
   <msg key="Approve">Approve</msg>
   <msg key="at">at</msg>
+  <msg key="Auth_internal_error">Internal error during authentication</msg>
   <msg key="Authority">Authority</msg>
   <msg key="Bad_Password">Bad Password</msg>
   <msg key="Ban">Ban</msg>
@@ -127,6 +129,7 @@
   <msg key="email_dont_show_admin">Don't show E-mail</msg>
   <msg key="email_not_available">Not available</msg>
   <msg key="Email_not_Requested">Email not Requested</msg>
+  <msg key="Email_required">Email required</msg>
   <msg key="email_subject_Forgotten_password">Your forgotten password on %system_name%</msg>
   <msg key="email_subject_Registration_password">Welcome to %system_name%</msg>
   <msg key="Enabled">Enabled</msg>
@@ -135,6 +138,9 @@
   <msg key="erase_portrait">erase portrait</msg>
   <msg key="Error">Error</msg>
   <msg key="Error_sending_mail">Error sending mail</msg>
+  <msg key="Error_sending_verification_mail">We got an error sending out the email for email verification</msg>
+  <msg key="Error_trying_to_register">We experienced an error while trying to register an account for you.</msg>
+  <msg key="Error_update_account_info">We experienced an error while trying to update the account information</msg>
   <msg key="Expires">Expires</msg>
   <msg key="Filename">Filename</msg>
   <msg key="First_names">First names</msg>
@@ -145,6 +151,10 @@
   <msg key="go_upload_your_portrait">go upload your portrait</msg>
   <msg key="Grant">Grant</msg>
   <msg key="Grant_Permission">Grant Permission</msg>
+  <msg key="Have_group_mail">We already have a group with this email</msg>
+  <msg key="Have_user_mail">We already have a user with this email.</msg>
+  <msg key="Have_user_name">We already have a user with this username.</msg>
+  <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="If_you_were_to">If you were to</msg>
@@ -279,10 +289,12 @@
   <msg key="no_portrait_title_message">your portrait</msg>
   <msg key="No_pretty_plural">No %pretty_plural%</msg>
   <msg key="No_services">No services</msg>
+  <msg key="No_user_with_this_username">No user found with this username</msg>
   <msg key="none">none</msg>
   <description key="none">Used to indicate that a list of permissions or objects is empty.</description>
 
   <msg key="Not_logged_in">Not logged in</msg>
+  <msg key="Not_valid_email_addr">This is not a valid email address</msg>
   <msg key="Notes">Notes:</msg>
   <msg key="Notice">Notice:</msg>
   <msg key="on_name_to">on %name% to:</msg>
@@ -310,12 +322,16 @@
 
 3. Choose &quot;%password_update_link_text%&quot;</msg>
   <msg key="Password_changed_subject">Password changed</msg>
+  <msg key="Password_regular_change_now">Your password must be changed
+  regularly. Please change your password now.</msg>
+  <msg key="Passwords_dont_match">Passwords don't match</msg>
   <msg key="perm_cannot_be_removed">This permission cannot be removed.</msg>
   <msg key="Permissions">Permissions</msg>
   <msg key="permissions">permissions</msg>
   <msg key="Permissions_for_name">Permissions for %name%</msg>
   <msg key="Please_return_to_home">Please return to %home_link%.</msg>
   <msg key="Portrait">Portrait</msg>
+  <msg key="Problem_auth_no_memb">There was a problem authenticating the account.  Most likely, the database contains users with no member_state.</msg>
   <msg key="Profile">Profile</msg>
   <msg key="Question">Question</msg>
   <msg key="Re_enable">Re-enable</msg>
@@ -338,6 +354,7 @@
   <msg key="Role">Role</msg>
   <msg key="Save_comment">Save comment</msg>
   <msg key="Screen_name">Screen name</msg>
+  <msg key="Screen_name_already_taken">This screen name is already taken.</msg>
   <msg key="Search_For_Exist_User">Search For An Existing User</msg>
   <msg key="Security_context_root">Security context root</msg>
   <msg key="Select_an_Object_by_Id">Select an Object by Id:</msg>
@@ -355,6 +372,7 @@
   <msg key="subsite">subsite</msg>
   <msg key="Subsites">Subsites</msg>
   <msg key="subsites">subsites</msg>
+  <msg key="Success_but_no_account_yet">You have successfully authenticated, but you do not have an account on %system_name% yet.</msg>
   <msg key="Thank_you">Thank you.</msg>
   <msg key="The_ISO_codes_were_not">The ISO codes were not loaded on this server.</msg>
   <msg key="This_group_is_closed">This group is closed. New members can only get access by invitation.</msg>
@@ -364,6 +382,7 @@
 </msg>
   <msg key="Topic">Topic</msg>
   <msg key="type_specific_info">type-specific info</msg>
+  <msg key="Unknown_email">Unknown email</msg>
   <msg key="UP">UP</msg>
   <description key="UP">Can we please have a description of this key??</description>
 
@@ -375,6 +394,8 @@
   <msg key="upload_a_replacement_por">upload a replacement portrait</msg>
   <msg key="Upload_Portrait">Upload Portrait</msg>
   <msg key="Username">Username</msg>
+  <msg key="Username_not_found_for_authority">No user with username '%username%' found for authority %this_authority%</msg>
+  <msg key="Username_required">Username required</msg>
   <msg key="UserSiteMap">User's Site Map</msg>
   <msg key="Vacation_Info_Updated">Vacation Information Updated</msg>
   <msg key="Vacation_information_updated">Your vacation information at %site_link% has been updated.</msg>