Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.en_US.ISO-8859-1.xml,v
diff -u -r1.30 -r1.30.2.1
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.en_US.ISO-8859-1.xml	24 Mar 2005 18:37:03 -0000	1.30
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.en_US.ISO-8859-1.xml	19 Jul 2005 07:07:40 -0000	1.30.2.1
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.2.0d9" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.2.0a1" locale="en_US" charset="ISO-8859-1">
 
   <msg key="authentication_authority">Authority</msg>
   <description key="authentication_authority">The identifying label for an authentication server, such as an  LDAP or RADIUS server.</description>
@@ -77,6 +77,11 @@
   <msg key="common_view">view</msg>
   <msg key="common_Yes">Yes</msg>
   <msg key="common_yes">yes</msg>
+  <msg key="Email_Address">Email Address</msg>
+  <msg key="First_Names">First Names</msg>
+  <msg key="Group">Group</msg>
+  <msg key="Last_Name">Last Name</msg>
+  <msg key="lt_Administrator_Relatio">Administrator Relationship</msg>
   <msg key="Member_role_pretty_name">Member</msg>
   <msg key="member_role_pretty_name">member</msg>
   <msg key="Member_role_pretty_plural">Members</msg>
@@ -91,4 +96,9 @@
   <msg key="member_state_needs_approval">needs approval</msg>
   <msg key="member_state_Rejected">Rejected</msg>
   <msg key="member_state_rejected">rejected</msg>
+  <msg key="Membership_Relation">Membership Relation</msg>
+  <msg key="Party">Party</msg>
+  <msg key="Person">Person</msg>
+  <msg key="Unregistered_Visitor">Unregistered Visitor</msg>
+  <msg key="User">User</msg>
 </message_catalog>
Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-create.sql,v
diff -u -r1.33 -r1.33.2.1
--- openacs-4/packages/acs-kernel/sql/postgresql/acs-create.sql	21 Mar 2005 11:59:54 -0000	1.33
+++ openacs-4/packages/acs-kernel/sql/postgresql/acs-create.sql	19 Jul 2005 07:07:41 -0000	1.33.2.1
@@ -256,7 +256,7 @@
   insert into acs_objects
     (object_id, object_type, title)
   values
-    (0, ''user'', ''Unregistered Visitor'');
+    (0, ''user'', ''#acs-kernel.Unregistered_Visitor#'');
 
   insert into parties
     (party_id)
@@ -266,7 +266,7 @@
   insert into persons
     (person_id, first_names, last_name)
   values
-    (0, ''Unregistered'', ''Visitor'');
+    (0, ''#acs-kernel.Unregistered#'', ''#acs-kernel.Visitor#'');
 
   insert into users
     (user_id, username)
@@ -286,7 +286,7 @@
     null,
     null,
     null,
-    ''The Public'',
+    ''#acs-kernel.The_Public#'',
     ''closed'',
     null
   );
@@ -333,7 +333,7 @@
     null,
     null,
     null,
-    ''Registered Users'',
+    ''#acs-kernel.Registered_Users#'',
     ''closed'',
     null
   );
@@ -388,7 +388,7 @@
     null,              -- authority_id
     null,              -- object_type
     'local',           -- short_name
-    'OpenACS Local',   -- pretty_name 
+    '#acs-kernel.OpenACS_Local#',   -- pretty_name 
     't',               -- enabled_p
     1,                 -- sort_order
     null,              -- auth_impl_id
