Index: openacs-4/packages/dotlrn/catalog/dotlrn.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.de_DE.ISO-8859-1.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/catalog/dotlrn.de_DE.ISO-8859-1.xml	4 Dec 2002 09:51:03 -0000	1.3
+++ openacs-4/packages/dotlrn/catalog/dotlrn.de_DE.ISO-8859-1.xml	11 Dec 2002 13:53:51 -0000	1.4
@@ -7,7 +7,6 @@
   <msg key="Change_My_Password">Meine Kennwort �ndern</msg>
   <msg key="actions">Aktionen</msg>
   <msg key="admin_page_name">Einstellungen</msg>
-  <msg key="and">und</msg>
   <msg key="archived">Archivierte</msg>
   <msg key="class_instance_portal_pretty_name">Kurse</msg>
   <msg key="class_instances_pretty_name">Kurs</msg>
Index: openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	4 Dec 2002 09:51:03 -0000	1.7
+++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	11 Dec 2002 13:53:51 -0000	1.8
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- Generated by lang::catalog::export_package_to_files on 2002 December 02 18:06 -->
+<!-- Generated by lang::catalog::export_package_to_files on 2002 December 09 18:46 -->
 <message_catalog package_key="dotlrn" locale="en_US" charset="ISO-8859-1">
 
   <msg key="A_copy_of">A copy of</msg>
@@ -8,21 +8,29 @@
   <msg key="Access_level">Access level:</msg>
   <msg key="Action">Action</msg>
   <msg key="Actions">Actions</msg>
+  <msg key="actions">Actions</msg>
   <msg key="Active_Applets">Active Applets</msg>
   <msg key="Add">Add</msg>
-  <msg key="AddDrop_Memberships">Add/Drop Memberships</msg>
+  <msg key="add">add</msg>
   <msg key="Add_A_Member">Add A Member</msg>
-  <msg key="Add_A_User">Add A User</msg>
-  <msg key="Add_New_Members">Add New Members</msg>
-  <msg key="Add_Professor">Add Professor</msg>
-  <msg key="Add_User">Add User</msg>
-  <msg key="Add_Users_to_Group">Add Users to Group</msg>
   <msg key="Add_a_Professor">Add a Professor</msg>
   <msg key="Add_a_Professor_2">Add a Professor:</msg>
+  <msg key="Add_A_User">Add A User</msg>
   <msg key="Add_a_User">Add a User</msg>
+  <msg key="Add_New_Members">Add New Members</msg>
+  <msg key="Add_Professor">Add Professor</msg>
+  <msg key="add_selected_members">Add Selected Members</msg>
   <msg key="Add_to_group_">Add to group ...</msg>
+  <msg key="Add_User">Add User</msg>
   <msg key="Add_users_to">Add users to</msg>
+  <msg key="Add_Users_to_Group">Add Users to Group</msg>
+  <msg key="AddDrop_Memberships">Add/Drop Memberships</msg>
   <msg key="Admin">Admin</msg>
+  <msg key="admin">admin</msg>
+  <msg key="admin_page_name">Control Panel</msg>
+  <msg key="admin_pages_navbar_name">Admin</msg>
+  <msg key="admin_role_pretty_name">Administrator</msg>
+  <msg key="admin_role_pretty_plural">Administrators</msg>
   <msg key="Administer">Administer</msg>
   <msg key="Administrator">Administrator</msg>
   <msg key="Administrators">Administrators</msg>
@@ -33,27 +41,63 @@
   <msg key="Any">Any</msg>
   <msg key="Applets_to_Add">Applets To Add</msg>
   <msg key="Approve">Approve</msg>
-  <msg key="Archived">Archived</msg>
+  <msg key="approve">approve</msg>
+  <msg key="aqua">aqua</msg>
+  <msg key="archived">Archived</msg>
+  <msg key="archived_classes_and_communities">Archived %class_instances_pretty_plural% and %clubs_pretty_plural%</msg>
+  <msg key="archived_groups">Archived %groups_pretty_plural%</msg>
   <msg key="Are_you_sure">Are you sure?</msg>
+  <msg key="are_you_sure_you_want_to_send">Are you sure you want to send the following</msg>
+  <msg key="arhive_group_name">Archive group %group_name%</msg>
   <msg key="Ask_a_question">Ask a question:</msg>
+  <msg key="at">at</msg>
+  <msg key="bad_folder_id">bad folder id</msg>
+  <msg key="be_either">be either</msg>
   <msg key="Be_sure">Be sure</msg>
+  <msg key="be_the_header_line">be the header line:</msg>
   <msg key="Become_this_user">Become this user!</msg>
   <msg key="Biography">Biography:</msg>
+  <msg key="black">black</msg>
   <msg key="Black_None_chosen">Black (None chosen)</msg>
+  <msg key="blue">blue</msg>
   <msg key="Bulk_Upload">Bulk Upload</msg>
   <msg key="Bulk_Uploading">Bulk Uploading....</msg>
-  <msg key="CSV_File_Format">CSV File Format</msg>
+  <msg key="byte">byte</msg>
+  <msg key="bytes">bytes</msg>
+  <msg key="cannot_be_removed">cannot be removed</msg>
   <msg key="Change_Locale">Change Locale</msg>
   <msg key="Change_My_Password">Change My Password</msg>
+  <msg key="class_instance_portal_pretty_name">Classes</msg>
+  <msg key="class_instances_pretty_name">Class</msg>
+  <msg key="class_instances_pretty_plural">Classes</msg>
   <msg key="Class_Key">Class Key</msg>
+  <msg key="class_may_not_be_deleted">Error: A %subject% must have &lt;em&gt;no&lt;/em&gt; %class_instances% to be deleted</msg>
+  <msg key="class_memberships">%class_instances_pretty_name% Memberships</msg>
+  <msg key="class_name">%classes_pretty_name% Name</msg>
+  <msg key="class_name_header">%class_instances_pretty_name% Name</msg>
+  <msg key="class_page_calendar_title">Calendar</msg>
+  <msg key="class_page_file_storage_title">File Storage</msg>
+  <msg key="class_page_home_title">Class Home</msg>
   <msg key="Classes">Classes</msg>
+  <msg key="classes_pretty_name">Subject</msg>
+  <msg key="classes_pretty_plural">Subjects</msg>
   <msg key="Closed">Closed</msg>
+  <msg key="club_page_calendar_title">Calendar</msg>
+  <msg key="club_page_file_storage_title">File Storage</msg>
+  <msg key="club_page_home_title">Community Home</msg>
+  <msg key="club_page_people_title">People</msg>
+  <msg key="clubs_name_header">%clubs_pretty_name% Name</msg>
+  <msg key="clubs_pretty_name">Community</msg>
+  <msg key="clubs_pretty_plural">Communities</msg>
   <msg key="Communities">Communities</msg>
   <msg key="Community">Community</msg>
+  <msg key="community_header_name">%clubs_pretty_name% Name</msg>
   <msg key="Community_ID">Community ID</msg>
+  <msg key="Community_member">Community member</msg>
+  <msg key="community_memberships">%clubs_pretty_name% Memberships</msg>
+  <msg key="community_name_already_in_use">The name &lt;strong&gt;%community_key%&lt;/strong&gt; is already in use either by an active or archived group. \n Please go back and select a different name.</msg>
   <msg key="Community_Type">Community Type</msg>
   <msg key="Community_Types">Community Types</msg>
-  <msg key="Community_member">Community member</msg>
   <msg key="Communitys_Name">Community's Name</msg>
   <msg key="Configure_Element">Configure Element</msg>
   <msg key="Configure_name">Configure %name%</msg>
@@ -62,30 +106,70 @@
   <msg key="Confirm_Drop">Confirm Drop</msg>
   <msg key="Confirmation">Confirmation</msg>
   <msg key="Control_Panel">Control Panel</msg>
+  <msg key="control_panel">Control Panel</msg>
   <msg key="Copy">Copy</msg>
+  <msg key="couldnt_find_user_id">We couldn't find user #%user_id%; perhaps this person was deleted?</msg>
+  <msg key="course_admin_role_pretty_name">Course Administrator</msg>
+  <msg key="course_admin_role_pretty_plural">Course Administrators</msg>
+  <msg key="course_assistant_role_pretty_name">Course Assistant</msg>
+  <msg key="course_assistant_role_pretty_plural">Course Assistants</msg>
   <msg key="Create_A_New_User">Create A New User</msg>
   <msg key="Create_a_Web_Log">Create a Web Log</msg>
-  <msg key="Current">Current</msg>
+  <msg key="CSV_File_Format">CSV File Format</msg>
   <msg key="Customize_Layout">Customize Layout</msg>
+  <msg key="days_ago">days ago</msg>
   <msg key="Deactivate_">Deactivate ...</msg>
   <msg key="Deactivate_Users">Deactivate Users</msg>
   <msg key="Deactivated">Deactivated</msg>
   <msg key="Delete">Delete</msg>
   <msg key="Delete_Empty">Delete Empty</msg>
   <msg key="Department">Department</msg>
+  <msg key="department_must_be_empty_to_be_deleted">Error: %departments_pretty_name% must be empty to be deleted</msg>
+  <msg key="department_name">%departments_pretty_name% Name</msg>
+  <msg key="department_name_already_in_use">The name &lt;strong&gt;%department_pretty_name%&lt;/strong&gt; is already in use. \n Please select a different name.</msg>
+  <msg key="departments_pretty_name">Department</msg>
+  <msg key="departments_pretty_plural">Departments</msg>
+  <msg key="deregister">deregister</msg>
   <msg key="Description">Description</msg>
+  <msg key="description">Description</msg>
   <msg key="Description_1">Description:</msg>
   <msg key="Dont_Add">Don't Add</msg>
