Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml	4 Jun 2005 12:36:44 -0000	1.8
+++ openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml	7 Jun 2005 07:45:39 -0000	1.9
@@ -4,109 +4,342 @@
   <msg key="--_select_a_group_--">-- select a group --</msg>
   <msg key="--select_one--">--select one--</msg>
   <msg key="Action">Action</msg>
+  <msg key="Actions">Actions</msg>
+  <msg key="Add">Add:</msg>
+  <msg key="Add_a_Group">Add a Group</msg>
   <msg key="Add_a_Person">Add a Person</msg>
   <msg key="Add_an_Organization">Add an Organization</msg>
+  <msg key="Add_Comment">Add Comment</msg>
+  <msg key="Add_Condition">Add Condition</msg>
   <msg key="Add_Group">Add Group</msg>
   <msg key="Add_Organization">Add Organization</msg>
   <msg key="Add_Person">Add Person</msg>
+  <msg key="Add_Search">Add Search</msg>
   <msg key="Add_Signature">Add Signature</msg>
   <msg key="Add_the_selected_contacts_to_a_category">Add the selected contacts to a category</msg>
   <msg key="Add_to_Category">Add to Category</msg>
+  <msg key="Add_to_Group">Add to Group</msg>
+  <msg key="Add_to_group">Add to group</msg>
+  <msg key="Add_to_Groups">Add to Group(s)</msg>
+  <msg key="Add_User">Add User</msg>
+  <msg key="Address">Address</msg>
   <msg key="Admin">Admin</msg>
   <msg key="Administer_Contacts">Administer Contacts</msg>
   <msg key="Advanced_Search">Advanced Search</msg>
   <msg key="Advanced_Searches">Advanced Searches</msg>
   <msg key="All">All</msg>
+  <msg key="All__Edit">All / Edit</msg>
   <msg key="Answer">Answer</msg>
   <msg key="Archive">Archive</msg>
   <msg key="Archive_the_checked_contacts">Archive the checked contacts</msg>
   <msg key="Archived">Archived</msg>
+  <msg key="area_code_is_-">area code is -&gt;</msg>
+  <msg key="area_code_is_not_-">area code is not -&gt;</msg>
   <msg key="at">at</msg>
   <msg key="Attribute">Attribute</msg>
+  <msg key="Attribute_-">Attribute -&gt;</msg>
   <msg key="Attributes">Attributes</msg>
+  <msg key="Cancel">Cancel</msg>
+  <msg key="Clear">Clear</msg>
   <msg key="Clear_the_currently_selected_Category">Clear the currently selected Category</msg>
   <msg key="Clear_the_currently_selected_Search">Clear the currently selected Search</msg>
+  <msg key="Comment_Added">Comment Added</msg>
   <msg key="Comments">Comments</msg>
+  <msg key="Configuration_Error">Configuration Error</msg>
   <msg key="Contact">Contact</msg>
+  <msg key="Contact_-">Contact -&gt;</msg>
+  <msg key="contact_is_in_-">contact is in -&gt;</msg>
+  <msg key="contact_is_not_in_-">contact is not in -&gt;</msg>
   <msg key="Contact_Relationship">Contact Relationship</msg>
   <msg key="Contact_Type">Contact Type</msg>
   <msg key="Contact_Type_One">Contact Type One</msg>
   <msg key="Contact_Type_Two">Contact Type Two</msg>
   <msg key="Contacts">Contacts</msg>
+  <msg key="contacts">contacts</msg>
+  <msg key="contains_-">contains -&gt;</msg>
+  <msg key="country_code_is_-">country code is -&gt;</msg>
+  <msg key="country_is_-">country is -&gt;</msg>
+  <msg key="country_is_not_-">country is not -&gt;</msg>
+  <msg key="Create">Create</msg>
   <msg key="Create_a_role">Create a role</msg>
+  <msg key="Create_a_Signature">Create a Signature</msg>
   <msg key="create_project">Create project</msg>
   <msg key="Create_role">Create role</msg>
+  <msg key="CSV">CSV</msg>
   <msg key="Current">Current</msg>
+  <msg key="Date">Date</msg>
+  <msg key="days">days</msg>
+  <msg key="Delete">Delete</msg>
+  <msg key="Details">Details</msg>
+  <msg key="does_not_contain_-">does not contain -&gt;</msg>
+  <msg key="Done">Done</msg>
+  <msg key="Edit">Edit</msg>
+  <msg key="Edit_a_Signature">Edit a Signature</msg>
+  <msg key="Edit_Details">Edit Details</msg>
+  <msg key="Edit_group_name">Edit ${group_name}</msg>
   <msg key="Email_Address">Email Address</msg>
+  <msg key="Error">Error</msg>
   <msg key="even">even</msg>
+  <msg key="False">False</msg>
+  <msg key="File">File</msg>
+  <msg key="Files">Files</msg>
+  <msg key="files">files</msg>
+  <msg key="First_Name">First Name</msg>
   <msg key="First_Names">First Names</msg>
+  <msg key="Go">Go</msg>
+  <msg key="Group_-">Group -&gt;</msg>
+  <msg key="Group_Name">Group Name</msg>
   <msg key="Groups">Groups</msg>
+  <msg key="groups">groups</msg>
+  <msg key="has_logged_in">has logged in</msg>
+  <msg key="has_never_logged_in">has never logged in</msg>
   <msg key="Help_Text">Help Text</msg>
+  <msg key="Invalid_Object_Type">Invalid Object Type</msg>
+  <msg key="is_-">is -&gt;</msg>
+  <msg key="is_after_-">is after -&gt;</msg>
+  <msg key="is_before_-">is before -&gt;</msg>
+  <msg key="is_greater_than_-">is greater than -&gt;</msg>
+  <msg key="is_less_than_-">is less than -&gt;</msg>
+  <msg key="is_more_than_-">is more than -&gt;</msg>
+  <msg key="is_not_-">is not -&gt;</msg>
+  <msg key="is_not_set">is not set</msg>
+  <msg key="is_set">is set</msg>
   <msg key="last">last</msg>
   <msg key="Last_Name">Last Name</msg>
   <msg key="Limit_Contacts_to">Limit Contacts to</msg>
+  <msg key="lt_--_Groups_-----------">-- Groups --------------------------</msg>
+  <msg key="lt_--_My_Searches_------">-- My Searches ---------------------</msg>
+  <msg key="lt_--_no_not_include_a_s">-- no not include a signature --</msg>
+  <msg key="lt_--_top_level_group_--">-- top level group --</msg>
   <msg key="lt_Add_relationship_type">Add relationship type</msg>
+  <msg key="lt_Add_to_Selected_Group">Add to Selected Group(s)</msg>
   <msg key="lt_Advanced_searches_are">Advanced searches are very powerful but in return they require very specific input...</msg>
   <msg key="lt_All_searches_are_case">All searches are case insensitive, capitalization does not matter. If more than one contact match the search a list of results is returned. If only one contact meets the search criteria you are redirected to that contact.</msg>
+  <msg key="lt_brbrsave_this_search_">&lt;br&gt;&lt;br&gt;save this search as</msg>
+  <msg key="lt_commented_on_in_last_">commented on in last -&gt;</msg>
   <msg key="lt_commentspretty_date_a">%comments.pretty_date% at %comments.pretty_time% -</msg>
+  <msg key="lt_Contact_Administratio">Contact Administration</msg>
   <msg key="lt_Contact_Relationships">Contact Relationships</msg>
