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.42 -r1.43
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	17 Oct 2003 10:30:23 -0000	1.42
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	17 Oct 2003 17:51:07 -0000	1.43
@@ -33,6 +33,7 @@
   <msg key="Applications">Applications</msg>
   <msg key="Approve">Approve</msg>
   <msg key="at">at</msg>
+  <msg key="Authority">Authority</msg>
   <msg key="Bad_Password">Bad Password</msg>
   <msg key="Ban">Ban</msg>
   <msg key="Basic_Information">Basic Information</msg>
@@ -120,7 +121,6 @@
   <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>
@@ -144,6 +144,7 @@
   <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_has_expired">The login page has expired. Please log in again.</msg>
   <msg key="Login_or_register">Login or register</msg>
   <msg key="login_page">login page</msg>
   <msg key="Logout">Logout</msg>
@@ -245,6 +246,7 @@
   <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="No_services">No services</msg>
   <msg key="none">none</msg>
   <msg key="Not_logged_in">Not logged in</msg>
   <msg key="Notes">Notes:</msg>
@@ -287,6 +289,7 @@
     &lt;p&gt; Once you're approved, you'll get an email message and you can return to start using %system_name%. &lt;/p&gt;
   </msg>
   <msg key="Reject">Reject</msg>
+  <msg key="Remember_my_login">Remember my login on this computer</msg>
   <msg key="Remove">Remove</msg>
   <msg key="Req_membership_comm">Request membership of this community</msg>
   <msg key="Request_membership">Request membership</msg>
Index: openacs-4/packages/acs-subsite/lib/login.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/login.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/acs-subsite/lib/login.tcl	16 Oct 2003 21:09:45 -0000	1.16
+++ openacs-4/packages/acs-subsite/lib/login.tcl	17 Oct 2003 17:51:07 -0000	1.17
@@ -71,7 +71,8 @@
     set register_url [export_vars -no_empty -base $register_url { username email }]
 }
 
