Index: openacs-4/packages/contacts/lib/comments.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/comments.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/contacts/lib/comments.adp	27 May 2005 09:59:31 -0000	1.4
+++ openacs-4/packages/contacts/lib/comments.adp	28 May 2005 15:43:52 -0000	1.5
@@ -1,19 +1,19 @@
+<h3>#contacts.Comments#</h3>
 
-<h3 class="contact-title">Comments</h3>
-
 <if @form@ eq top>
 <formtemplate id="comment_add" style="../../../contacts/resources/forms/inline"></formtemplate>
 </if>
 
 <if @comments:rowcount@ gt 0>
   <dl class="comments">
 <multiple name="comments">
-    <dt id="@comments.comment_id@" class="<if @comments.creation_user@ eq @user_id@>mine-</if><if @comments.rownum@ odd>odd</if><else>even</else>"><a href="comments#@comments.comment_id@" class="number">@comments.comment_number@.</a> @comments.pretty_date@ at @comments.pretty_time@ - <a href="contact?party_id=@comments.creation_user@">@comments.author@</a></dd>
-      <dd class="<if @comments.creation_user@ eq @user_id@>mine-</if><if @comments.rownum@ odd>odd</if><else>even</else>">@comments.comment_html;noquote@</dd>
+    <dt id="@comments.comment_id@" class="<if @comments.creation_user@ eq @user_id@>#contacts.mine-#</if><if @comments.rownum@ odd>#contacts.odd#</if><else>#contacts.even#</else>"><a href="comments#@comments.comment_id@" class="number">@comments.comment_number@.</a> #contacts.lt_commentspretty_date_a# <a href="contact?party_id=@comments.creation_user@">@comments.author@</a></dd>
+      <dd class="<if @comments.creation_user@ eq @user_id@>#contacts.mine-#</if><if @comments.rownum@ odd>#contacts.odd#</if><else>#contacts.even#</else>">@comments.comment_html;noquote@</dd>
 </multiple>
   </dl>
 </if>
 
 <if @form@ eq bottom>
 <formtemplate id="comment_add" style="../../../contacts/resources/forms/inline"></formtemplate>
 </if>
+
Index: openacs-4/packages/contacts/lib/contact-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-master.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/contacts/lib/contact-master.adp	19 May 2005 23:03:23 -0000	1.2
+++ openacs-4/packages/contacts/lib/contact-master.adp	28 May 2005 15:43:52 -0000	1.3
@@ -13,10 +13,11 @@
     <li><a href="@links.url@" title="Go to @links.label@"><if @links.selected_p@><strong></if>@links.label@<if @links.selected_p@></strong></if></a><if @links:rowcount@ eq @links.rownum@ and @public_url@ nil><em>&nbsp;</em></if> </li>
 </multiple>
 <if @public_url@ not nil>
-    <li><a href="@public_url@" title="Go to this community member's public page">Public Page</a><em>&nbsp;</em> </li>
+    <li><a href="@public_url@" title="Go to this community member's public page">#contacts.Public_Page#</a><em>&nbsp;</em> </li>
 </if>
   </ul>
 </div>
 
 <slave>
 
+
Index: openacs-4/packages/contacts/lib/groups.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/groups.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/contacts/lib/groups.adp	27 May 2005 09:35:43 -0000	1.4
+++ openacs-4/packages/contacts/lib/groups.adp	28 May 2005 15:43:52 -0000	1.5
@@ -3,11 +3,11 @@
 <formtemplate id="add_to_group" style="../../../contacts/resources/forms/inline"></formtemplate>
 </if>
 <else>
-<p>You cannot add this contact to more groups.</p>
+<p>#contacts.lt_You_cannot_add_this_c#</p>
 </else>
 </if>
 <if @groups:rowcount@ gt 0>