+  <msg key="dotLRN_Admin">dotLRN Admin</msg>
+  <msg key="dotlrn_admin_pretty_name">Site Wide Administration</msg>
+  <msg key="dotlrn_admin_rel_pretty_name">dotLRN Admin Community Membership</msg>
+  <msg key="dotlrn_admin_rel_pretty_plural">dotLRN Admin Community Memberships</msg>
+  <msg key="dotlrn_class_instance_description">e.g. 6.001</msg>
+  <msg key="dotlrn_class_instance_pretty_name">Class</msg>
+  <msg key="dotlrn_class_instance_pretty_plural">Classes</msg>
+  <msg key="dotlrn_club_description">e.g. Alumni</msg>
+  <msg key="dotlrn_club_pretty_name">Club</msg>
+  <msg key="dotlrn_club_pretty_plural">Clubs</msg>
+  <msg key="dotlrn_community_description">Communities - the base community type</msg>
+  <msg key="dotlrn_community_pretty_name">Community</msg>
+  <msg key="dotlrn_community_pretty_plural">Communities</msg>
+  <msg key="dotLRN_Information">dotLRN Information</msg>
+  <msg key="dotlrn_main_portlet_pretty_name">Groups</msg>
+  <msg key="dotlrn_member_rel_pretty_name">dotLRN Community Membership</msg>
+  <msg key="dotlrn_member_rel_pretty_plural">dotLRN Community Memberships</msg>
   <msg key="Download">Download</msg>
   <msg key="Drop">Drop</msg>
   <msg key="Drop_Membership">Drop Membership</msg>
   <msg key="Edit">Edit</msg>
+  <msg key="Edit_a_User">Edit a User</msg>
+  <msg key="edit_approved_email_servers">Edit Pre-approved Email Servers</msg>
+  <msg key="edit_message_and_hit_send">Edit the message below and hit &quot;Send Email&quot; to
+notify this user.</msg>
   <msg key="Edit_Properties">Edit Properties</msg>
+  <msg key="edit_subject">Edit</msg>
+  <msg key="edit_subject_properties">Edit %classes_pretty_name% properties.</msg>
   <msg key="Edit_Term">Edit Term</msg>
-  <msg key="Edit_a_User">Edit a User</msg>
+  <msg key="emacs_subject">Subject</msg>
   <msg key="Email">Email:</msg>
+  <msg key="email">E-mail</msg>
   <msg key="Email_1">Email</msg>
   <msg key="Email_Members">Email Members</msg>
+  <msg key="email_message">Message</msg>
+  <msg key="email_sent">email sent</msg>
   <msg key="End_Date">End Date</msg>
   <msg key="End_date">End date:</msg>
   <msg key="Error_sending_mail">Error sending mail</msg>
@@ -98,12 +182,17 @@
   <msg key="First_Name">First Name</msg>
   <msg key="First_Names">First Names</msg>
   <msg key="From">From</msg>
+  <msg key="fuchsia">fuchsia</msg>
   <msg key="Full">Full</msg>
   <msg key="Full_Access">Full Access</msg>
   <msg key="General_Information">General Information</msg>
   <msg key="General_Site_Help">General Site Help</msg>
+  <msg key="gray">gray</msg>
+  <msg key="green">green</msg>
+  <msg key="groups_icon">group's icon</msg>
   <msg key="Guest">Guest?</msg>
   <msg key="Guest_1">Guest?</msg>
+  <msg key="has_been_added_to">has been added to</msg>
   <msg key="Header_Alternate_Text">Header Alternate Text</msg>
   <msg key="Header_Font">Header Font</msg>
   <msg key="Header_Font_Color">Header Font Color</msg>
@@ -112,15 +201,21 @@
   <msg key="Header_Font_Sizes">Header Font Sizes</msg>
   <msg key="Header_Fonts">Header Fonts</msg>
   <msg key="Header_Icon_Alt_Text">Header Icon Alt text</msg>
+  <msg key="header_logo">Header Logo</msg>
   <msg key="Header_Logo_Alt_Text">Header Logo Alt Text</msg>
   <msg key="Header_Logo_Item_ID">Header Logo Item ID</msg>
+  <msg key="help">Help</msg>
   <msg key="ID">ID:</msg>
   <msg key="ID_1">ID</msg>
+  <msg key="instructor_role_pretty_name">Professor</msg>
+  <msg key="instructor_role_pretty_plural">Professors</msg>
   <msg key="Invalid">Invalid</msg>
+  <msg key="is_already_in_use">is already in use</msg>
+  <msg key="item">item</msg>
+  <msg key="items">items</msg>
   <msg key="Join">Join</msg>
   <msg key="Join_A_Group">Join A Group</msg>
   <msg key="Join_Policy">Join Policy</msg>
-  <msg key="Join_a">Join a</msg>
   <msg key="Key">Key</msg>
   <msg key="Large">Large</msg>
   <msg key="Last_Modified">Last Modified</msg>
@@ -129,254 +224,69 @@
   <msg key="Last_visit_over">Last visit over</msg>
   <msg key="Last_visit_under">Last visit under</msg>
   <msg key="Latest_post">Latest post:</msg>
+  <msg key="lime">lime</msg>
   <msg key="Limited">Limited</msg>
   <msg key="Limited_Access">Limited Access</msg>
