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.23 -r1.23.2.1
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml	14 Mar 2005 00:41:34 -0000	1.23
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml	2 Aug 2005 18:16:44 -0000	1.23.2.1
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-subsite" package_version="5.2.0d2" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="acs-subsite" package_version="5.2.0a2" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="_or"> oder</msg>
   <msg key="_Update_Basic_Information">Die Allgemeinen Informationen aktualisieren</msg>
@@ -14,8 +14,14 @@
   <msg key="Account_reopened_message">Ihr Benutzerkonto wurde wieder aktiviert. Willkommen bei %system_name%.</msg>
   <msg key="Account_reopened_title">Benutzerkonto wieder aktiviert</msg>
   <msg key="Action">Aktion</msg>
+  <msg key="Add">Hinzuf�gen</msg>
+  <msg key="add_folder">Ordner hinzuf�gen</msg>
   <msg key="Add_new_app">Neue Anwendung hinzuf�gen</msg>
+  <msg key="Add_this_user">Diesen User hinzuf�gen</msg>
+  <msg key="Add_User">User hinzuf�gen</msg>
+  <msg key="Add_users">User hinzuf�gen</msg>
   <msg key="Admin">Verwalten</msg>
+  <msg key="admin">Admin</msg>
   <msg key="Administer_subsite">%subsite_name% verwalten</msg>
   <msg key="Administrative_options">Verwaltungsoptionen f�r diesen Benutzer</msg>
   <msg key="Alert_Type">Art der Benachrichtigung</msg>
@@ -34,6 +40,7 @@
   <msg key="cannot_retrieve_password">Passwort zur�cksetzen durch lokale Authentifizierungsstelle nicht unterst�tzt</msg>
   <msg key="Cannot_see_memb_list">Liste der Teilnehmer verborgen</msg>
   <msg key="Change_locale_label">Sprache einstellen</msg>
+  <msg key="Change_my_email_P">�nderung meines e-Mail Privacy Levels</msg>
   <msg key="Change_my_Password">Passwort �ndern</msg>
   <msg key="Change_pass_email_por">Passwort, E-Mail-Adresse oder Bild �ndern</msg>
   <msg key="Check_Your_Inbox">�berp�fen Sie Ihr Postfach</msg>
@@ -51,6 +58,7 @@
   <msg key="Continue">Fortsetzen</msg>
   <msg key="Continue_to_your_account">Weiter nach %pvt_home_name%</msg>
   <msg key="Country_Name">Land</msg>
+  <msg key="create">Erstellen</msg>
   <msg key="Create_new_community">Neue %pretty_name% erstellen</msg>
   <msg key="Create_new_subsite">Neue Subsite erstellen</msg>
   <msg key="Current_Password">Aktuelles Passwort:</msg>
@@ -60,6 +68,7 @@
   <msg key="Database_Error">Datenbankfehler</msg>
   <msg key="default_context">Standardkontext</msg>
   <msg key="Delete">L�schen</msg>
+  <msg key="delete">l�schen</msg>
   <msg key="DevAdmin">Administration (Entwickler)</msg>
   <msg key="Developers_Admin">Administration auf Entwicklerebene</msg>
   <msg key="Direct_Permissions">Explizite Berechtigungen</msg>
@@ -70,9 +79,13 @@
   <msg key="edit_comment">Kommentar bearbeiten</msg>
   <msg key="Elements_not_editable">Einige Elemente k�nnen nicht bearbeitet werden, da sie von %authority_name% verwaltet werden.</msg>
   <msg key="Email">E-Mail-Adresse</msg>
