Index: lams_tool_task/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r721fa349b42e0b7e2ae19d60756fea47146bfdd4 -rb55ce696b700f625ffd4d10ea140e0952f72d649
--- lams_tool_task/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 721fa349b42e0b7e2ae19d60756fea47146bfdd4)
+++ lams_tool_task/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b55ce696b700f625ffd4d10ea140e0952f72d649)
@@ -6,18 +6,22 @@
  
 #=================== labels for TaskList =================# 
 
+activity.title  =Task List
+activity.description  =Task List.
 activity.helptext  =Going through list of tasks.
 tool.display.name  =Task List Tool
 tool.description  =Tool for displaying task lisk.
 appName  =Task List
 errorPage.title  =Error page
 errorPage.heading  =Some error occurs when handling your request
 label.authoring.heading  =Task List
-label.author.title  =Task List Authoring
+label.authoring.title  =Task List Authoring
 label.authoring.heading.basic  =Basic
-label.authoring.heading.instructions  =Instructions
 label.authoring.heading.basic.desc  =Basic input information for task list
+label.authoring.heading.instructions  =Instructions
 label.authoring.heading.instructions.desc  =Please input online and offline instructions
+label.authoring.heading.instructions.desc  =Please input conditions for task list
+label.authoring.heading.conditions  =Conditions
 label.authoring.heading.advance  =Advanced
 label.authoring.heading.advance.desc  =Please input advance options for task list
 label.authoring.basic.title  =Title
@@ -30,28 +34,18 @@
 label.authoring.basic.task.isChildTask =Don't display until parent has been completed
 label.authoring.basic.task.parent.task.name =Parent:
 label.authoring.basic.task.list.title  =Task List
-label.authoring.basic.resource.url  =URL
 label.authoring.basic.resource.task =Task
-label.authoring.basic.resource.file  =File
-label.authoring.basic.resource.website  =Website
-label.authoring.basic.resource.preview  =Preview
 label.authoring.basic.resource.edit  =Edit
 label.authoring.basic.resource.delete  =Delete
-label.authoring.basic.resource.add.instruction  =Add Instruction
-label.authoring.basic.resource.instructions  =Instructions
 label.authoring.basic.resource.title.input  =Title
 label.authoring.basic.resource.description.input  =Description
-label.authoring.basic.resource.zip.file.input  =Zip file:
 label.authoring.online.instruction  =Online Instructions
 label.authoring.offline.instruction  =Offline Instructions
 label.authoring.online.file  =Upload online file
-error.resource.item.desc.blank  =Description can not be blank
 label.authoring.offline.file  =Upload offline file
 label.authoring.choosefile.button  =Choose file
 label.authoring.upload.online.button  =Upload Online
 label.authoring.upload.offline.button  =Upload Offline
-label.authoring.online.filelist  =Online file list
-label.authoring.offline.filelist  =Offline file list
 label.authoring.online.delete  =Delete
 label.authoring.offline.delete  =Delete
 label.authoring.advance.allow.contribute.tasks  =Allow learners to contribute tasks
@@ -60,31 +54,35 @@
 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.cancel.button  =Cancel
+label.authoring.edit.conditions.button  =Edit Conditions
 label.authoring.save.button  =Save
+label.authoring.up  =Move Up
+label.authoring.down  =Move down
+label.authoring.conditions.add.condition  =Add Condition
+label.authoring.conditions.list.title  =Conditions
+label.authoring.conditions.condition.name  =Condition Name
+authoring.exception  =There is a problem in task list authoring page, the reason is {0}
 authoring.msg.cancel.save  =Do you want to close this window without saving?
 authoring.msg.no.tasks.save  =There must be at least one task to be saved.
-label.next.instruction  =Next Instruction
-authoring.exception  =There is a problem in task list authoring page, the reason is {0}
 error.resource.item.title.blank  =Title can not be blank.
+error.condition.name.blank  =Condition name can not be blank.
+error.condition.name.contains.wrong.symbol  =Condition name can not contain # symbol. Please choose the name without this symbol.
+error.condition.duplicated.name  =Duplicated name. Please choose unique one.
+error.condition.no.tasklistitems.selected  =There are no TaskListItems selected. Please select at least one.
 error.upload.failed  =Upload file failed: {0}
 error.msg.upload.file.not.found  =Could not find upload file {0}.
-error.msg.zip.file.exception  =Could not handle zip file when uploading file.
 error.msg.file.not.found  =File not found exception occurs when uploading file.
-error.msg.ims.application  =ImscpApplicationException occurs when uploading resource item file.
-error.msg.website.no.initial.file  =Website zip can not find out initial file (index.htm/html or default.htm/html).
 error.msg.io.exception  =IOException occurs when uploading file.
 error.msg.invaid.param.upload  =InvalidParameterException occured while trying to upload File.
 error.msg.repository  =Repository occurs exception while trying to upload file.
 error.msg.default.content.not.find  =Could not retrieve default content record for this tool.
-msg.no.instruction  =No instruction available.
+warning.msg.authoring.deletion.affect.conditions  =Deletion of this item may affect existing conditions. Do you want to proceed?
 label.learning.title  =Task List Learning