-  <msg key="Mail_Failed">Mail Failed</msg>
-  <msg key="Manage">Manage</msg>
-  <msg key="Manage_Applets">Manage Applets</msg>
-  <msg key="Manage_Members">Manage Members</msg>
-  <msg key="Manage_Membership">Manage Membership</msg>
-  <msg key="Manage_Memberships">Manage Memberships</msg>
-  <msg key="Member">Member</msg>
-  <msg key="Member_state">Member state:</msg>
-  <msg key="Members">Members</msg>
-  <msg key="Members_of">Members of</msg>
-  <msg key="Membership_Requests">Membership Requests</msg>
-  <msg key="Memberships">Memberships</msg>
-  <msg key="Memberships_1">Memberships:</msg>
-  <msg key="Message">Message</msg>
-  <msg key="My_Communities">My Communities</msg>
-  <msg key="NA">N/A</msg>
-  <msg key="Name">Name</msg>
-  <msg key="Name__Email">Name / Email</msg>
-  <msg key="Needs_Approval">Needs Approval</msg>
-  <msg key="New">New</msg>
-  <msg key="New_Password">New Password:</msg>
-  <msg key="New_Term">New Term</msg>
-  <msg key="New_User">New User</msg>
-  <msg key="No">No</msg>
-  <msg key="No_Terms">No Terms</msg>
-  <msg key="No_Users">No Users</msg>
-  <msg key="No_archived">No archived</msg>
-  <msg key="No_classes">No classes</msg>
-  <msg key="No_dont_delete_it">No, don't delete it</msg>
-  <msg key="No_groups_to_add_to">No groups to add to</msg>
-  <msg key="No_user_found">No user found</msg>
-  <msg key="None">None</msg>
-  <msg key="Normal">Normal</msg>
-  <msg key="Not_Allowed">Not Allowed</msg>
-  <msg key="Note">Note:</msg>
-  <msg key="Nuke">Nuke</msg>
-  <msg key="Nuke_">Nuke ...</msg>
-  <msg key="Nuke_Users">Nuke Users</msg>
-  <msg key="Open">Open</msg>
-  <msg key="Or">Or</msg>
-  <msg key="Pending">Pending</msg>
-  <msg key="Pending_Approval">Pending Approval</msg>
-  <msg key="Personal_Options">Personal Options</msg>
-  <msg key="Personal_home_page">Personal home page:</msg>
-  <msg key="Portrait">Portrait:</msg>
-  <msg key="Post_to">Post to:</msg>
-  <msg key="Pretty_Name">Pretty Name</msg>
-  <msg key="Pretty_Plural">Pretty Plural</msg>
-  <msg key="Preview">Preview</msg>
-  <msg key="Public_Web_Log">Public Web Log</msg>
-  <msg key="Recipients_Email">Recipient's Email</msg>
-  <msg key="Recipients_Last_Name">Recipient's Last Name</msg>
-  <msg key="Referer">Referer</msg>
-  <msg key="Registration_date">Registration date:</msg>
-  <msg key="Reject">Reject</msg>
-  <msg key="Request_Membership">Request Membership</msg>
-  <msg key="Results">Results</msg>
-  <msg key="Return_URL">Return URL</msg>
-  <msg key="Role">Role</msg>
-  <msg key="Screen_name">Screen name:</msg>
-  <msg key="Search">Search</msg>
-  <msg key="Search_Text">Search Text:</msg>
-  <msg key="Search_Users">Search Users</msg>
-  <msg key="Send_Date">Send Date</msg>
-  <msg key="Shared_Files">Shared Files</msg>
-  <msg key="Site-wide_Admin">Site-wide Admin?</msg>
-  <msg key="Size">Size</msg>
-  <msg key="SloanSpace">SloanSpace</msg>
-  <msg key="Small">Small</msg>
-  <msg key="Sorry">Sorry!</msg>
-  <msg key="Spam_">Spam ...</msg>
-  <msg key="Spam_Community">Spam Community</msg>
-  <msg key="Spam_Users">Spam Users</msg>
-  <msg key="Start_Date">Start Date</msg>
-  <msg key="Start_date">Start date:</msg>
-  <msg key="Subject">Subject</msg>
-  <msg key="Template">Template</msg>
-  <msg key="Templates">Templates</msg>
-  <msg key="Term">Term</msg>
-  <msg key="Term_ID">Term ID</msg>
-  <msg key="Term_eg_Spring_Fall">Term (e.g. Spring, Fall)</msg>
-  <msg key="Terms">Terms</msg>
-  <msg key="The_name">The name</msg>
-  <msg key="To">To</msg>
-  <msg key="Type">Type</msg>
-  <msg key="Unknown_Term">Unknown Term</msg>
-  <msg key="Update_Password">Update Password</msg>
-  <msg key="User">User</msg>
-  <msg key="User_Admin_Page">User Admin Page</msg>
-  <msg key="User_ID">User ID:</msg>
-  <msg key="User_ID_1">User ID</msg>
-  <msg key="User_Management">User Management</msg>
-  <msg key="User_Search">User Search</msg>
-  <msg key="User_Type">User Type</msg>
-  <msg key="User_type">User type:</msg>
-  <msg key="Users">Users</msg>
-  <msg key="Users_Bulk_Upload">Users: Bulk Upload</msg>
-  <msg key="Users_Search">Users Search</msg>
-  <msg key="View">View</msg>
-  <msg key="Year">Year:</msg>
-  <msg key="Yes">Yes</msg>
-  <msg key="Yes_Im_sure">Yes, I'm sure.</msg>
-  <msg key="Yes_delete">Yes, delete</msg>
-  <msg key="You_can_specify_colors_by_name">You can specify colors by name</msg>
-  <msg key="You_must_create">You must create</msg>
-  <msg key="Youre_editing">You're editing</msg>
-  <msg key="Youve_chosen_to_add">You've chosen to add</msg>
-  <msg key="a_member_of">A member of the</msg>
-  <msg key="actions">Actions</msg>
-  <msg key="add">add</msg>
-  <msg key="add_selected_members">Add Selected Members</msg>
-  <msg key="admin">admin</msg>
-  <msg key="admin_page_name">Control Panel</msg>
-  <msg key="admin_role_pretty_name">Administrator</msg>
-  <msg key="admin_role_pretty_plural">Administrators</msg>
-  <msg key="and">and</msg>
-  <msg key="approve">approve</msg>
-  <msg key="aqua">aqua</msg>
-  <msg key="archived">Archived</msg>
-  <msg key="are_you_sure_you_want_to_send">Are you sure you want to send the following</msg>
-  <msg key="arhive_group_name">Archive group %group_name%</msg>
-  <msg key="at">at</msg>
-  <msg key="bad_folder_id">bad folder id</msg>
-  <msg key="be_either">be either</msg>
-  <msg key="be_the_header_line">be the header line:</msg>
-  <msg key="black">black</msg>
-  <msg key="blue">blue</msg>
-  <msg key="byte">byte</msg>
-  <msg key="bytes">bytes</msg>
-  <msg key="cannot_be_removed">cannot be removed</msg>
-  <msg key="class_instance_portal_pretty_name">Classes</msg>
-  <msg key="class_instances_pretty_name">Class</msg>
-  <msg key="class_instances_pretty_plural">Classes</msg>
-  <msg key="class_may_not_be_deleted">Error: A %subject% must have &lt;em&gt;no&lt;/em&gt; %class_instances% to be deleted</msg>
-  <msg key="class_page_calendar_title">Calendar</msg>
-  <msg key="class_page_file_storage_title">File Storage</msg>
-  <msg key="class_page_home_title">Class Home</msg>
-  <msg key="classes_pretty_name">Subject</msg>
-  <msg key="classes_pretty_plural">Subjects</msg>
-  <msg key="club_page_calendar_title">Calendar</msg>
-  <msg key="club_page_file_storage_title">File Storage</msg>
-  <msg key="club_page_home_title">Community Home</msg>
-  <msg key="club_page_people_title">People</msg>
-  <msg key="clubs_pretty_name">Community</msg>
-  <msg key="clubs_pretty_plural">Communities</msg>
-  <msg key="community_name_already_in_use">The name &lt;strong&gt;%community_key%&lt;/strong&gt; is already in use either by an active or archived group. \n Please go back and select a different name.</msg>
-  <msg key="community_since">community since</msg>
-  <msg key="control_panel">Control Panel</msg>
-  <msg key="couldnt_find_user_id">We couldn't find user #%user_id%; perhaps this person was deleted?</msg>
-  <msg key="course_admin_role_pretty_name">Course Administrator</msg>
-  <msg key="course_admin_role_pretty_plural">Course Administrators</msg>
-  <msg key="course_assistant_role_pretty_name">Course Assistant</msg>
-  <msg key="course_assistant_role_pretty_plural">Course Assistants</msg>
-  <msg key="days_ago">days ago</msg>
-  <msg key="department_must_be_empty_to_be_deleted">Error: %departments_pretty_name% must be empty to be deleted</msg>
-  <msg key="department_name_already_in_use">The name &lt;strong&gt;%department_pretty_name%&lt;/strong&gt; is already in use. \n Please select a different name.</msg>
-  <msg key="departments_pretty_name">Department</msg>
-  <msg key="departments_pretty_plural">Departments</msg>
-  <msg key="deregister">deregister</msg>
-  <msg key="description">Description</msg>
-  <msg key="dotLRN_Admin">dotLRN Admin</msg>
-  <msg key="dotLRN_Information">dotLRN Information</msg>
-  <msg key="dotlrn_admin_pretty_name">Site Wide Administration</msg>
-  <msg key="dotlrn_admin_rel_pretty_name">dotLRN Admin Community Membership</msg>
-  <msg key="dotlrn_admin_rel_pretty_plural">dotLRN Admin Community Memberships</msg>
-  <msg key="dotlrn_class_instance_description">e.g. 6.001</msg>
-  <msg key="dotlrn_class_instance_pretty_name">Class</msg>
-  <msg key="dotlrn_class_instance_pretty_plural">Classes</msg>
-  <msg key="dotlrn_club_description">e.g. Alumni</msg>
-  <msg key="dotlrn_club_pretty_name">Club</msg>
-  <msg key="dotlrn_club_pretty_plural">Clubs</msg>
-  <msg key="dotlrn_community_description">Communities - the base community type</msg>
-  <msg key="dotlrn_community_pretty_name">Community</msg>
-  <msg key="dotlrn_community_pretty_plural">Communities</msg>
-  <msg key="dotlrn_main_portlet_pretty_name">Groups</msg>
-  <msg key="dotlrn_member_rel_pretty_name">dotLRN Community Membership</msg>
-  <msg key="dotlrn_member_rel_pretty_plural">dotLRN Community Memberships</msg>
-  <msg key="edit_approved_email_servers">Edit Pre-approved Email Servers</msg>
-  <msg key="edit_message_and_hit_send">Edit the message below and hit &quot;Send Email&quot; to
-notify this user.</msg>
-  <msg key="edit_subject">Edit</msg>
-  <msg key="emacs_subject">Subject</msg>
-  <msg key="email">E-mail</msg>
-  <msg key="email_message">Message</msg>
-  <msg key="email_sent">email sent</msg>
-  <msg key="fuchsia">fuchsia</msg>
-  <msg key="gray">gray</msg>
-  <msg key="green">green</msg>
-  <msg key="groups_icon">group's icon</msg>
-  <msg key="has_been_added_to">has been added to</msg>
-  <msg key="header_logo">Header Logo</msg>
-  <msg key="help">Help</msg>
-  <msg key="instructor_role_pretty_name">Professor</msg>
-  <msg key="instructor_role_pretty_plural">Professors</msg>
-  <msg key="is_already_in_use">is already in use</msg>
-  <msg key="item">item</msg>
-  <msg key="items">items</msg>
-  <msg key="lime">lime</msg>
   <msg key="login_information">Login information:</msg>
   <msg key="logout">Logout</msg>
-  <msg key="lt_Add_Members_to_Anothe">Add Members to Another Community</msg>
-  <msg key="lt_Add_Membership_To_Com">Add Membership To Community</msg>
-  <msg key="lt_Add_These_Users_To_A_">Add These Users To A Group</msg>
+  <msg key="lt_a_secondary">- 
+        a secondary identifier for the  user.</msg>
   <msg key="lt_Add_a_new_dotLRN_user">Add a new dotLRN user:</msg>
   <msg key="lt_Add_a_new_user_to_Slo">Add a new user to SloanSpace</msg>
   <msg key="lt_Add_community_name_Me">Add %community_name% Members to Another Community</msg>
+  <msg key="lt_Add_Members_to_Anothe">Add Members to Another Community</msg>
   <msg key="lt_Add_members_to_anothe">Add members to another group</msg>
+  <msg key="lt_Add_Membership_To_Com">Add Membership To Community</msg>
+  <msg key="lt_Add_These_Users_To_A_">Add These Users To A Group</msg>
   <msg key="lt_Administrative_Action">Administrative Actions</msg>
   <msg key="lt_An_error_occured_whil">An error occured while trying to add a user to a community.  This error has been logged.</msg>
   <msg key="lt_An_error_occured_whil_1">An error occured while trying to remove a user to a community.  This error has been logged.</msg>
+  <msg key="lt_approve_and_add_to_do">approve and add to dotLRN</msg>
+  <msg key="lt_are_not_yet_members_o">are not yet members of</msg>
   <msg key="lt_Are_you_sure_you_want">Are you sure you want to delete the empty department</msg>
   <msg key="lt_Be_sure_that_the_pers">Be sure that the person does not already have a SloanSpace account under another email address. Duplicate accounts cause problems for everyone. To add a person with an existing account use &lt;a href=members&gt;Manage Membership&lt;/a&gt;.</msg>
   <msg key="lt_Change_my_language_se">Change my language setting</msg>
   <msg key="lt_Class_Key_a_short_nam">Class Key (a short name, no spaces)</msg>
   <msg key="lt_Communitys_Web_Addres">Community's Web Address</msg>
+  <msg key="lt_Current_clubs_pretty_">Current %clubs_pretty_plural%</msg>
   <msg key="lt_Do_you_really_want_to">Do you really want to remove the following members?</msg>
   <msg key="lt_Do_you_really_want_to_1">Do you really want to remove %num_users% users?</msg>
+  <msg key="lt_dotLRN_properties_for">dotLRN properties for this user.</msg>
   <msg key="lt_E-mail_address_must_b">E-mail address must be valid and unique. &lt;br&gt;This user probably already has a SloanSpace account. &lt;br&gt;Try adding this user through &lt;a href=members&gt;Manage Membership&lt;/a&gt;.</msg>
+  <msg key="lt_Edit_department_prope">Edit department properties.</msg>
   <msg key="lt_Edit_My_Notifications">Edit My Notifications</msg>
   <msg key="lt_Edit_My_Personal_Info">Edit My Personal Information</msg>
   <msg key="lt_Edit_Pre-approved_Ema">Edit Pre-approved Email Servers</msg>
-  <msg key="lt_Edit_department_prope">Edit department properties.</msg>
   <msg key="lt_Email_suffixes_listed">Email suffixes listed here are used to automatically make dotLRN users of
   people that register with email addresses that match one of the values in
   this list.</msg>
-  <msg key="lt_Error_Nuking_first_na">Error Nuking %first_names% %last_name% (%email%)</msg>
+  <msg key="lt_emailing_this_user_fa">emailing this user failed!</msg>
   <msg key="lt_Error_adding_user_to_">Error adding user to community</msg>