+  <msg key="email_as_a_form">Zulassen, mich �ber ein Formular anzusprechen</msg>
+  <msg key="email_as_image">Meine e-Mail als Bild anzeigen</msg>
+  <msg key="email_as_text">Meine e-Mail als Text anzeigen</msg>
   <msg key="email_body_Forgotten_password">Hier sind Ihre neuen Anmeldedaten: %account_id_label%: %account_id% %password_label%: %password%. Bitte �ndern Sie Ihr Passwort unter folgendem Link: %reset_password_url%</msg>
   <msg key="email_body_Registration_password">Vielen Dank f�r Ihre Registrierung bei %system_name%. Mit folgenden Daten k�nnen Sie sich bei %system_url% anmelden: %account_id_label%: %account_id% %password_label%: %password% Bitte �ndern Sie Ihr Passwort unter folgendem Link: %reset_password_url%</msg>
   <msg key="Email_Confirmation">E-Mail-Adresse best�tigen:</msg>
+  <msg key="email_dont_show">Meine e-Mail nicht anzeigen</msg>
   <msg key="Email_not_Requested">E-Mail nicht angefordert</msg>
   <msg key="Email_required">Email-Adresse muss angegeben werden</msg>
   <msg key="email_subject_Forgotten_password">Ihr vergessenes Passwort f�r %system_name%</msg>
@@ -102,6 +115,7 @@
   <msg key="Home_page">Homepage</msg>
   <msg key="If_you_were_to">Wenn Sie sich anmelden </msg>
   <msg key="Information_Updated">Die Information wurde aktualisiert.</msg>
+  <msg key="Install_locales">Sprachen installieren</msg>
   <msg key="Invite">Einladen</msg>
   <msg key="ISO_Code">ISO-Code</msg>
   <msg key="ISO_Code_List">Liste der ISO-Codes</msg>
@@ -130,6 +144,7 @@
   <msg key="Logout">Abmelden</msg>
   <msg key="Logout_from_system">Von %system_name% abmelden</msg>
   <msg key="lt__youd_be_able_to_get">, werden Ihnen mehr Informationen �ber andere Teilnehmer Ihrer Gruppe angezeigt.</msg>
+  <msg key="lt_Add_checked_users_to_">Markierte User zu den Usern hinzuf�gen, die Zugriffsrechte auf das Objekt haben.</msg>
   <msg key="lt_Cannot_join_this_grou">Diese Gruppe kann nicht hinzugef�gt werden.</msg>
   <msg key="lt_Complete_List_of_ISO_">Vollst�ndige Liste der ISO-Codes</msg>
   <msg key="lt_Continue_working_with">Weiterarbeiten mit %system_name% </msg>
@@ -143,6 +158,8 @@
   <msg key="lt_If_you_dont_think_the">Wenn die Person noch kein Benutzerkonto hat:</msg>
   <msg key="lt_If_you_happen_to_know">Wenn die Person, die Sie einladen wollen, bereits ein Benutzerkonto auf diesem System hat:</msg>
   <msg key="lt_If_you_need_this_func">Wenn Sie diese Funktionalit�t nutzen wollen, laden Sie bitte acs-reference und ref-countries.</msg>
+  <msg key="lt_Inherit_from_parent_o">�bernehmen von $parent_object_name</msg>
+  <msg key="lt_Inherit_permissions_f">Zugriffsberechtigungen von $parent_object_name �bernehmen</msg>
   <msg key="lt_Inherited_Permissions">Vererbte Berechtigungen</msg>
   <msg key="lt_It_would_be_a_very_ba">Diese Option sollte nicht gew�hlt werden, wenn der Computer von mehreren Personen genutzt wird, etwa in einer Bibliothek oder einem universit�ren Rechenzentrum. Nachfolgende Benutzer k�nnen sonst unter Ihrer Identit�t auf den Dienst zugreifen.</msg>
   <msg key="lt_New_registration_at_s">Neue Registrierung bei %system_url%</msg>
@@ -220,6 +237,7 @@
   <msg key="Options">Optionen</msg>
   <msg key="Or_add_a_new_user">oder einen neuen Benutzer hinzuf�gen</msg>
   <msg key="or_the">oder das</msg>
