Index: openacs-4/packages/contacts/contacts.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/contacts.info,v
diff -u -r1.60 -r1.61
--- openacs-4/packages/contacts/contacts.info	3 Jan 2006 22:14:54 -0000	1.60
+++ openacs-4/packages/contacts/contacts.info	29 Jan 2006 16:18:16 -0000	1.61
@@ -7,14 +7,14 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="1.1d12" url="http://openacs.org/repository/download/apm/contacts-1.1d12.apm">
+    <version name="1.2b1" url="http://openacs.org/repository/download/apm/contacts-1.2b1.apm">
         <owner url="mailto:openacs@geddert.com">Matthew Geddert</owner>
         <summary>This application lets you collaboratively view, edit and categorize contacts.</summary>
         <release-date>2005-11-23</release-date>
         <description format="text/plain">Contacts is an application for managing all those people and or organization you need to keep track of. It has a complete UI for storing and categorizing contacts. Each contact can have an arbitrary number of custom attributes associated with it, including other contacts (i.e. a certain contact &quot;belongs&quot; to a certain organization). It also functions as a service contract provider for attributes related to users in your system</description>
         <maturity>0</maturity>
 
-        <provides url="contacts" version="1.1d12"/>
+        <provides url="contacts" version="1.2b1"/>
         <requires url="acs-tcl" version="5.2.0b3"/>
         <requires url="acs-datetime" version="4.2"/>
         <requires url="acs-events" version="0.5d3"/>
Index: openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml	31 Dec 2005 07:39:39 -0000	1.22
+++ openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml	29 Jan 2006 16:18:16 -0000	1.23
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="contacts" package_version="1.1d10" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="contacts" package_version="1.1d12" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="--_select_a_group_--">-- eine Gruppe markieren --</msg>
   <msg key="--Create_New_Message--">-- Neue Nachricht erstellen --</msg>
@@ -21,8 +21,8 @@
   <msg key="Add_Message">Nachricht hinzuf�gen</msg>
   <msg key="Add_New">Neuen hinzuf�gen</msg>
   <msg key="Add_new_in_Group">Eine neue %object_type% Gruppen zuteilen</msg>
-  <msg key="Add_Organization">Neuer Kunde</msg>
-  <msg key="Add_Person">Neuer Kundenkontakt</msg>
+  <msg key="Add_Organization">Neue Organisation</msg>
+  <msg key="Add_Person">Neue Person</msg>
   <msg key="Add_Search">Suche hinzuf�gen</msg>
   <msg key="Add_Signature">Eine Signatur hinzuf�gen</msg>
   <msg key="Add_the_selected_contacts_to_a_category">Den ausgew�hlten Kontakt zu einer Kategorie hinzuweisen</msg>
@@ -46,7 +46,7 @@
   <msg key="All_Contacts">Alle Kontakte</msg>
   <msg key="and">und</msg>
   <msg key="Answer">Antwort</msg>
-  <msg key="Any">jede/r</msg>
+  <msg key="Any">einer</msg>
   <msg key="Archive">Archiv</msg>
   <msg key="Archive_the_checked_contacts">Die markierten Kontakte archivieren</msg>
   <msg key="Archived">Archiviert</msg>
@@ -61,6 +61,8 @@
   <msg key="Attributes">Attribute</msg>
   <msg key="Available_Attributes">Verf�gbare Attribute</msg>
   <msg key="Available_Options">Verf�gbare Optionen</msg>
+  <msg key="Banner">Banner</msg>
+  <msg key="Banner_help_text">Pfad zu der Datei welche das Banner enth�lt</msg>
   <msg key="Belongs_to">Geh�rt zu</msg>
   <msg key="Body">Haupttext</msg>
   <msg key="Bulk_Update">Massen Update</msg>
@@ -105,9 +107,10 @@
   <msg key="Create_a_role">Eine Rolle anlegen</msg>
   <msg key="Create_a_Signature">Eine Signatur erstellen</msg>
   <msg key="Create_a_user_account_for_this_person">F�r diesen User einen User Account erzeugen</msg>
-  <msg key="Create_Club">Kundenportal Anlegen</msg>
+  <msg key="Create_Club">&lt;font color=red&gt;Kundenportal Anlegen&lt;/font&gt;</msg>
   <msg key="create_email">e-Mail anlegen</msg>
   <msg key="create_letter">Einen Brief anlegen</msg>
+  <msg key="create_oo_mailing">Mailing erstellen</msg>
   <msg key="create_project">Neues Projekt anlegen</msg>
   <msg key="Create_role">Rolle anlegen</msg>
   <msg key="Create_user">User anlegen</msg>
@@ -388,7 +391,13 @@
   <msg key="odd">ungerade</msg>
   <msg key="of">von</msg>
   <msg key="Offers">Angebote</msg>
+  <msg key="oo_content_help">Text welcher in die Vorlage eingelesen wird. Bitte nicht mit HTML verunstalten sondern in einem Font bleiben.</msg>
+  <msg key="oo_email_content">E-Mail</msg>
+  <msg key="oo_email_help">Inhalt der E-Mail, wenn Sie eine E-Mail versenden.</msg>
+  <msg key="oo_email_subject_help">Betreff der E-Mail. &lt;font color=red&gt;&lt;b&gt;Leer lassen zum Drucken&lt;/b&gt;&lt;/font&gt;
+</msg>
   <msg key="oo_mailing">Open Office Mailing</msg>
