Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r84fa07ec6182f90c72bd34dc3826b611389714c1 -r31037d3d873f87b6c212f635ed7f6ed3f4216a7b
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 84fa07ec6182f90c72bd34dc3826b611389714c1)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 31037d3d873f87b6c212f635ed7f6ed3f4216a7b)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Apr 18 07:23:17 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed May 21 09:51:09 BST 2008 
  
 #=================== labels for LAMS Administration =================# 
 
@@ -38,7 +38,6 @@
 cache.entries.title  =Cache Nodes
 cache.explanation1  =Listed below are the current nodes in the cache. This keeps certain common objects in memory to speed up LAMS. It is managed automatically and should not require any intervention. However, if the system appears to be keeping "old values" e.g. an old first name, try clearing all the nodes in the cache. Once cleared, LAMS will reload the objects from the database.
 cache.explanation2  =Warning: Removing nodes will reduce the performance of the LAMS server. After a while, the cache will build up again and LAMS will run as usual.
-cache.explanation3  =Warning: If you remove a node, you will remove the node and all its child nodes.
 cache.button.remove  =Remove
 admin.config.key  =Key
 admin.config.value  =Value
@@ -208,7 +207,6 @@
 label.excel.spreadsheet  =Upload Spreadsheet
 msg.import.1  =In the spreadsheet, columns marked with a (*) are mandatory.
 msg.import.2  =Download the user template to create users.
-msg.import.3  =Download the roles template to add users to groups/subgroups and assign their roles.
 error.user.does.not.exist  =User does not exist {0}
 msg.users.created  ={0} users were created successfully.
 sysadmin.library.createtim  =Create time
@@ -255,7 +253,6 @@
 sysadmin.ldap.configuration  =LDAP Configuration
 label.synchronise  =Synchronise
 msg.num.ldap.users  =There are {0} LDAP users in LAMS.
-msg.ldap.synchronise.intro  =This feature allows you to synchronise LAMS' database with your LDAP server.  This includes updating existing users' profile and adding them to the LAMS group which matches their attributes.
 msg.ldap.synchronise.warning  =Note that this process may take some time depending on the number of users contained in your LDAP tree; it's best to perform this operation when the LAMS server will not be under load.
 heading.ldap.synchronise  =Synchronise with LDAP
 msg.done  =...done!
@@ -363,6 +360,9 @@
 config.monitor.screen.size  =Monitor Screen Size
 config.learner.screen.size  =Learner Screen Size
 config.admin.screen.size  =System Admin Screen Size
+cache.explanation3  =Warning: If you remove a node, you will remove the node and all its child nodes.
+msg.ldap.synchronise.intro  =This feature allows you to synchronise LAMS' database with your LDAP server.  This includes updating existing users' profile and adding them to the LAMS group which matches their attributes.
+msg.import.3  =Download the roles template to add users to groups/subgroups and assign their roles.
 
 
 #======= End labels: Exported 356 labels for en AU =====
Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r84fa07ec6182f90c72bd34dc3826b611389714c1 -r31037d3d873f87b6c212f635ed7f6ed3f4216a7b
--- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 84fa07ec6182f90c72bd34dc3826b611389714c1)
+++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 31037d3d873f87b6c212f635ed7f6ed3f4216a7b)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Apr 18 07:23:17 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed May 21 09:51:09 BST 2008 
  
 #=================== labels for LAMS Administration =================# 
 
@@ -38,7 +38,6 @@
 cache.entries.title  =Cache Nodes
 cache.explanation1  =Listed below are the current nodes in the cache. This keeps certain common objects in memory to speed up LAMS. It is managed automatically and should not require any intervention. However, if the system appears to be keeping "old values" e.g. an old first name, try clearing all the nodes in the cache. Once cleared, LAMS will reload the objects from the database.
 cache.explanation2  =Warning: Removing nodes will reduce the performance of the LAMS server. After a while, the cache will build up again and LAMS will run as usual.
-cache.explanation3  =Warning: If you remove a node, you will remove the node and all its child nodes.
 cache.button.remove  =Remove
 admin.config.key  =Key
 admin.config.value  =Value
@@ -208,7 +207,6 @@
 label.excel.spreadsheet  =Upload Spreadsheet
 msg.import.1  =In the spreadsheet, columns marked with a (*) are mandatory.
 msg.import.2  =Download the user template to create users.
-msg.import.3  =Download the roles template to add users to groups/subgroups and assign their roles.
 error.user.does.not.exist  =User does not exist {0}
 msg.users.created  ={0} users were created successfully.
 sysadmin.library.createtim  =Create time
@@ -255,7 +253,6 @@
 sysadmin.ldap.configuration  =LDAP Configuration
 label.synchronise  =Synchronise
 msg.num.ldap.users  =There are {0} LDAP users in LAMS.
-msg.ldap.synchronise.intro  =This feature allows you to synchronise LAMS' database with your LDAP server.  This includes updating existing users' profile and adding them to the LAMS group which matches their attributes.
 msg.ldap.synchronise.warning  =Note that this process may take some time depending on the number of users contained in your LDAP tree; it's best to perform this operation when the LAMS server will not be under load.
 heading.ldap.synchronise  =Synchronise with LDAP
 msg.done  =...done!
@@ -363,6 +360,9 @@
 config.monitor.screen.size  =Monitor Screen Size
 config.learner.screen.size  =Learner Screen Size
 config.admin.screen.size  =System Admin Screen Size
+cache.explanation3  =Warning: If you remove a node, you will remove the node and all its child nodes.
+msg.ldap.synchronise.intro  =This feature allows you to synchronise LAMS' database with your LDAP server.  This includes updating existing users' profile and adding them to the LAMS group which matches their attributes.
+msg.import.3  =Download the roles template to add users to groups/subgroups and assign their roles.
 
 
 #======= End labels: Exported 356 labels for en AU =====
Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r786ef1286ad15b4ef2c676b148814fe5da11163d -r31037d3d873f87b6c212f635ed7f6ed3f4216a7b
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 786ef1286ad15b4ef2c676b148814fe5da11163d)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 31037d3d873f87b6c212f635ed7f6ed3f4216a7b)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed Apr 30 04:29:43 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed May 21 09:46:39 BST 2008 
  
 #=================== labels for LAMS Central =================# 
 
@@ -53,12 +53,10 @@
 title.import  =Import tool content
 title.export.loading  =Export tool content loading
 label.ld.zip.file  =Learning Design import file
-msg.import.success  =Learning design and activities imported successfully.
 msg.import.ld.success  =Learning design imported successfully.
 msg.import.tool.error.prefix  =But there are some tool(s) imports that failed
 msg.import.failed  =Learning design import failed
 msg.export.loading  =Learning design download will start automatically in seconds, please wait...
-msg.export.success  =Learning design and activities export successfully.
 msg.export.ld.success  =Learning design export successfully.
 msg.export.tool.error.prefix  =But there are some tool(s) exported failed
 msg.export.failed  =Learning design export failed
@@ -213,6 +211,8 @@
 error.forgot.password.email  =Please enter an email address.
 error.forgot.password.username  =Please enter a username.
 button.select.another.importfile  =Select Another File To Import
+msg.import.success  =Learning design and activities imported successfully.
+msg.export.success  =Learning design and activities export successfully.
 
 
 #======= End labels: Exported 207 labels for en AU =====
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r786ef1286ad15b4ef2c676b148814fe5da11163d -r31037d3d873f87b6c212f635ed7f6ed3f4216a7b
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 786ef1286ad15b4ef2c676b148814fe5da11163d)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 31037d3d873f87b6c212f635ed7f6ed3f4216a7b)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed Apr 30 04:29:43 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed May 21 09:46:39 BST 2008 
  
 #=================== labels for LAMS Central =================# 
 
@@ -53,12 +53,10 @@
 title.import  =Import tool content
 title.export.loading  =Export tool content loading
 label.ld.zip.file  =Learning Design import file
-msg.import.success  =Learning design and activities imported successfully.
 msg.import.ld.success  =Learning design imported successfully.
 msg.import.tool.error.prefix  =But there are some tool(s) imports that failed
 msg.import.failed  =Learning design import failed
 msg.export.loading  =Learning design download will start automatically in seconds, please wait...
-msg.export.success  =Learning design and activities export successfully.
 msg.export.ld.success  =Learning design export successfully.
 msg.export.tool.error.prefix  =But there are some tool(s) exported failed
 msg.export.failed  =Learning design export failed
@@ -213,6 +211,8 @@
 error.forgot.password.email  =Please enter an email address.
 error.forgot.password.username  =Please enter a username.
 button.select.another.importfile  =Select Another File To Import
+msg.import.success  =Learning design and activities imported successfully.
+msg.export.success  =Learning design and activities export successfully.
 
 
 #======= End labels: Exported 207 labels for en AU =====
Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rbfc50df4f757d914777bf5647c20d89d817ab83a -r31037d3d873f87b6c212f635ed7f6ed3f4216a7b
--- lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision bfc50df4f757d914777bf5647c20d89d817ab83a)
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 31037d3d873f87b6c212f635ed7f6ed3f4216a7b)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Apr 18 07:10:50 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed May 21 09:47:05 BST 2008 
  
 #=================== labels for Monitor (Java) =================# 
 
@@ -23,7 +23,6 @@
 label.gate.closed  =Closed
 label.gate.waiting.learners  ={0} out of {1} are waiting in front of the gate.
 label.grouping.max.num.in.group.heading  =Maximum number of groups:
-label.grouping.general.instructions.heading  =General Instructions:
 label.grouping.general.instructions.line1  =Place the lesson participants in their groups. Initially you can add and remove users, but once the grouping is used (that is, a participant starts an activity that uses the grouping) you will not be able to remove users from groups. If you try to remove someone from a group and they will not remove check their progress - if they start using the group while you are on this screen you will not get any errors but you will not be able to remove them from their group. You will still be able to add users to groups.
 label.grouping.group.heading  =Groups
 label.grouping.grouped.users.heading  =Members of selected Group
@@ -70,6 +69,7 @@
 label.grouping.non.grouped.users.heading  =Students without a Group
 label.branching.non.allocated.users.heading  =Students without a Branch
 label.grouping.general.instructions.line2  =To create a group, type a group name and click <strong>Add Group</strong>. Repeat as required. Select a group, then select students from Column 2 and click <strong>Add selected to group</strong>. Select students in Column 3 and click <strong>Remove selected members</strong> from group to remove them from the group membership. The changes are saved when you click any of the buttons.
+label.grouping.general.instructions.heading  =General Instructions:
 
 
 #======= End labels: Exported 64 labels for en AU =====
Index: lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rbfc50df4f757d914777bf5647c20d89d817ab83a -r31037d3d873f87b6c212f635ed7f6ed3f4216a7b
--- lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision bfc50df4f757d914777bf5647c20d89d817ab83a)
+++ lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 31037d3d873f87b6c212f635ed7f6ed3f4216a7b)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Apr 18 07:10:50 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed May 21 09:47:05 BST 2008 
  
 #=================== labels for Monitor (Java) =================# 
 
@@ -23,7 +23,6 @@
 label.gate.closed  =Closed
 label.gate.waiting.learners  ={0} out of {1} are waiting in front of the gate.
 label.grouping.max.num.in.group.heading  =Maximum number of groups:
-label.grouping.general.instructions.heading  =General Instructions:
 label.grouping.general.instructions.line1  =Place the lesson participants in their groups. Initially you can add and remove users, but once the grouping is used (that is, a participant starts an activity that uses the grouping) you will not be able to remove users from groups. If you try to remove someone from a group and they will not remove check their progress - if they start using the group while you are on this screen you will not get any errors but you will not be able to remove them from their group. You will still be able to add users to groups.
 label.grouping.group.heading  =Groups
 label.grouping.grouped.users.heading  =Members of selected Group
@@ -70,6 +69,7 @@
 label.grouping.non.grouped.users.heading  =Students without a Group
 label.branching.non.allocated.users.heading  =Students without a Branch
 label.grouping.general.instructions.line2  =To create a group, type a group name and click <strong>Add Group</strong>. Repeat as required. Select a group, then select students from Column 2 and click <strong>Add selected to group</strong>. Select students in Column 3 and click <strong>Remove selected members</strong> from group to remove them from the group membership. The changes are saved when you click any of the buttons.
+label.grouping.general.instructions.heading  =General Instructions:
 
 
 #======= End labels: Exported 64 labels for en AU =====
Index: lams_tool_chat/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r55304c311b7bdb0f2dcf08d1fb91ccbedf3d7d91 -r31037d3d873f87b6c212f635ed7f6ed3f4216a7b
--- lams_tool_chat/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 55304c311b7bdb0f2dcf08d1fb91ccbedf3d7d91)
+++ lams_tool_chat/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 31037d3d873f87b6c212f635ed7f6ed3f4216a7b)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri May 09 05:46:09 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed May 21 09:47:52 BST 2008 
  
 #=================== labels for Chat =================# 
 
@@ -21,10 +21,6 @@
 button.upload  =Upload
 label.authoring.basic.title  =Title:
 label.authoring.basic.content  =Content:
-instructions.onlineInstructions  =Online Instructions:
-instructions.offlineInstructions  =Offline Instructions:
-instructions.uploadOnlineInstr  =Online Instructions File:
-instructions.uploadOfflineInstr  =Offline Instructions File:
 instructions.type.online  =Online
 instructions.type.offline  =Offline
 label.filename  =Filename
@@ -36,11 +32,9 @@
 message.updateSuccess  =Changes saved
 message.unsavedChanges  =Page contains unsaved changes
 button.summary  =Summary
-button.instructions  =Instructions
 button.editActivity  =Edit Activity
 button.statistics  =Statistics
 titleHeading.summary  =Summary
-titleHeading.instructions  =Instructions
 titleHeading.statistics  =Statistics
 titleHeading.editActivity  =Edit Activity
 titleHeading.exportPortfolio  =Export Portfolio
@@ -69,8 +63,6 @@
 error.missingParam  =Unable to continue. {0} is missing.
 error.exceedMaxFileSize  =File size exceeded
 error.exception.NbApplication  =An internal error has occured with the Chat Tool. If reporting this error, please report: <br/> <b>{0}</b>
-error.contentrepository  =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly.
-error.content.locked  =The content has been locked since it is being used by one or more learners. The modification of the content is not allowed.
 error.defineLater  =Sorry, the activity is not ready yet. Please wait for the teacher to finishing defining the activity.
 errors.maxfilesize  =The uploaded file has exceeded the maximum file size limit of {0} bytes
 error.mandatoryField  ={0} field is mandatory.
@@ -82,20 +74,28 @@
 pageTitle.authoring  =Chat Authoring
 message.defineLaterSet  =Please wait for the teacher to complete the contents of this activity.
 pageTitle.monitoring.notebook  =View Notebook Entries
-advanced.reflectOnActivity  =Add Notebook at end of Chat with the following instructions:
 button.continue  =Continue
-label.authoring.basic.instructions  =Instructions:
 advanced.lockOnFinished  =Lock when finished
 message.runOfflineSet  =This activity is not being done on the computer. Please see your instructor for details.
 button.reflect  =Reflect on chat
 button.edit  =Edit
 message.no.reflection.available  =No notebook available
 button.finish  =Next Activity
 message.alertContentEdit  =Warning: One of more students have accessed this activity. Changing this content will result in students getting different information.
-message.contentInUseSet  =The modification of content is not allowed since one or more students has attempted the activity.
 advanced.filteringEnabled  =Filter Messages (separate each filtered word with a comma ie: word1, word2, etc)
 message.warnLockOnFinish  =Note: After you click on "Next Activity" and you come back to this Chat, you wont be able to continue chatting.
 message.activityLocked  =This activity has been set up to not to allow chatting after you have finished it. As you are returning to this Chat, you are able to see all messages but not allowed to chat anymore.
+message.contentInUseSet  =Modification of content is not allowed since one or more students has attempted the activity.
+error.content.locked  =The content has been locked since it is being used by one or more learners. The modification of the content is not allowed.
+label.authoring.basic.instructions  =Instructions:
+error.contentrepository  =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly.
+titleHeading.instructions  =Instructions
+button.instructions  =Instructions
+advanced.reflectOnActivity  =Add Notebook at end of Chat with the following instructions:
+instructions.uploadOfflineInstr  =Offline Instructions File:
+instructions.uploadOnlineInstr  =Online Instructions File:
+instructions.offlineInstructions  =Offline Instructions:
+instructions.onlineInstructions  =Online Instructions:
 
 
 #======= End labels: Exported 90 labels for en AU =====
Index: lams_tool_chat/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r55304c311b7bdb0f2dcf08d1fb91ccbedf3d7d91 -r31037d3d873f87b6c212f635ed7f6ed3f4216a7b
--- lams_tool_chat/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 55304c311b7bdb0f2dcf08d1fb91ccbedf3d7d91)
+++ lams_tool_chat/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 31037d3d873f87b6c212f635ed7f6ed3f4216a7b)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri May 09 05:46:09 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed May 21 09:47:52 BST 2008 
  
 #=================== labels for Chat =================# 
 
@@ -21,10 +21,6 @@
 button.upload  =Upload
 label.authoring.basic.title  =Title:
 label.authoring.basic.content  =Content:
-instructions.onlineInstructions  =Online Instructions:
-instructions.offlineInstructions  =Offline Instructions:
-instructions.uploadOnlineInstr  =Online Instructions File:
-instructions.uploadOfflineInstr  =Offline Instructions File:
 instructions.type.online  =Online
 instructions.type.offline  =Offline
 label.filename  =Filename
@@ -36,11 +32,9 @@
 message.updateSuccess  =Changes saved
 message.unsavedChanges  =Page contains unsaved changes
 button.summary  =Summary
-button.instructions  =Instructions
 button.editActivity  =Edit Activity
 button.statistics  =Statistics
 titleHeading.summary  =Summary
-titleHeading.instructions  =Instructions
 titleHeading.statistics  =Statistics
 titleHeading.editActivity  =Edit Activity
 titleHeading.exportPortfolio  =Export Portfolio
@@ -69,8 +63,6 @@
 error.missingParam  =Unable to continue. {0} is missing.
 error.exceedMaxFileSize  =File size exceeded
 error.exception.NbApplication  =An internal error has occured with the Chat Tool. If reporting this error, please report: <br/> <b>{0}</b>
-error.contentrepository  =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly.
-error.content.locked  =The content has been locked since it is being used by one or more learners. The modification of the content is not allowed.
 error.defineLater  =Sorry, the activity is not ready yet. Please wait for the teacher to finishing defining the activity.
 errors.maxfilesize  =The uploaded file has exceeded the maximum file size limit of {0} bytes
 error.mandatoryField  ={0} field is mandatory.
@@ -82,20 +74,28 @@
 pageTitle.authoring  =Chat Authoring
 message.defineLaterSet  =Please wait for the teacher to complete the contents of this activity.
 pageTitle.monitoring.notebook  =View Notebook Entries
-advanced.reflectOnActivity  =Add Notebook at end of Chat with the following instructions:
 button.continue  =Continue
-label.authoring.basic.instructions  =Instructions:
 advanced.lockOnFinished  =Lock when finished
 message.runOfflineSet  =This activity is not being done on the computer. Please see your instructor for details.
 button.reflect  =Reflect on chat
 button.edit  =Edit
 message.no.reflection.available  =No notebook available
 button.finish  =Next Activity
 message.alertContentEdit  =Warning: One of more students have accessed this activity. Changing this content will result in students getting different information.
-message.contentInUseSet  =The modification of content is not allowed since one or more students has attempted the activity.
 advanced.filteringEnabled  =Filter Messages (separate each filtered word with a comma ie: word1, word2, etc)
 message.warnLockOnFinish  =Note: After you click on "Next Activity" and you come back to this Chat, you wont be able to continue chatting.
 message.activityLocked  =This activity has been set up to not to allow chatting after you have finished it. As you are returning to this Chat, you are able to see all messages but not allowed to chat anymore.
+message.contentInUseSet  =Modification of content is not allowed since one or more students has attempted the activity.
+error.content.locked  =The content has been locked since it is being used by one or more learners. The modification of the content is not allowed.
+label.authoring.basic.instructions  =Instructions:
+error.contentrepository  =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly.
+titleHeading.instructions  =Instructions
+button.instructions  =Instructions
+advanced.reflectOnActivity  =Add Notebook at end of Chat with the following instructions:
+instructions.uploadOfflineInstr  =Offline Instructions File:
+instructions.uploadOnlineInstr  =Online Instructions File:
+instructions.offlineInstructions  =Offline Instructions:
+instructions.onlineInstructions  =Online Instructions:
 
 
 #======= End labels: Exported 90 labels for en AU =====
Index: lams_tool_lamc/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r0d31474c90254ddba9e1b37c11d3ecf6dd02d657 -r31037d3d873f87b6c212f635ed7f6ed3f4216a7b
--- lams_tool_lamc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 0d31474c90254ddba9e1b37c11d3ecf6dd02d657)
+++ lams_tool_lamc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 31037d3d873f87b6c212f635ed7f6ed3f4216a7b)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon May 19 06:27:47 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed May 21 09:42:49 BST 2008 
  
 #=================== labels for Multiple Choice Questions =================# 
 
@@ -15,7 +15,6 @@
 label.authoring.mc  =Multiple Choice Questions
 label.basic  =Basic
 label.advanced  =Advanced
-label.instructions  =Instructions
 label.summary  =Summary
 label.stats  =Stats
 label.editActivity  =Edit Activity
@@ -30,7 +29,6 @@
 label.authoring.mc.basic.editOptions  =Please define the question and/or its options.
 label.advanced.definitions  =Advanced Definitions
 label.authoring.title  =Title
-label.authoring.instructions  =Instructions
 label.Questions  =Questions
 label.weight  =Weight
 label.addNewQuestion  =Add New Question
@@ -68,7 +66,6 @@
 button.upload  =Upload
 button.preview  =Preview
 button.advanced  =Advanced
-button.instructions  =Instructions
 tool.icon.name  =MC
 button.add  =Add
 button.addNewQuestion  =Add
@@ -102,10 +99,6 @@
 radiobox.retries  =Allow Retries
 label.report.title  =Report Title
 label.report.endLearningMessage  =End of Activity Message