+  <msg key="lt_Contactsset_context_i">Contacts&quot;
+set context {}
+
+if { [exists_and_not_null query_id] } {
+    if { [contact::search::exists_p -search_id $query_id] } {
+        set search_id $query_id
+        set query_type &quot;search&quot;
+    } else {
+        set group_id $query_id
+        set query_type &quot;group&quot;
+    }
+} else {
+#    set group_id [application_group::group_id_from_package_id -package_id [ad_conn subsite_id]]
+    set group_id [contacts::default_group]
+    set query_id $group_id
+    set query_type &quot;group&quot;
+    if { ![exists_and_not_null group_id] } {
+        ad_return_error &quot;&lt;#_  Not Configured&quot; &quot;&lt;#_  Your administrator must map and add a default group in the &lt;a href=\&quot;admin\&quot;&gt;admin pages&lt;/a&gt;&quot;
+    }
+}
+
+
+if { $orderby == &quot;first_names,asc&quot; } {
+    set name_order 0
+    set name_label &quot;&lt;#_ Sort by: First Names</msg>
+  <msg key="lt_country_code_is_not_-">country code is not -&gt;</msg>
+  <msg key="lt_created_in_the_last_-">created in the last -&gt;</msg>
   <msg key="lt_Currently_the_system_">Currently, the system is able to handle the following types of relationships:</msg>
   <msg key="lt_Debugging_Code_-_Only">Debugging Code - Only SW Admins See This</msg>
   <msg key="lt_Define_a_new_relation">Define a new relationship type</msg>
+  <msg key="lt_Delete_the_selected_C">Delete the selected Contacts</msg>
+  <msg key="lt_Delete_the_selectted_">Delete the selectted files</msg>
+  <msg key="lt_E-mail_or_Mail_the_se">E-mail or Mail the selected contacts</msg>
+  <msg key="lt_Edita____________grou">Edit&quot;&gt;&lt;/a&gt;
+	    }
+	}
+        group_name {
+            label {&lt;#_ Group</msg>
   <msg key="lt_Entering_a_string_in_">Entering a string in the normal search box means that a search will be performed where:</msg>
   <msg key="lt_Existing_Relationship">Existing Relationships</msg>
   <msg key="lt_First_Names_contains_">&quot;First Names&quot; contains &quot;Search_Word&quot; or</msg>
+  <msg key="lt_First_Names_is_requir">First Names is required</msg>
+  <msg key="lt_Group_group_name_Crea">Group '${group_name}' Created</msg>
+  <msg key="lt_Group_group_name_Upda">Group '${group_name}' Updated</msg>
+  <msg key="lt_Group_Information_Sav">Group Information Saved.</msg>
+  <msg key="lt_has_logged_in_within_">has logged in within -&gt;</msg>
+  <msg key="lt_has_not_logged_in_wit">has not logged in within -&gt;</msg>
   <msg key="lt_If_in_a_normal_search">If in a normal search we search for &quot;D Jane&quot;. The first Search_Word (&quot;D&quot;) matches contacts 123 (via &quot;Doe&quot;), 234 (via &quot;Doe&quot;), and 345 (via &quot;Alfred&quot;). And the second Search_Word (&quot;Jane&quot;) matches only contact 123. Thus only one contact meets both requirements and &quot;Jane Doe&quot; (contact 123) is returned.</msg>
   <msg key="lt_If_multiple_words_are">If multiple words are used then all words must match the above critera. So, for example if our contacts database contains these entries:</msg>
   <msg key="lt_Instance_Permissions_">Instance Permissions - Not done yet</msg>
+  <msg key="lt_Insufficient_Permissi">Insufficient Permissions</msg>
+  <msg key="lt_Invalid_input_you_spe">Invalid input, you specified form as '$form' but should only specify: top, bottom, none</msg>
+  <msg key="lt_labels_are_not_implem">labels are not implemented yet</msg>
   <msg key="lt_Last_Name_contains_Se">&quot;Last Name&quot; contains &quot;Search_Word&quot; or</msg>
+  <msg key="lt_Last_Name_is_required">Last Name is required</msg>
   <msg key="lt_Last_updated_update_d">Last updated: %update_date%</msg>
+  <msg key="lt_li_The_role_you_enter">&lt;li&gt; The role you entered \&quot;$pretty_name\&quot; or the plural \&quot;$pretty_plural\&quot; already exists.</msg>
   <msg key="lt_Make_sure_you_do_not_">Make sure you do not add the same attribute to multiple groups</msg>
+  <msg key="lt_nbspnbsp_Show_set_fir">&amp;nbsp;&amp;nbsp; Show: &quot;
+set first_p 1
+foreach page_s [list 25 50 100 500] {
+    if { [string is false $first_p] } {
+        append name_label &quot; | &quot;
+    }
+    if { $page_size == $page_s } {
+        append name_label $page_s
+    } else {
+        append name_label &quot;&lt;a href=\&quot;[export_vars -base . -url {rel_type format query_id query page orderby {page_size $page_s}}]\&quot;&gt;$page_s&lt;/a&gt;&quot;
+    }
+    set first_p 0
+}
+append name_label &quot;&amp;nbsp;&amp;nbsp;&amp;nbsp;&lt;#_ Get</msg>
+  <msg key="lt_neither_person_nor_or">neither person nor org type is valid, what happened admin?</msg>
+  <msg key="lt_not_commented_on_in_l">not commented on in last -&gt;</msg>
+  <msg key="lt_not_created_in_the_la">not created in the last -&gt;</msg>
+  <msg key="lt_not_updated_in_the_la">not updated in the last -&gt;</msg>
+  <msg key="lt_of_the_following_cond">of the following conditions:&lt;br&gt;</msg>
   <msg key="lt_Once_ready_for_releas">Once ready for release this will be taken care of in code</msg>
   <msg key="lt_Organization_Name_con">&quot;Organization Name&quot; contains &quot;Search_Word&quot; or</msg>
   <msg key="lt_Organization_Relation">Organization Relationship</msg>
   <msg key="lt_Organization_Relation_1">Organization Relationships</msg>
   <msg key="lt_Party_ID_equals_Searc">&quot;Party ID&quot; equals &quot;Search_Word&quot;</msg>
+  <msg key="lt_People_or_Organizatio">People or Organizations</msg>
   <msg key="lt_Person_or_Organizatio">Person or Organization</msg>
+  <msg key="lt_pretty_plural_list_na">$pretty_plural_list_name found in search, please try again or add a new contact</msg>
+  <msg key="lt_remember_that_you_can">remember that you can use &lt;a href=&quot;message-help&quot;&gt;mail merge substitutions&lt;/a&gt;. the most common wildcards are \{name\} \{first_names\}, \{last_name\}, \{home_address\} and \{date\}</msg>
+  <msg key="lt_Remove_from_Selected_">Remove from Selected Group(s)</msg>
+  <msg key="lt_Remove_from_this_Grou">Remove from this Group</msg>
+  <msg key="lt_Some_of_the_required_">Some of the required elements for this form are missing. Please contact an administrator and make sure that the following attributes are included in the default group's form for this object type:&lt;ul&gt;&lt;li&gt;[join $missing_elements</msg>
+  <msg key="lt_Some_of_the_required__1">Some of the required elements for this form are missing. Please contact an administrator and make sure that the following attributes are included:&lt;ul&gt;&lt;li&gt;[join $missing_elements</msg>
+  <msg key="lt_stateprovince_is_not_">state/province is not -&gt;</msg>
+  <msg key="lt_the_action_supplied_i">the action supplied is not valid</msg>
   <msg key="lt_The_contact_specified">The contact specified does not exist</msg>
+  <msg key="lt_The_contact_specified_1">The contact specified is not one of the contacts in this relationship</msg>
   <msg key="lt_The_default_group_mus">The default group must have first_names and last_name for person objects and name for organization objects, both of them need email</msg>
+  <msg key="lt_The_file_lindex_messa">The file [lindex $message 0] was successfully uploaded</msg>
+  <msg key="lt_The_files_join_messag">The files [join $message &quot;, &quot;] were successfully uploaded</msg>
+  <msg key="lt_The_first_contact_spe">The first contact specified does not exist</msg>
+  <msg key="lt_The_first_role_specif">The first role specified does not exist</msg>
+  <msg key="lt_The_parameter_RecentO">The parameter RecentOnTopP is not set correctly for the General Comments package, please enter either a '0' or a '1'</msg>
+  <msg key="lt_The_party_id_specifie">The party_id specified does not exist</msg>
+  <msg key="lt_The_second_contact_sp">The second contact specified does not exist</msg>
+  <msg key="lt_The_second_role_speci">The second role specified does not exist</msg>
+  <msg key="lt_There_was_a_problem_w">There was a problem with your input. this type of relationship cannot exist.</msg>
+  <msg key="lt_This_action_cannot_be">This action cannot be taken for unmapped groups</msg>
   <msg key="lt_This_contact_is_not_p">This contact is not part of any groups - this is a problem.</msg>
+  <msg key="lt_This_group_is_already">This group is already the default</msg>
+  <msg key="lt_This_group_is_already_1">This group is already mapped</msg>
+  <msg key="lt_this_is_my_default_si">this is my default signature</msg>
+  <msg key="lt_This_signature_specif">This signature specified either does not exist or does not belong to you</msg>
+  <msg key="lt_This_user_is_awaiting">This user is awaiting administrator approval</msg>
+  <msg key="lt_This_users_has_not_be">This users has not been approved</msg>
+  <msg key="lt_updated_in_the_last_-">updated in the last -&gt;</msg>
   <msg key="lt_What_role_does_contac">What role does %contact_name_one% have when %contact_name_two% is a %secondary_role_pretty%:</msg>
   <msg key="lt_You_cannot_add_this_c">You cannot add this contact to more groups.</msg>
+  <msg key="lt_You_cannot_make_sub_g">You cannot make sub groups the default group</msg>
+  <msg key="lt_You_cannot_map_groups">You cannot map groups whose parent groups are not mapped</msg>
+  <msg key="lt_You_cannot_unmap_the_">You cannot unmap the default group</msg>
+  <msg key="lt_You_do_not_have_permi">You do not have permission to add users to groups</msg>
+  <msg key="lt_You_have_not_specifie">You have not specified a valid contact type</msg>
+  <msg key="lt_You_have_specified_an">You have specified an invalid Object Type</msg>
+  <msg key="lt_You_have_specified_an_1">You have specified an invalid size for the textarea</msg>
+  <msg key="lt_Your_administrator_mu">Your administrator must map and add a default group in the &lt;a href=\&quot;admin\&quot;&gt;admin pages&lt;/a&gt;</msg>
+  <msg key="lt_Your_need_to_provide_">Your need to provide some contacts to send a message</msg>
+  <msg key="lt_Your_provided_an_inva">Your provided an invalid Message Type</msg>
+  <msg key="lt_zippostal_does_not_st">zip/postal does not start with -&gt;</msg>
+  <msg key="lt_zippostal_starts_with">zip/postal starts with -&gt;</msg>
+  <msg key="Mail">Mail</msg>
+  <msg key="Mail_Merge">Mail Merge</msg>
   <msg key="Mail_Merge_Results">Mail Merge Results</msg>
   <msg key="Make_Current">Make Current</msg>
   <msg key="Make_the_checked_contacts_current">Make the checked contacts current</msg>
+  <msg key="Message">Message</msg>
+  <msg key="Message_is_required">Message is required</msg>
+  <msg key="Messages">Messages</msg>
   <msg key="mine-">mine-</msg>
   <msg key="My_Searches">My Searches</msg>
   <msg key="My_Signatures">My Signatures</msg>
   <msg key="Name">Name</msg>
+  <msg key="Name_is_required">Name is required</msg>
+  <msg key="Next">Next</msg>
   <msg key="none">(none)</msg>
   <msg key="Normal_Searches">Normal Searches</msg>
+  <msg key="Not_Configured">Not Configured</msg>
   <msg key="Number_of_Rows">Number of Rows</msg>
   <msg key="odd">odd</msg>
   <msg key="of">of</msg>
   <msg key="Ordering">Ordering</msg>
   <msg key="Organization">Organization</msg>
+  <msg key="Organization_Form">Organization Form</msg>
   <msg key="Organizations">Organizations</msg>
+  <msg key="organizations">organizations</msg>
+  <msg key="Output">Output</msg>
+  <msg key="Paper_Type">Paper Type</msg>
+  <msg key="Parent_Group">Parent Group</msg>
   <msg key="Party_Revision">Party Revision</msg>
   <msg key="Party_Revisions">Party Revisions</msg>
+  <msg key="People">People</msg>
+  <msg key="people">people</msg>
+  <msg key="Permissions">Permissions</msg>
   <msg key="Person">Person</msg>
+  <msg key="Person_Form">Person Form</msg>
+  <msg key="Preview">Preview</msg>
   <msg key="PROJECT">PROJECT</msg>
   <msg key="Public_Page">Public Page</msg>
   <msg key="READ_THESE">READ THESE</msg>
+  <msg key="Recipients">Recipients</msg>
+  <msg key="Relationship_Added">Relationship Added</msg>
+  <msg key="Relationship_Deleted">Relationship Deleted</msg>
   <msg key="Relationship_types">Relationship types</msg>
+  <msg key="Relationship_Updated">Relationship Updated</msg>
   <msg key="Relationships">Relationships</msg>
+  <msg key="relationships">relationships</msg>
+  <msg key="Remove_From_Group">Remove From Group</msg>
+  <msg key="Remove_From_to_Group">Remove From to Group</msg>
   <msg key="Required">Required</msg>
+  <msg key="Results">Results:</msg>
+  <msg key="Return_to_title">Return to \&quot;$title\&quot;</msg>
+  <msg key="Role">Role</msg>
+  <msg key="Role_Name">Role Name</msg>
   <msg key="Role_One">Role One</msg>
+  <msg key="Role_Plural">Role Plural</msg>
+  <msg key="Role_Singular">Role Singular</msg>
   <msg key="Role_Two">Role Two</msg>
   <msg key="Roles">Roles</msg>
+  <msg key="Save">Save</msg>
+  <msg key="Save_and_Add_Another">Save and Add Another</msg>
+  <msg key="Save_As">Save As</msg>
+  <msg key="Save_Message_As">Save Message As</msg>
   <msg key="Search">Search</msg>
+  <msg key="Search_Help">Search Help</msg>
+  <msg key="searches">searches</msg>
+  <msg key="Select">Select</msg>
   <msg key="Send_an_email_message_to_the_selected_contacts">Send an email message to the selected contacts</msg>
   <msg key="Send_Email">Send Email</msg>
   <msg key="Settings">Settings</msg>
+  <msg key="Show">Show:</msg>
   <msg key="Showing">Showing</msg>
+  <msg key="Signature">Signature</msg>
+  <msg key="signatures">signatures</msg>
   <msg key="Sort_By">Sort By</msg>
+  <msg key="Sort_by">Sort by:</msg>
+  <msg key="stateprovince_is_-">state/province is -&gt;</msg>
   <msg key="Status">Status</msg>
+  <msg key="Subject">Subject</msg>
+  <msg key="Subject_is_required">Subject is required</msg>
+  <msg key="Summary_View">Summary View</msg>
+  <msg key="Table">Table</msg>
+  <msg key="Tasks">Tasks</msg>
+  <msg key="The_error_was_errmsg">The error was: $errmsg</msg>
+  <msg key="True">True</msg>
+  <msg key="Type">Type</msg>
+  <msg key="Update">Update</msg>
+  <msg key="Update_filenames">Update filenames</msg>
+  <msg key="Updated_By">Updated By</msg>
+  <msg key="Updated_On">Updated On</msg>
+  <msg key="Upload_More">Upload More</msg>
   <msg key="View_all_roles">View all roles</msg>
+  <msg key="View_next">View next</msg>
+  <msg key="which_match">which match</msg>
   <msg key="Widget">Widget</msg>
+  <msg key="your_signatures">your signatures</msg>
 </message_catalog>
Index: openacs-4/packages/contacts/lib/comments.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/comments.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/contacts/lib/comments.tcl	31 May 2005 17:08:41 -0000	1.4
+++ openacs-4/packages/contacts/lib/comments.tcl	7 Jun 2005 07:45:39 -0000	1.5
@@ -3,15 +3,15 @@
 #    @cvs-id $Id$
 
 if { [string is false [contact::exists_p -party_id $party_id]] } {
-    error "The party_id specified does not exist"
+    error "[_ contacts.lt_The_party_id_specifie]"
 }
 
 if { [string is false [exists_and_not_null recent_on_top_p]] } {
     set recent_on_top_p [parameter::get_from_package_key -boolean -package_key "general-comments" -parameter "RecentOnTopP"]
 }
 
 if { [string is false [exists_and_not_null recent_on_top_p]] } {
-    error "The parameter RecentOnTopP is not set correctly for the General Comments package, please enter either a '0' or a '1'"
+    error "[_ contacts.lt_The_parameter_RecentO]"
 } else {
     if { $recent_on_top_p } {
         set orderby_clause "creation_date desc"
@@ -29,7 +29,7 @@
     small   {
         set textarea_size "cols 35 rows 3"
     }
-    default { error "You have specified an invalid size for the textarea" }
+    default { error "[_ contacts.lt_You_have_specified_an_1]" }
 }
 
 if { [string is false [exists_and_not_null form]] } {
@@ -40,7 +40,7 @@
     }
 }
 if { [lsearch [list top bottom none] $form] < 0 } {
-    error "Invalid input, you specified form as '$form' but should only specify: top, bottom, none"
+    error "[_ contacts.lt_Invalid_input_you_spe]"
 }
 
 
@@ -102,20 +102,14 @@
 }
 
 ad_form -name comment_add \
-    -action "[ad_conn package_url]comment-add" \
+   -action "[ad_conn package_url]comment-add" \
     -form "
         party_id:integer(hidden)
         return_url:text(hidden),optional
         {comment:text(textarea),nospell {label {}} {html {$textarea_size}} {after_html {<br />}}}
-        {save:text(submit),optional {label {Add Comment}}}
+        {save:text(submit),optional {label {[_ contacts.Add_Comment]}}}
     " -on_request {
     } -after_submit {
     }
 
-
-
-
-
-
-
 set user_id [ad_conn user_id]
Index: openacs-4/packages/contacts/lib/contact-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-master.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/contacts/lib/contact-master.tcl	6 Jun 2005 20:31:52 -0000	1.7
+++ openacs-4/packages/contacts/lib/contact-master.tcl	7 Jun 2005 07:45:39 -0000	1.8
@@ -6,7 +6,7 @@
 # Set up links in the navbar that the user has access to
 set name [contact::name -party_id $party_id]
 if { ![exists_and_not_null name] } {
-    ad_complain "The contact specified does not exist"
+    ad_complain "[_ contacts.lt_The_contact_specified]"
 }
 
 set user_id [ad_conn user_id]
@@ -25,30 +25,30 @@
 set link_list [list]
 if { [ad_conn user_id] != 0} {
     lappend link_list "${prefix}edit"
-    lappend link_list "All / Edit"
+    lappend link_list "[_ contacts.All__Edit]"
 
     lappend link_list "${prefix}"
-    lappend link_list "Summary View"
+    lappend link_list "[_ contacts.Summary_View]"
 
     lappend link_list "${prefix}groups"
-    lappend link_list "Groups"
+    lappend link_list "[_ contacts.Groups]"
 
     lappend link_list "${prefix}relationships"
-    lappend link_list "Relationships"
+    lappend link_list "[_ contacts.Relationships]"
 
     lappend link_list "${prefix}comments"
-    lappend link_list "Comments"
+    lappend link_list "[_ contacts.Comments]"
 
     lappend link_list "${prefix}files"
-    lappend link_list "Files"
+    lappend link_list "[_ contacts.Files]"
 
     if { [site_node::get_package_url -package_key "tasks"] != "" } {
 	lappend link_list "/tasks/contact?party_id=$party_id"
-	lappend link_list "Tasks"
+	lappend link_list "[_ contacts.Tasks]"
     }
 
     lappend link_list "${prefix}message"
-    lappend link_list "Mail"
+    lappend link_list "[_ contacts.Mail]"
 }
 
 # not yet implemented
Index: openacs-4/packages/contacts/lib/groups.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/groups.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/contacts/lib/groups.tcl	27 May 2005 09:35:43 -0000	1.4
+++ openacs-4/packages/contacts/lib/groups.tcl	7 Jun 2005 07:45:39 -0000	1.5
@@ -3,7 +3,7 @@
 #    @cvs-id $Id$
 
 if { [string is false [contact::exists_p -party_id $party_id]] } {
-    error "The party_id specified does not exist"
+    error "[_ contacts.lt_The_party_id_specifie]"
 }
 if { [string is false [exists_and_not_null hide_form_p]] } {
     set hide_form_p 0
Index: openacs-4/packages/contacts/tcl/contacts-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-procs-postgresql.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/contacts/tcl/contacts-procs-postgresql.xql	27 May 2005 00:18:58 -0000	1.5
+++ openacs-4/packages/contacts/tcl/contacts-procs-postgresql.xql	7 Jun 2005 07:45:40 -0000	1.6
@@ -68,9 +68,9 @@
 <fullquery name="contact::group::map.map_group">
   <querytext>
         insert into contact_groups
-        (group_id,owner_id,group_type,deprecated_p,package_id)
+        (group_id,default_p,package_id)
         values
-        (:group_id,:owner_id,:group_type,:deprecated_p,:package_id)
+        (:group_id,:default_p,:package_id)
   </querytext>
 </fullquery>
 
Index: openacs-4/packages/contacts/tcl/contacts-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/contacts/tcl/contacts-procs.tcl	4 Jun 2005 12:36:45 -0000	1.6
+++ openacs-4/packages/contacts/tcl/contacts-procs.tcl	7 Jun 2005 07:45:40 -0000	1.7
@@ -218,16 +218,12 @@
 
 ad_proc -public contact::group::map {
     -group_id:required
-    {-owner_id ""}
-    {-group_type "private"}
     {-package_id ""}
+    {-default_p "f"}
 } {
     this creates a new group for use with contacts (and the permissions system)
 } {
-    if {[exists_and_not_null owner_id]} {
-	set owner_id [ad_conn user_id]
-    }
-    if {[exists_and_not_null package_id]} {
+    if {[empty_string_p $package_id]} {
 	set package_id [ad_conn package_id]
     }
     db_dml map_group {}
Index: openacs-4/packages/contacts/www/comment-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/comment-add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/www/comment-add.tcl	18 May 2005 16:45:49 -0000	1.2
+++ openacs-4/packages/contacts/www/comment-add.tcl	7 Jun 2005 07:45:40 -0000	1.3
@@ -13,7 +13,7 @@
 } -validate {
     contact_exists -requires {party_id} {
 	if { ![contact::exists_p -party_id $party_id] && ![ad_form_new_p -key party_id] } {
-	    ad_complain "The contact specified does not exist"
+	    ad_complain "[_ contacts.lt_The_contact_specified]"
 	}
     }
 }
@@ -65,14 +65,14 @@
 	}
     
     } on_error {
-	ad_return_error "Error" $errmsg
+	ad_return_error "[_ contacts.Error]" $errmsg
     }
 }
 if { [string is false [exists_and_not_null return_url]] } {
     set return_url [contact::url -party_id $party_id]
 }
 