+  <msg key="parameters">parameter</msg>
   <msg key="Password">Passwort</msg>
   <msg key="Password_changed_body">Das Passwort Ihres Benutzerkontos (%account_id_label%: %account_id%) bei %system_name% wurde k�rzlich ge�ndert. Es sind keine weiteren Schritte n�tig, diese Mitteilung dient lediglich Ihrer Sicherheit. --------------- Sie k�nnen Ihr Passwort jederzeit mit folgenden Schritten �ndern: 1. Melden Sie sich bei %system_name% an. 2. Klicken Sie auf den Link '%pvt_home_name%'. 3. W�hlen Sie die Option '%password_update_link_text%'.</msg>
   <msg key="Password_changed_subject">Passwort ge�ndert</msg>
@@ -233,6 +251,7 @@
   <msg key="Profile">Profil</msg>
   <msg key="Question">Frage:</msg>
   <msg key="Re_enable">Aktivieren</msg>
+  <msg key="read">Lesen</msg>
   <msg key="Recover_Password">Passwort zur�cksetzen</msg>
   <msg key="Refresh_login">Anmeldung aktualisieren</msg>
   <msg key="Register">Registrieren</msg>
@@ -241,6 +260,7 @@
   <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="rename">Umbenennen</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>
@@ -255,6 +275,7 @@
   <msg key="Select_an_Object_by_Id">W�hlen Sie mit Hilfe der ID ein Objekt aus:</msg>
   <msg key="Send_email_to_this_user">E-Mail an diesen Benutzer senden</msg>
   <msg key="Show">Anzeigen</msg>
+  <msg key="Site_Wide_Admin">System Administration</msg>
   <msg key="Site_wide_administration">Systemadministration</msg>
   <msg key="sorry_forgotten_pwd">Das Passwort kann nicht zur�ckgesetzt werden.</msg>
   <msg key="Status">Status</msg>
@@ -276,6 +297,7 @@
   <msg key="Topic">Thema</msg>
   <msg key="type_specific_info">Typspezifische Informationen:</msg>
   <msg key="Unknown_email">Email-Adresse unbekannt</msg>
+  <msg key="unmount">abh�ngen</msg>
   <msg key="UP">Eine Ebene nach oben</msg>
   <msg key="up_to_context_name">Eine Ebene h�her zu &quot;%context_name%&quot;</msg>
   <msg key="Update">Aktualisieren</msg>
@@ -293,6 +315,7 @@
   <msg key="When_leaving_checkbox_empty">Bereits erteilte Berechtigungen, die Sie hier nicht ausw�hlen, werden aufgehoben.</msg>
   <msg key="Whos_Online_link_label">Benutzer, die derzeit online sind</msg>
   <msg key="Whos_Online_title">Wer ist online?</msg>
+  <msg key="write">Schreiben</msg>
   <msg key="Yes_I_am_sure">Ja, l�schen</msg>
   <msg key="You_are_in_the_follow">Sie geh�ren folgenden Gruppen an:</msg>
   <msg key="You_can_also_browse_from">Weitere M�glichkeiten f�r die Navigation sind der</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.67.2.4 -r1.67.2.5
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	31 Jul 2005 08:15:20 -0000	1.67.2.4
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	2 Aug 2005 18:16:44 -0000	1.67.2.5
@@ -332,8 +332,8 @@
   <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="parameters">parameters</msg>
   <msg key="Parameters">Parameters</msg>
+  <msg key="parameters">parameters</msg>
   <msg key="Password">Password</msg>
   <msg key="Password_changed_body">Your login information on %system_name%:
 
Index: openacs-4/packages/acs-subsite/tcl/rel-types-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/rel-types-procs-oracle.xql,v
diff -u -r1.2 -r1.2.14.1
--- openacs-4/packages/acs-subsite/tcl/rel-types-procs-oracle.xql	20 Aug 2001 05:15:28 -0000	1.2
+++ openacs-4/packages/acs-subsite/tcl/rel-types-procs-oracle.xql	2 Aug 2005 18:16:44 -0000	1.2.14.1
@@ -45,5 +45,12 @@
 	    end;
 </querytext>
 </fullquery>
