Index: lams_tool_task/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.16 -r1.17
--- lams_tool_task/conf/language/lams/ApplicationResources.properties	30 May 2008 07:53:17 -0000	1.16
+++ lams_tool_task/conf/language/lams/ApplicationResources.properties	2 Jun 2008 03:59:34 -0000	1.17
@@ -28,14 +28,14 @@
 label.authoring.basic.description  =Description
 label.authoring.basic.add.task  =Add Task
 label.authoring.basic.task.isRequired =Required task
-label.authoring.basic.task.isCommentsAllowed  =Allow participants to add comments
-label.authoring.basic.task.isCommentsRequired  =Are comments required to complete task?
-label.authoring.basic.task.isFilesAllowed  =Allow participants to add files
-label.authoring.basic.task.isFilesRequired  =Are files required to complete task?
+label.authoring.basic.task.isCommentsAllowed  =Allow Learners to add comment(s)
+label.authoring.basic.task.isCommentsRequired  =Comment required to complete task
+label.authoring.basic.task.isFilesAllowed  =Allow Learners to add file(s)
+label.authoring.basic.task.isFilesRequired  =File required to complete task
 label.authoring.basic.task.isCommentsFilesAllowed =Allow participants to add comments/files for this task
 label.authoring.basic.task.show.only.to.monitoring  =Show only to monitoring
 label.authoring.basic.task.show.to.all.learners  =Show to all learners
-label.authoring.basic.task.isChildTask =Don't display until parent has been completed
+label.authoring.basic.task.isChildTask =Don't display until parent task has been completed
 label.authoring.basic.task.parent.task.name =Parent:
 label.authoring.basic.task.list.title  =Task List
 label.authoring.basic.resource.task =Task
@@ -45,16 +45,14 @@
 label.authoring.basic.resource.description.input  =Description
 label.authoring.online.instruction  =Online Instructions:
 label.authoring.offline.instruction  =Offline Instructions:
-label.authoring.online.file  =Upload online file
-label.authoring.offline.file  =Upload offline file
+label.authoring.online.file  =Online Instructions File:
+label.authoring.offline.file  =Offline Instructions File:
 label.authoring.choosefile.button  =Choose file
-label.authoring.upload.online.button  =Upload Online
-label.authoring.upload.offline.button  =Upload Offline
-label.authoring.online.delete  =Delete
-label.authoring.offline.delete  =Delete
-label.authoring.advance.allow.contribute.tasks  =Allow learners to contribute tasks
+label.authoring.instructions.upload.button  =Upload
+label.authoring.instructions.delete.button  =Delete
+label.authoring.advance.allow.contribute.tasks  =Allow Learners to contribute tasks
 label.authoring.advance.lock.on.finished  =Lock when finished
-label.authoring.advance.monitor.verification.required  =Monitor need to verify these tasks before letting participants to complete activity
+label.authoring.advance.monitor.verification.required  =Monitor needs to verify these tasks before letting Learners to complete activity
 label.authoring.advanced.reflectOnActivity  =Add Notebook at end of Task List with the following instructions:
 label.authoring.advance.run.content.sequentialOrder  =Tasks have to be completed in sequential order
 label.authoring.advance.minimum.number.tasks  =Minimum number of tasks to complete
Index: lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.15 -r1.16
--- lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties	30 May 2008 07:53:17 -0000	1.15
+++ lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties	2 Jun 2008 03:59:34 -0000	1.16
@@ -24,14 +24,14 @@
 label.authoring.basic.description  =Description
 label.authoring.basic.add.task  =Add Task
 label.authoring.basic.task.isRequired  =Required task
-label.authoring.basic.task.isCommentsAllowed  =Allow participants to add comments
-label.authoring.basic.task.isCommentsRequired  =Are comments required to complete task
-label.authoring.basic.task.isFilesAllowed  =Allow participants to add files
-label.authoring.basic.task.isFilesRequired  =Are files required to complete task
+label.authoring.basic.task.isCommentsAllowed  =Allow Learners to add comment(s)
+label.authoring.basic.task.isCommentsRequired  =Comment required to complete task
+label.authoring.basic.task.isFilesAllowed  =Allow Learners to add file(s)
+label.authoring.basic.task.isFilesRequired  =File required to complete task
 label.authoring.basic.task.isCommentsFilesAllowed  =Allow participants to add comments/files for this task
 label.authoring.basic.task.show.only.to.monitoring  =Show only to monitoring
 label.authoring.basic.task.show.to.all.learners  =Show to all learners
