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.8 -r1.9
--- openacs-4/packages/ams/catalog/ams.en_US.ISO-8859-1.xml	7 Jun 2005 10:59:58 -0000	1.8
+++ openacs-4/packages/ams/catalog/ams.en_US.ISO-8859-1.xml	9 Jun 2005 20:20:39 -0000	1.9
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="ams" package_version="1.1d1" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="ams" package_version="1.0d" locale="en_US" charset="ISO-8859-1">
 
   <msg key="Action">Action</msg>
   <msg key="Add_an_AMS_Attribute">Add an AMS Attribute</msg>
@@ -9,41 +9,297 @@
   <msg key="AMS_Attributes">AMS Attributes</msg>
   <msg key="Answer_Optional">Answer Optional</msg>
   <msg key="Answer_Required">Answer Required</msg>
+  <msg key="apfee_dt">Application Fee Recieved</msg>
+  <msg key="apfee_dt_plural">Application Fees Recieved</msg>
+  <msg key="app_date">Applicatoin Date</msg>
+  <msg key="app_date_plural">Application Dates</msg>
   <msg key="app_rec">Application Recieved</msg>
   <msg key="app_rec_plural">Applications Recieved</msg>
   <msg key="app_visa">Application Visa</msg>
   <msg key="app_visa_plural">Application Visas</msg>
   <msg key="Attribute_Name">Attribute Name</msg>
   <msg key="birthday">Birthday</msg>
   <msg key="birthday_plural">Birthdays</msg>
+  <msg key="bt_patch_asdf">asdf</msg>
+  <msg key="bt_patch_Test">Test</msg>
+  <msg key="bt_patch_Tests">Tests</msg>
   <msg key="category">Category</msg>
   <msg key="category_plural">Categories</msg>
   <msg key="Checkbox">Checkbox - Multiple Options Allowed</msg>
   <msg key="cit_cntry">Citizenship</msg>
   <msg key="cit_cntry_plural">Citizenships</msg>
-  <msg key="Copy">Copy</msg>
   <msg key="country">Country</msg>