+  <msg key="oo_message">Mailing Vorlage</msg>
   <msg key="open">Offen</msg>
   <msg key="or">oder</msg>
   <msg key="Ordering">Reihenfolge</msg>
@@ -414,6 +423,7 @@
   <msg key="Permissions_for_default_group">Zugriffsrechte f�r Standardgruppe</msg>
   <msg key="Person">Person</msg>
   <msg key="Person_Form">Personen Formblatt</msg>
+  <msg key="pp">i.V.</msg>
   <msg key="Pretty_name">Angezeigter Name</msg>
   <msg key="pretty_name_help">Der Name der bei dieser Liste als �berschrift angezeigt wird.</msg>
   <msg key="Preview">Voransicht</msg>
@@ -485,8 +495,6 @@
   <msg key="signatures">Signaturen</msg>
   <msg key="Sort_By">Sortieren nach</msg>
   <msg key="Sort_by">Sortieren nach:</msg>
-  <msg key="Spoiler">Spoiler</msg>
-  <msg key="Spoiler_help_text">Pfad zu der .jpg Grafik Datei welche als Spoiler verwendet wird.</msg>
   <msg key="stateprovince_is_-">Bundesland ist -&gt;</msg>
   <msg key="Status">Status</msg>
   <msg key="Stored_extended">Gespeicherte erweiterte Optionen</msg>
@@ -526,6 +534,7 @@
   <msg key="Upload_file">Datei hochladen</msg>
   <msg key="Upload_More">Mehrere Dateien uploaden</msg>
   <msg key="User_Account_Information">Informationen zu dem User Account</msg>
+  <msg key="Users">Benutzer</msg>
   <msg key="valid">Berechtigt</msg>
   <msg key="Var_name">Variablen Name</msg>
   <msg key="var_name_help">Name der Variable, die in der erweiterten Suche verwendent werden soll.</msg>
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.59 -r1.60
--- openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml	3 Jan 2006 22:14:54 -0000	1.59
+++ openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml	29 Jan 2006 16:18:16 -0000	1.60
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="contacts" package_version="1.1d10" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="contacts" package_version="1.1d12" locale="en_US" charset="ISO-8859-1">
 
   <msg key="--_select_a_group_--">-- select a group --</msg>
   <msg key="--Create_New_Message--">-- Create New Message --</msg>
@@ -61,6 +61,8 @@
   <msg key="Attributes">Attributes</msg>
   <msg key="Available_Attributes">Available Attributes</msg>
   <msg key="Available_Options">Available Options</msg>
+  <msg key="Banner">Banner?</msg>
+  <msg key="Banner_help_text">Path to the file containing the image used as a banner</msg>
   <msg key="Belongs_to">Belongs to</msg>
   <msg key="Body">Body</msg>
   <msg key="Bulk_Update">Bulk Update</msg>
@@ -108,6 +110,7 @@
   <msg key="Create_Club">Create Club</msg>
   <msg key="create_email">Create Email</msg>
   <msg key="create_letter">Create Letter</msg>
+  <msg key="create_oo_mailing">Create OO Mailing</msg>
   <msg key="create_project">Create project</msg>
   <msg key="Create_role">Create role</msg>
   <msg key="Create_user">Create User</msg>
@@ -387,7 +390,12 @@
   <msg key="odd">odd</msg>
   <msg key="of">of</msg>
   <msg key="Offers">Offers</msg>
+  <msg key="oo_content_help">OO text which will be inserted into the template.</msg>
+  <msg key="oo_email_content">E-Mail content</msg>
+  <msg key="oo_email_help">Content of the E-mail, if you are sending an e-mail that is :).</msg>
+  <msg key="oo_email_subject_help">Subject of the email. &lt;font color=red&gt;&lt;b&gt;Leave empty to print&lt;/b&gt;&lt;/font&gt;</msg>
   <msg key="oo_mailing">Open Office Mailing</msg>
+  <msg key="oo_message">OO message</msg>
   <msg key="open">Open</msg>
   <msg key="or">or</msg>
   <msg key="Ordering">Ordering</msg>
@@ -413,6 +421,7 @@
   <msg key="Permissions_for_default_group">Permissions for default group</msg>
   <msg key="Person">Person</msg>
   <msg key="Person_Form">Person Form</msg>
+  <msg key="pp">pp.</msg>
   <msg key="Pretty_name">Pretty Name</msg>
   <msg key="pretty_name_help">The Pretty Name to use in the list label.</msg>
   <msg key="Preview">Preview</msg>
@@ -484,8 +493,6 @@
   <msg key="signatures">signatures</msg>
   <msg key="Sort_By">Sort By</msg>
   <msg key="Sort_by">Sort by</msg>
-  <msg key="Banner">Banner?</msg>
-  <msg key="Banner_help_text">Path to the file containing the image used as a banner</msg>
   <msg key="stateprovince_is_-">state/province is -&gt;</msg>
   <msg key="Status">Status</msg>
   <msg key="Stored_extended">Stored Extended Options</msg>