-ad_returnredirect -message "Comment Added" $return_url
+ad_returnredirect -message "[_ contacts.Comment_Added]" $return_url
 ad_script_abort
 
 
Index: openacs-4/packages/contacts/www/comments.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/comments.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/comments.tcl	18 May 2005 16:45:49 -0000	1.1
+++ openacs-4/packages/contacts/www/comments.tcl	7 Jun 2005 07:45:40 -0000	1.2
@@ -11,7 +11,7 @@
 } -validate {
     contact_exists -requires {party_id} {
 	if { ![contact::exists_p -party_id $party_id] } {
-	    ad_complain "The contact specified does not exist"
+	    ad_complain "[_ contacts.lt_The_contact_specified]"
 	}
     }
 }
Index: openacs-4/packages/contacts/www/contact-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact-add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/www/contact-add.tcl	26 May 2005 09:39:27 -0000	1.2
+++ openacs-4/packages/contacts/www/contact-add.tcl	7 Jun 2005 07:45:40 -0000	1.3
@@ -10,7 +10,7 @@
 } -validate {
     valid_type -requires {object_type} {
 	if { [lsearch [list organization person] $object_type] < 0 } {
-	    ad_complain "You have not specified a valid contact type"
+	    ad_complain "[_ contacts.lt_You_have_not_specifie]"
 	}
     }
 }
@@ -22,9 +22,9 @@
 lappend form_elements {object_type:text(hidden)}
 
 if { $object_type == "person" } {
-    set title "Add a Person"
+    set title "[_ contacts.Add_a_Person]"
 } else {
-    set title "Add an Organization"
+    set title "[_ contacts.Add_an_Organization]"
 }
 
 set user_id [ad_conn user_id]
@@ -33,9 +33,9 @@
 
 ad_form -name party_ae \
     -mode "edit" \
-    -cancel_label "Cancel" \
+    -cancel_label "[_ contacts.Cancel]" \
     -cancel_url [export_vars -base contact -url {party_id}] \
-    -edit_buttons [list [list Save save] [list "Save and Add Another" save_add_another]] \
+    -edit_buttons [list [list Save save] [list "[_ contacts.Save_and_Add_Another]" save_add_another]] \
     -form $form_elements
 
 callback contact::contact_form -package_id $package_id -form party_ae -object_type $object_type
@@ -57,7 +57,7 @@
 	}
 	# make the error message multiple item aware
 	if { [llength $missing_elements] > 0 } {
-	    ad_return_error "Configuration Error" "Some of the required elements for this form are missing. Please contact an administrator and make sure that the following attributes are included in the default group's form for this object type:<ul><li>[join $missing_elements "</li><li>"]</li></ul>" 
+            ad_return_error "[_ contacts.Configuration_Error]" "[_ contacts.lt_Some_of_the_required_]<ul><li>[join $missing_elements "</li><li>"]</li></ul>"
 	}
     } -edit_request {
     } -on_submit {
@@ -69,14 +69,14 @@
 
 	if { $object_type == "person" } {
 	    if { ![exists_and_not_null first_names] } {
-		template::element::set_error party_ae first_names "First Names is required"
+		template::element::set_error party_ae first_names "[_ contacts.lt_First_Names_is_requir]"
 	    }
 	    if { ![exists_and_not_null last_name] } {
-		template::element::set_error party_ae last_name "Last Name is required"
+		template::element::set_error party_ae last_name "[_ contacts.lt_Last_Name_is_required]"
 	    }
 	} else {
 	    if { ![exists_and_not_null name] } {
-		template::element::set_error party_ae name "Name is required"
+		template::element::set_error party_ae name "[_ contacts.Name_is_required]"
 	    }
 	}
 	if { ![template::form::is_valid party_ae] } {
@@ -127,7 +127,7 @@
 		    error $creation_info(creation_status)
 		}
 	    } on_error {
-		ad_return_error "Error" "The error was: $errmsg"
+		ad_return_error "[_ contacts.Error]" "[_ contacts.The_error_was_errmsg]"
 	    }
 	} else {
 	    # name is not included in this list because its required and checked for above
Index: openacs-4/packages/contacts/www/contact-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact-edit.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/contact-edit.tcl	18 May 2005 16:45:50 -0000	1.1
+++ openacs-4/packages/contacts/www/contact-edit.tcl	7 Jun 2005 07:45:40 -0000	1.2
@@ -10,7 +10,7 @@
 } -validate {
     contact_exists -requires {party_id} {
 	if { ![contact::exists_p -party_id $party_id] && ![ad_form_new_p -key party_id] } {
-	    ad_complain "The contact specified does not exist"
+	    ad_complain "[_ contacts.lt_The_contact_specified]"
 	}
     }
 }