-label.offlineInstructions  =Offline Instructions
-label.offlineInstructions.col  =Offline Instructions:
-label.onlineInstructions  =Online Instructions
-label.onlineInstructions.col  =Online Instructions:
 label.offlineFiles  =Offline Files:
 label.onlineFiles  =Online Files:
 label.uploadedOfflineFiles  =Uploaded Offline Files:
@@ -136,14 +129,12 @@
 options.count.zero  =Please correct this: There must be at least one candidate answer.
 error.passmark.notInteger  =Please correct this: Pass Mark can only be an integer.
 error.file.notPersisted  =An error occurred: The file is not viewable yet. Please save all the content first and check back.
-error.fileName.empty  =Please correct this: Under "Instructions", the file(name) to upload can not be empty.
 error.questions.withNoOptions  =Please note: The questions with no candidate answers have been automatically removed for you. Please check total question weight.
 error.answers.empty  =Please correct this: Candidate answers can not be empty.
 error.passMark.greater100  =Please correct this: The passmark can not be greater than 100%
 error.question.addNotAllowed.thisScreen  =The question text can not be modified in this screen since it has options attached . Please use the "Options" button to edit the question text.
 error.question.removeNotAllowed.thisScreen  =The question can not be removed since one or more of the question texts has been modified. Please try again without any text modifications.
 error.selectedIndex.empty  =Can not continue. Please select the correct answer and click "Done".
-error.content.locked  =The content has been locked since it is being used by one mor more learners. <br> The modification of the content is not allowed.
 error.noLearnerActivity  =Summary report is not available since no users attempted the activity yet.
 label.question  =Question
 label.answers  =Answers:
@@ -173,10 +164,10 @@
 label.export.learner  =Portfolio Export for Learner
 label.export.teacher  =Portfolio Export for Teacher
 label.yourAnswers  =Learner's Answers:
-label.authoring.instructions.col  =Instructions:
 label.candidateAnswer  =Candidate Answer
 label.studentMark  =Learner Mark
 label.authoring.title.col  =Title:
+label.monitoring.downloadMarks.button  =Download Marks
 message.no.reflection.available  =No notebook available
 label.mcqSummary  =MCQ Summary
 label.learning.forceFinishMessage  =Responses are no more allowed. Please finish.
@@ -200,9 +191,7 @@
 label.monitoring.yesDisplayAnswers  =Learners are able to see the answers for all questions.
 label.monitoring.noDisplayAnswers1  =Learners are not able to see the answers for the questions
 authoring.msg.cancel.save  =Do you want to close this window without saving?
-label.group.results  =Group's top and average marks
 label.feedback  =Question Feedback:
-label.reflect  =Add Notebook at end of MCQ with the following instructions:
 label.save.question  =Create Question
 label.notEnoughMarks  =You don't have enough marks to finish. Please redo.
 radiobox.onepq  =One question per page
@@ -225,11 +214,13 @@
 label.tip.editCandidate  =Enables editing of candidate answers
 label.tip.moveCandidateDown  =Moves candidate answer down
 label.tip.moveCandidateUp  =Moves candidate answer up
+label.monitoring.downloadMarks.username  =Username
 label.tip.moveQuestionDown  =Moves question down
 label.tip.moveQuestionUp  =Moves question up
 label.tip.editOptions  =Enables editing of candidate answers
 label.tip.removeQuestion  =Removes question
 label.tip.removeCandidate  =Removes candidate answer
+label.monitoring.downloadMarks.question.mark  =Question {0} (Mark: {1})
 label.continue  =Continue
 label.close  =Close
 errors.maxfilesize  =The uploaded file has exceeded the maximum file size limit of {0} bytes
@@ -242,18 +233,27 @@
 output.desc.learner.all.correct  =Are learner's answers all correct?
 output.desc.learner.all.correct.true  =All Correct
 output.desc.learner.all.correct.false  =Not All Correct
-label.showMarks  =Show top and average mark
 error.noStudentActivity  =Sorry, the report can not be generated. <br> No student has attempted the activity yet.
-error.content.inUse  =The modification of the content is not allowed since one or more students has attempted the activity.
 label.add.new.question  =Add
 label.add.candidates  =Answers
 label.displayAnswers  =Display correct answers and score after last question
 label.individual.results.withRetries  =Summary of Multiple Choice Responses with Retries
 label.individual.results.withoutRetries  =Summary of Multiple Choice Responses
 label.attachments  =Attachments
-label.monitoring.downloadMarks.button  =Download Marks
-label.monitoring.downloadMarks.question.mark  =Question {0} (Mark: {1})
-label.monitoring.downloadMarks.username  =Username
+error.content.locked  =The content has been locked since it is being used by one mor more learners. <br> The modification of the content is not allowed.
+error.content.inUse  =modification of the content is not allowed since one or more students has attempted the activity.
+label.showMarks  =Show top and average mark
+label.group.results  =Group's top and average marks
+error.fileName.empty  =Please correct this: Under "Instructions", the file(name) to upload can not be empty.
+label.reflect  =Add Notebook at end of MCQ with the following instructions:
+label.onlineInstructions  =Online Instructions
+label.offlineInstructions.col  =Offline Instructions:
+label.offlineInstructions  =Offline Instructions
+button.instructions  =Instructions
+label.onlineInstructions.col  =Online Instructions:
+label.authoring.instructions.col  =Instructions:
+label.instructions  =Instructions
+label.authoring.instructions  =Instructions
 
 
 #======= End labels: Exported 248 labels for en AU =====
Index: lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r0d31474c90254ddba9e1b37c11d3ecf6dd02d657 -r31037d3d873f87b6c212f635ed7f6ed3f4216a7b
--- lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 0d31474c90254ddba9e1b37c11d3ecf6dd02d657)
+++ lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 31037d3d873f87b6c212f635ed7f6ed3f4216a7b)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon May 19 06:27:47 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed May 21 09:42:49 BST 2008 
  
 #=================== labels for Multiple Choice Questions =================# 
 
@@ -15,7 +15,6 @@
 label.authoring.mc  =Multiple Choice Questions
 label.basic  =Basic
 label.advanced  =Advanced
-label.instructions  =Instructions
 label.summary  =Summary
 label.stats  =Stats
 label.editActivity  =Edit Activity
@@ -30,7 +29,6 @@
 label.authoring.mc.basic.editOptions  =Please define the question and/or its options.
 label.advanced.definitions  =Advanced Definitions
 label.authoring.title  =Title
-label.authoring.instructions  =Instructions
 label.Questions  =Questions
 label.weight  =Weight
 label.addNewQuestion  =Add New Question
@@ -68,7 +66,6 @@
 button.upload  =Upload
 button.preview  =Preview
 button.advanced  =Advanced
-button.instructions  =Instructions
 tool.icon.name  =MC
 button.add  =Add
 button.addNewQuestion  =Add
@@ -102,10 +99,6 @@
 radiobox.retries  =Allow Retries
 label.report.title  =Report Title
 label.report.endLearningMessage  =End of Activity Message
-label.offlineInstructions  =Offline Instructions
-label.offlineInstructions.col  =Offline Instructions:
-label.onlineInstructions  =Online Instructions
-label.onlineInstructions.col  =Online Instructions:
 label.offlineFiles  =Offline Files:
 label.onlineFiles  =Online Files:
 label.uploadedOfflineFiles  =Uploaded Offline Files:
@@ -136,14 +129,12 @@
 options.count.zero  =Please correct this: There must be at least one candidate answer.
 error.passmark.notInteger  =Please correct this: Pass Mark can only be an integer.
 error.file.notPersisted  =An error occurred: The file is not viewable yet. Please save all the content first and check back.
-error.fileName.empty  =Please correct this: Under "Instructions", the file(name) to upload can not be empty.
 error.questions.withNoOptions  =Please note: The questions with no candidate answers have been automatically removed for you. Please check total question weight.
 error.answers.empty  =Please correct this: Candidate answers can not be empty.
 error.passMark.greater100  =Please correct this: The passmark can not be greater than 100%
 error.question.addNotAllowed.thisScreen  =The question text can not be modified in this screen since it has options attached . Please use the "Options" button to edit the question text.
 error.question.removeNotAllowed.thisScreen  =The question can not be removed since one or more of the question texts has been modified. Please try again without any text modifications.
 error.selectedIndex.empty  =Can not continue. Please select the correct answer and click "Done".
-error.content.locked  =The content has been locked since it is being used by one mor more learners. <br> The modification of the content is not allowed.
 error.noLearnerActivity  =Summary report is not available since no users attempted the activity yet.
 label.question  =Question
 label.answers  =Answers:
@@ -173,10 +164,10 @@
 label.export.learner  =Portfolio Export for Learner
 label.export.teacher  =Portfolio Export for Teacher
 label.yourAnswers  =Learner's Answers:
-label.authoring.instructions.col  =Instructions:
 label.candidateAnswer  =Candidate Answer
 label.studentMark  =Learner Mark
 label.authoring.title.col  =Title:
+label.monitoring.downloadMarks.button  =Download Marks
 message.no.reflection.available  =No notebook available
 label.mcqSummary  =MCQ Summary
 label.learning.forceFinishMessage  =Responses are no more allowed. Please finish.
@@ -200,9 +191,7 @@
 label.monitoring.yesDisplayAnswers  =Learners are able to see the answers for all questions.
 label.monitoring.noDisplayAnswers1  =Learners are not able to see the answers for the questions
 authoring.msg.cancel.save  =Do you want to close this window without saving?
-label.group.results  =Group's top and average marks
 label.feedback  =Question Feedback:
-label.reflect  =Add Notebook at end of MCQ with the following instructions:
 label.save.question  =Create Question
 label.notEnoughMarks  =You don't have enough marks to finish. Please redo.
 radiobox.onepq  =One question per page
@@ -225,11 +214,13 @@
 label.tip.editCandidate  =Enables editing of candidate answers
 label.tip.moveCandidateDown  =Moves candidate answer down
 label.tip.moveCandidateUp  =Moves candidate answer up
+label.monitoring.downloadMarks.username  =Username
 label.tip.moveQuestionDown  =Moves question down
 label.tip.moveQuestionUp  =Moves question up
 label.tip.editOptions  =Enables editing of candidate answers
 label.tip.removeQuestion  =Removes question
 label.tip.removeCandidate  =Removes candidate answer
+label.monitoring.downloadMarks.question.mark  =Question {0} (Mark: {1})
 label.continue  =Continue
 label.close  =Close
 errors.maxfilesize  =The uploaded file has exceeded the maximum file size limit of {0} bytes
@@ -242,18 +233,27 @@
 output.desc.learner.all.correct  =Are learner's answers all correct?
 output.desc.learner.all.correct.true  =All Correct
 output.desc.learner.all.correct.false  =Not All Correct
-label.showMarks  =Show top and average mark
 error.noStudentActivity  =Sorry, the report can not be generated. <br> No student has attempted the activity yet.
-error.content.inUse  =The modification of the content is not allowed since one or more students has attempted the activity.
 label.add.new.question  =Add
 label.add.candidates  =Answers
 label.displayAnswers  =Display correct answers and score after last question
 label.individual.results.withRetries  =Summary of Multiple Choice Responses with Retries
 label.individual.results.withoutRetries  =Summary of Multiple Choice Responses
 label.attachments  =Attachments
