Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.da_DK.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.da_DK.ISO-8859-1.xml,v
diff -u -N -r1.17 -r1.18
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.da_DK.ISO-8859-1.xml	15 Oct 2003 15:28:20 -0000	1.17
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.da_DK.ISO-8859-1.xml	17 Oct 2003 09:19:31 -0000	1.18
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-subsite" package_version="5.0d5" locale="da_DK" charset="ISO-8859-1">
+<message_catalog package_key="acs-subsite" package_version="5.0d6" locale="da_DK" charset="ISO-8859-1">
 
   <msg key="About_You">Omkring dig</msg>
   <msg key="Account_closed">&lt;p&gt;Din konto er i �jeblikket lukket.&lt;/p&gt; &lt;p&gt;Hvis du vil, kan vi &lt;a href=&quot;%restore_url%&quot;&gt;gen�bne kontoen&lt;/a&gt;.&lt;/p&gt; </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 -N -r1.40 -r1.41
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	16 Oct 2003 15:07:12 -0000	1.40
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	17 Oct 2003 09:19:31 -0000	1.41
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="acs-subsite" package_version="5.0d6" locale="en_US" charset="ISO-8859-1">
 
+  <msg key="_or">, or</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>
   <msg key="Account_close_confirm_yes_label">Yes, please close my account</msg>
   <msg key="Account_closed">
@@ -18,9 +20,11 @@
   </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>
   <msg key="Add_new_app">Add new application</msg>
   <msg key="Admin">Admin</msg>
   <msg key="Administer_subsite">Administer %subsite_name%</msg>
+  <msg key="Alert_Type">Alert Type</msg>
   <msg key="Answer">Answer</msg>
   <msg key="Applications">Applications</msg>
   <msg key="Approve">Approve</msg>
@@ -56,10 +60,15 @@
   <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="default_context">default context</msg>
   <msg key="Delete">Delete</msg>
   <msg key="DevAdmin">DevAdmin</msg>
   <msg key="Developers_Admin">Developer's Administration</msg>
   <msg key="Direct_Permissions">Direct Permissions</msg>
+  <msg key="Disable">Disable</msg>
+  <msg key="Disabled">Disabled</msg>
+  <msg key="Domain">Domain</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:
 
@@ -85,26 +94,40 @@
   <msg key="Email_not_Requested">Email not Requested</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>
   <msg key="Error_sending_mail">Error sending mail</msg>
+  <msg key="Expires">Expires</msg>
   <msg key="First_names">First names</msg>
+  <msg key="Forgot_your_password">Forgot your password?</msg>
+  <msg key="Frequency">Frequency</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="Information_Updated">Information Updated</msg>
   <msg key="Invite">Invite</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>
+  <msg key="Keyword">Keyword</msg>
   <msg key="Last_name">Last name</msg>
+  <msg key="later">later.</msg>
   <msg key="Leave_community">Leave community</msg>
   <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_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="Logout">Logout</msg>
   <msg key="Logout_from_system">Logout from %system_name%</msg>
   <msg key="lt_Cannot_join_this_grou">Cannot join this group.</msg>
   <msg key="lt_first_names_last_name">%first_names% %last_name% (%email%) registered as a user of 
 %system_url%</msg>
   <msg key="lt_Grant_Permission_on_n">Grant Permission on %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_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
@@ -122,6 +145,7 @@
   <msg key="lt_Personal_Home_Page_UR">Personal Home Page URL:</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_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
 sent to %email%.</msg>
@@ -140,6 +164,7 @@
   <msg key="lt_What_other_people_see">What other people see when they click your name</msg>
   <msg key="lt_You_cant_have_a_lt_in">You can't have a &amp;lt; in your first name because it will look like an HTML tag and confuse other users.</msg>
   <msg key="lt_You_cant_have_a_lt_in_1">You can't have a &amp;lt; in your last name because it will look like an HTML tag and confuse other users.</msg>
+  <msg key="lt_You_wont_get_any_email">You won't get any email until after %pretty_date%.</msg>
   <msg key="lt_Your_email_has_been_c">Your email has been confirmed. You may now log into
     %system_name%.</msg>
   <msg key="lt_Your_email_has_been_c_1">Your email has been confirmed. You are now awaiting approval
@@ -161,8 +186,12 @@
   <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="Or_add_a_new_user">Or add a new user</msg>
+  <msg key="or_the">or the</msg>
   <msg key="Password">Password</msg>
   <msg key="Password_changed_body">Your login information on %system_name%:
 
@@ -183,8 +212,11 @@
 3. Choose &quot;%password_update_link_text%&quot;</msg>
   <msg key="Password_changed_subject">Password changed</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="Question">Question</msg>