-ad_form -name login -html { style "margin: 0px;" } -show_required_p 0 -edit_buttons { { "Login" ok } } -action "/register/" -form {
+set login_button [list [list [_ acs-subsite.Log_In] ok]]
+ad_form -name login -html { style "margin: 0px;" } -show_required_p 0 -edit_buttons $login_button -action "/register/" -form {
     {return_url:text(hidden)}
     {time:text(hidden)}
     {token_id:text(hidden)}
@@ -85,7 +86,7 @@
 
 set focus {}
 if { [auth::UseEmailForLoginP] } {
-    ad_form -extend -name login -form [list [list email:text($username_widget),nospell [list label "Email"]]]
+    ad_form -extend -name login -form [list [list email:text($username_widget),nospell [list label [_ acs-subsite.Email]]]]
     set user_id_widget_name email
     if { ![empty_string_p $email] } {
         set focus "password"
@@ -96,13 +97,13 @@
     if { [llength $authority_options] > 1 } {
         ad_form -extend -name login -form {
             {authority_id:integer(select) 
-                {label "Authority"} 
+                {label "[_ acs-subsite.Authority]"} 
                 {options $authority_options}
             }
         }
     }
 
-    ad_form -extend -name login -form [list [list username:text($username_widget),nospell [list label "Username"]]]
+    ad_form -extend -name login -form [list [list username:text($username_widget),nospell [list label [_ acs-subsite.Username]]]]
     set user_id_widget_name username
     if { ![empty_string_p $username] } {
         set focus "password"
@@ -114,19 +115,21 @@
 
 ad_form -extend -name login -form {
     {password:text(password) 
-        {label "Password"}
+        {label "[_ acs-subsite.Password]"}
     }
 }
 
+set options_list [list [list [_ acs-subsite.Remember_my_login] "t"]]
 if { $allow_persistent_login_p } {
     ad_form -extend -name login -form {
         {persistent_p:text(checkbox),optional
             {label ""}
-            {options { { "Remember my login on this computer" "t" } }}
+            {options $options_list}
         }
     }
 }
 
+set expired_message [list [list message [_ acs-subsite.Login_has_expired]]]
 ad_form -extend -name login -on_request {
     # Populate fields from local vars
 
@@ -150,7 +153,7 @@
     
     if { [string compare $hash $computed_hash] != 0 || \
              $time < [ns_time] - [ad_parameter -package_id [ad_acs_kernel_id] LoginExpirationTime security 600] } {
-        ad_returnredirect [export_vars -base [ad_conn url] { { message "The login page has expired. Please log in again." } }]
+        ad_returnredirect [export_vars -base [ad_conn url] $expired_message]
         ad_script_abort
     }
 
Index: openacs-4/packages/acs-subsite/lib/services.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/Attic/services.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/lib/services.tcl	8 Oct 2003 07:32:42 -0000	1.1
+++ openacs-4/packages/acs-subsite/lib/services.tcl	17 Oct 2003 17:51:07 -0000	1.2
@@ -3,10 +3,10 @@
 list::create \
     -name services \
     -multirow services \
-    -no_data "No services" \
+    -no_data "[_ acs-subsite.No_services]" \
     -elements {
         instance_name {
-            label "Name"
+            label "[_ acs-subsite.Name]"
             link_url_eval {$name/}
         }
     }
Index: openacs-4/packages/acs-subsite/lib/user-info.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/user-info.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-subsite/lib/user-info.tcl	7 Oct 2003 13:24:20 -0000	1.10
+++ openacs-4/packages/acs-subsite/lib/user-info.tcl	17 Oct 2003 17:51:07 -0000	1.11
@@ -62,7 +62,7 @@
     ad_form -extend -name user_info -form {
         {authority_id:text(select)
             {mode $elm_mode(authority_id)}
-            {label "Authority"}
+            {label "[_ acs-subsite.Authority]"}
             {options {[auth::authority::get_authority_options]}}
         }
     }
@@ -71,7 +71,7 @@
      ([acs_user::site_wide_admin_p] && [llength [auth::authority::get_authority_options]] > 1) } {
     ad_form -extend -name user_info -form {
         {username:text(text)
-            {label "Username"}
+            {label "[_ acs-subsite.Username]"}
             {mode $elm_mode(username)}
         }
     }
@@ -82,17 +82,17 @@
 
 ad_form -extend -name user_info -form {
     {first_names:text
-        {label "First names"}
+        {label "[_ acs-subsite.First_names]"}
         {html {size 50}}
         {mode $elm_mode(first_names)}
     }
     {last_name:text
-        {label "Last Name"}
+        {label "[_ acs-subsite.Last_name]"}
         {html {size 50}}
         {mode $elm_mode(last_name)}
     }
     {email:text
-        {label "Email"}
+        {label "[_ acs-subsite.Email]"}
         {html {size 50}}
         {mode $elm_mode(email)}
     }
@@ -102,7 +102,7 @@
     ad_form -extend -name user_info -form \
         [list \
              [list screen_name:text[ad_decode [acs_user::ScreenName] "solicit" ",optional" ""] \
-                  {label "Screen name"} \
+                  {label "[_ acs-subsite.Screen_name]"} \
                   {html {size 50}} \
                   {mode $elm_mode(screen_name)} \
                  ]]
@@ -111,12 +111,12 @@
 
 ad_form -extend -name user_info -form {
     {url:text,optional
-        {label "Home Page"}
+        {label "[_ acs-subsite.Home_page]"}
         {html {size 50}}
         {mode $elm_mode(url)}
     }
     {bio:text(textarea),optional
-        {label "About yourself"}
+        {label "[_ acs-subsite.About_You]"}
         {html {rows 8 cols 60}}
         {mode $elm_mode(bio)}
         {display_value {[ad_text_to_html -- $user(bio)]}}
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 -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/permissions/grant.adp	17 Oct 2003 09:19:31 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/permissions/grant.adp	17 Oct 2003 17:51:07 -0000	1.6
@@ -9,7 +9,7 @@
 
 <table>
   <tr valign="top">
-    <td>#acs-subsite.Grant_1# </td>
+    <td>#acs-subsite.Grant#: </td>
 
     <td>&nbsp;</td>