Index: lams_tool_wiki/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r4409f4bd1640395d7eacbf1681be39628304d815 -ra667bc67b8391230b6513ef16898cbf15247ddd6
--- lams_tool_wiki/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4409f4bd1640395d7eacbf1681be39628304d815)
+++ lams_tool_wiki/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a667bc67b8391230b6513ef16898cbf15247ddd6)
@@ -1,112 +1,146 @@
-appName = Spreadsheet
-activity.description = Spreadsheet
-activity.helptext = Spreadsheet tool
-tool.display.name = Spreadsheet tool
-tool.description = Tool for displaying spreadsheets.
-label.authoring.heading = Spreadsheet Authoring
-label.authoring.title = Spreadsheet
-label.authoring.heading.basic = Basic
-label.authoring.heading.basic.desc = Basic input information for spreadsheet
-label.authoring.heading.advance.desc = Please input advance options for spreadsheet
-label.authoring.basic.resource.instructions = Instructions
-label.authoring.basic.instruction = Instruction
-label.authoring.basic.resource.add.instruction = Add instruction
-label.authoring.basic.title = Title
-label.authoring.basic.spreadsheet = Spreadsheet
-label.authoring.advanced.reflectOnActivity = Add a notebook at end of Spreadsheet with the following instructions:
-label.authoring.advanced.play.only = Play only (learner can only play with the spreadsheet but cannot save)
-label.authoring.advanced.learners.are.allowed.to.save = Learners are allowed to submit individual spreadsheets
-label.authoring.advanced.enable.spreadsheet.marking = Enable spreadsheet marking
-label.authoring.cancel.button = Cancel
-label.learning.title = Spreadsheet Learning
-label.learning.comments = Comments
-label.learning.marks = Marks
-label.learning.not.available = Not available
-label.monitoring.summary.advanced.settings = Advanced settings
-label.monitoring.summary.learner = Learner
-label.monitoring.summary.marked = Marked?
-label.monitoring.summary.lock.when.finished = Lock when finished
-label.monitoring.summary.individual.spreadsheets = Learners are allowed to submit individual spreadsheets
-label.monitoring.summary.marking.enabled = Spreadsheet marking is enabled
-label.monitoring.summary.notebook.reflection = Notebook reflection
-label.monitoring.summary.overall.summary = Summary
-label.monitoring.summary.title.reflection = Notebook entry
-label.monitoring.summary.reflection = Notebook entry
-label.monitoring.summary.mark.button = Mark
-label.monitoring.summary.user = Learner
-label.monitoring.summary.viewAllMarks.button = View all marks
-label.monitoring.summary.releaseMarks.button = Release marks
-label.monitoring.summary.downloadMarks.button = Download marks
-label.monitoring.summary.marking.marking = Marking
-label.monitoring.summary.marking.marks = Marks
-label.monitoring.summary.marking.comments = Comments
-label.monitoring.summary.marking.update.marks = Update marks
-label.monitoring.edit.activity.edit = Edit
-label.monitoring.statistics.session.name = Session name
-label.monitoring.statistics.marked = Marked spreadsheets
-label.monitoring.statistics.not.marked = Not marked spreadsheets
-label.monitoring.statistics.total.spreadsheets.sent.by.learners = Total spreadsheets sent by learners
-label.monitoring.downloadmarks.learner.name = Name
-label.monitoring.downloadmarks.marks = Marks
-label.monitoring.downloadmarks.comments = Comments
-label.monitoring.vieawallmarks.heading.marking = Marking
-label.monitoring.vieawallmarks.learner = Learner:
-label.monitoring.vieawallmarks.spreadsheet.submitted = Spreadsheet submitted
-label.monitoring.vieawallmarks.true = True
-label.monitoring.vieawallmarks.false = False
-label.monitoring.vieawallmarks.marks = Marks:
-label.monitoring.vieawallmarks.comments = Comments:
-label.monitoring.vieawallmarks.update.marks = Update marks
-label.reviewitem.spreadsheet.sent.by = Spreadsheet sent by
-label.reviewitem.user.hasnot.sent.spreadsheet = User hasn't sent spreadsheet yet.
-label.reviewitem.title = Review learners' Spreadsheet
-label.export.marking.enabled = Spreadsheet marking is enabled
-label.export.notebook.reflection.enabled = Notebook reflection is enabled
-error.summary.marks.blank = Marks can not be blank.
-error.summary.marks.invalid.number = Mark is in invalid number format.
-error.summary.comments.blank = Comments can not be blank.
-error.upload.failed = Upload file failed: {0}
-error.msg.default.content.not.find = Could not retrieve default content record for this tool.
-authoring.msg.cancel.save = Do you want to close this window without saving?
-monitoring.tab.summary = Summary
-monitoring.tab.statistics = Statistics
-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 spreadsheet.
-label.delete = Delete
-label.view = View
-label.edit = Edit
-message.monitoring.summary.no.session = No session available
-label.save = Save
-label.cancel = Cancel
-define.later.message = Please wait for the instructor to complete the contents of this activity.
-button.try.again = Try again
-page.title.monitoring.view.reflection = Notebook entries
+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.
+tool.display.name = Wiki
+tool.description = Wiki tool
+activity.title = Wiki
+activity.description = Wiki tool
+pageTitle.authoring = Wiki Authoring
+button.basic = Basic
+button.advanced = Advanced
+button.continue = Continue
+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
+advanced.allowLearnerAttachImages = Allow learners to attach images to Wiki
+advanced.notifyChange = Send email notification to monitors when wiki pages are changed/edited.
+advanced.reflectOnActivity = Add a notebook at end of Wiki with the following instructions:
 message.no.reflection.available = No notebook available