+  <msg key="country_AD">Andorra</msg>
+  <msg key="country_AE">United Arab Emirates</msg>
+  <msg key="country_AF">Afghanistan</msg>
+  <msg key="country_AG">Antigua and Barbuda</msg>
+  <msg key="country_AI">Anguilla</msg>
+  <msg key="country_AL">Albania</msg>
+  <msg key="country_AM">Armenia</msg>
+  <msg key="country_AN">Netherlands Antilles</msg>
+  <msg key="country_AO">Angola</msg>
+  <msg key="country_AQ">Antarctica</msg>
+  <msg key="country_AR">Argentina</msg>
+  <msg key="country_AS">American Samoa</msg>
+  <msg key="country_AT">Austria</msg>
+  <msg key="country_AU">Australia</msg>
+  <msg key="country_AW">Aruba</msg>
+  <msg key="country_AZ">Azerbaijan</msg>
+  <msg key="country_BA">Bosnia and Herzegovina</msg>
+  <msg key="country_BB">Barbados</msg>
+  <msg key="country_BD">Bangladesh</msg>
+  <msg key="country_BE">Belgium</msg>
+  <msg key="country_BF">Burkina Faso</msg>
+  <msg key="country_BG">Bulgaria</msg>
+  <msg key="country_BH">Bahrain</msg>
+  <msg key="country_BI">Burundi</msg>
+  <msg key="country_BJ">Benin</msg>
+  <msg key="country_BM">Bermuda</msg>
+  <msg key="country_BN">Brunei Darussalam</msg>
+  <msg key="country_BO">Bolivia</msg>
+  <msg key="country_BR">Brazil</msg>
+  <msg key="country_BS">Bahamas</msg>
+  <msg key="country_BT">Bhutan</msg>
+  <msg key="country_BV">Bouvet Island</msg>
+  <msg key="country_BW">Botswana</msg>
+  <msg key="country_BY">Belarus</msg>
+  <msg key="country_BZ">Belize</msg>
+  <msg key="country_CA">Canada</msg>
+  <msg key="country_CC">Cocos (Keeling) Islands</msg>
+  <msg key="country_CD">Congo, The Democratic Republic of the</msg>
+  <msg key="country_CF">Central African Republic</msg>
+  <msg key="country_CG">Congo</msg>
+  <msg key="country_CH">Switzerland</msg>
+  <msg key="country_CI">Cote D'ivoire</msg>
+  <msg key="country_CK">Cook Islands</msg>
+  <msg key="country_CL">Chile</msg>
+  <msg key="country_CM">Cameroon</msg>
+  <msg key="country_CN">China</msg>
+  <msg key="country_CO">Colombia</msg>
+  <msg key="country_CR">Costa Rica</msg>
+  <msg key="country_CU">Cuba</msg>
+  <msg key="country_CV">Cape Verde</msg>
+  <msg key="country_CX">Christmas Island</msg>
+  <msg key="country_CY">Cyprus</msg>
+  <msg key="country_CZ">Czech Republic</msg>
+  <msg key="country_DE">Germany</msg>
+  <msg key="country_DJ">Djibouti</msg>
+  <msg key="country_DK">Denmark</msg>
+  <msg key="country_DM">Dominica</msg>
+  <msg key="country_DO">Dominican Republic</msg>
+  <msg key="country_DZ">Algeria</msg>
+  <msg key="country_EC">Ecuador</msg>
+  <msg key="country_EE">Estonia</msg>
+  <msg key="country_EG">Egypt</msg>
+  <msg key="country_EH">Western Sahara</msg>
+  <msg key="country_ER">Eritrea</msg>
+  <msg key="country_ES">Spain</msg>
+  <msg key="country_ET">Ethiopia</msg>
+  <msg key="country_FI">Finland</msg>
+  <msg key="country_FJ">Fiji</msg>
+  <msg key="country_FK">Falkland Islands (Malvinas)</msg>
+  <msg key="country_FM">Micronesia, Federated States of</msg>
+  <msg key="country_FO">Faroe Islands</msg>
+  <msg key="country_FR">France</msg>
+  <msg key="country_GA">Gabon</msg>
+  <msg key="country_GB">United Kingdom</msg>
+  <msg key="country_GD">Grenada</msg>
+  <msg key="country_GE">Georgia</msg>
+  <msg key="country_GF">French Guiana</msg>
+  <msg key="country_GH">Ghana</msg>
+  <msg key="country_GI">Gibraltar</msg>
+  <msg key="country_GL">Greenland</msg>
+  <msg key="country_GM">Gambia</msg>
+  <msg key="country_GN">Guinea</msg>
+  <msg key="country_GP">Guadeloupe</msg>
+  <msg key="country_GQ">Equatorial Guinea</msg>
+  <msg key="country_GR">Greece</msg>
+  <msg key="country_GS">South Georgia and the South Sandwich Islands</msg>
+  <msg key="country_GT">Guatemala</msg>
+  <msg key="country_GU">Guam</msg>
+  <msg key="country_GW">Guinea-Bissau</msg>
+  <msg key="country_GY">Guyana</msg>
+  <msg key="country_HK">Hong Kong</msg>
+  <msg key="country_HM">Heard Island and Mcdonald Islands</msg>
+  <msg key="country_HN">Honduras</msg>
+  <msg key="country_HR">Croatia</msg>
+  <msg key="country_HT">Haiti</msg>
+  <msg key="country_HU">Hungary</msg>
+  <msg key="country_ID">Indonesia</msg>
+  <msg key="country_IE">Ireland</msg>
+  <msg key="country_IL">Israel</msg>
+  <msg key="country_IN">India</msg>
+  <msg key="country_IO">British Indian Ocean Territory</msg>
+  <msg key="country_IQ">Iraq</msg>
+  <msg key="country_IR">Iran, Islamic Republic of</msg>
+  <msg key="country_IS">Iceland</msg>
+  <msg key="country_IT">Italy</msg>
+  <msg key="country_JM">Jamaica</msg>
+  <msg key="country_JO">Jordan</msg>
+  <msg key="country_JP">Japan</msg>
+  <msg key="country_KE">Kenya</msg>
+  <msg key="country_KG">Kyrgyzstan</msg>
+  <msg key="country_KH">Cambodia</msg>
+  <msg key="country_KI">Kiribati</msg>
+  <msg key="country_KM">Comoros</msg>
+  <msg key="country_KN">Saint Kitts and Nevis</msg>
+  <msg key="country_KP">Korea, Democratic People's Republic of</msg>
+  <msg key="country_KR">Korea, Republic of</msg>
+  <msg key="country_KW">Kuwait</msg>
+  <msg key="country_KY">Cayman Islands</msg>
+  <msg key="country_KZ">Kazakstan</msg>
+  <msg key="country_LA">Lao People's Democratic Republic</msg>
+  <msg key="country_LB">Lebanon</msg>
+  <msg key="country_LC">Saint Lucia</msg>
+  <msg key="country_LI">Liechtenstein</msg>
+  <msg key="country_LK">Sri Lanka</msg>
+  <msg key="country_LR">Liberia</msg>
+  <msg key="country_LS">Lesotho</msg>
+  <msg key="country_LT">Lithuania</msg>
+  <msg key="country_LU">Luxembourg</msg>
+  <msg key="country_LV">Latvia</msg>
+  <msg key="country_LY">Libyan Arab Jamahiriya</msg>
+  <msg key="country_MA">Morocco</msg>
+  <msg key="country_MC">Monaco</msg>
+  <msg key="country_MD">Moldova, Republic of</msg>
+  <msg key="country_MG">Madagascar</msg>
+  <msg key="country_MH">Marshall Islands</msg>
+  <msg key="country_MK">Macedonia, The Former Yugoslav Republic of</msg>
+  <msg key="country_ML">Mali</msg>
+  <msg key="country_MM">Myanmar</msg>
+  <msg key="country_MN">Mongolia</msg>
+  <msg key="country_MO">Macau</msg>
+  <msg key="country_MP">Northern Mariana Islands</msg>
+  <msg key="country_MQ">Martinique</msg>
+  <msg key="country_MR">Mauritania</msg>
+  <msg key="country_MS">Montserrat</msg>
+  <msg key="country_MT">Malta</msg>
+  <msg key="country_MU">Mauritius</msg>
+  <msg key="country_MV">Maldives</msg>
+  <msg key="country_MW">Malawi</msg>
+  <msg key="country_MX">Mexico</msg>
+  <msg key="country_MY">Malaysia</msg>
+  <msg key="country_MZ">Mozambique</msg>
+  <msg key="country_NA">Namibia</msg>
+  <msg key="country_NC">New Caledonia</msg>
+  <msg key="country_NE">Niger</msg>
+  <msg key="country_NF">Norfolk Island</msg>
+  <msg key="country_NG">Nigeria</msg>
+  <msg key="country_NI">Nicaragua</msg>
+  <msg key="country_NL">Netherlands</msg>
+  <msg key="country_NO">Norway</msg>
+  <msg key="country_NP">Nepal</msg>
+  <msg key="country_NR">Nauru</msg>
+  <msg key="country_NU">Niue</msg>
+  <msg key="country_NZ">New Zealand</msg>
+  <msg key="country_OM">Oman</msg>
+  <msg key="country_PA">Panama</msg>
+  <msg key="country_PE">Peru</msg>
+  <msg key="country_PF">French Polynesia</msg>
+  <msg key="country_PG">Papua New Guinea</msg>
+  <msg key="country_PH">Philippines</msg>
+  <msg key="country_PK">Pakistan</msg>
+  <msg key="country_PL">Poland</msg>
+  <msg key="country_PM">Saint Pierre and Miquelon</msg>
+  <msg key="country_PN">Pitcairn</msg>
+  <msg key="country_PR">Puerto Rico</msg>
+  <msg key="country_PS">Palestinian Territory, Occupied</msg>
+  <msg key="country_PT">Portugal</msg>
+  <msg key="country_PW">Palau</msg>
+  <msg key="country_PY">Paraguay</msg>
+  <msg key="country_QA">Qatar</msg>
+  <msg key="country_RE">Reunion</msg>
+  <msg key="country_RO">Romania</msg>
+  <msg key="country_RU">Russian Federation</msg>
+  <msg key="country_RW">Rwanda</msg>
+  <msg key="country_SA">Saudi Arabia</msg>
+  <msg key="country_SB">Solomon Islands</msg>
+  <msg key="country_SC">Seychelles</msg>
+  <msg key="country_SD">Sudan</msg>
+  <msg key="country_SE">Sweden</msg>
+  <msg key="country_SG">Singapore</msg>
+  <msg key="country_SH">Saint Helena</msg>
+  <msg key="country_SI">Slovenia</msg>
+  <msg key="country_SJ">Svalbard and Jan Mayen</msg>
+  <msg key="country_SK">Slovakia</msg>
+  <msg key="country_SL">Sierra Leone</msg>
+  <msg key="country_SM">San Marino</msg>
+  <msg key="country_SN">Senegal</msg>
+  <msg key="country_SO">Somalia</msg>
+  <msg key="country_SR">Suriname</msg>
+  <msg key="country_ST">Sao Tome and Principe</msg>
+  <msg key="country_SV">El Salvador</msg>
+  <msg key="country_SY">Syrian Arab Republic</msg>
+  <msg key="country_SZ">Swaziland</msg>
+  <msg key="country_TC">Turks and Caicos Islands</msg>
+  <msg key="country_TD">Chad</msg>
+  <msg key="country_TF">French Southern Territories</msg>
+  <msg key="country_TG">Togo</msg>
+  <msg key="country_TH">Thailand</msg>
+  <msg key="country_TJ">Tajikistan</msg>
+  <msg key="country_TK">Tokelau</msg>
+  <msg key="country_TM">Turkmenistan</msg>
+  <msg key="country_TN">Tunisia</msg>
+  <msg key="country_TO">Tonga</msg>
+  <msg key="country_TP">East Timor</msg>
+  <msg key="country_TR">Turkey</msg>
+  <msg key="country_TT">Trinidad And Tobago</msg>
+  <msg key="country_TV">Tuvalu</msg>
+  <msg key="country_TW">Taiwan, Province of China</msg>
+  <msg key="country_TZ">Tanzania, United Republic of</msg>
+  <msg key="country_UA">Ukraine</msg>
+  <msg key="country_UG">Uganda</msg>
+  <msg key="country_UM">United States Minor Outlying Islands</msg>
+  <msg key="country_US">United States</msg>
+  <msg key="country_UY">Uruguay</msg>
+  <msg key="country_UZ">Uzbekistan</msg>
+  <msg key="country_VA">Holy See (Vatican City State)</msg>
+  <msg key="country_VC">Saint Vincent and the Grenadines</msg>
+  <msg key="country_VE">Venezuela</msg>
+  <msg key="country_VG">Virgin Islands, British</msg>
+  <msg key="country_VI">Virgin Islands, U.S.</msg>
+  <msg key="country_VN">Viet Nam</msg>
+  <msg key="country_VU">Vanuatu</msg>
+  <msg key="country_WF">Wallis And Futuna</msg>
+  <msg key="country_WS">Samoa</msg>
+  <msg key="country_YE">Yemen</msg>
+  <msg key="country_YT">Mayotte</msg>
+  <msg key="country_YU">Yugoslavia</msg>
+  <msg key="country_ZA">South Africa</msg>
+  <msg key="country_ZM">Zambia</msg>
+  <msg key="country_ZW">Zimbabwe</msg>
   <msg key="Date">Date</msg>
   <msg key="date_inq">Date of Inquiry</msg>
   <msg key="date_inq_plural">Dates of Inquiry</msg>
   <msg key="date_rec">Applicatoin Recieved Date</msg>
   <msg key="date_rec_plural">Application Recieved Dates</msg>
   <msg key="Define_Widget">Define Widget</msg>
