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.44 -r1.44.2.1
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	3 Nov 2003 09:53:16 -0000	1.44
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	25 Nov 2003 01:46:35 -0000	1.44.2.1
@@ -28,6 +28,9 @@
   <msg key="Action">Action</msg>
   <msg key="Add_new_app">Add new application</msg>
   <msg key="Admin">Admin</msg>
+  <msg key="Subsites">Subsites</msg>
+  <msg key="subsites">subsites</msg>
+  <msg key="subsite">subsite</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>
@@ -62,13 +65,10 @@
   </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="Create_new_subsite">Create new subsite</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>
@@ -135,14 +135,14 @@
   <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_subsite">Join subsite</msg>
   <msg key="Join_group_name">Join %group_name%</msg>
-  <msg key="Join_this_community">Join this community</msg>
+  <msg key="Join_this_subsite">Join this subsite</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="Leave_this_subsite">Leave this subsite</msg>
+  <msg key="Leave_subsite">Leave subsite</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>
@@ -297,7 +297,7 @@
   <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="Req_membership_subs">Request membership of this subsite</msg>
   <msg key="Request_membership">Request membership</msg>
   <msg key="return_to_application">return to application</msg>
   <msg key="Revoke_Checked">Revoke Checked</msg>
@@ -314,9 +314,6 @@
   <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>
Index: openacs-4/packages/acs-subsite/lib/subsites.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/subsites.adp,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/acs-subsite/lib/subsites.adp	12 Oct 2003 19:50:30 -0000	1.3
+++ openacs-4/packages/acs-subsite/lib/subsites.adp	25 Nov 2003 01:46:35 -0000	1.3.2.1
@@ -1,5 +1,5 @@
 <p><listtemplate name="subsites"></listtemplate></p>
 
 <if @add_url@ not nil>
-  <p> <b>&raquo;</b> <a href="@add_url@">#acs-subsite.Create_new_community#</a> </p>
+  <p> <b>&raquo;</b> <a href="@add_url@">#acs-subsite.Create_new_subsite#</a> </p>
 </if>
