Index: openacs-4/packages/tasks/catalog/tasks.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/tasks/catalog/tasks.en_US.ISO-8859-1.xml,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/tasks/catalog/tasks.en_US.ISO-8859-1.xml	27 Jul 2005 13:45:00 -0000	1.1
+++ openacs-4/packages/tasks/catalog/tasks.en_US.ISO-8859-1.xml	27 Jul 2005 14:29:51 -0000	1.2
@@ -1,23 +1,58 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="tasks" package_version="0.1d" locale="en_US" charset="ISO-8859-1">
 
+  <msg key="a_Task">a Task</msg>
   <msg key="Add_Task">Add Task</msg>
+  <msg key="AddEdit">Add/Edit</msg>
   <msg key="Assign_Process">Assign Process</msg>
   <msg key="Cancel">Cancel</msg>
   <msg key="Cancel_do_not_delete">Cancel, do not delete</msg>
   <msg key="Created_By">Created By</msg>
+  <msg key="Custom_Task">Custom Task</msg>
   <msg key="Date">Date</msg>
   <msg key="Delete">Delete</msg>
+  <msg key="Delete_task_pretty">Delete $task_pretty</msg>
   <msg key="Done">Done</msg>
   <msg key="Due">Due</msg>
+  <msg key="Follow_Up_Call">Follow Up Call</msg>
+  <msg key="Follow_Up_Email">Follow Up Email</msg>
+  <msg key="Have_they_responded">Have they responded?</msg>
+  <msg key="lt_Add_Task_and_Add_Anot">Add Task and Add Another</msg>
+  <msg key="lt_Add_Task_save________">Add Task} save}
+        {{&lt;#_ Add Task and Add Another</msg>
   <msg key="lt_Are_you_sure_you_want">Are you sure you want to delete this process: %one_line%</msg>
+  <msg key="lt_Are_you_sure_you_want_1">Are you sure you want to delete $task2_pretty ?</msg>
+  <msg key="lt_Delete_from_Recruitin">Delete from Recruiting System</msg>
+  <msg key="lt_Either_a_custom_task_">Either a custom task or standard task is required</msg>
+  <msg key="lt_Originally_created_by">Originally created by &lt;a href=\&quot;[contact::url -party_id $creation_id]\&quot;&gt;[contact::name -party_id $creation_id]&lt;/a&gt;</msg>
+  <msg key="lt_Provide_Promotional_I">Provide Promotional Information</msg>
+  <msg key="lt_Send_Personal_NoteLet">Send Personal Note/Letter</msg>
+  <msg key="lt_Standard_tasks_are_ca">Standard tasks are cannot be used in conjunction with custom tasks</msg>
+  <msg key="lt_The_task_a_hreftaskst">The task &lt;a href=\&quot;/tasks/${task_url}\&quot;&gt;$task&lt;/a&gt; was added</msg>
+  <msg key="lt_The_task_a_hreftaskst_1">The task &lt;a href=\&quot;/tasks/${task_url}\&quot;&gt;$title&lt;/a&gt; was updated</msg>
+  <msg key="lt_The_task_lindex_task_">The task \&quot;[lindex $task_titles 0]\&quot; was deleted</msg>
+  <msg key="lt_The_task_task_was_add">The task \&quot;$task\&quot; was added to $names</msg>
+  <msg key="lt_The_tasks_task_list_w">The tasks ${task_list} were deleted</msg>
+  <msg key="lt_these_num_entries_tas">these $num_entries tasks</msg>
+  <msg key="lt_Update_and_Add_New_Ta">Update and Add New Task</msg>
+  <msg key="lt_You_are_not_allowed_t">You are not allowed to bulk edit a task for multiple contacts</msg>
   <msg key="more">more</msg>
   <msg key="No_Cancel">No, Cancel</msg>
+  <msg key="Not_Allowed">Not Allowed</msg>
   <msg key="Not_Done">Not Done</msg>
+  <msg key="Notes">Notes</msg>
   <msg key="Priority">Priority</msg>
   <msg key="Process">Process</msg>
   <msg key="Select_process">Select process:</msg>
+  <msg key="Send_Birthday_Card">Send Birthday Card</msg>
+  <msg key="Send_Class_Schedule">Send Class Schedule</msg>
+  <msg key="Send_Letter">Send Letter</msg>
+  <msg key="Send_Web_Info_Card">Send Web Info Card</msg>
+  <msg key="Standard_Task">Standard Task</msg>
+  <msg key="Status">Status</msg>
   <msg key="Task">Task</msg>
   <msg key="Tasks">Tasks</msg>
+  <msg key="this_task">this task</msg>
+  <msg key="Update">Update</msg>
   <msg key="Yes">Yes</msg>
 </message_catalog>
Index: openacs-4/packages/tasks/www/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/tasks/www/delete.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/tasks/www/delete.tcl	27 Jul 2005 13:45:00 -0000	1.1
+++ openacs-4/packages/tasks/www/delete.tcl	27 Jul 2005 14:29:51 -0000	1.2
@@ -20,9 +20,11 @@
 	ad_returnredirect ./
 	return
     }
-    set title "Delete [ad_decode $num_entries 1 "a Task" "Tasks"]"
+    set task_pretty [ad_decode $num_entries 1 "[_ tasks.a_Task]" "[_ tasks.Tasks]"]
+    set title "[_ tasks.Delete_task_pretty]"
     set context [list $title]
-    set question "Are you sure you want to delete [ad_decode $num_entries 1 "this task" "these $num_entries tasks"]?"
+    set task2_pretty [ad_decode $num_entries 1 "[_ tasks.this_task]" "[_ tasks.lt_these_num_entries_tas]"]
+    set question "[_ tasks.lt_Are_you_sure_you_want_1]"
     set yes_url "delete?[export_vars { task_id:multiple { confirm_p 1 } return_url}]"                                                    
     set no_url "${return_url}"
     return
@@ -57,9 +59,9 @@
 	append task_list "\"${task_title}\""
 	incr num
     }