-  <msg key="degree">Degree</msg>
-  <msg key="degree_plural">Degrees</msg>
+  <msg key="degree">Degree From Previous School</msg>
+  <msg key="degree_plural">Degree From Previous Schools</msg>
   <msg key="delivery_address">Street</msg>
-  <msg key="division">Division</msg>
-  <msg key="division_plural">Divisions</msg>
+  <msg key="denomination">Denomination</msg>
+  <msg key="denomination_plural">Denominations</msg>
+  <msg key="division">App Division</msg>
+  <msg key="division_plural">App Divisions</msg>
   <msg key="EditDelete_Heading">Edit/Delete Heading</msg>
   <msg key="Email">Email</msg>
   <msg key="enrl_int">Enrollment Interest Level</msg>
   <msg key="enrl_int_plural">Enrollment Interest Levels</msg>
+  <msg key="entry_date">Admissions Entry Date</msg>
+  <msg key="entry_date_plural">Admissions Entry Dates</msg>
+  <msg key="fax">Fax</msg>
+  <msg key="fax_plural">Faxes</msg>
+  <msg key="fee_rec">Application Fee Recieved</msg>
+  <msg key="fee_rec_plural">Application Fees Recieved</msg>
   <msg key="Form_Preview">Form Preview</msg>
   <msg key="gender">Gender</msg>
   <msg key="gender_plural">Genders</msg>
