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.15 -r1.16
--- openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml	10 Jun 2005 21:52:19 -0000	1.15
+++ openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml	11 Jun 2005 06:10:53 -0000	1.16
@@ -77,7 +77,7 @@
   <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="Edit_group_name">Edit %group_name%</msg>
   <msg key="Email_Address">Email Address</msg>
   <msg key="Error">Error</msg>
   <msg key="even">even</msg>
@@ -96,6 +96,7 @@
   <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="irrelevant">irrelevant</msg>
   <msg key="is_-">is -&gt;</msg>
   <msg key="is_after_-">is after -&gt;</msg>
   <msg key="is_before_-">is before -&gt;</msg>
@@ -117,11 +118,43 @@
   <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_attribute_pretty_area">%attribute_pretty% area code is: &lt;strong&gt;%option_pretty%&lt;/strong&gt;</msg>
+  <msg key="lt_attribute_pretty_area_1">%attribute_pretty% area code is not: &lt;strong&gt;%option_pretty%&lt;/strong&gt;</msg>
+  <msg key="lt_attribute_pretty_cont">%attribute_pretty% contains: &lt;strong&gt;%value%&lt;/strong&gt;</msg>
+  <msg key="lt_attribute_pretty_coun">%attribute_pretty% country code is: &lt;strong&gt;%option_pretty%&lt;/strong&gt;</msg>
+  <msg key="lt_attribute_pretty_coun_1">%attribute_pretty% country code is not: &lt;strong&gt;%option_pretty%&lt;/strong&gt;</msg>
+  <msg key="lt_attribute_pretty_coun_2">%attribute_pretty% country is: &lt;strong&gt;[_ ams.country_%value%]&lt;/strong&gt;</msg>
+  <msg key="lt_attribute_pretty_coun_3">%attribute_pretty% country is not: &lt;strong&gt;[_ ams.country_%value%]&lt;/strong&gt;</msg>
+  <msg key="lt_attribute_pretty_does">%attribute_pretty% does not contain: &lt;strong&gt;%value%&lt;/strong&gt;</msg>
+  <msg key="lt_attribute_pretty_is_a">%attribute_pretty% is after: &lt;strong&gt;[lc_time_fmt %value% %q]&lt;/strong&gt;</msg>
+  <msg key="lt_attribute_pretty_is_b">%attribute_pretty% is before: &lt;strong&gt;[lc_time_fmt %value% %q]&lt;/strong&gt;</msg>
+  <msg key="lt_attribute_pretty_is_g">%attribute_pretty% is greater than: &lt;strong&gt;%value%&lt;/strong&gt;</msg>
+  <msg key="lt_attribute_pretty_is_l">%attribute_pretty% is less than: &lt;strong&gt;%value%&lt;/strong&gt;</msg>
+  <msg key="lt_attribute_pretty_is_l_1">%attribute_pretty% is less than &lt;strong&gt;%interval%&lt;/strong&gt; ago</msg>
+  <msg key="lt_attribute_pretty_is_n">%attribute_pretty% is not set</msg>
+  <msg key="lt_attribute_pretty_is_n_1">%attribute_pretty% is not: &lt;strong&gt;%option_pretty%&lt;/strong&gt;</msg>
+  <msg key="lt_attribute_pretty_is_s">%attribute_pretty% is set</msg>
+  <msg key="lt_attribute_pretty_is_s_1">%attribute_pretty% is: &lt;strong&gt;%option_pretty%&lt;/strong&gt;</msg>
+  <msg key="lt_attribute_pretty_is_s_2">%attribute_pretty% is: &lt;strong&gt;%value%&lt;/strong&gt;</msg>
+  <msg key="lt_attribute_pretty_stat">%attribute_pretty% state/province is: &lt;strong&gt;%value%&lt;/strong&gt;</msg>
+  <msg key="lt_attribute_pretty_stat_1">%attribute_pretty% state/province is not: &lt;strong&gt;%value%&lt;/strong&gt;</msg>
+  <msg key="lt_attribute_pretty_zipp">%attribute_pretty% zip/postal starts with: &lt;strong&gt;%value%&lt;/strong&gt;</msg>
+  <msg key="lt_attribute_pretty_zipp_1">%attribute_pretty% zip/postal does not start with: &lt;strong&gt;%value%&lt;/strong&gt;</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_commented_on_">Contact commented on in the last: &lt;strong&gt;%interval%&lt;/strong&gt;</msg>
+  <msg key="lt_Contact_created_in_th">Contact created in the last: &lt;strong&gt;%interval%&lt;/strong&gt;</msg>
+  <msg key="lt_Contact_has_logged_in">Contact has logged in</msg>
+  <msg key="lt_Contact_has_logged_in_1">Contact has logged in within the last: &lt;strong&gt;%interval%&lt;/strong&gt;</msg>
+  <msg key="lt_Contact_has_never_log">Contact has never logged in</msg>
+  <msg key="lt_Contact_has_not_logge">Contact has not logged in within the last: &lt;strong&gt;%interval%&lt;/strong&gt;</msg>
+  <msg key="lt_Contact_not_commented">Contact not commented on in the last: &lt;strong&gt;%interval%&lt;/strong&gt;</msg>
+  <msg key="lt_Contact_not_created_i">Contact not created in the last: &lt;strong&gt;%interval%&lt;/strong&gt;</msg>
+  <msg key="lt_Contact_not_updated_i">Contact not updated in the last: &lt;strong&gt;%interval%&lt;/strong&gt;</msg>
   <msg key="lt_Contact_Relationships">Contact Relationships</msg>