-label.monitoring.downloadMarks.button  =Download Marks
-label.monitoring.downloadMarks.question.mark  =Question {0} (Mark: {1})
-label.monitoring.downloadMarks.username  =Username
+error.content.locked  =The content has been locked since it is being used by one mor more learners. <br> The modification of the content is not allowed.
+error.content.inUse  =modification of the content is not allowed since one or more students has attempted the activity.
+label.showMarks  =Show top and average mark
+label.group.results  =Group's top and average marks
+error.fileName.empty  =Please correct this: Under "Instructions", the file(name) to upload can not be empty.
+label.reflect  =Add Notebook at end of MCQ with the following instructions:
+label.onlineInstructions  =Online Instructions
+label.offlineInstructions.col  =Offline Instructions:
+label.offlineInstructions  =Offline Instructions
+button.instructions  =Instructions
+label.onlineInstructions.col  =Online Instructions:
+label.authoring.instructions.col  =Instructions:
+label.instructions  =Instructions
+label.authoring.instructions  =Instructions
 
 
 #======= End labels: Exported 248 labels for en AU =====
Index: lams_tool_laqa/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r5b5e984bfc38948620dee430607c48366fab5c03 -r31037d3d873f87b6c212f635ed7f6ed3f4216a7b
--- lams_tool_laqa/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 5b5e984bfc38948620dee430607c48366fab5c03)
+++ lams_tool_laqa/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 31037d3d873f87b6c212f635ed7f6ed3f4216a7b)
@@ -2,33 +2,22 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri May 09 05:34:04 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed May 21 09:44:27 BST 2008 
  
 #=================== labels for Q&A =================# 
 
-activity.title  =Q and A
 activity.description  =Each learner answers question(s) and then sees answers from all learners collated on the next page.
 activity.helptext  =Each learner answers one or more questions in short answer format and then sees answers from all learners collated on the next page.
-tool.display.name  =Question and Answer Tool
 tool.description  =Tool for asking one or more short answer questions and displays the results.
-label.tool.shortname  =Q/A
-label.authoring  =Q/A Authoring
-label.monitoring  =Q/A Monitoring
-label.authoring.qa  =Questions and Answers
 label.basic  =Basic
 label.advanced  =Advanced
 label.authoring.title  =Title
 label.summary  =Summary
-label.instructions  =Instructions
 label.editActivity  =Edit Activity
 label.stats  =Stats
 label.authoring.qa.basic  =Please define the questions.
 label.advanced.definitions  =Advanced Definitions
-label.authoring.instructions  =Instructions
-label.offlineInstructions.col  =Offline Instructions:
-label.onlineInstructions.col  =Online Instructions:
 label.exportPortfolio.simple  =Export Portfolio
-label.exportPortfolio  =Q/A Export Portfolio
 instructions.type.online  =Online
 instructions.type.offline  =Offline
 link.view  =View
@@ -38,8 +27,6 @@
 button.uploadFile  =Upload Package
 button.preview  =Preview
 button.advanced  =Advanced
-button.instructions  =Instructions
-tool.icon.name  =Q/A
 button.submitAllContent  =Submit
 button.done  =Done
 button.getNextQuestion  =Next
@@ -49,8 +36,6 @@
 label.question1  =Question 1
 radiobox.synchInMonitor  =Sync in Monitor
 radiobox.showFeedback  =Show Feedback
-label.offlineInstructions  =Offline Instructions
-label.onlineInstructions  =Online Instructions
 label.offlineFiles  =Offline Files:
 label.onlineFiles  =Online Files:
 label.upload  =Upload
@@ -65,7 +50,6 @@
 error.defaultquestion.empty  =The first question can not be empty. <br>
 submit.successful  =The content has been created successfully. <br>
 submit.unSuccessful  =Warning: An error occurred while saving the content. <br>
-label.learning.qa  =Answers for Q/A
 label.question  =Question
 label.answers  =Answers:
 label.answer  =Answer:
@@ -107,9 +91,7 @@
 count.max.attempt  =Maximum Attempt Count:
 error.monitorReportTitle  =The field "Monitor Report Title (Advanced)" is mandatory. <br>
 error.tab.contentId.required  =Sorry, the screen is not available. The Tool Activity requires a content id.
-error.contentrepository  =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly.
 label.authoring.title.col  =Title:
-label.authoring.instructions.col  =Instructions:
 error.system.qa  =<font color\="red">A system exception has occured. Please contact technical support. The error to report is\: <br/> <b>{0}</b></font>
 label.show  =Show
 label.response.hidden  =Hidden
@@ -135,7 +117,6 @@
 label.feedback.combined  =Number of questions presented in this activity:
 label.feedback.seq  =Number of questions presented in this activity:
 radiobox.usernameVisible  =Show learner's name with answer
-label.reflect  =Add Notebook at end of Q&A with the following instructions:
 label.learning.forceOfflineMessage  =This activity is not being done on the computer. Please see your instructor for details.
 label.questions.remaining  =Remaining question count:
 label.questions.simple  =questions.
@@ -165,9 +146,28 @@
 radiobox.defineLater  =Define in Monitor
 button.endLearning  =Next Activity
 label.show.names  =Show names of other learners
-error.content.inUse  =The modification of the content is not allowed since one or more students has attempted the activity.
 error.noStudentActivity  =Sorry, the report can not be generated. <br> No student has attempted the activity yet.
 label.other.answers  =Answers from other Learners
+error.content.inUse  =Modification of the content is not allowed since one or more students has attempted the activity.
+label.tool.shortname  =Q&A
+label.authoring  =Q&A Authoring
+label.monitoring  =Q&A Monitoring
+label.exportPortfolio  =Q&A Export Portfolio
+tool.icon.name  =Q&A
+label.learning.qa  =Answers for Q&A
+activity.title  =Q & A
+label.authoring.qa  =Questions and Answers
+tool.display.name  =Question & Answer Tool
+label.instructions  =Instructions
+error.contentrepository  =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly.
+label.authoring.instructions.col  =Instructions:
+label.onlineInstructions  =Online Instructions
+label.offlineInstructions  =Offline Instructions
+button.instructions  =Instructions
+label.onlineInstructions.col  =Online Instructions:
+label.offlineInstructions.col  =Offline Instructions:
+label.authoring.instructions  =Instructions
+label.reflect  =Add Notebook at end of Q&A with the following instructions:
 
 
 #======= End labels: Exported 162 labels for en AU =====
Index: lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r5b5e984bfc38948620dee430607c48366fab5c03 -r31037d3d873f87b6c212f635ed7f6ed3f4216a7b
--- lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 5b5e984bfc38948620dee430607c48366fab5c03)
+++ lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 31037d3d873f87b6c212f635ed7f6ed3f4216a7b)
@@ -2,33 +2,22 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri May 09 05:34:04 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed May 21 09:44:27 BST 2008 
  
 #=================== labels for Q&A =================# 
 
-activity.title  =Q and A
 activity.description  =Each learner answers question(s) and then sees answers from all learners collated on the next page.
 activity.helptext  =Each learner answers one or more questions in short answer format and then sees answers from all learners collated on the next page.
-tool.display.name  =Question and Answer Tool
 tool.description  =Tool for asking one or more short answer questions and displays the results.
-label.tool.shortname  =Q/A
-label.authoring  =Q/A Authoring
-label.monitoring  =Q/A Monitoring
-label.authoring.qa  =Questions and Answers
 label.basic  =Basic
 label.advanced  =Advanced
 label.authoring.title  =Title
 label.summary  =Summary
-label.instructions  =Instructions
 label.editActivity  =Edit Activity
 label.stats  =Stats
 label.authoring.qa.basic  =Please define the questions.
 label.advanced.definitions  =Advanced Definitions
-label.authoring.instructions  =Instructions
-label.offlineInstructions.col  =Offline Instructions:
-label.onlineInstructions.col  =Online Instructions:
 label.exportPortfolio.simple  =Export Portfolio
-label.exportPortfolio  =Q/A Export Portfolio
 instructions.type.online  =Online
 instructions.type.offline  =Offline
 link.view  =View
@@ -38,8 +27,6 @@
 button.uploadFile  =Upload Package
 button.preview  =Preview
 button.advanced  =Advanced
-button.instructions  =Instructions
-tool.icon.name  =Q/A
 button.submitAllContent  =Submit
 button.done  =Done
 button.getNextQuestion  =Next
@@ -49,8 +36,6 @@
 label.question1  =Question 1
 radiobox.synchInMonitor  =Sync in Monitor
 radiobox.showFeedback  =Show Feedback
-label.offlineInstructions  =Offline Instructions
-label.onlineInstructions  =Online Instructions
 label.offlineFiles  =Offline Files:
 label.onlineFiles  =Online Files:
 label.upload  =Upload
@@ -65,7 +50,6 @@
 error.defaultquestion.empty  =The first question can not be empty. <br>
 submit.successful  =The content has been created successfully. <br>
 submit.unSuccessful  =Warning: An error occurred while saving the content. <br>
-label.learning.qa  =Answers for Q/A
 label.question  =Question
 label.answers  =Answers:
 label.answer  =Answer:
@@ -107,9 +91,7 @@
 count.max.attempt  =Maximum Attempt Count:
 error.monitorReportTitle  =The field "Monitor Report Title (Advanced)" is mandatory. <br>
 error.tab.contentId.required  =Sorry, the screen is not available. The Tool Activity requires a content id.
-error.contentrepository  =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly.
 label.authoring.title.col  =Title:
-label.authoring.instructions.col  =Instructions:
 error.system.qa  =<font color\="red">A system exception has occured. Please contact technical support. The error to report is\: <br/> <b>{0}</b></font>
 label.show  =Show
 label.response.hidden  =Hidden
@@ -135,7 +117,6 @@
 label.feedback.combined  =Number of questions presented in this activity:
 label.feedback.seq  =Number of questions presented in this activity:
 radiobox.usernameVisible  =Show learner's name with answer
-label.reflect  =Add Notebook at end of Q&A with the following instructions:
 label.learning.forceOfflineMessage  =This activity is not being done on the computer. Please see your instructor for details.
 label.questions.remaining  =Remaining question count:
 label.questions.simple  =questions.
@@ -165,9 +146,28 @@
 radiobox.defineLater  =Define in Monitor
 button.endLearning  =Next Activity
 label.show.names  =Show names of other learners
-error.content.inUse  =The modification of the content is not allowed since one or more students has attempted the activity.
 error.noStudentActivity  =Sorry, the report can not be generated. <br> No student has attempted the activity yet.
 label.other.answers  =Answers from other Learners
+error.content.inUse  =Modification of the content is not allowed since one or more students has attempted the activity.
+label.tool.shortname  =Q&A
+label.authoring  =Q&A Authoring
+label.monitoring  =Q&A Monitoring
+label.exportPortfolio  =Q&A Export Portfolio
+tool.icon.name  =Q&A
+label.learning.qa  =Answers for Q&A
+activity.title  =Q & A
+label.authoring.qa  =Questions and Answers
+tool.display.name  =Question & Answer Tool
+label.instructions  =Instructions
+error.contentrepository  =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly.
+label.authoring.instructions.col  =Instructions:
+label.onlineInstructions  =Online Instructions
+label.offlineInstructions  =Offline Instructions
+button.instructions  =Instructions
+label.onlineInstructions.col  =Online Instructions:
+label.offlineInstructions.col  =Offline Instructions:
+label.authoring.instructions  =Instructions
+label.reflect  =Add Notebook at end of Q&A with the following instructions:
 
 
 #======= End labels: Exported 162 labels for en AU =====