+  <msg key="has_been_added_as_an_attribute_to">has been added as an attribute to</msg>
   <msg key="Heading">Heading</msg>
   <msg key="hsgrad_yr">Bachelor's Graduation Year</msg>
   <msg key="hsgrad_yr_plural">Bachelor's Graduation Years</msg>
+  <msg key="incomplete">Incomplete Application</msg>
+  <msg key="incomplete_plural">Incomplete Applications</msg>
   <msg key="inq_type">Inquiry Type</msg>
   <msg key="inq_type_plural">Inquiry Types</msg>
   <msg key="int_cntry">int Country</msg>
@@ -53,20 +309,24 @@
   <msg key="int_stud">Internation Student</msg>
   <msg key="int_stud_plural">Internation Students</msg>
   <msg key="Integer">Integer</msg>
+  <msg key="international_dial_code">011</msg>
   <msg key="is_not_a_valid_Canadian_postal_code">is not a valid Canadian postal code</msg>
   <msg key="is_not_a_valid_US_state">is not a valid U.S. State</msg>
   <msg key="is_not_a_valid_US_zip_code">is not a valid U.S. zip code</msg>
   <msg key="List_Name">List Name</msg>
-  <msg key="lt_An_answer_from_the_ch">An answer from the user is optional</msg>
+  <msg key="lt_AMS_Lists_associated_">AMS Lists associated with this Object</msg>
+  <msg key="lt_An_answer_from_the_ch">An answer is required from the checked attributes</msg>
   <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_Require_an_answer_fro">Require an answer from the user</msg>
