Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r63ab02e00bba3e3c018b17248ccf6540ea8940a4 -r46690f9897a1d36d9ed0314876d309948ed0adea
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 63ab02e00bba3e3c018b17248ccf6540ea8940a4)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 46690f9897a1d36d9ed0314876d309948ed0adea)
@@ -7,12 +7,10 @@
 error.general.3 = If the problem persists please contact your system administrator.
 error.newpassword.mismatch = Your new passwords do not match each other.
 error.oldpassword.mismatch = Your old password is not correct.
-error.password.history = You have already used this password.
 heading.password.change.screen = Change password
 label.password.old.password = Old password
 label.password.new.password = New password
 label.password.confirm.new.password = Confirm new password
-label.password.expired = Your password has expired.
 heading.password.changed.screen = Password changed
 msg.password.changed = Your password has been changed.
 error.login = Sorry, that username or password is not known. Please try again.
@@ -406,17 +404,14 @@
 label.mark.org.favorite = Mark course as favourite
 label.email.send.me.a.copy = Send me a copy
 label.password.max.length = must be less than 25 characters
-label.password.min.length = must be at the least {0} characters long
+label.password.min.length = must be at least {0} characters long
 label.password.old.must.entered = Old password must be entered
 label.password.symbols.allowed = Only these symbols are allowed
 label.password.restrictions = Password must follow the restrictions shown above
 label.password.must.contain = Password must contain
 label.password.must.ucase = at least 1 upper case letter
 label.password.must.number = at least 1 number
 label.password.must.symbol = at least 1 symbol
-label.password.user.details = must not be the same as user login, ID, email or names
-label.password.common = must not be common or breached
-label.password.history = must not be the same as last {0} passwords
 label.create.lesson = Create new lesson
 label.organisations = Select course with the lessons that needs to be export
 label.lesson.id = Lesson ID
@@ -888,8 +883,6 @@
 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.tbl.mark.hedging = Mark hedging?
-authoring.tbl.mark.hedging.tooltip = When enabled, allows students to split the marks to answers depending how confident they feel about each answer. Works best when marks are the same or higher than the number of available answers.
 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
@@ -1101,3 +1094,10 @@
 authoring.label.application.exercise.doku.gallery.walk.instructions =  Instructions for Gallery Walk (ie: Please review other groups' work and make sure you add your review/comments)
 authoring.create.doku.question = Add Collaborative Document Question
 authoring.label.application.exercise.doku.gallery.walk.read.only = Disable commentary and rating
+authoring.tbl.mark.hedging = Mark hedging?
+authoring.tbl.mark.hedging.tooltip = When enabled, allows students to split the marks to answers depending how confident they feel about each answer. Works best when marks are the same or higher than the number of available answers.
+error.password.history = You have already used this password.
+label.password.expired = Your password has expired.
+label.password.user.details = must not be the same as user login, ID, email or names
+label.password.common = must not be common or breached
+label.password.history = must not be the same as last {0} passwords