+  <msg key="lt_Error_Nuking_first_na">Error Nuking %first_names% %last_name% (%email%)</msg>
   <msg key="lt_Error_removing_user_c">Error removing user community</msg>
   <msg key="lt_Error_sending_email_t">Error sending email to %email% from password-update-2.tcl</msg>
   <msg key="lt_First_check_the_box_o">First check the box of the users you want to add, next select their
       role, and finally submit the form.</msg>
   <msg key="lt_Folder_folder_name_is">Folder %folder_name% is empty</msg>
   <msg key="lt_Go_back_and_try_again">Go back and try again</msg>
+  <msg key="lt_having_trouble">Having trouble getting the look you want? Here's some tips</msg>
   <msg key="lt_Help_and_Personal_Con">Help and Personal Configuration</msg>
   <msg key="lt_Here_is_the_actual_er">Here is the actual error message:</msg>
   <msg key="lt_Here_you_can_create_s">Here you can create several users at once using a correctly formatted CSV
 (comma-separated values) file. You can create a spreadsheet and save it as
 a CSV file to import here.</msg>
   <msg key="lt_If_this_person_is_a_M">If this person is a MIT or Sloan Student have him self-register at sloanspace.mit.edu so he will have a full access account.</msg>
+  <msg key="lt_if_you_misspell">If you misspell the font name or pick a font that a user doesn't
+  have on her computer, the normal system font will be used.</msg>
   <msg key="lt_If_you_wish_to_give_g">If you wish to give guests full access to forums and surveys you may request that the site-wide admin change the status of your community. This option is not open to classes due to MIT privacy policy.</msg>
   <msg key="lt_Information_about_oth">Information about other members of this community will not be available to this user.</msg>
   <msg key="lt_Interactive_setting_o">Interactive setting of dotLRN parameters</msg>
-  <msg key="lt_JoinDrop_Classes_or_C">Join/Drop Classes or Communities</msg>
-  <msg key="lt_JoinDrop_a_Class_or_C">Join/Drop a Class or Community Group</msg>
+  <msg key="lt_Join_a_class_instance">Join a %class_instances_pretty_name%</msg>
+  <msg key="lt_Join_a_clubs_pretty_n">Join a %clubs_pretty_name%</msg>
   <msg key="lt_Join_the_above_criter">Join the above criteria with</msg>
   <msg key="lt_Join_the_above_criter_1">Join the above criteria by</msg>
+  <msg key="lt_JoinDrop_a_Class_or_C">Join/Drop a Class or Community Group</msg>
+  <msg key="lt_JoinDrop_Classes_or_C">Join/Drop Classes or Communities</msg>
   <msg key="lt_Key_a_short_name_no_s">Key (a short name, no spaces)</msg>
   <msg key="lt_Last_Visit_Over_in_da">Last Visit Over (in days)</msg>
   <msg key="lt_Last_Visit_Within_in_">Last Visit Within (in days)</msg>
@@ -402,15 +312,18 @@
 
 </msg>
   <msg key="lt_Please_select_a_diffe">Please select a different name</msg>
+  <msg key="lt_policy_must_be_one_of">policy must be one of: open, needs approval, or closed</msg>
   <msg key="lt_Pre-approved_Email_Se">Pre-approved Email Servers</msg>
   <msg key="lt_Recipients_First_Name">Recipient's First Name</msg>
   <msg key="lt_Return_to_where_you_w">Return to where you were.</msg>
-  <msg key="lt_Revert_ONLY_the_Heade">Revert ONLY the Header Icon properties to defaults</msg>
   <msg key="lt_Revert_all_properties">Revert all properties to defaults</msg>
+  <msg key="lt_Revert_ONLY_the_Heade">Revert ONLY the Header Icon properties to defaults</msg>
   <msg key="lt_Save_and_use_this_hea">Save and use this header</msg>
   <msg key="lt_Search_dotLRN_users_f">Search dotLRN users for user:</msg>
   <msg key="lt_Senders_Email_Address">Sender's Email Address</msg>
   <msg key="lt_Some_of_the_emails_fa">Some of the emails failed. Those users had random passwords generated for them, however. The best way to proceed is to have these users log in and ask them to click on 'I have forgotten my password'.</msg>
+  <msg key="lt_spam_policy_must_be_o">spam policy must be one of: all or members</msg>
+  <msg key="lt_strongfirst_names_las">&lt;strong&gt;%first_names% %last_name% (%email%)&lt;/strong&gt; is a %existing_role% in %community_name%. You may select a new role below:</msg>
   <msg key="lt_The_first_line_of_the">The first line of the file</msg>
   <msg key="lt_The_following_email_w">The following email was just sent from %system_name%</msg>
   <msg key="lt_The_following_email_w_1">The following email was just sent from %system_name%
@@ -433,8 +346,15 @@
   <msg key="lt_This_action_will_take">This action will take approximately</msg>
   <msg key="lt_This_action_will_take_1">This action will take approximately &lt;strong&gt;%estimated_number_of_seconds%&lt;/strong&gt; seconds.</msg>
   <msg key="lt_This_allows_you_to_gi">This allows you to give a non-MIT  person who is not a registered student access to this group.</msg>
+  <msg key="lt_this_is_what_the_header">This is what the header title will look like</msg>
+  <msg key="lt_this_may_take_some_time">This may take some time. Please be patient.</msg>
   <msg key="lt_This_user_is_a_site-w">This user is a site-wide admin.</msg>
   <msg key="lt_This_user_is_currentl">This user is currently in state &lt;i&gt;%member_state%&lt;/i&gt;.  To allow this user access to dotLRN you must &lt;br&gt;&lt;a href=&quot;%approve_user_url%&quot;&gt;approve and add to dotLRN&lt;/a&gt;</msg>
+  <msg key="lt_this_user_is_deleted_">this user is deleted and
+  banned from the community.</msg>
+  <msg key="lt_this_user_to_another_">this user to another group.</msg>
+  <msg key="lt_to_use_vaild_email_ad">to use vaild email addresses since the process
+will send the new user's password to the given email address.</msg>
   <msg key="lt_Update_this_users_pas">Update this user's password</msg>
   <msg key="lt_Use_this_only_for_an_">Use this only for an officially registered student in this class who is &lt;b&gt;not&lt;/b&gt; a MIT or Sloan student.</msg>
   <msg key="lt_Web_Log_for_user_name">Web Log for %user_name%</msg>
@@ -458,62 +378,125 @@
   <msg key="lt_Your_search_returned_">Your search returned no results, please broaden your search criteria.</msg>
   <msg key="lt_Youre_asking_to_chang">You're asking to change the level of access of this user.
 This has strong repercussions. Are you user about this?</msg>
-  <msg key="lt__since_these_must_be_">, since these must be
-  associated with Terms.</msg>
-  <msg key="lt_a_secondary">- 
-        a secondary identifier for the  user.</msg>
-  <msg key="lt_approve_and_add_to_do">approve and add to dotLRN</msg>
-  <msg key="lt_are_not_yet_members_o">are not yet members of</msg>
-  <msg key="lt_dotLRN_properties_for">dotLRN properties for this user.</msg>
-  <msg key="lt_emailing_this_user_fa">emailing this user failed!</msg>
-  <msg key="lt_having_trouble">Having trouble getting the look you want? Here's some tips</msg>
-  <msg key="lt_if_you_misspell">If you misspell the font name or pick a font that a user doesn't
-  have on her computer, the normal system font will be used.</msg>
-  <msg key="lt_policy_must_be_one_of">policy must be one of: open, needs approval, or closed</msg>
-  <msg key="lt_spam_policy_must_be_o">spam policy must be one of: all or members</msg>
-  <msg key="lt_strongfirst_names_las">&lt;strong&gt;%first_names% %last_name% (%email%)&lt;/strong&gt; is a %existing_role% in %community_name%. You may select a new role below:</msg>
-  <msg key="lt_this_is_what_the_header">This is what the header title will look like</msg>
-  <msg key="lt_this_may_take_some_time">This may take some time. Please be patient.</msg>
-  <msg key="lt_this_user_is_deleted_">this user is deleted and
-  banned from the community.</msg>
-  <msg key="lt_this_user_to_another_">this user to another group.</msg>
-  <msg key="lt_to_use_vaild_email_ad">to use vaild email addresses since the process
-will send the new user's password to the given email address.</msg>
   <msg key="ltnone_set_upgt">&amp;lt;none set up&amp;gt;</msg>
+  <msg key="Mail_Failed">Mail Failed</msg>
+  <msg key="Manage">Manage</msg>
+  <msg key="Manage_Applets">Manage Applets</msg>
+  <msg key="Manage_Members">Manage Members</msg>
+  <msg key="Manage_Membership">Manage Membership</msg>
+  <msg key="Manage_Memberships">Manage Memberships</msg>
   <msg key="maroon">maroon</msg>
+  <msg key="Member">Member</msg>
+  <msg key="Member_state">Member state:</msg>
+  <msg key="Members">Members</msg>
   <msg key="members">Members</msg>
+  <msg key="Members_of">Members of</msg>
+  <msg key="Membership_Requests">Membership Requests</msg>
+  <msg key="Memberships">Memberships</msg>
+  <msg key="Memberships_1">Memberships:</msg>
+  <msg key="Message">Message</msg>
   <msg key="must">must</msg>
   <msg key="must_be_one_of">- must be one of</msg>
+  <msg key="My_Communities">My Communities</msg>
+  <msg key="NA">N/A</msg>
+  <msg key="Name">Name</msg>
+  <msg key="Name__Email">Name / Email</msg>
   <msg key="navy">navy</msg>
+  <msg key="Needs_Approval">Needs Approval</msg>
+  <msg key="New">New</msg>
   <msg key="new">new</msg>
   <msg key="new_class">New</msg>
+  <msg key="new_class_1">New %classes_pretty_name%</msg>
+  <msg key="new_class_instance">New %class_instances_pretty_name%</msg>
+  <msg key="new_class_navbar_name">New</msg>
+  <msg key="new_class_of_type_class_name">New %class_instances_pretty_name% of type %class_name%</msg>
+  <msg key="new_community">New %clubs_pretty_name%</msg>
+  <msg key="new_department">New %departments_pretty_name%</msg>
+  <msg key="New_Password">New Password:</msg>
+  <msg key="New_Term">New Term</msg>
+  <msg key="New_User">New User</msg>
+  <msg key="No">No</msg>
   <msg key="no">no</msg>