@@ -69,7 +69,7 @@
 	}
 	# make the error message multiple item aware
 	if { [llength $missing_elements] > 0 } {
-	    ad_return_error "Configuration Error" "Some of the required elements for this form are missing. Please contact an administrator and make sure that the following attributes are included:<ul><li>[join $missing_elements "</li><li>"]</li></ul>" 
+	    ad_return_error "[_ contacts.Configuration_Error]" "[_ contacts.lt_Some_of_the_required__1]"</li><li>"]</li></ul>" 
 	}
 
     } -edit_request {
@@ -92,14 +92,14 @@
 
 	if { $object_type == "person" } {
 	    if { ![exists_and_not_null first_names] } {
-		template::element::set_error party_ae first_names "First Names is required"
+		template::element::set_error party_ae first_names "[_ contacts.lt_First_Names_is_requir]"
 	    }
 	    if { ![exists_and_not_null last_name] } {
-		template::element::set_error party_ae last_name "Last Name is required"
+		template::element::set_error party_ae last_name "[_ contacts.lt_Last_Name_is_required]"
 	    }
 	} else {
 	    if { ![exists_and_not_null name] } {
-		template::element::set_error party_ae name "Name is required"
+		template::element::set_error party_ae name "[_ contacts.Name_is_required]"
 	    }
 	}
 	if { ![template::form::is_valid party_ae] } {
Index: openacs-4/packages/contacts/www/contact-groups.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact-groups.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/www/contact-groups.tcl	27 May 2005 09:35:43 -0000	1.2
+++ openacs-4/packages/contacts/www/contact-groups.tcl	7 Jun 2005 07:45:40 -0000	1.3
@@ -22,7 +22,7 @@
 
 set groups_belonging_to [db_list get_party_groups { select group_id from group_distinct_member_map where member_id = :party_id }]
 
-set groups_to_add [list [list "-- select a group --" ""]]
+set groups_to_add [list [list "[_ contacts.--_select_a_group_--]" ""]]
 foreach group $group_options {
     if { [lsearch "$groups_belonging_to" [lindex $group 1]] >= 0 } {
         # the party is part of this group
@@ -33,6 +33,6 @@
 }
 
 if { [llength $group_options] == "0" } {
-    ad_return_error "Insufficient Permissions" "You do not have permission to add users to groups"
+    ad_return_error "[_ contacts.lt_Insufficient_Permissi]" "[_ contacts.lt_You_do_not_have_permi]"
 }
 
Index: openacs-4/packages/contacts/www/contact-rels.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact-rels.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/contacts/www/contact-rels.tcl	5 Jun 2005 19:44:54 -0000	1.7
+++ openacs-4/packages/contacts/www/contact-rels.tcl	7 Jun 2005 07:45:40 -0000	1.8
@@ -15,12 +15,12 @@
 } -validate {
     contact_one_exists -requires {party_id} {
 	if { ![contact::exists_p -party_id $party_id] } {
-	    ad_complain "The first contact specified does not exist"
+	    ad_complain "[_ contacts.lt_The_first_contact_spe]"
 	}
     }
     contact_two_exists -requires {party_two} {
 	if { ![contact::exists_p -party_id $party_two] } {
-	    ad_complain "The second contact specified does not exist"
+	    ad_complain "[_ contacts.lt_The_second_contact_sp]"
 	}
     }
 
@@ -59,12 +59,12 @@
     } else {
         if { $org_valid_p } {
             set rel_type "organization_rel"
-            set pretty_plural_list_name "organizations"
+            set pretty_plural_list_name "[_ contacts.organizations]"
         } elseif { $person_valid_p } {
             set rel_type "membership_rel"
-            set pretty_plural_list_name "people"
+            set pretty_plural_list_name "[_ contacts.people]"
         } else {
-            error "neither person nor org type is valid, what happened admin?"
+            error "[_ contacts.lt_neither_person_nor_or]"
         }
     }
 }
@@ -129,7 +129,7 @@
     -html {width 100%} \
     -name "contacts" \
     -multirow "contacts" \
-    -row_pretty_plural "$pretty_plural_list_name found in search, please try again or add a new contact" \
+    -row_pretty_plural "[_ contacts.lt_pretty_plural_list_na]" \
     -checkbox_name checkbox \
     -selected_format ${format} \
     -orderby_name "order_search" \
@@ -144,7 +144,7 @@
         contact {
 	    label {}
             display_template {
-		<a href="<%=[contact::url -party_id ""]%>@contacts.party_id@">@contacts.name@</a> <span style="padding-left: 1em; font-size: 80%;">\[<a href="@contacts.map_url@">Select</a>\]</span>
+		<a href="<%=[contact::url -party_id ""]%>@contacts.party_id@">@contacts.name@</a> <span style="padding-left: 1em; font-size: 80%;">\[<a href="@contacts.map_url@">[_ contacts.Select]</a>\]</span>
                 <span style="clear:both; display: block; margin-left: 10px; font-size: 80%;">@contacts.email@</sapn>
 	    }
         }
@@ -166,19 +166,19 @@
     } -filters {
     } -orderby {
         first_names {
-            label "First Name"
+            label "[_ contacts.First_Name]"
             orderby_asc  "lower(contact__name(party_id,'f')) asc"
             orderby_desc "lower(contact__name(party_id,'f')) asc"
         }
         last_name {
-            label "Last Name"
+            label "[_ contacts.Last_Name]"
             orderby_asc  "lower(contact__name(party_id,'t')) asc"
             orderby_desc "lower(contact__name(party_id,'t')) asc"
         }
         default_value first_names,asc
     } -formats {
 	normal {
-	    label "Table"
+	    label "[_ contacts.Table]"
 	    layout table
 	    row {
 		contact {}
@@ -201,9 +201,9 @@
 
 
 ad_form -name "search" -method "GET" -export {party_id} -form {
-    {role_two:text(select) {label "Add: "} {options $rel_options}}
+    {role_two:text(select) {label "[_ contacts.Add]"} {options $rel_options}}
     {query:text(text) {label ""} {html {size 24}}}
-    {search:text(submit) {label "Search"}}
+    {search:text(submit) {label "[_ contacts.Search]"}}
 } -on_request {
 } -edit_request {
 } -on_refresh {
@@ -215,46 +215,46 @@
     -html {width 100%} \
     -name "relationships" \
     -multirow "relationships" \
-    -row_pretty_plural "relationships" \
+    -row_pretty_plural "[_ contacts.relationships]" \
     -selected_format "normal" \
     -elements {
         role {
-            label "Role"
+            label "[_ contacts.Role]"
             display_col role_singular
         }
         other_name {
-            label "Contact"
+            label "[_ contacts.Contact]"
             display_col other_name
             link_url_eval $contact_url
         }
         details {
-            label "Details"
+            label "[_ contacts.Details]"
             display_col details;noquote
         }
         actions {
-            label "Actions"
+            label "[_ contacts.Actions]"
             display_template {
-                <a href="@relationships.rel_delete_url@" class="button">Delete</a></if>
-                <if @relationships.rel_add_edit_url@ not nil><a href="@relationships.rel_add_edit_url@" class="button">Edit Details</a></if>
+                <a href="@relationships.rel_delete_url@" class="button">[_ contacts.Delete]</a></if>
+                <if @relationships.rel_add_edit_url@ not nil><a href="@relationships.rel_add_edit_url@" class="button">[_ contacts.Edit_Details]</a></if>
             }
         }
     } -filters {
         party_id {}
     } -orderby {
         other_name {
-            label "Contact"
+            label "[_ contacts.Contact]"
             orderby_asc  "CASE WHEN object_id_one = :party_id THEN upper(contact__name(object_id_two)) ELSE upper(contact__name(object_id_one)) END asc, upper(role_singular) asc"
             orderby_desc "CASE WHEN object_id_one = :party_id THEN upper(contact__name(object_id_two)) ELSE upper(contact__name(object_id_one)) END desc, upper(role_singular) asc"
         }
         role {
-            label "Role"
+            label "[_ contacts.Role]"
             orderby_asc  "upper(role_singular) asc, CASE WHEN object_id_one = :party_id THEN upper(contact__name(object_id_two)) ELSE upper(contact__name(object_id_one)) END asc"
             orderby_desc "upper(role_singular) desc, CASE WHEN object_id_one = :party_id THEN upper(contact__name(object_id_two)) ELSE upper(contact__name(object_id_one)) END asc"
         }
         default_value role,asc
     } -formats {
 	normal {
-	    label "Table"
+	    label "[_ contacts.Table]"
 	    layout table
 	    row {
                 role {}
Index: openacs-4/packages/contacts/www/contact.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/contacts/www/contact.tcl	31 May 2005 17:08:41 -0000	1.7
+++ openacs-4/packages/contacts/www/contact.tcl	7 Jun 2005 07:45:40 -0000	1.8
@@ -10,7 +10,7 @@
 } -validate {
     contact_exists -requires {party_id} {
 	if { ![contact::exists_p -party_id $party_id] } {
-	    ad_complain "The contact specified does not exist"
+	    ad_complain "[_ contacts.lt_The_contact_specified]"
 	}
     }
 }
@@ -28,7 +28,7 @@
 
 set groups_belonging_to [db_list get_party_groups { select group_id from group_distinct_member_map where member_id = :party_id }]
 if { [lsearch $groups_belonging_to -2] < 0 } {
-    ad_return_error "This users has not been approved" "This user is awaiting administrator approval"
+    ad_return_error "[_ contacts.lt_This_users_has_not_be]" "[_ contacts.lt_This_user_is_awaiting]"
 }
 set ams_forms [list]
 foreach group [contact::groups -expand "all" -privilege_required "read"] {
@@ -69,14 +69,6 @@
     }
 }
 
-
-
-
-
-
-
-
-
 set live_revision [contact::live_revision -party_id $party_id]
 if { [exists_and_not_null live_revision] } {
     set update_date [db_string get_update_date { select to_char(publish_date,'Mon FMDD, YYYY at FMHH12:MIam') from cr_revisions where revision_id = :live_revision } -default {}]
Index: openacs-4/packages/contacts/www/files.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/files.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/files.tcl	27 May 2005 00:18:58 -0000	1.1
+++ openacs-4/packages/contacts/www/files.tcl	7 Jun 2005 07:45:40 -0000	1.2
@@ -12,7 +12,7 @@
 } -validate {
     contact_exists -requires {party_id} {
 	if { ![contact::exists_p -party_id $party_id] } {
-	    ad_complain "The contact specified does not exist"
+	    ad_complain "[_ contacts.lt_The_contact_specified]"
 	}
     }
 }
@@ -31,9 +31,9 @@
     lappend form_elements [list "upload_title${upload_number}:text(text),optional" [list html "size 45 maxlength 100"] [list label ""]]
     incr upload_number
 }
-if { $upload_count == 1 } { set upload_label "Upload" } else { set upload_label "Done" }
+if { $upload_count == 1 } { set upload_label "Upload" } else { set upload_label "[_ contacts.Done]" }
 lappend form_elements [list "upload:text(submit),optional" [list "label" $upload_label]]
-lappend form_elements [list "upload_more:text(submit),optional" [list "label" "Upload More"]]
+lappend form_elements [list "upload_more:text(submit),optional" [list "label" "[_ contacts.Upload_More]"]]
 
 ad_form -name upload_files -html {enctype multipart/form-data} -form $form_elements -on_request {
 } -on_submit {
@@ -66,9 +66,9 @@
         incr upload_number
     }
     if { [llength $message] == 1 } {
-	util_user_message -html -message "The file [lindex $message 0] was successfully uploaded"
+	util_user_message -html -message "[_ contacts.lt_The_file_lindex_messa]"
     } elseif { [llength $message] > 1 } {
-	util_user_message -html -message "The files [join $message ", "] were successfully uploaded"
+	util_user_message -html -message "[_ contacts.lt_The_files_join_messag]"
     }
 
 } -after_submit {
@@ -87,12 +87,12 @@
     -html {width 100%} \
     -name "files" \
     -multirow "files" \
-    -row_pretty_plural "files" \
+    -row_pretty_plural "[_ contacts.files]" \
     -checkbox_name checkbox \
     -bulk_action_export_vars [list party_id orderby] \
     -bulk_actions {
-        "Delete" "../files-delete" "Delete the selectted files"
-	"Update" "../files-update" "Update filenames"
+        "[_ contacts.Delete]" "../files-delete" "[_ contacts.lt_Delete_the_selectted_]"
+	"[_ contacts.Update]" "../files-update" "[_ contacts.Update_filenames]"
     } -selected_format "normal" \
     -key item_id \
     -elements {
@@ -108,41 +108,41 @@
 	    }
 	}
         type {
-	    label "Type"
+	    label "[_ contacts.Type]"
 	    display_col extension
 	}
         creation_date {
-	    label "Updated On"
+	    label "[_ contacts.Updated_On]"
 	    display_col creation_date_pretty
 	}
         creation_user {
-	    label "Updated By"
+	    label "[_ contacts.Updated_By]"
 	    display_col creation_user_pretty
 	}
     } -filters {
     } -orderby {
         file {
-            label "File"
+            label "[_ contacts.File]"
             orderby_asc  "upper(cr.title) asc,  ao.creation_date desc"
             orderby_desc "upper(cr.title) desc, ao.creation_date desc"
             default_direction asc
         }
         creation_date {
-            label "Updated On"
+            label "[_ contacts.Updated_On]"
             orderby_asc  "ao.creation_date asc"
             orderby_desc "ao.creation_date desc"
 	    default_direction desc
 	}
         creation_user {
-            label "Updated By"
+            label "[_ contacts.Updated_By]"
             orderby_asc  "upper(contact__name(ao.creation_user)) asc, upper(cr.title) asc"
             orderby_desc "upper(contact__name(ao.creation_user)) desc, upper(cr.title) asc"
 	    default_direction desc
 	}
         default_value file,asc
     } -formats {
 	normal {
-	    label "Table"
+	    label "[_ contacts.Table]"
 	    layout table
 	    row {
 	    }
Index: openacs-4/packages/contacts/www/group-parties-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/group-parties-add.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/group-parties-add.tcl	18 May 2005 16:45:50 -0000	1.1
+++ openacs-4/packages/contacts/www/group-parties-add.tcl	7 Jun 2005 07:45:40 -0000	1.2
@@ -11,7 +11,7 @@
 } -validate {
     valid_party_submission {
 	if { ![exists_and_not_null party_id] && ![exists_and_not_null party_ids] } { 
-	    ad_complain "Your need to provide some contacts to send a message"
+	    ad_complain "[_ contacts.lt_Your_need_to_provide_]"
 	}
     }
 }
@@ -24,7 +24,7 @@
 
 
 
-set title "Add to Group"
+set title "[_ contacts.Add_to_Group]"
 set user_id [ad_conn user_id]
 set context [list $title]
 set package_id [ad_conn package_id]
@@ -37,25 +37,25 @@
 set form_elements {
     party_ids:text(hidden)
     return_url:text(hidden)
-    {recipients:text(inform),optional {label "Contacts"}}
+    {recipients:text(inform),optional {label "[_ contacts.Contacts]"}}
 }
 
 set group_options [contact::groups -expand "all" -privilege_required "create"]
 if { [llength $group_options] == "0" } {
-    ad_return_error "Insufficient Permissions" "You do not have permission to add users to groups"
+    ad_return_error "[_ contacts.lt_Insufficient_Permissi]" "[_ contacts.lt_You_do_not_have_permi]"
 }
 
 append form_elements {
-    {group_ids:text(checkbox),multiple {label "Add to Group(s)"} {options $group_options}}
+    {group_ids:text(checkbox),multiple {label "[_ contacts.Add_to_Groups]"} {options $group_options}}
 }
-set edit_buttons [list [list "Add to Selected Group(s)" create]]
+set edit_buttons [list [list "[_ contacts.lt_Add_to_Selected_Group]" create]]
 
 
 
 
 ad_form -action group-parties-add \
     -name add_to_group \
-    -cancel_label "Cancel" \
+    -cancel_label "[_ contacts.Cancel]" \
     -cancel_url $return_url \
     -edit_buttons $edit_buttons \
     -form $form_elements \
Index: openacs-4/packages/contacts/www/group-parties-remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/group-parties-remove.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/group-parties-remove.tcl	18 May 2005 16:45:50 -0000	1.1
+++ openacs-4/packages/contacts/www/group-parties-remove.tcl	7 Jun 2005 07:45:40 -0000	1.2
@@ -12,7 +12,7 @@
 } -validate {
     valid_party_submission {
 	if { ![exists_and_not_null party_id] && ![exists_and_not_null party_ids] } { 
-	    ad_complain "Your need to provide some contacts to send a message"
+	    ad_complain "[_ contacts.lt_Your_need_to_provide_]"
 	}
     }
 }
@@ -25,7 +25,7 @@
 
 
 
-set title "Remove From to Group"
+set title "[_ contacts.Remove_From_to_Group]"
 set user_id [ad_conn user_id]
 set context [list $title]
 set package_id [ad_conn package_id]
@@ -38,25 +38,25 @@
 set form_elements {
     party_ids:text(hidden)
     return_url:text(hidden)
-    {recipients:text(inform),optional {label "Contacts"}}
+    {recipients:text(inform),optional {label "[_ contacts.Contacts]"}}
 }
 
 set group_options [contact::groups -expand "all" -privilege_required "create"]
 if { [llength $group_options] == "0" } {
-    ad_return_error "Insufficient Permissions" "You do not have permission to add users to groups"
+    ad_return_error "[_ contacts.lt_Insufficient_Permissi]" "[_ contacts.lt_You_do_not_have_permi]"
 }
 
 append form_elements {
-    {group_ids:text(checkbox),multiple {label "Add to Group(s)"} {options $group_options}}
+    {group_ids:text(checkbox),multiple {label "[_ contacts.Add_to_Groups]"} {options $group_options}}
 }
-set edit_buttons [list [list "Remove from Selected Group(s)" create]]
+set edit_buttons [list [list "[_ contacts.lt_Remove_from_Selected_]" create]]
 
 
 
 
 ad_form -action group-parties-remove \
     -name remove_from_group \
-    -cancel_label "Cancel" \
+    -cancel_label "[_ contacts.Cancel]" \
     -cancel_url $return_url \
     -edit_buttons $edit_buttons \
     -form $form_elements \
Index: openacs-4/packages/contacts/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/index.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/contacts/www/index.tcl	18 May 2005 16:45:50 -0000	1.3
+++ openacs-4/packages/contacts/www/index.tcl	7 Jun 2005 07:45:40 -0000	1.4
@@ -16,7 +16,7 @@
 }
 
 
-set title "Contacts"
+set title "[_ contacts.Contacts]"
 set context {}
 
 if { [exists_and_not_null query_id] } {
@@ -33,19 +33,19 @@
     set query_id $group_id
     set query_type "group"
     if { ![exists_and_not_null group_id] } {
-        ad_return_error "Not Configured" "Your administrator must map and add a default group in the <a href=\"admin\">admin pages</a>"
+        ad_return_error "[_ contacts.Not_Configured]" "[_ contacts.lt_Your_administrator_mu]"
     }
 }
 
 
 if { $orderby == "first_names,asc" } {
     set name_order 0
-    set name_label "Sort by: First Names | <a href=\"[export_vars -base . -url {rel_type format query_id query page page_size {orderby {last_name,asc}}}]\">Last Name</a>"
+    set name_label "[_ contacts.Sort_by] [_ contacts.First_Names] | <a href=\"[export_vars -base . -url {rel_type format query_id query page page_size {orderby {last_name,asc}}}]\">[_ contacts.Last_Name]</a>"
 } else {
     set name_order 1
-    set name_label "Sort by: <a href=\"[export_vars -base . -url {rel_type format query_id query page page_size {orderby {first_names,asc}}}]\">First Names</a> | Last Name"
+    set name_label "[_ contacts.Sort_by] <a href=\"[export_vars -base . -url {rel_type format query_id query page page_size {orderby {first_names,asc}}}]\">[_ contacts.First_Names]</a> | [_ contacts.Last_Name]"
 }
-append name_label " &nbsp;&nbsp; Show: "
+append name_label " &nbsp;&nbsp; [_ contacts.Show]"
 set first_p 1
 foreach page_s [list 25 50 100 500] {
     if { [string is false $first_p] } {
@@ -63,7 +63,6 @@
 set tasks_url [export_vars -base "/tasks/query" -url {query_id query rel_type}]
 
 
-
 # SEARCH CLAUSE
 
 set search_clause [list]
@@ -103,18 +102,6 @@
 set search_clause [join $search_clause "\n"]
 
 
-
-
-
-
-
-
-
-
-
-
-
-
 # LIST CODE
 
 #set actions [list \
@@ -125,17 +112,17 @@
 #		  "Admin" "admin" "Administration"]
 set actions ""
 set bulk_actions [list \
-		  "Add to Group" "group-parties-add" "Add to group" \
-		  "Remove From Group" "group-parties-remove" "Remove from this Group" \
-		  "Delete" "delete" "Delete the selected Contacts" \
-		  "Mail Merge" "message" "E-mail or Mail the selected contacts" \
+		  "[_ contacts.Add_to_Group]" "group-parties-add" "[_ contacts.Add_to_group]" \
+		  "[_ contacts.Remove_From_Group]" "group-parties-remove" "[_ contacts.lt_Remove_from_this_Grou]" \
+		  "[_ contacts.Delete]" "delete" "[_ contacts.lt_Delete_the_selected_C]" \
+		  "[_ contacts.Mail_Merge]" "message" "[_ contacts.lt_E-mail_or_Mail_the_se]" \
 		  ]
 
 template::list::create \
     -html {width 100%} \
     -name "contacts" \
     -multirow "contacts" \
-    -row_pretty_plural "contacts" \
+    -row_pretty_plural "[_ contacts.contacts]" \
     -checkbox_name checkbox \
     -selected_format ${format} \
     -key party_id \
@@ -160,7 +147,7 @@
         contact {
 	    label "<span style=\"float: right; font-weight: normal; font-size: smaller\">$name_label</a>"
             display_template {
-		<a href="<%=[contact::url -party_id ""]%>@contacts.party_id@">@contacts.name@</a> <span style="padding-left: 1em; font-size: 80%;">\[<a href="contact-edit?party_id=@contacts.party_id@">Edit</a>\]</span>
+		<a href="<%=[contact::url -party_id ""]%>@contacts.party_id@">@contacts.name@</a> <span style="padding-left: 1em; font-size: 80%;">\[<a href="contact-edit?party_id=@contacts.party_id@">[_ contacts.Edit]</a>\]</span>
                 <span style="clear:both; display: block; margin-left: 10px; font-size: 80%;">@contacts.email@</sapn>
 	    }
         }
@@ -182,35 +169,35 @@
     } -filters {
     } -orderby {
         first_names {
-            label "First Name"
+            label "[_ contacts.First_Name]"
             orderby_asc  "lower(contact__name(party_id,'f')) asc"
             orderby_desc "lower(contact__name(party_id,'f')) asc"
         }
         last_name {
-            label "Last Name"
+            label "[_ contacts.Last_Name]"
             orderby_asc  "lower(contact__name(party_id,'t')) asc"
             orderby_desc "lower(contact__name(party_id,'t')) asc"
         }
         default_value first_names,asc
     } -formats {
 	normal {
-	    label "Table"
+	    label "[_ contacts.Table]"
 	    layout table
 	    row {
  		checkbox {}
 		contact {}
 	    }
 	}
 	tasks {
-	    label "Table"
+	    label "[_ contacts.Table]"
 	    layout table
 	    row {
  		checkbox {}
 		contact {}
 	    }
 	}
 	csv {
-	    label "CSV"
+	    label "[_ contacts.CSV]"
 	    output csv
             page_size 0
             row {
@@ -246,10 +233,10 @@
 
     # roles
     set rel_options [list]
-    lappend rel_options [list "All" "" ""]
+    lappend rel_options [list "[_ contacts.All]" "" ""]
     db_foreach get_rels {} {
         if { $relation_type == "membership_rel" } { 
-            set pretty_plural "People"
+            set pretty_plural "[_ contacts.People]"
         }
         lappend rel_options [list \
                                  [lang::util::localize $pretty_plural] \
@@ -261,10 +248,10 @@
 
 
 set owner_id [ad_conn user_id]
-set group_options [list [list "-- Groups --------------------------" ""]]
+set group_options [list [list "[_ contacts.lt_--_Groups_-----------]" ""]]
 append group_options  " [contact::groups -expand "all"]"
 lappend group_options   [list "" ""]
-lappend group_options   [list "-- My Searches ---------------------" ""]
+lappend group_options   [list "[_ contacts.lt_--_My_Searches_------]" ""]
 append group_options  " [db_list_of_lists get_my_searches {}]"
 
 
@@ -283,9 +270,9 @@
 
 append form_elements {
     {query:text(text),optional {label ""} {html {size 20 maxlength 255}}}
-    {save:text(submit) {label {Go}} {value "go"}}
+    {save:text(submit) {label {[_ contacts.Go]}} {value "go"}}
 }
-#     {format:text(select),optional {label "&nbsp;&nbsp;&nbsp;Output"} {options {{Default normal} {CSV csv}}} {html {onClick "javascript:acs_FormRefresh('search')"}}}
+#     {format:text(select),optional {label "&nbsp;&nbsp;&nbsp;[_ contacts.Output]"} {options {{Default normal} {CSV csv}}} {html {onClick "javascript:acs_FormRefresh('search')"}}}
 
 switch $format {
     normal {
@@ -294,14 +281,14 @@
 	}
 	if { $contacts_total_count > 0 } {
 	    append form_elements {
-		{result_count:integer(inform),optional {label "&nbsp;&nbsp;<span style=\"font-size: smaller;\">Results:</span>"} {value "$contacts_total_count"}}
+		{result_count:integer(inform),optional {label "&nbsp;&nbsp;<span style=\"font-size: smaller;\">[_ contacts.Results]</span>"} {value "$contacts_total_count"}}
 	    }
 	}
 
     }
     tasks {
 	append form_elements {
-	    {tasks_interval:integer(text),optional {label "&nbsp;&nbsp;<span style=\"font-size: smaller;\">View next</span>"} {after_html "<span style=\"font-size: smaller;\">days</span>"} {html {size 2 maxlength 3 onChange "javascript:acs_FormRefresh('search')"}}}
+	    {tasks_interval:integer(text),optional {label "&nbsp;&nbsp;<span style=\"font-size: smaller;\">[_ contacts.View_next]</span>"} {after_html "<span style=\"font-size: smaller;\">[_ contacts.days]</span>"} {html {size 2 maxlength 3 onChange "javascript:acs_FormRefresh('search')"}}}
 	}
     }
     csv {
Index: openacs-4/packages/contacts/www/message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/message.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/message.tcl	18 May 2005 16:45:50 -0000	1.1
+++ openacs-4/packages/contacts/www/message.tcl	7 Jun 2005 07:45:40 -0000	1.2
@@ -14,12 +14,12 @@
 } -validate {
     valid_message_type -requires {message_type} {
 	if { [lsearch [list email letter label] $message_type] < 0 } {
-	    ad_complain "Your provided an invalid Message Type"
+	    ad_complain "[_ contacts.lt_Your_provided_an_inva]"
 	}
     }
     valid_party_submission {
 	if { ![exists_and_not_null party_id] && ![exists_and_not_null party_ids] } { 
-	    ad_complain "Your need to provide some contacts to send a message"
+	    ad_complain "[_ contacts.lt_Your_need_to_provide_]"
 	}
     }
 }
@@ -33,7 +33,7 @@
 set party_count [llength $party_ids]
 
 
-set title "Messages"
+set title "[_ contacts.Messages]"
 set user_id [ad_conn user_id]
 set context [list $title]
 
@@ -47,13 +47,13 @@
     message_id:key
     party_ids:text(hidden)
     return_url:text(hidden)
-    {to:text(inform),optional {label "Recipients"} {value $recipients}}
+    {to:text(inform),optional {label "[_ contacts.Recipients]"} {value $recipients}}
 }
 
 
 if { [string is false [exists_and_not_null message_type]] } {
     append form_elements {
-	{message_type:text(select) {label "Type"} {options {{Email email} {Letter letter} {Label label}}}}
+	{message_type:text(select) {label "[_ contacts.Type]"} {options {{Email email} {Letter letter} {Label label}}}}
     }
     set title [_ contacts.create_a_message]
 } else {
@@ -66,21 +66,21 @@
 
 if { [string is false [exists_and_not_null message]] } {
     append form_elements {
-	{message:text(select) {label "Message"} {options {{{-- Create New Message --} new}}}}
+	{message:text(select) {label "[_ contacts.Message]"} {options {{{-- Create New Message --} new}}}}
     }
-    set edit_buttons [list [list "Next" create]]
+    set edit_buttons [list [list "[_ contacts.Next]" create]]
 } else {
     append form_elements {
 	{message:text(hidden)}
     }
     if { $message_type == "email" } {
 	append form_elements {
 	    {subject:text(text),optional
-		{label "Subject"}
+		{label "[_ contacts.Subject]"}
 		{html {size 55}}
 	    }
 	    {content:text(textarea),optional
-		{label "Message"}
+		{label "[_ contacts.Message]"}
 		{html {cols 55 rows 18}}
 		{help_text {remember that you can use <a href="message-help">mail merge substitutions</a>. the most common wildcards are \{name\} \{first_names\}, \{last_name\}, \{home_address\} and \{date\}}}
 	    }
@@ -89,34 +89,34 @@
 	set todays_date [lc_time_fmt [dt_sysdate] "%q"]
 	append form_elements {
             {paper_type:text(select),optional
-		{label "Paper Type"}
+		{label "[_ contacts.Paper_Type]"}
 		{options {{{Letter} letter} {Letterhead letterhead}}}
 	    }
             {date:text(inform),optional
-		{label "Date"}
+		{label "[_ contacts.Date]"}
 		{value $todays_date}
 	    }
             {address:text(inform),optional
-		{label "Address"}
+		{label "[_ contacts.Address]"}
 		{value "{name}<br>{mailing_address}"}
 		{help_text {The recipeints name and mailing address will automatically be included so that they work with window envelopes}}
 	    }
 	    {content:richtext(richtext),optional
-		{label "Message"}
+		{label "[_ contacts.Message]"}
 		{html {cols 70 rows 24}}
-		{help_text {remember that you can use <a href="message-help">mail merge substitutions</a>. the most common wildcards are \{name\} \{first_names\}, \{last_name\}, \{home_address\} and \{date\}}}
+		{help_text {[_ contacts.lt_remember_that_you_can]}}
 	    }
 	}
     } else {
-	error "labels are not implemented yet"
+	error "[_ contacts.lt_labels_are_not_implem]"
     }
-    set sig_options "{{-- no not include a signature --} \"none\"} [db_list_of_lists select_sigs {select title, signature from contact_signatures where party_id = :user_id}]"
+    set sig_options "{{[_ contacts.lt_--_no_not_include_a_s]} \"none\"} [db_list_of_lists select_sigs {select title, signature from contact_signatures where party_id = :user_id}]"
     append form_elements {
-        {include_signature:text(select),optional {label "Signature"} {options $sig_options} {help_text {you may modify <a href="settings">your signatures</a>}}}
-	{save_as:text(text),optional {label "Save Message As"} {html {size 35}}}
+        {include_signature:text(select),optional {label "[_ contacts.Signature]"} {options $sig_options} {help_text {you may modify <a href="settings">[_ contacts.your_signatures]</a>}}}
+	{save_as:text(text),optional {label "[_ contacts.Save_Message_As]"} {html {size 35}}}
     }
     append form_elements 
-    set edit_buttons [list [list "Preview" create]]
+    set edit_buttons [list [list "[_ contacts.Preview]" create]]
 }
 
 
@@ -125,7 +125,7 @@
 
 ad_form -action message \
     -name message \
-    -cancel_label "Cancel" \
+    -cancel_label "[_ contacts.Cancel]" \
     -cancel_url $return_url \
     -edit_buttons $edit_buttons \
     -form $form_elements \
@@ -145,15 +145,15 @@
 					 ] \
 				    ]
 		    if { $content_raw == "" } {
-			template::element set_error message content "Message is required"
+			template::element set_error message content "[_ contacts.Message_is_required]"
 		    }
 		}
 		email {
 		    if { [string trim $subject] == "" } {
-			template::element set_error message subject "Subject is required"
+			template::element set_error message subject "[_ contacts.Subject_is_required]"
 		    }
 		    if { [string trim $content] == "" } {
-			template::element set_error message content "Message is required"
+			template::element set_error message content "[_ contacts.Message_is_required]"
 		    }
 		} 
 	    }
Index: openacs-4/packages/contacts/www/my-searches.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/Attic/my-searches.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/my-searches.tcl	18 May 2005 16:45:50 -0000	1.1
+++ openacs-4/packages/contacts/www/my-searches.tcl	7 Jun 2005 07:45:40 -0000	1.2
@@ -9,17 +9,17 @@
 } -validate {
 }
 
-set title "My Searches"
-set context [list [list "search" "Advanced Search"] $title]
+set title "[_ contacts.My_Searches]"
+set context [list [list "search" "[_ contacts.Advanced_Search]"] $title]
 
 template::list::create \
     -name "searches" \
     -multirow "searches" \
-    -row_pretty_plural "searches" \
+    -row_pretty_plural "[_ contacts.searches]" \
     -selected_format "normal" \
     -key party_id \
     -actions [list \
-		  "Add Search" "search" "Add Search"] \
+		  "[_ contacts.Add_Search]" "search" "[_ contacts.Add_Search]"] \
     -elements {
         object_type {
             label {Type}
@@ -38,7 +38,7 @@
     } -orderby {
     } -formats {
 	normal {
-	    label "Table"
+	    label "[_ contacts.Table]"
 	    layout table
 	    row {
 	    }
Index: openacs-4/packages/contacts/www/person-groups-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/person-groups-ae.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/www/person-groups-ae.tcl	4 Jun 2005 12:36:45 -0000	1.2
+++ openacs-4/packages/contacts/www/person-groups-ae.tcl	7 Jun 2005 07:45:40 -0000	1.3
@@ -23,7 +23,7 @@
 set package_key "contacts"
 
 if { [ad_form_new_p -key person_id] } {
-    set title "Add a Person"
+    set title "[_ contacts.Add_a_Person]"
     set mode "edit"
 } else {
     set title [person::name -person_id $person_id]
@@ -43,7 +43,7 @@
     -mode "display" \
     -has_edit "t" \
     -actions {
-        {"Add to Group" "formbutton:edit"}
+        {"[_ contacts.Add_to_Group]" "formbutton:edit"}
     } -form {
         {person_id:key}
     }
@@ -69,13 +69,13 @@
      where groups.group_id != '-1'
 }]
 ad_form -extend -name groups_ae -form {
-	{group_id:integer(checkbox),multiple {label "Groups"} {options $group_options}}
+	{group_id:integer(checkbox),multiple {label "[_ contacts.Groups]"} {options $group_options}}
     } -edit_request {
 	set group_id [db_list get_them { select distinct group_id from group_member_map where member_id = :person_id }]
         #ad_return_error $group_id $group_id
     } -on_submit {
     } -after_submit {
-        ad_returnredirect -message "Group Information Saved." [export_vars -base "person-ae" -url {person_id}]
+        ad_returnredirect -message "[_ contacts.lt_Group_Information_Sav]" [export_vars -base "person-ae" -url {person_id}]
     }
 
 
Index: openacs-4/packages/contacts/www/relationship-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/relationship-add.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/contacts/www/relationship-add.tcl	25 May 2005 02:09:52 -0000	1.3
+++ openacs-4/packages/contacts/www/relationship-add.tcl	7 Jun 2005 07:45:40 -0000	1.4
@@ -14,24 +14,24 @@
 } -validate {
     contact_one_exists -requires {party_one} {
 	if { ![contact::exists_p -party_id $party_one] } {
-	    ad_complain "The first contact specified does not exist"
+	    ad_complain "[_ contacts.lt_The_first_contact_spe]"
 	}
     }
     contact_two_exists -requires {party_two} {
 	if { ![contact::exists_p -party_id $party_two] } {
-	    ad_complain "The second contact specified does not exist"
+	    ad_complain "[_ contacts.lt_The_second_contact_sp]"
 	}
     }
     role_one_exists -requires {role_one} {
         set role $role_one
 	if { ![db_0or1row role_exists_p {}] } {
-	    ad_complain "The first role specified does not exist"
+	    ad_complain "[_ contacts.lt_The_first_role_specif]"
 	}
     }
     role_two_exists -requires {role_two} {
         set role $role_two
 	if { ![db_0or1row role_exists_p {}] } {
-	    ad_complain "The second role specified does not exist"
+	    ad_complain "[_ contacts.lt_The_second_role_speci]"
 	}
     }
 }
@@ -46,7 +46,7 @@
     set options_list [db_list_of_lists get_rel_types {}]
     set options_length [llength $options_list]
     if { $options_length == "0" } {
-        ad_return_error "Error" "There was a problem with your input. this type of relationship cannot exist."
+        ad_return_error "[_ contacts.Error]" "[_ contacts.lt_There_was_a_problem_w]"
     } elseif { $options_length == "1" } {
         set rel_type [lindex [lindex $options_list 0] 0]
         set role_one [lindex [lindex $options_list 0] 1]
Index: openacs-4/packages/contacts/www/relationship-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/relationship-ae.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/contacts/www/relationship-ae.tcl	4 Jun 2005 12:36:45 -0000	1.3
+++ openacs-4/packages/contacts/www/relationship-ae.tcl	7 Jun 2005 07:45:40 -0000	1.4
@@ -13,17 +13,17 @@
 } -validate {
     contact_one_exists -requires {object_id_one} {
 	if { ![contact::exists_p -party_id $object_id_one] } {
-	    ad_complain "The first contact specified does not exist"
+	    ad_complain "[_ contacts.lt_The_first_contact_spe]"
 	}
     }
     contact_two_exists -requires {object_id_two} {
 	if { ![contact::exists_p -party_id $object_id_two] } {
-	    ad_complain "The second contact specified does not exist"
+	    ad_complain "[_ contacts.lt_The_second_contact_sp]"
 	}
     }
     party_id_valid -requires {object_id_one object_id_two party_id} {
 	if { $party_id != $object_id_one && $party_id != $object_id_two } {
-	    ad_complain "The contact specified is not one of the contacts in this relationship"
+	    ad_complain "[_ contacts.lt_The_contact_specified_1]"
 	}
     }
 }
@@ -74,9 +74,9 @@
 	set creation_ip [ad_conn peeraddr]
 	set rel_id [db_exec_plsql create_rel {}]
         db_dml insert_contact_rel {}
-        util_user_message -message "Relationship Added"
+        util_user_message -message "[_ contacts.Relationship_Added]"
     } else {
-        util_user_message -message "Relationship Updated"
+        util_user_message -message "[_ contacts.Relationship_Updated]"
     }
     if { $list_exists_p } {
         ams::ad_form::save -package_key "contacts" \
Index: openacs-4/packages/contacts/www/relationship-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/relationship-delete.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/www/relationship-delete.tcl	25 May 2005 02:09:52 -0000	1.2
+++ openacs-4/packages/contacts/www/relationship-delete.tcl	7 Jun 2005 07:45:40 -0000	1.3
@@ -11,7 +11,7 @@
 } -validate {
     valid_party -requires {party_id} {
 	if { ![contact::exists_p -party_id $party_id] } {
-	    ad_complain "The contact specified does not exist"
+	    ad_complain "[_ contacts.lt_The_contact_specified]"
 	}
     }
 }
@@ -22,5 +22,5 @@
 if { ![exists_and_not_null return_url] } {
     set return_url "$party_id/relationships"
 }
-ad_returnredirect -message "Relationship Deleted" $return_url
+ad_returnredirect -message "[_ contacts.Relationship_Deleted]" $return_url
 ad_script_abort
Index: openacs-4/packages/contacts/www/search-help.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/search-help.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/www/search-help.tcl	4 Jun 2005 12:36:45 -0000	1.2
+++ openacs-4/packages/contacts/www/search-help.tcl	7 Jun 2005 07:45:40 -0000	1.3
@@ -9,6 +9,6 @@
 }
 set admin_p [ad_permission_p [ad_conn package_id] admin]
 #set default_group_id [contacts::default_group_id]
-set title "Search Help"
+set title "[_ contacts.Search_Help]"
 set context [list $title]
 
Index: openacs-4/packages/contacts/www/settings.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/settings.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/www/settings.tcl	4 Jun 2005 12:36:45 -0000	1.2
+++ openacs-4/packages/contacts/www/settings.tcl	7 Jun 2005 07:45:40 -0000	1.3
@@ -8,7 +8,7 @@
 } {
 }
 