+  <msg key="Re_enable">Re-enable</msg>
   <msg key="Recover_Password">Recover Password</msg>
   <msg key="Register">Register</msg>
   <msg key="Registration_Approval_Notice">
@@ -195,25 +227,45 @@
   <msg key="Remove">Remove</msg>
   <msg key="Req_membership_comm">Request membership of this community</msg>
   <msg key="Request_membership">Request membership</msg>
+  <msg key="return_to_application">return to application</msg>
   <msg key="Revoke_Checked">Revoke Checked</msg>
   <msg key="Role">Role</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>
+  <msg key="Select_an_Object_by_Id">Select an Object by Id:</msg>
   <msg key="Send_email_to_this_user">Send email to this user</msg>
   <msg key="Show">Show</msg>
   <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="Subcommunities">Subcommunities</msg>
   <msg key="subcommunities">subcommunities</msg>
   <msg key="subcommunity">subcommunity</msg>
   <msg key="Thank_you">Thank you.</msg>
+  <msg key="this_subsite">this subsite</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_a_portrait">upload a 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="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_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>
+  <msg key="Your_discussion_alerts">Your discussion forum alerts</msg>
   <msg key="Your_Portrait">Your Portrait</msg>
+  <msg key="Your_system_alerts">Your %gc_system_name% alerts</msg>
+  <msg key="Youre_marked_as_back">You're marked as back from vacation at %site_link%.</msg>
 </message_catalog>
Index: openacs-4/packages/acs-subsite/lib/login.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/login.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/lib/login.adp	18 Sep 2003 17:12:53 -0000	1.3
+++ openacs-4/packages/acs-subsite/lib/login.adp	17 Oct 2003 09:19:31 -0000	1.4
@@ -3,10 +3,11 @@
 <formtemplate id="login" style="standard-lars"></formtemplate>
 
 <if @forgotten_pwd_url@ not nil>
-  <a href="@forgotten_pwd_url@">Forgot your password?</a> <br />
+  <a href="@forgotten_pwd_url@">#acs-subsite.Forgot_your_password#</a> <br />
 </if>
 
 <if @register_url@ not nil>
-  <a href="@register_url@">Register</a>
+  <a href="@register_url@">#acs-subsite.Register#</a>
 </if>
 
+
Index: openacs-4/packages/acs-subsite/lib/user-info.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/user-info.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/lib/user-info.adp	22 Sep 2003 08:22:26 -0000	1.3
+++ openacs-4/packages/acs-subsite/lib/user-info.adp	17 Oct 2003 09:19:31 -0000	1.4
@@ -2,5 +2,6 @@
 <formtemplate id="user_info"></formtemplate>
 
 <if @edit_mode_p@ true and @read_only_notice_p@ true>
-  <p> <font color="red">Notice:</font> Certain elements are not editable, because they are managed by @authority_name@. </p>
+  <p> <font color="red">#acs-subsite.Notice#</font> #acs-subsite.Elements_not_editable# </p>
 </if>
+
Index: openacs-4/packages/acs-subsite/www/members/member-invite.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/member-invite.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/members/member-invite.adp	28 Aug 2003 09:41:41 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/members/member-invite.adp	17 Oct 2003 09:19:31 -0000	1.3
@@ -3,19 +3,19 @@
   <property name="title">@page_title@</property>
   <property name="focus">user_search.user_id</property>
 
-<h2>Search For An Existing User</h2>
+<h2>#acs-subsite.Search_For_Exist_User#</h2>
 
 <p>
-  If you happen to know or believe that the person you would like to
-  invite already has an account on this system:
+  #acs-subsite.lt_If_you_happen_to_know#
 </p>
 
 <formtemplate id="user_search" style="standard-lars"></formtemplate>
 
-<h2>Or add a new user</h2>
+<h2>#acs-subsite.Or_add_a_new_user#</h2>
 
 <p>
-  If you don't think the person has an account already:
+  #acs-subsite.lt_If_you_dont_think_the#
 </p>
 
 <formtemplate id="user_create" style="standard-lars"></formtemplate>
+
Index: openacs-4/packages/acs-subsite/www/permissions/grant.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/grant.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/permissions/grant.adp	12 Oct 2003 19:43:37 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/permissions/grant.adp	17 Oct 2003 09:19:31 -0000	1.5
@@ -9,7 +9,7 @@
 
 <table>
   <tr valign="top">
-    <td>Grant: </td>
+    <td>#acs-subsite.Grant_1# </td>
 
     <td>&nbsp;</td>
 
@@ -19,7 +19,7 @@
 
     <td>&nbsp;</td>
 
-    <td>on @name@ to:</td>
+    <td>#acs-subsite.on_name_to#</td>
 
     <td>&nbsp;</td>
 
@@ -46,8 +46,9 @@
 
 <p>
 
-<i>Notes:</i>
+<i>#acs-subsite.Notes#</i>
 <br>
