Index: lams_tool_wiki/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r73ac6bcdf2a88c63b7e483b6636eec3c173d471d -r0ed9d80cb0ce1c83b572bb29001157724dbe30bc
--- lams_tool_wiki/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 73ac6bcdf2a88c63b7e483b6636eec3c173d471d)
+++ lams_tool_wiki/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 0ed9d80cb0ce1c83b572bb29001157724dbe30bc)
@@ -2,11 +2,10 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Sun Jul 05 07:20:41 CST 2009 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Dec 29 05:49:37 CST 2011 
  
 #=================== labels for Wiki =================# 
 
-label.authoring.basic.wikipagevisible  =Allow editing of this page
 appName  =wiki
 error.contentrepository  =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly.
 button.instructions  =Instructions
@@ -15,6 +14,7 @@
 instructions.offlineInstructions  =Offline Instructions:
 instructions.onlineInstructions  =Online Instructions:
 activity.helptext  =Wiki tool for creating wiki pages
+message.contentInUseSet  =Modification of content is not allowed since one or more learners 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.
 tool.display.name  =Wiki
 tool.description  =Wiki Tool
@@ -28,6 +28,7 @@
 button.edit  =Edit
 label.authoring.basic.title  =Title:
 label.authoring.basic.content  =Content:
+label.authoring.basic.wikipagevisible  =Allow editing of this page
 advanced.lockOnFinished  =Lock when finished
 advanced.allowLearnerCreatePages  =Allow learners to create new Wiki pages
 advanced.allowLearnerInsertLinks  =Allow learners to insert external links into Wiki
@@ -93,6 +94,7 @@
 button.try.again  =Try Again
 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 learners have accessed this activity. Changing this content will result in learners getting different information.
 message.warnLockOnFinish  =Note: After you click on "Next Activity" and you come back to this Wiki, you won't be able to continue editing.
 message.activityLocked  =The instructor has set this activity not to allow editing after you have finished it. As you are returning to this Wiki, you are able to see your Wiki but not allowed to edit it.
 message.minumumEditsNotReached  =Note: You have not yet reached the required number of edits, you must complete {0} edits before continuing to the next activity.
@@ -115,9 +117,9 @@
 label.wiki.view.toolTip  =View this Wiki page
 label.wiki.remove  =Remove
 label.wiki.remove.toolTip  =Remove this Wiki page
+label.wiki.remove.confirm  =Are you sure you want to delete this Wiki page? This action cannot be undone.
 label.wiki.pages  =Wiki Pages
 label.wiki.savechanges  =Save changes
-label.wiki.remove.confirm  =Are you sure you want to delete this Wiki page? This action cannot be undone.
 label.wiki.history  =History
 label.wiki.history.toolTip  =View previous versions of this Wiki page
 label.wiki.history.version  =Version
@@ -146,17 +148,15 @@
 monitor.notebooks  =Notebook Reflections
 output.learner.number.of.edits  =Number of page edits
 output.learner.number.of.add  =Number of pages added
-notify.pageEdited.subject  =LAMS Wiki page has been edited for {0}.
-notify.pageAdded.subject  =LAMS Wiki page has been added for {0}.
-notify.pageRemoved.subject  =LAMS Wiki page has been removed for {0}.
+notify.pageEdited.subject  =LAMS Wiki page has been edited by {0}.
+notify.pageAdded.subject  =LAMS Wiki page has been added by {0}.
+notify.pageRemoved.subject  =LAMS Wiki page has been removed by {0}.
 notify.pageEdited.body  =A Wiki page has been edited by {0} for {1}. To see the page, go to {2}
 notify.pageAdded.body  =A Wiki page has been added by {0} for {1}. To see the page, go to {2}
 notify.pageRemoved.body  =A Wiki page has been removed by {0} for {1}. To see the Wiki, go to {2}
 notify.learner.subscribe  =Subscribe
 notify.learner.unsubscribe  =Unsubscribe
 notify.learner.query  ={0} to notifications by email each time the Wiki is edited.
-message.contentInUseSet  =Modification of content is not allowed since one or more learners has attempted the activity.
-message.alertContentEdit  =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information.
 
 
 #======= End labels: Exported 151 labels for en AU =====