-    util_user_message -html -message "The tasks ${task_list} were deleted"
+    util_user_message -html -message "[_ tasks.lt_The_tasks_task_list_w]"
 } else {
-    util_user_message -html -message "The task \"[lindex $task_titles 0]\" was deleted"
+    util_user_message -html -message "[_ tasks.lt_The_task_lindex_task_]"
 }
 
 ad_returnredirect $return_url
Index: openacs-4/packages/tasks/www/task.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/tasks/www/Attic/task.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/tasks/www/task.tcl	27 Jul 2005 13:45:00 -0000	1.1
+++ openacs-4/packages/tasks/www/task.tcl	27 Jul 2005 14:29:51 -0000	1.2
@@ -21,7 +21,7 @@
 
 set party_count [expr [llength $party_id] + [llength $other_party_ids]]
 if { $party_count > 1 && ![ad_form_new_p -key "task_id"] } {
-    ad_return_error "Not Allowed" "You are not allowed to bulk edit a task for multiple contacts"
+    ad_return_error "[_ tasks.Not_Allowed]" "[_ tasks.lt_You_are_not_allowed_t]"
 }
 
 if { [llength $party_id] > 1 } {
@@ -49,20 +49,20 @@
 set user_id    [ad_maybe_redirect_for_registration]
 set project_id [tasks::project_id]
 
-set title "Add/Edit"
+set title "[_ tasks.AddEdit]"
 set context [list $title]
 
 if { ![ad_form_new_p -key task_id] } {
-    append edit_buttons {
-	{Update save}
-        {{Update and Add New Task} save_add_another}
-        {{Delete} delete}
-    }
+    append edit_buttons [list \
+			     [list "[_ tasks.Update]" save]�\
+			     [list "[_ tasks.lt_Update_and_Add_New_Ta]" save_add_another] \
+			     [list "[_ tasks.Delete]" delete]
+			 ]
 } else {
-    set edit_buttons {
-	{{Add Task} save}
-        {{Add Task and Add Another} save_add_another}
-    }
+    set edit_buttons [list \
+			  [list "[_ tasks.Add_Task]" save] \
+			  [list "[_ tasks.lt_Add_Task_and_Add_Anot]" save_add_another]
+		      ]
 }
 
 if { [ns_queryget "formbutton:delete"] != "" } {
@@ -73,7 +73,7 @@
 
 ad_form -name add_edit \
     -cancel_url $return_url \
-    -cancel_label "Cancel" \
+    -cancel_label "[_ tasks.Cancel]" \
     -edit_buttons $edit_buttons \
     -form {
         task_id:key
@@ -85,30 +85,30 @@
         {names:text(hidden),optional {label {Add Task To}}}
 
         {task_prescribed:text(select),optional
-            {label "Standard Task"}
+            {label "[_ tasks.Standard_Task]"}
 	    {options {
 		{{}                                {}}             
-		{{Delete from Recruiting System}   {Delete from Recruiting System}}	 
-		{{Follow Up Call}		   {Follow Up Call}}		 	
-		{{Follow Up Email}		   {Follow Up Email}}		 
-		{{Have they responded?}		   {Have they responded?}}		 
-		{{Provide Promotional Information} {Provide Promotional Information}}
-		{{Send Letter}			   {Send Letter}}			 
-		{{Send Birthday Card}		   {Send Birthday Card}}		 
-		{{Send Class Schedule}		   {Send Class Schedule}}		 
-		{{Send Personal Note/Letter}	   {Send Personal Note/Letter}}	 
-		{{Send Web Info Card}              {Send Web Info Card}}             
+		{{[_ tasks.lt_Delete_from_Recruitin]}   {[_ tasks.lt_Delete_from_Recruitin]}}	 
+		{{[_ tasks.Follow_Up_Call]}		   {[_ tasks.Follow_Up_Call]}}		 	
+		{{[_ tasks.Follow_Up_Email]}		   {[_ tasks.Follow_Up_Email]}}		 
+		{{[_ tasks.Have_they_responded]}		   {[_ tasks.Have_they_responded]}}		 
+		{{[_ tasks.lt_Provide_Promotional_I]} {[_ tasks.lt_Provide_Promotional_I]}}
+		{{[_ tasks.Send_Letter]}			   {[_ tasks.Send_Letter]}}			 
+		{{[_ tasks.Send_Birthday_Card]}		   {[_ tasks.Send_Birthday_Card]}}		 
+		{{[_ tasks.Send_Class_Schedule]}		   {[_ tasks.Send_Class_Schedule]}}		 
+		{{[_ tasks.lt_Send_Personal_NoteLet]}	   {[_ tasks.lt_Send_Personal_NoteLet]}}	 
+		{{[_ tasks.Send_Web_Info_Card]}              {[_ tasks.Send_Web_Info_Card]}}             
 	    }}
 	}
 
         {task:text(text),optional
-            {label "Custom Task"}
+            {label "[_ tasks.Custom_Task]"}
             {html { maxlength 1000 size 35 }}
             {help_text {You can either use a standard task or a custom task, but not both}}
 	}
 
 	{end_date:text(text)
-	    {label "Due"}
+	    {label "[_ tasks.Due]"}
 	    {html {id date1 size 10 maxlength 10}}
 	    {help_text {if blank there is no due date}}
 	    {after_html {
@@ -130,22 +130,22 @@
 	}
 
         {completed_p:text(checkbox),optional
-            {label "Status"}
+            {label "[_ tasks.Status]"}
             {options {{Completed 1}}}
         }
 
         {priority:integer(select),optional
-            {label "Priority"}
+            {label "[_ tasks.Priority]"}
             {options {{{3 - Very Important} 3} {{2 - Important} 2} {{1 - Normal} 1} {{0 - Not Important} 0}}}
         }
 
         {description:text(textarea),optional,nospell
-            {label "Notes"}
+            {label "[_ tasks.Notes]"}
             {html { rows 6 cols 60 wrap soft}}}
 
     } -new_request {
 
-        set title "Add Task"
+        set title "[_ tasks.Add_Task]"
 	set context [list $title]
 	set status_id "1"
         set priority "1"
@@ -192,11 +192,11 @@
 	set task_prescribed [string trim $task_prescribed]
 	set task [string trim $task]
 	if { [exists_and_not_null task_prescribed] && [exists_and_not_null task] } {
-	    template::element set_error add_edit task_prescribed "Standard tasks are cannot be used in conjunction with custom tasks"
-	    template::element set_error add_edit task "Standard tasks are cannot be used in conjunction with custom tasks"
+	    template::element set_error add_edit task_prescribed "[_ tasks.lt_Standard_tasks_are_ca]"
+	    template::element set_error add_edit task "[_ tasks.lt_Standard_tasks_are_ca]"
 	} elseif { ![exists_and_not_null task_prescribed] && ![exists_and_not_null task] } {
-	    template::element set_error add_edit task_prescribed "Either a custom task or standard task is required"
-	    template::element set_error add_edit task "Either a custom task or standard task is required"
+	    template::element set_error add_edit task_prescribed "[_ tasks.lt_Either_a_custom_task_]"
+	    template::element set_error add_edit task "[_ tasks.lt_Either_a_custom_task_]"
 	} elseif { [exists_and_not_null task_prescribed] } {
 	    set task $task_prescribed
 	}
@@ -232,9 +232,9 @@
 
 	if { [llength $all_parties] == 1 } {
 	    set task_url [export_vars -base task -url {task_id status_id orderby party_id}]
-	    util_user_message -html -message "The task <a href=\"/tasks/${task_url}\">$task</a> was added"
+	    util_user_message -html -message "[_ tasks.lt_The_task_a_hreftaskst]"
 	} else {
-	    util_user_message -html -message "The task \"$task\" was added to $names"	    
+	    util_user_message -html -message "[_ tasks.lt_The_task_task_was_add]"	    
 	}
 
     } -edit_data {
@@ -277,7 +277,7 @@
 	"
 
     	set task_url [export_vars -base task -url {task_id status_id orderby party_id}]
-	util_user_message -html -message "The task <a href=\"/tasks/${task_url}\">$title</a> was updated"
+	util_user_message -html -message "[_ tasks.lt_The_task_a_hreftaskst_1]"
 
 
     } -after_submit {
@@ -298,7 +298,7 @@
 	-datatype "text" \
 	-widget "inform" \
 	-label "" \
-	-value "Originally created by <a href=\"[contact::url -party_id $creation_id]\">[contact::name -party_id $creation_id]</a>" \
+	-value "[_ tasks.lt_Originally_created_by]" \
 	-optional
 } else {
     if { $party_count > 1 } {