Index: lams_tool_larsrc/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r069f823016a284e4761ba280a4388bf5d27b434d -r31037d3d873f87b6c212f635ed7f6ed3f4216a7b
--- lams_tool_larsrc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 069f823016a284e4761ba280a4388bf5d27b434d)
+++ lams_tool_larsrc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 31037d3d873f87b6c212f635ed7f6ed3f4216a7b)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue May 20 12:59:02 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed May 21 09:45:48 BST 2008 
  
 #=================== labels for ShareResources =================# 
 
@@ -16,12 +16,9 @@
 label.authoring.heading  =Share Resources
 label.author.title  =Share Resources Authoring
 label.authoring.heading.basic  =Basic
-label.authoring.heading.instructions  =Instructions
 label.authoring.heading.basic.desc  =Basic input information for shared resources
-label.authoring.heading.instructions.desc  =Please input online and offline instructions
 label.authoring.heading.advance.desc  =Please input advance options for shared resources
 label.authoring.basic.title  =Title
-label.authoring.basic.instruction  =Instruction
 label.authoring.basic.add.url  =Add URL
 label.authoring.basic.add.file  =Add Single File
 label.authoring.basic.resource.list.title  =Resource List
@@ -32,17 +29,12 @@
 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.url.input  =URL
 label.authoring.basic.resource.file.input  =File
 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  =Comment/Instruction can not be blank
 label.authoring.offline.file  =Upload offline file
 label.authoring.choosefile.button  =Choose file
 label.authoring.upload.online.button  =Upload Online
@@ -54,7 +46,6 @@
 label.authoring.advance.mini.number.resources.view  =Minimum number of resources to view
 label.authoring.advance.allow.learner.add.urls  =Allow learners to add URLs
 label.authoring.advance.allow.learner.add.files  =Allow learners to add Files
-label.next.instruction  =Next Instruction
 label.authoring.cancel.button  =Cancel
 label.description  =Description:
 authoring.exception  =There is a problem in shared resources authoring page, the reason is {0}
@@ -71,7 +62,6 @@
 error.msg.io.exception  =IOException occurs when uploading file.
 error.msg.invaid.param.upload  =InvalidParameterException occured 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.
 authoring.msg.cancel.save  =Do you want to close this window without saving?
 label.learning.title  =Share Resource Learning
 label.learning.heading  =Share Resources
@@ -81,10 +71,8 @@
 label.suggest.new  =Suggest a new
 label.learning.new.file  =New file details:
 label.learning.new.url  =New URL details:
-label.learning.comment.or.instruction  =Comment/Instruction
 monitoring.tab.summary  =Summary
 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.
@@ -135,7 +123,6 @@
 button.edit  =Edit
 message.no.reflection.available  =No notebook available
 error.reflection.emtpy  =Please input Notebook Entry
-label.authoring.advanced.reflectOnActivity  =Add Notebook at end of Shared Resources with the following instructions:
 title.reflection  =Notebook Entry
 monitoring.user.reflection  =Notebook Entry
 activity.title  =Share Resources
@@ -166,6 +153,19 @@
 message.warnLockOnFinish  =Note: After you click on "Next Activity" and you come back to this Share Resources, you won't be able to share/view resources
 message.activityLocked  =The instructor has set this activity not to allow you to view or share any more resources after you have finished it.
 label.export.reflection  =Notebook Entries
+label.authoring.basic.resource.instructions  =Instructions
+label.authoring.heading.instructions  =Instructions
+label.authoring.heading.instructions.desc  =Please input online and offline instructions
+label.authoring.basic.instruction  =Instruction
+label.authoring.basic.resource.add.instruction  =Add Instruction
+label.authoring.online.instruction  =Online Instructions
+label.authoring.offline.instruction  =Offline Instructions
+error.resource.item.desc.blank  =Comment/Instruction can not be blank
+label.next.instruction  =Next Instruction
+msg.no.instruction  =No instruction available.
+label.learning.comment.or.instruction  =Comment/Instruction
+monitoring.tab.instructions  =Instruction
+label.authoring.advanced.reflectOnActivity  =Add Notebook at end of Shared Resources with the following instructions:
 
 
 #======= End labels: Exported 160 labels for en AU =====
Index: lams_tool_larsrc/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r069f823016a284e4761ba280a4388bf5d27b434d -r31037d3d873f87b6c212f635ed7f6ed3f4216a7b
--- lams_tool_larsrc/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 069f823016a284e4761ba280a4388bf5d27b434d)
+++ lams_tool_larsrc/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 31037d3d873f87b6c212f635ed7f6ed3f4216a7b)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue May 20 12:59:02 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed May 21 09:45:48 BST 2008 
  
 #=================== labels for ShareResources =================# 
 
@@ -16,12 +16,9 @@
 label.authoring.heading  =Share Resources
 label.author.title  =Share Resources Authoring
 label.authoring.heading.basic  =Basic
-label.authoring.heading.instructions  =Instructions
 label.authoring.heading.basic.desc  =Basic input information for shared resources
-label.authoring.heading.instructions.desc  =Please input online and offline instructions
 label.authoring.heading.advance.desc  =Please input advance options for shared resources
 label.authoring.basic.title  =Title
-label.authoring.basic.instruction  =Instruction
 label.authoring.basic.add.url  =Add URL
 label.authoring.basic.add.file  =Add Single File
 label.authoring.basic.resource.list.title  =Resource List
@@ -32,17 +29,12 @@
 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.url.input  =URL
 label.authoring.basic.resource.file.input  =File
 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  =Comment/Instruction can not be blank
 label.authoring.offline.file  =Upload offline file
 label.authoring.choosefile.button  =Choose file
 label.authoring.upload.online.button  =Upload Online
@@ -54,7 +46,6 @@
 label.authoring.advance.mini.number.resources.view  =Minimum number of resources to view
 label.authoring.advance.allow.learner.add.urls  =Allow learners to add URLs
 label.authoring.advance.allow.learner.add.files  =Allow learners to add Files
-label.next.instruction  =Next Instruction
 label.authoring.cancel.button  =Cancel
 label.description  =Description:
 authoring.exception  =There is a problem in shared resources authoring page, the reason is {0}
@@ -71,7 +62,6 @@
 error.msg.io.exception  =IOException occurs when uploading file.
 error.msg.invaid.param.upload  =InvalidParameterException occured 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.
 authoring.msg.cancel.save  =Do you want to close this window without saving?
 label.learning.title  =Share Resource Learning
 label.learning.heading  =Share Resources
@@ -81,10 +71,8 @@
 label.suggest.new  =Suggest a new
 label.learning.new.file  =New file details:
 label.learning.new.url  =New URL details:
-label.learning.comment.or.instruction  =Comment/Instruction
 monitoring.tab.summary  =Summary
 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.
@@ -135,7 +123,6 @@
 button.edit  =Edit
 message.no.reflection.available  =No notebook available
 error.reflection.emtpy  =Please input Notebook Entry
-label.authoring.advanced.reflectOnActivity  =Add Notebook at end of Shared Resources with the following instructions:
 title.reflection  =Notebook Entry
 monitoring.user.reflection  =Notebook Entry
 activity.title  =Share Resources
@@ -166,6 +153,19 @@
 message.warnLockOnFinish  =Note: After you click on "Next Activity" and you come back to this Share Resources, you won't be able to share/view resources
 message.activityLocked  =The instructor has set this activity not to allow you to view or share any more resources after you have finished it.
 label.export.reflection  =Notebook Entries
+label.authoring.basic.resource.instructions  =Instructions
+label.authoring.heading.instructions  =Instructions
+label.authoring.heading.instructions.desc  =Please input online and offline instructions
+label.authoring.basic.instruction  =Instruction
+label.authoring.basic.resource.add.instruction  =Add Instruction
+label.authoring.online.instruction  =Online Instructions
+label.authoring.offline.instruction  =Offline Instructions
+error.resource.item.desc.blank  =Comment/Instruction can not be blank
+label.next.instruction  =Next Instruction
+msg.no.instruction  =No instruction available.
+label.learning.comment.or.instruction  =Comment/Instruction
+monitoring.tab.instructions  =Instruction
+label.authoring.advanced.reflectOnActivity  =Add Notebook at end of Shared Resources with the following instructions:
 
 
 #======= End labels: Exported 160 labels for en AU =====
Index: lams_tool_nb/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r5b5e984bfc38948620dee430607c48366fab5c03 -r31037d3d873f87b6c212f635ed7f6ed3f4216a7b
--- lams_tool_nb/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 5b5e984bfc38948620dee430607c48366fab5c03)
+++ lams_tool_nb/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 31037d3d873f87b6c212f635ed7f6ed3f4216a7b)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri May 09 05:32:47 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed May 21 09:43:34 BST 2008 
  
 #=================== labels for Noticeboard =================# 
 
@@ -13,14 +13,9 @@
 tool.description  =Tool that displays a noticeboard
 label.authoring.heading.basic  =Basic
 label.authoring.heading.advanced  =Advanced
-label.authoring.heading.instructions  =Instructions
 button.upload  =Upload
 basic.title  =Title:
 basic.content  =Content:
-instructions.onlineInstructions  =Online Instructions:
-instructions.offlineInstructions  =Offline Instructions:
-instructions.uploadOnlineInstr  =Online Instructions File:
-instructions.uploadOfflineInstr  =Offline Instructions File:
 instructions.type.online  =Online
 instructions.type.offline  =Offline
 label.filename  =Filename
@@ -34,7 +29,6 @@
 heading.totalLearnersInGroup  =Number of Learners in Group:
 button.edit  =Edit
 titleHeading.summary  =Summary
-titleHeading.instructions  =Instructions
 titleHeading.statistics  =Statistics
 titleHeading.editActivity  =Edit Activity
 heading.group  =Group {0}:
@@ -47,20 +41,26 @@
 error.missingParam  =Unable to continue. {0} is missing.
 error.exceedMaxFileSize  =File size exceeded
 error.exception.NbApplication  =An internal error has occured with the Noticeboard Tool. If reporting this error, please report: <br/> <b>{0}</b>
-error.contentrepository  =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly.
 button.try.again  =Try again
 titleHeading.reflection  =Notebook Entry
 message.no.reflection  =No Notebook Entry has yet been made.
 authoring.msg.cancel.save  =Do you want to close this window without saving?
 message.runOfflineSet  =This activity is not being done on the computer. Please see your instructor for details.
 button.continue  =Continue
-advanced.reflectOnActivity  =Add Notebook at end of Noticeboard with the following instructions:
 errors.maxfilesize  =The uploaded file has exceeded the maximum file size limit of {0} bytes.
 button.finish  =Next Activity
 message.alertContentEdit  =Warning: One of more students have accessed this activity. Changing this content will result in students getting different information.
-message.contentInUseSet  =The modification of content is not allowed since one or more students has attempted the activity.
 titleHeading.reflections  =Notebook Entries
 message.no.reflections  =No notebook entries have yet been made.
