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.41 -r1.42
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	17 Oct 2003 09:19:31 -0000	1.41
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	17 Oct 2003 10:30:23 -0000	1.42
@@ -2,6 +2,7 @@
 <message_catalog package_key="acs-subsite" package_version="5.0d6" locale="en_US" charset="ISO-8859-1">
 
   <msg key="_or">, or</msg>
+  <msg key="A_member_of_the_system">A member of the %system_name% community since</msg>
   <msg key="About_You">About You</msg>
   <msg key="Account_at_system_closed">Your account at %system_name% has been closed.</msg>
   <msg key="Account_close_confirm_no_label">No, take me back to %pvt_home_name%</msg>
@@ -24,14 +25,18 @@
   <msg key="Add_new_app">Add new application</msg>
   <msg key="Admin">Admin</msg>
   <msg key="Administer_subsite">Administer %subsite_name%</msg>
+  <msg key="Administrative_options">Administrative options for this user</msg>
   <msg key="Alert_Type">Alert Type</msg>
+  <msg key="another_picture">another picture.</msg>
   <msg key="Answer">Answer</msg>
+  <msg key="Application_Error">Application Error</msg>
   <msg key="Applications">Applications</msg>
   <msg key="Approve">Approve</msg>
   <msg key="at">at</msg>
   <msg key="Bad_Password">Bad Password</msg>
   <msg key="Ban">Ban</msg>
   <msg key="Basic_Information">Basic Information</msg>
+  <msg key="Biography">Biography</msg>
   <msg key="cannot_retrieve_password">Retrieving password from local authority is not supported.</msg>
   <msg key="Cannot_see_memb_list">Cannot see the members list</msg>
   <msg key="Change_locale_label">Change language</msg>
@@ -51,15 +56,19 @@
 logging in again. &lt;/p&gt;
   </msg>
   <msg key="Close_your_account">Close your account</msg>
+  <msg key="Comment">Comment</msg>
   <msg key="Communities">Communities</msg>
   <msg key="communities">communities</msg>
   <msg key="community">community</msg>
   <msg key="Confirm">Confirm</msg>
+  <msg key="Continue">Continue</msg>
+  <msg key="Country_Name">Country Name</msg>
   <msg key="Create_new_community">Create new %pretty_name%</msg>
   <msg key="Current_Password">Current Password</msg>
   <msg key="Currently_invisible_msg">&lt;p&gt; Your online status is currently not visible to other users. &lt;/p&gt;</msg>
   <msg key="Currently_visible_msg">&lt;p&gt; Your online status is currently visible to other users. &lt;/p&gt;</msg>
   <msg key="Customize_Question">Customize Question</msg>
+  <msg key="Database_Error">Database Error</msg>
   <msg key="default_context">default context</msg>
   <msg key="Delete">Delete</msg>
   <msg key="DevAdmin">DevAdmin</msg>
@@ -68,6 +77,8 @@
   <msg key="Disable">Disable</msg>
   <msg key="Disabled">Disabled</msg>
   <msg key="Domain">Domain</msg>
+  <msg key="E_mail">E-mail</msg>
+  <msg key="edit_comment">edit comment</msg>
   <msg key="Elements_not_editable">Certain elements are not editable, because they are managed by %authority_name%.</msg>
   <msg key="Email">Email</msg>
   <msg key="email_body_Forgotten_password">Here is your new login information:
@@ -95,17 +106,31 @@
   <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>
+  <msg key="Enter_your_username_to">Enter your username to begin password recovery.</msg>
+  <msg key="Erase_Portrait">Erase Portrait</msg>
+  <msg key="erase_portrait">erase portrait</msg>
+  <msg key="Error">Error</msg>
   <msg key="Error_sending_mail">Error sending mail</msg>
   <msg key="Expires">Expires</msg>
+  <msg key="Filename">Filename</msg>
   <msg key="First_names">First names</msg>
   <msg key="Forgot_your_password">Forgot your password?</msg>
   <msg key="Frequency">Frequency</msg>
+  <msg key="Go_back">Go back</msg>
+  <msg key="go_upload_the_users_por">go upload the user's portrait</msg>
+  <msg key="go_upload_your_portrait">go upload your portrait</msg>
   <msg key="Grant">Grant</msg>
   <msg key="Grant_1">Grant:</msg>
   <msg key="Grant_Permission">Grant Permission</msg>
   <msg key="Hide">Hide</msg>