-<i>Privileges higher in the hierarchy imply all the privileges below, e.g. when you grant admin, then read, write etc. are implied automatically.</i>
+<i>#acs-subsite.lt_Privileges_higher_implied#</i>
 <br>
-<i>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.</i>
+<i>#acs-subsite.When_leaving_checkbox_empty#</i>
+
Index: openacs-4/packages/acs-subsite/www/permissions/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/index.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/permissions/index.adp	22 May 2003 14:12:40 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/permissions/index.adp	17 Oct 2003 09:19:31 -0000	1.4
@@ -1,28 +1,28 @@
   <master>
-    <property name="title">Permissions</property>
+    <property name="title">#acs-subsite.Permissions#</property>
     <property name="context">@context;noquote@</property>
 
     <if @objects:rowcount@ gt 0> 
-      You have admin rights on the following objects:
+      #acs-subsite.You_have_admin_rights_on#
       <ul>
         <multiple name="objects">
 
-          <li> <if @objects.object_id@ eq @root@ and @objects.context_id@ not nil> <a href="./?root=@objects.context_id@">UP</a></if>
-          <if @objects.object_id@ ne @root@><a href="./?root=@objects.object_id@">+</a></if> <strong>@objects.name@</strong> @objects.object_type@ <a href="one?object_id=@objects.object_id@">permissions</a></li>
+          <li> <if @objects.object_id@ eq @root@ and @objects.context_id@ not nil> <a href="./?root=@objects.context_id@">#acs-subsite.UP#</a></if>
+          <if @objects.object_id@ ne @root@><a href="./?root=@objects.object_id@">+</a></if> <strong>@objects.name@</strong> @objects.object_type@ <a href="one?object_id=@objects.object_id@">#acs-subsite.permissions#</a></li>
 
         </multiple>
       </ul>
     </if>
     <else>
-      <em>You do not have admin rights on object @root@ or any of it's children<em>
+      <em>#acs-subsite.You_do_not_have_admin_on#<em>
     </else>
 
     <form method="get" action="one">
-      Select an Object by Id:
+      #acs-subsite.Select_an_Object_by_Id#
       <input name="object_id" type="text"> <input value="Continue" type="submit">
     </form>
 
 <if @admin_p@><p>
-You can also browse from the <a href="./?root=@default_context@">default context</a>
-or the <a href="./?root=@security_context_root@">Security context root</a>, or <a href="./?root=@subsite@">this subsite</a>.
-</p></if>
\ No newline at end of file
+#acs-subsite.You_can_also_browse_from# <a href="./?root=@default_context@">#acs-subsite.default_context#</a>
+#acs-subsite.or_the# <a href="./?root=@security_context_root@">#acs-subsite.Security_context_root#</a>#acs-subsite._or# <a href="./?root=@subsite@">#acs-subsite.this_subsite#</a>.
+</p></if>
Index: openacs-4/packages/acs-subsite/www/permissions/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/one.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/permissions/one.adp	31 Aug 2003 13:09:52 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/permissions/one.adp	17 Oct 2003 09:19:31 -0000	1.7
@@ -43,7 +43,7 @@
           </multiple>
         </ul>
 
