Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r919480104e49e8c2055348b663dcb3e688cfe571 -r4a002a93eec034b0f79f414a8a3b8bff277692af
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 919480104e49e8c2055348b663dcb3e688cfe571)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4a002a93eec034b0f79f414a8a3b8bff277692af)
@@ -56,8 +56,8 @@
 msg.loading.add.lesson.window = Loading Add Lesson Wizard.
 title.monitor.lesson.window = Monitor Lesson:: LAMS
 msg.loading.monitor.lesson.window = Loading Lesson Monitoring Environment.
-title.learner.window = Learner:: LAMS
-msg.loading.learner.window = Loading Learner Environment.
+title.learner.window = Student:: LAMS
+msg.loading.learner.window = Loading Student Environment...
 title.error.window = LAMS :: Error
 authoring.msg.save.success = Congratulations, your content saved successfully!
 label.authoring.close = Close
@@ -91,7 +91,7 @@
 button.close = Close
 button.import = Import
 msg.LAMS.copyright.statement.1 = LAMS™ © 2002 onwards LAMS Foundation
-msg.LAMS.copyright.statement.2 = LAMS is a trademark of LAMS Foundation (http://lamsfoundation.org).
+msg.LAMS.copyright.statement.2 = LAMS is a trademark of LAMS Foundation.
 msg.LAMS.copyright.statement.3 = This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation.
 title.export = Export tool content
 error.system.error = An error has occurred. Please start again. Reason for error: {0}
@@ -181,11 +181,11 @@
 error.forgot.password.username = Please enter a username.
 button.select.another.importfile = Select another file to import
 error.forgot.password.incorrect.key = The request key is incorrect or has already been used. Please click the "Forgot your Password" link again to make a new request.
-lessonsearch.title = Search learners in lesson
-lessonsearch.instuctions = Please enter the login, first or last name of the learner.
+lessonsearch.title = Search students in lesson
+lessonsearch.instuctions = Please enter the login, first or last name of the student.
 lessonsearch.results = Lessons in which ''''{0}'''' has been found
-index.searchlesson = Learner Search
-index.searchlesson.tooltip = Search learners across lessons
+index.searchlesson = Student Search
+index.searchlesson.tooltip = Search students across lessons
 lessonsearch.noresults = No Lessons found
 error.multiple.emails = There are multiple users in LAMS with the given email. Email could not be sent. Please try again using your username, or contact your system administrator.
 public.folder = Public Folder
@@ -287,17 +287,17 @@
 label.tab.advanced = Advanced
 label.tab.conditions = Conditions
 label.tab.lesson.title = Select the design to add a lesson, and click on Add now
-label.tab.class.title = Use drag n' drop to select or unselect monitors and learners
+label.tab.class.title = Use drag n' drop to select or unselect monitors and students
 label.tab.lesson.name = Lesson name:
 label.tab.lesson.size.full = (show full size)
 label.tab.lesson.size.fit = (fit to window)
 label.tab.lesson.sequence.folder = Run sequences
 error.tab.lesson.sequence = A valid design must be selected
 label.tab.class.monitors.unselected = Monitors unselected
 label.tab.class.monitors.selected = Monitors selected
-label.tab.class.learners.unselected = Learners unselected
-label.tab.class.learners.selected = Learners selected
-error.tab.class.learners = There must be at least 1 learner selected
+label.tab.class.learners.unselected = Students unselected
+label.tab.class.learners.selected = Students selected
+error.tab.class.learners = There must be at least 1 student selected
 error.tab.class.monitors = There must be at least 1 monitor selected
 label.tab.advanced.details = Details
 label.tab.advanced.intro.enable = Enable lesson intro
@@ -307,7 +307,7 @@
 label.tab.advanced.field.monitor = Start in Monitor
 label.tab.advanced.field.liveedit = Enable Live Edit
 label.tab.advanced.field.notification = Enable lesson notifications
-label.tab.advanced.field.presence = Allow learners to see who is online
+label.tab.advanced.field.presence = Allow students to see who is online
 label.tab.advanced.field.im = Enable Instant Messaging
 label.tab.advanced.field.split = Split learners into separate copies of this lesson
 label.tab.advanced.field.split.number = No. learners per lesson
@@ -354,7 +354,7 @@
 label.course.groups.grouping.use.confirm = Are you sure you want to use grouping "[0]"? Groups will be created for this lesson and learners assigned to them.
 label.course.groups.locked = Some users in this group already used the grouping. The group is now locked: you can not remove it or move users to another group.
 label.course.groups.locked.transfer = Are you sure you want to move these users to a locked group? You will not be allowed to move them to another group later.
-label.tab.advanced.field.restart = Learners always start from the first activity
+label.tab.advanced.field.restart = Students always start from the first activity
 error.firstname.invalid.characters = First name contains invalid characters
 error.lastname.invalid.characters = Last name contains invalid characters
 error.username.invalid.characters = Username can only contain alphanumeric characters and no spaces.
@@ -393,8 +393,8 @@
 authoring.fla.course.groups.to.branches.match.dialog.title = Match Course Groups to Branching Groups
 authoring.fla.branch.mapping.course.groups.header = Course groups
 authoring.fla.branch.mapping.branching.groups.header = Branching groups
-label.tab.advanced.field.force.restart = Learners always start from the first activity
-label.tab.advanced.field.allow.restart = Learners can restart the lesson
+label.tab.advanced.field.force.restart = Students always start from the first activity
+label.tab.advanced.field.allow.restart = Students can restart the lesson
 label.verification.code = Verification code
 error.verification.code = Sorry, entered verification code is incorrect. Please try again.
 label.your.new.shared.secret = Your new shared secret: {0}
@@ -573,11 +573,11 @@
 authoring.fla.page.prop.grouping.type = Grouping type:
 authoring.fla.page.prop.grouping.type.random = Random
 authoring.fla.page.prop.grouping.type.monitor = Choose in Monitor
-authoring.fla.page.prop.grouping.type.learner = Learner's choice
+authoring.fla.page.prop.grouping.type.learner = Student's choice
 authoring.fla.page.prop.groups.number = Number of groups:
-authoring.fla.page.prop.groups.learners = Or learners per group:
+authoring.fla.page.prop.groups.learners = Or students per group:
 authoring.fla.page.prop.groups.equal = Equal group sizes?
-authoring.fla.page.prop.groups.view.learners = View learners before selection?
+authoring.fla.page.prop.groups.view.learners = View students before selection?
 authoring.fla.page.prop.groups.name = Name Groups
 authoring.fla.page.prop.gradebook = Gradebook output:
 authoring.fla.page.prop.description = Description:
@@ -591,14 +591,14 @@
 authoring.fla.page.prop.days = days
 authoring.fla.page.prop.hours = hours
 authoring.fla.page.prop.minutes = minutes
-authoring.fla.page.prop.gate.activity.finish.based = Since learner finished previous activity?
+authoring.fla.page.prop.gate.activity.finish.based = Since student finished previous activity?
 authoring.fla.page.prop.conditions.create = Create conditions
 authoring.fla.page.prop.gate.conditions.map = Map gate conditions
 authoring.fla.page.prop.branching.type = Branching type:
 authoring.fla.page.prop.branching.type.chose = Instructor's choice
 authoring.fla.page.prop.branching.type.group = Group-based
-authoring.fla.page.prop.branching.type.tool = Learner's output
-authoring.fla.page.prop.branching.type.optional = Learner's choice
+authoring.fla.page.prop.branching.type.tool = Student's output
+authoring.fla.page.prop.branching.type.optional = Student's choice
 authoring.fla.page.prop.grouping = Grouping:
 authoring.fla.page.prop.branching.conditions.match = Match conditions to branches
 authoring.fla.page.prop.branching.groups.match = Match Groups to Branches
@@ -662,11 +662,11 @@
 tour.course.gradebook.content = View your marks for this course.
 tour.more.actions.content = General options for managing this course such as notifications, subgroups, gradebook. The contents of this menu will vary depending on your responsibilities.
 tour.lesson.monitoring.title = Lesson Monitoring
-tour.lesson.monitoring.content = The Monitoring screen shows you where the learners are in the lesson their contributions.
+tour.lesson.monitoring.content = The Monitoring screen shows you where the students are in the lesson their contributions.
 tour.lesson.notifications.title = Lesson Notifications
-tour.lesson.notifications.content = Send email notifications to learners.
+tour.lesson.notifications.content = Send email notifications to students.
 tour.lesson.gradebook.title = Lesson Gradebook
-tour.lesson.gradebook.content = Review learners\' marks and the length of time taken in the lesson.
+tour.lesson.gradebook.content = Review students\' marks and the length of time taken in the lesson.
 tour.lesson.conditions.title = Lesson Conditions
 tour.lesson.conditions.content = Set up conditions for starting or ending the lesson.
 tour.lesson.remove.title = Remove Lesson
@@ -702,16 +702,16 @@
 label.tab.advanced.field.gradebook.complete = Display activity scores on completion
 index.kumalive = Kumalive
 index.kumalive.tooltip = Enter a live lesson
-index.kumalive.enter.learner = Enter as a learner
+index.kumalive.enter.learner = Enter as a student
 index.kumalive.report = Reports
 index.kumalive.rubric = Rubrics management
 label.import.groups.from.template = Import groups from template
-label.import.groups.from.template.description = Download the template spreadsheet to create your groups using all the present learners in this lesson/course. Once you upload the file, the groups will be automatically created according to the spreadsheet.
+label.import.groups.from.template.description = Download the template spreadsheet to create your groups using all the present students in this lesson/course. Once you upload the file, the groups will be automatically created according to the spreadsheet.
 label.download.template = Download Template
 label.upload.group.spreadsheet = Upload Finished Spreadsheet
 error.file.required = Grouped Spreadsheet Required
 error.file.wrong.format = Grouped Spreadsheet in the wrong format. Please upload a file based on the given template.
-label.import.successful = Group Import successful. {0} learners allocated to groups.
+label.import.successful = Group Import successful. {0} students allocated to groups.
 label.import.warning.replace.groups = Importing this file will replace the existing groups. Do you want to import this file?
 filename.create.grouping.template = create-grouping-template
 spreadsheet.column.login = Login
@@ -721,20 +721,20 @@
 error.groups.upload.locked = Cannot update groups as the groups are now in use.
 error.branching.upload.must.use.existing.groups = Cannot update branching. Must use the existing names: {0}.
 label.print = Print
-authoring.tbl.desc.peer.review = These are the criteria for which the learners will rate each other using a 5 star rating. These fields are optional and no Peer Evaluation will be created if they are left blank.
+authoring.tbl.desc.peer.review = These are the criteria for which the students will rate each other using a 5 star rating. These fields are optional and no Peer Evaluation will be created if they are left blank.
 authoring.section.peerreview = Peer Evaluation
 authoring.label.peerrevice.criteria.num = Rating Criteria {0}
-authoring.label.peerrevice.allow.comments = Allow learners to comment on other learners
+authoring.label.peerrevice.allow.comments = Allow students to comment on each others
 authoring.label.peerrevice.min.words.in.comments = Minimum number of words in a comment
-authoring.create.criteria = Create Criteria
+authoring.create.criteria = Add Criteria
 audit.design.created = Learning design "{0}" ({1}) created by {2} ({3})
 authoring.fla.save.successful.check.grouping = Your design is valid and has been saved.\\nIf this is a TBL design, you may want to make following activities grouped:
 authoring.fla.weights.none = No activities with weightable gradebook output
 audit.live.edit.start = Live Edit of Learning Design "{0}" ({1}) for Lesson ({2}) started by {3} ({4})
 audit.live.edit.end = Live Edit of Learning Design "{0}" ({1}) for Lesson ({2}) completed by {3} ({4})
 label.post.anonomously = Post anonymously
 label.anonymous = Anonymous
-label.anonymous.tooltip = Turn on "Post anonymously" to hide your name from other learners. Teachers will still be able to see your name.
+label.anonymous.tooltip = Turn on "Post anonymously" to hide your name from other students. Teachers will still be able to see your name.
 authoring.fla.page.ld.title.desc = Click to display design details
 label.start = Start:
 label.end = End:
@@ -761,7 +761,7 @@
 authoring.fla.page.prop.gradebook.none = No score
 label.select.country = Select a country
 error.country.required = Country is required
-error.cannot.login.as.with.not.allow.direct.access = You cannot login as this user as they are 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 they are an Integration student and 'Allow direct access to main LAMS page for Integration Students' is turned off in the system configuration.
 signup.email.verify.body.1 = Hi there,
 signup.email.verify.body.2 = Please confirm your email address by clicking on the link below
 signup.email.verify.body.3 = Regards,
@@ -824,20 +824,20 @@
 authoring.msg.close.cancel.save = Do you want to close this window without saving?
 authoring.msg.list.cancel.save = Do you want to return to the wizard list without saving?
 authoring.fla.page.menu.new.template = Use Learning Design Wizards
-authoring.template.list.introduction = Select a teaching strategy to explore it.
+authoring.template.list.introduction = Select a teaching strategy to explore sample lesson designs, guidance, and templates.
 authoring.learning.design.templates = Learning Design Wizards
 authoring.template.successful = Your design has been saved as {0}.
 authoring.label.sequence.title = Name
 authoring.error.question.correct.num = RAT Questions: One of the answers for Question {0} needs to be correct.
 authoring.description.application.exercise = Application Exercise (These question(s) will be shown during the analysis phase in the design).
 authoring.label.grouping = Teams
-authoring.label.grouping.learners.choice = Learner's Choice
+authoring.label.grouping.learners.choice = Students' Choice
 authoring.label.grouping.teachers.choice = Teacher's Choice
 authoring.label.grouping.random.allocation = Random Allocation
 authoring.label.numgroups = Number of teams:
 authoring.error.numgroups = Number of teams must be 1 to 99.
-authoring.label.numlearners = Number of learners:
-authoring.error.numlearners = Number of learners must be 1 to 99.
+authoring.label.numlearners = Number of students:
+authoring.error.numlearners = Number of students must be 1 to 99.
 authoring.error.group.data = Team settings are not correct.
 authoring.section.lessondetails = Lesson Details
 authoring.section.questions = RAT Questions
@@ -865,7 +865,7 @@
 authoring.label.none = None
 authoring.tbl.template.title = Team-Based Learning
 authoring.tbl.template.description = Structured form of small-group learning that emphasises student preparation out of class and application of knowledge in class.
-authoring.tbl.desc.question = Adding RAT questions.
+authoring.tbl.desc.question = Adding RAT questions
 authoring.tbl.desc.ae = Adding Application Exercises (AEs). You can create multiple AEs if needed.
 outcome.manage.remove.error.in.use = The outcome is mapped to some items. It can not be removed.
 scale.manage.remove.error.in.use = The scale is used in some outcomes. It can not be removed.
@@ -881,7 +881,7 @@
 authoring.tbl.delete.appex.prompt = Do you want to delete the Application Exercise {0}?
 authoring.tbl.delete.mcq.prompt = Do you want to delete the RAT Question {0}?
 authoring.application.exercise.allow.multiple.responses = Allow multiple responses
-authoring.application.exercise.allow.multiple.responses.tooltip = When learners are allowed to select multiple answers the grade is the sum of the grade for all correct responses selected.
+authoring.application.exercise.allow.multiple.responses.tooltip = When students are allowed to select multiple answers the grade is the sum of the grade for all correct responses selected.
 message.teacher.role.not.recognized = Please wait for a teacher to start the lesson. (You were logged in as a learner, as your current role does not conform LTI specification).
 label.multiple.lessons = Multiple lessons
 label.add.lessons.to.subgroups = Add lesson to all selected subcourses
@@ -1016,7 +1016,7 @@
 label.authoring.answer.required = Answer required?
 label.authoring.basic.default.question.grade = Default question grade
 label.required.field = Required field
-label.authoring.basic.allow.learners.rich.editor = Allow learners to use rich text editor
+label.authoring.basic.allow.learners.rich.editor = Allow students to use rich text editor
 label.maximum.number.words = Maximum number of words
 label.minimum.number.words = Minimum number of words
 label.authoring.basic.general.feedback = General feedback
@@ -1106,8 +1106,8 @@
 label.qb.difficulty.index.tooltip = The difficulty index represents a percentage of the students responses that answered the question correctly. This metric takes a value between 0 and 1. High values indicate that the question is easy, while low values indicate that is difficult. Value 0.3 to 0.7 is considered good for this factor and outside this range requires improvement.
 label.qb.discrimination.index.tooltip = Discrimination index measures how well a question distinguishes between students with more knowledge or skill from those with less. Values close to +1 indicate that the question does a good job of discriminating between high performers and low performers. Value 0.2 to 1 is considered good for this factor, -0.2 to 0.2 is medium and below -0.2 requires improvement.
 label.qb.point.biserial.tooltip = Point-biserial measures the correlation between the scores on the entire exam and the scores on the single question (where 1 = correct answer and 0 = incorrect answer). A large correlation indicates that a question is measuring the same construct as the overall exam measures. Value 0.2 to 1 is considered good for this factor, -0.2 to 0.2 is medium and below -0.2 requires improvement.
-label.qb.stats.tooltip = Item analysis is a technique that analyses the learner answers to evaluate the effectiveness of questions in an exam. Only learners who have finished the activity are taken into consideration. There must be at least 2 learners.
-authoring.fla.page.prop.gate.stop.at.preceding = Stop learners at preceding activity?
+label.qb.stats.tooltip = Item analysis is a technique that analyses the student answers to evaluate the effectiveness of questions in an exam. Only students who have finished the activity are taken into consideration. There must be at least 2 students.
+authoring.fla.page.prop.gate.stop.at.preceding = Stop students at preceding activity?
 authoring.fla.tool.category.1 = Flow
 authoring.fla.tool.category.2 = Collaboration
 authoring.fla.tool.category.3 = Assessment
@@ -1128,13 +1128,13 @@
 authoring.fla.remove.button.tip = Remove this item
 label.qb.advanced.search.same.ld = Present in this learning design
 label.qb.advanced.search.same.ld.tip = Show only questions which were already used in this sequence's activities.
-label.authoring.short.answer.exact.match = Learner answer must exactly match expected answer
+label.authoring.short.answer.exact.match = Student answer must exactly match expected answer
 signup.email.verify.subject = LAMS confirm email address
 label.grouping.general.instructions.heading = General instructions:
 label.grouping.general.instructions.line1 = Choose a course grouping to use in this lesson or create a new one. You are working with copies, so any changes made here have no influence on the original course groupings. Grouping with zero groups are not listed here. Once a grouping is chosen, the only way to come back to the grouping list is to manually remove all groups.
-label.grouping.general.instructions.line2 = Place the lesson participants in their groups. Initially you can add and remove learners, but once a groups is used (that is, a participant starts an activity that uses the grouping) you will not be able to remove learners from it. Even if a group is in use you can still add learners. The changes are saved immediately.
+label.grouping.general.instructions.line2 = Place the students in their groups. At first, you can add or remove students, but once a group is in use, meaning a student has started an activity that is grouped, you will no longer be able to remove students from it. Even when a group is in use, you can still add students. All changes are saved immediately.
 label.grouping.general.instructions.branching = This grouping activity is used for branching. Groups can therefore not be added or deleted.
-label.branching.general.instructions = Place the lesson participants in their branches. Initially you can add and remove learners, but once a participant starts one of the branches then you will not be able to remove learners from any branches. If you try to remove someone from a branch and they will not remove then check their progress - if they start using the branch while you are on this screen you will not get any errors but you will not be able to remove them from the branch. You will still be able to add learners to branches.
+label.branching.general.instructions = Place the students in their branches. At first, you can add or remove students, but once a student starts one of the branches, you will no longer be able to remove students from any branch. If you try to remove someone and the system does not allow it, check their progress, because if they have started using a branch while you are on this screen, you will not see an error, but the removal will not occur. You can still add students to branches at any time.
 label.grouping.popup.viewmode.message = You are presently in group view mode. Groups can not be modified.
 label.tab.grouping = Groups
 label.tab.grouping.none = The selected design does not contain an activity to apply course grouping to.
@@ -1162,7 +1162,7 @@
 authoring.fla.page.menu.new.ai = AI Assistant
 authoring.learning.design.ai.wizard = Learning Design AI Wizard
 label.grouping.return.to.monitoring = Return to monitoring
-label.import.successful.skipped = {0} learners skipped, including:
+label.import.successful.skipped = {0} students skipped, including:
 label.questions.choice.none.found = No questions available
 index.teamwork = Teamwork
 label.learning.design.last.modified = Last modified date
@@ -1197,8 +1197,16 @@
 authoring.fla.page.prop.password.dynamic = Dynamic password:
 authoring.fla.page.prop.password.dynamic.tooltip = A six-digit password will be generated automatically and changed every 15 seconds.
 authoring.fla.sequence.not.valid.description = It must be corrected before it can be used in lessons.
-label.tab.advanced.field.spawn = Create a separate lesson instance for each learner
+label.tab.advanced.field.spawn = Create a separate lesson instance for each student
 label.authoring.basic.template = Template
-label.authoring.basic.template.hint = Learners will get this content as a template to answer the question.
+label.authoring.basic.template.hint = Students will get this content as a template to answer the question.
 authoring.fla.copy.open.button = Open a copy
 403.tool.session = You are not allowed to view this page. Do not share lesson links with other students.
+authoring.fla.page.menu.new.pedagogy.explorer = Explore
+authoring.template.tag.activelearning = Active learning
+authoring.template.tag.structured = Structured
+authoring.template.tag.flipped = Flipped classroom
+authoring.template.tag.collaborative = Collaborative
+authoring.template.create.ld = Create Design
+hint.option.up = Move up
+hint.option.down = Move down