Index: openacs-4/packages/acs-subsite/lib/subsites.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/subsites.tcl,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/acs-subsite/lib/subsites.tcl	28 Oct 2003 13:33:47 -0000	1.7
+++ openacs-4/packages/acs-subsite/lib/subsites.tcl	25 Nov 2003 01:46:35 -0000	1.7.2.1
@@ -1,10 +1,5 @@
-if { [string equal [ad_conn package_url] "/"] } {
-    set pretty_name [_ acs-subsite.community]
-    set pretty_plural [_ acs-subsite.communities]
-} else {
-    set pretty_name [_ acs-subsite.subcommunity]
-    set pretty_plural [_ acs-subsite.subcommunities]
-}
+set pretty_name [_ acs-subsite.subsite]
+set pretty_plural [_ acs-subsite.subsites]
 
 set admin_p [permission::permission_p -object_id [ad_conn package_id] -privilege admin -party_id [ad_conn untrusted_user_id]]
 if { $admin_p } {
Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl,v
diff -u -r1.17.2.1 -r1.17.2.2
--- openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	20 Nov 2003 20:28:28 -0000	1.17.2.1
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	25 Nov 2003 01:46:35 -0000	1.17.2.2
@@ -641,7 +641,7 @@
 } {
     set master_template_options [list]
     lappend master_template_options [list "Default" "/www/default-master"]
-    lappend master_template_options [list "Community" "/packages/acs-subsite/www/group-master"]
+    lappend master_template_options [list "Subsite" "/packages/acs-subsite/www/group-master"]
     set current_master [parameter::get -parameter DefaultMaster -package_id [ad_conn subsite_id]]
     set found_p 0
     foreach elm $master_template_options {
Index: openacs-4/packages/acs-subsite/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/index.adp,v
diff -u -r1.16 -r1.16.2.1
--- openacs-4/packages/acs-subsite/www/index.adp	12 Oct 2003 19:50:30 -0000	1.16
+++ openacs-4/packages/acs-subsite/www/index.adp	25 Nov 2003 01:46:35 -0000	1.16.2.1
@@ -6,17 +6,17 @@
     <if @main_site_p@ false>  
       <if @group_member_p@ true>
         <span class="button"><a href="group-leave" class="button"
-          title="#acs-subsite.Leave_this_community#">#acs-subsite.Leave_community#</a></span>
+          title="#acs-subsite.Leave_this_subsite#">#acs-subsite.Leave_subsite#</a></span>
       </if>
       <else>
         <if @can_join_p@ true>
           <if @group_join_policy@ eq "open">
             <a href="register/user-join" class="button"
-              title="#acs-subsite.Join_this_community">#acs-subsite.Join_community#</a>
+              title="#acs-subsite.Join_this_subsite">#acs-subsite.Join_subsite#</a>
           </if>
           <else>
             <a href="register/user-join" class="button"
-              title="#acs-subsite.Req_membership_comm#">#acs-subsite.Request_membership#</a>
+              title="#acs-subsite.Req_membership_subs#">#acs-subsite.Request_membership#</a>
           </else>
         </if>
       </else>
@@ -34,7 +34,7 @@
       <include src="/packages/acs-subsite/lib/applications">
     </td>
     <td valign="top">
-      <h2>@communities_label@</h2>
+      <h2>#acs-subsite.Subsites#</h2>
       <include src="/packages/acs-subsite/lib/subsites">
     </td>
   </tr>
Index: openacs-4/packages/acs-subsite/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/index.tcl,v
diff -u -r1.16 -r1.16.2.1
--- openacs-4/packages/acs-subsite/www/index.tcl	16 Oct 2003 20:45:43 -0000	1.16
+++ openacs-4/packages/acs-subsite/www/index.tcl	25 Nov 2003 01:46:35 -0000	1.16.2.1
@@ -55,5 +55,3 @@
 
 set can_join_p [expr !$group_admin_p && $group_member_p == 0 && $user_id != 0 && ![string equal $group_join_policy "closed"]]
 
-set communities_label [ad_decode $main_site_p 1 "[_ acs-subsite.Communities]" \
-	"[_ acs-subsite.Subcommunities]"]
Index: openacs-4/packages/acs-subsite/www/admin/configure.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/configure.tcl,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/acs-subsite/www/admin/configure.tcl	16 Oct 2003 20:24:57 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/configure.tcl	25 Nov 2003 01:46:36 -0000	1.7.2.1
@@ -11,16 +11,14 @@
 set context [list "Configuration"]
 
 
-# TODO: Add join policy
-
 ad_form -name name -cancel_url [ad_conn url] -mode display -form {
     {instance_name:text
         {label "Subsite name"}
         {html {size 50}}
     }
     {master_template:text(select)
         {label "Template"}
-        {help_text "Choose the layout and navigation you want for your community."}
+        {help_text "Choose the layout and navigation you want for your subsite."}
         {options [subsite::get_template_options]}
     }
     {visibility:text(select)
Index: openacs-4/packages/acs-subsite/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/index.adp,v
diff -u -r1.19 -r1.19.2.1
--- openacs-4/packages/acs-subsite/www/admin/index.adp	10 Nov 2003 13:58:22 -0000	1.19
+++ openacs-4/packages/acs-subsite/www/admin/index.adp	25 Nov 2003 01:46:36 -0000	1.19.2.1
@@ -7,7 +7,7 @@
   <li><a href="permissions">Permissions</a>
   <li><a href="../members/">Members</a>
   <li><a href="../shared/parameters">Parameters</a>
-  <li><a href="subsite-add">Create new @subsite_label@</a>
+  <li><a href="subsite-add">Create new subsite</a>
 </ul>
 
 <h2>Advanced Features</h2>
Index: openacs-4/packages/acs-subsite/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/index.tcl,v
diff -u -r1.11 -r1.11.2.1
--- openacs-4/packages/acs-subsite/www/admin/index.tcl	2 Oct 2003 22:15:49 -0000	1.11
+++ openacs-4/packages/acs-subsite/www/admin/index.tcl	25 Nov 2003 01:46:36 -0000	1.11.2.1
@@ -29,9 +29,4 @@
 
 set acs_lang_admin_url "[apm_package_url_from_key "acs-lang"]admin/"
 
-if { [string equal [ad_conn package_url] "/"] } {
-    set subsite_label "community"
-} else {
-    set subsite_label "subcommunity"
-}
 
Index: openacs-4/packages/acs-subsite/www/admin/subsite-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/subsite-add.tcl,v
diff -u -r1.7.2.1 -r1.7.2.2
--- openacs-4/packages/acs-subsite/www/admin/subsite-add.tcl	15 Nov 2003 22:31:15 -0000	1.7.2.1
+++ openacs-4/packages/acs-subsite/www/admin/subsite-add.tcl	25 Nov 2003 01:46:36 -0000	1.7.2.2
@@ -1,5 +1,5 @@
 ad_page_contract {
-    Create and mount a new Subsite/Community.
+    Create and mount a new Subsite
 
     @author Steffen Tiedemann Christensen (steffen@christensen.name)
     @creation-date 2003-09-26
@@ -9,21 +9,17 @@
 
 auth::require_login
 
-if { [string equal [ad_conn package_url] "/"] } {
-    set page_title "New community"
-    set subsite_pretty_name "Community name"
-} else {
-    set page_title "New subcommunity"
-    set subsite_pretty_name "Subcommunity name"
-}
+set page_title "New subsite"
+set subsite_pretty_name "Subsite name"
+
 set context [list $page_title]
 
 
 ad_form -name subsite -cancel_url . -form {
     {node_id:key}
     {instance_name:text
         {label $subsite_pretty_name}
-        {help_text "The name of the new community you're setting up."}
+        {help_text "The name of the new subsite you're setting up."}
         {html {size 30}}
     }
     {folder:url_element(text),optional
@@ -33,7 +29,7 @@
     }
     {master_template:text(select)
         {label "Template"}
-        {help_text "Choose the layout and navigation you want for your community."}
+        {help_text "Choose the layout and navigation you want for your subsite."}
         {options [subsite::get_template_options]}
     }
     {visibility:text(select)
@@ -81,7 +77,7 @@
         }
         
     } on_error {
-        ad_return_error "Problem Creating Application" "We had a problem creating the community."
+        ad_return_error "Problem Creating Application" "We had a problem creating the subsite."
     }
 } -after_submit {
     ad_returnredirect ../$folder
Index: openacs-4/packages/acs-subsite/www/members/member-invite.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/member-invite.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/acs-subsite/www/members/member-invite.tcl	10 Nov 2003 12:36:20 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/members/member-invite.tcl	25 Nov 2003 01:46:36 -0000	1.3.2.1
@@ -69,7 +69,7 @@
                 -user_id $user_id \
                 -rel_type $rel_type
         } {
-            form set_error user_serach user_id "Error adding user to community: $errmsg"
+            form set_error user_search user_id "Error adding user to community: $errmsg"
             global errorInfo
             ns_log Error "Error adding user $user_id to community group $group_id: $errmsg\n$errorInfo"
             break