+  <msg key="no_arhived_groups">No archived %groups_pretty_plural%</msg>
+  <msg key="no_class_instances">No %class_instances_pretty_plural%</msg>
+  <msg key="No_classes">No classes</msg>
+  <msg key="no_classes">No %classes_pretty_plural%</msg>
+  <msg key="no_clubs">No %clubs_pretty_plural%</msg>
+  <msg key="no_communities">No %clubs_pretty_plural%</msg>
   <msg key="no_community_member_with_id">There is no community member with the user_id of %user_id%</msg>
+  <msg key="no_departments">No %departments_pretty_plural%</msg>
   <msg key="no_description">none set up</msg>
+  <msg key="No_dont_delete_it">No, don't delete it</msg>
+  <msg key="No_groups_to_add_to">No groups to add to</msg>
+  <msg key="No_Terms">No Terms</msg>
+  <msg key="No_user_found">No user found</msg>
+  <msg key="No_Users">No Users</msg>
   <msg key="non_member_page_name">Not-A-Member</msg>
+  <msg key="None">None</msg>
   <msg key="none_set_up">none set up</msg>
+  <msg key="Normal">Normal</msg>
   <msg key="not_a_user">Not a User</msg>
+  <msg key="Not_Allowed">Not Allowed</msg>
+  <msg key="Note">Note:</msg>
+  <msg key="Nuke">Nuke</msg>
   <msg key="nuke">nuke</msg>
-  <msg key="of_type">of type</msg>
+  <msg key="Nuke_">Nuke ...</msg>
+  <msg key="Nuke_Users">Nuke Users</msg>
   <msg key="olive">olive</msg>
+  <msg key="Open">Open</msg>
   <msg key="optional_defaults_to">optional, defaults to</msg>
+  <msg key="Or">Or</msg>
   <msg key="or">or</msg>
   <msg key="or_by_RGB_number">or by RGB number</msg>
   <msg key="or_return_to">or, return to</msg>
   <msg key="password">Password:</msg>
+  <msg key="Pending">Pending</msg>
+  <msg key="Pending_Approval">Pending Approval</msg>
+  <msg key="Personal_home_page">Personal home page:</msg>
+  <msg key="Personal_Options">Personal Options</msg>
   <msg key="portal_templates">Portal Templates</msg>
-  <msg key="properties">properties.</msg>
+  <msg key="Portrait">Portrait:</msg>
+  <msg key="Post_to">Post to:</msg>
+  <msg key="Pretty_Name">Pretty Name</msg>
+  <msg key="Pretty_Plural">Pretty Plural</msg>
+  <msg key="Preview">Preview</msg>
+  <msg key="Public_Web_Log">Public Web Log</msg>
   <msg key="purple">purple</msg>
+  <msg key="Recipients_Email">Recipient's Email</msg>
+  <msg key="Recipients_Last_Name">Recipient's Last Name</msg>
   <msg key="red">red</msg>
+  <msg key="Referer">Referer</msg>
+  <msg key="Registration_date">Registration date:</msg>
   <msg key="registration_request_sent">Thank you. Your registration request has been sent to the System Administrator</msg>
+  <msg key="Reject">Reject</msg>
   <msg key="reject">reject</msg>
+  <msg key="Request_Membership">Request Membership</msg>
   <msg key="required">required</msg>
+  <msg key="Results">Results</msg>
+  <msg key="Return_URL">Return URL</msg>
   <msg key="revoke">revoke</msg>
+  <msg key="Role">Role</msg>
   <msg key="rrggbb">rrggbb</msg>
+  <msg key="Screen_name">Screen name:</msg>
+  <msg key="Search">Search</msg>
   <msg key="search">search</msg>
+  <msg key="Search_Text">Search Text:</msg>
+  <msg key="Search_Users">Search Users</msg>
   <msg key="seconds">seconds.</msg>
+  <msg key="Send_Date">Send Date</msg>
   <msg key="send_email">Send Email</msg>
+  <msg key="Shared_Files">Shared Files</msg>
   <msg key="silver">silver</msg>
+  <msg key="Site-wide_Admin">Site-wide Admin?</msg>
+  <msg key="Size">Size</msg>
+  <msg key="SloanSpace">SloanSpace</msg>
+  <msg key="Small">Small</msg>
+  <msg key="Sorry">Sorry!</msg>
+  <msg key="Spam_">Spam ...</msg>
+  <msg key="Spam_Community">Spam Community</msg>
+  <msg key="Spam_Users">Spam Users</msg>
+  <msg key="Start_Date">Start Date</msg>
+  <msg key="Start_date">Start date:</msg>
   <msg key="student_role_pretty_name">Student</msg>
   <msg key="student_role_pretty_plural">Students</msg>
   <msg key="subcomm_page_calendar_title">Calendar</msg>
@@ -522,38 +505,71 @@
   <msg key="subcomm_page_info_title">Subgroup Info</msg>
   <msg key="subcommunities_pretty_name">Subgroup</msg>
   <msg key="subcommunities_pretty_plural">Subgroups</msg>
+  <msg key="subcommunity_memberships">%subcommunities_pretty_name% Memberships</msg>
+  <msg key="Subject">Subject</msg>
   <msg key="teaching_assistant_role_pretty_name">Teaching Assistant</msg>
   <msg key="teaching_assistant_role_pretty_plural">Teaching Assistants</msg>
   <msg key="teal">teal</msg>
+  <msg key="Template">Template</msg>
+  <msg key="Templates">Templates</msg>
+  <msg key="Term">Term</msg>
   <msg key="term">Term</msg>
+  <msg key="Term_eg_Spring_Fall">Term (e.g. Spring, Fall)</msg>
+  <msg key="Term_ID">Term ID</msg>
   <msg key="term_properties">term properties.</msg>
+  <msg key="Terms">Terms</msg>
   <msg key="terms">Terms</msg>
   <msg key="thank_you">Thank you</msg>
   <msg key="the_format_of_email_domains">The format of this value is a comma-separated list of domains (usually
   preceded by the *@ string which match
   &amp;lt;anything&amp;gt;@&amp;lt;email-domain&amp;gt;). For example, you might use:</msg>
+  <msg key="The_name">The name</msg>
   <msg key="there_are_no_users_matching">There are no users matching %search_text%.</msg>
   <msg key="this_user_is_deleted">this user is deleted</msg>
   <msg key="this_user_to_dotLRN">this user to dotLRN.</msg>
-  <msg key="to_be_able_to_create">to be able to create</msg>
+  <msg key="To">To</msg>
+  <msg key="Type">Type</msg>
   <msg key="type">type</msg>
+  <msg key="Unknown_Term">Unknown Term</msg>
+  <msg key="Update_Password">Update Password</msg>
   <msg key="upload">upload</msg>
+  <msg key="User">User</msg>
   <msg key="user_add_confirm_email_body">You have been added as a user to %system_name% at %system_url%.
             Login: %user_email%
             Password: %user_password%</msg>
   <msg key="user_add_confirm_email_subject">You have been added as a user to %system_name% at %system_url%</msg>
+  <msg key="User_Admin_Page">User Admin Page</msg>
   <msg key="user_email_already_exists">User %user_email% already exists... storing user_id</msg>
   <msg key="user_email_created">User %user_email% created....</msg>
+  <msg key="user_has_been_a_member_since">%first_names% %last_name% has been a member of %system_name% since %pretty_creation_date%</msg>
+  <msg key="User_ID">User ID:</msg>
+  <msg key="User_ID_1">User ID</msg>
+  <msg key="User_Management">User Management</msg>
   <msg key="user_portal_page_calendar_title">Calendar</msg>
   <msg key="user_portal_page_file_storage_title">My Files</msg>
   <msg key="user_portal_page_home_title">MySpace</msg>
   <msg key="user_portal_pretty_name">User</msg>
+  <msg key="User_Search">User Search</msg>
+  <msg key="User_Type">User Type</msg>
+  <msg key="User_type">User type:</msg>
   <msg key="user_type_external_pretty_name">External</msg>
   <msg key="user_type_staff_pretty_name">Staff</msg>
+  <msg key="Users">Users</msg>
   <msg key="users">Users</msg>
+  <msg key="Users_Bulk_Upload">Users: Bulk Upload</msg>
+  <msg key="Users_Search">Users Search</msg>
+  <msg key="View">View</msg>
   <msg key="visit">Visit</msg>
+  <msg key="Year">Year:</msg>
+  <msg key="Yes">Yes</msg>
   <msg key="yes">yes</msg>
+  <msg key="Yes_delete">Yes, delete</msg>
+  <msg key="Yes_Im_sure">Yes, I'm sure.</msg>
+  <msg key="You_can_specify_colors_by_name">You can specify colors by name</msg>
   <msg key="you_have_been_added">You have been added as a user to</msg>
   <msg key="you_may_change_password">you may change your password after you log in</msg>
+  <msg key="you_need_to_create_terms_to_create_classes">&lt;b&gt;Note:&lt;/b&gt; You must create &lt;a href=&quot;%terms_url%&quot;&gt;%terms_pretty_plural%&lt;/a&gt; to be able to create %class_instances_pretty_plural%, since these must be associated with %terms_pretty_plural%.</msg>
   <msg key="your_icon_is_too_large">Your icon is too large. The publisher of %system_name% has chosen to limit attachments to %max_attachments_bytes% bytes.\n</msg>
+  <msg key="Youre_editing">You're editing</msg>
+  <msg key="Youve_chosen_to_add">You've chosen to add</msg>
 </message_catalog>
Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v
diff -u -r1.172 -r1.173
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl	4 Dec 2002 09:51:03 -0000	1.172
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl	11 Dec 2002 13:53:51 -0000	1.173
@@ -492,7 +492,7 @@
         set role_options [list]
 
         foreach {rel_type role pretty_name pretty_plural} [eval concat [get_all_roles]] {
-            lappend role_options [list $pretty_name $rel_type]
+            lappend role_options [list [lang::util::localize $pretty_name] $rel_type]
         }
 
         return $role_options
@@ -1175,11 +1175,6 @@
 
 		append chunk "<a href=\"${url}${drop_target}?referer=[ad_conn url]\">[_ dotlrn.Drop]</a>\n"
 		 
