Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml,v
diff -u -r1.20.2.2 -r1.20.2.3
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml	14 Oct 2004 03:21:13 -0000	1.20.2.2
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml	28 Oct 2004 15:39:37 -0000	1.20.2.3
@@ -227,6 +227,7 @@
   <msg key="Reject">Ablehnen</msg>
   <msg key="Remember_my_login">Anmeldedaten auf diesem Computer speichern</msg>
   <msg key="Remove">Entfernen</msg>
+  <msg key="Remove_All">Alle Entfernen</msg>
   <msg key="Req_membership_comm">Zugang zu dieser Gruppe beantragen</msg>
   <msg key="Req_membership_subs">Mitgliedschaft f�r diese Subsite beantragen</msg>
   <msg key="Request_membership">Zugang beantragen</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 -r1.51.2.5 -r1.51.2.6
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	14 Oct 2004 03:21:13 -0000	1.51.2.5
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	28 Oct 2004 15:39:37 -0000	1.51.2.6
@@ -311,6 +311,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="Remove">Remove_All</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>
Index: openacs-4/packages/acs-subsite/www/permissions/grant.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/grant.tcl,v
diff -u -r1.12 -r1.12.2.1
--- openacs-4/packages/acs-subsite/www/permissions/grant.tcl	12 Mar 2004 13:45:27 -0000	1.12
+++ openacs-4/packages/acs-subsite/www/permissions/grant.tcl	28 Oct 2004 15:39:36 -0000	1.12.2.1
@@ -9,6 +9,7 @@
     object_id:integer,notnull
     privileges:multiple,optional
     {application_url ""}
+    {return_url ""}
 }
 
 ad_require_permission $object_id admin
@@ -107,12 +108,12 @@
     lappend select_list [list "[string repeat "&nbsp;&nbsp;&nbsp;" $level] $privilege" $privilege]
 }
 
-form create grant
+ad_form -name grant -export {return_url} -form {
+    {object_id:text(hidden)
+        {value $object_id}
+    }
+}
 
-element create grant object_id \
-    -widget hidden \
-    -value $object_id
-
 element create grant application_url \
     -widget hidden \
     -value $application_url \
@@ -160,6 +161,11 @@
         }
     }
     
-    ad_returnredirect "one?[export_vars [list object_id application_url]]"
+    if {[exists_and_not_null return_url]} {
+        ad_returnredirect "$return_url"
+    } else {
+        ad_returnredirect "one?[export_vars [list object_id application_url]]"
+    }
+
     ad_script_abort
 }
Index: openacs-4/packages/acs-subsite/www/permissions/perm-include.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/perm-include.adp,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/acs-subsite/www/permissions/perm-include.adp	31 Aug 2003 12:51:23 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/permissions/perm-include.adp	28 Oct 2004 15:39:36 -0000	1.3.4.1
@@ -4,7 +4,7 @@
     <listtemplate name="permissions"></listtemplate>
   </p>
   <p>
-    <input type="submit" value="Save changes">
+    <input type="submit" value="#acs-subsite.Confirm#">
   </p>
 </form>
 
Index: openacs-4/packages/acs-subsite/www/permissions/perm-include.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/perm-include.tcl,v
diff -u -r1.4 -r1.4.4.1
--- openacs-4/packages/acs-subsite/www/permissions/perm-include.tcl	16 Oct 2003 21:33:32 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/permissions/perm-include.tcl	28 Oct 2004 15:39:36 -0000	1.4.4.1
@@ -20,7 +20,7 @@
 
 set elements [list]
 lappend elements grantee_name { 
-    label "Name" 
+    label "[_ acs-subsite.Name]" 
     link_url_col name_url
     display_template {
         <if @permissions.any_perm_p_@ true>
@@ -57,7 +57,7 @@
 # Remove all
 lappend elements remove_all {
     html { align center } 
-    label "Remove All"
+    label "[_ acs-subsite.Remove_All]"
     display_template {<input type="checkbox" name="perm" value="@permissions.grantee_id@,remove">}
 }
 
@@ -71,8 +71,9 @@
 set user_add_url [export_vars -base $user_add_url { object_id expanded {return_url "[ad_return_url]"}}]
 
 
-set actions [list "Add user" $user_add_url "Grant permissions to a new user"]
-
+set actions [list "[_ acs-subsite.Grant_Permission]" "${perm_url}grant?[export_vars {return_url application_url object_id}]" "[_ acs-subsite.Grant_Permission]" \
+				"[_ acs-subsite.Search_For_Exist_User]" $user_add_url "[_ acs-subsite.Search_For_Exist_User]"]
+				
 if { ![empty_string_p $context_id] } {
     set inherit_p [permission::inherit_p -object_id $object_id]