+  <msg key="lt_Contact_updated_in_th">Contact updated in the last: &lt;strong&gt;%interval%&lt;/strong&gt;</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>
@@ -134,21 +167,21 @@
   <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_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_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_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_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>
@@ -162,23 +195,27 @@
   <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_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:</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:</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_is_in_the">The contact is in the group: &lt;strong&gt;%group_pretty%&lt;/strong&gt;</msg>
+  <msg key="lt_The_contact_is_NOT_in">The contact is NOT in the group: &lt;strong&gt;%group_pretty%&lt;/strong&gt;</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_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_query_type_var_li">The query \&quot;%type% %var_list%\&quot; is no longer valid because: %error_message</msg>
+  <msg key="lt_The_query_type_var_li_1">The query \&quot;%type% %var_list%\&quot; is no longer valid. Contact an admin.</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>
@@ -190,6 +227,7 @@
   <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_Unable_to_retrieve_gr">Unable to retrieve group_id</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>
@@ -237,6 +275,7 @@
   <msg key="Party_Revisions">Party Revisions</msg>
   <msg key="People">People</msg>
   <msg key="people">people</msg>
+  <msg key="People_or_Organizations">People or Organizations</msg>
   <msg key="Permissions">Permissions</msg>
   <msg key="Person">Person</msg>
   <msg key="Person_Form">Person Form</msg>
@@ -289,7 +328,7 @@
   <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="The_error_was_errmsg">The error was: %errmsg</msg>
   <msg key="True">True</msg>
   <msg key="Type">Type</msg>
   <msg key="Update">Update</msg>