-# Removing admin to improve performance
-#                if {[dotlrn::user_can_admin_community_p -community_id $sc_id]} {
-#                    append chunk " <a href=\"${url}one-community-admin\"><img border=0 valign=\"bottom\" src=\"graphics/admin.gif\" alt=\"Administer\"></a>\n"
-#                }
-
                 append chunk "<ul>\n[get_subcomm_chunk -community_id $sc_id -user_id $user_id -only_member_p $only_member_p]</ul>\n"
             } elseif {[member_p $sc_id $user_id] || [not_closed_p -community_id $sc_id]} {
 
Index: openacs-4/packages/dotlrn/tcl/navigation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/navigation-procs.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/dotlrn/tcl/navigation-procs.tcl	4 Dec 2002 09:51:04 -0000	1.19
+++ openacs-4/packages/dotlrn/tcl/navigation-procs.tcl	11 Dec 2002 13:53:51 -0000	1.20
@@ -33,10 +33,11 @@
     } {
         # Prepend some args
         set first_args [list [list [get_url] "dotLRN"]]
+        set admin_pretty_name [_ dotlrn.admin_pages_navbar_name]
         if {[llength $args] > 0} {
-            lappend first_args [list [get_admin_url] Admin]
+            lappend first_args [list [get_admin_url] $admin_pretty_name]
         } else {
-            lappend first_args Admin
+            lappend first_args $admin_pretty_name
         }
 
         set args [concat $first_args $args]
Index: openacs-4/packages/dotlrn/www/clone.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/clone.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/clone.adp	23 Oct 2002 12:38:39 -0000	1.4
+++ openacs-4/packages/dotlrn/www/clone.adp	11 Dec 2002 13:53:51 -0000	1.5
@@ -21,7 +21,7 @@
 <master src="dotlrn-master">
 <property name="title">@title@</property>
 
-<i><strong>#dotlrn.Note#:</strong> #dotlrn.lt_this_may_take_some_time#</i>
+<i><strong>#dotlrn.Note#</strong> #dotlrn.lt_this_may_take_some_time#</i>
 <formtemplate id="clone_form"></formtemplate>
 
 
Index: openacs-4/packages/dotlrn/www/community-member.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-member.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn/www/community-member.adp	4 Dec 2002 09:51:04 -0000	1.13
+++ openacs-4/packages/dotlrn/www/community-member.adp	11 Dec 2002 13:53:51 -0000	1.14
@@ -35,7 +35,7 @@
   </if></else>
 </if>
 
-#dotlrn.a_member_of# @system_name@ #dotlrn.community_since# @pretty_creation_date@
+#dotlrn.user_has_been_a_member_since#
 
 <if @member_state@ eq "deleted">
 
@@ -50,7 +50,7 @@
 
 <if @show_email_p@ eq 1>
   <ul>
-    <li>#dotlrn.email# @first_names@ @last_name@: <a href="mailto:@email@">@email@</a></li>
+    <li>#dotlrn.email#: <a href="mailto:@email@">@email@</a></li>
 
     <if @url@ not nil>
       <li>#dotlrn.Personal_home_page# <a href="@url@">@url@</a></li>
Index: openacs-4/packages/dotlrn/www/manage-memberships.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/manage-memberships.adp,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/dotlrn/www/manage-memberships.adp	4 Dec 2002 09:51:04 -0000	1.19
+++ openacs-4/packages/dotlrn/www/manage-memberships.adp	11 Dec 2002 13:53:51 -0000	1.20
@@ -26,11 +26,11 @@
 
 <p>
   <small>
-    <a href="#current_clubs">#dotlrn.Current# <%= [parameter::get -localize -parameter clubs_pretty_plural] %></a>
+    <a href="#current_clubs">#dotlrn.lt_Current_clubs_pretty_#</a>
     |
-    <a href="#join_classes">#dotlrn.Join_a# <%= [parameter::get -localize -parameter class_instances_pretty_name] %></a>
+    <a href="#join_classes">#dotlrn.lt_Join_a_class_instance#</a>
     |
-    <a href="#join_clubs">#dotlrn.Join_a# <%= [parameter::get -localize -parameter clubs_pretty_name] %></a>
+    <a href="#join_clubs">#dotlrn.lt_Join_a_clubs_pretty_n#</a>
   </small>
 </p>
 
@@ -58,7 +58,7 @@
 <if @member_classes:rowcount@ gt 0>
     <table cellpadding="0" cellspacing="0" width="100%">
       <tr class="table-title">
-        <th align="left" width="55%"><%= [parameter::get -localize -parameter class_instances_pretty_name] %> #dotlrn.Name#</th>
+        <th align="left" width="55%">#dotlrn.class_name_header#</th>
         <th align="left" width="15%">#dotlrn.Term#</th>
         <th align="left" width="15%">#dotlrn.Role#</th>
         <th align="center" width="15%">#dotlrn.Actions#</th>
@@ -94,7 +94,7 @@
 <if @member_clubs:rowcount@ gt 0>
     <table cellpadding="0" cellspacing="0" width="100%">
       <tr class="table-title">
-        <th align="left" colspan="2" width="70%"><%= [parameter::get -localize -parameter clubs_pretty_name] %> #dotlrn.Name#</th>
+        <th align="left" colspan="2" width="70%">#dotlrn.clubs_name_header#</th>
         <th align="left" width="15%">#dotlrn.Role#</th>
         <th align="center" width="15%">#dotlrn.Actions#</th>
       </tr>
@@ -120,7 +120,7 @@
     </table>
 </if>
 <else>
-  <p><small>#dotlrn.No# <%= [parameter::get -localize -parameter clubs_pretty_plural] %></small></p>
+  <p><small>#dotlrn.no_clubs#</small></p>
 </else>
 
 </if>
@@ -148,7 +148,7 @@
 <if @non_member_classes:rowcount@ gt 0>
     <table celladding="0" cellspacing="0" width="100%">
       <tr class="table-title">
-        <th align="left" width="55%"><%= [parameter::get -localize -parameter class_instances_pretty_name] %> #dotlrn.Name#</th>
+        <th align="left" width="55%">#dotlrn.class_name_header#</th>
         <th align="left" width="15%">#dotlrn.Term#</th>
         <th align="left" width="15%">&nbsp;</th>
         <th align="center" width="15%">#dotlrn.Actions#</th>
@@ -185,7 +185,7 @@
 <a name="join_club"><p></a>
     <table cellpadding="0" cellspacing="0" width="100%">
       <tr class="table-title">
-        <th align="left" width="55%"><%= [parameter::get -localize -parameter clubs_pretty_name] %> #dotlrn.Name#</th>
+        <th align="left" width="55%">#dotlrn.clubs_name_header#</th>
         <th align="left" width="15%">&nbsp;</th>
         <th align="left" width="15%">&nbsp;</th>
         <th align="center">#dotlrn.Actions#</th>
@@ -214,7 +214,7 @@
 
 </if>
 <else>
-  <p><small>#dotlrn.No# <%= [parameter::get -localize -parameter clubs_pretty_plural] %></small></p>
+  <p><small>#dotlrn.no_clubs#</small></p>
 </else>
 
 </if>
Index: openacs-4/packages/dotlrn/www/manage-memberships.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/manage-memberships.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/manage-memberships.tcl	23 Oct 2002 12:38:39 -0000	1.7
+++ openacs-4/packages/dotlrn/www/manage-memberships.tcl	11 Dec 2002 13:53:51 -0000	1.8
@@ -177,5 +177,9 @@
 
 set referer [ns_urlencode "[ns_conn url]?[export_vars {member_department_key member_term_id non_member_department_key non_member_term_id}]"]
 
-ad_return_template
+# en_US messages make use of these configurable pretty names
+set clubs_pretty_plural [parameter::get -localize -parameter clubs_pretty_plural]
+set class_instances_pretty_name [parameter::get -localize -parameter class_instances_pretty_name]
+set clubs_pretty_name [parameter::get -localize -parameter clubs_pretty_name]
 
+ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/archived-communities.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/archived-communities.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/archived-communities.adp	23 Oct 2002 12:38:40 -0000	1.3
+++ openacs-4/packages/dotlrn/www/admin/archived-communities.adp	11 Dec 2002 13:53:51 -0000	1.4
@@ -39,7 +39,5 @@
 </table>
 </if>
 <else>
-  #dotlrn.No_archived# @groups_pretty_plural@
+  #dotlrn.no_arhived_groups#
 </else>
-
-
Index: openacs-4/packages/dotlrn/www/admin/archived-communities.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/archived-communities.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/archived-communities.tcl	23 Oct 2002 12:38:40 -0000	1.3
+++ openacs-4/packages/dotlrn/www/admin/archived-communities.tcl	11 Dec 2002 13:53:51 -0000	1.4
@@ -28,12 +28,11 @@
 
 set groups_pretty_plural "[parameter::get -localize -parameter class_instances_pretty_plural] / [parameter::get -localize -parameter clubs_pretty_plural]"
 
-set title "[_ dotlrn.Archived] $groups_pretty_plural"
+set title "[_ dotlrn.archived_groups]"
 set context_bar [list $title]
 
 db_multirow archived_comms select_archived_comms {} {
     set description [ad_quotehtml $description]
 }
 
 ad_return_template
-
Index: openacs-4/packages/dotlrn/www/admin/class-instance-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-instance-new.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/dotlrn/www/admin/class-instance-new.adp	23 Oct 2002 12:38:40 -0000	1.10
+++ openacs-4/packages/dotlrn/www/admin/class-instance-new.adp	11 Dec 2002 13:53:51 -0000	1.11
@@ -19,11 +19,7 @@
 %>
 
 <master src="dotlrn-admin-master">
-<property name="title">#dotlrn.New# @class_instances_pretty_name@ #dotlrn.of_type# @class_name@</property>
+<property name="title">#dotlrn.new_class_of_type_class_name#</property>
 <property name="context_bar">@context_bar@</property>
 
 <formtemplate id="add_class_instance"></formtemplate>
-
-
-
-
Index: openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl	23 Oct 2002 12:38:40 -0000	1.21
+++ openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl	11 Dec 2002 13:53:51 -0000	1.22
@@ -104,13 +104,13 @@
     ad_script_abort
 }
 