+message.contentInUseSet  =Modification of content is not allowed since one or more students has attempted the activity.
+error.contentrepository  =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly.
+titleHeading.instructions  =Instructions
+instructions.uploadOfflineInstr  =Offline Instructions File:
+instructions.uploadOnlineInstr  =Online Instructions File:
+instructions.offlineInstructions  =Offline Instructions:
+instructions.onlineInstructions  =Online Instructions:
+label.authoring.heading.instructions  =Instructions
+advanced.reflectOnActivity  =Add Notebook at end of Noticeboard with the following instructions:
 
 
 #======= End labels: Exported 55 labels for en AU =====
Index: lams_tool_nb/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r5b5e984bfc38948620dee430607c48366fab5c03 -r31037d3d873f87b6c212f635ed7f6ed3f4216a7b
--- lams_tool_nb/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 5b5e984bfc38948620dee430607c48366fab5c03)
+++ lams_tool_nb/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 31037d3d873f87b6c212f635ed7f6ed3f4216a7b)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri May 09 05:32:47 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed May 21 09:43:34 BST 2008 
  
 #=================== labels for Noticeboard =================# 
 
@@ -13,14 +13,9 @@
 tool.description  =Tool that displays a noticeboard
 label.authoring.heading.basic  =Basic
 label.authoring.heading.advanced  =Advanced
-label.authoring.heading.instructions  =Instructions
 button.upload  =Upload
 basic.title  =Title:
 basic.content  =Content:
-instructions.onlineInstructions  =Online Instructions:
-instructions.offlineInstructions  =Offline Instructions:
-instructions.uploadOnlineInstr  =Online Instructions File:
-instructions.uploadOfflineInstr  =Offline Instructions File:
 instructions.type.online  =Online
 instructions.type.offline  =Offline
 label.filename  =Filename
@@ -34,7 +29,6 @@
 heading.totalLearnersInGroup  =Number of Learners in Group:
 button.edit  =Edit
 titleHeading.summary  =Summary
-titleHeading.instructions  =Instructions
 titleHeading.statistics  =Statistics
 titleHeading.editActivity  =Edit Activity
 heading.group  =Group {0}:
@@ -47,20 +41,26 @@
 error.missingParam  =Unable to continue. {0} is missing.
 error.exceedMaxFileSize  =File size exceeded
 error.exception.NbApplication  =An internal error has occured with the Noticeboard Tool. If reporting this error, please report: <br/> <b>{0}</b>
-error.contentrepository  =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly.
 button.try.again  =Try again
 titleHeading.reflection  =Notebook Entry
 message.no.reflection  =No Notebook Entry has yet been made.
 authoring.msg.cancel.save  =Do you want to close this window without saving?
 message.runOfflineSet  =This activity is not being done on the computer. Please see your instructor for details.
 button.continue  =Continue
-advanced.reflectOnActivity  =Add Notebook at end of Noticeboard with the following instructions:
 errors.maxfilesize  =The uploaded file has exceeded the maximum file size limit of {0} bytes.
 button.finish  =Next Activity
 message.alertContentEdit  =Warning: One of more students have accessed this activity. Changing this content will result in students getting different information.
-message.contentInUseSet  =The modification of content is not allowed since one or more students has attempted the activity.
 titleHeading.reflections  =Notebook Entries
 message.no.reflections  =No notebook entries have yet been made.
+message.contentInUseSet  =Modification of content is not allowed since one or more students has attempted the activity.
+error.contentrepository  =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly.
+titleHeading.instructions  =Instructions
+instructions.uploadOfflineInstr  =Offline Instructions File:
+instructions.uploadOnlineInstr  =Online Instructions File:
+instructions.offlineInstructions  =Offline Instructions:
+instructions.onlineInstructions  =Online Instructions:
+label.authoring.heading.instructions  =Instructions
+advanced.reflectOnActivity  =Add Notebook at end of Noticeboard with the following instructions:
 
 
 #======= End labels: Exported 55 labels for en AU =====
Index: lams_tool_notebook/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rb0dcb38987a64f7df435ccf3e2beabe7ac54d8fb -r31037d3d873f87b6c212f635ed7f6ed3f4216a7b
--- lams_tool_notebook/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b0dcb38987a64f7df435ccf3e2beabe7ac54d8fb)
+++ lams_tool_notebook/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 31037d3d873f87b6c212f635ed7f6ed3f4216a7b)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri May 02 07:12:10 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed May 21 09:49:20 BST 2008 
  
 #=================== labels for Notebook =================# 
 
@@ -17,13 +17,8 @@
 button.upload  =Upload
 label.authoring.basic.title  =Title:
 label.authoring.basic.content  =Content:
-label.authoring.basic.instructions  =Instructions:
 advanced.lockOnFinished  =Lock when finished
 advanced.allowRichEditor  =Allow rich text editor
-instructions.onlineInstructions  =Online Instructions:
-instructions.offlineInstructions  =Offline Instructions:
-instructions.uploadOnlineInstr  =Online Instructions File:
-instructions.uploadOfflineInstr  =Offline Instructions File:
 instructions.type.online  =Online
 instructions.type.offline  =Offline
 label.filename  =Filename
@@ -39,11 +34,9 @@
 message.runOfflineSet  =This activity is not being done on the computer. Please see your instructor for details.
 pageTitle.monitoring  =Notebook Monitoring
 button.summary  =Summary
-button.instructions  =Instructions
 button.editActivity  =Edit Activity
 button.statistics  =Statistics
 titleHeading.summary  =Summary
-titleHeading.instructions  =Instructions
 titleHeading.statistics  =Statistics
 titleHeading.editActivity  =Edit Activity
 titleHeading.exportPortfolio  =Export Portfolio
@@ -69,8 +62,6 @@
 error.missingParam  =Unable to continue. {0} is missing.
 error.exceedMaxFileSize  =File size exceeded
 error.exception.NbApplication  =An internal error has occured with the Notebook Tool. If reporting this error, please report: <br/> <b>{0}</b>
-error.contentrepository  =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly.
-error.content.locked  =The content has been locked since it is being used by one or more learners. The modification of the content is not allowed.
 error.defineLater  =Sorry, the activity is not ready yet. Please wait for the teacher to finishing defining the activity.
 errors.maxfilesize  =The uploaded file has exceeded the maximum file size limit of {0} bytes
 error.mandatoryField  ={0} field is mandatory.
@@ -81,9 +72,18 @@
 message.learner.blank.input  =You have not written anything. Are you sure this is correct?
 button.finish  =Next Activity
 message.alertContentEdit  =Warning: One of more students have accessed this activity. Changing this content will result in students getting different information.
-message.contentInUseSet  =The modification of content is not allowed since one or more students has attempted the activity.
-message.warnLockOnFinish = Note: After you click on "Next Activity" and you come back to this Notebook, you won't be able to continue adding notes.
-message.activityLocked = The instructor has set this activity not to allow notes after you have finished it. As you are returning to this Notebook, you are able to see your notes but not allowed to add more.
+message.warnLockOnFinish  =Note: After you click on "Next Activity" and you come back to this Notebook, you won't be able to continue adding notes.
+message.activityLocked  =The instructor has set this activity not to allow notes after you have finished it. As you are returning to this Notebook, you are able to see your notes but not allowed to add more.
+message.contentInUseSet  =Modification of content is not allowed since one or more students has attempted the activity.
+error.content.locked  =The content has been locked since it is being used by one or more learners. The modification of the content is not allowed.
+titleHeading.instructions  =Instructions
+label.authoring.basic.instructions  =Instructions:
+error.contentrepository  =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly.
+button.instructions  =Instructions
+instructions.uploadOfflineInstr  =Offline Instructions File:
+instructions.uploadOnlineInstr  =Online Instructions File:
+instructions.offlineInstructions  =Offline Instructions:
+instructions.onlineInstructions  =Online Instructions:
 
 
-#======= End labels: Exported 76 labels for en AU =====
+#======= End labels: Exported 78 labels for en AU =====
Index: lams_tool_notebook/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r6bcf712b3d8fe651de530f85975fcc536260d76f -r31037d3d873f87b6c212f635ed7f6ed3f4216a7b
--- lams_tool_notebook/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 6bcf712b3d8fe651de530f85975fcc536260d76f)
+++ lams_tool_notebook/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 31037d3d873f87b6c212f635ed7f6ed3f4216a7b)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri May 02 07:12:10 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed May 21 09:49:20 BST 2008 
  
 #=================== labels for Notebook =================# 
 
@@ -17,13 +17,8 @@
 button.upload  =Upload
 label.authoring.basic.title  =Title:
 label.authoring.basic.content  =Content:
-label.authoring.basic.instructions  =Instructions:
 advanced.lockOnFinished  =Lock when finished
 advanced.allowRichEditor  =Allow rich text editor
-instructions.onlineInstructions  =Online Instructions:
-instructions.offlineInstructions  =Offline Instructions:
-instructions.uploadOnlineInstr  =Online Instructions File:
-instructions.uploadOfflineInstr  =Offline Instructions File:
 instructions.type.online  =Online
 instructions.type.offline  =Offline
 label.filename  =Filename
@@ -39,11 +34,9 @@
 message.runOfflineSet  =This activity is not being done on the computer. Please see your instructor for details.
 pageTitle.monitoring  =Notebook Monitoring
 button.summary  =Summary
-button.instructions  =Instructions
 button.editActivity  =Edit Activity
 button.statistics  =Statistics
 titleHeading.summary  =Summary
-titleHeading.instructions  =Instructions
 titleHeading.statistics  =Statistics
 titleHeading.editActivity  =Edit Activity
 titleHeading.exportPortfolio  =Export Portfolio
@@ -69,8 +62,6 @@
 error.missingParam  =Unable to continue. {0} is missing.
 error.exceedMaxFileSize  =File size exceeded
 error.exception.NbApplication  =An internal error has occured with the Notebook Tool. If reporting this error, please report: <br/> <b>{0}</b>
-error.contentrepository  =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly.
-error.content.locked  =The content has been locked since it is being used by one or more learners. The modification of the content is not allowed.
 error.defineLater  =Sorry, the activity is not ready yet. Please wait for the teacher to finishing defining the activity.
 errors.maxfilesize  =The uploaded file has exceeded the maximum file size limit of {0} bytes
 error.mandatoryField  ={0} field is mandatory.
@@ -81,7 +72,18 @@
 message.learner.blank.input  =You have not written anything. Are you sure this is correct?
 button.finish  =Next Activity
 message.alertContentEdit  =Warning: One of more students have accessed this activity. Changing this content will result in students getting different information.
-message.contentInUseSet  =The modification of content is not allowed since one or more students has attempted the activity.
+message.warnLockOnFinish  =Note: After you click on "Next Activity" and you come back to this Notebook, you won't be able to continue adding notes.
+message.activityLocked  =The instructor has set this activity not to allow notes after you have finished it. As you are returning to this Notebook, you are able to see your notes but not allowed to add more.
+message.contentInUseSet  =Modification of content is not allowed since one or more students has attempted the activity.
+error.content.locked  =The content has been locked since it is being used by one or more learners. The modification of the content is not allowed.
+titleHeading.instructions  =Instructions
+label.authoring.basic.instructions  =Instructions:
+error.contentrepository  =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly.
+button.instructions  =Instructions
+instructions.uploadOfflineInstr  =Offline Instructions File:
+instructions.uploadOnlineInstr  =Online Instructions File:
+instructions.offlineInstructions  =Offline Instructions:
+instructions.onlineInstructions  =Online Instructions:
 
 
-#======= End labels: Exported 76 labels for en AU =====
+#======= End labels: Exported 78 labels for en AU =====
Index: lams_tool_scribe/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rae03325d706cf732c5e55bfd96af04195c4e1e46 -r31037d3d873f87b6c212f635ed7f6ed3f4216a7b
--- lams_tool_scribe/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ae03325d706cf732c5e55bfd96af04195c4e1e46)
+++ lams_tool_scribe/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 31037d3d873f87b6c212f635ed7f6ed3f4216a7b)
@@ -2,14 +2,13 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri May 09 05:53:25 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed May 21 09:50:25 BST 2008 
  
 #=================== labels for Scribe =================# 
 
 message.confirmForceComplete  =Are you sure you want to Force Complete?
 pageTitle.monitoring.notebook  =Notebook Entry
 heading.reflection  =Notebook Entry