-<h3 class="contact-title">Groups</h3>
+<h3 class="contact-title">#contacts.Groups#</h3>
 <ul>
 <multiple name="groups">
 <if @groups.sub_p@>(</if><else><li></else>
@@ -17,5 +17,6 @@
 </ul>
 </if>
 <else>
-<strong>This contact is not part of any groups - this is a problem.</strong>
+<strong>#contacts.lt_This_contact_is_not_p#</strong>
 </else>
+
Index: openacs-4/packages/contacts/tcl/contacts-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-init.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/contacts/tcl/contacts-init.tcl	26 May 2005 09:40:45 -0000	1.5
+++ openacs-4/packages/contacts/tcl/contacts-init.tcl	28 May 2005 15:44:06 -0000	1.6
@@ -6,99 +6,3 @@
     @creation-date 2004-08-16
 }
 
-set attribute_id [attribute::new \
-              -object_type "person" \
-              -attribute_name "last_name" \
-              -datatype "string" \
-              -pretty_name "#ams.person_last_name#" \
-              -pretty_plural "#ams.person_last_name_plural#" \
-              -table_name "" \
-              -column_name "" \
-              -default_value "" \
-              -min_n_values "0" \
-              -max_n_values "1" \
-              -sort_order "1" \
-              -storage "type_specific" \
-              -static_p "f" \
-                      -if_does_not_exist]
-
-lang::message::register en_US ams person_last_name "First Names" 
-lang::message::register en_US ams person_last_name_plural "First Names"
-
-ams::attribute::new \
-              -attribute_id $attribute_id \
-              -widget "textbox" \
-              -dynamic_p "f"
-
-set attribute_id [attribute::new \
-              -object_type "person" \
-              -attribute_name "first_names" \
-              -datatype "string" \
-              -pretty_name "#ams.person_first_names#" \
-              -pretty_plural "#ams.person_first_names_plural#" \
-              -table_name "" \
-              -column_name "" \
-              -default_value "" \
-              -min_n_values "0" \
-              -max_n_values "1" \
-              -sort_order "1" \
-              -storage "type_specific" \
-              -static_p "f" \
-                      -if_does_not_exist]
-
-lang::message::register en_US ams person_first_names "Last Name" 
-lang::message::register en_US ams person_first_names_plural "Last Names"
-
-ams::attribute::new \
-              -attribute_id $attribute_id \
-              -widget "textbox" \
-              -dynamic_p "f"
-
-set attribute_id [attribute::new \
-              -object_type "party" \
-              -attribute_name "email" \
-              -datatype "string" \
-              -pretty_name "#ams.party_email#" \
-              -pretty_plural "#ams.party_email_plural#" \
-              -table_name "" \
-              -column_name "" \
-              -default_value "" \
-              -min_n_values "0" \
-              -max_n_values "1" \
-              -sort_order "1" \
-              -storage "type_specific" \
-              -static_p "f" \
-                      -if_does_not_exist]
-
-lang::message::register en_US ams party_email "Email Address"
-lang::message::register en_US ams party_email_plural "Email Addresses"
-
-ams::attribute::new \
-              -attribute_id $attribute_id \
-              -widget "email" \
-              -dynamic_p "f"
-
-set attribute_id [attribute::new \
-              -object_type "organization" \
-              -attribute_name "name" \
-              -datatype "string" \
-              -pretty_name "#ams.organization_name#" \
-              -pretty_plural "#ams.organization_name_plural#" \
-              -table_name "" \
-              -column_name "" \
-              -default_value "" \
-              -min_n_values "1" \
-              -max_n_values "1" \
-              -sort_order "1" \
-              -storage "generic" \
-              -static_p "f" \
-                      -if_does_not_exist]
-
-lang::message::register en_US ams organization_name "Organization Name"
-lang::message::register en_US ams organization_name_plural "Organization Names"
-
-ams::attribute::new \
-              -attribute_id $attribute_id \
-              -widget "textbox" \
-              -dynamic_p "t"
-
Index: openacs-4/packages/contacts/tcl/contacts-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-install-procs.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/contacts/tcl/contacts-install-procs.tcl	26 May 2005 09:37:54 -0000	1.1
+++ openacs-4/packages/contacts/tcl/contacts-install-procs.tcl	28 May 2005 15:44:06 -0000	1.2
@@ -9,6 +9,7 @@
     @cvs-id $Id$
 }
 