-label.authoring.basic.task.isChildTask  =Don't display until parent has been completed
+label.authoring.basic.task.isChildTask  =Don't display until parent task has been completed
 label.authoring.basic.task.parent.task.name  =Parent:
 label.authoring.basic.task.list.title  =Task List
 label.authoring.basic.resource.task  =Task
@@ -41,16 +41,14 @@
 label.authoring.basic.resource.description.input  =Description
 label.authoring.online.instruction  =Online Instructions:
 label.authoring.offline.instruction  =Offline Instructions:
-label.authoring.online.file  =Upload online file
-label.authoring.offline.file  =Upload offline file
+label.authoring.online.file  =Online Instructions File:
+label.authoring.offline.file  =Offline Instructions File:
 label.authoring.choosefile.button  =Choose file
-label.authoring.upload.online.button  =Upload Online
-label.authoring.upload.offline.button  =Upload Offline
-label.authoring.online.delete  =Delete
-label.authoring.offline.delete  =Delete
-label.authoring.advance.allow.contribute.tasks  =Allow learners to contribute tasks
+label.authoring.instructions.upload.button  =Upload
+label.authoring.instructions.delete.button  =Delete
+label.authoring.advance.allow.contribute.tasks  =Allow Learners to contribute tasks
 label.authoring.advance.lock.on.finished  =Lock when finished
-label.authoring.advance.monitor.verification.required  =Monitor need to verify these tasks before letting participants to complete activity
+label.authoring.advance.monitor.verification.required  =Monitor needs to verify these tasks before letting Learners to complete activity
 label.authoring.advanced.reflectOnActivity  =Add Notebook at end of Task List with the following instructions:
 label.authoring.advance.run.content.sequentialOrder  =Tasks have to be completed in sequential order
 label.authoring.advance.minimum.number.tasks  =Minimum number of tasks to complete
Index: lams_tool_task/conf/language/rams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/conf/language/rams/Attic/ApplicationResources.properties,v
diff -u -r1.10 -r1.11
--- lams_tool_task/conf/language/rams/ApplicationResources.properties	29 May 2008 04:46:53 -0000	1.10
+++ lams_tool_task/conf/language/rams/ApplicationResources.properties	2 Jun 2008 03:59:34 -0000	1.11
@@ -28,14 +28,14 @@
 label.authoring.basic.description  =Description
 label.authoring.basic.add.task  =Add Task
 label.authoring.basic.task.isRequired =Required task
-label.authoring.basic.task.isCommentsAllowed  =Allow participants to add comments
-label.authoring.basic.task.isCommentsRequired  =Are comments required to complete task
-label.authoring.basic.task.isFilesAllowed  =Allow participants to add files
-label.authoring.basic.task.isFilesRequired  =Are files required to complete task
+label.authoring.basic.task.isCommentsAllowed  =Allow Learners to add comment(s)
+label.authoring.basic.task.isCommentsRequired  =Comment required to complete task
+label.authoring.basic.task.isFilesAllowed  =Allow Learners to add file(s)
+label.authoring.basic.task.isFilesRequired  =File required to complete task
 label.authoring.basic.task.isCommentsFilesAllowed =Allow participants to add comments/files for this task
 label.authoring.basic.task.show.only.to.monitoring  =Show only to monitoring
 label.authoring.basic.task.show.to.all.learners  =Show to all learners
-label.authoring.basic.task.isChildTask =Don't display until parent has been completed
+label.authoring.basic.task.isChildTask =Don't display until parent task has been completed
 label.authoring.basic.task.parent.task.name =Parent:
 label.authoring.basic.task.list.title  =Task List
 label.authoring.basic.resource.task =Task
@@ -45,16 +45,14 @@
 label.authoring.basic.resource.description.input  =Description
 label.authoring.online.instruction  =Online Instructions
 label.authoring.offline.instruction  =Offline Instructions