+  <msg key="Home_page">Home page</msg>
+  <msg key="If_you_were_to">If you were to</msg>
   <msg key="Information_Updated">Information Updated</msg>
   <msg key="Invite">Invite</msg>
+  <msg key="ISO_Code">ISO Code</msg>
+  <msg key="ISO_Code_List">ISO Code List</msg>
+  <msg key="ISO_Codes_Not_Loaded">ISO Codes Not Loaded</msg>
+  <msg key="ISO_Codes_not_loaded">ISO Codes not loaded</msg>
   <msg key="Join_community">Join community</msg>
   <msg key="Join_group_name">Join %group_name%</msg>
   <msg key="Join_this_community">Join this community</msg>
@@ -116,23 +141,38 @@
   <msg key="Leave_this_community">Leave this community</msg>
   <msg key="lGo_back_without_adding">Go back without adding any users</msg>
   <msg key="Log_In">Log In</msg>
+  <msg key="log_in">log in</msg>
   <msg key="Log_in_to_system">Log in to %system_name%</msg>
   <msg key="logging_back_in">logging back in</msg>
   <msg key="Login_or_register">Login or register</msg>
+  <msg key="login_page">login page</msg>
   <msg key="Logout">Logout</msg>
   <msg key="Logout_from_system">Logout from %system_name%</msg>
+  <msg key="lt__youd_be_able_to_get">, you'd be able to get more information on your fellow community member.</msg>
   <msg key="lt_Cannot_join_this_grou">Cannot join this group.</msg>
+  <msg key="lt_Complete_List_of_ISO_">Complete List of ISO Codes</msg>
+  <msg key="lt_Continue_working_with">Continue working with %system_name%</msg>
+  <msg key="lt_Edit_comment_for_the_">Edit comment for the portrait of %first_names% %last_name%</msg>
   <msg key="lt_first_names_last_name">%first_names% %last_name% (%email%) registered as a user of 
 %system_url%</msg>
+  <msg key="lt_For_Site-Wide_Adminis">For Site-Wide Administrators</msg>
   <msg key="lt_Grant_Permission_on_n">Grant Permission on %name%</msg>
+  <msg key="lt_Heres_what_the_databa">Here's what the database reported:</msg>
+  <msg key="lt_How_would_you_like_the">How would you like the world to see %first_names% %last_name%?</msg>
   <msg key="lt_If_you_dont_think_the">If you don't think the person has an account already:</msg>
   <msg key="lt_If_you_happen_to_know">If you happen to know or believe that the person you would like to
   invite already has an account on this system:</msg>
+  <msg key="lt_If_you_need_this_func">If you need this functionality, please load acs-reference and ref-countries.</msg>
   <msg key="lt_Inherited_Permissions">Inherited Permissions</msg>
   <msg key="lt_It_would_be_a_very_ba">It would be a very bad idea to choose this option if you're using a
 shared computer in a library or school.  Any subsequent user of this
 machine would be able to masquerade as you on our service.</msg>
   <msg key="lt_New_registration_at_s">New registration at %system_url%</msg>
+  <msg key="lt_Note_text_in_red_below">Note text in red below the parameter entry fields indicates the value of this
+    parameter is being overridden by an entry in the OpenACS parameter file.  The
+    use of the parameter file is discouraged but some sites need it to provide
+    instance-specific values for parameters independent of the apm_parameter
+    tables.</msg>
   <msg key="lt_Note_that_you_can_era">Note that you can erase your saved email address and password by
 choosing the &quot;log out&quot; option from your workspace.</msg>
   <msg key="lt_num_children_Children">%num_children% Children Hidden</msg>
@@ -143,8 +183,11 @@
 keep telling us your email address and password.</msg>
   <msg key="lt_Password_Confirmation">Password Confirmation</msg>
   <msg key="lt_Personal_Home_Page_UR">Personal Home Page URL:</msg>
+  <msg key="lt_Please_locate_your_co">Please locate your country's code among those listed below then use
+the &quot;back&quot; button on your browser to return to the previous form.</msg>
   <msg key="lt_Please_read_and_follo">Please read and follow the instructions in this email.</msg>
   <msg key="lt_Please_try_to_a_hrefi">Please try to &lt;a href=&quot;index&quot;&gt;log in&lt;/a&gt; again</msg>