+namespace contact::install
 ad_proc -public -callback contact::contact_form {
     {-package_id:required}
     {-form:required}
@@ -23,3 +24,102 @@
     {-object_type:required}
 } {
 }
+
+ad_proc -public contact::install::register_attributes {
+    set attribute_id [attribute::new \
+                          -object_type "person" \
+                          -attribute_name "last_name" \
+                          -datatype "string" \
+                          -pretty_name "#ams.person_last_name#" \
+                          -pretty_plural "#ams.person_last_name_plural#" \
+                          -table_name "" \
+                          -column_name "" \
+                          -default_value "" \
+                          -min_n_values "0" \
+                          -max_n_values "1" \
+                          -sort_order "1" \
+                          -storage "type_specific" \
+                          -static_p "f" \
+                          -if_does_not_exist]
+    
+    lang::message::register en_US ams person_last_name "First Names" 
+    lang::message::register en_US ams person_last_name_plural "First Names"
+    
+    ams::attribute::new \
+        -attribute_id $attribute_id \
+        -widget "textbox" \
+        -dynamic_p "f"
+    
+    set attribute_id [attribute::new \
+                          -object_type "person" \
+                          -attribute_name "first_names" \
+                          -datatype "string" \
+                          -pretty_name "#ams.person_first_names#" \
+                          -pretty_plural "#ams.person_first_names_plural#" \
+                          -table_name "" \
+                          -column_name "" \
+                          -default_value "" \
+                          -min_n_values "0" \
+                          -max_n_values "1" \
+                          -sort_order "1" \
+                          -storage "type_specific" \
+                          -static_p "f" \
+                          -if_does_not_exist]
+    
+    lang::message::register en_US ams person_first_names "Last Name" 
+    lang::message::register en_US ams person_first_names_plural "Last Names"
+    
+    ams::attribute::new \
+        -attribute_id $attribute_id \
+        -widget "textbox" \
+        -dynamic_p "f"
+    
+    set attribute_id [attribute::new \
+                          -object_type "party" \
+                          -attribute_name "email" \
+                          -datatype "string" \
+                          -pretty_name "#ams.party_email#" \
+                          -pretty_plural "#ams.party_email_plural#" \
+                          -table_name "" \
+                          -column_name "" \
+                          -default_value "" \
+                          -min_n_values "0" \
+                          -max_n_values "1" \
+                          -sort_order "1" \
+                          -storage "type_specific" \
+                          -static_p "f" \
+                          -if_does_not_exist]
+    
+    lang::message::register en_US ams party_email "Email Address"
+    lang::message::register en_US ams party_email_plural "Email Addresses"
+    
+    ams::attribute::new \
+        -attribute_id $attribute_id \
+        -widget "email" \
+        -dynamic_p "f"
+    
+    set attribute_id [attribute::new \
+                          -object_type "organization" \
+                          -attribute_name "name" \
+                          -datatype "string" \
+                          -pretty_name "#ams.organization_name#" \
+                          -pretty_plural "#ams.organization_name_plural#" \
+                          -table_name "" \
+                          -column_name "" \
+                          -default_value "" \
+                          -min_n_values "1" \
+                          -max_n_values "1" \
+                          -sort_order "1" \
+                          -storage "generic" \
+                          -static_p "f" \
+                          -if_does_not_exist]
+    
+    lang::message::register en_US ams organization_name "Organization Name"
+    lang::message::register en_US ams organization_name_plural "Organization Names"
+    
+    ams::attribute::new \
+        -attribute_id $attribute_id \
+        -widget "textbox" \
+        -dynamic_p "t"
+    
+}
\ No newline at end of file
Index: openacs-4/packages/contacts/www/contact-rels.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact-rels.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/contacts/www/contact-rels.adp	25 May 2005 16:23:51 -0000	1.3
+++ openacs-4/packages/contacts/www/contact-rels.adp	28 May 2005 15:44:06 -0000	1.4
@@ -10,7 +10,8 @@
 <if @query@ not nil>
 <listtemplate name="contacts"></listtemplate>
 
-<h3>Existing Relationships</h3>
+<h3>#contacts.lt_Existing_Relationship#</h3>
 </if>
 <listtemplate name="relationships"></listtemplate>
 