-label.authoring.online.file  =Upload online file
-label.authoring.offline.file  =Upload offline file
+label.authoring.online.file  =Online Instructions File:
+label.authoring.offline.file  =Offline Instructions File:
 label.authoring.choosefile.button  =Choose file
-label.authoring.upload.online.button  =Upload Online:
-label.authoring.upload.offline.button  =Upload Offline:
-label.authoring.online.delete  =Delete
-label.authoring.offline.delete  =Delete
-label.authoring.advance.allow.contribute.tasks  =Allow learners to contribute tasks
+label.authoring.instructions.upload.button  =Upload
+label.authoring.instructions.delete.button  =Delete
+label.authoring.advance.allow.contribute.tasks  =Allow Learners to contribute tasks
 label.authoring.advance.lock.on.finished  =Lock when finished
-label.authoring.advance.monitor.verification.required  =Monitor need to verify these tasks before letting participants to complete activity
+label.authoring.advance.monitor.verification.required  =Monitor needs to verify these tasks before letting Learners to complete activity
 label.authoring.advanced.reflectOnActivity  =Add Notebook at end of Task List with the following instructions:
 label.authoring.advance.run.content.sequentialOrder  =Tasks have to be completed in sequential order
 label.authoring.advance.minimum.number.tasks  =Minimum number of tasks to complete
Index: lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/conf/language/rams/Attic/ApplicationResources_en_AU.properties,v
diff -u -r1.10 -r1.11
--- lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties	29 May 2008 04:46:53 -0000	1.10
+++ lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties	2 Jun 2008 03:59:34 -0000	1.11
@@ -28,14 +28,14 @@
 label.authoring.basic.description  =Description
 label.authoring.basic.add.task  =Add Task
 label.authoring.basic.task.isRequired =Required task
-label.authoring.basic.task.isCommentsAllowed  =Allow participants to add comments
-label.authoring.basic.task.isCommentsRequired  =Are comments required to complete task
-label.authoring.basic.task.isFilesAllowed  =Allow participants to add files
-label.authoring.basic.task.isFilesRequired  =Are files required to complete task
+label.authoring.basic.task.isCommentsAllowed  =Allow Learners to add comment(s)
+label.authoring.basic.task.isCommentsRequired  =Comment required to complete task
+label.authoring.basic.task.isFilesAllowed  =Allow Learners to add file(s)
+label.authoring.basic.task.isFilesRequired  =File required to complete task
 label.authoring.basic.task.isCommentsFilesAllowed =Allow participants to add comments/files for this task
 label.authoring.basic.task.show.only.to.monitoring  =Show only to monitoring
 label.authoring.basic.task.show.to.all.learners  =Show to all learners
-label.authoring.basic.task.isChildTask =Don't display until parent has been completed
+label.authoring.basic.task.isChildTask =Don't display until parent task has been completed
 label.authoring.basic.task.parent.task.name =Parent:
 label.authoring.basic.task.list.title  =Task List
 label.authoring.basic.resource.task =Task
@@ -45,16 +45,14 @@
 label.authoring.basic.resource.description.input  =Description
 label.authoring.online.instruction  =Online Instructions:
 label.authoring.offline.instruction  =Offline Instructions:
-label.authoring.online.file  =Upload online file
-label.authoring.offline.file  =Upload offline file
+label.authoring.online.file  =Online Instructions File:
+label.authoring.offline.file  =Offline Instructions File:
 label.authoring.choosefile.button  =Choose file
-label.authoring.upload.online.button  =Upload Online
-label.authoring.upload.offline.button  =Upload Offline
-label.authoring.online.delete  =Delete
-label.authoring.offline.delete  =Delete
-label.authoring.advance.allow.contribute.tasks  =Allow learners to contribute tasks
+label.authoring.instructions.upload.button  =Upload
+label.authoring.instructions.delete.button  =Delete
+label.authoring.advance.allow.contribute.tasks  =Allow Learners to contribute tasks
 label.authoring.advance.lock.on.finished  =Lock when finished