+  <msg key="lt_Portrait_of_first_last">Portrait of %first_names% %last_name%</msg>
   <msg key="lt_Privileges_higher_implied">Privileges higher in the hierarchy imply all the privileges below, e.g. when you grant admin, then read, write etc. are implied automatically.</msg>
   <msg key="lt_Problem_with_authenti">Problem with authentication</msg>
   <msg key="lt_Registration_informat">Registration information for this service has just been
@@ -157,8 +200,23 @@
   <msg key="lt_Saving_email_address_">Saving email address and password</msg>
   <msg key="lt_Show_everyone_else_at">Show everyone else at %system_name% how great looking you are:</msg>
   <msg key="lt_Sorry_but_it_seems_th">Sorry but it seems that you've been banned from %system_name%.</msg>
+  <msg key="lt_Sure_erase_user_por">Are you sure that you want to erase this user's portrait?</msg>
+  <msg key="lt_Sure_erase_your_por">Are you sure that you want to erase your portrait?</msg>
+  <msg key="lt_The_picture_of_you_in">The picture of you in the system is invalid. Please</msg>
   <msg key="lt_There_was_a_problem_w">There was a problem with authenticating your account</msg>
+  <msg key="lt_This_is_the_image_that">This is the image that we show to other users at %system_name%</msg>
+  <msg key="lt_This_user_doesnt_have">This user doesn't have a portrait yet. You can</msg>
+  <msg key="lt_This_user_is_deleted">This user is deleted and banned from the community.</msg>
   <msg key="lt_To_confirm_your_regis">To confirm your registration, please go to %confirmation_url%</msg>