+
Index: openacs-4/packages/contacts/www/contact.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/contacts/www/contact.adp	27 May 2005 09:02:14 -0000	1.4
+++ openacs-4/packages/contacts/www/contact.adp	28 May 2005 15:44:06 -0000	1.5
@@ -40,10 +40,26 @@
 
       <include src="/packages/contacts/lib/groups" party_id="@party_id@" hide_form_p="t">
 
+      <include src="/packages/contacts/lib/relationships" party_id="@party_id@">
+
+      <include src="/packages/contacts/lib/comments"
+      party_id="@party_id@" limit="3" truncate_len="100" size="small"
+      recent_on_top_p="1"> 
+      <br />
+      @project_id@
+      @base_url@
+      <h3><a href="@project_url@">#contacts.PROJECT#</a>
+      <if @project_url@ ne "">
+          <include src="/packages/project-manager/lib/subprojects" project_item_id="@project_id@">
+      </if>
+    </td>
+  </tr>
+</table>
+<if @update_date@ not nil><p style="padding-top: 0px; margin-top: 0px;"><small>#contacts.lt_Last_updated_update_d#</small></p></if>
+
 <if @tasks_enabled_p@>
 	     <include src="/packages/tasks/lib/tasks" party_id="@party_id@" hide_form_p="t">
 </if>
-
       <include src="/packages/contacts/lib/comments" party_id="@party_id@" limit="3" truncate_len="150" size="small" recent_on_top_p="1">
 
 </div>
Index: openacs-4/packages/contacts/www/contact.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/contacts/www/contact.tcl	27 May 2005 09:35:43 -0000	1.5
+++ openacs-4/packages/contacts/www/contact.tcl	28 May 2005 15:44:06 -0000	1.6
@@ -77,11 +77,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 {}]
@@ -94,8 +89,19 @@
     set tasks_enabled_p 0
 }
 
+# Get the linked projekt_id to display the subprojects
 
+set project_id [application_data_link::get_linked -from_object_id $party_id -to_object_type "content_item"]
 
+if {$project_id > 0} {
+    set package_id [acs_object::get_element -object_id $project_id -element package_id]
+    set base_url [apm_package_url_from_id $package_id]
+    set project_url [export_vars -base $base_url {{project_item_id $project_id}}]
+} else {
+    set project_url ""
+}
 
 
+
+
 ad_return_template
Index: openacs-4/packages/contacts/www/group-parties-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/group-parties-add.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/contacts/www/group-parties-add.adp	18 May 2005 16:45:50 -0000	1.1
+++ openacs-4/packages/contacts/www/group-parties-add.adp	28 May 2005 15:44:06 -0000	1.2
@@ -1,10 +1,10 @@
-<master>
-
-<property name="title">@title@</property>
-<property name="context">@context@</property>
-<property name="header_stuff">
-    <link href="/resources/contacts/contacts.css" rel="stylesheet" type="text/css">
-</property>
-
-<formtemplate id="add_to_group"></formtemplate>
-
+<master>
+
+<property name="title">@title@</property>
+<property name="context">@context@</property>
+<property name="header_stuff">
+    <link href="/resources/contacts/contacts.css" rel="stylesheet" type="text/css">
+</property>
+
+<formtemplate id="add_to_group"></formtemplate>
+
Index: openacs-4/packages/contacts/www/group-parties-remove.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/group-parties-remove.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/contacts/www/group-parties-remove.adp	18 May 2005 16:45:50 -0000	1.1
+++ openacs-4/packages/contacts/www/group-parties-remove.adp	28 May 2005 15:44:06 -0000	1.2
@@ -1,10 +1,10 @@
-<master>
-
-<property name="title">@title@</property>
-<property name="context">@context@</property>
-<property name="header_stuff">
-    <link href="/resources/contacts/contacts.css" rel="stylesheet" type="text/css">
-</property>
-
-<formtemplate id="remove_from_group"></formtemplate>
-
+<master>
+
+<property name="title">@title@</property>
+<property name="context">@context@</property>
+<property name="header_stuff">
+    <link href="/resources/contacts/contacts.css" rel="stylesheet" type="text/css">
+</property>
+
+<formtemplate id="remove_from_group"></formtemplate>
+
Index: openacs-4/packages/contacts/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/index.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/contacts/www/index.adp	25 May 2005 16:23:51 -0000	1.5
+++ openacs-4/packages/contacts/www/index.adp	28 May 2005 15:44:06 -0000	1.6
@@ -8,11 +8,11 @@
 <property name="focus">search.query</property>
 <div id="section">
   <ul>