-  <msg key="lt_Unmap_check_attribute">Unmap checked attributes</msg>
-  <msg key="lt_Update_ordering_from_">Update ordering</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="Mapped_Attributes">Mapped Attributes</msg>
   <msg key="married">Marriage Status</msg>
   <msg key="married_plural">Marriage Statuses</msg>
+  <msg key="matric_fee">Matriculation Fee Recieved</msg>
+  <msg key="matric_fee_plural">Matriculation Fees Recieved</msg>
   <msg key="mi">Middle Initial</msg>
   <msg key="mi_plural">Middle Initials</msg>
   <msg key="move2app">Move to Applicant</msg>
@@ -78,6 +338,8 @@
   <msg key="no_mail">No Mail</msg>
   <msg key="no_mail_plural">No Mails</msg>
   <msg key="Object_Type">Object Type</msg>
+  <msg key="Object_Type_1">Object Type</msg>
+  <msg key="Objects">Objects</msg>
   <msg key="Option">Option</msg>
   <msg key="Optional">Optional</msg>
   <msg key="Ordering">Ordering</msg>
@@ -97,15 +359,16 @@
   <msg key="person_last_name">First Names</msg>
   <msg key="person_last_name_plural">First Names</msg>
   <msg key="postal_code">Zip/Postal Code</msg>