-set title "Settings"
+set title "[_ contacts.Settings]"
 set context [list $title]
 set package_id [ad_conn package_id]
 set party_id [ad_conn user_id]
@@ -17,7 +17,7 @@
 template::list::create \
     -name "signatures" \
     -multirow "signatures" \
-    -row_pretty_plural "signatures" \
+    -row_pretty_plural "[_ contacts.signatures]" \
     -elements {
 	default_p {
 	    label ""
Index: openacs-4/packages/contacts/www/signature.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/signature.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/www/signature.tcl	4 Jun 2005 12:36:45 -0000	1.2
+++ openacs-4/packages/contacts/www/signature.tcl	7 Jun 2005 07:45:40 -0000	1.3
@@ -11,34 +11,34 @@
 	set party_id [ad_conn user_id]
 	if { ![ad_form_new_p -key signature_id] } {
 	    if { [string is false [db_0or1row sig_is_mine_p {select '1' from contact_signatures where signature_id = :signature_id and party_id = :party_id}]] } {
-		ad_complain "This signature specified either does not exist or does not belong to you"
+		ad_complain "[_ contacts.lt_This_signature_specif]"
 	    }
 	}
     }
 }
 
 
 if { [ad_form_new_p -key signature_id] } {
-    set page_title "Create a Signature"
-    set edit_buttons [list [list "Create" save]]
+    set page_title "[_ contacts.Create_a_Signature]"
+    set edit_buttons [list [list "[_ contacts.Create]" save]]
 } else {
-    set page_title "Edit a Signature"
-    set edit_buttons [list [list "Save" save] [list "Delete" delete]]
+    set page_title "[_ contacts.Edit_a_Signature]"
+    set edit_buttons [list [list "[_ contacts.Save]" save] [list "[_ contacts.Delete]" delete]]
 }
 
 set context [list $page_title]
 set party_id [ad_conn user_id]
 set form_elements {
     signature_id:key
-    {title:text(text) {label "Save As"} {html {size 35 maxlength 35}}}
-    {signature:text(textarea) {label "Signature"} {html {cols 45 rows 5}}}
-    {default_p:boolean(checkbox),optional {label ""} {options {{{this is my default signature} 1}}}}
+    {title:text(text) {label "[_ contacts.Save_As]"} {html {size 35 maxlength 35}}}
+    {signature:text(textarea) {label "[_ contacts.Signature]"} {html {cols 45 rows 5}}}
+    {default_p:boolean(checkbox),optional {label ""} {options {{{[_ contacts.lt_this_is_my_default_si]} 1}}}}
 }
 
 
 ad_form -action signature \
     -name signature \