-label.learning.heading  =Task List
-label.learning.tasks.to.do  =Tasks to do
+label.learning.tasks.to.do	  =Tasks to do
 label.learning.new.task.details  =New task details:
 label.learning.check.for.new  =Check for new
-label.learning.suggest.new.task  =Suggest a new task
-label.learning.comment.or.instruction  =Description
-label.learning.required.tasks  =* - required tasks
+label.learning.comment.or.instruction  =Comment/Instruction
+label.learning.required.tasks  =required tasks
 label.learning.wait.for.monitor.verification  =To finish wait for monitor verification
 label.preview.upload.file  =Upload file
 label.preview.upload.button  =Upload
@@ -97,95 +95,46 @@
 monitoring.tab.statistics  =Statistic
 monitoring.tab.instructions  =Instruction
 monitoring.tab.edit.activity  =Edit Activity
-monitoring.label.group  =Group
-monitoring.summary.note  =Note: number of learners is the number of learners who have viewed the resource.
-monitoring.label.type  =Type
 monitoring.label.title  =Title
 monitoring.label.suggest  =Suggested By
 monitoring.label.number.learners  =Number of Learners
-monitoring.label.hide  =Hide
-monitoring.label.show  =Show
 monitoring.label.user.loginname  =Login name
 monitoring.label.user.name  =Name
-monitoring.label.hidden  =Hidden
-label.monitoring.edit.activity.cancel  =Cancel
-label.monitoring.edit.activity.update  =Update
+label.monitoring.heading.access  =Learners list
 label.monitoring.edit.activity.edit  =Edit
 label.monitoring.summary.overall.summary  =Overall Summary
 label.monitoring.summary.user  =User
 label.monitoring.summary.complete.activity  =Complete Activity?
 label.monitoring.tasksummary.task.summary  =Task Summary
 label.monitoring.tasksummary.task.required.to.finish  =this task is required to finish this activity
-label.monitoring.tasksummary.parent.activity =Parent activity
+label.monitoring.tasksummary.parent.activity  =Parent activity
 label.monitoring.tasksummary.comments.files.enabled  =Comments/files enabled
 label.monitoring.tasksummary.user  =User
 label.monitoring.tasksummary.completed  =Completed
 label.monitoring.tasksummary.time.and.date  =Time and Date
 label.monitoring.tasksummary.comments.files  =Comments/Files
-label.monitoring.tasksummary.  =
-label.monitoring.tasksummary.  =
-label.monitoring.tasksummary.  =
-label.monitoring.tasksummary.  =
-label.monitoring.tasksummary.  =
 message.monitoring.edit.activity.not.editable  =This Activity is no longer editable
-message.monitoring.summary.no.session  =No Session Available
-message.monitoring.summary.no.resource.for.group  =No resource available for this group.
-export.label.resource  =Resource
-export.label.no.learning.object  =No offline package available
 export.title  =Export portfolio of Task List
-export.init.resource  =Initial Resources
-errors.header  =<b class='error'>
-errors.footer  =</b>
-error.valueReqd  =Value Required
-error.inputFileTooLarge  =Input File size is too large!
-error.uploading  =error uploading
-error.title.empty  =Title can not be blank
-message.msg.maxFileSize  =Max 250K
-label.open  =Open
-label.delete  =Delete
 label.download  =Download
 label.view  =View
 label.edit  =Edit
 label.completed  =Completed
 button.upload  =Upload
 button.add  =Add
-button.cancel  =Cancel
-label.show  =Show
-label.hide  =Hide
-label.save  =Save
+message.monitoring.summary.no.session  =No Session Available
 label.cancel  =Cancel
 define.later.message  =Please wait for the teacher to complete the contents of this activity.
 run.offline.message  =This activity is not being done on the computer. Please see your instructor for details.
 button.try.again  =Try again
-open.in.new.window  =Open URL in pop-up
-button.edit  =Edit
 message.no.reflection.available  =No notebook available
-activity.title  =Task List
-activity.description  =Sharing resource with others.
 monitoring.label.access.time  =Access time
-error.msg.ims.package  =Invalid IMS CP format.
-message.step.of  =Step {0} of {1}
-label.up  =Move Up
-label.down  =Move down
-error.reflection.emtpy  =Please input reflection
-title.reflection  =Reflection
 label.continue  =Continue
-monitoring.user.fullname  =Name
-monitoring.user.reflection  =Reflection
 page.title.monitoring.view.reflection  =View Reflection
 button.close  =Close
-label.monitoring.heading.access  =Learners list
-errors.maxfilesize  =The uploaded file has exceeded the maximum file size limit of {0} bytes
-error.attachment.executable  =The uploaded file is executable, please zip it before uploading.
-lable.learning.minimum.view.number.less  =You must view at least another {0} of the resources.
 message.alertContentEdit  =Warning: One of more students have accessed this activity. Changing this content will result in students getting different information.
 label.finished  =Next Activity
 label.finish  =Next Activity
-lable.topic.title.comment  =Comment
-lable.topic.title.createDate  =Date
-lable.topic.title.author  =Author
 label.default.user.name  =Instructor
-output.desc.learner.number.of.tasks.completed  =Learner''s number of tasks completed
-output.desc.tool.condition  =Complex tool conditions
 
+
 #======= End labels: Exported 156 labels for en AU =====