-advanced.reflectOnActivity  =Add Notebook at end of Scribe with the following instructions:
 button.submit  =Add
 label.authoring.basic.heading.add  =Create Heading
 message.scribeInstructions  =You, {0} are the scribe for your group. In this window you need to summarise your group''s responses to the headings based on the discussion. The members of your group will click agree when they agree with your report. When everyone (including you) agrees, click Force Complete to continue.<P>If the whole group cannot agree on the report, then you can force the activity to end by clicking "Force Complete".
@@ -29,8 +28,6 @@
 error.missingParam  =Unable to continue. {0} is missing.
 error.exceedMaxFileSize  =File size exceeded
 error.exception.NbApplication  =An internal error has occured with the Scribe Tool. If reporting this error, please report: <br/> <b>{0}</b>
-error.contentrepository  =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly.
-error.content.locked  =The content has been locked since it is being used by one or more learners. The modification of the content is not allowed.
 error.defineLater  =Sorry, the activity is not ready yet. Please wait for the teacher to finishing defining the activity.
 errors.maxfilesize  =The uploaded file has exceeded the maximum file size limit of {0} bytes
 error.mandatoryField  ={0} field is mandatory.
@@ -61,20 +58,14 @@
 pageTitle.authoring  =Scribe Authoring
 button.basic  =Basic
 button.advanced  =Advanced
-button.instructions  =Instructions
 button.upload  =Upload
 label.authoring.basic.title  =Title:
 label.authoring.basic.content  =Content:
-label.authoring.basic.instructions  =Instructions:
 label.authoring.basic.heading  =Headings
 advanced.lockOnFinished  =Lock when finished
 advanced.selectScribe  =Select Scribe
 advanced.firstLearner  =First Learner
 advanced.selectInMonitor  =Select in Monitor
-instructions.onlineInstructions  =Online Instructions:
-instructions.offlineInstructions  =Offline Instructions:
-instructions.uploadOnlineInstr  =Online Instructions File:
-instructions.uploadOfflineInstr  =Offline Instructions File:
 instructions.type.online  =Online
 instructions.type.offline  =Offline
 label.filename  =Filename
@@ -93,7 +84,6 @@
 button.editActivity  =Edit Activity
 button.statistics  =Statistics
 titleHeading.summary  =Summary
-titleHeading.instructions  =Instructions
 titleHeading.statistics  =Statistics
 titleHeading.editActivity  =Edit Activity
 titleHeading.exportPortfolio  =Export Portfolio
@@ -105,8 +95,18 @@
 heading.other.group.reports  =Other Groups
 message.runOfflineSet  =This activity is not being done on the computer. Please see your instructor for details.
 button.finish  =Next Activity
-message.contentInUseSet  =The modification of content is not allowed since one or more students has attempted the activity.
 heading.reflections  =Notebook entries
+message.contentInUseSet  =Modification of content is not allowed since one or more students has attempted the activity.
+error.content.locked  =The content has been locked since it is being used by one or more learners. The modification of the content is not allowed.
+instructions.uploadOnlineInstr  =Online Instructions File:
+instructions.offlineInstructions  =Offline Instructions:
+instructions.onlineInstructions  =Online Instructions:
+label.authoring.basic.instructions  =Instructions:
+titleHeading.instructions  =Instructions
+button.instructions  =Instructions
+error.contentrepository  =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly.
+advanced.reflectOnActivity  =Add Notebook at end of Scribe with the following instructions:
+instructions.uploadOfflineInstr  =Offline Instructions File:
 
 
 #======= End labels: Exported 101 labels for en AU =====
Index: lams_tool_scribe/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rae03325d706cf732c5e55bfd96af04195c4e1e46 -r31037d3d873f87b6c212f635ed7f6ed3f4216a7b
--- lams_tool_scribe/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision ae03325d706cf732c5e55bfd96af04195c4e1e46)
+++ lams_tool_scribe/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 31037d3d873f87b6c212f635ed7f6ed3f4216a7b)
@@ -2,14 +2,13 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri May 09 05:53:25 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed May 21 09:50:25 BST 2008 
  
 #=================== labels for Scribe =================# 
 
 message.confirmForceComplete  =Are you sure you want to Force Complete?
 pageTitle.monitoring.notebook  =Notebook Entry
 heading.reflection  =Notebook Entry
-advanced.reflectOnActivity  =Add Notebook at end of Scribe with the following instructions:
 button.submit  =Add
 label.authoring.basic.heading.add  =Create Heading
 message.scribeInstructions  =You, {0} are the scribe for your group. In this window you need to summarise your group''s responses to the headings based on the discussion. The members of your group will click agree when they agree with your report. When everyone (including you) agrees, click Force Complete to continue.<P>If the whole group cannot agree on the report, then you can force the activity to end by clicking "Force Complete".
@@ -29,8 +28,6 @@
 error.missingParam  =Unable to continue. {0} is missing.
 error.exceedMaxFileSize  =File size exceeded
 error.exception.NbApplication  =An internal error has occured with the Scribe Tool. If reporting this error, please report: <br/> <b>{0}</b>
-error.contentrepository  =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly.
-error.content.locked  =The content has been locked since it is being used by one or more learners. The modification of the content is not allowed.
 error.defineLater  =Sorry, the activity is not ready yet. Please wait for the teacher to finishing defining the activity.
 errors.maxfilesize  =The uploaded file has exceeded the maximum file size limit of {0} bytes
 error.mandatoryField  ={0} field is mandatory.
@@ -61,20 +58,14 @@
 pageTitle.authoring  =Scribe Authoring
 button.basic  =Basic
 button.advanced  =Advanced
-button.instructions  =Instructions
 button.upload  =Upload
 label.authoring.basic.title  =Title:
 label.authoring.basic.content  =Content:
-label.authoring.basic.instructions  =Instructions:
 label.authoring.basic.heading  =Headings
 advanced.lockOnFinished  =Lock when finished
 advanced.selectScribe  =Select Scribe
 advanced.firstLearner  =First Learner
 advanced.selectInMonitor  =Select in Monitor
-instructions.onlineInstructions  =Online Instructions:
-instructions.offlineInstructions  =Offline Instructions:
-instructions.uploadOnlineInstr  =Online Instructions File:
-instructions.uploadOfflineInstr  =Offline Instructions File:
 instructions.type.online  =Online
 instructions.type.offline  =Offline
 label.filename  =Filename
@@ -93,7 +84,6 @@
 button.editActivity  =Edit Activity
 button.statistics  =Statistics
 titleHeading.summary  =Summary
-titleHeading.instructions  =Instructions
 titleHeading.statistics  =Statistics
 titleHeading.editActivity  =Edit Activity
 titleHeading.exportPortfolio  =Export Portfolio
@@ -105,8 +95,18 @@
 heading.other.group.reports  =Other Groups
 message.runOfflineSet  =This activity is not being done on the computer. Please see your instructor for details.
 button.finish  =Next Activity
-message.contentInUseSet  =The modification of content is not allowed since one or more students has attempted the activity.
 heading.reflections  =Notebook entries
+message.contentInUseSet  =Modification of content is not allowed since one or more students has attempted the activity.
+error.content.locked  =The content has been locked since it is being used by one or more learners. The modification of the content is not allowed.
+instructions.uploadOnlineInstr  =Online Instructions File:
+instructions.offlineInstructions  =Offline Instructions:
+instructions.onlineInstructions  =Online Instructions:
+label.authoring.basic.instructions  =Instructions:
+titleHeading.instructions  =Instructions
+button.instructions  =Instructions
+error.contentrepository  =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly.
+advanced.reflectOnActivity  =Add Notebook at end of Scribe with the following instructions:
+instructions.uploadOfflineInstr  =Offline Instructions File:
 
 
 #======= End labels: Exported 101 labels for en AU =====
Index: lams_tool_survey/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r6803809d4d0e2a5d4b4d1dc11ad5152e5cb6bb0b -r31037d3d873f87b6c212f635ed7f6ed3f4216a7b
--- lams_tool_survey/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6803809d4d0e2a5d4b4d1dc11ad5152e5cb6bb0b)
+++ lams_tool_survey/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 31037d3d873f87b6c212f635ed7f6ed3f4216a7b)
@@ -2,15 +2,14 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon May 12 03:43:09 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed May 21 09:49:49 BST 2008 
  
 #=================== labels for Survey =================# 
 
 page.title.monitoring.view.reflection  =View Notebook Entries
 title.reflection  =Notebook Entry
 error.reflection.emtpy  =Please input Notebook Entry
 label.authoring.basic.add.survey.open.question  =Add free text
-label.authoring.advanced.reflectOnActivity  =Add Notebook at end of Survey with the following instructions:
 monitoring.user.reflection  =Notebook Entry
 message.not.available  =Not Available
 message.possible.answers  =Possible answers
@@ -42,14 +41,12 @@
 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.
 error.mandatory.question  =Mandatory question, please give answer.
-msg.no.instruction  =No instruction available.
 authoring.msg.cancel.save  =Do you want to close this window without saving?
 label.learning.title  =Survey Learning
 label.learning.heading  =Survey
 label.resoruce.to.review  =Survey to view
 monitoring.tab.summary  =Summary
 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 survey.
@@ -102,12 +99,9 @@
 label.author.title  =Survey Authoring
 label.authoring.heading.basic  =Basic
 label.authoring.heading.advance  =Advanced
-label.authoring.heading.instructions  =Instructions
 label.authoring.heading.basic.desc  =Basic input information for survey
-label.authoring.heading.instructions.desc  =Please input online and offline instructions
 label.authoring.heading.advance.desc  =Please input advance options for survey
 label.authoring.basic.title  =Title
-label.authoring.basic.instruction  =Instruction
 label.question  =Question
 label.optional  =Optional
 label.authoring.basic.add.survey.question  =Add question
@@ -121,8 +115,6 @@
 label.authoring.basic.survey.edit  =Edit
 label.authoring.basic.survey.delete  =Delete
 label.authoring.basic.survey.title.input  =Title
-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.choosefile.button  =Choose file
@@ -154,6 +146,14 @@
 label.monitoring.instructions.attachments  =Attachments
 message.warnLockOnFinish  =Note: After you click on "Next Activity" and you come back to this Survey, you won't be able to change your answers.
 message.activityLocked  == The instructor has set this activity not to allow you to retake the survey after you have finished it. As you are returning to this activity, you are able to see your answers but not allowed to change them.
