Index: openacs-4/packages/ams/catalog/ams.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/catalog/ams.de_DE.ISO-8859-1.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ams/catalog/ams.de_DE.ISO-8859-1.xml	8 Jun 2005 16:35:44 -0000	1.2
+++ openacs-4/packages/ams/catalog/ams.de_DE.ISO-8859-1.xml	10 Jun 2005 21:50:53 -0000	1.3
@@ -2,35 +2,60 @@
 <message_catalog package_key="ams" package_version="1.1d1" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="Action">Aktion</msg>
+  <msg key="Add_an_AMS_Attribute">Ein AMS Attribut hinzuf�gen</msg>
+  <msg key="Add_Attribute">Ein Attribut hinzuf�gen</msg>
   <msg key="Add_Heading">�berschrift hinzuf�gen</msg>
+  <msg key="Address">Adresse</msg>
+  <msg key="AMS_Attributes">AMS Attribute</msg>
   <msg key="Answer_Optional">optionale Antwort</msg>
   <msg key="Answer_Required">Antwort erforderlich</msg>
+  <msg key="Attribute_Name">Name des Attributs</msg>
+  <msg key="Checkbox">Checkbox - Mehrere Optionen erlaubt</msg>
   <msg key="country">Land</msg>
+  <msg key="Date">Datum</msg>
   <msg key="Define_Widget">Widget definieren</msg>
   <msg key="delivery_address">Strasse</msg>
+  <msg key="Email">E-Mail</msg>
   <msg key="Form_Preview">Formblatt Voransicht</msg>
   <msg key="Heading">�berschrift</msg>
+  <msg key="Integer">Zahl</msg>
   <msg key="List_Name">Listenname</msg>
+  <msg key="lt_AMS_Lists_associated_">AMS Listen, die mit diesem Objekt Typen verbunden sind</msg>
   <msg key="lt_An_answer_from_the_ch">Die Antwort des Users ist optional</msg>
   <msg key="lt_Create_and_map_a_new_">Ein neues Attribut erstellen und zuweisen</msg>
+  <msg key="lt_Export_code_to_recrea">Code zum Erstellen dieser Liste exportieren</msg>
   <msg key="lt_Require_an_answer_fro">Ben�tigen eine Antwort vom User</msg>
   <msg key="lt_Unmap_check_attribute">Markierte Attribute entfernen</msg>
   <msg key="lt_Update_ordering_from_">Update Reihenfolge</msg>
   <msg key="Map">Zuweisen</msg>
   <msg key="Mapped_Attributes">Zugewiesene Attribute</msg>
+  <msg key="Multiselect">Menu - Mehrere Optionen erlaubt</msg>
   <msg key="municipality">Stadt</msg>
   <msg key="Object_Type">Objekttyp</msg>
   <msg key="Option">Option</msg>
   <msg key="Optional">optional</msg>
   <msg key="Ordering">Reihenfolge</msg>
+  <msg key="Package_Key">Package Key</msg>
   <msg key="postal_code">Postleitzahl</msg>
+  <msg key="Pretty_Name">Sichtbarer Name: Name</msg>
+  <msg key="Pretty_Name_1">Sichtbarer Name</msg>
+  <msg key="Pretty_Plural">Sichtbarer Name im Plural:</msg>
+  <msg key="Pretty_Plural_1">Sichtbarer Name im Plural</msg>
   <msg key="Preview_Input_Form">Voransicht des Formblatts</msg>
+  <msg key="Radio">Radio Buttons - Eine Option erlaubt</msg>
   <msg key="region">Bundesland</msg>
   <msg key="Required">Erforderlich</msg>
+  <msg key="Richtext">Textbox (WYSYWIG-Editor)</msg>
+  <msg key="Select">Drop Down List - Eine Option erlaubt</msg>
   <msg key="Sort_Order">Sortierreihenfolge</msg>
+  <msg key="Telecom_Number">Telefonnummer</msg>
+  <msg key="Textarea">Textbox (l�ngerer Text m�glich)</msg>
+  <msg key="Textbox">Textzeile</msg>
   <msg key="Unmap">Attribut entfernen</msg>
   <msg key="Unmapped_Attributes">Nicht zugewiesene Attribute</msg>
   <msg key="Update_Options">Aktualisieren der Optionen</msg>
   <msg key="Update_Ordering">Update Reihenfolge</msg>
+  <msg key="Url">Website URL</msg>
+  <msg key="Widget">Widget</msg>
   <msg key="Widget_1">Widget</msg>
 </message_catalog>
Index: openacs-4/packages/ams/catalog/ams.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/catalog/ams.en_US.ISO-8859-1.xml,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/ams/catalog/ams.en_US.ISO-8859-1.xml	10 Jun 2005 14:45:17 -0000	1.10
+++ openacs-4/packages/ams/catalog/ams.en_US.ISO-8859-1.xml	10 Jun 2005 21:50:53 -0000	1.11
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="ams" package_version="1.0d" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="ams" package_version="1.1d1" locale="en_US" charset="ISO-8859-1">
 
   <msg key="Action">Action</msg>
   <msg key="Add_an_AMS_Attribute">Add an AMS Attribute</msg>
@@ -321,12 +321,12 @@
   <msg key="lt_Create_and_map_a_new_">Create and map a new attribute</msg>
   <msg key="lt_Export_code_to_recrea">Export code to recreate this list</msg>
   <msg key="lt_Here_is_the_code_nece">Here is the code necessary to recreate the list</msg>
-  <msg key="lt_You_can_create_a_list">You can create a list ...</msg>
-  <msg key="Map">Map</msg>
   <msg key="lt_If_you_need_to_add_mo">If you need to add more you will be able to</msg>
   <msg key="lt_Require_an_answer_fro">Require an answer from the checked attributes</msg>
   <msg key="lt_Unmap_check_attribute">Unmap the checked attributes</msg>
   <msg key="lt_Update_ordering_from_">Update ordering from numbers in the ordering column</msg>
