Index: lams_common/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r919480104e49e8c2055348b663dcb3e688cfe571 -r4a002a93eec034b0f79f414a8a3b8bff277692af
--- lams_common/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 919480104e49e8c2055348b663dcb3e688cfe571)
+++ lams_common/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4a002a93eec034b0f79f414a8a3b8bff277692af)
@@ -1,10 +1,10 @@
 runsequences.folder.name = {0} Run sequences
 validation.error.other = Other error
 validation.error.transitionNoActivityBeforeOrAfter = A transition must have an activity before or after the transition
-validation.error.activityWithNoTransition = An activity must have an input or output transition
-validation.error.inputTransitionType1 = This activity has no input transition
+validation.error.activityWithNoTransition = Activity "{0}" must have an input or output transition
+validation.error.inputTransitionType1 = Activity "{0}" has no input transition
 validation.error.inputTransitionType2 = No activities are missing their input transition.
-validation.error.outputTransitionType1 = This activity has no output transition
+validation.error.outputTransitionType1 = Activity "{0}" has no output transition
 validation.error.outputTransitionType2 = No activities are missing their output transition.
 validation.error.GroupingRequired = Grouping is required
 validation.error.GroupingNotRequired = Grouping is not supported
@@ -28,19 +28,19 @@
 error.import.matching.tool.not.found = The activity with signature {0} is skipped because a matching tool cannot be found.
 error.import.tool.service.fail = Unable to import tool content for tool {0}. Caused by {1}.
 error.no.valid.tool = No valid tools in this learning design.
-import.shareresources.warning = The design contains one or more Share Resources activities. Please check these activities as any file or uploaded websites in the activity will be invalid and will cause an error for the learners. Links to external websites should not cause any errors.
+import.shareresources.warning = The design contains one or more Share Resources activities. Please check these activities as any file or uploaded websites in the activity will be invalid and will cause an error for the students. Links to external websites should not cause any errors.
 audit.user.password.change = Password changed for: {0}
 audit.user.create = Created user: {0}, Full Name: {1}
 validation.error.branching.must.have.a.branch = A Branching activity must have at least one Branch.
-validation.error.toolBranchingMustHaveDefaultBranch = A learner's output branching activity must have a default branch.
+validation.error.toolBranchingMustHaveDefaultBranch = A student's output branching activity must have a default branch.
 validation.error.sequenceActivityMustHaveFirstActivity = A branch must have a first Activity.
 validation.error.groupedBranchingMustHaveAGrouping = A group based branching activity must have a Grouping Activity. Unless Define Later is turned on, it must have at least one group.
 validation.error.groupedBranchingMustHaveBranchForGroup = A group based branching activity must have all Groups assigned to Branches.
 validation.error.toolBranchingConditionInvalid = A condition has a bad or missing comparison value.
-validation.error.toolBranchingMustHaveAnInputToolActivity = A learner's output branching activity must have an input tool.
+validation.error.toolBranchingMustHaveAnInputToolActivity = A student's output branching activity must have an input tool.
 error.possibly.incompatible.version = Cannot confirm that the .zip file is compatible with the current version of LAMS. It may be from a newer version of LAMS. Version from .zip file is {0}, current LAMS version is {1}. Import may fail.
 validation.error.group.count.mismatch = More groups exist than the number of groups that should exist.
-validation.error.toolBranchingMustHaveACondition = Learner's output branching activity must have at least one condition.
+validation.error.toolBranchingMustHaveACondition = Student's output branching activity must have at least one condition.
 mail.resend.abandon.subject = LAMS: Message delivery failed
 mail.resend.abandon.body1 = LAMS was resending a message to users, but eventually it gave up. The message was:\n
 mail.resend.abandon.body2 = \nUsers' login names:\n
@@ -64,7 +64,7 @@
 audit.cancelled.editing.activity = Teacher {0} has cancelled editing activity {1} in monitor
 audit.tool.prefix = Tool {0}:
 audit.change.initiated.by = Change initiated by
-error.cannot.login.as.with.not.allow.direct.access = You cannot login as this user as he/she is an Integration Learner and 'Allow direct access to main LAMS page for integration learners' is turned off in the system configuration.
+error.cannot.login.as.with.not.allow.direct.access = You cannot login as this user as he/she is an Integration student and 'Allow direct access to main LAMS page for integration students' is turned off in the system configuration.
 country.AD = Andorra
 country.AE = United Arab Emirates
 country.AF = Afghanistan
@@ -316,4 +316,4 @@
 country.BQ = Bonaire, Saint Eustatius and Saba
 validation.error.blankPasswordGatePassword = A Password gate cannot have a blank password
 audit.change.mark.for.option = User {2} ({3}) Changed mark for users who chose option with UID {0}. New mark: {1}
-audit.change.mark.for.question = User {4} ({5}) Changed mark for learner {0} for tool question with UID {1}. Old mark: {2}. New mark: {3}
+audit.change.mark.for.question = User {4} ({5}) Changed mark for student {0} for tool question with UID {1}. Old mark: {2}. New mark: {3}