-    <li><a href="contact-add?object_type=person" title="Add a Person">Add Person</a>
-    <li><a href="contact-add?object_type=organization" title="Add an Organization">Add Organization</a>
-    <li><a href="search" title="Advanced Search">Advanced Search</a>
-    <li><a href="settings" title="Modify My Settings">Settings</a>
-    <li><a href="admin" title="Admin">Admin</a><em>&nbsp;</em> </li>
+    <li><a href="contact-add?object_type=person" title="Add a Person">#contacts.Add_Person#</a>
+    <li><a href="contact-add?object_type=organization" title="Add an Organization">#contacts.Add_Organization#</a>
+    <li><a href="search" title="Advanced Search">#contacts.Advanced_Search#</a>
+    <li><a href="settings" title="Modify My Settings">#contacts.Settings#</a>
+    <li><a href="admin" title="Admin">#contacts.Admin#</a><em>&nbsp;</em> </li>
   </ul>
 </div>
 
@@ -21,3 +21,4 @@
 <listtemplate name="contacts"></listtemplate>
         
 
+
Index: openacs-4/packages/contacts/www/message-messages.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/message-messages.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/contacts/www/message-messages.adp	18 May 2005 16:45:50 -0000	1.1
+++ openacs-4/packages/contacts/www/message-messages.adp	28 May 2005 15:44:06 -0000	1.2
@@ -1,25 +1,26 @@
-<html>
-<head>
-<title>Mail Merge Results</title>
-<link href="/resources/contacts/contacts.css" rel="stylesheet" media="screen" type="text/css">
-<link href="/resources/contacts/contacts-print.css" rel="stylesheet" media="print" type="text/css">
-</head>
-<body>
-<multiple name="messages">
-<if @messages.message_type@ eq letter>
-<div class="<if @messages.rownum@ eq @messages:rowcount@>last</if>letter">
-@messages.content;noquote@
-</div>
-</if>	
-<if @messages.message_type@ eq email>
-<pre>
-From:    @from@
-To:      @messages.to@
-Subject: @messages.subject@
-
-@messages.content@
-</pre>
-<if @messages.rownum@ not eq @messages:rowcount@><br><br><br><hr /></if>
-</if>
-</multiple>
-</body>
+<html>
+<head>
+<title>#contacts.Mail_Merge_Results#</title>
+<link href="/resources/contacts/contacts.css" rel="stylesheet" media="screen" type="text/css">
+<link href="/resources/contacts/contacts-print.css" rel="stylesheet" media="print" type="text/css">
+</head>
+<body>
+<multiple name="messages">
+<if @messages.message_type@ eq letter>
+<div class="<if @messages.rownum@ eq @messages:rowcount@>#contacts.last#</if>letter">
+@messages.content;noquote@
+</div>
+</if>	
+<if @messages.message_type@ eq email>
+<pre>
+From:    @from@
+To:      @messages.to@
+Subject: @messages.subject@
+
+@messages.content@
+</pre>
+<if @messages.rownum@ not eq @messages:rowcount@><br><br><br><hr /></if>
+</if>
+</multiple>
+</body>
+
Index: openacs-4/packages/contacts/www/person-groups-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/person-groups-ae.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/contacts/www/person-groups-ae.adp	18 May 2005 16:45:50 -0000	1.1
+++ openacs-4/packages/contacts/www/person-groups-ae.adp	28 May 2005 15:44:06 -0000	1.2
@@ -1,7 +1,7 @@
-<master>
-<property name="title">@title@</property>
-<property name="context">@context@</property>
-
-<formtemplate id="groups_ae"></formtemplate>
-
-      
+<master>
+<property name="title">@title@</property>
+<property name="context">@context@</property>
+
+<formtemplate id="groups_ae"></formtemplate>
+
+      
Index: openacs-4/packages/contacts/www/relationship-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/relationship-add.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/contacts/www/relationship-add.adp	18 May 2005 16:45:50 -0000	1.1
+++ openacs-4/packages/contacts/www/relationship-add.adp	28 May 2005 15:44:06 -0000	1.2
@@ -1,9 +1,10 @@
 <master src="/packages/contacts/lib/contact-master">
 <property name="party_id">@party_id@</property>
 
