Index: openacs-4/contrib/packages/survey/catalog/survey.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/catalog/Attic/survey.en_US.ISO-8859-1.xml,v
diff -u -r1.6 -r1.7
--- openacs-4/contrib/packages/survey/catalog/survey.en_US.ISO-8859-1.xml	1 Mar 2004 10:54:36 -0000	1.6
+++ openacs-4/contrib/packages/survey/catalog/survey.en_US.ISO-8859-1.xml	12 Mar 2004 07:18:13 -0000	1.7
@@ -38,18 +38,18 @@
   <msg key="Continue_with_Delete">Continue with Delete</msg>
   <msg key="Copy">Copy</msg>
   <msg key="Copy_of">Copy of</msg>
-  <msg key="Copy_of_name">Copy of $name</msg>
+  <msg key="Copy_of_name">Copy of %name%</msg>
   <msg key="Copy_this_survey">Copy this survey</msg>
   <msg key="Copy_title_name">Copy: %title_name%</msg>
-  <msg key="Copy_title_name_1">Copy $title_name</msg>
+  <msg key="Copy_title_name_1">Copy %title_name%</msg>
   <msg key="Could_not_find_user">Could not find user</msg>
   <msg key="Create_a_New">Create a new predefined question</msg>
   <msg key="Create_Survey">Create Survey</msg>
   <msg key="CSV_Export">CSV Export</msg>
   <msg key="CSV_file">CSV file</msg>
   <msg key="Database_Error">Database Error</msg>
   <msg key="Database_error">Database error</msg>
-  <msg key="Database_Error_test">Database Error $test</msg>
+  <msg key="Database_Error_test">Database Error %test%</msg>
   <msg key="Date">Date</msg>
   <msg key="Delete">Delete</msg>
   <msg key="Delete_1">Delete:</msg>
@@ -80,7 +80,7 @@
   <msg key="Email_Options">Email Options:</msg>
   <msg key="enable">enable</msg>
   <msg key="Enter_Message">Enter Message</msg>
-  <msg key="errmsg__line">$errmsg :: $line</msg>
+  <msg key="errmsg__line">%errmsg% :: %line%</msg>
   <msg key="Errors_encountered">Errors encountered</msg>
   <msg key="Execute_TCL-Code">Execute TCL-Code</msg>
   <msg key="Extreme_Actions">Extreme Actions:</msg>
@@ -146,21 +146,21 @@
   <msg key="lt_Cannot_make_measureme">Cannot make measurement section</msg>
   <msg key="lt_Cannot_move_section_b">Cannot move section below dependant sections</msg>
   <msg key="lt_Completely_delete">Completely delete %user_name_var%'s response from %response_date_var%? (Note: This can not be undone.)</msg>
-  <msg key="lt_Completely_delete_use">Completely delete ${user_name}'s response from $response_date? (Note: This can not be undone.)</msg>
+  <msg key="lt_Completely_delete_use">Completely delete %user_name%'s response from %response_date%? (Note: This can not be undone.)</msg>
   <msg key="lt_Compress_to_single_se">Compress to single section</msg>
   <msg key="lt_Confirm_Survey_Detail">Confirm Survey Details</msg>
   <msg key="lt_Copying_a_survey_will">Copying a survey will create a new survey with copies of all the questions.&lt;br /&gt; None of the response data will be duplicated.</msg>
   <msg key="lt_Could_not_find_a_surv">Could not find a survey question</msg>
   <msg key="lt_Could_not_find_the_re">Could not find the response</msg>
-  <msg key="lt_Could_not_find_user_u">Could not find user #$user_id</msg>
+  <msg key="lt_Could_not_find_user_u">Could not find user #%user_id%</msg>
   <msg key="lt_Couldnt_find_attachment">Couldn't find attachment. Couldn't find an attachment matching the response_id %response_id%, question_id %question_id% given.</msg>
   <msg key="lt_Create_a_custom_templ">Create a custom template</msg>
   <msg key="lt_CSV_file_with_anonymo">CSV file (with anonymous answers)</msg>
   <msg key="lt_CSV_file_without_anon">CSV file (without anonymous answers)</msg>
   <msg key="lt_DELETE_survey_infonam">DELETE: %survey_info.name%</msg>
   <msg key="lt_DELETE_Survey_Respons">DELETE: Survey Response</msg>
   <msg key="lt_Deleting_this_surve">Deleting this survey will delete all %questions_count% questions and all %responses_count% responses associated with this survey!</msg>