+
+<fullquery name="rel_types::create_role.create_role">
+<querytext>
+begin  acs_rel_type.create_role(:role, :pretty_name, :pretty_plural);
+end;
+</querytext>
+</fullquery>
  
 </queryset>
Index: openacs-4/packages/acs-subsite/tcl/rel-types-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/rel-types-procs-postgresql.xql,v
diff -u -r1.6 -r1.6.8.1
--- openacs-4/packages/acs-subsite/tcl/rel-types-procs-postgresql.xql	23 Sep 2003 17:33:22 -0000	1.6
+++ openacs-4/packages/acs-subsite/tcl/rel-types-procs-postgresql.xql	2 Aug 2005 18:16:44 -0000	1.6.8.1
@@ -70,4 +70,11 @@
 </querytext>
 </fullquery>
 
+<fullquery name="rel_types::create_role.create_role">
+<querytext>
+      select acs_rel_type__create_role(:role, :pretty_name, :pretty_plural)
+</querytext>
+</fullquery>
+
+
 </queryset>
Index: openacs-4/packages/acs-subsite/tcl/rel-types-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/rel-types-procs.tcl,v
diff -u -r1.6 -r1.6.8.1
--- openacs-4/packages/acs-subsite/tcl/rel-types-procs.tcl	25 Sep 2003 17:25:08 -0000	1.6
+++ openacs-4/packages/acs-subsite/tcl/rel-types-procs.tcl	2 Aug 2005 18:16:44 -0000	1.6.8.1
@@ -7,38 +7,33 @@
     @author mbryzek@arsdigita.com
     @creation-date Tue Dec 12 15:40:39 2000
     @cvs-id $Id$
-
 }
 