+  <msg key="lt_You_can_create_a_list">You can create a list ...</msg>
+  <msg key="Map">Map</msg>
   <msg key="Mapped_Attributes">Mapped Attributes</msg>
   <msg key="married">Marriage Status</msg>
   <msg key="married_plural">Marriage Statuses</msg>
Index: openacs-4/packages/ams/tcl/ams-list-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/tcl/ams-list-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ams/tcl/ams-list-procs.tcl	3 Jun 2005 01:17:56 -0000	1.3
+++ openacs-4/packages/ams/tcl/ams-list-procs.tcl	10 Jun 2005 21:50:53 -0000	1.4
@@ -211,7 +211,8 @@
     if { ![exists_and_not_null description] } {
         set description_mime_type ""
     }
-
+    
+    set pretty_name [lang::util::convert_to_i18n -prefix "ams_list" -text "$pretty_name"]
     set extra_vars [ns_set create]
     oacs_util::vars_to_ns_set -ns_set $extra_vars -var_list { list_id package_key object_type list_name pretty_name description description_mime_type }
     set list_id [package_instantiate_object -extra_vars $extra_vars ams_list]
Index: openacs-4/packages/ams/tcl/ams-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/tcl/ams-procs.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/ams/tcl/ams-procs.tcl	10 Jun 2005 09:43:22 -0000	1.13
+++ openacs-4/packages/ams/tcl/ams-procs.tcl	10 Jun 2005 21:50:53 -0000	1.14
@@ -67,8 +67,8 @@
 
     @see ams::attribute::new
 } {
-    set pretty_name [lang::util::convert_to_i18n -prefix "${object_type}_${attribute_name}" -text "$pretty_name"]
-    set pretty_plural [lang::util::convert_to_i18n -prefix "${object_type}_${attribute_name}" -text "$pretty_plural"]
+    set pretty_name [lang::util::convert_to_i18n -message_key "${object_type}_${attribute_name}" -text "$pretty_name"]
+    set pretty_plural [lang::util::convert_to_i18n -message_key "${object_type}_${attribute_name}" -text "$pretty_plural"]
 
     if { $if_does_not_exist_p } {
 	set attribute_id [attribute::id -object_type $object_type -attribute_name $attribute_name]
Index: openacs-4/packages/ams/www/list-code.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/www/list-code.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/ams/www/list-code.adp	7 Jun 2005 07:44:14 -0000	1.5
+++ openacs-4/packages/ams/www/list-code.adp	10 Jun 2005 21:50:53 -0000	1.6
@@ -8,8 +8,8 @@
                 -package_key "@list_info.package_key@" \
                 -object_type "@list_info.object_type@" \
                 -list_name "@list_info.list_name@" \
-                -pretty_name "\#@list_info.pretty_name@\#" \
-                -description "\#@list_info.description@\#" \
+                -pretty_name "@list_info.pretty_name@" \
+                -description "@list_info.description@" \
                 -description_mime_type "@list_info.description_mime_type@"]
 
 
@@ -20,8 +20,8 @@
               -object_type "@attributes.object_type@" \
               -attribute_name "@attributes.attribute_name@" \
               -datatype "@attributes.datatype@" \
-              -pretty_name "\#@attributes.pretty_name@#" \
-              -pretty_plural "\#@attributes.pretty_plural@#" \
+              -pretty_name "@attributes.pretty_name@" \
+              -pretty_plural "@attributes.pretty_plural@" \
               -table_name "@attributes.table_name@" \
               -column_name "@attributes.column_name@" \
               -default_value "@attributes.default_value@" \
@@ -32,9 +32,6 @@
               -static_p "@attributes.static_p@" \
               -if_does_not_exist]
 
-lang::message::register en_US acs-translations @attributes.message_key@ "@attributes.true_pretty@"
-lang::message::register en_US acs-translations @attributes.message_key@_plural "@attributes.true_plural@"
-
 ams::attribute::new \
               -attribute_id $attribute_id \
               -widget "@attributes.widget@" \
@@ -51,9 +48,8 @@
 <if @attributes.option_id@ not nil>
 set option_id [ams::option::new \
 	-attribute_id $attribute_id \
-	-option "\#@attributes.option@#"]
+	-option "@attributes.option@"]
 
-lang::message::register en_US acs-translations @attributes.option_key@ "@attributes.true_option@"
 </if>
 </group>
 </multiple>
Index: openacs-4/packages/ams/www/list-code.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/www/list-code.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/ams/www/list-code.tcl	7 Jun 2005 07:44:14 -0000	1.5
+++ openacs-4/packages/ams/www/list-code.tcl	10 Jun 2005 21:50:53 -0000	1.6
@@ -42,13 +42,10 @@
 } {
     regsub -all {"} $section_heading {\"} section_heading
     set message_key "${object_type}_${attribute_name}"
-    set option_key "${message_key}_[lang::util::suggest_key $option]"
-    set pretty_name "acs-translation.$message_key"
-    set pretty_plural "acs-translation.${message_key}_plural"
-    set true_pretty [lang::message::lookup en_US acs-translations.$message_key]
-    set true_plural [lang::message::lookup en_US acs-translations.${message_key}_plural]
-    set true_option $option
-    set option "acs-translation.$option_key"
+#    set option [lang::message::lookup en_US [string trim $option "#"]]
+	set pretty_name [lang::message::lookup en_US [string trim $pretty_name "#"]]
+	set pretty_plural [lang::message::lookup en_US [string trim $pretty_plural "#"]]
+
 # set true_option [lang::message::lookup en_US acs-translations.$option_key]
 }