+# Used by en_US version of new_class_instance message
 set class_instances_pretty_name [parameter::get -localize -parameter class_instances_pretty_name]
 
 set context_bar [list \
     [list classes [_ dotlrn.Classes]] \
     [list "class?class_key=$class_key" $class_name] \
-    [list [_ dotlrn.New] $class_instances_pretty_name] \
+    [_ dotlrn.new_class_instance]
 ]
 
 ad_return_template
-
Index: openacs-4/packages/dotlrn/www/admin/class-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-new.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/admin/class-new.adp	23 Oct 2002 12:38:40 -0000	1.9
+++ openacs-4/packages/dotlrn/www/admin/class-new.adp	11 Dec 2002 13:53:51 -0000	1.10
@@ -23,6 +23,3 @@
 <property name="context_bar">@context_bar@</property>
 
 <formtemplate id="add_class"></formtemplate>
-
-
-
Index: openacs-4/packages/dotlrn/www/admin/class-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-new.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/dotlrn/www/admin/class-new.tcl	23 Oct 2002 12:38:40 -0000	1.14
+++ openacs-4/packages/dotlrn/www/admin/class-new.tcl	11 Dec 2002 13:53:51 -0000	1.15
@@ -29,8 +29,10 @@
     context_bar:onevalue
 }
 
-set title "[_ dotlrn.New] [parameter::get -localize -parameter classes_pretty_name]"
-set context_bar [list [list classes [parameter::get -localize -parameter classes_pretty_plural]] New]
+# Used in en_US title
+set classes_pretty_name [parameter::get -localize -parameter classes_pretty_name]
+set title "[_ dotlrn.new_class_1]"
+set context_bar [list [list classes [parameter::get -localize -parameter classes_pretty_plural]] [_ dotlrn.new_class_navbar_name]]
 
 form create add_class
 
@@ -74,4 +76,3 @@
 }
 
 ad_return_template
-
Index: openacs-4/packages/dotlrn/www/admin/class.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.adp,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/dotlrn/www/admin/class.adp	4 Dec 2002 09:51:04 -0000	1.28
+++ openacs-4/packages/dotlrn/www/admin/class.adp	11 Dec 2002 13:53:51 -0000	1.29
@@ -37,7 +37,7 @@
   <br>
 
   <li>
-    <a href="class-edit?class_key=@class_key@&referer=@referer@">#dotlrn.edit_subject#</a> <%= [parameter::get -localize -parameter classes_pretty_name] %> #dotlrn.properties#
+    <a href="class-edit?class_key=@class_key@&referer=@referer@">#dotlrn.edit_subject_properties#</a>
   </li>
 
 </ul>
@@ -52,7 +52,7 @@
       <td align="left">
         <nobr>
           <small>[
-            <a href="class-instance-new?class_key=@class_key@">#dotlrn.new_class# <%= [parameter::get -localize -parameter class_instances_pretty_name] %></a>
+            <a href="class-instance-new?class_key=@class_key@">#dotlrn.new_class_instance#</a>
           ]</small>
         </nobr>
       </td>
@@ -81,7 +81,7 @@
     <tr>
       <th align="left" width="15%">#dotlrn.term#</th>
       <th align="left">
-        <%= [parameter::get -localize -parameter class_instances_pretty_name] %> #dotlrn.Name#
+        #dotlrn.class_name_header#
       </th>
       <th align="center" width="5%">#dotlrn.members#</th>
       <th align="center" width="10%">#dotlrn.actions#</th>
@@ -115,7 +115,7 @@
 <else>
     <tr bgcolor="#eeeeee">
       <td align="left" colspan="4">
-        <i>#dotlrn.No# <%= [parameter::get -localize -parameter class_instances_pretty_plural] %></i>
+        <i>#dotlrn.no_class_instances#</i>
       </td>
     </tr>
 </else>
Index: openacs-4/packages/dotlrn/www/admin/class.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/dotlrn/www/admin/class.tcl	23 Oct 2002 12:38:40 -0000	1.16
+++ openacs-4/packages/dotlrn/www/admin/class.tcl	11 Dec 2002 13:53:51 -0000	1.17
@@ -74,5 +74,9 @@
 set context_bar [list [list classes [parameter::get -localize -parameter classes_pretty_plural]] $pretty_name]
 set referer "[ns_conn url]?[ns_conn query]"
 
-ad_return_template
+# Used by some en_US messages on the adp page
+set classes_pretty_name [parameter::get -localize -parameter classes_pretty_name]
+set class_instances_pretty_name [parameter::get -localize -parameter class_instances_pretty_name]
+set class_instances_pretty_plural [parameter::get -localize -parameter class_instances_pretty_plural]
 
+ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/classes-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes-chunk.adp,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/dotlrn/www/admin/classes-chunk.adp	4 Dec 2002 09:51:04 -0000	1.17
+++ openacs-4/packages/dotlrn/www/admin/classes-chunk.adp	11 Dec 2002 13:53:51 -0000	1.18
@@ -26,7 +26,7 @@
       <td align="left">
         <nobr>
           <small>[
-            <a href="class-new?department_key=@department_key@&referer=@referer@">#dotlrn.New# <%= [parameter::get -localize -parameter classes_pretty_name] %></a>
+            <a href="class-new?department_key=@department_key@&referer=@referer@">#dotlrn.new_class_1#</a>
           ]</small>
         </nobr>
       </td>
@@ -52,7 +52,7 @@
 
     <tr>
       <th align="left" width="30%"><%= [parameter::get -localize -parameter departments_pretty_name] %></th>
-      <th align="left"><%= [parameter::get -localize -parameter classes_pretty_name] %> #dotlrn.Name#</th>
+      <th align="left">#dotlrn.class_name#</th>
       <th align="center" width="5%"><%= [parameter::get -localize -parameter class_instances_pretty_plural] %></th>
       <th align="center" width="10%">#dotlrn.Actions#</th>
     </tr>
@@ -73,7 +73,7 @@
 <if @can_instantiate@>
         <nobr>
           <small>[
-            <a href="class-instance-new?class_key=@classes.class_key@">#dotlrn.New# <%= [parameter::get -localize -parameter class_instances_pretty_name] %></a>
+            <a href="class-instance-new?class_key=@classes.class_key@">#dotlrn.new_class_instance#</a>
           ]</small>
         </nobr>
 </if>
@@ -85,7 +85,7 @@
 <else>
   <tr bgcolor="#eeeeee">
     <td align="left" colspan="4">
-      <i>#dotlrn.No# <%= [parameter::get -localize -parameter classes_pretty_plural] %></i>
+      <i>#dotlrn.no_classes#</i>
     </td>
   </tr>
 </else>
@@ -99,7 +99,7 @@
       <td align="left">
         <nobr>
           <small>[
-            <a href="class-new?department_key=@department_key@&referer=@referer@">#dotlrn.New# <%= [parameter::get -localize -parameter classes_pretty_name] %></a>
+            <a href="class-new?department_key=@department_key@&referer=@referer@">#dotlrn.new_class_1#</a>
           ]</small>
         </nobr>
       </td>
@@ -108,8 +108,3 @@
 </if>
 
 </center>
-
-
-
-
-
Index: openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl	23 Oct 2002 12:38:40 -0000	1.8
+++ openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl	11 Dec 2002 13:53:51 -0000	1.9
@@ -67,5 +67,9 @@
 set can_create [dotlrn_class::can_create]
 set can_instantiate [dotlrn_class::can_instantiate]
 
-ad_return_template
+# Used in the en_US versions of some of the messages in the adp
+set classes_pretty_name [parameter::get -localize -parameter classes_pretty_name]
+set classes_pretty_plural [parameter::get -localize -parameter classes_pretty_plural]
+set class_instances_pretty_name [parameter::get -localize -parameter class_instances_pretty_name]
 
+ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/club-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/club-new.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/admin/club-new.adp	23 Oct 2002 12:38:40 -0000	1.8
+++ openacs-4/packages/dotlrn/www/admin/club-new.adp	11 Dec 2002 13:53:51 -0000	1.9
@@ -23,6 +23,3 @@
 <property name="context_bar">@context_bar@</property>
 
 <formtemplate id="add_club"></formtemplate>
-
-
-
Index: openacs-4/packages/dotlrn/www/admin/club-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/club-new.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/dotlrn/www/admin/club-new.tcl	23 Oct 2002 12:38:40 -0000	1.16
+++ openacs-4/packages/dotlrn/www/admin/club-new.tcl	11 Dec 2002 13:53:51 -0000	1.17
@@ -67,8 +67,8 @@
     ad_script_abort
 }
 
-set title "[_ dotlrn.New] [parameter::get -localize -parameter clubs_pretty_name]"
+set clubs_pretty_name [parameter::get -localize -parameter clubs_pretty_name]
+set title "[_ dotlrn.new_community]"
 set context_bar [list [list clubs [parameter::get -localize -parameter clubs_pretty_plural]] $title]
 
 ad_return_template
-
Index: openacs-4/packages/dotlrn/www/admin/clubs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/clubs.adp,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/dotlrn/www/admin/clubs.adp	23 Oct 2002 12:38:40 -0000	1.22
+++ openacs-4/packages/dotlrn/www/admin/clubs.adp	11 Dec 2002 13:53:51 -0000	1.23
@@ -29,7 +29,7 @@
       <td align="left">
         <nobr>
           <small>[
-            <a href="club-new">#dotlrn.New# <%= [parameter::get -localize -parameter clubs_pretty_name] %></a>
+            <a href="club-new">#dotlrn.new_community#</a>
           ]</small>
         </nobr>
       </td>
@@ -41,7 +41,7 @@
   <table bgcolor="#cccccc" cellpadding="5" width="95%">
 
     <tr>
-      <th align="left" width="30%"><%= [parameter::get -localize -parameter clubs_pretty_name] %> #dotlrn.Name#</th>
+      <th align="left" width="30%">#dotlrn.community_header_name#</th>
       <th align="left">#dotlrn.Description#</th>
       <th align="center" width="5%">#dotlrn.Members#</th>
       <th align="center" width="10%">#dotlrn.Actions#</th>
@@ -75,7 +75,7 @@
 <else>
   <tr bgcolor="#eeeeee">
     <td align="left" colspan="4">
-      <i>#dotlrn.No# <%= [parameter::get -localize -parameter clubs_pretty_plural] %></i>
+      <i>#dotlrn.no_communities#</i>
     </td>
   </tr>
 </else>