-<p>What role does @contact_name_one@ have when @contact_name_two@ is a @secondary_role_pretty@: </p>
+<p>#contacts.lt_What_role_does_contac# </p>
 <ul>
 <multiple name="rel_types">
   <li><a href="@rel_types.url@">@rel_types.primary_role_pretty@</a>
 </multiple>
 </ul>
+
Index: openacs-4/packages/contacts/www/search-help.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/search-help.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/contacts/www/search-help.adp	18 May 2005 16:45:50 -0000	1.1
+++ openacs-4/packages/contacts/www/search-help.adp	28 May 2005 15:44:06 -0000	1.2
@@ -1,29 +1,30 @@
-<master>
-
-<property name="title">@title@</property>
-<property name="context">@context@</property>
-<property name="header_stuff">
-    <link href="/resources/contacts/contacts.css" rel="stylesheet" type="text/css">
-</property>
-<p>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.</p>
-<h3>Normal Searches</h3>
-<p>Entering a string in the normal search box means that a search will be performed where:</p>
-<ol>
-<li>"First Names" contains "Search_Word" or
-<li>"Last Name" contains "Search_Word" or 
-<li>"Organization Name" contains "Search_Word" or
-<li>"Party ID" equals "Search_Word"
-</ol>
-<p>If multiple words are used then all words must match the above critera. So, for example if our contacts database contains these entries:
-<pre>
-Contact ID    | First Names    | Last Name     | Organization Name
---------------+----------------+---------------+---------------------------------
-123           | Jane           | Doe           |
-234           | John           | Doe           |
-345           | Alfred         | Hitchcock     |
-456           |                |               | United States Treasury
-</pre>
-<p>If in a normal search we search for "D Jane". The first Search_Word ("D") matches contacts 123 (via "Doe"), 234 (via "Doe"), and 345 (via "Alfred"). And the second Search_Word ("Jane") matches only contact 123. Thus only one contact meets both requirements and "Jane Doe" (contact 123) is returned.</p>
-
-<h3>Advanced Searches</h3>
-<p>Advanced searches are very powerful but in return they require very specific input...
+<master>
+
+<property name="title">@title@</property>
+<property name="context">@context@</property>
+<property name="header_stuff">
+    <link href="/resources/contacts/contacts.css" rel="stylesheet" type="text/css">
+</property>
+<p>#contacts.lt_All_searches_are_case#</p>
+<h3>#contacts.Normal_Searches#</h3>
+<p>#contacts.lt_Entering_a_string_in_#</p>
+<ol>
+<li>#contacts.lt_First_Names_contains_#
+<li>#contacts.lt_Last_Name_contains_Se# 
+<li>#contacts.lt_Organization_Name_con#
+<li>#contacts.lt_Party_ID_equals_Searc#
+</ol>
+<p>#contacts.lt_If_multiple_words_are#
+<pre>
+Contact ID    | First Names    | Last Name     | Organization Name
+--------------+----------------+---------------+---------------------------------
+123           | Jane           | Doe           |
+234           | John           | Doe           |
+345           | Alfred         | Hitchcock     |
+456           |                |               | United States Treasury
+</pre>
+<p>#contacts.lt_If_in_a_normal_search#</p>
+
+<h3>#contacts.Advanced_Searches#</h3>
+<p>#contacts.lt_Advanced_searches_are#
+
Index: openacs-4/packages/contacts/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/search.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/contacts/www/search.adp	25 May 2005 16:23:51 -0000	1.2
+++ openacs-4/packages/contacts/www/search.adp	28 May 2005 15:44:06 -0000	1.3
@@ -6,11 +6,12 @@
     <link href="/resources/contacts/contacts.css" rel="stylesheet" type="text/css">
 </property>
 