+  <msg key="Predefined_Options">Predefined Options</msg>
   <msg key="prefix">Prefix</msg>
   <msg key="prefix_plural">Prefixes</msg>
-  <msg key="Pretty_Name">Pretty Name</msg>
   <msg key="Pretty_Name_1">Pretty Name</msg>
-  <msg key="Pretty_Plural">Pretty Name Plural</msg>
   <msg key="Pretty_Plural_1">Pretty Plural</msg>
   <msg key="Preview_Input_Form">Preview the Input Form</msg>
-  <msg key="program">Program</msg>
-  <msg key="program_plural">Programs</msg>
+  <msg key="prior_app">Applied Previously</msg>
+  <msg key="prior_app_plural">Applied Previously</msg>
+  <msg key="program">Application Program</msg>
+  <msg key="program_plural">Application Programs</msg>
   <msg key="Radio">Radio Buttons - One Option Allowed</msg>
   <msg key="ref_by">Referred By</msg>
   <msg key="ref_by_plural">Referred By</msg>
@@ -122,7 +385,8 @@
   <msg key="schl_type_plural">School Types</msg>
   <msg key="Select">Drop Down List - One Option Allowed</msg>
   <msg key="select_one">Select One</msg>
-  <msg key="Sort_Order">Sort Order</msg>
+  <msg key="sms_trans">Transferred to Student Management System</msg>
+  <msg key="sms_trans_plural">Transferred to Student Management System</msg>
   <msg key="suffix">Suffix</msg>
   <msg key="suffix_plural">Suffixes</msg>
   <msg key="Telecom_Number">Phone Number</msg>
@@ -131,11 +395,14 @@
   <msg key="Textbox">Textbox</msg>
   <msg key="tran_visa">Transcript Visa</msg>
   <msg key="tran_visa_plural">Transcript Visas</msg>
+  <msg key="trans_date">Transfer to Student Management Date</msg>
+  <msg key="trans_date_plural">Transfer to Student Management Dates</msg>
+  <msg key="trans_done">Transfer Complete</msg>
+  <msg key="trans_done_plural">Transfers Completed</msg>
   <msg key="trm_ofint">Term of Interest</msg>
   <msg key="trm_ofint_plural">Terms of Interest</msg>
   <msg key="Unmap">Unmap</msg>
   <msg key="Unmapped_Attributes">Unmapped Attributes</msg>
-  <msg key="Update_Options">Update Options</msg>
   <msg key="Update_Ordering">Update Ordering</msg>
   <msg key="Url">Website Url</msg>
   <msg key="visa_cntry">Visa Country</msg>
@@ -146,7 +413,6 @@
   <msg key="visa_type_plural">Visa Types</msg>
   <msg key="vtran_schl">Visa Transferred from School</msg>
   <msg key="vtran_schl_plural">Visas Transferred from School</msg>
-  <msg key="Widget">Widget</msg>
   <msg key="Widget_1">Widget</msg>
   <msg key="wk_permit">Work Permit</msg>
   <msg key="wk_permit_plural">Work Permits</msg>
Index: openacs-4/packages/ams/tcl/address-widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/tcl/address-widget-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/ams/tcl/address-widget-procs.tcl	7 Jun 2005 10:59:58 -0000	1.6
+++ openacs-4/packages/ams/tcl/address-widget-procs.tcl	9 Jun 2005 20:20:39 -0000	1.7
@@ -98,8 +98,8 @@
         # There is no HTTP connection - resort to system locale
         set locale [lang::system::locale]
     }