-        [<a href="@hide_children_url@">Hide</a>]
+        [<a href="@hide_children_url@">#acs-subsite.Hide#</a>]
       </if>
       <else>
         <p><em>#acs-subsite.none#</em></p>
@@ -58,9 +58,10 @@
     </if>
     <if @application_url@ not nil>
       <p>
-        [<a href="@application_url@">return to application</a>]
+        [<a href="@application_url@">#acs-subsite.return_to_application#</a>]
       </p>
     </if>
     <else>
       <if @context_id@ not nil><p>[<a href="one?object_id=@context_id@">#acs-subsite.up_to_context_name#</a>]</p></if>
     </else>      
+
Index: openacs-4/packages/acs-subsite/www/permissions/perm-user-add-include.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/perm-user-add-include.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/permissions/perm-user-add-include.adp	22 Sep 2003 16:51:02 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/permissions/perm-user-add-include.adp	17 Oct 2003 09:19:31 -0000	1.4
@@ -1,5 +1,6 @@
 <p><listtemplate name="users"></listtemplate></p>
 
 <p>
-  <b>&raquo;</b> <a href="@return_url@">Go back without adding any users</a>
+  <b>&raquo;</b> <a href="@return_url@">#acs-subsite.lGo_back_without_adding#</a>
 </p>
+
Index: openacs-4/packages/acs-subsite/www/pvt/alerts.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/alerts.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/pvt/alerts.adp	22 May 2003 14:12:54 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/pvt/alerts.adp	17 Oct 2003 09:19:32 -0000	1.5
@@ -4,28 +4,28 @@
 
 <if @discussion_forum_alert_p@ eq 1>
 
-<h3>Your discussion forum alerts</h3>
+<h3>#acs-subsite.Your_discussion_alerts#</h3>
 
 <blockquote>
    <table>
-   <tr><th>Status</th>
-       <th>Action</th>
-       <th>Topic</th>
-       <th>Frequency</th>
+   <tr><th>#acs-subsite.Status#</th>
+       <th>#acs-subsite.Action#</th>
+       <th>#acs-subsite.Topic#</th>
+       <th>#acs-subsite.Frequency#</th>
      <if @bboard_keyword_p@ eq 1>
-       <th>Keyword</th>
+       <th>#acs-subsite.Keyword#</th>
      </if>
    </tr>
 
  <multiple name=bboard_rows>
    <tr>
       <if @status@ eq "enabled">
-       <td><font color="red">Enabled</font></td>
-       <td><a href="@action_url@">Disable</a></td>
+       <td><font color="red">#acs-subsite.Enabled#</font></td>
+       <td><a href="@action_url@">#acs-subsite.Disable#</a></td>
       </if>
       <else>
-       <td>Disabled</td>
-       <td><a href="@action_url@">Re-enable</a></td>
+       <td>#acs-subsite.Disabled#</td>
+       <td><a href="@action_url@">#acs-subsite.Re_enable#</a></td>
       </else>
        <td>@topic@</td>
        <td>@frequency@</td>
@@ -42,17 +42,17 @@
 
 <if @classified_email_alert_p@ eq 1>
 
-<h3>Your @gc_system_name@ alerts</h3>
+<h3>#acs-subsite.Your_system_alerts#</h3>
 
 <blockquote>
    <table border>
-   <tr><th>Status</th>
-       <th>Action</th>
-       <th>Domain</th>
-       <th>Expires</th>
-       <th>Frequency</th>
-       <th>Alert Type</th>
-       <th>type-specific info</th>
+   <tr><th>#acs-subsite.Status#</th>
+       <th>#acs-subsite.Action#</th>
+       <th>#acs-subsite.Domain#</th>
+       <th>#acs-subsite.Expires#</th>
+       <th>#acs-subsite.Frequency#</th>
+       <th>#acs-subsite.Alert_Type#</th>
+       <th>#acs-subsite.type_specific_info#</th>
    </tr>
    
  <multiple name=classified_rows>
@@ -73,5 +73,6 @@
 </if>
 
 <if @discussion_forum_alert_p@ eq 0 and @classified_email_alert_p@ eq 0>
- You currently have no email alerts registered.
+ #acs-subsite.You_have_no_email_alerts#
 </if>
+
Index: openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-to-null.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-to-null.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-to-null.adp	15 Aug 2003 21:18:12 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-to-null.adp	17 Oct 2003 09:19:32 -0000	1.5
@@ -1,7 +1,8 @@
 <master>
-<property name="title">Vacation Information Updated</property>
-<property name="context">Information Updated</property>
+<property name="title">#acs-subsite.Vacation_Info_Updated#</property>
+<property name="context">#acs-subsite.Information_Updated#</property>
 
-<p>You're marked as back from vacation at @site_link@.</p>
+<p>#acs-subsite.Youre_marked_as_back#</p>
 
-<p>Please return to @home_link@.</p>
+<p>#acs-subsite.Please_return_to_home#</p>
+
Index: openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-until.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-until.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-until.adp	15 Aug 2003 21:18:12 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-until.adp	17 Oct 2003 09:19:32 -0000	1.5
@@ -1,11 +1,12 @@
 <master>
-<property name="title">Vacation Information Updated</property>
-<property name="context">Information Updated</property>
+<property name="title">#acs-subsite.Vacation_Info_Updated#</property>
+<property name="context">#acs-subsite.Information_Updated#</property>
  
-<p>Your vacation information at @site_link@ has been updated.</p>
+<p>#acs-subsite.Vacation_information_updated#</p>
 
-<p>You won't get any email until after @pretty_date@.</p>
+<p>#acs-subsite.lt_You_wont_get_any_email#</p>
 
-<p>Please return to @home_link@.</p>
+<p>#acs-subsite.Please_return_to_home#</p>
 
 
+
Index: openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2.adp	19 Sep 2003 15:00:44 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2.adp	17 Oct 2003 09:19:32 -0000	1.5
@@ -2,9 +2,10 @@
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
-<p> Your account at @system_name@ has been closed. </p>
+<p> #acs-subsite.Account_at_system_closed# </p>
 
-<p> You can always re-open it by <a href="@login_url@">logging back in</a> later. </p>
+<p> #acs-subsite.You_can_always_re_open# <a href="@login_url@">#acs-subsite.logging_back_in#</a> #acs-subsite.later# </p>
 
 
 
+