-  <msg key="lt_Deleting_this_survey_">Deleting this survey will delete all $questions_count questions and all $responses_count responses associated with this survey!</msg>
+  <msg key="lt_Deleting_this_survey_">Deleting this survey will delete all %questions_count% questions and all $responses_count responses associated with this survey!</msg>
   <msg key="lt_denotes_a_required_qu">denotes a required question</msg>
   <msg key="lt_Description_must_be_l">Description must be less than 4000 characters</msg>
   <msg key="lt_Edit_and_submit_to_ch">Edit and submit to change the name for this survey:</msg>
@@ -180,13 +180,13 @@
   <msg key="lt_img_srcgraphicsadming">&lt;img src=&quot;graphics/admin.gif&quot; border=&quot;0&quot; alt=&quot;Administer Surveys&quot;&gt;</msg>
   <msg key="lt_img_srcgraphicsadming_1">&lt;img src=&quot;graphics/admin.gif&quot; border=&quot;0&quot; alt=&quot;Admin&quot;&gt;</msg>
   <msg key="lt_Import_responses_from">Import responses from a .csv file</msg>
-  <msg key="lt_Import_successful___T">Import successful&quot; &lt;#_ There were no problems with the import. $line records have been created. &lt;a href=one?survey_id=$survey_id&gt;Return to the survey&lt;/a&gt;</msg>
-  <msg key="lt_Line_line_Answer_to_q">Line $line: Answer to question $question($question_id.question_text) cannot be empty</msg>
-  <msg key="lt_Line_line_Choice_choi">Line $line: Choice \&quot;$choice\&quot; does not exist in question $question($question_id.question_text)</msg>
-  <msg key="lt_Line_line_Invalid_boo">Line $line: Invalid boolean value \&quot;$response_value\&quot; for question $question($question_id.question_text)&lt;</msg>
-  <msg key="lt_Line_line_Invalid_Dat">Line $line: Invalid Date \&quot;$response_value\&quot; for question $question($question_id.question_text)</msg>
-  <msg key="lt_Line_line_Invalid_Num">Line $line: Invalid Number \&quot;$response_value\&quot; for question $question($question_id.question_text)</msg>
-  <msg key="lt_Line_line_User_with_i">Line $line: User with $identifier \&quot;[lindex $data $idfield]\&quot; does not exist</msg>
+  <msg key="lt_Import_successful___T">Import successful&quot; &lt;#_ There were no problems with the import. %line% records have been created. &lt;a href=one?survey_id=%survey_id%&gt;Return to the survey&lt;/a&gt;</msg>
+  <msg key="lt_Line_line_Answer_to_q">Line %line%: Answer to question %question(%question_id.question_text%)% cannot be empty</msg>
+  <msg key="lt_Line_line_Choice_choi">Line %line%: Choice \&quot;$choice\&quot; does not exist in question %question(%question_id.question_text%)%</msg>
+  <msg key="lt_Line_line_Invalid_boo">Line %line%: Invalid boolean value \&quot;$response_value\&quot; for question %question(%question_id.question_text%)%&lt;</msg>
+  <msg key="lt_Line_line_Invalid_Dat">Line %line%: Invalid Date \&quot;$response_value\&quot; for question %question(%question_id.question_text%)%</msg>
+  <msg key="lt_Line_line_Invalid_Num">Line %line%: Invalid Number \&quot;$response_value\&quot; for question %question(%question_id.question_text%)%</msg>
+  <msg key="lt_Line_line_User_with_i">Line %line%: User with $identifier \&quot;[lindex $data $idfield]\&quot; does not exist</msg>
   <msg key="lt_Main_Survey_Administr">Main Survey Administration</msg>
   <msg key="lt_Manage_predefined_que">Manage predefined questions</msg>
   <msg key="lt_Modify_a_Questions_Te">Modify a Question's Text</msg>
@@ -241,16 +241,16 @@
   <msg key="lt_Requested_survey_does">Requested survey does not exist</msg>
   <msg key="lt_Response_on_response_">Response on %response_date%</msg>
   <msg key="lt_Response_on_responses">Response on %responses.creation_date%]</msg>