-    -cancel_label "Cancel" \
+    -cancel_label "[_ contacts.Cancel]" \
     -cancel_url "settings" \
     -edit_buttons $edit_buttons \
     -form $form_elements \
Index: openacs-4/packages/contacts/www/admin/group-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/group-ae.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/admin/group-ae.tcl	18 May 2005 16:45:50 -0000	1.1
+++ openacs-4/packages/contacts/www/admin/group-ae.tcl	7 Jun 2005 07:45:40 -0000	1.2
@@ -20,16 +20,16 @@
 }
 
 if { [ad_form_new_p -key group_id] } {
-    set parents "{{-- top level group --} {}} [contact::groups -expand "none" -output "ad_form" -privilege_required "admin"]"
+    set parents "{{[_ contacts.lt_--_top_level_group_--]} {}} [contact::groups -expand "none" -output "ad_form" -privilege_required "admin"]"
     append form_elements {
-        {parent:integer(select),optional {label "Parent Group"} {options $parents}}
+        {parent:integer(select),optional {label "[_ contacts.Parent_Group]"} {options $parents}}
     }
 } else {
     set parent_id [contact::group::parent -group_id $group_id]
     if { [exists_and_not_null parent_id] } {
         set parent [acs_object_name $parent_id]
         append form_elements {
-            {parent:text(inform),optional {label "Parent Group"}}
+            {parent:text(inform),optional {label "[_ contacts.Parent_Group]"}}
         }
     }
 }