Index: openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql,v
diff -u -r1.21 -r1.21.2.1
--- openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql	18 Jun 2004 18:21:57 -0000	1.21
+++ openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql	19 Jul 2005 07:07:41 -0000	1.21.2.1
@@ -124,12 +124,12 @@
  -- 
  PERFORM acs_object_type__create_type (
    ''party'',
-   ''Party'',
-   ''Parties'',
+   ''#acs-kernel.Party#'',
+   ''#acs-kernel.Parties#'',
    ''acs_object'',
    ''parties'',
    ''party_id'',
-   ''party'',
+    ''party'',
    ''f'',
    null,
    ''party.name''
@@ -139,8 +139,8 @@
 	''party'',
 	''email'',
 	''string'',
-	''Email Address'',
-	''Email Addresses'',
+	''#acs-kernel.Email_Address#'',
+	''#acs-kernel.Email_Addresses#'',
 	null,
 	null,
 	null,
@@ -155,8 +155,8 @@
 	''party'',
 	''url'',
 	''string'',
-	''URL'',
-	''URLs'',
+	''#acs-kernel.URL#'',
+	''#acs-kernel.URLs#'',
 	null,
 	null,
 	null,
@@ -172,8 +172,8 @@
  --
  attr_id := acs_object_type__create_type (
    ''person'',
-   ''Person'',
-   ''People'',
+   ''#acs-kernel.Person#'',
+   ''#acs-kernel.People#'',
    ''party'',
    ''persons'',
    ''person_id'',
@@ -187,8 +187,8 @@
         ''person'',
         ''first_names'',
         ''string'',
-        ''First Names'',
-        ''First Names'',
+        ''#acs-kernel.First_Names#'',
+        ''#acs-kernel.First_Names#'',
         null,
         null,
         null,
@@ -203,8 +203,8 @@
         ''person'',
         ''last_name'',
         ''string'',
-        ''Last Name'',
-        ''Last Names'',
+        ''#acs-kernel.Last_Name#'',
+        ''#acs-kernel.Last_Names#'',
         null,
         null,
         null,
@@ -219,8 +219,8 @@
  --
  attr_id := acs_object_type__create_type (
    ''user'',
-   ''User'',
-   ''Users'',
+   ''#acs-kernel.User#'',
+   ''#acs-kernel.Users#'',
    ''person'',
    ''users'',
    ''user_id'',
Index: openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql,v
diff -u -r1.19.2.1 -r1.19.2.2
--- openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql	24 May 2005 02:21:02 -0000	1.19.2.1
+++ openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql	19 Jul 2005 07:07:41 -0000	1.19.2.2
@@ -32,7 +32,7 @@
                         primary key,
         -- null means waiting for admin approval
         member_state    varchar(20) constraint membership_rel_mem_ck
-                        check (member_state in ('merged','approved', 'needs approval',
+                        check (member_state in ('merged', 'approved', 'needs approval',
                                               'banned', 'rejected', 'deleted'))
 );
 
@@ -54,8 +54,8 @@
  --
  attr_id := acs_object_type__create_type (
    ''group'',
-   ''Group'',
-   ''Groups'',
+   ''#acs-kernel.Group#'',
+   ''#acs-kernel.Groups#'',
    ''party'',
    ''groups'',
    ''group_id'',
@@ -69,8 +69,8 @@
 	''group'',
 	''group_name'',
 	''string'',
-	''Group name'',
-	''Group names'',
+	''#acs-kernel.Group_name#'',
+	''#acs-kernel.Group_names#'',
 	null,
 	null,
 	null,
@@ -113,8 +113,8 @@
 
  attr_id := acs_rel_type__create_type (
    ''membership_rel'',                 -- rel_type
-   ''Membership Relation'',            -- pretty_name
-   ''Membership Relationships'',       -- pretty_plural
+   ''#acs-kernel.Membership_Relation#'',            -- pretty_name
+   ''#acs-kernel.lt_Membership_Relationsh#'',       -- pretty_plural
    ''relationship'',                   -- supertype
    ''membership_rels'',                -- table_name
    ''rel_id'',                         -- id_column
@@ -132,12 +132,12 @@
  --
  -- Administrator Relationship
  --
- attr_id := acs_rel_type__create_role (''admin'', ''Administrator'', ''Administrators'');
+ attr_id := acs_rel_type__create_role (''admin'', ''#acs-kernel.Administrator#'', ''#acs-kernel.Administrators#'');
 
  attr_id := acs_rel_type__create_type (
    ''admin_rel'',                      -- rel_type
-   ''Administrator Relation'',         -- pretty_name
-   ''Administrator Relationships'',    -- pretty_plural
+   ''#acs-kernel.lt_Administrator_Relatio#'',         -- pretty_name
+   ''#acs-kernel.lt_Administrator_Relatio_1#'',    -- pretty_plural
    ''membership_rel'',                 -- supertype
    ''admin_rels'',                     -- table_name
    ''rel_id'',                         -- id_column