-<p><a href="my-searches" class="button">My Searches</a></p>
+<p><a href="my-searches" class="button">#contacts.My_Searches#</a></p>
 <formtemplate id="advanced_search" style="../../../contacts/resources/forms/inline"></formtemplate>
 
 <if @query_code@ not nil and @sw_admin_p@>
-<h3>Debugging Code - Only SW Admins See This</h3>
+<h3>#contacts.lt_Debugging_Code_-_Only#</h3>
 
 @query_code;noquote@
 </if>
+
Index: openacs-4/packages/contacts/www/settings.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/settings.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/contacts/www/settings.adp	18 May 2005 16:45:50 -0000	1.1
+++ openacs-4/packages/contacts/www/settings.adp	28 May 2005 15:44:06 -0000	1.2
@@ -1,12 +1,13 @@
-<master>
-<property name="title">@title@</property>
-<property name="context">@context@</property>
-
-<p>
-<a href="signature" class="button">Add Signature</a></if>
-<if @admin_p@><a href="admin/" class="button">Administer Contacts</a></if>
-</p>
-<h3>My Signatures</h3>
-<listtemplate name="signatures"></listtemplate>
-
-
+<master>
+<property name="title">@title@</property>
+<property name="context">@context@</property>
+
+<p>
+<a href="signature" class="button">#contacts.Add_Signature#</a></if>
+<if @admin_p@><a href="admin/" class="button">#contacts.Administer_Contacts#</a></if>
+</p>
+<h3>#contacts.My_Signatures#</h3>
+<listtemplate name="signatures"></listtemplate>
+
+
+
Index: openacs-4/packages/contacts/www/admin/group-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/group-ae.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/contacts/www/admin/group-ae.adp	18 May 2005 16:45:50 -0000	1.1
+++ openacs-4/packages/contacts/www/admin/group-ae.adp	28 May 2005 15:44:06 -0000	1.2
@@ -1,7 +1,7 @@
-<master>
-
-<property name="title">@title@</property>
-<property name="context">@context@</property>
-
-<formtemplate id="group_ae"></formtemplate>
-
+<master>
+
+<property name="title">@title@</property>
+<property name="context">@context@</property>
+
+<formtemplate id="group_ae"></formtemplate>
+
Index: openacs-4/packages/contacts/www/admin/group-map.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/group-map.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/contacts/www/admin/group-map.adp	18 May 2005 16:45:50 -0000	1.1
+++ openacs-4/packages/contacts/www/admin/group-map.adp	28 May 2005 15:44:06 -0000	1.2
@@ -1,7 +1,7 @@
-<master>
-
-<property name="title">@title@</property>
-<property name="context">@context@</property>
-
-<formtemplate id="group_map"></formtemplate>
-
+<master>
+
+<property name="title">@title@</property>
+<property name="context">@context@</property>
+
+<formtemplate id="group_map"></formtemplate>
+
Index: openacs-4/packages/contacts/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/index.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/contacts/www/admin/index.adp	18 May 2005 16:45:50 -0000	1.3
+++ openacs-4/packages/contacts/www/admin/index.adp	28 May 2005 15:44:06 -0000	1.4
@@ -3,15 +3,16 @@
 <property name="context">@context@</property>
 
 <p>
-<a href="relationships" class="button">Relationships</a>
-<a href="group-ae" class="button">Add Group</a>
-<a href="permissions" class="button">Instance Permissions - Not done yet</a>
+<a href="relationships" class="button">#contacts.Relationships#</a>
+<a href="group-ae" class="button">#contacts.Add_Group#</a>
+<a href="permissions" class="button">#contacts.lt_Instance_Permissions_#</a>
 </p>
-<h1>READ THESE</h1>
+<h1>#contacts.READ_THESE#</h1>
 <ul>
-  <li>Make sure you do not add the same attribute to multiple groups</li>
-  <li>The default group must have first_names and last_name for person objects and name for organization objects, both of them need email</li>
+  <li>#contacts.lt_Make_sure_you_do_not_#</li>
+  <li>#contacts.lt_The_default_group_mus#</li>
 </ul>