@@ -39,14 +39,14 @@
 #}
 
 append form_elements {
-    {group_name:text(text) {label "Group Name"}}
+    {group_name:text(text) {label "[_ contacts.Group_Name]"}}
     join_policy:text(hidden)
     url:text(hidden),optional
     email:text(hidden),optional
 }
 ad_form -name group_ae -action group-ae -form $form_elements \
 -new_request {
-    set title "Add a Group"
+    set title "[_ contacts.Add_a_Group]"
     set context [list $title]
     set join_policy "open"
 } -edit_request {
@@ -60,8 +60,8 @@
            and groups.group_id = :group_id 
     }
 
-    set title "Edit ${group_name}"
-    set context [list [list groups "Groups"] $title]
+    set title "[_ contacts.Edit_group_name]"
+    set context [list [list groups "[_ contacts.Groups]"] $title]
 
 } -validate {
 } -new_data {
@@ -79,7 +79,7 @@
 	    relation_add -member_state "approved" "composition_rel" $parent $group_id
 	}
     }
-    set message "Group '${group_name}' Created"
+    set message "[_ contacts.lt_Group_group_name_Crea]"
 
 } -edit_data {
 
@@ -97,7 +97,7 @@
          where party_id = :group_id
     }
 
-    set message "Group '${group_name}' Updated"
+    set message "[_ contacts.lt_Group_group_name_Upda]"
 
 } -after_submit {
 
Index: openacs-4/packages/contacts/www/admin/group-map.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/group-map.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/admin/group-map.tcl	18 May 2005 16:45:50 -0000	1.1
+++ openacs-4/packages/contacts/www/admin/group-map.tcl	7 Jun 2005 07:45:40 -0000	1.2
@@ -12,7 +12,7 @@
 } -validate {
     action_valid -requires {action} {
         if { [lsearch [list map unmap makedefault] $action] < 0 } {
-            ad_complain "the action supplied is not valid"
+            ad_complain "[_ contacts.lt_the_action_supplied_i]"
         }
     }
     action_appropriate -requires {action} {
@@ -23,24 +23,24 @@
         if { [exists_and_not_null default_p] } {
             # the group is mapped
             if { $default_p && $action == "makedefault" } {
-                ad_complain "This group is already the default"
+                ad_complain "[_ contacts.lt_This_group_is_already]"
             }
             if { [exists_and_not_null parent_id] && $action == "makedefault" } {
-                ad_complain "You cannot make sub groups the default group"
+                ad_complain "[_ contacts.lt_You_cannot_make_sub_g]"
             }
             if { $default_p && $action == "unmap" } {
-                ad_complain "You cannot unmap the default group"
+                ad_complain "[_ contacts.lt_You_cannot_unmap_the_]"
             }
             if { $action == "map" } {
-                ad_complain "This group is already mapped"
+                ad_complain "[_ contacts.lt_This_group_is_already_1]"
             }
         } else {
             if { $action != "map" } {
-                ad_complain "This action cannot be taken for unmapped groups"
+                ad_complain "[_ contacts.lt_This_action_cannot_be]"
             }
             if { [exists_and_not_null parent_id] } {
                 if { ![db_0or1row parent_mapped { select 1 from contact_groups where group_id = :parent_id and package_id = :package_id }] } {
-                    ad_complain "You cannot map groups whose parent groups are not mapped"
+                    ad_complain "[_ contacts.lt_You_cannot_map_groups]"
                 }
             }
         }
Index: openacs-4/packages/contacts/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/index.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/contacts/www/admin/index.tcl	18 May 2005 16:45:50 -0000	1.3
+++ openacs-4/packages/contacts/www/admin/index.tcl	7 Jun 2005 07:45:40 -0000	1.4
@@ -10,50 +10,50 @@
 
 
 set orderby "name"
-set title "Contact Administration"
+set title "[_ contacts.lt_Contact_Administratio]"
 set context {}
 set package_id [ad_conn package_id]
 
 template::list::create \
     -name "groups" \
     -multirow "groups" \
-    -row_pretty_plural "groups" \
+    -row_pretty_plural "[_ contacts.groups]" \
     -elements {
         edit {
 	    label {}
 	    display_template {
-		<a href="group-ae?group_id=@groups.group_id@"><img src="/resources/acs-subsite/Edit16.gif" height="16" width="16" border= "0" alt="Edit"></a>
+		<a href="group-ae?group_id=@groups.group_id@"><img src="/resources/acs-subsite/Edit16.gif" height="16" width="16" border= "0" alt="[_ acs-kernel.common_Edit]"></a>
 	    }
 	}
         group_name {
             label {Group}
 	    display_col group_name
         }
         member_count {
-            label {\# Contacts}
+            label {[_ contacts.Contacts]}
 	    display_col member_count
             link_url_eval $group_url
         }
         mapped {
             label {Mapped}
             display_template {
                 <if @groups.mapped_p@>
-                  <a href="group-map?action=unmap&group_id=@groups.group_id@"><img src="/resources/acs-subsite/checkboxchecked.gif" border="0" height="13" width="13" alt="True"></a>
+                  <a href="group-map?action=unmap&group_id=@groups.group_id@"><img src="/resources/acs-subsite/checkboxchecked.gif" border="0" height="13" width="13" alt="[_ contacts.True]"></a>
                 </if>
                 <else>
-                  <a href="group-map?action=map&group_id=@groups.group_id@"><img src="/resources/acs-subsite/checkbox.gif" border="0" height="13" width="13" alt="False"></a>
+                  <a href="group-map?action=map&group_id=@groups.group_id@"><img src="/resources/acs-subsite/checkbox.gif" border="0" height="13" width="13" alt="[_ contacts.False]"></a>
                 </else>
             }
         }
         default {
             label {Default}
             display_template {
                 <if @groups.default_p@>
-                  <img src="/resources/acs-subsite/checkboxchecked.gif" border="0" height="13" width="13" alt="True">
+                  <img src="/resources/acs-subsite/checkboxchecked.gif" border="0" height="13" width="13" alt="[_ contacts.True]">
                 </if>
                 <else>
                   <if @groups.mapped_p@ and @groups.level@ eq 1>
-                  <a href="group-map?action=makedefault&group_id=@groups.group_id@"><img src="/resources/acs-subsite/checkbox.gif" border="0" height="13" width="13" alt="False"></a>
+                  <a href="group-map?action=makedefault&group_id=@groups.group_id@"><img src="/resources/acs-subsite/checkbox.gif" border="0" height="13" width="13" alt="[_ contacts.False]"></a>
                   </if>
                   <else>
                   </else>
@@ -62,17 +62,17 @@
         }
         person_form {
             display_template {
-                <a href="@groups.ams_person_url@" class="button">Person Form</a>
+                <a href="@groups.ams_person_url@" class="button">[_ contacts.Person_Form]</a>
             }
         }
         org_form {
             display_template {
-                <a href="@groups.ams_org_url@" class="button">Organization Form</a>
+                <a href="@groups.ams_org_url@" class="button">[_ contacts.Organization_Form]</a>
             }
         }
 	actions {
 	    display_template {
-		<if @groups.level@ eq 1><a href="permissions?group_id=@groups.group_id@" class="button">Permissions</a></if>
+		<if @groups.level@ eq 1><a href="permissions?group_id=@groups.group_id@" class="button">[_ contacts.Permissions]</a></if>
 	    }
         }
     } -filters {
@@ -96,14 +96,14 @@
                           -list_name "${package_id}__${group_id}" \
                           -pretty_name "${package_id}__${group_id}" \
                           -return_url [ad_conn url] \
-                          -return_url_label "Return to \"$title\""]
+                          -return_url_label "[_ contacts.Return_to_title]"]
     set ams_org_url [ams::list::url \
                           -package_key "contacts" \
                           -object_type "organization" \
                           -list_name "${package_id}__${group_id}" \
                           -pretty_name "${package_id}__${group_id}" \
                           -return_url [ad_conn url] \
-                          -return_url_label "Return to \"$title\""]
+                          -return_url_label "[_ contacts.Return_to_title]"]
     multirow append groups [lindex $group 1] [lindex $group 0] "../?group_id=${group_id}" $ams_person_url $ams_org_url $member_count $level $mapped_p $default_p
 
 
Index: openacs-4/packages/contacts/www/admin/permissions-user-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/permissions-user-add.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/admin/permissions-user-add.tcl	18 May 2005 16:45:50 -0000	1.1
+++ openacs-4/packages/contacts/www/admin/permissions-user-add.tcl	7 Jun 2005 07:45:40 -0000	1.2
@@ -8,7 +8,7 @@
     object_id:integer
 }
 
-set page_title "Add User"
+set page_title "[_ contacts.Add_User]"
 
-set context [list [list [export_vars -base permissions { object_id }] "Permissions"] $page_title]
+set context [list [list [export_vars -base permissions { object_id }] "[_ contacts.Permissions]"] $page_title]
 
Index: openacs-4/packages/contacts/www/admin/permissions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/permissions.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/contacts/www/admin/permissions.tcl	18 May 2005 16:45:50 -0000	1.3
+++ openacs-4/packages/contacts/www/admin/permissions.tcl	7 Jun 2005 07:45:40 -0000	1.4
@@ -10,7 +10,7 @@
 
 set object_id $group_id
 
-set page_title "Permissions"
+set page_title "[_ contacts.Permissions]"
 
 set context [list $page_title]
 
Index: openacs-4/packages/contacts/www/admin/relationships.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/relationships.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/www/admin/relationships.tcl	21 May 2005 21:00:41 -0000	1.2
+++ openacs-4/packages/contacts/www/admin/relationships.tcl	7 Jun 2005 07:45:40 -0000	1.3
@@ -15,7 +15,7 @@
     rel_types:multirow
 }
 