+  <msg key="lt_Upload_your_favorite">Upload your favorite file, a scanned JPEG or GIF, from your desktop
+computer system (note that you can't refer to an image elsewhere on
+the Internet; this image must be on your computer's hard drive).</msg>
+  <msg key="lt_Uploaded_pretty_date">Uploaded:  %pretty_date%</msg>
+  <msg key="lt_Uploaded_publish_date">Uploaded: %publish_date%</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_We_cant_find_you">We can't find you (user %user_id%) in the users table.  Probably your
+account was deleted for some reason.</msg>
+  <msg key="lt_We_had_a_problem_proc">We had a problem processing your entry.</msg>
   <msg key="lt_We_were_not_awaiting_">We were not awaiting your email.  There must be some mistake.</msg>
   <msg key="lt_Welcome_to_system_nam">Welcome to %system_name%</msg>
   <msg key="lt_What_other_people_see">What other people see when they click your name</msg>
@@ -170,6 +228,7 @@
   <msg key="lt_Your_email_has_been_c_1">Your email has been confirmed. You are now awaiting approval
     from the %system_name% administrator.</msg>
   <msg key="lt_Your_email_is_confirm">Your email is confirmed</msg>
+  <msg key="lt_Your_login_has_expire">Your login has expired. Please retype your password to continue working.</msg>
   <msg key="lt_Your_URL_doesnt_have_">Your URL doesn't have the correct form.  A valid URL would be something like &quot;%valid_url_example%&quot;.</msg>
   <msg key="Make_administrator">Make administrator</msg>
   <msg key="Make_member">Make member</msg>
@@ -182,14 +241,17 @@
   <msg key="Name">Name</msg>
   <msg key="New_Password">New Password</msg>
   <msg key="No_applications">No applications</msg>
+  <msg key="No_ISO_Codes">No ISO Codes</msg>
+  <msg key="No_package_parameters">This package does not have any parameters.</msg>
   <msg key="no_portrait_title_message">your portrait</msg>
   <msg key="No_pretty_plural">No %pretty_plural%</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="Notes">Notes:</msg>
   <msg key="Notice">Notice:</msg>
   <msg key="on_name_to">on %name% to:</msg>
+  <msg key="optional">(optional)</msg>
+  <msg key="Options">Options</msg>
   <msg key="Or_add_a_new_user">Or add a new user</msg>
   <msg key="or_the">or the</msg>
   <msg key="Password">Password</msg>
@@ -215,6 +277,7 @@
   <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="Question">Question</msg>
   <msg key="Re_enable">Re-enable</msg>
   <msg key="Recover_Password">Recover Password</msg>
@@ -230,6 +293,7 @@
   <msg key="return_to_application">return to application</msg>
   <msg key="Revoke_Checked">Revoke Checked</msg>
   <msg key="Role">Role</msg>
+  <msg key="Save_comment">Save comment</msg>
   <msg key="Screen_name">Screen name</msg>
   <msg key="Search_For_Exist_User">Search For An Existing User</msg>
   <msg key="Security_context_root">Security context root</msg>
@@ -239,28 +303,38 @@
   <msg key="Site_wide_administration">Site-wide administration</msg>
   <msg key="sorry_forgotten_pwd">Sorry, we can't help you with your forgotten password.</msg>
   <msg key="Status">Status</msg>
+  <msg key="Story_Behind_Photo">Story Behind Photo</msg>
+  <msg key="Story_behind_photo">Story Behind Photo</msg>
   <msg key="Subcommunities">Subcommunities</msg>
   <msg key="subcommunities">subcommunities</msg>
   <msg key="subcommunity">subcommunity</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_subsite">this subsite</msg>
+  <msg key="This_user_has_left_the">This user has left the community.</msg>
+  <msg key="To_log_in_visit_the">To log in, visit the</msg>
   <msg key="Topic">Topic</msg>
   <msg key="type_specific_info">type-specific info</msg>
   <msg key="UP">UP</msg>
   <msg key="up_to_context_name">up to %context_name%</msg>
   <msg key="Update">Update</msg>
   <msg key="Update_Password">Update Password</msg>
+  <msg key="upload">upload</msg>
   <msg key="upload_a_portrait">upload a portrait</msg>
+  <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="Vacation_Info_Updated">Vacation Information Updated</msg>
   <msg key="Vacation_information_updated">Your vacation information at %site_link% has been updated.</msg>
   <msg key="Welcome_user">Welcome, %user_name%</msg>
   <msg key="When_leaving_checkbox_empty">When you leave a checkbox empty here then that privilege will be revoked from the party you choose in case it has been granted to that party before.</msg>
   <msg key="Whos_Online_link_label">Users currently online</msg>
   <msg key="Whos_Online_title">Who's Online</msg>
+  <msg key="Yes_I_am_sure">Yes, I'm sure</msg>
   <msg key="You_can_also_browse_from">You can also browse from the</msg>
   <msg key="You_can_always_re_open">You can always re-open it by</msg>
   <msg key="You_do_not_have_admin_on">You do not have admin rights on object %root% or any of it's children</msg>
+  <msg key="You_dont_have_a_portrait">You don't have a portrait yet. You can</msg>
   <msg key="You_have_admin_rights_on">You have admin rights on the following objects:</msg>
   <msg key="You_have_no_email_alerts">You currently have no email alerts registered.</msg>
   <msg key="Your_Account">Your Account</msg>
Index: openacs-4/packages/acs-subsite/www/register/account-message.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/account-message.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/register/account-message.adp	10 Sep 2003 16:45:49 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/register/account-message.adp	17 Oct 2003 10:30:23 -0000	1.2
@@ -5,6 +5,7 @@
 <p> @message;noquote@ </p>
 
 <if @return_url@ not nil>
-  <b>&raquo;</b> <a href="@return_url@">Continue working with @system_name@</a>
+  <b>&raquo;</b> <a href="@return_url@">#acs-subsite.lt_Continue_working_with#</a>
 </if>
 
+
Index: openacs-4/packages/acs-subsite/www/register/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/index.adp,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-subsite/www/register/index.adp	2 Oct 2003 12:42:14 -0000	1.15
+++ openacs-4/packages/acs-subsite/www/register/index.adp	17 Oct 2003 10:30:23 -0000	1.16
@@ -3,11 +3,12 @@
   <property name="context">{#acs-subsite.Log_In#}</property>
 
 <if @expired_p@ true>
-  <div class="general-message">Your login has expired. Please retype your password to continue working.</div>
+  <div class="general-message">#acs-subsite.lt_Your_login_has_expire#</div>
 </if>
 
 <if @message@ not nil>
   <div class="general-message">@message@</div>
 </if>
 
 <include src="/packages/acs-subsite/lib/login" return_url="@return_url;noquote@" no_frame_p="1" authority_id="@authority_id@" username="@username;noquote@" email="@email;noquote@" &="__adp_properties">
+
Index: openacs-4/packages/acs-subsite/www/register/recover-password.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/recover-password.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/register/recover-password.adp	2 Oct 2003 12:18:07 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/register/recover-password.adp	17 Oct 2003 10:30:23 -0000	1.7
@@ -4,11 +4,12 @@
   <property name="focus">@focus;noquote@</property>
 
 <if @recover_info.password_message@ nil>
-  <p> Enter your username to begin password recovery. </p>
+  <p> #acs-subsite.Enter_your_username_to# </p>
   <formtemplate id="recover"></formtemplate>
 </if>
 <else>
   @recover_info.password_message@
-  <p> To log in, visit the <a href="@login_url@">login page</a>. </p>
+  <p> #acs-subsite.To_log_in_visit_the# <a href="@login_url@">#acs-subsite.login_page#</a>. </p>
 </else>
 
+
Index: openacs-4/packages/acs-subsite/www/register/restore-user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/restore-user.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/register/restore-user.adp	24 Sep 2003 15:19:24 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/register/restore-user.adp	17 Oct 2003 10:30:23 -0000	1.9
@@ -5,8 +5,9 @@
 <p>#acs-subsite.Account_reopened_message#</p>
 
 <p>
-  <b>&raquo;</b> <a href="@return_url@">Continue</a>
+  <b>&raquo;</b> <a href="@return_url@">#acs-subsite.Continue#</a>
 </p>
 
 
 
+
Index: openacs-4/packages/acs-subsite/www/shared/community-member.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/community-member.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-subsite/www/shared/community-member.adp	24 Sep 2003 15:19:24 -0000	1.10
+++ openacs-4/packages/acs-subsite/www/shared/community-member.adp	17 Oct 2003 10:30:23 -0000	1.11
@@ -9,51 +9,51 @@
 <else>
   <if @inline_portrait_state eq "link">
     <p>
-      <b>&raquo;</b> <a href="portrait?@portrait_export_vars@">Portrait</a>
+      <b>&raquo;</b> <a href="portrait?@portrait_export_vars@">#acs-subsite.Portrait#</a>
     </p>
   </if>
 </else>
 
 <p>
-  A member of the @system_name@ community since <b>@pretty_creation_date@</b>.
+  #acs-subsite.A_member_of_the_system# <b>@pretty_creation_date@</b>.
 </p>
 
 <if @member_state@ eq "deleted">
   <blockquote>
     <font color="red">
-      This user has left the community.
+      #acs-subsite.This_user_has_left_the#
     </font>
   </blockquote>
 </if>
 <else>
   <if @member_state@ eq "banned">
     <blockquote>
       <font color="red">
-        This user is deleted and banned from the community.
+        #acs-subsite.lt_This_user_is_deleted#
        </font>
     </blockquote>
   </if>
 </else>
 
 <p>
-  <b>Name:</b> @first_names@ @last_name@
+  <b>#acs-subsite.Name#:</b> @first_names@ @last_name@
 </p>
 
 <if @show_email_p@ true>
   <p>
-    <b>E-mail:</b> <a href="mailto:@email@">@email@</a>
+    <b>#acs-subsite.E_mail#:</b> <a href="mailto:@email@">@email@</a>
   </p>
 </if>
 
 <if @url@ not nil>
   <p>
-    <b>Home page:</b> <a href="@url@">@url@</a>
+    <b>#acs-subsite.Home_page#:</b> <a href="@url@">@url@</a>
   </p>
 </if>
 
 <if @bio@ not nil>
   <p>
-    <b>Biography:</b>
+    <b>#acs-subsite.Biography#:</b>
    </p>
    <blockquote>
      @bio;noquote@
@@ -63,14 +63,15 @@
 
 <if @untrusted_user_id@ eq 0>
   <blockquote>
-    If you were to <a href="@subsite_url@register/index?@login_export_vars@">log in</a>, you'd be able to get more information on your fellow community member.
+    #acs-subsite.If_you_were_to# <a href="@subsite_url@register/index?@login_export_vars@">#acs-subsite.log_in#</a>#acs-subsite.lt__youd_be_able_to_get#
   </blockquote>
 </if>
 
 <if @site_wide_admin_p@>
-  <h3>For Site-Wide Administrators</h3>
+  <h3>#acs-subsite.lt_For_Site-Wide_Adminis#</h3>
   <p>
-    <b>&raquo;</b> <a href="@admin_user_url@">Administrative options for this user</a>
+    <b>&raquo;</b> <a href="@admin_user_url@">#acs-subsite.Administrative_options#</a>
   </p>
 </if>
 
+
Index: openacs-4/packages/acs-subsite/www/shared/db-error.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/db-error.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/shared/db-error.adp	15 Aug 2003 21:18:13 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/shared/db-error.adp	17 Oct 2003 10:30:23 -0000	1.5
@@ -1,16 +1,17 @@
 <master>
-<property name="title">Database Error</property>
-<property name="context">Database Error</property>
+<property name="title">#acs-subsite.Database_Error#</property>
+<property name="context">#acs-subsite.Database_Error#</property>
 
 <p><if @custom_message@ nil>
-We had a problem processing your entry.
+#acs-subsite.lt_We_had_a_problem_proc#
 </if>
 <else>
 @custom_message@
 </else>
 </p>
-<p>Here's what the database reported:
+<p>#acs-subsite.lt_Heres_what_the_databa#
 <blockquote>
 @errmsg@
 </blockquote>
 </p>
+
Index: openacs-4/packages/acs-subsite/www/shared/iso-codes-no-exist.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/iso-codes-no-exist.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/shared/iso-codes-no-exist.adp	15 Aug 2003 21:18:13 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/shared/iso-codes-no-exist.adp	17 Oct 2003 10:30:23 -0000	1.7
@@ -1,10 +1,11 @@
 <master>
-<property name="title">ISO Codes Not Loaded</property>
-<property name="context">No ISO Codes</property>
+<property name="title">#acs-subsite.ISO_Codes_Not_Loaded#</property>
+<property name="context">#acs-subsite.No_ISO_Codes#</property>
  
-<H2>ISO Codes not loaded</H2>
+<H2>#acs-subsite.ISO_Codes_not_loaded#</H2>
 <hr>
 
-<p>The ISO codes were not loaded on this server.
-<p>If you need this functionality, please load acs-reference and ref-countries.
+<p>#acs-subsite.The_ISO_codes_were_not#
+<p>#acs-subsite.lt_If_you_need_this_func#
 
+
Index: openacs-4/packages/acs-subsite/www/shared/iso-codes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/iso-codes.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/shared/iso-codes.adp	15 Aug 2003 21:18:13 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/shared/iso-codes.adp	17 Oct 2003 10:30:23 -0000	1.6
@@ -1,15 +1,14 @@
 <master>
-<property name="title">Complete List of ISO Codes</property>
-<property name="context">ISO Code List</property>
+<property name="title">#acs-subsite.lt_Complete_List_of_ISO_#</property>
+<property name="context">#acs-subsite.ISO_Code_List#</property>
  
-<h2>Complete List of ISO Codes</h2>
+<h2>#acs-subsite.lt_Complete_List_of_ISO_#</h2>
 
-Please locate your country's code among those listed below then use
-the "back" button on your browser to return to the previous form.
+#acs-subsite.lt_Please_locate_your_co#
 
 <hr>
 <table>
-<tr><th align=left>Country Name<th>ISO Code</tr>
+<tr><th align=left>#acs-subsite.Country_Name#<th>#acs-subsite.ISO_Code#</tr>
 
 <multiple name="ccodes">
 
@@ -19,3 +18,4 @@
 
 </table>
 
+
Index: openacs-4/packages/acs-subsite/www/shared/parameters.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/parameters.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/shared/parameters.adp	17 Sep 2003 18:39:25 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/shared/parameters.adp	17 Oct 2003 10:30:23 -0000	1.4
@@ -8,17 +8,14 @@
 
   <if @display_warning_p@ true>
     <span style="color: red; font-weight: bold;">(*)</span>
-    Note text in red below the parameter entry fields indicates the value of this
-    parameter is being overridden by an entry in the OpenACS parameter file.  The
-    use of the parameter file is discouraged but some sites need it to provide
-    instance-specific values for parameters independent of the apm_parameter
-    tables.
+    #acs-subsite.lt_Note_text_in_red_below#
   </if>
 
 </if>
 <else>
-  <p> This package does not have any parameters. </p>
+  <p> #acs-subsite.No_package_parameters# </p>
   <if @return_url@ not nil>
-    <p> <b>&raquo;</b> <a href="@return_url@">Go back</a> </p>
+    <p> <b>&raquo;</b> <a href="@return_url@">#acs-subsite.Go_back#</a> </p>
   </if>
 </else>
+
Index: openacs-4/packages/acs-subsite/www/shared/portrait.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/portrait.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/shared/portrait.adp	31 Aug 2003 06:19:41 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/shared/portrait.adp	17 Oct 2003 10:30:23 -0000	1.7
@@ -1,5 +1,5 @@
 <master>
-<property name="title">Portrait of @first_names@ @last_name@</property>
+<property name="title">#acs-subsite.lt_Portrait_of_first_last#</property>
 <property name="context">@context;noquote@</property>
 
 <p><center>
@@ -9,10 +9,11 @@
 </p>
 
 <p><ul>
-<li>Comment:  
+<li>#acs-subsite.Comment#:
 <blockquote>
 @description@
 </blockquote>
-<li>Uploaded: @publish_date@
+<li>#acs-subsite.lt_Uploaded_publish_date#
 </ul>
 </p>
+
Index: openacs-4/packages/acs-subsite/www/shared/report-error.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/report-error.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/shared/report-error.adp	15 Aug 2003 21:18:13 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/shared/report-error.adp	17 Oct 2003 10:30:23 -0000	1.5
@@ -1,10 +1,11 @@
 <master>
-<property name="title">Application Error</property>
-<property name="context">Error</property>
+<property name="title">#acs-subsite.Application_Error#</property>
+<property name="context">#acs-subsite.Error#</property>
 
 <if @custom_message@ nil>
-We had a problem processing your entry.
+#acs-subsite.lt_We_had_a_problem_proc#
 </if>
 <else>
 @custom_message@
 </else>
+
Index: openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp	22 May 2003 14:15:21 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp	17 Oct 2003 10:30:23 -0000	1.6
@@ -1,18 +1,19 @@
 <master>
-<property name="title">Edit comment for the portrait of @first_names;noquote@ @last_name;noquote@</property>
+<property name="title">#acs-subsite.lt_Edit_comment_for_the_#</property>
 <property name="context">@context;noquote@</property>
 
 <form method="post" action="comment-edit-2.tcl">
 @export_vars;noquote@
-Story Behind Photo:<br />
+#acs-subsite.Story_behind_photo#:<br />
 <textarea rows="6" cols="50" wrap="soft" name="description">
 @description@
 </textarea>
 
 
 <p><center>
-<input type="submit" value="Save comment" />
+<input type="submit" value="#acs-subsite.Save_comment#" />
 </center></p>
 </form>
 
 
+
Index: openacs-4/packages/acs-subsite/www/user/portrait/erase.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/erase.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/user/portrait/erase.adp	22 May 2003 14:15:21 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/user/portrait/erase.adp	17 Oct 2003 10:30:23 -0000	1.5
@@ -1,17 +1,18 @@
 <master>
-<property name="title">Erase Portrait</property>
+<property name="title">#acs-subsite.Erase_Portrait#</property>
 <property name="context">@context;noquote@</property>
 
 <if @admin_p@ eq 0>
-  <p>Are you sure that you want to erase your portrait?</p>
+  <p>#acs-subsite.lt_Sure_erase_your_por#</p>
 </if>
 <else>
-  <p>Are you sure that you want to erase this user's portrait?</p>
+  <p>#acs-subsite.lt_Sure_erase_user_por#</p>
 </else>
 
 <form method="get" action="erase-2">
 @export_vars;noquote@
 <center>
-<input type="submit" value="Yes, I'm sure" />
+<input type="submit" value="#acs-subsite.Yes_I_am_sure#" />
 </center>
 
+
Index: openacs-4/packages/acs-subsite/www/user/portrait/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/index.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/user/portrait/index.adp	1 Sep 2003 11:41:01 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/user/portrait/index.adp	17 Oct 2003 10:30:23 -0000	1.9
@@ -1,11 +1,11 @@
 <master>
-<property name="title">Portrait of @first_names@ @last_name@</property>
+<property name="title">#acs-subsite.lt_Portrait_of_first_last#</property>
 <property name="context">@context;noquote@</property>
 
 <switch @return_code@>
 
 <case value="no_error">
-<p>This is the image that we show to other users at @system_name@:</p>
+<p>#acs-subsite.lt_This_is_the_image_that#:</p>
 </if>
 
 <center>
@@ -14,45 +14,44 @@
 </center>
 
 <ul>
-<li>Uploaded:  @pretty_date@</li>
-<li>Comment: 
+<li>#acs-subsite.lt_Uploaded_pretty_date#</li>
+<li>#acs-subsite.Comment#: 
 <blockquote>
 @description@
 </blockquote>
 </li>
 </ul>
 
 <if @admin_p@ eq 1>
-Options:
+#acs-subsite.Options#:
 
 <ul>
-<li><a href="comment-edit?@export_edit_vars@">edit comment</a></li>
-<li><a href="upload?return_url=@return_url@">upload a replacement portrait</a></li>
+<li><a href="comment-edit?@export_edit_vars@">#acs-subsite.edit_comment#</a></li>
+<li><a href="upload?return_url=@return_url@">#acs-subsite.upload_a_replacement_por#</a></li>
 
-<li><a href="erase?@export_edit_vars@">erase portrait</a></li>
+<li><a href="erase?@export_edit_vars@">#acs-subsite.erase_portrait#</a></li>
 
 </ul>
 </if>
 </case>
 
 <case value="no_user">
-We can't find you (user @user_id@) in the users table.  Probably your
-account was deleted for some reason.
+#acs-subsite.lt_We_cant_find_you#
 </case>
 
 <case value="no_portrait_info">
-The picture of you in the system is invalid. Please
-<a href="upload?return_url=@return_url@">upload</a> another picture.
+#acs-subsite.lt_The_picture_of_you_in#
+<a href="upload?return_url=@return_url@">#acs-subsite.upload#</a> #acs-subsite.another_picture#
 </case>
 
 <case value="no_portrait">
 <if @admin_p@ eq "0">
-This user doesn't have a portrait yet. You can
-<a href="upload?@export_edit_vars@">go upload the user's portrait</a>.
+#acs-subsite.lt_This_user_doesnt_have#
+<a href="upload?@export_edit_vars@">#acs-subsite.go_upload_the_users_por#</a>.
 </if>
 <else>
-You don't have a portrait yet. You can
-<a href="upload?return_url=@return_url@">go upload your portrait</a>.
+#acs-subsite.You_dont_have_a_portrait#
+<a href="upload?return_url=@return_url@">#acs-subsite.go_upload_your_portrait#</a>.
 </else>
 </case>
  
@@ -62,3 +61,4 @@
 
 
 
+
Index: openacs-4/packages/acs-subsite/www/user/portrait/upload.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/upload.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/user/portrait/upload.adp	22 May 2003 14:15:21 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/user/portrait/upload.adp	17 Oct 2003 10:30:23 -0000	1.5
@@ -1,30 +1,28 @@
 <master>
-<property name=title>Upload Portrait</property>
+<property name=title>#acs-subsite.Upload_Portrait#</property>
 <property name="context">@context;noquote@</property>
 
-How would you like the world to see @first_names@ @last_name@?
+#acs-subsite.lt_How_would_you_like_the#
 
 <p>
 
-Upload your favorite file, a scanned JPEG or GIF, from your desktop
-computer system (note that you can't refer to an image elsewhere on
-the Internet; this image must be on your computer's hard drive).
+#acs-subsite.lt_Upload_your_favorite#
 
 <blockquote>
 <form enctype=multipart/form-data method=POST action="upload-2">
 @export_vars;noquote@
 <table>
 <tr>
-<td valign=top align=right>Filename: </td>
+<td valign=top align=right>#acs-subsite.Filename#: </td>
 <td>
 <input type=file name=upload_file size=20><br>
-<font size=-1>Use the "Browse..." button to locate your file, then click "Open".</font>
+<font size=-1>#acs-subsite.lt_Use_the_Browse_button#</font>
 </td>
 </tr>
 <tr>
-<td valign=top align=right>Story Behind Photo
+<td valign=top align=right>#acs-subsite.Story_Behind_Photo#
 <br>
-<font size=-1>(optional)</font>
+<font size=-1>#acs-subsite.optional#</font>
 </td>
 <td><textarea rows=6 cols=50 wrap=soft name=portrait_comment>
 </textarea>
@@ -39,3 +37,4 @@
 </blockquote>
 </form>
 
+