-#    return [util_memoize [list template::util::address::country_options_not_cached -locale $locale]]
-    return [template::util::address::country_options_not_cached]
+    return [util_memoize [list template::util::address::country_options_not_cached -locale $locale]]
+#    return [template::util::address::country_options_not_cached]
 }
 
 ad_proc -public template::util::address::country_options_not_cached {
@@ -113,17 +113,16 @@
 
     foreach country $country_code_list {
         if { [lsearch $reserved_country_codes $country] < 0 } {
-            lappend return_country_list [list [lang::util::localize "#ref-countries.${country}#"] $country]
+            lappend return_country_list [list [lang::message::lookup $locale "ref-countries.${country}"] $country]
         }
     }
     set country_code [list]
     if { [exists_and_not_null reserved_country_codes] } {
-        foreach code $reserved_country_codes {
-            set code [string toupper $code]
-            lappend country_code [list [lang::message::lookup $this_locale "ams.country_${code}"] $code]
+        foreach country $reserved_country_codes {
+            set country [string toupper $country]
+            lappend country_code [list [lang::message::lookup $locale "ref-countries.${country}"] $country]
         }
-        lappend country_code [list "--" ""]
-        append country_code " [lsort $return_country_list]"
+        set country_code [concat $country_code [list "--" ""] [lsort $return_country_list]]
     } else {
         set country_code [lsort $return_country_list]
     }
Index: openacs-4/packages/ams/tcl/ams-widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/tcl/ams-widget-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ams/tcl/ams-widget-procs.tcl	8 Jun 2005 06:13:28 -0000	1.3
+++ openacs-4/packages/ams/tcl/ams-widget-procs.tcl	9 Jun 2005 20:20:39 -0000	1.4
@@ -75,8 +75,8 @@
 		set options {}
 	    }
 	}
+	ns_log notice "MGEDDERT DEBUG: 	return ::ams::widget::${widget} -request $request -attribute_name $attribute_name -pretty_name $pretty_name -value $value -optional_p $optional_p -form_name $form_name -options $options"
 	return [::ams::widget::${widget} -request $request -attribute_name $attribute_name -pretty_name $pretty_name -value $value -optional_p $optional_p -form_name $form_name -options $options]
-
     } else {
 	# the widget requested did not exist
 	ns_log notice "AMS: the ams widget \"${widget}\" was requested and the associated ::ams::widget::${widget} procedure does not exist"
Index: openacs-4/packages/ams/www/attribute-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/www/attribute-add.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/ams/www/attribute-add.tcl	7 Jun 2005 06:50:47 -0000	1.6
+++ openacs-4/packages/ams/www/attribute-add.tcl	9 Jun 2005 20:20:40 -0000	1.7
@@ -44,7 +44,7 @@
     lappend elements [list option_fields_count:integer(hidden) [list value $option_fields_count]]
 #    lappend elements [list options_on_last_screen:integer(hidden),optional]
     while { $i <= $option_fields_count } {
-	set element [list option${i}:text(text),optional [list label "[_ ams.Option_i]"] [list html [list size 50]]]
+	set element [list option${i}:text(text),optional [list label "[_ ams.Option] $i"] [list html [list size 50]]]
         if { $i == $option_fields_count } {
 	    lappend element [list help_text "[_ ams.lt_If_you_need_to_add_mo]"]
 	}
@@ -190,7 +190,7 @@
     } else {
 	set return_url [export_vars -base "object" -url {object_type return_url return_url_label}]
     }
-    ad_returnredirect -message "$pretty_name has been added as an attribute to $object_type#>" $return_url
+    ad_returnredirect -message "$pretty_name [_ ams.has_been_added_as_an_attribute_to] $object_type" $return_url
     ad_script_abort
 }