-label.authoring.advance.monitor.verification.required  =Monitor need to verify these tasks before letting participants to complete activity
+label.authoring.advance.monitor.verification.required  =Monitor needs to verify these tasks before letting Learners to complete activity
 label.authoring.advanced.reflectOnActivity  =Add Notebook at end of Task List with the following instructions:
 label.authoring.advance.run.content.sequentialOrder  =Tasks have to be completed in sequential order
 label.authoring.advance.minimum.number.tasks  =Minimum number of tasks to complete
Index: lams_tool_task/db/sql/create_lams_tool_taskList.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/db/sql/create_lams_tool_taskList.sql,v
diff -u -r1.13 -r1.14
--- lams_tool_task/db/sql/create_lams_tool_taskList.sql	2 Jun 2008 03:13:00 -0000	1.13
+++ lams_tool_task/db/sql/create_lams_tool_taskList.sql	2 Jun 2008 03:59:34 -0000	1.14
@@ -150,7 +150,7 @@
 	`online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, `content_id`, `lock_when_finished`, 
 	`minimum_number_tasks_complete`, `is_sequential_order`, `allow_contribute_tasks`, `is_monitor_verification_required`, 
 	`reflect_on_activity`) VALUES
-  (1,NULL,NULL,NULL,'TaskList','0','Instructions ',null,null,0,0,${default_content_id},0,0,0,0,0,0);
+  (1,NULL,NULL,NULL,'Task List','0','Instructions ',null,null,0,0,${default_content_id},0,0,0,0,0,0);
   
 INSERT INTO `tl_latask10_taskList_item` (`uid`, `sequence_id`, `description`, `init_item`, `organization_xml`, `title`, `create_by`, `create_date`, `create_by_author`, `is_required`, `is_comments_allowed`, `is_comments_required`, `is_files_allowed`, `is_files_required`, `is_comments_files_allowed`, `show_comments_to_all`, `is_child_task`, `parent_task_name`, `taskList_uid`, `session_uid`) VALUES 
   (1,1,NULL,NULL,NULL,'Task number 1',null,NOW(),1,0,0,0,0,0,0,1,0,NULL,1,NULL);
Index: lams_tool_task/web/pages/authoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/authoring/Attic/instructions.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_task/web/pages/authoring/instructions.jsp	9 May 2008 03:49:43 -0000	1.3
+++ lams_tool_task/web/pages/authoring/instructions.jsp	2 Jun 2008 03:59:34 -0000	1.4
@@ -82,7 +82,7 @@
 				<fmt:message key="label.authoring.choosefile.button" />
 			</html:file>
 			<a href="#" onclick="javascript:doUploadOnline();" class="button">
-				<fmt:message key="label.authoring.upload.online.button" /> 
+				<fmt:message key="label.authoring.instructions.upload.button" /> 
 			</a>
 		</td>
 	</tr>
@@ -120,7 +120,7 @@
 				<fmt:message key="label.authoring.choosefile.button" />
 			</html:file>
 			<a href="#" onclick="javascript:doUploadOffline();" class="button">
-				<fmt:message key="label.authoring.upload.offline.button" /> 
+				<fmt:message key="label.authoring.instructions.upload.button" /> 
 			</a>
 		</td>
 	</tr>
Index: lams_tool_task/web/pages/authoring/parts/instructionfilelist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/authoring/parts/Attic/instructionfilelist.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_task/web/pages/authoring/parts/instructionfilelist.jsp	28 Feb 2008 03:50:18 -0000	1.1
+++ lams_tool_task/web/pages/authoring/parts/instructionfilelist.jsp	2 Jun 2008 03:59:34 -0000	1.2
@@ -48,13 +48,13 @@
 						<c:when test="${fileTypeFlag==CONS_OFFLINE}">
 							<html:link href="#"
 								onclick="deleteOfflineFile(${file.fileUuid},${file.fileVersionId})">
-								<fmt:message key="label.authoring.offline.delete" />
+								<fmt:message key="label.authoring.instructions.delete.button" />
 							</html:link>
 						</c:when>
 						<c:otherwise>
 							<html:link href="#"
 								onclick="deleteOnlineFile(${file.fileUuid},${file.fileVersionId})">
-								<fmt:message key="label.authoring.online.delete" />
+								<fmt:message key="label.authoring.instructions.delete.button" />
 							</html:link>
 						</c:otherwise>
 					</c:choose>