-
-ad_page_contract_filter rel_type_dynamic_p { name value } {
+ad_page_contract_filter rel_type_dynamic_p {name value} {
     Checks whether the value (assumed to be a string referring to a
-    relationship type) is a dynamic object type.
+			      relationship type) is a dynamic object type.
 
     @author Michael Bryzek (mbryzek@arsdigita.com)
     @creation-date 12/30/2000
-
 } {
-    if { [db_string rel_type_dynamic_p {
-	select case when exists (select 1 
-                                   from acs_object_types t
-                                  where t.dynamic_p = 't'
-                                    and t.object_type = :value)
-	            then 1 else 0 end
-	  from dual
-    }] } {
+    if {[db_string rel_type_dynamic_p {
+	select case when exists (select 1
+				 from acs_object_types t
+				 where t.dynamic_p = 't'
+				 and t.object_type = :value)
+	then 1 else 0 end
+	from dual}]} {
 	return 1
     }
     ad_complain "Specific rel type either does not exist or is not dynamic and thus cannot be modified"
     return 0
 }
 
-
 namespace eval rel_types {
 
-    ad_proc -public additional_rel_types_p { 
-	{ -group_id "" } 
-	{ -group_type "" }
+    ad_proc -public additional_rel_types_p {
+	{-group_id "" }
+	{-group_type "" }
     } {
 	Returns 1 if there is a relationship type not being used by
 	the specified group_id or group_type. Useful for deciding when
@@ -47,27 +42,27 @@
 
 	@author Michael Bryzek (mbryzek@arsdigita.com)
 	@creation-date 12/2000
-	
     } {
-	if { ![empty_string_p $group_id] } {
+	if {![empty_string_p $group_id]} {
 	    return [additional_rel_types_group_p $group_id]
-	} elseif { ![empty_string_p $group_type] } {
+	} elseif {![empty_string_p $group_type]} {
 	    return [additional_rel_types_group_type_p $group_type]
 	} else {
 	    error "rel_types::rel_types_p error: One of group_id or group_type must be specified"
 	}
     }
 
-    ad_proc -private additional_rel_types_group_p { group_id } {
+    ad_proc -private additional_rel_types_group_p {
+	group_id
+    } {
 	returns 1 if there is a rel type that is not defined as a
 	segment for this group
 
 	@author Michael Bryzek (mbryzek@arsdigita.com)
 	@creation-date 12/30/2000
-
     } {
 	return [db_string "group_rel_type_exists" "
-	     select case when exists (select 1 
+	     select case when exists (select 1
                                         from acs_object_types t
                                         where t.object_type not in (select g.rel_type
                                                                       from group_rels g
@@ -78,17 +73,17 @@
                from dual"]
     }
 
-
-    ad_proc -private additional_rel_types_group_type_p { group_type } {
+    ad_proc -private additional_rel_types_group_type_p {
+	group_type
+    } {
 	returns 1 if there is a rel type that is not defined as
 	allowable for the specified group_type.
 
 	@author Michael Bryzek (mbryzek@arsdigita.com)
 	@creation-date 12/30/2000
-
     } {
 	return [db_string "group_rel_type_exists" "
-	     select case when exists (select 1 
+	     select case when exists (select 1
                                         from acs_object_types t
                                         where t.object_type not in (select g.rel_type
                                                                       from group_type_rels g
@@ -99,89 +94,121 @@
                from dual"]
     }
 
-    
     ad_proc -public new {
-	{ -supertype "relationship" }
-	{ -role_one "" }
-	{ -role_two "" }
-	rel_type 
-	pretty_name 
-	pretty_plural 
-	object_type_one 
-	min_n_rels_one 
-	max_n_rels_one 
-	object_type_two 
-	min_n_rels_two 
+	{-supertype "relationship" }
+	{-role_one "" }
+	{-role_two "" }
+	{-table_name ""}
+	{-create_table_p "t"}
+	rel_type
+	pretty_name
+	pretty_plural
+	object_type_one
+	min_n_rels_one
+	max_n_rels_one
+	object_type_two
+	min_n_rels_two
 	max_n_rels_two
     } {
 	Creates a new relationship type named rel_type
-	
+
 	@author Michael Bryzek (mbryzek@arsdigita.com)
 	@creation-date 12/30/2000
-
     } {
-	
-	# use 29 chars to leave 1 character in the name for later dynamic views
-	set rel_type [plsql_utility::generate_oracle_name -max_length 29 $rel_type]
-	if { [plsql_utility::object_type_exists_p $rel_type] } {
+
+	# use 29 chars to leave 1 character in the name for later dynamic
+	# views
+
+	set rel_type [plsql_utility::generate_oracle_name \
+			  -max_length 29 $rel_type]
+	if {[plsql_utility::object_type_exists_p $rel_type]} {
 	    error "Specified relationship type, $rel_type, already exists (or another object of the same type exists)\n"
 	}
-	 
-	if { ![db_0or1row parent_rel_type {
+
+	if {![db_0or1row parent_rel_type {
 	    select table_name as references_table,
-	           id_column as references_column
-	      from acs_object_types
-	     where object_type=:supertype
-	}] } {
+	    id_column as references_column
+	    from acs_object_types
+	    where object_type=:supertype}]} {
 	    error "The specified supertype \"$supertype\" does not exist"
 	}
 
-	# use 29 chars to leave 1 character in the name for later dynamic views
-	set table_name [plsql_utility::generate_oracle_name -max_length 29 "${rel_type}_ext"]
+	# use 29 chars to leave 1 character in the name for later dynamic
+	# views
+
+	if {[empty_string_p $table_name]} {
+	    set table_name [plsql_utility::generate_oracle_name \
+				-max_length 29 "${rel_type}_ext"]
+	}
 	set package_name $rel_type
 
 	# We use rel_id for the primary key... since this is a relationship
+
 	set pk_constraint_name [plsql_utility::generate_constraint_name $table_name rel_id "pk"]
 	set fk_constraint_name [plsql_utility::generate_constraint_name $table_name rel_id "fk"]
-    
+
 	set plsql [list]
 
 	# Create the actual acs object type
+
 	lappend plsql_drop [list db_exec_plsql drop_type {FOO}]
 	lappend plsql [list db_exec_plsql create_type {FOO}]
-	
+
 	# Mark the type as dynamic
+
 	lappend plsql [list db_dml update_type {FOO}]
 	
-	foreach pair $plsql { 
+	# Force internationalisation of Roles
+	
+	# Internationalising of Attributes. This is done by storing the
+	# attribute with it's acs-lang key
+	
+	set message_key "rel_type_${rel_type}"
+
+	# Register the language keys
+	
+	lang::message::register en_US acs-translations $message_key $pretty_name
+	lang::message::register en_US acs-translations "${message_key}_plural" $pretty_plural
+	
+	# Replace the pretty_name and pretty_plural with the message key, so
+	# it is inserted correctly in the database
+	
+	set pretty_name "#acs-translations.${message_key}#"
+	set pretty_plural "#acs-translations.${message_key}_plural#"
+
+	foreach pair $plsql {
 	    eval [lindex $pair 0] [lindex $pair 1] [lindex $pair 2]
 	}
 
-	# The following create table statement commits the
-	# transaction. If it fails, we roll back what we've done
+	# The following create table statement commits the transaction. If it
+	# fails, we roll back what we've done
 
-	if { [catch {db_exec_plsql create_table "
-	create table $table_name (
-            rel_id constraint $fk_constraint_name
+	if {$create_table_p == "t"} {
+	    if {[catch {db_exec_plsql create_table "
+		create table $table_name (
+        	   rel_id constraint $fk_constraint_name
                    references $references_table ($references_column)
                    constraint $pk_constraint_name primary key
-	)"} errmsg] } {
-            # Roll back our work so for
-            for { set i [expr [llength $plsql_drop] - 1] } { $i >= 0 } { incr i -1 } {
-		set drop_pair [lindex $plsql_drop $i]
-		if { [catch {eval [lindex $drop_pair 0] [lindex $drop_pair 1] [lindex $drop_pair 2]} err_msg_2] } {
-		    append errmsg "\nAdditional error while trying to roll back: $err_msg_2"
-		    return -code error $errmsg
+		)"} errmsg]} {
+
+		# Roll back our work so for
+
+		for {set i [expr [llength $plsql_drop] - 1]} {$i >= 0} {incr i -1} {
+		    set drop_pair [lindex $plsql_drop $i]
+		    if {[catch {eval [lindex $drop_pair 0] [lindex $drop_pair 1] [lindex $drop_pair 2]} err_msg_2]} {
+			append errmsg "\nAdditional error while trying to roll back: $err_msg_2"
+			return -code error $errmsg
+		    }
 		}
+		return -code error $errmsg
 	    }
-	    return -code error $errmsg
-        }
+	}
 
-	# Finally, create the PL/SQL package. 
+	# Finally, create the PL/SQL package.
+
 	package_recreate_hierarchy $rel_type
 
 	return $rel_type
-    
     }
 
     ad_proc -public add_permissible {
@@ -207,6 +234,59 @@
 	} errmsg]} {
 	}
     }
-	
+
+    ad_proc -public create_role {
+	{-pretty_name:required}
+	{-pretty_plural:required}
+	{-role}
+    } {
+
+	Create a new Relationship Role
+
+	@author Malte Sussdorff (sussdorff@sussdorff.de)
+	@creation-date 2005-06-04
+
+	@param pretty_name
+
+	@param pretty_plural
+
+	@param role
+
+	@return 1 if successful
+    } {
+	if {![exists_and_not_null role]} {
+	    set role [util_text_to_url \
+			  -text $pretty_name \
+			  -replacement "_" \
+			  -existing_urls [db_list get_roles {}]]
+	}
+
+	set return_code 1
+
+	db_transaction {
+
+	    # Force internationalisation of Roles
+
+	    # Internationalising of Attributes. This is done by storing the
+	    # attribute with it's acs-lang key
+
+	    set message_key "role_${role}"
+
+	    # Register the language keys
+
+	    lang::message::register en_US acs-translations $message_key $pretty_name
+	    lang::message::register en_US acs-translations "${message_key}_plural" $pretty_plural
+
+	    # Replace the pretty_name and pretty_plural with the message key, so
+	    # it is inserted correctly in the database
+
+	    set pretty_name "#acs-translations.${message_key}#"
+	    set pretty_plural "#acs-translations.${message_key}_plural#"
+	    db_exec_plsql create_role {}
+	} on_error {
+	    set return_code 0
+	}
+	return $return_code
+    }
 }
 
Index: openacs-4/packages/acs-subsite/tcl/rel-types-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/rel-types-procs.xql,v
diff -u -r1.3 -r1.3.14.1
--- openacs-4/packages/acs-subsite/tcl/rel-types-procs.xql	20 Aug 2001 21:52:31 -0000	1.3
+++ openacs-4/packages/acs-subsite/tcl/rel-types-procs.xql	2 Aug 2005 18:16:44 -0000	1.3.14.1
@@ -34,5 +34,11 @@
 and rel_type= :rel_type
 </querytext>
 </fullquery>
+
+<fullquery name="rel_types::create_role.get_roles">
+<querytext>
+select role from acs_rel_roles
+</querytext>
+</fullquery>
  
 </queryset>
Index: openacs-4/packages/acs-subsite/www/permissions/perm-user-add-include.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/perm-user-add-include.tcl,v
diff -u -r1.5 -r1.5.6.1
--- openacs-4/packages/acs-subsite/www/permissions/perm-user-add-include.tcl	11 Dec 2003 21:39:56 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/permissions/perm-user-add-include.tcl	2 Aug 2005 18:16:44 -0000	1.5.6.1
@@ -24,24 +24,24 @@
     -key user_id \
     -page_size 20 \
     -page_query_name users_who_dont_have_any_permissions_paginator \
-    -no_data "There are no users who don't already have access to this object" \
+    -no_data "[_ acs-subsite.lt_There_are_no_users_wh]" \
     -bulk_action_export_vars { return_url object_id } \
     -bulk_actions [list \
-                       "Add users" "${perm_url}perm-user-add-2" "Add checked users to users who have permissions on your object." \
+                       "[_ acs-subsite.Add_users]" "${perm_url}perm-user-add-2" "[_ acs-subsite.lt_Add_checked_users_to_]" \
                       ]  \
     -elements {
         name {
-            label "Name"
+            label "[_ acs-subsite.Name]"
         }
         email {
-            label "Email"
+            label "[_ acs-subsite.Email]"
             link_url_eval {mailto:$email}
         }
         add {
-            label "Add"
+            label "[_ acs-subsite.Add]"
             link_url_col add_url
-            link_html { title "Add this user" }
-            display_template "Add"
+            link_html { title "[_ acs-subsite.Add_this_user]" }
+            display_template "[_ acs-subsite.Add]"
         }
     } -filters {
 	object_id {}
Index: openacs-4/packages/acs-subsite/www/permissions/perm-user-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/perm-user-add.tcl,v
diff -u -r1.2 -r1.2.8.1
--- openacs-4/packages/acs-subsite/www/permissions/perm-user-add.tcl	28 Aug 2003 09:41:41 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/permissions/perm-user-add.tcl	2 Aug 2005 18:16:44 -0000	1.2.8.1
@@ -4,6 +4,6 @@
     return_url
 }
 
-set context [list [list $return_url "Permissions"] "Add User"]
-set title "Add User"
+set context [list [list $return_url "Permissions"] "[_ acs-subsite.Add_User]"]
+set title "[_ acs-subsite.Add_User]"