-label.export.reflection = Notebook Entries
+msg.no.instruction  =No instruction available.
+monitoring.tab.instructions  =Instruction
+label.authoring.heading.instructions  =Instructions
+label.authoring.heading.instructions.desc  =Please input online and offline instructions
+label.authoring.basic.instruction  =Instruction
+label.authoring.online.instruction  =Online Instructions
+label.authoring.offline.instruction  =Offline Instructions
+label.authoring.advanced.reflectOnActivity  =Add Notebook at end of Survey with the following instructions:
 
+
 #======= End labels: Exported 148 labels for en AU =====
Index: lams_tool_survey/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r8749316b7e0c9b77395a69962852be25e120285e -r31037d3d873f87b6c212f635ed7f6ed3f4216a7b
--- lams_tool_survey/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 8749316b7e0c9b77395a69962852be25e120285e)
+++ lams_tool_survey/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 31037d3d873f87b6c212f635ed7f6ed3f4216a7b)
@@ -2,15 +2,14 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon May 12 03:43:09 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed May 21 09:49:49 BST 2008 
  
 #=================== labels for Survey =================# 
 
 page.title.monitoring.view.reflection  =View Notebook Entries
 title.reflection  =Notebook Entry
 error.reflection.emtpy  =Please input Notebook Entry
 label.authoring.basic.add.survey.open.question  =Add free text
-label.authoring.advanced.reflectOnActivity  =Add Notebook at end of Survey with the following instructions:
 monitoring.user.reflection  =Notebook Entry
 message.not.available  =Not Available
 message.possible.answers  =Possible answers
@@ -42,14 +41,12 @@
 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.
 error.mandatory.question  =Mandatory question, please give answer.
-msg.no.instruction  =No instruction available.
 authoring.msg.cancel.save  =Do you want to close this window without saving?
 label.learning.title  =Survey Learning
 label.learning.heading  =Survey
 label.resoruce.to.review  =Survey to view
 monitoring.tab.summary  =Summary
 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 survey.
@@ -102,12 +99,9 @@
 label.author.title  =Survey Authoring
 label.authoring.heading.basic  =Basic
 label.authoring.heading.advance  =Advanced
-label.authoring.heading.instructions  =Instructions
 label.authoring.heading.basic.desc  =Basic input information for survey
-label.authoring.heading.instructions.desc  =Please input online and offline instructions
 label.authoring.heading.advance.desc  =Please input advance options for survey
 label.authoring.basic.title  =Title
-label.authoring.basic.instruction  =Instruction
 label.question  =Question
 label.optional  =Optional
 label.authoring.basic.add.survey.question  =Add question
@@ -121,8 +115,6 @@
 label.authoring.basic.survey.edit  =Edit
 label.authoring.basic.survey.delete  =Delete
 label.authoring.basic.survey.title.input  =Title
-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.choosefile.button  =Choose file
@@ -154,6 +146,14 @@
 label.monitoring.instructions.attachments  =Attachments
 message.warnLockOnFinish  =Note: After you click on "Next Activity" and you come back to this Survey, you won't be able to change your answers.
 message.activityLocked  == The instructor has set this activity not to allow you to retake the survey after you have finished it. As you are returning to this activity, you are able to see your answers but not allowed to change them.
+msg.no.instruction  =No instruction available.
+monitoring.tab.instructions  =Instruction
+label.authoring.heading.instructions  =Instructions
+label.authoring.heading.instructions.desc  =Please input online and offline instructions
+label.authoring.basic.instruction  =Instruction
+label.authoring.online.instruction  =Online Instructions
+label.authoring.offline.instruction  =Offline Instructions
+label.authoring.advanced.reflectOnActivity  =Add Notebook at end of Survey with the following instructions:
 
 
 #======= End labels: Exported 148 labels for en AU =====
Index: lams_tool_vote/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r45e33638e0f473eb10846b0bd45665adde09edaa -r31037d3d873f87b6c212f635ed7f6ed3f4216a7b
--- lams_tool_vote/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 45e33638e0f473eb10846b0bd45665adde09edaa)
+++ lams_tool_vote/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 31037d3d873f87b6c212f635ed7f6ed3f4216a7b)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon May 19 06:34:32 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed May 21 09:48:45 BST 2008 
  
 #=================== labels for Voting =================# 
 
@@ -14,7 +14,6 @@
 label.vote.lockedOnFinish  =Lock when finished
 label.add.new.nomination  =Create Nomination
 label.save.nomination  =Add
-label.reflect  =Add Notebook at end of Voting with the following instructions:
 label.notebook.entries  =Notebook Entries
 label.reflection  =Notebook Entry
 appName  =voting
@@ -27,7 +26,6 @@
 label.authoring.vote  =Voting
 label.basic  =Basic
 label.advanced  =Advanced
-label.instructions  =Instructions
 label.summary  =Summary
 label.stats  =Stats
 label.editActivity  =Edit Activity
@@ -43,7 +41,6 @@
 label.vote.nominations  =Nominations
 label.nomination  =Nomination
 label.authoring.title  =Title
-label.authoring.instructions  =Instructions
 label.moveDown  =Down
 label.other  =Other
 label.view.chart  =View Votes Chart
@@ -58,16 +55,11 @@
 button.upload  =Upload
 button.preview  =Preview
 button.advanced  =Advanced
-button.instructions  =Instructions
 button.add  =Add
 button.remove  =Delete
 button.submit  =Submit
 sbmt.successful  =The content has been created successfully.
 label.nomination1  =Nomination 1
-label.offlineInstructions  =Offline Instructions
-label.offlineInstructions.col  =Offline Instructions:
-label.onlineInstructions  =Online Instructions
-label.onlineInstructions.col  =Online Instructions:
 label.offlineFiles  =Offline Files:
 label.onlineFiles  =Online Files:
 label.uploadedOfflineFiles  =Uploaded Offline Files:
@@ -76,8 +68,6 @@
 label.cancel  =Cancel
 label.title.export  =Learner Submission Details
 error.maxNominationCount.invalid  =Please correct this: The "Max Nominations" field in Advanced section is invalid.
-error.fileName.empty  =Please correct this: Under "Instructions", the file(name) to upload can not be empty.
-error.content.inUse  =The modification of the content is not allowed since it is being used.
 error.noLearnerActivity  =The report is not available since no users attempted the activity yet.
 label.learning.reportMessage  =The following are your votes.
 error.maxNominationCount.reached  =You have selected too many nominations. You can only select
@@ -122,7 +112,6 @@
 label.groupName  =Group Name:
 label.learnersVoted  =Learners Voted
 label.authoring.title.col  =Title:
-label.authoring.instructions.col  =Instructions:
 label.nomination.col  =Nomination:
 authoring.msg.cancel.save  =Do you want to close this window without saving?
 button.try.again  =Try again
@@ -155,6 +144,17 @@
 label.attachments  =Attachments
 label.nominations.available  =You have {0} vote(s), please choose your option(s)
 label.open.votes  =Other text entries:
+error.content.inUse  =Modification of the content is not allowed since it is being used.
+label.authoring.instructions.col  =Instructions:
+label.reflect  =Add Notebook at end of Voting with the following instructions:
+error.fileName.empty  =Please correct this: Under "Instructions", the file(name) to upload can not be empty.
+label.onlineInstructions.col  =Online Instructions:
+label.onlineInstructions  =Online Instructions
+label.offlineInstructions.col  =Offline Instructions:
+label.offlineInstructions  =Offline Instructions
+button.instructions  =Instructions
+label.authoring.instructions  =Instructions
+label.instructions  =Instructions
 
 
 #======= End labels: Exported 149 labels for en AU =====
Index: lams_tool_vote/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r45e33638e0f473eb10846b0bd45665adde09edaa -r31037d3d873f87b6c212f635ed7f6ed3f4216a7b
--- lams_tool_vote/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 45e33638e0f473eb10846b0bd45665adde09edaa)
+++ lams_tool_vote/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 31037d3d873f87b6c212f635ed7f6ed3f4216a7b)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon May 19 06:34:32 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed May 21 09:48:45 BST 2008 
  
 #=================== labels for Voting =================# 
 
@@ -14,7 +14,6 @@
 label.vote.lockedOnFinish  =Lock when finished
 label.add.new.nomination  =Create Nomination
 label.save.nomination  =Add
-label.reflect  =Add Notebook at end of Voting with the following instructions:
 label.notebook.entries  =Notebook Entries
 label.reflection  =Notebook Entry
 appName  =voting
@@ -27,7 +26,6 @@
 label.authoring.vote  =Voting
 label.basic  =Basic
 label.advanced  =Advanced
-label.instructions  =Instructions
 label.summary  =Summary
 label.stats  =Stats
 label.editActivity  =Edit Activity
@@ -43,7 +41,6 @@
 label.vote.nominations  =Nominations
 label.nomination  =Nomination
 label.authoring.title  =Title
-label.authoring.instructions  =Instructions
 label.moveDown  =Down
 label.other  =Other
 label.view.chart  =View Votes Chart
@@ -58,16 +55,11 @@
 button.upload  =Upload
 button.preview  =Preview
 button.advanced  =Advanced
-button.instructions  =Instructions
 button.add  =Add
 button.remove  =Delete
 button.submit  =Submit
 sbmt.successful  =The content has been created successfully.
 label.nomination1  =Nomination 1
-label.offlineInstructions  =Offline Instructions
-label.offlineInstructions.col  =Offline Instructions:
-label.onlineInstructions  =Online Instructions
-label.onlineInstructions.col  =Online Instructions:
 label.offlineFiles  =Offline Files:
 label.onlineFiles  =Online Files:
 label.uploadedOfflineFiles  =Uploaded Offline Files:
@@ -76,8 +68,6 @@
 label.cancel  =Cancel
 label.title.export  =Learner Submission Details
 error.maxNominationCount.invalid  =Please correct this: The "Max Nominations" field in Advanced section is invalid.
-error.fileName.empty  =Please correct this: Under "Instructions", the file(name) to upload can not be empty.
-error.content.inUse  =The modification of the content is not allowed since it is being used.
 error.noLearnerActivity  =The report is not available since no users attempted the activity yet.
 label.learning.reportMessage  =The following are your votes.
 error.maxNominationCount.reached  =You have selected too many nominations. You can only select
@@ -122,7 +112,6 @@
 label.groupName  =Group Name:
 label.learnersVoted  =Learners Voted
 label.authoring.title.col  =Title:
-label.authoring.instructions.col  =Instructions:
 label.nomination.col  =Nomination:
 authoring.msg.cancel.save  =Do you want to close this window without saving?
 button.try.again  =Try again
@@ -155,6 +144,17 @@
 label.attachments  =Attachments
 label.nominations.available  =You have {0} vote(s), please choose your option(s)
 label.open.votes  =Other text entries:
+error.content.inUse  =Modification of the content is not allowed since it is being used.
+label.authoring.instructions.col  =Instructions:
+label.reflect  =Add Notebook at end of Voting with the following instructions:
+error.fileName.empty  =Please correct this: Under "Instructions", the file(name) to upload can not be empty.
+label.onlineInstructions.col  =Online Instructions:
+label.onlineInstructions  =Online Instructions
+label.offlineInstructions.col  =Offline Instructions:
+label.offlineInstructions  =Offline Instructions
+button.instructions  =Instructions
+label.authoring.instructions  =Instructions
+label.instructions  =Instructions
 
 
 #======= End labels: Exported 149 labels for en AU =====