-title.reflection = Notebook entry
-activity.title = Spreadsheet
-label.authoring.save.button = Save
-label.authoring.advance.lock.on.finished = Lock when finished
-label.authoring.heading.advance = Advanced
-label.up = Up
-label.down = Down
-label.continue = Continue
+advanced.editingLimits = Editing limits
+advanced.editingLimits.prompt = Number of times a learner can edit a page
+advanced.editingLimits.minimum = Minimum:
+advanced.editingLimits.maximum = Maximum:
+advanced.editingLimits.nominimum = No minimum
+advanced.editingLimits.nomaximum = No maximum
+advanced.editingLimits.error = Maximum edits must be larger or equal to minimum.
+message.updateSuccess = Changes saved
+pageTitle.learning = Wiki
+message.defineLaterSet = Please wait for the instructor to complete the contents of this activity
+pageTitle.monitoring = Wiki Monitoring
+button.summary = Summary
+button.editActivity = Edit activity
+button.statistics = Statistics
+titleHeading.summary = Summary
+titleHeading.statistics = Statistics
+titleHeading.editActivity = Edit activity
+heading.totalLearners = Number of learners:
+heading.totalLearnersInGroup = Total number of learners in group:
+heading.totalFinishedLearnersInGroup = Number of finished learners:
+message.summary = There is no summary available for this tool.
+label.view = View
+label.notAvailable = Not available
+heading.learner = Learner
+heading.notebookEntry = Notebook entry
+button.cancel = Cancel
 button.close = Close