-set title "Relationship types"
+set title "[_ contacts.Relationship_types]"
 set context [list $title]
 
 set package_id [ad_conn package_id]
@@ -36,22 +36,22 @@
 
 } {
     switch $primary_object_type {
-        party           { set primary_type_pretty "Person or Organization" }
-        organization    { set primary_type_pretty "Organization" }
-        person          { set primary_type_pretty "Person" }
+        party           { set primary_type_pretty "[_ contacts.lt_Person_or_Organizatio]" }
+        organization    { set primary_type_pretty "[_ contacts.Organization]" }
+        person          { set primary_type_pretty "[_ contacts.Person]" }
     }
     switch $secondary_object_type {
-        party           { set secondary_type_pretty "Person or Organization" }
-        organization    { set secondary_type_pretty "Organization" }
-        person          { set secondary_type_pretty "Person" }
+        party           { set secondary_type_pretty "[_ contacts.lt_Person_or_Organizatio]" }
+        organization    { set secondary_type_pretty "[_ contacts.Organization]" }
+        person          { set secondary_type_pretty "[_ contacts.Person]" }
     }
     set rel_form_url [ams::list::url \
                           -package_key "contacts" \
                           -object_type ${rel_type} \
                           -list_name ${package_id} \
                           -pretty_name ${pretty_name} \
                           -return_url ${url} \
-                          -return_url_label "Return to \"$title\""]
+                          -return_url_label "[_ contacts.Return_to_title]"]
 
 }
 ad_return_template
Index: openacs-4/packages/contacts/www/admin/roles.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/roles.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/admin/roles.tcl	18 May 2005 16:45:50 -0000	1.1
+++ openacs-4/packages/contacts/www/admin/roles.tcl	7 Jun 2005 07:45:40 -0000	1.2
@@ -14,7 +14,7 @@
     
 }
 
-set context [list [list "relationships" "Relationship types"] "Roles"]
+set context [list [list "relationships" "[_ contacts.Relationship_types]"] "[_ contacts.Roles]"]
 
 db_multirow roles select_roles {
     select r.role, r.pretty_name, coalesce(num1.number_rels,0) + coalesce(num2.number_rels,0) as number_rel_types