-<p>Once ready for release this will be taken care of in code</p>
+<p>#contacts.lt_Once_ready_for_releas#</p>
 <listtemplate name="groups"></listtemplate>
 
+
Index: openacs-4/packages/contacts/www/admin/relationships.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/relationships.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/contacts/www/admin/relationships.adp	21 May 2005 21:00:41 -0000	1.2
+++ openacs-4/packages/contacts/www/admin/relationships.adp	28 May 2005 15:44:06 -0000	1.3
@@ -4,17 +4,17 @@
 
 
 <p>
-<a href="relationship-ae" class="button">Define a new relationship type</a>
-<a href="roles" class="button">View all roles</a>
+<a href="relationship-ae" class="button">#contacts.lt_Define_a_new_relation#</a>
+<a href="roles" class="button">#contacts.View_all_roles#</a>
 </p>
-<p>Currently, the system is able to handle the following types of relationships: </p>
+<p>#contacts.lt_Currently_the_system_# </p>
 
 
 
 <dl>
 
   <if @rel_types:rowcount@ eq 0>
-    <dt><em>(none)</em></dt>
+    <dt><em>#contacts.none#</em></dt>
       
   </if>
   <else>
@@ -24,7 +24,7 @@
     <dl>
       <ul>
         <group column=sort_two>
-        <li>@rel_types.primary_role_pretty@ -> @rel_types.secondary_role_pretty@ <a href="@rel_types.rel_form_url@" class="button">Attributes</a></li>
+        <li>@rel_types.primary_role_pretty@ -> @rel_types.secondary_role_pretty@ <a href="@rel_types.rel_form_url@" class="button">#contacts.Attributes#</a></li>
         </group>
       </ul>
     </dl>
@@ -35,3 +35,4 @@
 </dl>
 
 
+
Index: openacs-4/packages/contacts/www/admin/role-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/role-ae.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/contacts/www/admin/role-ae.adp	18 May 2005 16:45:50 -0000	1.1
+++ openacs-4/packages/contacts/www/admin/role-ae.adp	28 May 2005 15:44:06 -0000	1.2
@@ -1,6 +1,7 @@
 <master>
 <property name="context">@context;noquote@</property>
-<property name="title">Create role</property>
+<property name="title">#contacts.Create_role#</property>
 <property name="focus">role_form.role</property>
 
 <formtemplate id="role_form"></formtemplate>
+
Index: openacs-4/packages/contacts/www/admin/roles.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/roles.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/contacts/www/admin/roles.adp	18 May 2005 16:45:50 -0000	1.1
+++ openacs-4/packages/contacts/www/admin/roles.adp	28 May 2005 15:44:06 -0000	1.2
@@ -1,16 +1,17 @@
 <master>
 <property name="context">@context;noquote@</property>
-<property name="title">Roles</property>
+<property name="title">#contacts.Roles#</property>
 
 
-<p><a href="role-ae" class="button">Create a role</a></p>
+<p><a href="role-ae" class="button">#contacts.Create_a_role#</a></p>
 <ul>
   <if @roles:rowcount@ eq 0>
-    <li> <em>(none)</em>
+    <li> <em>#contacts.none#</em>
   </if><else>
   <multiple name="roles">
     <li> <a href=role-ae?role=<%=[ad_urlencode $roles(role)]%>>@roles.pretty_name@</a>
   </multiple>
   </else>
 </ul>
 
+
Index: openacs-4/packages/contacts/www/admin/widgets.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/widgets.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/contacts/www/admin/widgets.adp	18 May 2005 16:45:50 -0000	1.3
+++ openacs-4/packages/contacts/www/admin/widgets.adp	28 May 2005 15:44:06 -0000	1.4
@@ -1,6 +1,6 @@
-<master>
-<property name="title">@title@</property>
-<property name="context">@context@</property>
-
-
-      <listtemplate name="entries"></listtemplate>
+<master>
+<property name="title">@title@</property>
+<property name="context">@context@</property>
+
+
+      <listtemplate name="entries"></listtemplate>