-label.finished = Next Activity
-label.finish = Finished
-error.msg.repository = A repository error occurred while trying to upload the file.
+button.ok = OK
+button.done = Done
+button.save = Save
+button.next = Next
+label.created = Created
+label.lastModified = Last modified
+label.notebookEntry = Notebook entry
+authoring.msg.cancel.save = Do you want to close this window without saving?
+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.activityLocked = The instructor has set this activity not to allow you to change spreadsheet after you have finished it.
-msg.mark.released = Marks in {0} have been released.
-label.export.reflection = Notebook entries
-message.warnLockOnFinish = Note: After you click on "Next Activity", if you come back to this Spreadsheet, you won’t be able to submit apreadsheet's changes.
+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.
+message.warnMaxEdits = Note: You are only allowed to do {0} more edits before this Wiki will be locked. After that you wont be able to continue editing.
+message.maxEditsReached = You have reached the maximum number of edits for this Wiki activity so it has been locked.
+message.pageNotEditable = This page has been set to locked by your instructor, so you cannot edit it.
+titleHeading.instructions = Instructions
+label.authoring.basic.instructions = Instructions:
+label.wiki.body = Wiki content
+label.wiki.edit = Edit
+label.wiki.edit.toolTip = Edit the current Wiki page
+label.wiki.add = Add
+label.wiki.add.toolTip = Add a new Wiki page to this Wiki
+label.wiki.add.title.exists = A Wiki page with title [{0}] already exists, please choose a different title.
+label.wiki.add.title.required = A title is required for the Wiki page.
+label.wiki.last.edit = Last edited by <b>{0}</b> - {1}
+label.wiki.refresh = Refresh
+label.wiki.refresh.toolTip = Refresh the page to get the current content
+label.wiki.view = View
+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.history = History
+label.wiki.history.toolTip = View previous versions of this Wiki page
+label.wiki.history.version = Version
+label.wiki.history.empty = There are no previous versions of this Wiki page.
+label.wiki.history.date = Edit date
+label.wiki.history.editor = Edit by
+label.wiki.history.editor.author = Author
+label.wiki.history.actions = Actions
+label.wiki.history.actions.revert = Revert
+label.wiki.history.actions.revert.tooltip = Revert back to this version
+label.wiki.history.actions.compare = Compare
+label.wiki.history.actions.view = View
+label.wiki.history.actions.view.tooltip = View page version
+label.wiki.history.actions.compare.tooltip = Compare current version to this version
+label.wiki.compare = Comparing versions {0}
+label.wiki.compare.added.line = Added lines
+label.wiki.compare.removed.line = Removed lines
 label.on = On
 label.off = Off
-label.submit = Finish
-label.search = Search...
-label.refresh = Refresh
-label.spreadsheet.options = Options
+monitor.summary.th.advancedSettings = Advanced settings
+monitor.th.sessions = Wiki sessions
+monitor.th.numlearners = Number of learners
+monitor.summary.td.addNotebook = Add a notebook at end of Wiki
+monitor.summary.td.notebookInstructions = Notebook instructions
+monitor.nosessions = There are no sessions running yet for this Wiki.
+monitor.notebooks = Notebook reflections
+output.desc.number.of.edits = Number of page edits
+output.desc.number.of.add = Number of pages added
+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.
+label.wiki.restore = Restore
+label.wiki.restore.toolTip = Restore previously removed page
+notify.pageRestored.subject = Wiki page has been restored by {0}.
+notify.pageRestored.body = A Wiki page has been restored by {0} for {1}. To see the Wiki, go to {2}
+label.wiki.remove.mark.toolTip = Mark this page as removed
+label.wiki.remove.mark.confirm = Are you sure you want to mark this Wiki page as removed?
+label.wiki.removed = This page has been removed.
+button.submit = Finish
+error.title.invalid.characters = Title cannot contain any of these characters ^, <, >, #, (, ), \, |, ', ", {, }, `
+label.wiki.options = Options
 label.activity.completion = End of activity
+label.notifications = Notifications
+monitor.summary.date.restriction = Deadline
+monitor.summary.when.date.restriction.is.set = Learners will not be able to use the Wiki after the set date and time.
+monitor.summary.after.date = Date/time:
+monitor.summary.set.restriction = Set restriction
+monitor.summary.unset.restriction = Remove restriction
+authoring.info.teacher.set.restriction = For this activity, the instructor fixed a deadline until {0}. After this time this activity will not be available.
+monitor.summary.notification = Notification
+monitor.summary.date.restriction.set = Deadline has been set
+monitor.summary.date.restriction.removed = Deadline has been removed
 outcome.authoring.title = Learning outcomes
 outcome.authoring.input = Search and select by outcome name or code
 outcome.authoring.existing = Added outcomes