-  <msg key="lt_Response_Submitted_fo">Response Submitted for $survey_name</msg>
+  <msg key="lt_Response_Submitted_fo">Response Submitted for %survey_name%</msg>
   <msg key="lt_Response_Submitted_for">Response Submitted for %survey_name%</msg>
   <msg key="lt_Response_submitted_Th">Response submitted. Thank you.</msg>
   <msg key="lt_Responses_to_Question">Responses to Question</msg>
   <msg key="lt_Return_to_survey_admi">Return to survey administration</msg>
-  <msg key="lt_Section_id_section_id">Section_id $section_id is not an integer</msg>
+  <msg key="lt_Section_id_section_id">Section_id %section_id% is not an integer</msg>
   <msg key="lt_Section_is_rendered_b">Section is rendered by a custom template.</msg>
   <msg key="lt_Section_is_rendered_b_1">Section is rendered by the normal template.</msg>
   <msg key="lt_Section_section_id_do">Section %section_id% does not exist</msg>
-  <msg key="lt_Section_section_id_do_1">Section $section_id does not exist</msg>
+  <msg key="lt_Section_section_id_do_1">Section %section_id% does not exist</msg>
   <msg key="lt_Send_Mail_Re_survey_n">Send Mail Re: %survey_name%</msg>
   <msg key="lt_Survey_Administration">Survey Administration</msg>
   <msg key="lt_Survey_Administration_1">Survey Administration: Add a Question (cont.)</msg>
@@ -273,7 +273,7 @@
   <msg key="lt_Survey_section_id_does">Survey %section_id% does not exist</msg>
   <msg key="lt_Survey_survey_id_do_no">Survey %survey_id% does not exist</msg>
   <msg key="lt_Survey_survey_id_does">Survey %survey_id% does not exist</msg>
-  <msg key="lt_Survey_survey_id_does_1">Survey $survey_id does not exist</msg>
+  <msg key="lt_Survey_survey_id_does_1">Survey %survey_id% does not exist</msg>
   <msg key="lt_Survey_survey_nameRes">Survey: %survey_name%
 Respondent: %user_name% 
 
@@ -284,8 +284,8 @@
 
 Here is what %user_name% &lt;%comm_url%&gt;
 had to say in response to %survey_name:%</msg>
-  <msg key="lt_Surveys_of_type_type_">Surveys of type $type are not currently available.</msg>
-  <msg key="lt_Test_successful___The">Test successful&quot; &lt;#_ There were no problems with the import. $line records can be created. Go back and hit Import to proceed</msg>
+  <msg key="lt_Surveys_of_type_type_">Surveys of type %type% are not currently available.</msg>
+  <msg key="lt_Test_successful___The">Test successful&quot; &lt;#_ There were no problems with the import. %line% records can be created. Go back and hit Import to proceed</msg>
   <msg key="lt_The_Above_Description">The Above Description is</msg>
   <msg key="lt_The_above_description">The above description is</msg>
   <msg key="lt_The_response_to_ques_i">The response to %question_text% must be an integer. Your answer was %response_value%.</msg>
@@ -305,7 +305,7 @@
 code (e.g. for redirects) conditional on the user's score at the end
 of the survey.</msg>
   <msg key="lt_This_question_has_n">This question has %n_responses% %response_text% that will be deleted if you continue. (Note: This can not be undone.)</msg>
-  <msg key="lt_This_question_has_n_r">This question has $n_responses $response_text that will be deleted if you continue. (Note: This can not be undone.)</msg>
+  <msg key="lt_This_question_has_n_r">This question has %n_responses% %response_text% that will be deleted if you continue. (Note: This can not be undone.)</msg>
   <msg key="lt_This_should_have_been">This should have been checked earlier.</msg>
   <msg key="lt_This_survey_allows_yo">This survey allows you to specify the type of response
 required. Use this survey if you want to allow users to enter their
@@ -378,7 +378,7 @@
   <msg key="Presentation">Presentation</msg>
   <msg key="Presentation_Type">Presentation Type</msg>
   <msg key="Preview">Preview</msg>
-  <msg key="Preview_name">Preview $name</msg>
+  <msg key="Preview_name">Preview %name%</msg>
   <msg key="Public">Public?</msg>
   <msg key="Question">Question</msg>
   <msg key="Question_Text">Question Text</msg>