@@ -89,7 +89,7 @@
       <td align="left">
         <nobr>
           <small>[
-            <a href="club-new">#dotlrn.New# <%= [parameter::get -localize -parameter clubs_pretty_name] %></a>
+            <a href="club-new">#dotlrn.new_community#</a>
           ]</small>
         </nobr>
       </td>
@@ -98,7 +98,3 @@
 </if>
 
 </center>
-
-
-
-
Index: openacs-4/packages/dotlrn/www/admin/clubs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/clubs.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn/www/admin/clubs.tcl	23 Oct 2002 12:38:40 -0000	1.12
+++ openacs-4/packages/dotlrn/www/admin/clubs.tcl	11 Dec 2002 13:53:51 -0000	1.13
@@ -36,5 +36,8 @@
     set description [ad_quotehtml $description]
 }
 
-ad_return_template
+# Some of the en_US messages in the adp use these variables
+set clubs_pretty_name [parameter::get -localize -parameter clubs_pretty_name]
+set clubs_pretty_plural [parameter::get -localize -parameter clubs_pretty_plural]
 
+ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/department.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn/www/admin/department.adp	4 Dec 2002 09:51:04 -0000	1.12
+++ openacs-4/packages/dotlrn/www/admin/department.adp	11 Dec 2002 13:53:51 -0000	1.13
@@ -56,5 +56,3 @@
 <br>
 
 <include src="classes-chunk" department_key="@department_key@">
-
-
Index: openacs-4/packages/dotlrn/www/admin/department.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn/www/admin/department.tcl	23 Oct 2002 12:38:40 -0000	1.12
+++ openacs-4/packages/dotlrn/www/admin/department.tcl	11 Dec 2002 13:53:51 -0000	1.13
@@ -47,4 +47,3 @@
 set referer "[ns_conn url]?[ns_conn query]"
 
 ad_return_template
-
Index: openacs-4/packages/dotlrn/www/admin/departments.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/departments.adp,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/dotlrn/www/admin/departments.adp	23 Oct 2002 12:38:40 -0000	1.18
+++ openacs-4/packages/dotlrn/www/admin/departments.adp	11 Dec 2002 13:53:51 -0000	1.19
@@ -28,7 +28,7 @@
     <tr>
       <td align="left" style="white-space: nowrap; font-size: x-small;">
         [
-          <a href="department-new?referer=@referer@">#dotlrn.New# @departments_pretty_name@</a>
+          <a href="department-new?referer=@referer@">#dotlrn.new_department#</a>
         ]
       </td>
     </tr>
@@ -39,7 +39,7 @@
   <table bgcolor="#cccccc" cellpadding="5" width="95%">
 
     <tr>
-      <th align="left">@departments_pretty_name@ #dotlrn.Name#</th>
+      <th align="left">#dotlrn.department_name#</th>
       <th align="center" width="10%">#dotlrn.Actions#</th>
     </tr>
 
@@ -62,7 +62,7 @@
         
           <if @can_create@>
             [
-              <a href="class-new?department_key=@departments.department_key@&referer=department?department_key=@departments.department_key@">#dotlrn.New# @classes_pretty_name@</a>
+              <a href="class-new?department_key=@departments.department_key@&referer=department?department_key=@departments.department_key@">#dotlrn.new_class_1#</a>
             
             <if @departments.n_classes@ eq 0>
             |
@@ -80,7 +80,7 @@
     <else>
       <tr bgcolor="#eeeeee">
         <td align="left" colspan="2">
-          <em>#dotlrn.No# @departments_pretty_plural@</em>
+          <em>#dotlrn.no_departments#</em>
         </td>
       </tr>
     </else>
@@ -94,7 +94,7 @@
       <td align="left">
         <nobr>
           <small>[
-            <a href="department-new?referer=@referer@">#dotlrn.New# @departments_pretty_name@</a>
+            <a href="department-new?referer=@referer@">#dotlrn.new_department#</a>
           ]</small>
         </nobr>
       </td>
Index: openacs-4/packages/dotlrn/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/index.adp,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/dotlrn/www/admin/index.adp	23 Oct 2002 12:38:40 -0000	1.21
+++ openacs-4/packages/dotlrn/www/admin/index.adp	11 Dec 2002 13:53:51 -0000	1.22
@@ -36,9 +36,7 @@
   <li><a href="term?term_id=-1"><%= [parameter::get -localize -parameter class_instances_pretty_plural] %></a></li>
   <li><a href="clubs"><%= [parameter::get -localize -parameter clubs_pretty_plural] %></a></li> 
   <li><a href="portal-templates">#dotlrn.portal_templates#</a></li>
-  <li><a href="archived-communities">#dotlrn.archived#
-        <%= [parameter::get -localize -parameter class_instances_pretty_plural] %> #dotlrn.and#
-        <%= [parameter::get -localize -parameter clubs_pretty_plural] %></a></li>
+  <li><a href="archived-communities">#dotlrn.archived_classes_and_communities#</a></li>
   <li><a href="edit-preapproved-emails">#dotlrn.edit_approved_email_servers#</a></li>
 </ul>
 
Index: openacs-4/packages/dotlrn/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/index.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn/www/admin/index.tcl	23 Oct 2002 12:38:40 -0000	1.13
+++ openacs-4/packages/dotlrn/www/admin/index.tcl	11 Dec 2002 13:53:51 -0000	1.14
@@ -24,5 +24,8 @@
 set admin_pretty_name [parameter::get -localize -parameter dotlrn_admin_pretty_name]
 set context_bar {}
 
-ad_return_template
+# Some en_US messages reuse these configurable pretty names
+set class_instances_pretty_plural [parameter::get -localize -parameter class_instances_pretty_plural]
+set clubs_pretty_plural [parameter::get -localize -parameter clubs_pretty_plural]
 
+ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/need-term-note.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/need-term-note.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/admin/need-term-note.adp	23 Oct 2002 12:38:40 -0000	1.7
+++ openacs-4/packages/dotlrn/www/admin/need-term-note.adp	11 Dec 2002 13:53:51 -0000	1.8
@@ -19,9 +19,5 @@
 %>
 
 <i>
-  <b>#dotlrn.Note#</b> #dotlrn.You_must_create# <a href="terms">#dotlrn.terms#</a> #dotlrn.to_be_able_to_create#
-  <%= [parameter::get -localize -parameter class_instances_pretty_plural] %>#dotlrn.lt__since_these_must_be_#
+  #dotlrn.you_need_to_create_terms_to_create_classes#
 </i>
-
-
-
Index: openacs-4/packages/dotlrn/www/admin/need-term-note.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/need-term-note.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/admin/need-term-note.tcl	11 Dec 2002 13:53:51 -0000	1.1
@@ -0,0 +1,5 @@
+
+# Used by the en_US version of the message in the adp file
+set terms_url "terms"
+set terms_pretty_plural [_ dotlrn.terms]
+set class_instances_pretty_plural [parameter::get -localize -parameter class_instances_pretty_plural]
Index: openacs-4/packages/dotlrn/www/admin/term.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term.adp,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/dotlrn/www/admin/term.adp	4 Dec 2002 09:51:04 -0000	1.20
+++ openacs-4/packages/dotlrn/www/admin/term.adp	11 Dec 2002 13:53:51 -0000	1.21
@@ -124,15 +124,11 @@
 <else>
     <td align="left" colspan="5">
 </else>
-      <i>#dotlrn.No# <%= [parameter::get -localize -parameter class_instances_pretty_plural] %></i>
+      <i>#dotlrn.no_class_instances#</i>
     </td>
   </tr>
 </else>
 
   </table>
 
 </center>
-
-
-
-
Index: openacs-4/packages/dotlrn/www/admin/term.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/dotlrn/www/admin/term.tcl	23 Oct 2002 12:38:40 -0000	1.11
+++ openacs-4/packages/dotlrn/www/admin/term.tcl	11 Dec 2002 13:53:51 -0000	1.12
@@ -116,5 +116,7 @@
     }
 }
 
-ad_return_template
+# Used by the en_US version of the no_class_instances message in the adp
+set class_instances_pretty_plural [parameter::get -localize -parameter class_instances_pretty_plural]
 
+ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.adp,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/dotlrn/www/admin/user.adp	4 Dec 2002 09:51:04 -0000	1.19
+++ openacs-4/packages/dotlrn/www/admin/user.adp	11 Dec 2002 13:53:51 -0000	1.20
@@ -111,7 +111,7 @@
 
 <if @member_classes:rowcount@ gt 0>
   <blockquote>
-    <h4><%= [parameter::get -localize -parameter class_instances_pretty_name] %> #dotlrn.Memberships#</h4>
+    <h4>#dotlrn.class_memberships#</h4>
 
     <ul>
 <multiple name="member_classes">
@@ -127,7 +127,7 @@
 
 <if @member_clubs:rowcount@ gt 0>
   <blockquote>
-    <h4><%= [parameter::get -localize -parameter clubs_pretty_name] %> #dotlrn.Memberships#</h4>
+    <h4>#dotlrn.community_memberships#</h4>
 
     <ul>
 <multiple name="member_clubs">
@@ -142,7 +142,7 @@
 
 <if @member_subgroups:rowcount@ gt 0>
   <blockquote>
-    <h4><%= [parameter::get -localize -parameter subcommunities_pretty_name] %> #dotlrn.Memberships#</h4>
+    <h4>#dotlrn.subcommunity_memberships#</h4>
 
     <ul>
 <multiple name="member_subgroups">
Index: openacs-4/packages/dotlrn/www/admin/user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/dotlrn/www/admin/user.tcl	4 Dec 2002 09:51:04 -0000	1.14
+++ openacs-4/packages/dotlrn/www/admin/user.tcl	11 Dec 2002 13:53:51 -0000	1.15
@@ -88,4 +88,9 @@
 
 set approve_user_url "/acs-admin/users/member-state-change?user_id=$user_id&member_state=approved&return_url=$dual_approve_return_url"
 
+# Used in some en_US messages in the adp file
+set class_instances_pretty_name [parameter::get -localize -parameter class_instances_pretty_name]
+set clubs_pretty_name [parameter::get -localize -parameter clubs_pretty_name]
+set subcommunities_pretty_name [parameter::get -localize -parameter subcommunities_pretty_name]
+
 ad_return_template