Index: openacs-4/packages/contacts/tcl/contact-search-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contact-search-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/contacts/tcl/contact-search-procs.tcl	10 Jun 2005 09:23:27 -0000	1.4
+++ openacs-4/packages/contacts/tcl/contact-search-procs.tcl	11 Jun 2005 06:10:53 -0000	1.5
@@ -294,19 +294,19 @@
             if { $to == "pretty" } {
                 set attribute_pretty [attribute::pretty_name -attribute_id $attribute_id]
             } else {
-                set attribute_pretty "irrelevant"
+                set attribute_pretty "[_ contacts.irrelevant]"
             }
 
             set operand [lindex $var_list 1]
             set value [string tolower [lindex $var_list 2]]
 
             switch $operand {
                 set {
-                    set output_pretty "$attribute_pretty is set"
+                    set output_pretty "[_ contacts.lt_attribute_pretty_is_s]"
                     set output_code "$revision_id in (\n\select aav${attribute_id}.object_id\n  from ams_attribute_values aav${attribute_id}\n where aav${attribute_id}.attribute_id = '${attribute_id}' )"
                 }
                 not_set {
-                    set output_pretty "$attribute_pretty is not set"
+                    set output_pretty "[_ contacts.lt_attribute_pretty_is_n]"
                     set output_code "$revision_id not in (\n\select aav${attribute_id}.object_id\n  from ams_attribute_values aav${attribute_id}\n where aav${attribute_id}.attribute_id = '${attribute_id}' )"
                 }
                 default {
@@ -323,43 +323,43 @@
 
                             switch $operand {
                                 selected {
-                                    set output_pretty "$attribute_pretty is: <strong>$option_pretty</strong>"
+                                    set output_pretty "[_ contacts.lt_attribute_pretty_is_s_1]"
                                     set output_code "$revision_id in (\n\select aav${attribute_id}.object_id\n  from ams_attribute_values aav${attribute_id}, ams_options ao${attribute_id}\n where aav${attribute_id}.attribute_id = '${attribute_id}' and aav${attribute_id}.value_id = ao${attribute_id}.value_id and ao${attribute_id}.option_id = '$value' )"
                                 }
                                 not_selected {
-                                    set output_pretty "$attribute_pretty is not: <strong>$option_pretty</strong>"
+                                    set output_pretty "[_ contacts.lt_attribute_pretty_is_n_1]"
                                     set output_code "$revision_id not in (\n\select aav${attribute_id}.object_id\n  from ams_attribute_values aav${attribute_id}, ams_options ao${attribute_id}\n where aav${attribute_id}.attribute_id = '${attribute_id}' and aav${attribute_id}.value_id = ao${attribute_id}.value_id and ao${attribute_id}.option_id = '$value' )"
                                 }
                             }
                         }
                         ams_value__telecom_number {
                             switch $operand {
                                 area_code_equals {
-                                    set output_pretty "$attribute_pretty area code is: <strong>$option_pretty</strong>"
+                                    set output_pretty "[_ contacts.lt_attribute_pretty_area]"
                                     set output_code "$revision_id in (\n\select aav${attribute_id}.object_id\n  from ams_attribute_values aav${attribute_id}, telecom_numbers tn${attribute_id}\n where aav${attribute_id}.attribute_id = '${attribute_id}' and aav.${attribute_id}.value_id = tn${attribute_id}.number_id and tn${attribute_id}.area_city_code = '$value' )"
                                 }
                                 not_area_code_equals {
-                                    set output_pretty "$attribute_pretty area code is not: <strong>$option_pretty</strong>"
+                                    set output_pretty "[_ contacts.lt_attribute_pretty_area_1]"
                                     set output_code "$revision_id not in (\n\select aav${attribute_id}.object_id\n  from ams_attribute_values aav${attribute_id}, telecom_numbers tn${attribute_id}\n where aav${attribute_id}.attribute_id = '${attribute_id}' and aav.${attribute_id}.value_id = tn${attribute_id}.number_id and tn${attribute_id}.area_city_code = '$value' )"
                                 }
                                 country_code_equals {
-                                    set output_pretty "$attribute_pretty country code is: <strong>$option_pretty</strong>"
+                                    set output_pretty "[_ contacts.lt_attribute_pretty_coun]"
                                     set output_code "$revision_id in (\n\select aav${attribute_id}.object_id\n  from ams_attribute_values aav${attribute_id}, telecom_numbers tn${attribute_id}\n where aav${attribute_id}.attribute_id = '${attribute_id}' and aav.${attribute_id}.value_id = tn${attribute_id}.number_id and tn${attribute_id}.country_code = '$value' )"
                                 }
                                 not_country_code_equals {
-                                    set output_pretty "$attribute_pretty country code is not: <strong>$option_pretty</strong>"
+                                    set output_pretty "[_ contacts.lt_attribute_pretty_coun_1]"
                                     set output_code "$revision_id in (\n\select aav${attribute_id}.object_id\n  from ams_attribute_values aav${attribute_id}, telecom_numbers tn${attribute_id}\n where aav${attribute_id}.attribute_id = '${attribute_id}' and aav.${attribute_id}.value_id = tn${attribute_id}.number_id and tn${attribute_id}.area_city_code = '$value' )"
                                 }
                             }
                         }
                         ams_value__text {
                             switch $operand  {
                                 contains {
-                                    set output_pretty "$attribute_pretty contains: <strong>$value</strong>"
+                                    set output_pretty "[_ contacts.lt_attribute_pretty_cont]"
                                     set output_code "$revision_id in (\n\select aav${attribute_id}.object_id\n  from ams_attribute_values aav${attribute_id}, ams_texts at${attribute_id}\n where aav${attribute_id}.attribute_id = '${attribute_id}'\n   and aav${attribute_id}.value_id = at${attribute_id}.value_id\n   and lower(at${attribute_id}.text) like ('\%$value\%')\n)"
                                 }
                                 not_contains {
-                                    set output_pretty "$attribute_pretty does not contain: <strong>$value</strong>"
+                                    set output_pretty "[_ contacts.lt_attribute_pretty_does]"
                                     set output_code "$revision_id in (\n\select aav${attribute_id}.object_id\n  from ams_attribute_values aav${attribute_id}, ams_texts at${attribute_id}\n where aav${attribute_id}.attribute_id = '${attribute_id}'\n   and aav${attribute_id}.value_id = at${attribute_id}.value_id\n   and lower(at${attribute_id}.text) not like ('\%$value\%')\n)"
                                 }
                             }
@@ -368,43 +368,43 @@
                             set value [string toupper $value]
                             switch $operand {
                                 country_is {
-                                    set output_pretty "$attribute_pretty country is: <strong>[_ ams.country_${value}]</strong>"
+                                    set output_pretty "[_ contacts.lt_attribute_pretty_coun_2]"
                                     set output_code "$revision_id in (\n\select aav${attribute_id}.object_id\n  from ams_attribute_values aav${attribute_id}, postal_addresses pa${attribute_id}\n where aav${attribute_id}.attribute_id = '${attribute_id}' and aav${attribute_id}.value_id = pa${attribute_id}.address_id and pa${attribute_id}.country_code = '$value' )"
                                 }
                                 country_is_not {
-                                    set output_pretty "$attribute_pretty country is not: <strong>[_ ams.country_${value}]</strong>"
+                                    set output_pretty "[_ contacts.lt_attribute_pretty_coun_3]"
                                     set output_code "$revision_id in (\n\select aav${attribute_id}.object_id\n  from ams_attribute_values aav${attribute_id}, postal_addresses pa${attribute_id}\n where aav${attribute_id}.attribute_id = '${attribute_id}' and aav${attribute_id}.value_id = pa${attribute_id}.address_id and pa${attribute_id}.country_code = '$value' )"
                                 }
                                 state_is {
-                                    set output_pretty "$attribute_pretty state/province is: <strong>$value</strong>"
+                                    set output_pretty "[_ contacts.lt_attribute_pretty_stat]"
                                     set output_code "$revision_id in (\n\select aav${attribute_id}.object_id\n  from ams_attribute_values aav${attribute_id}, postal_addresses pa${attribute_id}\n where aav${attribute_id}.attribute_id = '${attribute_id}' and aav${attribute_id}.value_id = pa${attribute_id}.address_id and pa${attribute_id}.region = '$value' )"
                                 }
                                 state_is_not {
-                                    set output_pretty "$attribute_pretty state/province is not: <strong>$value</strong>"
+                                    set output_pretty "[_ contacts.lt_attribute_pretty_stat_1]"
                                     set output_code "$revision_id in (\n\select aav${attribute_id}.object_id\n  from ams_attribute_values aav${attribute_id}, postal_addresses pa${attribute_id}\n where aav${attribute_id}.attribute_id = '${attribute_id}' and aav${attribute_id}.value_id = pa${attribute_id}.address_id and pa${attribute_id}.region = '$value' )"
                                 }
                                 zip_is {
-                                    set output_pretty "$attribute_pretty zip/postal starts with: <strong>$value</strong>"
+                                    set output_pretty "[_ contacts.lt_attribute_pretty_zipp]"
                                     set output_code "$revision_id in (\n\select aav${attribute_id}.object_id\n  from ams_attribute_values aav${attribute_id}, postal_addresses pa${attribute_id}\n where aav${attribute_id}.attribute_id = '${attribute_id}' and aav${attribute_id}.value_id = pa${attribute_id}.address_id and pa${attribute_id}.postal_code like ('$value\%') )"
                                 }
                                 zip_is_not {
-                                    set output_pretty "$attribute_pretty zip/postal does not start with: <strong>$value</strong>"
+                                    set output_pretty "[_ contacts.lt_attribute_pretty_zipp_1]"
                                     set output_code "$revision_id in (\n\select aav${attribute_id}.object_id\n  from ams_attribute_values aav${attribute_id}, postal_addresses pa${attribute_id}\n where aav${attribute_id}.attribute_id = '${attribute_id}' and aav${attribute_id}.value_id = pa${attribute_id}.address_id and pa${attribute_id}.postal_code like ('$value\%') )"
                                 }
                             }
                         }
                         ams_value__number {
                             switch $operand {
                                 is {
-                                    set output_pretty "$attribute_pretty is: <strong>$value</strong>"
+                                    set output_pretty "[_ contacts.lt_attribute_pretty_is_s_2]"
                                     set output_code "$revision_id in (\n\select aav${attribute_id}.object_id\n  from ams_attribute_values aav${attribute_id}, ams_numbers an${attribute_id}\n where aav${attribute_id}.attribute_id = '${attribute_id}'\n   and aav${attribute_id}.value_id = an${attribute_id}.value_id\n   and an${attribute_id}.number = '$value' )"
                                 }
                                 greater_than {
-                                    set output_pretty "$attribute_pretty is greater than: <strong>$value</strong>"
+                                    set output_pretty "[_ contacts.lt_attribute_pretty_is_g]"
                                     set output_code "$revision_id in (\n\select aav${attribute_id}.object_id\n  from ams_attribute_values aav${attribute_id}, ams_numbers an${attribute_id}\n where aav${attribute_id}.attribute_id = '${attribute_id}'\n   and aav${attribute_id}.value_id = an${attribute_id}.value_id\n   and an${attribute_id}.number > '$value' )"
                                 }
                                 less_than {
-                                    set output_pretty "$attribute_pretty is less than: <strong>$value</strong>"
+                                    set output_pretty "[_ contacts.lt_attribute_pretty_is_l]"
                                     set output_code "$revision_id in (\n\select aav${attribute_id}.object_id\n  from ams_attribute_values aav${attribute_id}, ams_numbers an${attribute_id}\n where aav${attribute_id}.attribute_id = '${attribute_id}'\n   and aav${attribute_id}.value_id = an${attribute_id}.value_id\n   and an${attribute_id}.number < '$value' )"
                                 }
                             }
@@ -413,19 +413,19 @@
                             set interval "$value [string tolower [lindex $var_list 3]]"
                             switch $operand {
                                 less_than {
-                                    set output_pretty "$attribute_pretty is less than <strong>$interval</strong> ago"
+                                    set output_pretty "[_ contacts.lt_attribute_pretty_is_l_1]"
                                     set output_code "$revision_id in (\n\select aav${attribute_id}.object_id\n  from ams_attribute_values aav${attribute_id}, ams_times at${attribute_id}\n where aav${attribute_id}.attribute_id = '${attribute_id}'\n   and aav${attribute_id}.value_id = at${attribute_id}.value_id\n   and at${attribute_id}.time > ( now() - '$interval'::interval ) )"
                                 }
                                 more_than {
-                                    set output_pretty "$attribute_pretty is less than <strong>$interval</strong> ago"
+                                    set output_pretty "[_ contacts.lt_attribute_pretty_is_l_1]"
                                     set output_code "$revision_id in (\n\select aav${attribute_id}.object_id\n  from ams_attribute_values aav${attribute_id}, ams_times at${attribute_id}\n where aav${attribute_id}.attribute_id = '${attribute_id}'\n   and aav${attribute_id}.value_id = at${attribute_id}.value_id\n   and at${attribute_id}.time < ( now() - '$interval'::interval ) )"
                                 }
                                 after {
-                                    set output_pretty "$attribute_pretty is after: <strong>[lc_time_fmt $value %q]</strong>"
+                                    set output_pretty "[_ contacts.lt_attribute_pretty_is_a]"
                                     set output_code "$revision_id in (\n\select aav${attribute_id}.object_id\n  from ams_attribute_values aav${attribute_id}, ams_times at${attribute_id}\n where aav${attribute_id}.attribute_id = '${attribute_id}'\n   and aav${attribute_id}.value_id = at${attribute_id}.value_id\n   and at${attribute_id}.time > '$value'::timestamptz )"
                                 }
                                 before {
-                                    set output_pretty "$attribute_pretty is before: <strong>[lc_time_fmt $value %q]</strong>"
+                                    set output_pretty "[_ contacts.lt_attribute_pretty_is_b]"
                                     set output_code "$revision_id in (\n\select aav${attribute_id}.object_id\n  from ams_attribute_values aav${attribute_id}, ams_times at${attribute_id}\n where aav${attribute_id}.attribute_id = '${attribute_id}'\n   and aav${attribute_id}.value_id = at${attribute_id}.value_id\n   and at${attribute_id}.time < '$value'::timestamptz )"
                                 }
                             }
@@ -439,43 +439,43 @@
             set interval "[lindex $var_list 1] [lindex $var_list 2]"
             switch $operand {
                 update {
-                    set output_pretty "Contact updated in the last: <strong>$interval</strong>"
+                    set output_pretty "[_ contacts.lt_Contact_updated_in_th]"
                     set output_code   "CASE WHEN ( select creation_date from acs_objects where object_id = $revision_id ) > ( now() - '$interval'::interval ) THEN 't'::boolean ELSE 'f'::boolean END"
                 }
                 not_update {
-                    set output_pretty "Contact not updated in the last: <strong>$interval</strong>"
+                    set output_pretty "[_ contacts.lt_Contact_not_updated_i]"
                     set output_code   "CASE WHEN ( select creation_date from acs_objects where object_id = $revision_id ) > ( now() - '$interval'::interval ) THEN 'f'::boolean ELSE 't'::boolean END"
                 }
                 comment {
-                    set output_pretty "Contact commented on in the last: <strong>$interval</strong>"
+                    set output_pretty "[_ contacts.lt_Contact_commented_on_]"
                     set output_code   "CASE WHEN (select creation_date from acs_objects where object_id in ( select comment_id from general_comments where object_id = $party_id ) order by creation_date desc limit 1 ) > ( now() - '$interval'::interval ) THEN 't'::boolean ELSE 'f'::boolean END"
                 }
                 not_comment {
-                    set output_pretty "Contact not commented on in the last: <strong>$interval</strong>"
+                    set output_pretty "[_ contacts.lt_Contact_not_commented]"
                     set output_code   "CASE WHEN (select creation_date from acs_objects where object_id in ( select comment_id from general_comments where object_id = $party_id ) order by creation_date desc limit 1 ) > ( now() - '$interval'::interval ) THEN 'f'::boolean ELSE 't'::boolean END"
                 }
                 created {
-                    set output_pretty "Contact created in the last: <strong>$interval</strong>"
+                    set output_pretty "[_ contacts.lt_Contact_created_in_th]"
                     set output_code   "CASE WHEN ( select acs_objects.creation_date from acs_objects where acs_objects.object_id = $party_id ) > ( now() - '$interval'::interval ) THEN 't'::boolean ELSE 'f'::boolean END"
                 }
                 not_created {
-                    set output_pretty "Contact not created in the last: <strong>$interval</strong>"
+                    set output_pretty "[_ contacts.lt_Contact_not_created_i]"
                     set output_code   "CASE WHEN ( select acs_objects.creation_date from acs_objects where acs_objects.object_id = $party_id ) > ( now() - '$interval'::interval ) THEN 'f'::boolean ELSE 't'::boolean END"
                 }
                 login {
-                    set output_pretty "Contact has logged in"
+                    set output_pretty "[_ contacts.lt_Contact_has_logged_in]"
                     set output_code   "CASE WHEN ( select n_sessions from users where user_id = $party_id ) > 1 or ( select last_visit from users where user_id = $party_id ) is not null THEN 't'::boolean ELSE 'f'::boolean END"
                 }
                 not_login {
-                    set output_pretty "Contact has never logged in"
+                    set output_pretty "[_ contacts.lt_Contact_has_never_log]"
                     set output_code   "CASE WHEN ( select n_sessions from users where user_id = $party_id ) > 1 or ( select last_visit from users where user_id = $party_id ) is not null THEN 'f'::boolean ELSE 't'::boolean END"
                 }
                 login_time {
-                    set output_pretty "Contact has logged in within the last: <strong>$interval</strong>"
+                    set output_pretty "[_ contacts.lt_Contact_has_logged_in_1]"
                     set output_code   "CASE WHEN ( select last_visit from users where user_id = $party_id ) > ( now() - '$interval'::interval ) THEN 't'::boolean ELSE 'f'::boolean END"
                 }
                 not_login_time {
-                    set output_pretty "Contact has not logged in within the last: <strong>$interval</strong>"
+                    set output_pretty "[_ contacts.lt_Contact_has_not_logge]"
                     set output_code   "CASE WHEN ( select last_visit from users where user_id = $party_id ) > ( now() - '$interval'::interval ) THEN 'f'::boolean ELSE 't'::boolean END"
                 }
             }
@@ -484,17 +484,17 @@
             set operand [lindex $var_list 0]
             set group_id [lindex $var_list 1]
             if { $to == "pretty" } {
-                set group_pretty [db_string select_group_name { select group_name from groups where group_id = :group_id }]
+                set group_pretty [lang::util::localize [db_string select_group_name { select group_name from groups where group_id = :group_id }]]
             } else {
                 set group_pretty ""
             }
             switch $operand {
                 in {
-                    set output_pretty "The contact is in the group: <strong>$group_pretty</strong>"
+                    set output_pretty "[_ contacts.lt_The_contact_is_in_the]"
                     set output_code "$party_id in ( select member_id from group_distinct_member_map where group_id = '$group_id')"
                 }
                 not_in {
-                    set output_pretty "The contact is NOT in the group: <strong>$group_pretty</strong>"
+                    set output_pretty "[_ contacts.lt_The_contact_is_NOT_in]"
                     set output_code "$party_id not in ( select member_id from group_distinct_member_map where group_id = '$group_id')"
                 }
             }
@@ -512,9 +512,9 @@
     }
     if { ![exists_and_not_null output_pretty] || ![exists_and_not_null output_code] } {
         if { [exists_and_not_null error_message] } {
-            error "The query \"$type $var_list\" is no longer valid because: $error_message"
+            error "[_ contacts.lt_The_query_type_var_li]"
         } else {
-            error "The query \"$type $var_list\" is no longer valid. Contact an admin."
+            error "[_ contacts.lt_The_query_type_var_li_1]"
         }
     } else {
         switch $to {
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.11 -r1.12
--- openacs-4/packages/contacts/tcl/contacts-procs.tcl	9 Jun 2005 14:24:34 -0000	1.11
+++ openacs-4/packages/contacts/tcl/contacts-procs.tcl	11 Jun 2005 06:10:53 -0000	1.12
@@ -429,7 +429,7 @@
 	    set group_name [lang::util::convert_to_i18n -prefix "group" $group_name]
 	}
 	if {![db_0or1row get_group_id "select group_id from groups where group_name = :group_name"]} {
-	    ad_return_error "ERROR" "<#_ Unable to retrieve group_id#>"
+	    ad_return_error "ERROR" "[_ contacts.lt_Unable_to_retrieve_gr]"
 	}
     }